diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/apparmorapplet.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/apparmorapplet.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/apparmorapplet.po	2012-01-02 18:14:17.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/apparmorapplet.po	2012-02-23 07:17:27.000000000 +0000
@@ -9,8 +9,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:37+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:36+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/apparmor-applet.c:244
 msgid ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/app-install-data.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/app-install-data.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/app-install-data.po	2012-01-02 18:14:17.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/app-install-data.po	2012-02-23 07:17:27.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: app-install-data-ubuntu\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-28 20:33+0000\n"
+"POT-Creation-Date: 2012-01-31 17:33+0000\n"
 "PO-Revision-Date: 2011-02-06 13:42+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:42+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:41+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../menu-data-additional/7zip.desktop.in.h:1
 msgid "7zip"
@@ -51,27 +51,27 @@
 msgstr ""
 
 #: ../menu-data-additional/flashplugin-installer.desktop.in.h:1
-msgid "Adobe Flash plugin"
+msgid "Installer for the Adobe Flash plugin for Mozilla"
 msgstr ""
 
 #: ../menu-data-additional/flashplugin-installer.desktop.in.h:2
-msgid "Installer for the Adobe Flash plugin for Mozilla"
+msgid "Adobe Flash plugin"
 msgstr ""
 
 #: ../menu-data-additional/gnome-utils.desktop.in.h:1
-msgid "Dictionary, Disk Usage Analyzer, Log File Viewer, Search Tool"
+msgid "GNOME Desktop Utilities"
 msgstr ""
 
 #: ../menu-data-additional/gnome-utils.desktop.in.h:2
-msgid "GNOME Desktop Utilities"
+msgid "Dictionary, Disk Usage Analyzer, Log File Viewer, Search Tool"
 msgstr ""
 
 #: ../menu-data-additional/icedtea-plugin.desktop.in.h:1
-msgid "Icedtea Java Browser Plugin"
+msgid "Icedtea Java Plugin"
 msgstr ""
 
 #: ../menu-data-additional/icedtea-plugin.desktop.in.h:2
-msgid "Icedtea Java Plugin"
+msgid "Icedtea Java Browser Plugin"
 msgstr ""
 
 #: ../menu-data-additional/kernelpanic.desktop.in.h:1
@@ -141,19 +141,19 @@
 msgstr ""
 
 #: ../menu-data-additional/pidgin-otr.desktop.in.h:1
-msgid "Off-the-Record Messaging plugin for pidgin"
+msgid "Pidgin Internet Messenger Off-the-Record Plugin"
 msgstr ""
 
 #: ../menu-data-additional/pidgin-otr.desktop.in.h:2
-msgid "Pidgin Internet Messenger Off-the-Record Plugin"
+msgid "Off-the-Record Messaging plugin for pidgin"
 msgstr ""
 
 #: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:1
-msgid "30 useful plugins for pidgin"
+msgid "Pidgin Internet Messenger Plugin Pack"
 msgstr ""
 
 #: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:2
-msgid "Pidgin Internet Messenger Plugin Pack"
+msgid "30 useful plugins for pidgin"
 msgstr ""
 
 #: ../menu-data-additional/rar.desktop.in.h:1
@@ -165,19 +165,19 @@
 msgstr ""
 
 #: ../menu-data-additional/spamassassin.desktop.in.h:1
-msgid "Spam filter using text analysis (works with Evolution Mail)"
-msgstr ""
-
-#: ../menu-data-additional/spamassassin.desktop.in.h:2
 msgid "Spamassassin"
 msgstr "Spamassassin"
 
+#: ../menu-data-additional/spamassassin.desktop.in.h:2
+msgid "Spam filter using text analysis (works with Evolution Mail)"
+msgstr ""
+
 #: ../menu-data-additional/totem-plugin-arte.desktop.in.h:1
-msgid "A totem plugin to watch streams from arte.tv"
+msgid "Arte plugin for totem"
 msgstr ""
 
 #: ../menu-data-additional/totem-plugin-arte.desktop.in.h:2
-msgid "Arte plugin for totem"
+msgid "A totem plugin to watch streams from arte.tv"
 msgstr ""
 
 #: ../menu-data-additional/ubuntu-restricted-extras.desktop.in.h:1
@@ -290,12 +290,12 @@
 msgstr ""
 
 #: ../menu-data-xul-extensions/firefox-launchpad-plugin.desktop.in.h:1
-msgid ""
-"Firefox Launchpad integration adds quick search for Launchpad services"
+msgid "Firefox Launchpad plugin"
 msgstr ""
 
 #: ../menu-data-xul-extensions/firefox-launchpad-plugin.desktop.in.h:2
-msgid "Firefox Launchpad plugin"
+msgid ""
+"Firefox Launchpad integration adds quick search for Launchpad services"
 msgstr ""
 
 #: ../menu-data-xul-extensions/xul-ext-ubufox.desktop.in.h:1
@@ -315,11 +315,19 @@
 msgstr ""
 
 #: ../menu-data/3depict:3depict.desktop.in.h:1
+msgid "Valued point cloud visualisation and analysis"
+msgstr ""
+
+#: ../menu-data/3depict:3depict.desktop.in.h:2
 msgid "3depict"
 msgstr "3depict"
 
-#: ../menu-data/3depict:3depict.desktop.in.h:2
-msgid "Valued point cloud visualisation and analysis"
+#: ../menu-data/4digits:4digits.desktop.in.h:1
+msgid "4digits"
+msgstr ""
+
+#: ../menu-data/4digits:4digits.desktop.in.h:2
+msgid "A guess-the-number game, aka Bulls and Cows"
 msgstr ""
 
 #: ../menu-data/7kaa:7kaa.desktop.in.h:1
@@ -363,19 +371,19 @@
 msgstr ""
 
 #: ../menu-data/abuse:abuse.desktop.in.h:1
-msgid "A side-scrolling shoot-em-up action game"
+msgid "Abuse"
 msgstr ""
 
 #: ../menu-data/abuse:abuse.desktop.in.h:2
-msgid "Abuse"
+msgid "A side-scrolling shoot-em-up action game"
 msgstr ""
 
 #: ../menu-data/accerciser:accerciser.desktop.in.h:1
-msgid "Accerciser Accessibility Explorer"
+msgid "Give your application an accessibility workout"
 msgstr ""
 
 #: ../menu-data/accerciser:accerciser.desktop.in.h:2
-msgid "Give your application an accessibility workout"
+msgid "Accerciser Accessibility Explorer"
 msgstr ""
 
 #: ../menu-data/ace-of-penguins:penguin-canfield.desktop.in.h:1
@@ -491,11 +499,11 @@
 msgstr ""
 
 #: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:1
-msgid "A 2D graphical RPG"
+msgid "Waste's Edge"
 msgstr ""
 
 #: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:2
-msgid "Waste's Edge"
+msgid "A 2D graphical RPG"
 msgstr ""
 
 #: ../menu-data/adun.app:UL.desktop.in.h:1
@@ -507,11 +515,11 @@
 msgstr ""
 
 #: ../menu-data/aee:xae.desktop.in.h:1
-msgid "Small text editor"
+msgid "xae"
 msgstr ""
 
 #: ../menu-data/aee:xae.desktop.in.h:2
-msgid "xae"
+msgid "Small text editor"
 msgstr ""
 
 #: ../menu-data/aeolus:aeolus.desktop.in.h:1
@@ -539,11 +547,11 @@
 msgstr ""
 
 #: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:1
-msgid "Simple agenda and calendar application for GNUstep"
+msgid "SimpleAgenda"
 msgstr ""
 
 #: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:2
-msgid "SimpleAgenda"
+msgid "Simple agenda and calendar application for GNUstep"
 msgstr ""
 
 #: ../menu-data/agtl:advancedcaching.desktop.in.h:1
@@ -579,19 +587,19 @@
 msgstr ""
 
 #: ../menu-data/akregator:kde4__akregator.desktop.in.h:1
-msgid "A KDE News Feed Reader"
+msgid "Akregator"
 msgstr ""
 
 #: ../menu-data/akregator:kde4__akregator.desktop.in.h:2
-msgid "Akregator"
+msgid "A KDE News Feed Reader"
 msgstr ""
 
 #: ../menu-data/alacarte:alacarte.desktop.in.h:1
-msgid "Change which applications are shown on the main menu"
+msgid "Main Menu"
 msgstr ""
 
 #: ../menu-data/alacarte:alacarte.desktop.in.h:2
-msgid "Main Menu"
+msgid "Change which applications are shown on the main menu"
 msgstr ""
 
 #: ../menu-data/alarm-clock-applet:alarm-clock-applet.desktop.in.h:1
@@ -616,11 +624,11 @@
 msgstr ""
 
 #: ../menu-data/alien-arena:alien-arena.desktop.in.h:1
-msgid "A standalone 3D first person online deathmatch shooter"
+msgid "Alien Arena"
 msgstr ""
 
 #: ../menu-data/alien-arena:alien-arena.desktop.in.h:2
-msgid "Alien Arena"
+msgid "A standalone 3D first person online deathmatch shooter"
 msgstr ""
 
 #: ../menu-data/aliki:aliki-alsa.desktop.in.h:1
@@ -681,6 +689,14 @@
 msgid "OpenAL-Soft Configuration Utility"
 msgstr ""
 
+#: ../menu-data/altos:altos.desktop.in.h:1
+msgid "AltOS UI"
+msgstr ""
+
+#: ../menu-data/altos:altos.desktop.in.h:2
+msgid "View and log downlink data from Altus Metrum products"
+msgstr ""
+
 #: ../menu-data/amarok:kde4__amarok.desktop.in.h:1
 msgid "Amarok"
 msgstr ""
@@ -690,19 +706,19 @@
 msgstr ""
 
 #: ../menu-data/amide:amide.desktop.in.h:1
-msgid "A Medical Image Data Examiner"
+msgid "Amide"
 msgstr ""
 
 #: ../menu-data/amide:amide.desktop.in.h:2
-msgid "Amide"
+msgid "A Medical Image Data Examiner"
 msgstr ""
 
 #: ../menu-data/amoebax:amoebax.desktop.in.h:1
-msgid "Amoebax"
+msgid "Defeat your opponent by filling up their grid up with garbage."
 msgstr ""
 
 #: ../menu-data/amoebax:amoebax.desktop.in.h:2
-msgid "Defeat your opponent by filling up their grid up with garbage."
+msgid "Amoebax"
 msgstr ""
 
 #: ../menu-data/amor:kde4__amor.desktop.in.h:1
@@ -738,35 +754,35 @@
 msgstr ""
 
 #: ../menu-data/amsn:amsn.desktop.in.h:1
-msgid "MSN Messenger for Linux"
+msgid "aMSN"
 msgstr ""
 
 #: ../menu-data/amsn:amsn.desktop.in.h:2
-msgid "aMSN"
+msgid "MSN Messenger for Linux"
 msgstr ""
 
 #: ../menu-data/amsynth:amsynth.desktop.in.h:1
-msgid "Two oscillator software synthesizer"
+msgid "amSynth"
 msgstr ""
 
 #: ../menu-data/amsynth:amsynth.desktop.in.h:2
-msgid "amSynth"
+msgid "Two oscillator software synthesizer"
 msgstr ""
 
 #: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:1
-msgid "aMule remote control"
+msgid "aMuleGUI"
 msgstr ""
 
 #: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:2
-msgid "aMuleGUI"
+msgid "aMule remote control"
 msgstr ""
 
 #: ../menu-data/amule:amule.desktop.in.h:1
-msgid "A client for the eD2k network"
+msgid "aMule"
 msgstr ""
 
 #: ../menu-data/amule:amule.desktop.in.h:2
-msgid "aMule"
+msgid "A client for the eD2k network"
 msgstr ""
 
 #: ../menu-data/anagramarama:anagramarama.desktop.in.h:1
@@ -778,30 +794,30 @@
 msgstr ""
 
 #: ../menu-data/angband:angband-gtk.desktop.in.h:1
-#: ../menu-data/angband:angband-sdl.desktop.in.h:1
-#: ../menu-data/angband:angband-x11.desktop.in.h:1
-msgid ""
-"A roguelike dungeon exploration game based on the books of J.R.R.Tolkien"
+msgid "Angband (GTK)"
 msgstr ""
 
 #: ../menu-data/angband:angband-gtk.desktop.in.h:2
-msgid "Angband (GTK)"
+#: ../menu-data/angband:angband-sdl.desktop.in.h:2
+#: ../menu-data/angband:angband-x11.desktop.in.h:2
+msgid ""
+"A roguelike dungeon exploration game based on the books of J.R.R.Tolkien"
 msgstr ""
 
-#: ../menu-data/angband:angband-sdl.desktop.in.h:2
+#: ../menu-data/angband:angband-sdl.desktop.in.h:1
 msgid "Angband (SDL)"
 msgstr ""
 
-#: ../menu-data/angband:angband-x11.desktop.in.h:2
+#: ../menu-data/angband:angband-x11.desktop.in.h:1
 msgid "Angband (X11)"
 msgstr ""
 
 #: ../menu-data/angrydd:angrydd.desktop.in.h:1
-msgid "\"Falling blocks puzzle game\""
+msgid "Angry Drunken Dwarves"
 msgstr ""
 
 #: ../menu-data/angrydd:angrydd.desktop.in.h:2
-msgid "Angry Drunken Dwarves"
+msgid "\"Falling blocks puzzle game\""
 msgstr ""
 
 #: ../menu-data/anjuta:anjuta.desktop.in.h:1
@@ -813,19 +829,19 @@
 msgstr ""
 
 #: ../menu-data/anki:anki.desktop.in.h:1
-msgid "An intelligent spaced-repetition memory training program"
+msgid "Anki"
 msgstr ""
 
 #: ../menu-data/anki:anki.desktop.in.h:2
-msgid "Anki"
+msgid "An intelligent spaced-repetition memory training program"
 msgstr ""
 
 #: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:1
-msgid "Translate as you type"
+msgid "Translator"
 msgstr ""
 
 #: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:2
-msgid "Translator"
+msgid "Translate as you type"
 msgstr ""
 
 #: ../menu-data/apper:kde4__apper.desktop.in.h:1
@@ -841,7 +857,7 @@
 msgstr ""
 
 #: ../menu-data/aptitude-gtk:aptitude-gtk.desktop.in.h:2
-#: ../menu-data/synaptic:synaptic.desktop.in.h:1
+#: ../menu-data/synaptic:synaptic.desktop.in.h:2
 msgid "Install, remove and upgrade software packages"
 msgstr ""
 
@@ -858,11 +874,11 @@
 msgstr ""
 
 #: ../menu-data/apvlv:apvlv.desktop.in.h:1
-msgid "Alf's PDF Viewer Like Vim"
+msgid "apvlv"
 msgstr ""
 
 #: ../menu-data/apvlv:apvlv.desktop.in.h:2
-msgid "apvlv"
+msgid "Alf's PDF Viewer Like Vim"
 msgstr ""
 
 #: ../menu-data/aqemu:aqemu.desktop.in.h:1
@@ -923,11 +939,11 @@
 msgstr ""
 
 #: ../menu-data/ardesia:ardesia.desktop.in.h:1
-msgid "Annotate on the desktop screen."
+msgid "Ardesia desktop sketchpad "
 msgstr ""
 
 #: ../menu-data/ardesia:ardesia.desktop.in.h:2
-msgid "Ardesia desktop sketchpad "
+msgid "Annotate on the desktop screen."
 msgstr ""
 
 #: ../menu-data/ardour-i686:ardour.desktop.in.h:1
@@ -981,11 +997,11 @@
 msgstr ""
 
 #: ../menu-data/armagetronad:armagetronad.desktop.in.h:1
-msgid "3d light cycle game"
+msgid "Armagetron Advanced"
 msgstr ""
 
 #: ../menu-data/armagetronad:armagetronad.desktop.in.h:2
-msgid "Armagetron Advanced"
+msgid "3d light cycle game"
 msgstr ""
 
 #: ../menu-data/arora:arora.desktop.in.h:1
@@ -993,9 +1009,9 @@
 msgstr ""
 
 #: ../menu-data/arora:arora.desktop.in.h:2
-#: ../menu-data/dooble:dooble.desktop.in.h:1
-#: ../menu-data/firefox:firefox.desktop.in.h:1
-#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:1
+#: ../menu-data/dooble:dooble.desktop.in.h:2
+#: ../menu-data/firefox:firefox.desktop.in.h:2
+#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:2
 msgid "Browse the World Wide Web"
 msgstr ""
 
@@ -1016,19 +1032,19 @@
 msgstr ""
 
 #: ../menu-data/asciijump:asciijump.desktop.in.h:1
-msgid "A clone of the dsj game"
+msgid "asciijump"
 msgstr ""
 
 #: ../menu-data/asciijump:asciijump.desktop.in.h:2
-msgid "asciijump"
+msgid "A clone of the dsj game"
 msgstr ""
 
 #: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:1
-msgid "Allows you to select the default ALSA sound card"
+msgid "Default Sound Card"
 msgstr ""
 
 #: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:2
-msgid "Default Sound Card"
+msgid "Allows you to select the default ALSA sound card"
 msgstr ""
 
 #: ../menu-data/assaultcube:assaultcube.desktop.in.h:1
@@ -1048,13 +1064,13 @@
 msgstr ""
 
 #: ../menu-data/asunder:asunder.desktop.in.h:1
-msgid ""
-"An application to save tracks from an Audio CD as WAV, MP3, OGG, FLAC, "
-"and/or Wavpack"
+msgid "Asunder CD Ripper"
 msgstr ""
 
 #: ../menu-data/asunder:asunder.desktop.in.h:2
-msgid "Asunder CD Ripper"
+msgid ""
+"An application to save tracks from an Audio CD as WAV, MP3, OGG, FLAC, "
+"and/or Wavpack"
 msgstr ""
 
 #: ../menu-data/asylum:asylum.desktop.in.h:1
@@ -1094,14 +1110,15 @@
 msgstr ""
 
 #: ../menu-data/attal:attal.desktop.in.h:2
+#: ../menu-data/triplea:triplea.desktop.in.h:2
 msgid "Turn based strategy game"
 msgstr ""
 
-#: ../menu-data/audacious:audacious2.desktop.in.h:1
+#: ../menu-data/audacious:audacious.desktop.in.h:1
 msgid "Audacious"
 msgstr ""
 
-#: ../menu-data/audacious:audacious2.desktop.in.h:2
+#: ../menu-data/audacious:audacious.desktop.in.h:2
 msgid "Listen to music"
 msgstr ""
 
@@ -1144,6 +1161,14 @@
 msgid "AutoKey (QT)"
 msgstr ""
 
+#: ../menu-data/autorenamer:autorenamer.desktop.in.h:1
+msgid "AutoRenamer"
+msgstr ""
+
+#: ../menu-data/autorenamer:autorenamer.desktop.in.h:2
+msgid "Automatically rename files have them sort in given order"
+msgstr ""
+
 #: ../menu-data/avahi-discover:avahi-discover.desktop.in.h:1
 msgid "Avahi Zeroconf Browser"
 msgstr ""
@@ -1169,11 +1194,11 @@
 msgstr ""
 
 #: ../menu-data/avant-window-navigator:avant-window-navigator.desktop.in.h:1
-msgid "A dock-like window navigator."
+msgid "Avant Window Navigator"
 msgstr ""
 
 #: ../menu-data/avant-window-navigator:avant-window-navigator.desktop.in.h:2
-msgid "Avant Window Navigator"
+msgid "A dock-like window navigator."
 msgstr ""
 
 #: ../menu-data/avidemux-qt:avidemux-qt.desktop.in.h:1
@@ -1190,11 +1215,11 @@
 msgstr ""
 
 #: ../menu-data/avogadro:avogadro.desktop.in.h:1
-msgid "Advanced molecular editor"
+msgid "Avogadro"
 msgstr ""
 
 #: ../menu-data/avogadro:avogadro.desktop.in.h:2
-msgid "Avogadro"
+msgid "Advanced molecular editor"
 msgstr ""
 
 #: ../menu-data/aweather:aweather.desktop.in.h:1
@@ -1222,11 +1247,11 @@
 msgstr ""
 
 #: ../menu-data/ayttm:ayttm.desktop.in.h:1
-msgid "\"The GTK Unified Messaging Client\""
+msgid "ayttm"
 msgstr ""
 
 #: ../menu-data/ayttm:ayttm.desktop.in.h:2
-msgid "ayttm"
+msgid "\"The GTK Unified Messaging Client\""
 msgstr ""
 
 #: ../menu-data/azureus:azureus.desktop.in.h:1
@@ -1238,11 +1263,11 @@
 msgstr ""
 
 #: ../menu-data/babiloo:babiloo.desktop.in.h:1
-msgid "Application to view dictionaries"
+msgid "Babiloo"
 msgstr ""
 
 #: ../menu-data/babiloo:babiloo.desktop.in.h:2
-msgid "Babiloo"
+msgid "Application to view dictionaries"
 msgstr ""
 
 #: ../menu-data/backintime-gnome:backintime-gnome.desktop.in.h:1
@@ -1264,20 +1289,28 @@
 msgstr ""
 
 #: ../menu-data/balazarbrothers:balazarbrothers.desktop.in.h:1
-msgid "3D adventure and roleplaying game"
+msgid "Balazar Brothers"
 msgstr ""
 
 #: ../menu-data/balazarbrothers:balazarbrothers.desktop.in.h:2
-msgid "Balazar Brothers"
+msgid "3D adventure and roleplaying game"
 msgstr ""
 
 #: ../menu-data/balder2d:Balder2D.desktop.in.h:1
+msgid "Balder2D"
+msgstr "Balder2D"
+
+#: ../menu-data/balder2d:Balder2D.desktop.in.h:2
 msgid "2D overhead shooter in Zero G"
 msgstr ""
 
-#: ../menu-data/balder2d:Balder2D.desktop.in.h:2
-msgid "Balder2D"
-msgstr "Balder2D"
+#: ../menu-data/ballview:ballview.desktop.in.h:1
+msgid "BALLView"
+msgstr ""
+
+#: ../menu-data/ballview:ballview.desktop.in.h:2
+msgid "Molecular modeling and visualization tool"
+msgstr ""
 
 #: ../menu-data/ballz:ballz.desktop.in.h:1
 msgid "B.A.L.L.Z."
@@ -1289,12 +1322,12 @@
 
 #: ../menu-data/balsa:balsa-mailto-handler.desktop.in.h:1
 #: ../menu-data/balsa:balsa.desktop.in.h:1
-msgid "Balsa Mail Client"
+msgid "E-Mail utility"
 msgstr ""
 
 #: ../menu-data/balsa:balsa-mailto-handler.desktop.in.h:2
 #: ../menu-data/balsa:balsa.desktop.in.h:2
-msgid "E-Mail utility"
+msgid "Balsa Mail Client"
 msgstr ""
 
 #: ../menu-data/bangarang:kde4__bangarang.desktop.in.h:1
@@ -1303,7 +1336,7 @@
 
 #: ../menu-data/bangarang:kde4__bangarang.desktop.in.h:2
 #: ../menu-data/kaffeine:kde4__kaffeine.desktop.in.h:2
-#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:2
+#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:1
 msgid "Media Player"
 msgstr ""
 
@@ -1316,19 +1349,27 @@
 msgstr ""
 
 #: ../menu-data/bareftp:bareftp.desktop.in.h:1
-msgid "Transfer files using the FTP, FTPS or SFTP protocol"
+msgid "bareFTP"
 msgstr ""
 
 #: ../menu-data/bareftp:bareftp.desktop.in.h:2
-msgid "bareFTP"
+msgid "Transfer files using the FTP, FTPS or SFTP protocol"
 msgstr ""
 
 #: ../menu-data/barrage:barrage.desktop.in.h:1
-msgid "A rather destructive action game."
+msgid "Barrage"
 msgstr ""
 
 #: ../menu-data/barrage:barrage.desktop.in.h:2
-msgid "Barrage"
+msgid "A rather destructive action game."
+msgstr ""
+
+#: ../menu-data/basenji:basenji.desktop.in.h:1
+msgid "Basenji"
+msgstr ""
+
+#: ../menu-data/basenji:basenji.desktop.in.h:2
+msgid "A portable volume indexer."
 msgstr ""
 
 #: ../menu-data/basex:basexgui.desktop.in.h:1
@@ -1384,11 +1425,11 @@
 msgstr ""
 
 #: ../menu-data/bauble:bauble.desktop.in.h:1
-msgid "An application for managing botanical collections"
+msgid "Bauble"
 msgstr ""
 
 #: ../menu-data/bauble:bauble.desktop.in.h:2
-msgid "Bauble"
+msgid "An application for managing botanical collections"
 msgstr ""
 
 #: ../menu-data/beidgui:beidgui35.desktop.in.h:1
@@ -1400,13 +1441,13 @@
 msgstr ""
 
 #: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:1
-msgid ""
-"A science-fiction adventure game set in a bleak post-apocalyptic vision of "
-"the future"
+msgid "Beneath A Steel Sky"
 msgstr ""
 
 #: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:2
-msgid "Beneath A Steel Sky"
+msgid ""
+"A science-fiction adventure game set in a bleak post-apocalyptic vision of "
+"the future"
 msgstr ""
 
 #: ../menu-data/berusky:berusky.desktop.in.h:1
@@ -1418,11 +1459,11 @@
 msgstr ""
 
 #: ../menu-data/betaradio:betaradio.desktop.in.h:1
-msgid "An easy way to listen to internet radio of Taiwan."
+msgid "BetaRadio Tuner"
 msgstr ""
 
 #: ../menu-data/betaradio:betaradio.desktop.in.h:2
-msgid "BetaRadio Tuner"
+msgid "An easy way to listen to internet radio of Taiwan."
 msgstr ""
 
 #: ../menu-data/between:between.desktop.in.h:1
@@ -1433,20 +1474,36 @@
 msgid "game about consciousness and isolation"
 msgstr ""
 
-#: ../menu-data/bibledit:bibledit.desktop.in.h:1
+#: ../menu-data/bibledit-bibletime:bibledit-bibletime.desktop.in.h:1
+msgid "Bibledit-BibleTime"
+msgstr ""
+
+#: ../menu-data/bibledit-bibletime:bibledit-bibletime.desktop.in.h:2
+msgid "Bibledit BibleTime Interface"
+msgstr ""
+
+#: ../menu-data/bibledit-gtk:bibledit-gtk.desktop.in.h:1
+msgid "Bibledit-Gtk"
+msgstr ""
+
+#: ../menu-data/bibledit-gtk:bibledit-gtk.desktop.in.h:2
 msgid "Bible Editor"
 msgstr ""
 
-#: ../menu-data/bibledit:bibledit.desktop.in.h:2
-msgid "Bibledit"
+#: ../menu-data/bibledit-xiphos:bibledit-xiphos.desktop.in.h:1
+msgid "Bibledit-Xiphos"
+msgstr ""
+
+#: ../menu-data/bibledit-xiphos:bibledit-xiphos.desktop.in.h:2
+msgid "Bibledit Xiphos Interface"
 msgstr ""
 
 #: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:1
-msgid "A simple KDE Application"
+msgid "BibleMemorizer"
 msgstr ""
 
 #: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:2
-msgid "BibleMemorizer"
+msgid "A simple KDE Application"
 msgstr ""
 
 #: ../menu-data/bibletime:bibletime.desktop.in.h:1
@@ -1498,19 +1555,11 @@
 msgstr ""
 
 #: ../menu-data/bino:bino.desktop.in.h:1
-msgid "3D video player"
-msgstr ""
-
-#: ../menu-data/bino:bino.desktop.in.h:2
 msgid "Bino"
 msgstr ""
 
-#: ../menu-data/biococoa.app:BioCocoa.desktop.in.h:1
-msgid "BioCocoa"
-msgstr "BioCocoa"
-
-#: ../menu-data/biococoa.app:BioCocoa.desktop.in.h:2
-msgid "GNUstep BioCocoa"
+#: ../menu-data/bino:bino.desktop.in.h:2
+msgid "3D video player"
 msgstr ""
 
 #: ../menu-data/biogenesis:biogenesis.desktop.in.h:1
@@ -1524,11 +1573,11 @@
 msgstr ""
 
 #: ../menu-data/bist:bist.desktop.in.h:1
-msgid "Bist stands for bidimensional structures"
+msgid "bist"
 msgstr ""
 
 #: ../menu-data/bist:bist.desktop.in.h:2
-msgid "bist"
+msgid "Bist stands for bidimensional structures"
 msgstr ""
 
 #: ../menu-data/bitmeter:bitmeter.desktop.in.h:1
@@ -1548,11 +1597,11 @@
 msgstr ""
 
 #: ../menu-data/bitstormlite:bitstormlite.desktop.in.h:1
-msgid "A small and fast BitTorrent client"
+msgid "BitStormLite"
 msgstr ""
 
 #: ../menu-data/bitstormlite:bitstormlite.desktop.in.h:2
-msgid "BitStormLite"
+msgid "A small and fast BitTorrent client"
 msgstr ""
 
 #: ../menu-data/bittornado-gui:bittornado.desktop.in.h:1
@@ -1596,11 +1645,11 @@
 msgstr ""
 
 #: ../menu-data/blender:blender.desktop.in.h:1
-msgid "3D modeling, animation, rendering and post-production"
+msgid "Blender"
 msgstr ""
 
 #: ../menu-data/blender:blender.desktop.in.h:2
-msgid "Blender"
+msgid "3D modeling, animation, rendering and post-production"
 msgstr ""
 
 #: ../menu-data/bless:bless.desktop.in.h:1
@@ -1612,11 +1661,11 @@
 msgstr ""
 
 #: ../menu-data/blinken:kde4__blinken.desktop.in.h:1
-msgid "A memory enhancement game"
+msgid "Blinken"
 msgstr ""
 
 #: ../menu-data/blinken:kde4__blinken.desktop.in.h:2
-msgid "Blinken"
+msgid "A memory enhancement game"
 msgstr ""
 
 #: ../menu-data/blobandconquer:blobAndConquer.desktop.in.h:1
@@ -1632,15 +1681,15 @@
 msgstr ""
 
 #: ../menu-data/blobby:blobby.desktop.in.h:2
-msgid "Volley-Ball Game"
+msgid "Volleyball Game"
 msgstr ""
 
 #: ../menu-data/bloboats:bloboats.desktop.in.h:1
-msgid "An arcade-like boat racing game"
+msgid "Bloboats"
 msgstr ""
 
 #: ../menu-data/bloboats:bloboats.desktop.in.h:2
-msgid "Bloboats"
+msgid "An arcade-like boat racing game"
 msgstr ""
 
 #: ../menu-data/blobwars:blobwars.desktop.in.h:1
@@ -1676,11 +1725,11 @@
 msgstr ""
 
 #: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:1
-msgid "A KDE Blogging Client"
+msgid "Blogilo"
 msgstr ""
 
 #: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:2
-msgid "Blogilo"
+msgid "A KDE Blogging Client"
 msgstr ""
 
 #: ../menu-data/bluefish:bluefish.desktop.in.h:1
@@ -1692,22 +1741,22 @@
 msgstr ""
 
 #: ../menu-data/blueman:blueman-manager.desktop.in.h:1
-msgid "Blueman Bluetooth Manager"
+msgid "Bluetooth Manager"
 msgstr ""
 
 #: ../menu-data/blueman:blueman-manager.desktop.in.h:2
-msgid "Bluetooth Manager"
+msgid "Blueman Bluetooth Manager"
 msgstr ""
 
 #: ../menu-data/bluemindo:Bluemindo.desktop.in.h:1
+msgid "Bluemindo"
+msgstr "Bluemindo"
+
+#: ../menu-data/bluemindo:Bluemindo.desktop.in.h:2
 msgid ""
 "A really simple but powerful audio player in Python/PyGTK, using Gstreamer."
 msgstr ""
 
-#: ../menu-data/bluemindo:Bluemindo.desktop.in.h:2
-msgid "Bluemindo"
-msgstr "Bluemindo"
-
 #: ../menu-data/blueproximity:blueproximity.desktop.in.h:1
 msgid "BlueProximity"
 msgstr ""
@@ -1725,11 +1774,11 @@
 msgstr ""
 
 #: ../menu-data/bmon:bmon.desktop.in.h:1
-msgid "Bandwidth monitor"
+msgid "bmon"
 msgstr ""
 
 #: ../menu-data/bmon:bmon.desktop.in.h:2
-msgid "bmon"
+msgid "Bandwidth monitor"
 msgstr ""
 
 #: ../menu-data/boa-constructor:boa-constructor.desktop.in.h:1
@@ -1756,12 +1805,20 @@
 msgid "Configure or monitor a BOINC core client"
 msgstr ""
 
+#: ../menu-data/bokken:bokken.desktop.in.h:1
+msgid "Bokken"
+msgstr ""
+
+#: ../menu-data/bokken:bokken.desktop.in.h:2
+msgid "Reverse engineering suite"
+msgstr ""
+
 #: ../menu-data/bomber:kde4__bomber.desktop.in.h:1
-msgid "Arcade Bombing Game"
+msgid "Bomber"
 msgstr ""
 
 #: ../menu-data/bomber:kde4__bomber.desktop.in.h:2
-msgid "Bomber"
+msgid "Arcade Bombing Game"
 msgstr ""
 
 #: ../menu-data/bomberclone:bomberclone.desktop.in.h:1
@@ -1781,11 +1838,11 @@
 msgstr ""
 
 #: ../menu-data/boswars:boswars.desktop.in.h:1
-msgid "Battle for survival"
+msgid "Bos Wars"
 msgstr ""
 
 #: ../menu-data/boswars:boswars.desktop.in.h:2
-msgid "Bos Wars"
+msgid "Battle for survival"
 msgstr ""
 
 #: ../menu-data/bouml:bouml.desktop.in.h:1
@@ -1813,35 +1870,39 @@
 msgstr ""
 
 #: ../menu-data/bpython:bpython.desktop.in.h:1
-msgid "A fancy interface to the python interpreter!"
+msgid "bpython"
 msgstr ""
 
 #: ../menu-data/bpython:bpython.desktop.in.h:2
-msgid "bpython"
+msgid "A fancy interface to the python interpreter!"
+msgstr ""
+
+#: ../menu-data/braindump:kde4__braindump.desktop.in.h:1
+msgid "Braindump"
 msgstr ""
 
 #: ../menu-data/brasero:brasero.desktop.in.h:1
-msgid "Brasero Disc Burner"
+msgid "Create and copy CDs and DVDs"
 msgstr ""
 
 #: ../menu-data/brasero:brasero.desktop.in.h:2
-msgid "Create and copy CDs and DVDs"
+msgid "Brasero Disc Burner"
 msgstr ""
 
 #: ../menu-data/brewtarget:brewtarget.desktop.in.h:1
-msgid "Beer calculator"
+msgid "Brewtarget"
 msgstr ""
 
 #: ../menu-data/brewtarget:brewtarget.desktop.in.h:2
-msgid "Brewtarget"
+msgid "Beer calculator"
 msgstr ""
 
 #: ../menu-data/briquolo:briquolo.desktop.in.h:1
-msgid "An OpenGL breakout"
+msgid "Briquolo"
 msgstr ""
 
 #: ../menu-data/briquolo:briquolo.desktop.in.h:2
-msgid "Briquolo"
+msgid "An OpenGL breakout"
 msgstr ""
 
 #: ../menu-data/brp-pacu:brp-pacu.desktop.in.h:1
@@ -1861,19 +1922,19 @@
 msgstr ""
 
 #: ../menu-data/bsnes:bsnes.desktop.in.h:1
-msgid "SNES emulator"
+msgid "bsnes"
 msgstr ""
 
 #: ../menu-data/bsnes:bsnes.desktop.in.h:2
-msgid "bsnes"
+msgid "SNES emulator"
 msgstr ""
 
 #: ../menu-data/bsnes:snespurify.desktop.in.h:1
-msgid "Tool for resolving problems with SNES ROMs"
+msgid "snespurify"
 msgstr ""
 
 #: ../menu-data/bsnes:snespurify.desktop.in.h:2
-msgid "snespurify"
+msgid "Tool for resolving problems with SNES ROMs"
 msgstr ""
 
 #: ../menu-data/btanks:btanks.desktop.in.h:1
@@ -1884,24 +1945,12 @@
 msgid "fast 2D tank arcade game with multiplayer and split-screen modes"
 msgstr ""
 
-#: ../menu-data/btnx-config:btnx-config.desktop.in.h:1
-msgid "btnx"
-msgstr ""
-
 #: ../menu-data/bubbros:bubbros.desktop.in.h:1
-msgid "Kill evil enemies by catching them into bubbles and smashing those"
-msgstr ""
-
-#: ../menu-data/bubbros:bubbros.desktop.in.h:2
 msgid "The Bub's Brothers"
 msgstr ""
 
-#: ../menu-data/bug-buddy:bug-buddy.desktop.in.h:1
-msgid "Bug Report Tool"
-msgstr ""
-
-#: ../menu-data/bug-buddy:bug-buddy.desktop.in.h:2
-msgid "Report a bug in GNOME-based applications"
+#: ../menu-data/bubbros:bubbros.desktop.in.h:2
+msgid "Kill evil enemies by catching them into bubbles and smashing those"
 msgstr ""
 
 #: ../menu-data/bugsquish:bugsquish.desktop.in.h:1
@@ -1929,11 +1978,11 @@
 msgstr ""
 
 #: ../menu-data/burgerspace:burgerspace.desktop.in.h:1
-msgid "A hamburger-smashing video game"
+msgid "BurgerSpace"
 msgstr ""
 
 #: ../menu-data/burgerspace:burgerspace.desktop.in.h:2
-msgid "BurgerSpace"
+msgid "A hamburger-smashing video game"
 msgstr ""
 
 #: ../menu-data/buxon:buxon.desktop.in.h:1
@@ -1953,19 +2002,19 @@
 msgstr ""
 
 #: ../menu-data/bygfoot:bygfoot.desktop.in.h:1
-msgid " A soccer manager game"
+msgid "bygfoot"
 msgstr ""
 
 #: ../menu-data/bygfoot:bygfoot.desktop.in.h:2
-msgid "bygfoot"
+msgid " A soccer manager game"
 msgstr ""
 
 #: ../menu-data/byobu:byobu.desktop.in.h:1
-msgid "Advanced Command Line and Text Window Manager"
+msgid "Byobu Terminal"
 msgstr ""
 
 #: ../menu-data/byobu:byobu.desktop.in.h:2
-msgid "Byobu Terminal"
+msgid "Advanced Command Line and Text Window Manager"
 msgstr ""
 
 #: ../menu-data/bzflag-data:bzflag.desktop.in.h:1
@@ -1985,11 +2034,11 @@
 msgstr ""
 
 #: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:1
-msgid "Apply Bazaar Bundle"
+msgid "Bazaar"
 msgstr ""
 
 #: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:2
-msgid "Bazaar"
+msgid "Apply Bazaar Bundle"
 msgstr ""
 
 #: ../menu-data/cadabra:cadabra.desktop.in.h:1
@@ -2025,11 +2074,72 @@
 msgstr ""
 
 #: ../menu-data/calibre:calibre.desktop.in.h:1
-msgid "E-book library management"
+msgid "calibre"
 msgstr ""
 
 #: ../menu-data/calibre:calibre.desktop.in.h:2
-msgid "calibre"
+msgid "E-book library management"
+msgstr ""
+
+#: ../menu-data/calligra-data:kde4__calligra.desktop.in.h:1
+msgid "Calligra"
+msgstr ""
+
+#: ../menu-data/calligraactive:calligraactive.desktop.in.h:1
+msgid "Calligra Active"
+msgstr ""
+
+#: ../menu-data/calligraflow:kde4__flow.desktop.in.h:1
+msgid "Calligra Flow"
+msgstr ""
+
+#: ../menu-data/calligraflow:kde4__flow.desktop.in.h:2
+msgid "Flowchart & Diagram Editing"
+msgstr ""
+
+#: ../menu-data/calligramobile:hildon__calligramobile.desktop.in.h:1
+msgid "Calligra Mobile"
+msgstr ""
+
+#: ../menu-data/calligraplan:kde4__plan.desktop.in.h:1
+msgid "Plan"
+msgstr ""
+
+#: ../menu-data/calligraplan:kde4__plan.desktop.in.h:2
+#: ../menu-data/calligraplan:kde4__planwork.desktop.in.h:2
+#: ../menu-data/kplato:kde4__kplato.desktop.in.h:2
+#: ../menu-data/planner:planner.desktop.in.h:1
+msgid "Project Management"
+msgstr ""
+
+#: ../menu-data/calligraplan:kde4__planwork.desktop.in.h:1
+msgid "Plan WorkPackage Handler"
+msgstr ""
+
+#: ../menu-data/calligrastage:kde4__stage.desktop.in.h:1
+msgid "Calligra Stage"
+msgstr ""
+
+#: ../menu-data/calligrastage:kde4__stage.desktop.in.h:2
+#: ../menu-data/kpresenter:kde4__kpresenter.desktop.in.h:2
+msgid "Write presentation documents"
+msgstr ""
+
+#: ../menu-data/calligratables:kde4__tables.desktop.in.h:1
+msgid "Calligra Tables"
+msgstr ""
+
+#: ../menu-data/calligratables:kde4__tables.desktop.in.h:2
+#: ../menu-data/kspread:kde4__kspread.desktop.in.h:2
+msgid "Write spreadsheet documents"
+msgstr ""
+
+#: ../menu-data/calligrawords:kde4__words.desktop.in.h:1
+msgid "Calligra Words"
+msgstr ""
+
+#: ../menu-data/calligrawords:kde4__words.desktop.in.h:2
+msgid "Write documents"
 msgstr ""
 
 #: ../menu-data/cameleon:cameleon.desktop.in.h:1
@@ -2061,11 +2171,11 @@
 msgstr ""
 
 #: ../menu-data/canorus:canorus.desktop.in.h:1
-msgid "A free next-generation cross-platform music score editor!"
+msgid "Canorus"
 msgstr ""
 
 #: ../menu-data/canorus:canorus.desktop.in.h:2
-msgid "Canorus"
+msgid "A free next-generation cross-platform music score editor!"
 msgstr ""
 
 #: ../menu-data/cantor:kde4__cantor.desktop.in.h:1
@@ -2077,11 +2187,11 @@
 msgstr ""
 
 #: ../menu-data/caret:caret.desktop.in.h:1
-msgid "Caret"
+msgid "Cortical Surface Reconstruction and Visualization"
 msgstr ""
 
 #: ../menu-data/caret:caret.desktop.in.h:2
-msgid "Cortical Surface Reconstruction and Visualization"
+msgid "Caret"
 msgstr ""
 
 #: ../menu-data/caribou:caribou.desktop.in.h:1
@@ -2101,11 +2211,11 @@
 msgstr ""
 
 #: ../menu-data/catdoc:wordview.desktop.in.h:1
-msgid "Microsoft doc document file viewer"
+msgid "Wordview Microsoft doc Viewer"
 msgstr ""
 
 #: ../menu-data/catdoc:wordview.desktop.in.h:2
-msgid "Wordview Microsoft doc Viewer"
+msgid "Microsoft doc document file viewer"
 msgstr ""
 
 #: ../menu-data/catfish:catfish.desktop.in.h:1
@@ -2125,12 +2235,12 @@
 msgstr ""
 
 #: ../menu-data/cbrpager:cbrpager.desktop.in.h:1
-#: ../menu-data/comix:comix.desktop.in.h:1
-msgid "A viewer for comic book archives"
+msgid "Cbrpager"
 msgstr ""
 
 #: ../menu-data/cbrpager:cbrpager.desktop.in.h:2
-msgid "Cbrpager"
+#: ../menu-data/comix:comix.desktop.in.h:2
+msgid "A viewer for comic book archives"
 msgstr ""
 
 #: ../menu-data/cdcat:cdcat.desktop.in.h:1
@@ -2199,13 +2309,13 @@
 msgstr ""
 
 #: ../menu-data/charmap.app:Charmap.desktop.in.h:1
-msgid "Character map for GNUstep"
-msgstr ""
-
-#: ../menu-data/charmap.app:Charmap.desktop.in.h:2
 msgid "Charmap"
 msgstr "Charmap"
 
+#: ../menu-data/charmap.app:Charmap.desktop.in.h:2
+msgid "Character map for GNUstep"
+msgstr ""
+
 #: ../menu-data/checkbox-gtk:checkbox-gtk.desktop.in.h:1
 msgid "System Testing"
 msgstr ""
@@ -2219,7 +2329,7 @@
 msgstr ""
 
 #: ../menu-data/checkgmail:checkgmail.desktop.in.h:2
-#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:2
+#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:1
 msgid "Gmail Notifier"
 msgstr ""
 
@@ -2239,6 +2349,14 @@
 msgid "Draw and make calculations on chemical structures"
 msgstr ""
 
+#: ../menu-data/cherrytree:cherrytree.desktop.in.h:1
+msgid "CherryTree"
+msgstr ""
+
+#: ../menu-data/cherrytree:cherrytree.desktop.in.h:2
+msgid "Hierarchical Note Taking"
+msgstr ""
+
 #: ../menu-data/childsplay:childsplay.desktop.in.h:1
 msgid "Childsplay"
 msgstr ""
@@ -2286,7 +2404,7 @@
 msgstr ""
 
 #: ../menu-data/choqok:kde4__choqok.desktop.in.h:2
-msgid "KDE Micro-blogging Client"
+msgid "Micro-blogging Client"
 msgstr ""
 
 #: ../menu-data/chromium-bsu:chromium-bsu.desktop.in.h:1
@@ -2306,24 +2424,24 @@
 msgstr ""
 
 #: ../menu-data/clam-chordata:Chordata.desktop.in.h:1
-msgid "Analize chords (Chordata)"
+msgid "CLAM Chordata"
 msgstr ""
 
 #: ../menu-data/clam-chordata:Chordata.desktop.in.h:2
-msgid "CLAM Chordata"
+msgid "MP3/OGG/Wav songs chord analyser"
 msgstr ""
 
 #: ../menu-data/clam-chordata:Chordata.desktop.in.h:3
-msgid "MP3/OGG/Wav songs chord analyser"
+msgid "Analize chords (Chordata)"
 msgstr ""
 
 #: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:1
-msgid ""
-"An audio tool to build processing networks by connecting functional boxes"
+msgid "CLAM Network Editor"
 msgstr ""
 
 #: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:2
-msgid "CLAM Network Editor"
+msgid ""
+"An audio tool to build processing networks by connecting functional boxes"
 msgstr ""
 
 #: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:3
@@ -2335,11 +2453,11 @@
 msgstr ""
 
 #: ../menu-data/clam-networkeditor:Prototyper.desktop.in.h:2
-msgid "Run with Prototyper"
+msgid "Runs an audio processing core under a QT designer interface"
 msgstr ""
 
 #: ../menu-data/clam-networkeditor:Prototyper.desktop.in.h:3
-msgid "Runs an audio processing core under a QT designer interface"
+msgid "Run with Prototyper"
 msgstr ""
 
 #: ../menu-data/clamtk:clamtk.desktop.in.h:1
@@ -2379,7 +2497,7 @@
 msgstr ""
 
 #: ../menu-data/clipit:clipit.desktop.in.h:2
-#: ../menu-data/parcellite:parcellite.desktop.in.h:1
+#: ../menu-data/parcellite:parcellite.desktop.in.h:2
 msgid "Clipboard Manager"
 msgstr ""
 
@@ -2410,12 +2528,12 @@
 msgstr ""
 
 #: ../menu-data/code-aster-gui:code-aster-gui.desktop.in.h:1
-#: ../menu-data/eficas:eficas.desktop.in.h:2
-msgid "Graphical command editor for Code_Aster."
+msgid "code-aster-gui"
 msgstr ""
 
 #: ../menu-data/code-aster-gui:code-aster-gui.desktop.in.h:2
-msgid "code-aster-gui"
+#: ../menu-data/eficas:eficas.desktop.in.h:2
+msgid "Graphical command editor for Code_Aster."
 msgstr ""
 
 #: ../menu-data/codeblocks:codeblocks.desktop.in.h:1
@@ -2439,25 +2557,21 @@
 msgstr ""
 
 #: ../menu-data/colorcode:colorcode.desktop.in.h:1
-msgid "Advanced clone of the MasterMind code-breaking game"
+msgid "ColorCode"
 msgstr ""
 
 #: ../menu-data/colorcode:colorcode.desktop.in.h:2
-msgid "ColorCode"
+msgid "Advanced clone of the MasterMind code-breaking game"
 msgstr ""
 
 #: ../menu-data/colorname:colorname.desktop.in.h:1
 msgid "colorname"
 msgstr ""
 
-#: ../menu-data/comix:comix.desktop.in.h:2
+#: ../menu-data/comix:comix.desktop.in.h:1
 msgid "Comix"
 msgstr ""
 
-#: ../menu-data/compiz-core:compiz.desktop.in.h:1
-msgid "Compiz"
-msgstr ""
-
 #: ../menu-data/compizconfig-settings-manager:ccsm.desktop.in.h:1
 msgid "CompizConfig Settings Manager"
 msgstr ""
@@ -2466,20 +2580,20 @@
 msgid "Configure Compiz with CompizConfig"
 msgstr ""
 
-#: ../menu-data/composite-data:composite.desktop.in.h:1
+#: ../menu-data/composite:composite.desktop.in.h:1
 msgid "Composite"
 msgstr ""
 
-#: ../menu-data/composite-data:composite.desktop.in.h:2
-msgid "Live performance sequencer, sampler, looper"
+#: ../menu-data/composite:composite.desktop.in.h:2
+msgid "Live performance sequencer"
 msgstr ""
 
 #: ../menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop.in.h:1
-msgid "Clean up a system so it's more like a freshly installed one"
+msgid "Computer Janitor"
 msgstr ""
 
 #: ../menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop.in.h:2
-msgid "Computer Janitor"
+msgid "Clean up a system so it's more like a freshly installed one"
 msgstr ""
 
 #: ../menu-data/conduit:conduit.desktop.in.h:1
@@ -2523,13 +2637,14 @@
 msgstr ""
 
 #: ../menu-data/contacts:contacts.desktop.in.h:1
-msgid "Address book"
+#: ../menu-data/gnome-contacts:gnome-contacts.desktop.in.h:1
+#: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1
+#: ../menu-data/thunderbird:thunderbird.desktop.in.h:4
+msgid "Contacts"
 msgstr ""
 
 #: ../menu-data/contacts:contacts.desktop.in.h:2
-#: ../menu-data/gnome-contacts:gnome-contacts.desktop.in.h:1
-#: ../menu-data/thunderbird:thunderbird.desktop.in.h:2
-msgid "Contacts"
+msgid "Address book"
 msgstr ""
 
 #: ../menu-data/controlaula:controlaula.desktop.in.h:1
@@ -2541,11 +2656,11 @@
 msgstr ""
 
 #: ../menu-data/convertall:convertall.desktop.in.h:1
-msgid "Convert between many different units"
+msgid "ConvertAll"
 msgstr ""
 
 #: ../menu-data/convertall:convertall.desktop.in.h:2
-msgid "ConvertAll"
+msgid "Convert between many different units"
 msgstr ""
 
 #: ../menu-data/coqide:coqide.desktop.in.h:1
@@ -2565,19 +2680,19 @@
 msgstr ""
 
 #: ../menu-data/cowbell:cowbell.desktop.in.h:1
-msgid "An elegant music organizer"
+msgid "Cowbell Music Organizer"
 msgstr ""
 
 #: ../menu-data/cowbell:cowbell.desktop.in.h:2
-msgid "Cowbell Music Organizer"
+msgid "An elegant music organizer"
 msgstr ""
 
 #: ../menu-data/cqrlog:cqrlog.desktop.in.h:1
-msgid "Advanced logging program for hamradio operators"
+msgid "CQRLOG"
 msgstr ""
 
 #: ../menu-data/cqrlog:cqrlog.desktop.in.h:2
-msgid "CQRLOG"
+msgid "Advanced logging program for hamradio operators"
 msgstr ""
 
 #: ../menu-data/crack-attack:crack-attack.desktop.in.h:1
@@ -2609,11 +2724,11 @@
 msgstr ""
 
 #: ../menu-data/crossfire-client:crossfire-client.desktop.in.h:1
-msgid "Client for Crossfire, a multiplayer graphical RPG and adventure game"
+msgid "Crossfire GTK Client V2"
 msgstr ""
 
 #: ../menu-data/crossfire-client:crossfire-client.desktop.in.h:2
-msgid "Crossfire GTK Client V2"
+msgid "Client for Crossfire, a multiplayer graphical RPG and adventure game"
 msgstr ""
 
 #: ../menu-data/cryptkeeper:cryptkeeper.desktop.in.h:1
@@ -2621,19 +2736,19 @@
 msgstr ""
 
 #: ../menu-data/csmash:csmash.desktop.in.h:1
-msgid "3D tabletennis game"
+msgid "Cannon Smash"
 msgstr ""
 
 #: ../menu-data/csmash:csmash.desktop.in.h:2
-msgid "Cannon Smash"
+msgid "3D tabletennis game"
 msgstr ""
 
 #: ../menu-data/cssed:cssed.desktop.in.h:1
-msgid "Css and Web Development Editor"
+msgid "Cssed Editor"
 msgstr ""
 
 #: ../menu-data/cssed:cssed.desktop.in.h:2
-msgid "Cssed Editor"
+msgid "Css and Web Development Editor"
 msgstr ""
 
 #: ../menu-data/ctsim:ctsim.desktop.in.h:1
@@ -2668,12 +2783,16 @@
 msgid "Serial Terminal"
 msgstr ""
 
+#: ../menu-data/cycle:cycle.desktop.in.h:1
+msgid "Cycle"
+msgstr ""
+
 #: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:1
-msgid "A free and romantic music player"
+msgid "Cynthiune"
 msgstr ""
 
 #: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:2
-msgid "Cynthiune"
+msgid "A free and romantic music player"
 msgstr ""
 
 #: ../menu-data/cytadela:cytadela.desktop.in.h:1
@@ -2709,11 +2828,11 @@
 msgstr ""
 
 #: ../menu-data/daemonfs:daemonfs.desktop.in.h:1
-msgid "DaemonFS"
+msgid "Real time monitoring software"
 msgstr ""
 
 #: ../menu-data/daemonfs:daemonfs.desktop.in.h:2
-msgid "Real time monitoring software"
+msgid "DaemonFS"
 msgstr ""
 
 #: ../menu-data/daisy-player:daisy-player.desktop.in.h:1
@@ -2733,11 +2852,11 @@
 msgstr ""
 
 #: ../menu-data/darktable:darktable.desktop.in.h:1
-msgid "Darktable Photo Workflow Software"
+msgid "Organize and develop images from digital cameras"
 msgstr ""
 
 #: ../menu-data/darktable:darktable.desktop.in.h:2
-msgid "Organize and develop images from digital cameras"
+msgid "Darktable Photo Workflow Software"
 msgstr ""
 
 #: ../menu-data/dasher:dasher.desktop.in.h:1
@@ -2759,20 +2878,20 @@
 msgstr ""
 
 #: ../menu-data/dc-qt:dc-qt.desktop.in.h:1
-msgid "GUI for Direct Connect Protocol"
+msgid "dc-qt"
 msgstr ""
 
 #: ../menu-data/dc-qt:dc-qt.desktop.in.h:2
-msgid "dc-qt"
+msgid "GUI for Direct Connect Protocol"
 msgstr ""
 
 #: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:1
-#: ../menu-data/gconf-editor:gconf-editor.desktop.in.h:2
-msgid "Directly edit your entire configuration database"
+msgid "dconf Editor"
 msgstr ""
 
 #: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:2
-msgid "dconf Editor"
+#: ../menu-data/gconf-editor:gconf-editor.desktop.in.h:2
+msgid "Directly edit your entire configuration database"
 msgstr ""
 
 #: ../menu-data/ddd:ddd.desktop.in.h:1
@@ -2808,11 +2927,11 @@
 msgstr ""
 
 #: ../menu-data/decibel-audio-player:decibel-audio-player.desktop.in.h:1
-msgid "A simple audio player"
+msgid "Decibel Audio Player"
 msgstr ""
 
 #: ../menu-data/decibel-audio-player:decibel-audio-player.desktop.in.h:2
-msgid "Decibel Audio Player"
+msgid "A simple audio player"
 msgstr ""
 
 #: ../menu-data/defendguin:defendguin.desktop.in.h:1
@@ -2824,16 +2943,16 @@
 msgstr ""
 
 #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:1
-msgid "Back Up Now"
+#: ../menu-data/deja-dup:deja-dup.desktop.in.h:1
+msgid "Backup"
 msgstr ""
 
 #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:2
-#: ../menu-data/deja-dup:deja-dup.desktop.in.h:1
-msgid "Backup"
+msgid "Change your backup settings"
 msgstr ""
 
 #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:3
-msgid "Change your backup settings"
+msgid "Back Up Now"
 msgstr ""
 
 #: ../menu-data/dell-recovery:dell-recovery-media.desktop.in.h:1
@@ -2846,18 +2965,18 @@
 
 #: ../menu-data/deluge-gtk:deluge.desktop.in.h:2
 #: ../menu-data/qbittorrent:qBittorrent.desktop.in.h:1
-#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:1
-#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:1
+#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:2
+#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:2
 msgid "Download and share files over BitTorrent"
 msgstr ""
 
 #: ../menu-data/denemo:denemo.desktop.in.h:1
-#: ../menu-data/nted:nted.desktop.in.h:1
-msgid "Edit musical scores"
+msgid "GNU Denemo"
 msgstr ""
 
 #: ../menu-data/denemo:denemo.desktop.in.h:2
-msgid "GNU Denemo"
+#: ../menu-data/nted:nted.desktop.in.h:2
+msgid "Edit musical scores"
 msgstr ""
 
 #: ../menu-data/deskscribe:deskscribe.desktop.in.h:1
@@ -2869,11 +2988,16 @@
 msgstr ""
 
 #: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:1
-msgid "Compose email in browser"
+msgid "Desktop Webmail"
 msgstr ""
 
 #: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:2
-msgid "Desktop Webmail"
+msgid "Compose email in browser"
+msgstr ""
+
+#: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:3
+#: ../menu-data/thunderbird:thunderbird.desktop.in.h:3
+msgid "Compose New Message"
 msgstr ""
 
 #: ../menu-data/desktopcouch-tools:desktopcouch-pair.desktop.in.h:1
@@ -2885,19 +3009,19 @@
 msgstr ""
 
 #: ../menu-data/desktopnova-tray:desktopnova-tray.desktop.in.h:1
-msgid "A Tray-Icon for DesktopNova"
+msgid "DesktopNova-Tray"
 msgstr ""
 
 #: ../menu-data/desktopnova-tray:desktopnova-tray.desktop.in.h:2
-msgid "DesktopNova-Tray"
+msgid "A Tray-Icon for DesktopNova"
 msgstr ""
 
 #: ../menu-data/desktopnova:desktopnova.desktop.in.h:1
-msgid "Changes your background image automatically"
+msgid "DesktopNova"
 msgstr ""
 
 #: ../menu-data/desktopnova:desktopnova.desktop.in.h:2
-msgid "DesktopNova"
+msgid "Changes your background image automatically"
 msgstr ""
 
 #: ../menu-data/desmume:desmume.desktop.in.h:1
@@ -2909,21 +3033,21 @@
 msgstr ""
 
 #: ../menu-data/devede:devede.desktop.in.h:1
-msgid ""
-"Allows to create video CDs and DVDs, suitable to be reproduced in home DVD "
-"players"
+msgid "DeVeDe DVD/CD Video Creator"
 msgstr ""
 
 #: ../menu-data/devede:devede.desktop.in.h:2
-msgid "DeVeDe DVD/CD Video Creator"
+msgid ""
+"Allows to create video CDs and DVDs, suitable to be reproduced in home DVD "
+"players"
 msgstr ""
 
 #: ../menu-data/devhelp:devhelp.desktop.in.h:1
-msgid "Developer's Help program"
+msgid "Devhelp"
 msgstr ""
 
 #: ../menu-data/devhelp:devhelp.desktop.in.h:2
-msgid "Devhelp"
+msgid "Developer's Help program"
 msgstr ""
 
 #: ../menu-data/dff:dff.desktop.in.h:1
@@ -2942,11 +3066,11 @@
 msgid "Desktop Flickr Organizer for Gnome"
 msgstr ""
 
-#: ../menu-data/dia-common:dia-common.desktop.in.h:1
-msgid "Dia Diagram Editor"
+#: ../menu-data/dia-common:dia.desktop.in.h:1
+msgid "Dia"
 msgstr ""
 
-#: ../menu-data/dia-common:dia-common.desktop.in.h:2
+#: ../menu-data/dia-common:dia.desktop.in.h:2
 msgid "Edit your Diagrams"
 msgstr ""
 
@@ -2959,19 +3083,19 @@
 msgstr ""
 
 #: ../menu-data/dictionaryreader.app:DictionaryReader.desktop.in.h:1
-msgid "A Dict client for GNUstep"
+msgid "Dictionary Reader"
 msgstr ""
 
 #: ../menu-data/dictionaryreader.app:DictionaryReader.desktop.in.h:2
-msgid "Dictionary Reader"
+msgid "A Dict client for GNUstep"
 msgstr ""
 
 #: ../menu-data/diffpdf:diffpdf.desktop.in.h:1
-msgid "Compare two PDF files"
+msgid "DiffPDF"
 msgstr ""
 
 #: ../menu-data/diffpdf:diffpdf.desktop.in.h:2
-msgid "DiffPDF"
+msgid "Compare two PDF files"
 msgstr ""
 
 #: ../menu-data/diffuse:diffuse.desktop.in.h:1
@@ -2983,13 +3107,13 @@
 msgstr ""
 
 #: ../menu-data/digikam:kde4__digikam.desktop.in.h:1
-#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:1
-msgid ""
-"Manage your photographs like a professional with the power of open source"
+msgid "digiKam"
 msgstr ""
 
 #: ../menu-data/digikam:kde4__digikam.desktop.in.h:2
-msgid "digiKam"
+#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:2
+msgid ""
+"Manage your photographs like a professional with the power of open source"
 msgstr ""
 
 #: ../menu-data/digikam:kde4__panoramagui.desktop.in.h:1
@@ -3008,6 +3132,14 @@
 msgid "Lightweight browser"
 msgstr ""
 
+#: ../menu-data/dino:dino.desktop.in.h:1
+msgid "Dino"
+msgstr ""
+
+#: ../menu-data/dino:dino.desktop.in.h:2
+msgid "Integrated MIDI piano roll editor and sequencer engine"
+msgstr ""
+
 #: ../menu-data/djplay:djplay.desktop.in.h:1
 msgid "DJPlay"
 msgstr ""
@@ -3025,19 +3157,19 @@
 msgstr ""
 
 #: ../menu-data/djvusmooth:djvusmooth.desktop.in.h:1
-msgid "Graphical editor for DjVu"
+msgid "djvusmooth"
 msgstr ""
 
 #: ../menu-data/djvusmooth:djvusmooth.desktop.in.h:2
-msgid "djvusmooth"
+msgid "Graphical editor for DjVu"
 msgstr ""
 
 #: ../menu-data/dkopp:dkopp.desktop.in.h:1
-msgid "Full and incremental backup to DVD with verify"
+msgid "dkopp"
 msgstr ""
 
 #: ../menu-data/dkopp:dkopp.desktop.in.h:2
-msgid "dkopp"
+msgid "Full and incremental backup to DVD with verify"
 msgstr ""
 
 #: ../menu-data/dlume:dlume.desktop.in.h:1
@@ -3057,19 +3189,11 @@
 msgstr ""
 
 #: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:1
-msgid "Convert to OpenDocument"
-msgstr ""
-
-#: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:2
 msgid "docbook2odf"
 msgstr ""
 
-#: ../menu-data/dockbarx:dbx_preference.desktop.in.h:1
-msgid "DockbarX Preference"
-msgstr ""
-
-#: ../menu-data/dockbarx:dbx_preference.desktop.in.h:2
-msgid "Preference dialog for DockbarX"
+#: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:2
+msgid "Convert to OpenDocument"
 msgstr ""
 
 #: ../menu-data/docky:docky.desktop.in.h:1
@@ -3093,12 +3217,12 @@
 msgstr ""
 
 #: ../menu-data/dolphin:kde4__dolphin.desktop.in.h:2
-#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:2
-#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:2
+#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1
+#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:1
 msgid "File Manager"
 msgstr ""
 
-#: ../menu-data/dooble:dooble.desktop.in.h:2
+#: ../menu-data/dooble:dooble.desktop.in.h:1
 msgid "Dooble"
 msgstr ""
 
@@ -3139,7 +3263,7 @@
 msgstr ""
 
 #: ../menu-data/dragonplayer:kde4__dragonplayer.desktop.in.h:2
-#: ../menu-data/xine-ui:xine.desktop.in.h:1
+#: ../menu-data/xine-ui:xine.desktop.in.h:2
 msgid "Video Player"
 msgstr ""
 
@@ -3160,11 +3284,11 @@
 msgstr ""
 
 #: ../menu-data/dreampie:dreampie.desktop.in.h:1
-msgid "An interactive Python shell"
+msgid "DreamPie"
 msgstr ""
 
 #: ../menu-data/dreampie:dreampie.desktop.in.h:2
-msgid "DreamPie"
+msgid "An interactive Python shell"
 msgstr ""
 
 #: ../menu-data/drgeo:drgeo.desktop.in.h:1
@@ -3226,35 +3350,35 @@
 msgstr ""
 
 #: ../menu-data/dvd95:dvd95.desktop.in.h:1
-msgid "Convert a DVD9 into a DVD5"
+msgid "Dvd95 Converter"
 msgstr ""
 
 #: ../menu-data/dvd95:dvd95.desktop.in.h:2
-msgid "Dvd95 Converter"
+msgid "Convert a DVD9 into a DVD5"
 msgstr ""
 
 #: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:1
-msgid "Additional error protection for CD/DVD media"
+msgid "dvdisaster"
 msgstr ""
 
 #: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:2
-msgid "dvdisaster"
+msgid "Additional error protection for CD/DVD media"
 msgstr ""
 
 #: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:1
-msgid "Queue dvd::rip projects"
+msgid "dvd::rip queue"
 msgstr ""
 
 #: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:2
-msgid "dvd::rip queue"
+msgid "Queue dvd::rip projects"
 msgstr ""
 
 #: ../menu-data/dvdrip:dvdrip.desktop.in.h:1
-msgid "Rip DVDs"
+msgid "dvd::rip"
 msgstr ""
 
 #: ../menu-data/dvdrip:dvdrip.desktop.in.h:2
-msgid "dvd::rip"
+msgid "Rip DVDs"
 msgstr ""
 
 #: ../menu-data/dvdstyler-data:dvdstyler.desktop.in.h:1
@@ -3302,43 +3426,43 @@
 msgstr ""
 
 #: ../menu-data/earth3d:kde__earth3d.desktop.in.h:1
-msgid "earth3d"
+msgid "earth3d - 3D Model of the earth"
 msgstr ""
 
 #: ../menu-data/earth3d:kde__earth3d.desktop.in.h:2
-msgid "earth3d - 3D Model of the earth"
+msgid "earth3d"
 msgstr ""
 
 #: ../menu-data/easychem:easychem.desktop.in.h:1
-msgid "Create high-quality chemical formulas"
+msgid "EasyChem Chemical Structures Editor"
 msgstr ""
 
 #: ../menu-data/easychem:easychem.desktop.in.h:2
-msgid "EasyChem Chemical Structures Editor"
+msgid "Create high-quality chemical formulas"
 msgstr ""
 
 #: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:1
-msgid "A graphical GNUstep diff utility"
+msgid "EasyDiff"
 msgstr ""
 
 #: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:2
-msgid "EasyDiff"
+msgid "A graphical GNUstep diff utility"
 msgstr ""
 
 #: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:1
-msgid "A GUI for mp3gain, vorbisgain and aacgain"
+msgid "easyMP3Gain"
 msgstr ""
 
 #: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:2
-msgid "easyMP3Gain"
+msgid "A GUI for mp3gain, vorbisgain and aacgain"
 msgstr ""
 
 #: ../menu-data/easystroke:easystroke.desktop.in.h:1
-msgid "Control your desktop using mouse gestures"
+msgid "Easystroke Gesture Recognition"
 msgstr ""
 
 #: ../menu-data/easystroke:easystroke.desktop.in.h:2
-msgid "Easystroke Gesture Recognition"
+msgid "Control your desktop using mouse gestures"
 msgstr ""
 
 #: ../menu-data/easytag:easytag.desktop.in.h:1
@@ -3352,19 +3476,11 @@
 msgstr ""
 
 #: ../menu-data/eboard:eboard.desktop.in.h:1
-msgid "A graphical chessboard program"
-msgstr ""
-
-#: ../menu-data/eboard:eboard.desktop.in.h:2
 msgid "eboard"
 msgstr ""
 
-#: ../menu-data/ebook-speaker:eBook-speaker.desktop.in.h:1
-msgid "Speaking e-reader"
-msgstr ""
-
-#: ../menu-data/ebook-speaker:eBook-speaker.desktop.in.h:2
-msgid "eBook speaker"
+#: ../menu-data/eboard:eboard.desktop.in.h:2
+msgid "A graphical chessboard program"
 msgstr ""
 
 #: ../menu-data/ebumeter:ebumeter.desktop.in.h:1
@@ -3392,11 +3508,11 @@
 msgstr ""
 
 #: ../menu-data/edenmath.app:EdenMath.desktop.in.h:1
-msgid "A Scientific Calculator"
+msgid "EdenMath"
 msgstr ""
 
 #: ../menu-data/edenmath.app:EdenMath.desktop.in.h:2
-msgid "EdenMath"
+msgid "A Scientific Calculator"
 msgstr ""
 
 #: ../menu-data/edubuntu-menueditor:menueditor.desktop.in.h:1
@@ -3404,11 +3520,11 @@
 msgstr ""
 
 #: ../menu-data/eekboek-gui:ebwxshell.desktop.in.h:1
-msgid "Bookkeeping program for small to medium sized companies"
+msgid "EekBoek"
 msgstr ""
 
 #: ../menu-data/eekboek-gui:ebwxshell.desktop.in.h:2
-msgid "EekBoek"
+msgid "Bookkeeping program for small to medium sized companies"
 msgstr ""
 
 #: ../menu-data/efax-gtk:efax-gtk.desktop.in.h:1
@@ -3424,19 +3540,19 @@
 msgstr ""
 
 #: ../menu-data/efte:efte.desktop.in.h:1
-msgid "Fast, extendable programmers' text editor"
+msgid "eFTE"
 msgstr ""
 
 #: ../menu-data/efte:efte.desktop.in.h:2
-msgid "eFTE"
+msgid "Fast, extendable programmers' text editor"
 msgstr ""
 
 #: ../menu-data/egoboo:egoboo.desktop.in.h:1
-msgid "3D dungeon crawling game"
+msgid "Egoboo"
 msgstr ""
 
 #: ../menu-data/egoboo:egoboo.desktop.in.h:2
-msgid "Egoboo"
+msgid "3D dungeon crawling game"
 msgstr ""
 
 #: ../menu-data/eiciel:eiciel.desktop.in.h:1
@@ -3449,11 +3565,11 @@
 msgstr ""
 
 #: ../menu-data/einstein:einstein.desktop.in.h:1
-msgid "\"Puzzle game inspired on Einstein's puzzle\""
+msgid "Einstein"
 msgstr ""
 
 #: ../menu-data/einstein:einstein.desktop.in.h:2
-msgid "Einstein"
+msgid "\"Puzzle game inspired on Einstein's puzzle\""
 msgstr ""
 
 #: ../menu-data/eiskaltdcpp-gtk:eiskaltdcpp-gtk.desktop.in.h:1
@@ -3478,21 +3594,29 @@
 msgstr ""
 
 #: ../menu-data/electric:electric.desktop.in.h:1
-msgid "Electrical CAD System"
+msgid "electric"
 msgstr ""
 
 #: ../menu-data/electric:electric.desktop.in.h:2
-msgid "electric"
+msgid "Electrical CAD System"
 msgstr ""
 
 #: ../menu-data/elinks-lite:elinks.desktop.in.h:1
 #: ../menu-data/elinks:elinks.desktop.in.h:1
-msgid "Browse the web in text mode"
+msgid "ELinks Web Browser"
 msgstr ""
 
 #: ../menu-data/elinks-lite:elinks.desktop.in.h:2
 #: ../menu-data/elinks:elinks.desktop.in.h:2
-msgid "ELinks Web Browser"
+msgid "Browse the web in text mode"
+msgstr ""
+
+#: ../menu-data/elki:elki.desktop.in.h:1
+msgid "ELKI"
+msgstr ""
+
+#: ../menu-data/elki:elki.desktop.in.h:2
+msgid "Data mining algorithm development framework"
 msgstr ""
 
 #: ../menu-data/elmer:ElmerGUI.desktop.in.h:1
@@ -3528,43 +3652,43 @@
 msgstr ""
 
 #: ../menu-data/emelfm2:emelfm2.desktop.in.h:1
-msgid "2-pane Gtk+2 file manager"
+msgid "emelFM2"
 msgstr ""
 
 #: ../menu-data/emelfm2:emelfm2.desktop.in.h:2
-msgid "emelFM2"
+msgid "2-pane Gtk+2 file manager"
 msgstr ""
 
 #: ../menu-data/emerillon:emerillon.desktop.in.h:1
-msgid "Browse maps"
+msgid "Emerillon Map Viewer"
 msgstr ""
 
 #: ../menu-data/emerillon:emerillon.desktop.in.h:2
-msgid "Emerillon Map Viewer"
+msgid "Browse maps"
 msgstr ""
 
 #: ../menu-data/emesene:emesene.desktop.in.h:1
-msgid "Instant messaging client for MSN, Gtalk and Facebook"
+msgid "emesene"
 msgstr ""
 
 #: ../menu-data/emesene:emesene.desktop.in.h:2
-msgid "emesene"
+msgid "Instant messaging client for MSN, Gtalk and Facebook"
 msgstr ""
 
 #: ../menu-data/emma:emma.desktop.in.h:1
-msgid "MySQL managing assistant"
+msgid "emma"
 msgstr ""
 
 #: ../menu-data/emma:emma.desktop.in.h:2
-msgid "emma"
+msgid "MySQL managing assistant"
 msgstr ""
 
 #: ../menu-data/empathy:empathy.desktop.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgid "Empathy Internet Messaging"
 msgstr ""
 
 #: ../menu-data/empathy:empathy.desktop.in.h:2
-msgid "Empathy Internet Messaging"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr ""
 
 #: ../menu-data/empcommand:empcommand.desktop.in.h:1
@@ -3610,11 +3734,11 @@
 msgstr ""
 
 #: ../menu-data/enna:enna.desktop.in.h:1
-msgid "EFL Multimedia Center"
+msgid "Enna"
 msgstr ""
 
 #: ../menu-data/enna:enna.desktop.in.h:2
-msgid "Enna"
+msgid "EFL Multimedia Center"
 msgstr ""
 
 #: ../menu-data/entagged:entagged.desktop.in.h:1
@@ -3626,12 +3750,12 @@
 msgstr ""
 
 #: ../menu-data/eog:eog.desktop.in.h:1
-msgid "Browse and rotate images"
+#: ../menu-data/gpicview:gpicview.desktop.in.h:1
+msgid "Image Viewer"
 msgstr ""
 
 #: ../menu-data/eog:eog.desktop.in.h:2
-#: ../menu-data/gpicview:gpicview.desktop.in.h:1
-msgid "Image Viewer"
+msgid "Browse and rotate images"
 msgstr ""
 
 #: ../menu-data/epdfview:epdfview.desktop.in.h:1
@@ -3643,30 +3767,30 @@
 msgstr ""
 
 #: ../menu-data/epigrass:epigrass.desktop.in.h:1
-msgid "Epidemics Simulator"
+msgid "Epigrass"
 msgstr ""
 
 #: ../menu-data/epigrass:epigrass.desktop.in.h:2
-msgid "Epigrass"
+msgid "Epidemics Simulator"
 msgstr ""
 
 #: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:1
-#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:1
-msgid "Browse the web"
+msgid "Epiphany Web Browser"
 msgstr ""
 
 #: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:2
-msgid "Epiphany Web Browser"
+#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:2
+msgid "Browse the web"
 msgstr ""
 
 #: ../menu-data/epiphany:epiphany-game.desktop.in.h:1
-msgid ""
-"Collect valuable minerals, while avoiding being hit by a falling boulder or "
-"a bomb"
+msgid "Epiphany"
 msgstr ""
 
 #: ../menu-data/epiphany:epiphany-game.desktop.in.h:2
-msgid "Epiphany"
+msgid ""
+"Collect valuable minerals, while avoiding being hit by a falling boulder or "
+"a bomb"
 msgstr ""
 
 #: ../menu-data/epoptes:epoptes.desktop.in.h:1
@@ -3694,11 +3818,11 @@
 msgstr ""
 
 #: ../menu-data/espeak-gui:espeak-gui.desktop.in.h:1
-msgid "Let the computer read out text for you"
+msgid "eSpeak speech synthesizer"
 msgstr ""
 
 #: ../menu-data/espeak-gui:espeak-gui.desktop.in.h:2
-msgid "eSpeak speech synthesizer"
+msgid "Let the computer read out text for you"
 msgstr ""
 
 #: ../menu-data/esperanza:esperanza.desktop.in.h:1
@@ -3710,14 +3834,6 @@
 "XMMS2 client which aims to be as feature-full and easy-to-use as possible"
 msgstr ""
 
-#: ../menu-data/esteidutil:esteidutil.desktop.in.h:1
-msgid "EstEID smartcard management tool"
-msgstr ""
-
-#: ../menu-data/esteidutil:esteidutil.desktop.in.h:2
-msgid "esteidutil"
-msgstr ""
-
 #: ../menu-data/etherape:etherape.desktop.in.h:1
 msgid "EtherApe"
 msgstr ""
@@ -3727,50 +3843,51 @@
 msgstr ""
 
 #: ../menu-data/etoys:etoys.desktop.in.h:1
-msgid " A media-rich model, simulation construction kit and authoring tool"
+msgid "eToys"
 msgstr ""
 
 #: ../menu-data/etoys:etoys.desktop.in.h:2
-msgid "eToys"
+msgid " A media-rich model, simulation construction kit and authoring tool"
 msgstr ""
 
 #: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:1
-msgid "Multipurpose sniffer/interceptor/logger"
+msgid "ettercap"
 msgstr ""
 
 #: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:2
-msgid "ettercap"
+msgid "Multipurpose sniffer/interceptor/logger"
 msgstr ""
 
 #: ../menu-data/etw:etw.desktop.in.h:1
-msgid "Arcade Soccer Game"
+msgid "Eat The Whistle"
 msgstr ""
 
 #: ../menu-data/etw:etw.desktop.in.h:2
-msgid "Eat The Whistle"
+msgid "Arcade Soccer Game"
 msgstr ""
 
 #: ../menu-data/euler:euler.desktop.in.h:1
-msgid "An interactive mathematical program"
+msgid "Euler"
 msgstr ""
 
 #: ../menu-data/euler:euler.desktop.in.h:2
-msgid "Euler"
+msgid "An interactive mathematical program"
 msgstr ""
 
 #: ../menu-data/evilvte:evilvte.desktop.in.h:1
-#: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:1
-msgid "Terminal Emulator"
+msgid "evilvte"
 msgstr ""
 
 #: ../menu-data/evilvte:evilvte.desktop.in.h:2
-msgid "evilvte"
+#: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:1
+msgid "Terminal Emulator"
 msgstr ""
 
 #: ../menu-data/evince-common:evince.desktop.in.h:1
-#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:1
-#: ../menu-data/okular:kde4__okular.desktop.in.h:1
-#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:1
+#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:2
+#: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:2
+#: ../menu-data/okular:kde4__okular.desktop.in.h:2
+#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:2
 msgid "Document Viewer"
 msgstr ""
 
@@ -3778,14 +3895,6 @@
 msgid "View multi-page documents"
 msgstr ""
 
-#: ../menu-data/evolution-rss:evolution-rss.desktop.in.h:1
-msgid "Evolution RSS"
-msgstr ""
-
-#: ../menu-data/evolution-rss:evolution-rss.desktop.in.h:2
-msgid "Evolution plugin that enables Evolution Mail to display rss feeds."
-msgstr ""
-
 #: ../menu-data/evolution:evolution.desktop.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr ""
@@ -3811,14 +3920,14 @@
 msgstr ""
 
 #: ../menu-data/exfalso:exfalso.desktop.in.h:1
-msgid "Edit tags in your audio files"
+msgid "Ex Falso"
 msgstr ""
 
 #: ../menu-data/exfalso:exfalso.desktop.in.h:2
-msgid "Ex Falso"
+msgid "Edit tags in your audio files"
 msgstr ""
 
-#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1
+#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:2
 msgid "Browse the file system"
 msgstr ""
 
@@ -3831,14 +3940,14 @@
 msgstr ""
 
 #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:2
-#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:3
+#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2
 #: ../menu-data/roxterm:roxterm.desktop.in.h:2
 #: ../menu-data/sakura:sakura.desktop.in.h:2
 msgid "Use the command line"
 msgstr ""
 
-#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:2
-#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:1
+#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:1
+#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:2
 msgid "Web Browser"
 msgstr ""
 
@@ -3851,11 +3960,11 @@
 msgstr ""
 
 #: ../menu-data/extace:extace.desktop.in.h:1
-msgid "Audio Waveform Monitor"
+msgid "Extace Waveform Display"
 msgstr ""
 
 #: ../menu-data/extace:extace.desktop.in.h:2
-msgid "Extace Waveform Display"
+msgid "Audio Waveform Monitor"
 msgstr ""
 
 #: ../menu-data/extcalc:extcalc.desktop.in.h:1
@@ -3894,20 +4003,12 @@
 msgid "No name"
 msgstr ""
 
-#: ../menu-data/fastdnaml:fastdnaml.desktop.in.h:1
-msgid "Tool for construction of phylogenetic trees of DNA sequences"
-msgstr ""
-
-#: ../menu-data/fastdnaml:fastdnaml.desktop.in.h:2
-msgid "fastDNAml"
-msgstr ""
-
 #: ../menu-data/fatrat:fatrat.desktop.in.h:1
-msgid "FatRat"
+msgid "Qt-based download/upload manager"
 msgstr ""
 
 #: ../menu-data/fatrat:fatrat.desktop.in.h:2
-msgid "Qt-based download/upload manager"
+msgid "FatRat"
 msgstr ""
 
 #: ../menu-data/faumachine:faum.desktop.in.h:1
@@ -3952,27 +4053,27 @@
 msgstr ""
 
 #: ../menu-data/fcitx-data:fcitx.desktop.in.h:1
-msgid "Chinese Input Method"
+msgid "Fcitx"
 msgstr ""
 
 #: ../menu-data/fcitx-data:fcitx.desktop.in.h:2
-msgid "Fcitx"
+msgid "Chinese Input Method"
 msgstr ""
 
 #: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:1
-msgid "Chinese Input Method (Use Kimpanel)"
+msgid "Fcitx Kimpanel"
 msgstr ""
 
 #: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:2
-msgid "Fcitx Kimpanel"
+msgid "Chinese Input Method (Use Kimpanel)"
 msgstr ""
 
 #: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:1
-msgid "Chinese Input Method (Use Light weight UI)"
+msgid "Fcitx Light UI"
 msgstr ""
 
 #: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:2
-msgid "Fcitx Light UI"
+msgid "Chinese Input Method (Use Light weight UI)"
 msgstr ""
 
 #: ../menu-data/feh:feh.desktop.in.h:1
@@ -3980,40 +4081,40 @@
 msgstr ""
 
 #: ../menu-data/feh:feh.desktop.in.h:2
-#: ../menu-data/preview.app:Preview.desktop.in.h:1
+#: ../menu-data/preview.app:Preview.desktop.in.h:2
 msgid "Image viewer"
 msgstr ""
 
 #: ../menu-data/felix-latin:felix.desktop.in.h:1
-msgid "Gaffiot's dictionary is a reference book"
+msgid "Latin-French dictionary"
 msgstr ""
 
 #: ../menu-data/felix-latin:felix.desktop.in.h:2
-msgid "Latin-French dictionary"
+msgid "Gaffiot's dictionary is a reference book"
 msgstr ""
 
 #: ../menu-data/ferret:ferret.desktop.in.h:1
-msgid "Design E-R databases"
+msgid "ferret"
 msgstr ""
 
 #: ../menu-data/ferret:ferret.desktop.in.h:2
-msgid "ferret"
+msgid "Design E-R databases"
 msgstr ""
 
 #: ../menu-data/fet:fet.desktop.in.h:1
-msgid "Generate timetables for educational institutions"
+msgid "Timetable Generator"
 msgstr ""
 
 #: ../menu-data/fet:fet.desktop.in.h:2
-msgid "Timetable Generator"
+msgid "Generate timetables for educational institutions"
 msgstr ""
 
 #: ../menu-data/ffado-mixer-qt4:ffado.org-ffadomixer.desktop.in.h:1
-msgid "Audio mixer for Firewire devices"
+msgid "FFADO Mixer"
 msgstr ""
 
 #: ../menu-data/ffado-mixer-qt4:ffado.org-ffadomixer.desktop.in.h:2
-msgid "FFADO Mixer"
+msgid "Audio mixer for Firewire devices"
 msgstr ""
 
 #: ../menu-data/fgo:fgo.desktop.in.h:1
@@ -4049,11 +4150,11 @@
 msgstr ""
 
 #: ../menu-data/filezilla:filezilla.desktop.in.h:1
-msgid "Download and upload files via FTP, FTPS and SFTP"
+msgid "FileZilla"
 msgstr ""
 
 #: ../menu-data/filezilla:filezilla.desktop.in.h:2
-msgid "FileZilla"
+msgid "Download and upload files via FTP, FTPS and SFTP"
 msgstr ""
 
 #: ../menu-data/filler:filler.desktop.in.h:1
@@ -4080,7 +4181,7 @@
 msgid "Record and edit multitrack audio"
 msgstr ""
 
-#: ../menu-data/firefox:firefox.desktop.in.h:2
+#: ../menu-data/firefox:firefox.desktop.in.h:1
 msgid "Firefox Web Browser"
 msgstr ""
 
@@ -4089,52 +4190,60 @@
 msgstr ""
 
 #: ../menu-data/firestarter:firestarter.desktop.in.h:1
-msgid "Desktop Firewall Tool"
+msgid "Firestarter"
 msgstr ""
 
 #: ../menu-data/firestarter:firestarter.desktop.in.h:2
-msgid "Firestarter"
+msgid "Desktop Firewall Tool"
 msgstr ""
 
 #: ../menu-data/fityk:fityk.desktop.in.h:1
-msgid "Peak fitting and data analysis"
+msgid "fityk"
 msgstr ""
 
 #: ../menu-data/fityk:fityk.desktop.in.h:2
-msgid "fityk"
+msgid "Peak fitting and data analysis"
 msgstr ""
 
 #: ../menu-data/flamerobin:flamerobin.desktop.in.h:1
-msgid "Administration Tool for Firebird DBMS"
+msgid "FlameRobin"
 msgstr ""
 
 #: ../menu-data/flamerobin:flamerobin.desktop.in.h:2
-msgid "FlameRobin"
+msgid "Administration Tool for Firebird DBMS"
+msgstr ""
+
+#: ../menu-data/flare:flare.desktop.in.h:1
+msgid "Flare"
+msgstr ""
+
+#: ../menu-data/flare:flare.desktop.in.h:2
+msgid "A single player, 2D-isometric, action Role-Playing Game"
 msgstr ""
 
 #: ../menu-data/fldiff:fldiff.desktop.in.h:1
-msgid "A graphical diff program"
+msgid "fldiff"
 msgstr ""
 
 #: ../menu-data/fldiff:fldiff.desktop.in.h:2
-msgid "fldiff"
+msgid "A graphical diff program"
 msgstr ""
 
 #: ../menu-data/fldigi:flarq.desktop.in.h:1
-msgid "Amateur Radio Data Transfer with ARQ"
+msgid "Flarq"
 msgstr ""
 
 #: ../menu-data/fldigi:flarq.desktop.in.h:2
-msgid "Flarq"
+msgid "Amateur Radio Data Transfer with ARQ"
 msgstr ""
 
 #: ../menu-data/fldigi:fldigi.desktop.in.h:1
-#: ../menu-data/linpsk:linpsk.desktop.in.h:1
-msgid "Amateur Radio Sound Card Communications"
+msgid "Fldigi"
 msgstr ""
 
 #: ../menu-data/fldigi:fldigi.desktop.in.h:2
-msgid "Fldigi"
+#: ../menu-data/linpsk:linpsk.desktop.in.h:2
+msgid "Amateur Radio Sound Card Communications"
 msgstr ""
 
 #: ../menu-data/flegita:flegita.desktop.in.h:1
@@ -4146,66 +4255,66 @@
 msgstr ""
 
 #: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:1
+msgid "Flight of the Amazon Queen"
+msgstr ""
+
+#: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:2
 msgid ""
 "Embark on a quest to rescue a kidnapped princess and in the process, "
 "discover the true sinister intentions of a suspiciously located Lederhosen "
 "company"
 msgstr ""
 
-#: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:2
-msgid "Flight of the Amazon Queen"
-msgstr ""
-
 #: ../menu-data/flightgear:flightgear.desktop.in.h:1
-msgid "A flight simulator"
+msgid "FlightGear"
 msgstr ""
 
 #: ../menu-data/flightgear:flightgear.desktop.in.h:2
-msgid "FlightGear"
+msgid "A flight simulator"
 msgstr ""
 
 #: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:1
-msgid "A tetris-like game"
+msgid "FloboPuyo"
 msgstr ""
 
 #: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:2
-msgid "FloboPuyo"
+msgid "A tetris-like game"
 msgstr ""
 
 #: ../menu-data/flphoto:flphoto.desktop.in.h:1
-msgid "FLTK Photo Software"
+msgid "flPhoto"
 msgstr ""
 
 #: ../menu-data/flphoto:flphoto.desktop.in.h:2
-msgid "flPhoto"
+msgid "FLTK Photo Software"
 msgstr ""
 
 #: ../menu-data/flpsed:flpsed.desktop.in.h:1
-msgid "Add text and annotations to PDF and PostScript documents"
+msgid "flpsed PDF Annotator"
 msgstr ""
 
 #: ../menu-data/flpsed:flpsed.desktop.in.h:2
-msgid "flpsed PDF Annotator"
+msgid "Add text and annotations to PDF and PostScript documents"
 msgstr ""
 
 #: ../menu-data/fltk1.1-games:flblocks.desktop.in.h:1
 #: ../menu-data/fltk1.3-games:flblocks.desktop.in.h:1
-msgid "Block Attack! Game"
+msgid "FLTK Block Attack!"
 msgstr ""
 
 #: ../menu-data/fltk1.1-games:flblocks.desktop.in.h:2
 #: ../menu-data/fltk1.3-games:flblocks.desktop.in.h:2
-msgid "FLTK Block Attack!"
+msgid "Block Attack! Game"
 msgstr ""
 
 #: ../menu-data/fltk1.1-games:flcheckers.desktop.in.h:1
 #: ../menu-data/fltk1.3-games:flcheckers.desktop.in.h:1
-msgid "Checkers Game"
+msgid "FLTK Checkers"
 msgstr ""
 
 #: ../menu-data/fltk1.1-games:flcheckers.desktop.in.h:2
 #: ../menu-data/fltk1.3-games:flcheckers.desktop.in.h:2
-msgid "FLTK Checkers"
+msgid "Checkers Game"
 msgstr ""
 
 #: ../menu-data/fltk1.1-games:flsudoku.desktop.in.h:1
@@ -4219,11 +4328,11 @@
 msgstr ""
 
 #: ../menu-data/fluid:fluid.desktop.in.h:1
-msgid "FLTK GUI Designer"
+msgid "FLUID"
 msgstr ""
 
 #: ../menu-data/fluid:fluid.desktop.in.h:2
-msgid "FLUID"
+msgid "FLTK GUI Designer"
 msgstr ""
 
 #: ../menu-data/flumotion:flumotion-admin.desktop.in.h:1
@@ -4235,19 +4344,19 @@
 msgstr ""
 
 #: ../menu-data/flush:flush.desktop.in.h:1
-msgid "Downloading files by BitTorrent protocol"
+msgid "Flush"
 msgstr ""
 
 #: ../menu-data/flush:flush.desktop.in.h:2
-msgid "Flush"
+msgid "Downloading files by BitTorrent protocol"
 msgstr ""
 
 #: ../menu-data/fmit:fmit.desktop.in.h:1
-msgid "Music instrument tuner"
+msgid "FMIT"
 msgstr ""
 
 #: ../menu-data/fmit:fmit.desktop.in.h:2
-msgid "fmit"
+msgid "Tune musical instruments"
 msgstr ""
 
 #: ../menu-data/focuswriter:focuswriter.desktop.in.h:1
@@ -4271,27 +4380,27 @@
 msgstr ""
 
 #: ../menu-data/font-manager:font-sampler.desktop.in.h:1
-msgid "Create a PDF sample sheet from a directory of fonts"
+msgid "Font Sampler"
 msgstr ""
 
 #: ../menu-data/font-manager:font-sampler.desktop.in.h:2
-msgid "Font Sampler"
+msgid "Create a PDF sample sheet from a directory of fonts"
 msgstr ""
 
 #: ../menu-data/fontforge:fontforge.desktop.in.h:1
-msgid "An outline font editor"
+msgid "FontForge"
 msgstr ""
 
 #: ../menu-data/fontforge:fontforge.desktop.in.h:2
-msgid "FontForge"
+msgid "An outline font editor"
 msgstr ""
 
 #: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:1
-msgid "A font manager"
+msgid "Fontmatrix"
 msgstr ""
 
 #: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:2
-msgid "Fontmatrix"
+msgid "A font manager"
 msgstr ""
 
 #: ../menu-data/fontypython:fontypython.desktop.in.h:1
@@ -4311,19 +4420,19 @@
 msgstr ""
 
 #: ../menu-data/foobillard:foobillard.desktop.in.h:1
-msgid "3D billiards game using OpenGL"
+msgid "Foobillard"
 msgstr ""
 
 #: ../menu-data/foobillard:foobillard.desktop.in.h:2
-msgid "Foobillard"
+msgid "3D billiards game using OpenGL"
 msgstr ""
 
 #: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:1
-msgid "Foomatic-GUI printer configuration tool"
+msgid "Printers"
 msgstr ""
 
 #: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:2
-msgid "Printers"
+msgid "Foomatic-GUI printer configuration tool"
 msgstr ""
 
 #: ../menu-data/fotowall:fotowall.desktop.in.h:1
@@ -4334,20 +4443,20 @@
 msgid "Photo collection creativity tool"
 msgstr ""
 
-#: ../menu-data/fotoxx:fotoxx.desktop.in.h:1
-msgid "Digital Photo Editor"
+#: ../menu-data/fotoxx:kornelix-fotoxx.desktop.in.h:1
+msgid "fotoxx"
 msgstr ""
 
-#: ../menu-data/fotoxx:fotoxx.desktop.in.h:2
-msgid "fotoxx"
+#: ../menu-data/fotoxx:kornelix-fotoxx.desktop.in.h:2
+msgid "Edit photos and manage collections"
 msgstr ""
 
 #: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:1
-msgid "Display map and GPS position"
+msgid "FoxtrotGPS"
 msgstr ""
 
 #: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:2
-msgid "FoxtrotGPS"
+msgid "Display map and GPS position"
 msgstr ""
 
 #: ../menu-data/fpm2:fpm2.desktop.in.h:1
@@ -4355,24 +4464,25 @@
 msgstr ""
 
 #: ../menu-data/fpm2:fpm2.desktop.in.h:2
+#: ../menu-data/kedpm-gtk:kedpm-gtk.desktop.in.h:2
 msgid "Manage passwords"
 msgstr ""
 
 #: ../menu-data/fprint-demo:fprint-demo.desktop.in.h:1
-msgid "Fingerprint scanning demonstration"
+msgid "fprint-demo"
 msgstr ""
 
 #: ../menu-data/fprint-demo:fprint-demo.desktop.in.h:2
-msgid "fprint-demo"
+msgid "Fingerprint scanning demonstration"
 msgstr ""
 
 #: ../menu-data/fqterm:fqterm.desktop.in.h:1
-#: ../menu-data/qterm:qterm.desktop.in.h:1
-msgid "BBS client based on Qt library in linux"
+msgid "FQTerm"
 msgstr ""
 
 #: ../menu-data/fqterm:fqterm.desktop.in.h:2
-msgid "FQTerm"
+#: ../menu-data/qterm:qterm.desktop.in.h:2
+msgid "BBS client based on Qt library in linux"
 msgstr ""
 
 #: ../menu-data/fracplanet:fracplanet.desktop.in.h:1
@@ -4400,27 +4510,35 @@
 msgstr ""
 
 #: ../menu-data/freealchemist:freealchemist.desktop.in.h:1
-msgid "A simpler figure block game"
+msgid "FreeAlchemist"
 msgstr ""
 
 #: ../menu-data/freealchemist:freealchemist.desktop.in.h:2
-msgid "FreeAlchemist"
+msgid "A simpler figure block game"
 msgstr ""
 
 #: ../menu-data/freebirth:freebirth.desktop.in.h:1
-msgid "Bass synthesizer/sample player/sequencer"
+msgid "Freebirth"
 msgstr ""
 
 #: ../menu-data/freebirth:freebirth.desktop.in.h:2
-msgid "Freebirth"
+msgid "Bass synthesizer/sample player/sequencer"
 msgstr ""
 
 #: ../menu-data/freecad:freecad.desktop.in.h:1
-msgid "Feature based Parametric Modeler"
+msgid "FreeCAD"
 msgstr ""
 
 #: ../menu-data/freecad:freecad.desktop.in.h:2
-msgid "FreeCAD"
+msgid "Feature based Parametric Modeler"
+msgstr ""
+
+#: ../menu-data/freeciv-client-extras:freeciv-modpack.desktop.in.h:1
+msgid "Freeciv modpack installer"
+msgstr ""
+
+#: ../menu-data/freeciv-client-extras:freeciv-modpack.desktop.in.h:2
+msgid "Download and install add-ons for Freeciv"
 msgstr ""
 
 #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:1
@@ -4428,10 +4546,15 @@
 msgstr ""
 
 #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:2
+#: ../menu-data/freeciv-server:freeciv-server.desktop.in.h:2
 msgid ""
 "Turn-based strategy game inspired by the history of human civilization"
 msgstr ""
 
+#: ../menu-data/freeciv-server:freeciv-server.desktop.in.h:1
+msgid "Freeciv server"
+msgstr ""
+
 #: ../menu-data/freecol:freecol.desktop.in.h:1
 msgid "FreeCol"
 msgstr ""
@@ -4461,24 +4584,24 @@
 msgstr ""
 
 #: ../menu-data/freedm:freedm.desktop.in.h:1
-#: ../menu-data/freedoom:freedoom.desktop.in.h:1
-msgid "First Person Shooter Game"
+msgid "Free DM"
 msgstr ""
 
 #: ../menu-data/freedm:freedm.desktop.in.h:2
-msgid "Free DM"
+#: ../menu-data/freedoom:freedoom.desktop.in.h:2
+msgid "First Person Shooter Game"
 msgstr ""
 
-#: ../menu-data/freedoom:freedoom.desktop.in.h:2
+#: ../menu-data/freedoom:freedoom.desktop.in.h:1
 msgid "Freedoom"
 msgstr ""
 
 #: ../menu-data/freedroid:freedroid.desktop.in.h:1
-msgid "Clear a spaceship from all droids"
+msgid "Freedroid"
 msgstr ""
 
 #: ../menu-data/freedroid:freedroid.desktop.in.h:2
-msgid "Freedroid"
+msgid "Clear a spaceship from all droids"
 msgstr ""
 
 #: ../menu-data/freedroidrpg:freedroidrpg.desktop.in.h:1
@@ -4490,78 +4613,78 @@
 msgstr ""
 
 #: ../menu-data/freegish:freegish.desktop.in.h:1
-msgid "A physics based arcade game"
+msgid "FreeGish"
 msgstr ""
 
 #: ../menu-data/freegish:freegish.desktop.in.h:2
-msgid "FreeGish"
+msgid "A physics based arcade game"
 msgstr ""
 
 #: ../menu-data/freeguide:freeguide.desktop.in.h:1
-msgid "Download a TV guide from the Internet and view it"
+msgid "FreeGuide"
 msgstr ""
 
 #: ../menu-data/freeguide:freeguide.desktop.in.h:2
-msgid "FreeGuide"
+msgid "Download a TV guide from the Internet and view it"
 msgstr ""
 
 #: ../menu-data/freemat:freemat.desktop.in.h:1
-msgid "FreeMat"
-msgstr ""
-
-#: ../menu-data/freemat:freemat.desktop.in.h:2
 msgid ""
 "a free environment for rapid engineering and scientific prototyping and data "
 "processing."
 msgstr ""
 
+#: ../menu-data/freemat:freemat.desktop.in.h:2
+msgid "FreeMat"
+msgstr ""
+
 #: ../menu-data/freemind:freemind.desktop.in.h:1
-msgid "A free mind mapping tool"
+msgid "FreeMind"
 msgstr ""
 
 #: ../menu-data/freemind:freemind.desktop.in.h:2
-msgid "FreeMind"
+msgid "A free mind mapping tool"
 msgstr ""
 
 #: ../menu-data/freemix:freemix.desktop.in.h:1
-msgid "Live video performance tool"
+msgid "freemix"
 msgstr ""
 
 #: ../menu-data/freemix:freemix.desktop.in.h:2
-msgid "freemix"
+msgid "Live video performance tool"
 msgstr ""
 
 #: ../menu-data/freeplane:freeplane.desktop.in.h:1
-msgid ""
-"A free tool to structure and organise your information with mind mapping"
+msgid "Freeplane"
 msgstr ""
 
 #: ../menu-data/freeplane:freeplane.desktop.in.h:2
-msgid "Freeplane"
+msgid ""
+"A free tool to structure and organise your information with mind mapping"
 msgstr ""
 
 #: ../menu-data/freepops-updater-gnome:freepops-updater-gnome.desktop.in.h:1
-msgid "Download updated version of FreePOPs plugins"
+msgid "FreePOPs updater"
 msgstr ""
 
 #: ../menu-data/freepops-updater-gnome:freepops-updater-gnome.desktop.in.h:2
-msgid "FreePOPs updater"
+msgid "Download updated version of FreePOPs plugins"
 msgstr ""
 
 #: ../menu-data/freespeak:freespeak.desktop.in.h:1
-msgid "A free frontend to online translator engines"
+msgid "FreeSpeak"
 msgstr ""
 
 #: ../menu-data/freespeak:freespeak.desktop.in.h:2
-msgid "FreeSpeak"
+msgid "A free frontend to online translator engines"
 msgstr ""
 
 #: ../menu-data/freetennis:freetennis.desktop.in.h:1
-msgid "Free Tennis - a free tennis simulation"
+msgid "FreeTennis"
 msgstr ""
 
 #: ../menu-data/freetennis:freetennis.desktop.in.h:2
-msgid "FreeTennis"
+msgid "Free Tennis - a free tennis simulation"
 msgstr ""
 
 #: ../menu-data/freevial:freevial.desktop.in.h:1
@@ -4577,7 +4700,7 @@
 msgstr ""
 
 #: ../menu-data/freevo:freevo.desktop.in.h:2
-msgid "Playing various multimedia formats, like pictures, audio or video. "
+msgid "Playing various multimedia formats, like pictures, audio or video"
 msgstr ""
 
 #: ../menu-data/freewheeling:freewheeling.desktop.in.h:1
@@ -4596,12 +4719,12 @@
 msgid "Realtime audio processor based on frequency spectral manipulation"
 msgstr ""
 
-#: ../menu-data/frescobaldi:kde4__frescobaldi.desktop.in.h:1
-msgid "Frescobaldi"
+#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:1
+msgid "LilyPond Music Editor"
 msgstr ""
 
-#: ../menu-data/frescobaldi:kde4__frescobaldi.desktop.in.h:2
-msgid "LilyPond Music Editor"
+#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:2
+msgid "Frescobaldi"
 msgstr ""
 
 #: ../menu-data/fretsonfire-game:fretsonfire-game.desktop.in.h:1
@@ -4646,11 +4769,11 @@
 msgstr ""
 
 #: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:1
-msgid "FSL 4.1"
+msgid "Software Collection for (f)MRI Data Analysis"
 msgstr ""
 
 #: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:2
-msgid "Software Collection for (f)MRI Data Analysis"
+msgid "FSL 4.1"
 msgstr ""
 
 #: ../menu-data/fslint:fslint.desktop.in.h:1
@@ -4721,6 +4844,14 @@
 msgid "Render Peter de Jong maps"
 msgstr ""
 
+#: ../menu-data/g2ipmsg:g2ipmsg.desktop.in.h:1
+msgid "GNOME2 IP Messenger"
+msgstr ""
+
+#: ../menu-data/g2ipmsg:g2ipmsg.desktop.in.h:2
+msgid "IP Messenger for the GNOME2"
+msgstr ""
+
 #: ../menu-data/g3data:g3data.desktop.in.h:1
 msgid "G3Data Graph Analyzer"
 msgstr ""
@@ -4730,11 +4861,11 @@
 msgstr ""
 
 #: ../menu-data/g3dviewer:g3dviewer.desktop.in.h:1
-msgid "3D model viewer"
+msgid "G3DViewer"
 msgstr ""
 
 #: ../menu-data/g3dviewer:g3dviewer.desktop.in.h:2
-msgid "G3DViewer"
+msgid "3D model viewer"
 msgstr ""
 
 #: ../menu-data/gabedit:gabedit.desktop.in.h:1
@@ -4746,11 +4877,11 @@
 msgstr ""
 
 #: ../menu-data/gadmin-bind:gadmin-bind.desktop.in.h:1
-msgid "BIND DNS server administration"
+msgid "GADMIN-BIND"
 msgstr ""
 
 #: ../menu-data/gadmin-bind:gadmin-bind.desktop.in.h:2
-msgid "GADMIN-BIND"
+msgid "BIND DNS server administration"
 msgstr ""
 
 #: ../menu-data/gadmin-openvpn-client:gadmin-openvpn-client.desktop.in.h:1
@@ -4790,19 +4921,19 @@
 msgstr ""
 
 #: ../menu-data/gaiksaurus:gaiksaurus.desktop.in.h:1
-msgid "Find Synonyms and Homonyms"
+msgid "GTK Aiksaurus"
 msgstr ""
 
 #: ../menu-data/gaiksaurus:gaiksaurus.desktop.in.h:2
-msgid "GTK Aiksaurus"
+msgid "Find Synonyms and Homonyms"
 msgstr ""
 
 #: ../menu-data/gajim:gajim.desktop.in.h:1
-msgid "A GTK+ Jabber client"
+msgid "Gajim Instant Messenger"
 msgstr ""
 
 #: ../menu-data/gajim:gajim.desktop.in.h:2
-msgid "Gajim Instant Messenger"
+msgid "A GTK+ Jabber client"
 msgstr ""
 
 #: ../menu-data/galan:galan.desktop.in.h:1
@@ -4818,11 +4949,11 @@
 msgstr ""
 
 #: ../menu-data/gallery-uploader:gallery-uploader.desktop.in.h:1
-msgid "Gallery Uploader"
+msgid "Upload pictures and videos to Gallery"
 msgstr ""
 
 #: ../menu-data/gallery-uploader:gallery-uploader.desktop.in.h:2
-msgid "Upload pictures and videos to Gallery"
+msgid "Gallery Uploader"
 msgstr ""
 
 #: ../menu-data/gally:kde4__gally.desktop.in.h:1
@@ -4850,43 +4981,43 @@
 msgstr ""
 
 #: ../menu-data/gambas2-ide:gambas2.desktop.in.h:1
-msgid "Gambas Almost Means Basic"
+msgid "Gambas2"
 msgstr ""
 
 #: ../menu-data/gambas2-ide:gambas2.desktop.in.h:2
-msgid "Gambas2"
+msgid "Gambas Almost Means Basic"
 msgstr ""
 
 #: ../menu-data/gameconqueror:GameConqueror.desktop.in.h:1
-msgid "A game hacking tool. A GUI front-end for scanmem."
+msgid "Game Conqueror"
 msgstr ""
 
 #: ../menu-data/gameconqueror:GameConqueror.desktop.in.h:2
-msgid "Game Conqueror"
+msgid "A game hacking tool. A GUI front-end for scanmem."
 msgstr ""
 
 #: ../menu-data/gamgi:gamgi.desktop.in.h:1
-msgid "Construct, view and analyse atomic structures"
+msgid "gamgi"
 msgstr ""
 
 #: ../menu-data/gamgi:gamgi.desktop.in.h:2
-msgid "gamgi"
+msgid "Construct, view and analyse atomic structures"
 msgstr ""
 
 #: ../menu-data/gamt:gamt.desktop.in.h:1
-msgid "Intel AMT serial-over-lan client."
+msgid "gamt"
 msgstr ""
 
 #: ../menu-data/gamt:gamt.desktop.in.h:2
-msgid "gamt"
+msgid "Intel AMT serial-over-lan client."
 msgstr ""
 
 #: ../menu-data/ganyremote:ganyremote.desktop.in.h:1
-msgid "Bluetooth remote control"
+msgid "ganyremote"
 msgstr ""
 
 #: ../menu-data/ganyremote:ganyremote.desktop.in.h:2
-msgid "ganyremote"
+msgid "Bluetooth remote control"
 msgstr ""
 
 #: ../menu-data/gaphor:gaphor.desktop.in.h:1
@@ -4898,11 +5029,11 @@
 msgstr ""
 
 #: ../menu-data/garden-of-coloured-lights:garden.desktop.in.h:1
-msgid "Abstract vertical shooter with music elements"
+msgid "Garden of Coloured Lights"
 msgstr ""
 
 #: ../menu-data/garden-of-coloured-lights:garden.desktop.in.h:2
-msgid "Garden of Coloured Lights"
+msgid "Abstract vertical shooter with music elements"
 msgstr ""
 
 #: ../menu-data/gargoyle-free:gargoyle.desktop.in.h:1
@@ -4931,11 +5062,11 @@
 msgstr ""
 
 #: ../menu-data/gatos:gatos-conf.desktop.in.h:1
-msgid "Gatos Configuration Editor"
+msgid "gatos-conf"
 msgstr ""
 
 #: ../menu-data/gatos:gatos-conf.desktop.in.h:2
-msgid "gatos-conf"
+msgid "Gatos Configuration Editor"
 msgstr ""
 
 #: ../menu-data/gatos:xatitv.desktop.in.h:1
@@ -4971,27 +5102,27 @@
 msgstr ""
 
 #: ../menu-data/gbemol:gbemol.desktop.in.h:1
-msgid "MPD client"
+msgid "gbemol"
 msgstr ""
 
 #: ../menu-data/gbemol:gbemol.desktop.in.h:2
-msgid "gbemol"
+msgid "MPD client"
 msgstr ""
 
 #: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:1
-msgid "GTK2 Bulgarian-English Dictionary"
+msgid "GbgOffice"
 msgstr ""
 
 #: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:2
-msgid "GbgOffice"
+msgid "GTK2 Bulgarian-English Dictionary"
 msgstr ""
 
 #: ../menu-data/gbirthday:gbirthday.desktop.in.h:1
-msgid "Birthday reminder for E-Mail contacts"
+msgid "GBirthday"
 msgstr ""
 
 #: ../menu-data/gbirthday:gbirthday.desktop.in.h:2
-msgid "GBirthday"
+msgid "Birthday reminder for E-Mail contacts"
 msgstr ""
 
 #: ../menu-data/gbonds:gbonds.desktop.in.h:1
@@ -5003,13 +5134,13 @@
 msgstr ""
 
 #: ../menu-data/gbrainy:gbrainy.desktop.in.h:1
-msgid ""
-"Play games that challenge your logic, verbal, calculation and memory "
-"abilities"
+msgid "gbrainy"
 msgstr ""
 
 #: ../menu-data/gbrainy:gbrainy.desktop.in.h:2
-msgid "gbrainy"
+msgid ""
+"Play games that challenge your logic, verbal, calculation and memory "
+"abilities"
 msgstr ""
 
 #: ../menu-data/gcalctool:gcalctool.desktop.in.h:1
@@ -5021,35 +5152,27 @@
 msgstr ""
 
 #: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:1
-msgid "Edit chemical 2D structures"
-msgstr ""
-
-#: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:2
 msgid "GChemPaint Chemical Structures Editor"
 msgstr ""
 
-#: ../menu-data/gcin:gcin-setup.desktop.in.h:1
-msgid "Setup utility for gcin input method"
-msgstr ""
-
-#: ../menu-data/gcin:gcin-setup.desktop.in.h:2
-msgid "gcin Setup"
+#: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:2
+msgid "Edit chemical 2D structures"
 msgstr ""
 
 #: ../menu-data/gcipher:gcipher.desktop.in.h:1
-msgid "A simple encryption tool"
+msgid "GCipher"
 msgstr ""
 
 #: ../menu-data/gcipher:gcipher.desktop.in.h:2
-msgid "GCipher"
+msgid "A simple encryption tool"
 msgstr ""
 
 #: ../menu-data/gco:gco.desktop.in.h:1
-msgid "A GNOME interface for managing your comic book collection"
+msgid "GNOME Comics Organizer"
 msgstr ""
 
 #: ../menu-data/gco:gco.desktop.in.h:2
-msgid "GNOME Comics Organizer"
+msgid "A GNOME interface for managing your comic book collection"
 msgstr ""
 
 #: ../menu-data/gcolor2:gcolor2.desktop.in.h:1
@@ -5061,19 +5184,19 @@
 msgstr ""
 
 #: ../menu-data/gcompris:gcompris.desktop.in.h:1
-msgid "Educational game for ages 2 to 10"
+msgid "Educational suite GCompris"
 msgstr ""
 
 #: ../menu-data/gcompris:gcompris.desktop.in.h:2
-msgid "Educational suite GCompris"
+msgid "Educational game for ages 2 to 10"
 msgstr ""
 
 #: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:1
-msgid "A Cleaning tool for GConf"
+msgid "GConf Cleaner"
 msgstr ""
 
 #: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:2
-msgid "GConf Cleaner"
+msgid "A Cleaning tool for GConf"
 msgstr ""
 
 #: ../menu-data/gconf-editor:gconf-editor.desktop.in.h:1
@@ -5081,19 +5204,19 @@
 msgstr ""
 
 #: ../menu-data/gconjugue:gconjugue.desktop.in.h:1
-msgid "Conjugates Portuguese verbs"
+msgid "GConjugue"
 msgstr ""
 
 #: ../menu-data/gconjugue:gconjugue.desktop.in.h:2
-msgid "GConjugue"
+msgid "Conjugates Portuguese verbs"
 msgstr ""
 
 #: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:1
-msgid "Edit and display crystalline structures"
+msgid "Gnome Crystal Crystalline Structures Viewer"
 msgstr ""
 
 #: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:2
-msgid "Gnome Crystal Crystalline Structures Viewer"
+msgid "Edit and display crystalline structures"
 msgstr ""
 
 #: ../menu-data/gcstar:gcstar.desktop.in.h:1
@@ -5105,35 +5228,35 @@
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:1
-msgid "Display chemical 3D structures"
+msgid "Molecules Viewer"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:2
-msgid "Molecules Viewer"
+msgid "Display chemical 3D structures"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:1
-msgid "A simple calculator for chemistry"
+msgid "Chemical calculator"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:2
-msgid "Chemical calculator"
+msgid "A simple calculator for chemistry"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:1
-msgid "A Mendeleiev table of the chemical elements"
+msgid "Periodic table of the elements"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:2
-msgid "Periodic table of the elements"
+msgid "A Mendeleiev table of the chemical elements"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:1
-msgid "A spectrum viewer for the GNOME desktop"
+msgid "Spectrum viewer"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:2
-msgid "Spectrum viewer"
+msgid "A spectrum viewer for the GNOME desktop"
 msgstr ""
 
 #: ../menu-data/gcursor:gcursor.desktop.in.h:1
@@ -5159,7 +5282,7 @@
 
 #: ../menu-data/gdebi-kde:kde4__gdebi-kde.desktop.in.h:2
 #: ../menu-data/gdebi:gdebi.desktop.in.h:2
-#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:1
+#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:2
 msgid "Install and view software packages"
 msgstr ""
 
@@ -5172,19 +5295,19 @@
 msgstr ""
 
 #: ../menu-data/gdesklets:gdesklets.desktop.in.h:1
-msgid "A desktop applet system for GNOME"
+msgid "gDesklets"
 msgstr ""
 
 #: ../menu-data/gdesklets:gdesklets.desktop.in.h:2
-msgid "gDesklets"
+msgid "A desktop applet system for GNOME"
 msgstr ""
 
 #: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:1
-msgid "GUI for devilspie matching daemon"
+msgid "gDevilspie"
 msgstr ""
 
 #: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:2
-msgid "gDevilspie"
+msgid "GUI for devilspie matching daemon"
 msgstr ""
 
 #: ../menu-data/gdigi:gdigi.desktop.in.h:1
@@ -5201,11 +5324,11 @@
 msgstr ""
 
 #: ../menu-data/gdmap:gdmap.desktop.in.h:1
-msgid "Display disk space using tree maps"
+msgid "Graphical Disk Map"
 msgstr ""
 
 #: ../menu-data/gdmap:gdmap.desktop.in.h:2
-msgid "Graphical Disk Map"
+msgid "Display disk space using tree maps"
 msgstr ""
 
 #: ../menu-data/gdpc:gdpc.desktop.in.h:1
@@ -5217,78 +5340,74 @@
 msgstr ""
 
 #: ../menu-data/geany:geany.desktop.in.h:1
-msgid "A fast and lightweight IDE using GTK2"
+msgid "Geany"
 msgstr ""
 
 #: ../menu-data/geany:geany.desktop.in.h:2
-msgid "Geany"
+msgid "A fast and lightweight IDE using GTK2"
 msgstr ""
 
 #: ../menu-data/gebabbel:gebabbel.desktop.in.h:1
-msgid "Convert GPS data and exchange it with a GPS unit"
+msgid "Gebabbel"
 msgstr ""
 
 #: ../menu-data/gebabbel:gebabbel.desktop.in.h:2
-msgid "Gebabbel"
+msgid "Convert GPS data and exchange it with a GPS unit"
 msgstr ""
 
 #: ../menu-data/gecrit:gecrit.desktop.in.h:1
-msgid "A python text editor."
+msgid "gEcrit"
 msgstr ""
 
 #: ../menu-data/gecrit:gecrit.desktop.in.h:2
-msgid "gEcrit"
+msgid "A python text editor."
 msgstr ""
 
 #: ../menu-data/geda-gattrib:geda-gattrib.desktop.in.h:1
-msgid "Manipulate component attributes with gattrib"
+msgid "gEDA Attribute Editor"
 msgstr ""
 
 #: ../menu-data/geda-gattrib:geda-gattrib.desktop.in.h:2
-msgid "gEDA Attribute Editor"
+msgid "Manipulate component attributes with gattrib"
 msgstr ""
 
 #: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
+msgid "gEDA Schematic Editor"
 msgstr ""
 
 #: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:2
-msgid "gEDA Schematic Editor"
+msgid "Create and edit electrical schematics and symbols with gschem"
 msgstr ""
 
 #: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:1
-msgid "Create and edit electronics projects with xgsch2pcb"
+msgid "gEDA Schematic -> PCB Project"
 msgstr ""
 
 #: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:2
-msgid "gEDA Schematic -> PCB Project"
+msgid "Create and edit electronics projects with xgsch2pcb"
 msgstr ""
 
 #: ../menu-data/gedit:gedit.desktop.in.h:1
-#: ../menu-data/jedit:jedit.desktop.in.h:1
-#: ../menu-data/scribes:scribes.desktop.in.h:1
-#: ../menu-data/vim-gui-common:gvim.desktop.in.h:1
+#: ../menu-data/jedit:jedit.desktop.in.h:2
+#: ../menu-data/scribes:scribes.desktop.in.h:2
+#: ../menu-data/vim-gui-common:gvim.desktop.in.h:2
 msgid "Edit text files"
 msgstr ""
 
 #: ../menu-data/gedit:gedit.desktop.in.h:2
-#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:2
+#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1
+#: ../menu-data/mined:mined.desktop.in.h:2
 msgid "Text Editor"
 msgstr ""
 
-#: ../menu-data/geeqie-gps:geeqie-gps.desktop.in.h:1
-msgid "Geeqie (GPS support)"
+#: ../menu-data/geeqie:geeqie-standard.desktop.in.h:1
+msgid "Geeqie"
 msgstr ""
 
-#: ../menu-data/geeqie-gps:geeqie-gps.desktop.in.h:2
 #: ../menu-data/geeqie:geeqie-standard.desktop.in.h:2
 msgid "View and manage images"
 msgstr ""
 
-#: ../menu-data/geeqie:geeqie-standard.desktop.in.h:1
-msgid "Geeqie"
-msgstr ""
-
 #: ../menu-data/gelemental:gelemental.desktop.in.h:1
 msgid "Periodic Table"
 msgstr ""
@@ -5318,27 +5437,27 @@
 msgstr ""
 
 #: ../menu-data/genpo:genpo.desktop.in.h:1
-msgid "GENPO is the GENeral Purpose Organ."
+msgid "Genpo"
 msgstr ""
 
 #: ../menu-data/genpo:genpo.desktop.in.h:2
-msgid "Genpo"
+msgid "GENPO is the GENeral Purpose Organ."
 msgstr ""
 
 #: ../menu-data/gentoo:gentoo.desktop.in.h:1
-msgid "Fully GUI-configurable, two-pane X file manager"
+msgid "Gentoo"
 msgstr ""
 
 #: ../menu-data/gentoo:gentoo.desktop.in.h:2
-msgid "Gentoo"
+msgid "Fully GUI-configurable, two-pane X file manager"
 msgstr ""
 
 #: ../menu-data/geogebra:geogebra.desktop.in.h:1
-msgid "Create interactive mathematical constructions and applets. "
+msgid "GeoGebra"
 msgstr ""
 
 #: ../menu-data/geogebra:geogebra.desktop.in.h:2
-msgid "GeoGebra"
+msgid "Create interactive mathematical constructions and applets. "
 msgstr ""
 
 #: ../menu-data/geomview:geomview.desktop.in.h:1
@@ -5350,19 +5469,19 @@
 msgstr ""
 
 #: ../menu-data/geotranz:geotranz.desktop.in.h:1
-msgid "Geographic coordinates translator"
+msgid "Geotranz"
 msgstr ""
 
 #: ../menu-data/geotranz:geotranz.desktop.in.h:2
-msgid "Geotranz"
+msgid "Geographic coordinates translator"
 msgstr ""
 
 #: ../menu-data/gerbv:gerbv.desktop.in.h:1
-msgid "Gerber file viewer for PCB design"
+msgid "Gerbv Gerber File Viewer"
 msgstr ""
 
 #: ../menu-data/gerbv:gerbv.desktop.in.h:2
-msgid "Gerbv Gerber File Viewer"
+msgid "Gerber file viewer for PCB design"
 msgstr ""
 
 #: ../menu-data/gerstensaft:gerstensaft.desktop.in.h:1
@@ -5370,27 +5489,27 @@
 msgstr ""
 
 #: ../menu-data/gespeaker:gespeaker.desktop.in.h:1
-msgid "A frontend for espeak"
+msgid "Gespeaker"
 msgstr ""
 
 #: ../menu-data/gespeaker:gespeaker.desktop.in.h:2
-msgid "Gespeaker"
+msgid "A frontend for espeak"
 msgstr ""
 
 #: ../menu-data/gextractwinicons:gextractwinicons.desktop.in.h:1
-msgid "Extract cursors and icons from MS Windows compatible resource files"
+msgid "gExtractWinIcons"
 msgstr ""
 
 #: ../menu-data/gextractwinicons:gextractwinicons.desktop.in.h:2
-msgid "gExtractWinIcons"
+msgid "Extract cursors and icons from MS Windows compatible resource files"
 msgstr ""
 
 #: ../menu-data/gfaim:gfaim.desktop.in.h:1
-msgid "Find any recipe you want"
+msgid "Gfaim"
 msgstr ""
 
 #: ../menu-data/gfaim:gfaim.desktop.in.h:2
-msgid "Gfaim"
+msgid "Find any recipe you want"
 msgstr ""
 
 #: ../menu-data/gfax:gfax.desktop.in.h:1
@@ -5414,11 +5533,11 @@
 msgstr ""
 
 #: ../menu-data/gftp-gtk:gftp.desktop.in.h:1
-msgid "Download and upload files using multiple file transfer protocols"
+msgid "gFTP"
 msgstr ""
 
 #: ../menu-data/gftp-gtk:gftp.desktop.in.h:2
-msgid "gFTP"
+msgid "Download and upload files using multiple file transfer protocols"
 msgstr ""
 
 #: ../menu-data/ggcov:Development__ggcov.desktop.in.h:1
@@ -5438,29 +5557,29 @@
 msgstr ""
 
 #: ../menu-data/ggz-gnome-client:ggz-gnome.desktop.in.h:1
-#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:1
-#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:1
-msgid "GGZ Core Client"
+msgid "GGZ-Gnome"
 msgstr ""
 
 #: ../menu-data/ggz-gnome-client:ggz-gnome.desktop.in.h:2
-msgid "GGZ-Gnome"
+#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:2
+#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:2
+msgid "GGZ Core Client"
 msgstr ""
 
-#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:2
+#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:1
 msgid "ggz-gtk"
 msgstr ""
 
-#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:2
+#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:1
 msgid "ggz-txt"
 msgstr ""
 
 #: ../menu-data/ghemical:ghemical.desktop.in.h:1
-msgid "Draw models of molecules"
+msgid "ghemical"
 msgstr ""
 
 #: ../menu-data/ghemical:ghemical.desktop.in.h:2
-msgid "ghemical"
+msgid "Draw models of molecules"
 msgstr ""
 
 #: ../menu-data/ghex:ghex.desktop.in.h:1
@@ -5472,11 +5591,11 @@
 msgstr ""
 
 #: ../menu-data/ghextris:ghextris.desktop.in.h:1
-msgid "Fit falling blocks together on a hexagonal grid"
+msgid "Ghextris"
 msgstr ""
 
 #: ../menu-data/ghextris:ghextris.desktop.in.h:2
-msgid "Ghextris"
+msgid "Fit falling blocks together on a hexagonal grid"
 msgstr ""
 
 #: ../menu-data/ghkl:ghkl.desktop.in.h:1
@@ -5496,11 +5615,11 @@
 msgstr ""
 
 #: ../menu-data/gigolo:gigolo.desktop.in.h:1
-msgid "A simple frontend to easily connect to remote filesystems"
+msgid "Gigolo"
 msgstr ""
 
 #: ../menu-data/gigolo:gigolo.desktop.in.h:2
-msgid "Gigolo"
+msgid "A simple frontend to easily connect to remote filesystems"
 msgstr ""
 
 #: ../menu-data/gimmix:gimmix.desktop.in.h:1
@@ -5512,11 +5631,11 @@
 msgstr ""
 
 #: ../menu-data/gimp:gimp.desktop.in.h:1
-msgid "Create images and edit photographs"
+msgid "GIMP Image Editor"
 msgstr ""
 
 #: ../menu-data/gimp:gimp.desktop.in.h:2
-msgid "GIMP Image Editor"
+msgid "Create images and edit photographs"
 msgstr ""
 
 #: ../menu-data/ginkgocadx:ginkgocadx.desktop.in.h:1
@@ -5528,11 +5647,11 @@
 msgstr ""
 
 #: ../menu-data/gip:gip.desktop.in.h:1
-msgid "Calculate IP addresses and networks"
+msgid "Gip IP Address Calculator"
 msgstr ""
 
 #: ../menu-data/gip:gip.desktop.in.h:2
-msgid "Gip IP Address Calculator"
+msgid "Calculate IP addresses and networks"
 msgstr ""
 
 #: ../menu-data/gisomount:gisomount.desktop.in.h:1
@@ -5540,35 +5659,35 @@
 msgstr ""
 
 #: ../menu-data/git-cola:cola.desktop.in.h:1
-msgid "A highly caffeinated git GUI"
+msgid "Cola Git GUI"
 msgstr ""
 
 #: ../menu-data/git-cola:cola.desktop.in.h:2
-msgid "Cola Git GUI"
+msgid "A highly caffeinated git GUI"
 msgstr ""
 
 #: ../menu-data/gitg:gitg.desktop.in.h:1
-msgid "Git repository browser"
+msgid "gitg"
 msgstr ""
 
 #: ../menu-data/gitg:gitg.desktop.in.h:2
-msgid "gitg"
+msgid "Git repository browser"
 msgstr ""
 
 #: ../menu-data/gjacktransport:gjackclock.desktop.in.h:1
-msgid "Display JACK transport timecode"
+msgid "G. JACK Clock"
 msgstr ""
 
 #: ../menu-data/gjacktransport:gjackclock.desktop.in.h:2
-msgid "G. JACK Clock"
+msgid "Display JACK transport timecode"
 msgstr ""
 
 #: ../menu-data/gjacktransport:gjacktransport.desktop.in.h:1
-msgid "Access JACK transport mechanism via a dynamic graphical slider. "
+msgid "G. JACK Transport"
 msgstr ""
 
 #: ../menu-data/gjacktransport:gjacktransport.desktop.in.h:2
-msgid "G. JACK Transport"
+msgid "Access JACK transport mechanism via a dynamic graphical slider. "
 msgstr ""
 
 #: ../menu-data/gjiten:gjiten.desktop.in.h:1
@@ -5588,19 +5707,19 @@
 msgstr ""
 
 #: ../menu-data/gkamus:gkamus.desktop.in.h:1
-msgid "English - Indonesian dictionary"
+msgid "gKamus"
 msgstr ""
 
 #: ../menu-data/gkamus:gkamus.desktop.in.h:2
-msgid "gKamus"
+msgid "English - Indonesian dictionary"
 msgstr ""
 
 #: ../menu-data/gkbd-capplet:gkbd-indicator-plugins-capplet.desktop.in.h:1
-msgid "Enable/disable installed plugins"
+msgid "Keyboard Indicator plugins"
 msgstr ""
 
 #: ../menu-data/gkbd-capplet:gkbd-indicator-plugins-capplet.desktop.in.h:2
-msgid "Keyboard Indicator plugins"
+msgid "Enable/disable installed plugins"
 msgstr ""
 
 #: ../menu-data/gkbd-capplet:gkbd-keyboard-display.desktop.in.h:1
@@ -5628,37 +5747,37 @@
 msgstr ""
 
 #: ../menu-data/gl-117:gl-117.desktop.in.h:1
-msgid "Play a flight simulator"
+msgid "gl-117"
 msgstr ""
 
 #: ../menu-data/gl-117:gl-117.desktop.in.h:2
-msgid "gl-117"
+msgid "Play a flight simulator"
 msgstr ""
 
 #: ../menu-data/glabels:glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
+msgid "gLabels Label Designer"
 msgstr ""
 
 #: ../menu-data/glabels:glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
+msgid "Create labels, business cards and media covers"
 msgstr ""
 
 #: ../menu-data/glade-gtk2:glade-3.desktop.in.h:1
 #: ../menu-data/glade:glade.desktop.in.h:1
-msgid "Create or open user interface designs for GTK+ applications"
+msgid "Glade Interface Designer"
 msgstr ""
 
 #: ../menu-data/glade-gtk2:glade-3.desktop.in.h:2
 #: ../menu-data/glade:glade.desktop.in.h:2
-msgid "Glade Interface Designer"
+msgid "Create or open user interface designs for GTK+ applications"
 msgstr ""
 
 #: ../menu-data/gladish:gladish.desktop.in.h:1
-msgid "LADI Session Handler"
+msgid "gladish"
 msgstr ""
 
 #: ../menu-data/gladish:gladish.desktop.in.h:2
-msgid "gladish"
+msgid "LADI Session Handler"
 msgstr ""
 
 #: ../menu-data/glame:Multimedia__glame.desktop.in.h:1
@@ -5677,14 +5796,6 @@
 msgid "Play the classic two-player boardgame of chess"
 msgstr ""
 
-#: ../menu-data/glest:glest.desktop.in.h:1
-msgid "Glest"
-msgstr ""
-
-#: ../menu-data/glest:glest.desktop.in.h:2
-msgid "Play a real-time strategy game with 3D graphics"
-msgstr ""
-
 #: ../menu-data/glfer:glfer.desktop.in.h:1
 msgid "glfer"
 msgstr ""
@@ -5710,59 +5821,51 @@
 msgstr ""
 
 #: ../menu-data/glob2:glob2.desktop.in.h:1
-msgid "An innovative new strategy game"
+msgid "Globulation 2"
 msgstr ""
 
 #: ../menu-data/glob2:glob2.desktop.in.h:2
-msgid "Globulation 2"
+msgid "An innovative new strategy game"
 msgstr ""
 
 #: ../menu-data/globs:globs.desktop.in.h:1
-msgid "GL Open Benchmark Suite"
+msgid "Globs"
 msgstr ""
 
 #: ../menu-data/globs:globs.desktop.in.h:2
-msgid "Globs"
+msgid "GL Open Benchmark Suite"
 msgstr ""
 
 #: ../menu-data/glogg:glogg.desktop.in.h:1
-msgid "A smart interactive log explorer."
-msgstr ""
-
-#: ../menu-data/glogg:glogg.desktop.in.h:2
 msgid "glogg"
 msgstr ""
 
-#: ../menu-data/glom:glom.desktop.in.h:1
-msgid "A user-friendly database environment."
-msgstr ""
-
-#: ../menu-data/glom:glom.desktop.in.h:2
-msgid "Glom"
+#: ../menu-data/glogg:glogg.desktop.in.h:2
+msgid "A smart interactive log explorer."
 msgstr ""
 
 #: ../menu-data/glpeces:glpeces.desktop.in.h:1
-msgid "GLPeces"
+msgid "Play with 33 tangram and more 4600 figures"
 msgstr ""
 
 #: ../menu-data/glpeces:glpeces.desktop.in.h:2
-msgid "Play with 33 tangram and more 4600 figures"
+msgid "GLPeces"
 msgstr ""
 
 #: ../menu-data/gltron:gltron.desktop.in.h:1
-msgid "Play a Tron-like light cycle game"
+msgid "glTron"
 msgstr ""
 
 #: ../menu-data/gltron:gltron.desktop.in.h:2
-msgid "glTron"
+msgid "Play a Tron-like light cycle game"
 msgstr ""
 
 #: ../menu-data/glurp:glurp.desktop.in.h:1
-msgid "A Client for the MPD daemon"
+msgid "Glurp"
 msgstr ""
 
 #: ../menu-data/glurp:glurp.desktop.in.h:2
-msgid "Glurp"
+msgid "A Client for the MPD daemon"
 msgstr ""
 
 #: ../menu-data/gmail-notify:gmail-notify.desktop.in.h:1
@@ -5782,19 +5885,19 @@
 msgstr ""
 
 #: ../menu-data/gmanedit:gmanedit.desktop.in.h:1
-msgid "GNOME Manpages Editor"
+msgid "gmanedit"
 msgstr ""
 
 #: ../menu-data/gmanedit:gmanedit.desktop.in.h:2
-msgid "gmanedit"
+msgid "GNOME Manpages Editor"
 msgstr ""
 
 #: ../menu-data/gmbox:gmbox.desktop.in.h:1
-msgid "Google Music Box"
+msgid "gmbox"
 msgstr ""
 
 #: ../menu-data/gmbox:gmbox.desktop.in.h:2
-msgid "gmbox"
+msgid "Google Music Box"
 msgstr ""
 
 #: ../menu-data/gmchess:gmchess.desktop.in.h:1
@@ -5806,19 +5909,19 @@
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-alsamixer.desktop.in.h:1
-msgid "Alsa mixer"
+msgid "Gmerlin mixer"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-alsamixer.desktop.in.h:2
-msgid "Gmerlin mixer"
+msgid "Alsa mixer"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-kbd.desktop.in.h:1
-msgid "Configure the Gmerlin keyboard daemon"
+msgid "Gmerlin KBD"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-kbd.desktop.in.h:2
-msgid "Gmerlin KBD"
+msgid "Configure the Gmerlin keyboard daemon"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-player.desktop.in.h:1
@@ -5830,27 +5933,27 @@
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-plugincfg.desktop.in.h:1
-msgid "Configure gmerlin plugins"
+msgid "Gmerlin plugin configurator"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-plugincfg.desktop.in.h:2
-msgid "Gmerlin plugin configurator"
+msgid "Configure gmerlin plugins"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-recorder.desktop.in.h:1
-msgid "Audio/video recorder"
+msgid "Gmerlin recorder"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-recorder.desktop.in.h:2
-msgid "Gmerlin recorder"
+msgid "Audio/video recorder"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-transcoder.desktop.in.h:1
-msgid "Gmerlin multimedia transcoder"
+msgid "Gmerlin transcoder"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-transcoder.desktop.in.h:2
-msgid "Gmerlin transcoder"
+msgid "Gmerlin multimedia transcoder"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-visualizer.desktop.in.h:1
@@ -5862,27 +5965,27 @@
 msgstr ""
 
 #: ../menu-data/gmfsk:gmfsk.desktop.in.h:1
-msgid "HF digital mode terminal"
+msgid "gMFSK"
 msgstr ""
 
 #: ../menu-data/gmfsk:gmfsk.desktop.in.h:2
-msgid "gMFSK"
+msgid "HF digital mode terminal"
 msgstr ""
 
 #: ../menu-data/gmidimonitor:gmidimonitor-alsa.desktop.in.h:1
-msgid "Analyse MIDI messages through ALSA"
+msgid "Gmidimonitor (with ALSA support)"
 msgstr ""
 
 #: ../menu-data/gmidimonitor:gmidimonitor-alsa.desktop.in.h:2
-msgid "Gmidimonitor (with ALSA support)"
+msgid "Analyse MIDI messages through ALSA"
 msgstr ""
 
 #: ../menu-data/gmidimonitor:gmidimonitor-jack.desktop.in.h:1
-msgid "Analyse MIDI messages through JACK"
+msgid "Gmidimonitor (with JACK support)"
 msgstr ""
 
 #: ../menu-data/gmidimonitor:gmidimonitor-jack.desktop.in.h:2
-msgid "Gmidimonitor (with JACK support)"
+msgid "Analyse MIDI messages through JACK"
 msgstr ""
 
 #: ../menu-data/gmlive:gmlive.desktop.in.h:1
@@ -5898,11 +6001,11 @@
 msgstr ""
 
 #: ../menu-data/gmorgan:gmorgan.desktop.in.h:1
-msgid "MIDI rhythm station for ALSA"
+msgid "gmorgan"
 msgstr ""
 
 #: ../menu-data/gmorgan:gmorgan.desktop.in.h:2
-msgid "gmorgan"
+msgid "MIDI rhythm station for ALSA"
 msgstr ""
 
 #: ../menu-data/gmountiso:gmount-iso.desktop.in.h:1
@@ -5914,44 +6017,44 @@
 msgstr ""
 
 #: ../menu-data/gmpc:gmpc.desktop.in.h:1
-msgid "A gnome frontend for the mpd daemon"
+msgid "Gnome Music Player Client"
 msgstr ""
 
 #: ../menu-data/gmpc:gmpc.desktop.in.h:2
-msgid "Gnome Music Player Client"
+msgid "A gnome frontend for the mpd daemon"
 msgstr ""
 
 #: ../menu-data/gmsh:gmsh.desktop.in.h:1
-#: ../menu-data/netgen:netgen.desktop.in.h:1
-msgid "3-D finite element mesh generator"
+msgid "Gmsh Mesh Generator"
 msgstr ""
 
 #: ../menu-data/gmsh:gmsh.desktop.in.h:2
-msgid "Gmsh Mesh Generator"
+#: ../menu-data/netgen:netgen.desktop.in.h:2
+msgid "3-D finite element mesh generator"
 msgstr ""
 
 #: ../menu-data/gmtp:gMTP.desktop.in.h:1
-msgid "A simple MTP Client for MP3 Players"
+msgid "gMTP"
 msgstr ""
 
 #: ../menu-data/gmtp:gMTP.desktop.in.h:2
-msgid "gMTP"
+msgid "A simple MTP Client for MP3 Players"
 msgstr ""
 
 #: ../menu-data/gmult:gmult.desktop.in.h:1
-msgid "Figure out which letters are which numbers"
+msgid "Multiplication Puzzle"
 msgstr ""
 
 #: ../menu-data/gmult:gmult.desktop.in.h:2
-msgid "Multiplication Puzzle"
+msgid "Figure out which letters are which numbers"
 msgstr ""
 
 #: ../menu-data/gmusicbrowser:gmusicbrowser.desktop.in.h:1
-msgid "Jukebox for large collections of mp3/ogg/flac/mpc"
+msgid "gmusicbrowser"
 msgstr ""
 
 #: ../menu-data/gmusicbrowser:gmusicbrowser.desktop.in.h:2
-msgid "gmusicbrowser"
+msgid "Jukebox for large collections of mp3/ogg/flac/mpc"
 msgstr ""
 
 #: ../menu-data/gmysqlcc:gmysqlcc.desktop.in.h:1
@@ -5975,19 +6078,19 @@
 msgstr ""
 
 #: ../menu-data/gnibbles:gnibbles.desktop.in.h:1
-msgid "Guide a worm around a maze"
+msgid "Nibbles"
 msgstr ""
 
 #: ../menu-data/gnibbles:gnibbles.desktop.in.h:2
-msgid "Nibbles"
+msgid "Guide a worm around a maze"
 msgstr ""
 
 #: ../menu-data/gnobots2:gnobots2.desktop.in.h:1
-msgid "Avoid the robots and make them crash into each other"
+msgid "Robots"
 msgstr ""
 
 #: ../menu-data/gnobots2:gnobots2.desktop.in.h:2
-msgid "Robots"
+msgid "Avoid the robots and make them crash into each other"
 msgstr ""
 
 #: ../menu-data/gnoemoe:gnoemoe.desktop.in.h:1
@@ -5999,11 +6102,11 @@
 msgstr ""
 
 #: ../menu-data/gnomad2:gnomad2.desktop.in.h:1
-msgid "A tool for managing Creative Nomad/Zen Jukeboxes and Dell DJs"
+msgid "Gnomad 2"
 msgstr ""
 
 #: ../menu-data/gnomad2:gnomad2.desktop.in.h:2
-msgid "Gnomad 2"
+msgid "A tool for managing Creative Nomad/Zen Jukeboxes and Dell DJs"
 msgstr ""
 
 #: ../menu-data/gnome-activity-journal:gnome-activity-journal.desktop.in.h:1
@@ -6017,11 +6120,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-alsamixer:gnome-alsamixer.desktop.in.h:1
-msgid "ALSA sound mixer for GNOME"
+msgid "GNOME ALSA Mixer"
 msgstr ""
 
 #: ../menu-data/gnome-alsamixer:gnome-alsamixer.desktop.in.h:2
-msgid "GNOME ALSA Mixer"
+msgid "ALSA sound mixer for GNOME"
 msgstr ""
 
 #: ../menu-data/gnome-blog:gnome-blog.desktop.in.h:1
@@ -6073,11 +6176,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-color-chooser:gnome-color-chooser.desktop.in.h:1
-msgid "Customize your GNOME desktop"
+msgid "GNOME Color Chooser"
 msgstr ""
 
 #: ../menu-data/gnome-color-chooser:gnome-color-chooser.desktop.in.h:2
-msgid "GNOME Color Chooser"
+msgid "Customize your GNOME desktop"
 msgstr ""
 
 #: ../menu-data/gnome-color-manager:gcm-calibrate.desktop.in.h:1
@@ -6113,11 +6216,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-commander-data:gnome-commander.desktop.in.h:1
-msgid "A two paned file manager"
+msgid "GNOME Commander"
 msgstr ""
 
 #: ../menu-data/gnome-commander-data:gnome-commander.desktop.in.h:2
-msgid "GNOME Commander"
+msgid "A two paned file manager"
 msgstr ""
 
 #: ../menu-data/gnome-disk-utility:palimpsest.desktop.in.h:1
@@ -6129,21 +6232,21 @@
 msgstr ""
 
 #: ../menu-data/gnome-do:gnome-do.desktop.in.h:1
-msgid ""
-"Do things as quickly as possible (but no quicker) with your files, "
-"bookmarks, applications, music, contacts, and more!"
+msgid "GNOME Do"
 msgstr ""
 
 #: ../menu-data/gnome-do:gnome-do.desktop.in.h:2
-msgid "GNOME Do"
+msgid ""
+"Do things as quickly as possible (but no quicker) with your files, "
+"bookmarks, applications, music, contacts, and more!"
 msgstr ""
 
 #: ../menu-data/gnome-documents:gnome-documents.desktop.in.h:1
-msgid "Access, manage and share documents"
+msgid "Documents"
 msgstr ""
 
 #: ../menu-data/gnome-documents:gnome-documents.desktop.in.h:2
-msgid "Documents"
+msgid "Access, manage and share documents"
 msgstr ""
 
 #: ../menu-data/gnome-dvb-client:gnome-dvb-control.desktop.in.h:1
@@ -6155,7 +6258,7 @@
 msgstr ""
 
 #: ../menu-data/gnome-font-viewer:gnome-font-viewer.desktop.in.h:1
-#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:1
+#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:2
 msgid "Font Viewer"
 msgstr ""
 
@@ -6164,11 +6267,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-format:gnome-format.desktop.in.h:1
-msgid "Format external storage devices"
+msgid "Gnome Format"
 msgstr ""
 
 #: ../menu-data/gnome-format:gnome-format.desktop.in.h:2
-msgid "Gnome Format"
+msgid "Format external storage devices"
 msgstr ""
 
 #: ../menu-data/gnome-genius:gnome-genius.desktop.in.h:1
@@ -6179,7 +6282,7 @@
 msgid "Genius Mathematical Tool and Calculator"
 msgstr ""
 
-#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:1
+#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:2
 msgid "Gmail Inbox Monitor"
 msgstr ""
 
@@ -6208,59 +6311,51 @@
 msgstr ""
 
 #: ../menu-data/gnome-lirc-properties:gnome-lirc-properties.desktop.in.h:1
-msgid "Configure your remote control"
-msgstr ""
-
-#: ../menu-data/gnome-lirc-properties:gnome-lirc-properties.desktop.in.h:2
 msgid "Infrared Remote Control"
 msgstr ""
 
-#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:1
-msgid "Disassemble a pile of tiles by removing matching pairs"
-msgstr ""
-
-#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:2
-msgid "Mahjongg"
+#: ../menu-data/gnome-lirc-properties:gnome-lirc-properties.desktop.in.h:2
+msgid "Configure your remote control"
 msgstr ""
 
 #: ../menu-data/gnome-mastermind:gnome-mastermind.desktop.in.h:1
-msgid "Break the hidden code!"
+msgid "Mastermind"
 msgstr ""
 
 #: ../menu-data/gnome-mastermind:gnome-mastermind.desktop.in.h:2
-msgid "Mastermind"
+msgid "Break the hidden code!"
 msgstr ""
 
 #: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:1
-msgid "A simple media player for GNOME"
+msgid "GNOME Media Player"
 msgstr ""
 
 #: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:2
-msgid "GNOME Media Player"
+msgid "A simple media player for GNOME"
 msgstr ""
 
 #: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:1
-msgid "Record sound clips"
+msgid "Sound Recorder"
 msgstr ""
 
 #: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:2
-msgid "Sound Recorder"
+msgid "Record sound clips"
 msgstr ""
 
 #: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:1
-msgid "Configure defaults for GStreamer applications"
+msgid "Multimedia Systems Selector"
 msgstr ""
 
 #: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:2
-msgid "Multimedia Systems Selector"
+msgid "Configure defaults for GStreamer applications"
 msgstr ""
 
 #: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:1
-msgid "Controls the mouse via Webcam."
+msgid "MouseTrap"
 msgstr ""
 
 #: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:2
-msgid "MouseTrap"
+msgid "Controls the mouse via Webcam."
 msgstr ""
 
 #: ../menu-data/gnome-mplayer:gnome-mplayer.desktop.in.h:1
@@ -6288,12 +6383,12 @@
 msgstr ""
 
 #: ../menu-data/gnome-network-admin:network.desktop.in.h:1
-msgid "Configure network devices and connections"
+#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1
+msgid "Network"
 msgstr ""
 
 #: ../menu-data/gnome-network-admin:network.desktop.in.h:2
-#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:2
-msgid "Network"
+msgid "Configure network devices and connections"
 msgstr ""
 
 #: ../menu-data/gnome-orca:orca.desktop.in.h:1
@@ -6307,11 +6402,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:1
-msgid "Create and Edit Drawings or Images"
+msgid "Gnome Paint Drawing Editor"
 msgstr ""
 
 #: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:2
-msgid "Gnome Paint Drawing Editor"
+msgid "Create and Edit Drawings or Images"
 msgstr ""
 
 #: ../menu-data/gnome-phone-manager:gnome-phone-manager.desktop.in.h:1
@@ -6331,35 +6426,35 @@
 msgstr ""
 
 #: ../menu-data/gnome-pie:gnome-pie.desktop.in.h:1
-msgid "Cakes don't lie."
+msgid "Gnome-Pie"
 msgstr ""
 
 #: ../menu-data/gnome-pie:gnome-pie.desktop.in.h:2
-msgid "Gnome-Pie"
+msgid "Cakes don't lie."
 msgstr ""
 
 #: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:1
-msgid "Observe power management"
+msgid "Power Statistics"
 msgstr ""
 
 #: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:2
-msgid "Power Statistics"
+msgid "Observe power management"
 msgstr ""
 
 #: ../menu-data/gnome-ppp:gnome-ppp.desktop.in.h:1
-msgid "GNOME Dialup Tool"
+msgid "GNOME PPP"
 msgstr ""
 
 #: ../menu-data/gnome-ppp:gnome-ppp.desktop.in.h:2
-msgid "GNOME PPP"
+msgid "GNOME Dialup Tool"
 msgstr ""
 
 #: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:1
-msgid "Manage your system tasks"
+msgid "Scheduled tasks"
 msgstr ""
 
 #: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:2
-msgid "Scheduled tasks"
+msgid "Manage your system tasks"
 msgstr ""
 
 #: ../menu-data/gnome-shell:gnome-shell.desktop.in.h:1
@@ -6371,11 +6466,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-specimen:gnome-specimen.desktop.in.h:1
-msgid "Preview and compare fonts"
+msgid "Specimen Font Previewer"
 msgstr ""
 
 #: ../menu-data/gnome-specimen:gnome-specimen.desktop.in.h:2
-msgid "Specimen Font Previewer"
+msgid "Preview and compare fonts"
 msgstr ""
 
 #: ../menu-data/gnome-split:gnome-split.desktop.in.h:1
@@ -6403,22 +6498,22 @@
 msgstr ""
 
 #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:1
-msgid "New Terminal"
-msgstr ""
-
-#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2
 #: ../menu-data/konsole:kde4__konsole.desktop.in.h:2
-#: ../menu-data/terminal.app:Terminal.desktop.in.h:2
-#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:2
+#: ../menu-data/terminal.app:Terminal.desktop.in.h:1
+#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr ""
 
+#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:3
+msgid "New Terminal"
+msgstr ""
+
 #: ../menu-data/gnome-time-admin:time.desktop.in.h:1
-msgid "Change system time, date, and timezone"
+msgid "Time and Date"
 msgstr ""
 
 #: ../menu-data/gnome-time-admin:time.desktop.in.h:2
-msgid "Time and Date"
+msgid "Change system time, date, and timezone"
 msgstr ""
 
 #: ../menu-data/gnome-translate:gnome-translate.desktop.in.h:1
@@ -6462,30 +6557,30 @@
 msgstr ""
 
 #: ../menu-data/gnomekiss:gnomekiss.desktop.in.h:1
-msgid "Gnome's KiSSeake dolls viewer"
+msgid "GnomeKiSS"
 msgstr ""
 
 #: ../menu-data/gnomekiss:gnomekiss.desktop.in.h:2
-msgid "GnomeKiSS"
+msgid "Gnome's KiSSeake dolls viewer"
 msgstr ""
 
 #: ../menu-data/gnomine:gnomine.desktop.in.h:1
+#: ../menu-data/mines.app:Mines.desktop.in.h:1
 #: ../menu-data/sgt-puzzles:mines.desktop.in.h:1
-msgid "Clear hidden mines from a minefield"
+msgid "Mines"
 msgstr ""
 
 #: ../menu-data/gnomine:gnomine.desktop.in.h:2
-#: ../menu-data/mines.app:Mines.desktop.in.h:2
 #: ../menu-data/sgt-puzzles:mines.desktop.in.h:2
-msgid "Mines"
+msgid "Clear hidden mines from a minefield"
 msgstr ""
 
 #: ../menu-data/gnomint:gnomint.desktop.in.h:1
-msgid "Manage X.509 certificates and CAs, easily and graphically"
+msgid "gnoMint X.509 CA Manager"
 msgstr ""
 
 #: ../menu-data/gnomint:gnomint.desktop.in.h:2
-msgid "gnoMint X.509 CA Manager"
+msgid "Manage X.509 certificates and CAs, easily and graphically"
 msgstr ""
 
 #: ../menu-data/gnote:gnote.desktop.in.h:1
@@ -6493,7 +6588,7 @@
 msgstr ""
 
 #: ../menu-data/gnote:gnote.desktop.in.h:2
-#: ../menu-data/tomboy:tomboy.desktop.in.h:1
+#: ../menu-data/tomboy:tomboy.desktop.in.h:2
 msgid "Take notes, link ideas, and stay organized"
 msgstr ""
 
@@ -6506,11 +6601,11 @@
 msgstr ""
 
 #: ../menu-data/gnotravex:gnotravex.desktop.in.h:1
-msgid "Complete the puzzle by matching numbered tiles"
+msgid "Tetravex"
 msgstr ""
 
 #: ../menu-data/gnotravex:gnotravex.desktop.in.h:2
-msgid "Tetravex"
+msgid "Complete the puzzle by matching numbered tiles"
 msgstr ""
 
 #: ../menu-data/gnotski:gnotski.desktop.in.h:1
@@ -6538,11 +6633,11 @@
 msgstr ""
 
 #: ../menu-data/gnubik:gnubik.desktop.in.h:1
-msgid "3D Rubik's cube game"
+msgid "GNUbik"
 msgstr ""
 
 #: ../menu-data/gnubik:gnubik.desktop.in.h:2
-msgid "GNUbik"
+msgid "3D Rubik's cube game"
 msgstr ""
 
 #: ../menu-data/gnucash:gnucash.desktop.in.h:1
@@ -6586,11 +6681,11 @@
 msgstr ""
 
 #: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:1
-msgid "Calculation, Analysis, and Visualization of Information"
+msgid "Gnumeric Spreadsheet"
 msgstr ""
 
 #: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:2
-msgid "Gnumeric Spreadsheet"
+msgid "Calculation, Analysis, and Visualization of Information"
 msgstr ""
 
 #: ../menu-data/gnunet-gtk:gnunet-gtk.desktop.in.h:1
@@ -6610,11 +6705,11 @@
 msgstr ""
 
 #: ../menu-data/gnurobbo:gnurobbo.desktop.in.h:1
-msgid "A clone of Robbo"
+msgid "GNU Robbo"
 msgstr ""
 
 #: ../menu-data/gnurobbo:gnurobbo.desktop.in.h:2
-msgid "GNU Robbo"
+msgid "A clone of Robbo"
 msgstr ""
 
 #: ../menu-data/gnusim8085:GNUSim8085.desktop.in.h:1
@@ -6638,11 +6733,11 @@
 msgstr ""
 
 #: ../menu-data/gobby:gobby.desktop.in.h:1
-msgid "Edit text files collaboratively"
+msgid "Gobby Collaborative Editor (0.4)"
 msgstr ""
 
 #: ../menu-data/gobby:gobby.desktop.in.h:2
-msgid "Gobby Collaborative Editor (0.4)"
+msgid "Edit text files collaboratively"
 msgstr ""
 
 #: ../menu-data/gofigure2:gofigure2.desktop.in.h:1
@@ -6658,16 +6753,16 @@
 msgstr ""
 
 #: ../menu-data/gogglesmm:gogglesmm.desktop.in.h:2
-#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:1
+#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2
 msgid "Play and organize your music collection"
 msgstr ""
 
 #: ../menu-data/gok:gok.desktop.in.h:1
-msgid "Navigate applications and type using alternative input devices"
+msgid "On-Screen Keyboard"
 msgstr ""
 
 #: ../menu-data/gok:gok.desktop.in.h:2
-msgid "On-Screen Keyboard"
+msgid "Navigate applications and type using alternative input devices"
 msgstr ""
 
 #: ../menu-data/goldendict:goldendict.desktop.in.h:1
@@ -6675,19 +6770,19 @@
 msgstr ""
 
 #: ../menu-data/golly:golly.desktop.in.h:1
-msgid "A Conway's Game of Life simulator"
+msgid "Golly"
 msgstr ""
 
 #: ../menu-data/golly:golly.desktop.in.h:2
-msgid "Golly"
+msgid "A Conway's Game of Life simulator"
 msgstr ""
 
 #: ../menu-data/gomoku.app:Gomoku.desktop.in.h:1
-msgid "GNUstep Gomoku Game"
+msgid "Gomoku.app"
 msgstr ""
 
 #: ../menu-data/gomoku.app:Gomoku.desktop.in.h:2
-msgid "Gomoku.app"
+msgid "GNUstep Gomoku Game"
 msgstr ""
 
 #: ../menu-data/goobox:goobox.desktop.in.h:1
@@ -6716,19 +6811,19 @@
 msgstr ""
 
 #: ../menu-data/goplay:goplay.desktop.in.h:1
-msgid "Gaming packages browser"
+msgid "GoPlay!"
 msgstr ""
 
 #: ../menu-data/goplay:goplay.desktop.in.h:2
-msgid "GoPlay!"
+msgid "Gaming packages browser"
 msgstr ""
 
 #: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:1
-msgid "GOsa"
+msgid "GOsa²"
 msgstr ""
 
 #: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:2
-msgid "GOsa²"
+msgid "GOsa"
 msgstr ""
 
 #: ../menu-data/gosmore:gosmore.desktop.in.h:1
@@ -6750,51 +6845,51 @@
 msgstr ""
 
 #: ../menu-data/gpaco:gpaco.desktop.in.h:1
-msgid "Manages software installed from source code"
+msgid "Package Organizer"
 msgstr ""
 
 #: ../menu-data/gpaco:gpaco.desktop.in.h:2
-msgid "Package Organizer"
+msgid "Manages software installed from source code"
 msgstr ""
 
 #: ../menu-data/gpaint:gpaint.desktop.in.h:1
-msgid "A small-scale painting program for GNOME, the GNU Desktop"
+msgid "GNU Paint"
 msgstr ""
 
 #: ../menu-data/gpaint:gpaint.desktop.in.h:2
-msgid "GNU Paint"
+msgid "A small-scale painting program for GNOME, the GNU Desktop"
 msgstr ""
 
 #: ../menu-data/gparted:gparted.desktop.in.h:1
-msgid "Create, reorganize, and delete partitions"
+msgid "GParted Partition Editor"
 msgstr ""
 
 #: ../menu-data/gparted:gparted.desktop.in.h:2
-msgid "GParted Partition Editor"
+msgid "Create, reorganize, and delete partitions"
 msgstr ""
 
 #: ../menu-data/gpdftext:gpdftext.desktop.in.h:1
-msgid "Edit text from ebook PDF files"
+msgid "gPDFText ebook editor"
 msgstr ""
 
 #: ../menu-data/gpdftext:gpdftext.desktop.in.h:2
-msgid "gPDFText ebook editor"
+msgid "Edit text from ebook PDF files"
 msgstr ""
 
 #: ../menu-data/gphpedit:gphpedit.desktop.in.h:1
-msgid "Edit PHP source files"
+msgid "gPHPEdit"
 msgstr ""
 
 #: ../menu-data/gphpedit:gphpedit.desktop.in.h:2
-msgid "gPHPEdit"
+msgid "Edit PHP source files"
 msgstr ""
 
 #: ../menu-data/gpick:gpick.desktop.in.h:1
-msgid "Color picker"
+msgid "Gpick"
 msgstr ""
 
 #: ../menu-data/gpick:gpick.desktop.in.h:2
-msgid "Gpick"
+msgid "Color picker"
 msgstr ""
 
 #: ../menu-data/gpicview:gpicview.desktop.in.h:2
@@ -6810,19 +6905,19 @@
 msgstr ""
 
 #: ../menu-data/gplanarity:gplanarity.desktop.in.h:1
-msgid "Puzzle game involving untangling planar graphs"
+msgid "gPlanarity"
 msgstr ""
 
 #: ../menu-data/gplanarity:gplanarity.desktop.in.h:2
-msgid "gPlanarity"
+msgid "Puzzle game involving untangling planar graphs"
 msgstr ""
 
 #: ../menu-data/gpodder:gpodder.desktop.in.h:1
-msgid "Download audio and video content from podcasts"
+msgid "gPodder Podcast Client"
 msgstr ""
 
 #: ../menu-data/gpodder:gpodder.desktop.in.h:2
-msgid "gPodder Podcast Client"
+msgid "Download audio and video content from podcasts"
 msgstr ""
 
 #: ../menu-data/gpointing-device-settings:gpointing-device-settings.desktop.in.h:1
@@ -6834,11 +6929,11 @@
 msgstr ""
 
 #: ../menu-data/gpomme:gpomme.desktop.in.h:1
-msgid "A graphical client for pommed"
+msgid "pommed GTK client"
 msgstr ""
 
 #: ../menu-data/gpomme:gpomme.desktop.in.h:2
-msgid "pommed GTK client"
+msgid "A graphical client for pommed"
 msgstr ""
 
 #: ../menu-data/gpppon:gpppon.desktop.in.h:1
@@ -6866,28 +6961,28 @@
 msgstr ""
 
 #: ../menu-data/gprompter:gprompter.desktop.in.h:1
-#: ../menu-data/pyprompter:pyprompter.desktop.in.h:1
-msgid "Predictive text editor powered by presage"
+msgid "gprompter"
 msgstr ""
 
 #: ../menu-data/gprompter:gprompter.desktop.in.h:2
-msgid "gprompter"
+#: ../menu-data/pyprompter:pyprompter.desktop.in.h:2
+msgid "Predictive text editor powered by presage"
 msgstr ""
 
 #: ../menu-data/gpscorrelate-gui:gpscorrelate.desktop.in.h:1
-msgid "Add coordinates to jpeg images using gpx files"
+msgid "GPSCorrelate"
 msgstr ""
 
 #: ../menu-data/gpscorrelate-gui:gpscorrelate.desktop.in.h:2
-msgid "GPSCorrelate"
+msgid "Add coordinates to jpeg images using gpx files"
 msgstr ""
 
 #: ../menu-data/gpsdrive:gpsdrive.desktop.in.h:1
-msgid "GPS Navigation"
+msgid "GpsDrive"
 msgstr ""
 
 #: ../menu-data/gpsdrive:gpsdrive.desktop.in.h:2
-msgid "GpsDrive"
+msgid "GPS Navigation"
 msgstr ""
 
 #: ../menu-data/gpsk31:gpsk31.desktop.in.h:1
@@ -6907,27 +7002,27 @@
 msgstr ""
 
 #: ../menu-data/gpxviewer:gpxviewer.desktop.in.h:1
-msgid "GPS Trace Viewer"
+msgid "GPX Viewer"
 msgstr ""
 
 #: ../menu-data/gpxviewer:gpxviewer.desktop.in.h:2
-msgid "GPX Viewer"
+msgid "GPS Trace Viewer"
 msgstr ""
 
 #: ../menu-data/grace:grace.desktop.in.h:1
-msgid "An XY plotting tool"
+msgid "Grace"
 msgstr ""
 
 #: ../menu-data/grace:grace.desktop.in.h:2
-msgid "Grace"
+msgid "An XY plotting tool"
 msgstr ""
 
 #: ../menu-data/grafx2:grafx2.desktop.in.h:1
-msgid "Deluxe Paint Clone"
+msgid "GrafX2"
 msgstr ""
 
 #: ../menu-data/grafx2:grafx2.desktop.in.h:2
-msgid "GrafX2"
+msgid "Deluxe Paint Clone"
 msgstr ""
 
 #: ../menu-data/gramps:gramps.desktop.in.h:1
@@ -6939,36 +7034,28 @@
 "Manage genealogical information, perform genealogical research and analysis"
 msgstr ""
 
-#: ../menu-data/grandr:grandr.desktop.in.h:1
-msgid "Configure multiple screens"
-msgstr ""
-
-#: ../menu-data/grandr:grandr.desktop.in.h:2
-msgid "Multiple Screens"
-msgstr ""
-
 #: ../menu-data/granule:granule.desktop.in.h:1
-msgid "Flashcards Program"
+msgid "Granule"
 msgstr ""
 
 #: ../menu-data/granule:granule.desktop.in.h:2
-msgid "Granule"
+msgid "Flashcards Program"
 msgstr ""
 
 #: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:1
-msgid "Draw mathematical graphs/curves"
+msgid "Graphmonkey"
 msgstr ""
 
 #: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:2
-msgid "Graphmonkey"
+msgid "Draw mathematical graphs/curves"
 msgstr ""
 
 #: ../menu-data/graphthing:graphthing.desktop.in.h:1
-msgid "Create, manipulate and study graphs."
+msgid "GraphThing"
 msgstr ""
 
 #: ../menu-data/graphthing:graphthing.desktop.in.h:2
-msgid "GraphThing"
+msgid "Create, manipulate and study graphs."
 msgstr ""
 
 #: ../menu-data/gravitation:gravitation.desktop.in.h:1
@@ -6996,11 +7083,11 @@
 msgstr ""
 
 #: ../menu-data/grdesktop:grdesktop.desktop.in.h:1
-msgid "Connect to a remote Windows Terminal-Server"
+msgid "Remotedesktop Client"
 msgstr ""
 
 #: ../menu-data/grdesktop:grdesktop.desktop.in.h:2
-msgid "Remotedesktop Client"
+msgid "Connect to a remote Windows Terminal-Server"
 msgstr ""
 
 #: ../menu-data/greenwich:greenwich.desktop.in.h:1
@@ -7008,11 +7095,11 @@
 msgstr ""
 
 #: ../menu-data/gresistor:gresistor.desktop.in.h:1
-msgid "Resistor color code calculator"
+msgid "gResistor"
 msgstr ""
 
 #: ../menu-data/gresistor:gresistor.desktop.in.h:2
-msgid "gResistor"
+msgid "Resistor color code calculator"
 msgstr ""
 
 #: ../menu-data/gresolver:gresolver.desktop.in.h:1
@@ -7024,11 +7111,11 @@
 msgstr ""
 
 #: ../menu-data/gretl-common:gretl.desktop.in.h:1
-msgid "Econometrics program"
+msgid "gretl"
 msgstr ""
 
 #: ../menu-data/gretl-common:gretl.desktop.in.h:2
-msgid "gretl"
+msgid "Econometrics program"
 msgstr ""
 
 #: ../menu-data/grhino:grhino.desktop.in.h:1
@@ -7052,11 +7139,11 @@
 msgstr ""
 
 #: ../menu-data/gringotts:gringotts.desktop.in.h:1
-msgid "An electronic strongbox"
+msgid "Gringotts"
 msgstr ""
 
 #: ../menu-data/gringotts:gringotts.desktop.in.h:2
-msgid "Gringotts"
+msgid "An electronic strongbox"
 msgstr ""
 
 #: ../menu-data/grinvin:grinvin.desktop.in.h:1
@@ -7072,11 +7159,11 @@
 msgstr ""
 
 #: ../menu-data/gromit:gromit.desktop.in.h:1
-msgid "draw freehand screen annotations"
+msgid "gromit"
 msgstr ""
 
 #: ../menu-data/gromit:gromit.desktop.in.h:2
-msgid "gromit"
+msgid "draw freehand screen annotations"
 msgstr ""
 
 #: ../menu-data/groundcontrol:groundcontrol.desktop.in.h:1
@@ -7088,11 +7175,11 @@
 msgstr ""
 
 #: ../menu-data/grpn:grpn.desktop.in.h:1
-msgid "A reverse polish notation calculator"
+msgid "Grpn Calculator"
 msgstr ""
 
 #: ../menu-data/grpn:grpn.desktop.in.h:2
-msgid "Grpn Calculator"
+msgid "A reverse polish notation calculator"
 msgstr ""
 
 #: ../menu-data/grr.app:Grr.desktop.in.h:1
@@ -7112,29 +7199,29 @@
 msgstr ""
 
 #: ../menu-data/gscan2pdf:gscan2pdf.desktop.in.h:1
-msgid "A GUI to aid the scan-to-PDF process"
+msgid "gscan2pdf"
 msgstr ""
 
 #: ../menu-data/gscan2pdf:gscan2pdf.desktop.in.h:2
-msgid "gscan2pdf"
+msgid "A GUI to aid the scan-to-PDF process"
 msgstr ""
 
 #: ../menu-data/gshare:gshare-manager.desktop.in.h:1
-msgid "Configure the file sharing service"
+msgid "File Sharing"
 msgstr ""
 
 #: ../menu-data/gshare:gshare-manager.desktop.in.h:2
-msgid "File Sharing"
+msgid "Configure the file sharing service"
 msgstr ""
 
 #: ../menu-data/gshutdown:gshutdown.desktop.in.h:1
-msgid ""
-"An advanced shutdown utility which allows you to schedule the shutdown or "
-"the restart of your computer"
+msgid "GShutdown"
 msgstr ""
 
 #: ../menu-data/gshutdown:gshutdown.desktop.in.h:2
-msgid "GShutdown"
+msgid ""
+"An advanced shutdown utility which allows you to schedule the shutdown or "
+"the restart of your computer"
 msgstr ""
 
 #: ../menu-data/gsmartcontrol:gsmartcontrol.desktop.in.h:1
@@ -7155,43 +7242,43 @@
 msgstr ""
 
 #: ../menu-data/gsoko:gsoko.desktop.in.h:1
-msgid "Clone of the Sokoban game"
+msgid "Sokoban"
 msgstr ""
 
 #: ../menu-data/gsoko:gsoko.desktop.in.h:2
-msgid "Sokoban"
+msgid "Clone of the Sokoban game"
 msgstr ""
 
 #: ../menu-data/gsql:gsql.desktop.in.h:1
-msgid "Integrated Database Development Environment for GNOME"
+msgid "gsql"
 msgstr ""
 
 #: ../menu-data/gsql:gsql.desktop.in.h:2
-msgid "gsql"
+msgid "Integrated Database Development Environment for GNOME"
 msgstr ""
 
 #: ../menu-data/gstm:gstm.desktop.in.h:1
-msgid "Manage SSH tunnel connections"
+msgid "gSTM"
 msgstr ""
 
 #: ../menu-data/gstm:gstm.desktop.in.h:2
-msgid "gSTM"
+msgid "Manage SSH tunnel connections"
 msgstr ""
 
 #: ../menu-data/gtablix:gtablix.desktop.in.h:1
-msgid "Generate highschool timetables using a GUI for Tablix."
+msgid "Gtablix Timetable Generator"
 msgstr ""
 
 #: ../menu-data/gtablix:gtablix.desktop.in.h:2
-msgid "Gtablix Timetable Generator"
+msgid "Generate highschool timetables using a GUI for Tablix."
 msgstr ""
 
 #: ../menu-data/gtali:gtali.desktop.in.h:1
-msgid "Beat the odds in a poker-style dice game"
+msgid "Tali"
 msgstr ""
 
 #: ../menu-data/gtali:gtali.desktop.in.h:2
-msgid "Tali"
+msgid "Beat the odds in a poker-style dice game"
 msgstr ""
 
 #: ../menu-data/gtamsanalyzer.app:GTAMSAnalyzer.desktop.in.h:1
@@ -7227,11 +7314,11 @@
 msgstr ""
 
 #: ../menu-data/gthumb:gthumb.desktop.in.h:1
-msgid "View and organize your images"
+msgid "gThumb Image Viewer"
 msgstr ""
 
 #: ../menu-data/gthumb:gthumb.desktop.in.h:2
-msgid "gThumb Image Viewer"
+msgid "View and organize your images"
 msgstr ""
 
 #: ../menu-data/gtick:gtick.desktop.in.h:1
@@ -7251,27 +7338,27 @@
 msgstr ""
 
 #: ../menu-data/gtimer:gtimer.desktop.in.h:1
-msgid "GTK-based X11 task timer"
+msgid "GTimer"
 msgstr ""
 
 #: ../menu-data/gtimer:gtimer.desktop.in.h:2
-msgid "GTimer"
+msgid "GTK-based X11 task timer"
 msgstr ""
 
 #: ../menu-data/gtk-chtheme:gtk-chtheme.desktop.in.h:1
-msgid "GTK+2.0 Theme Changer"
+msgid "Gtk-ChTheme"
 msgstr ""
 
 #: ../menu-data/gtk-chtheme:gtk-chtheme.desktop.in.h:2
-msgid "Gtk-ChTheme"
+msgid "GTK+2.0 Theme Changer"
 msgstr ""
 
 #: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:1
-msgid "A GUI based Gnutella Servent"
+msgid "gtk-gnutella"
 msgstr ""
 
 #: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:2
-msgid "gtk-gnutella"
+msgid "A GUI based Gnutella Servent"
 msgstr ""
 
 #: ../menu-data/gtk-recordmydesktop:gtk-recordmydesktop.desktop.in.h:1
@@ -7284,35 +7371,35 @@
 msgstr ""
 
 #: ../menu-data/gtk-redshift:gtk-redshift.desktop.in.h:1
-msgid "Color temperature adjustment tool"
+msgid "Redshift"
 msgstr ""
 
 #: ../menu-data/gtk-redshift:gtk-redshift.desktop.in.h:2
-msgid "Redshift"
+msgid "Color temperature adjustment tool"
 msgstr ""
 
 #: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:1
-msgid "Save vector images of application windows"
+msgid "Take Vector Screenshot"
 msgstr ""
 
 #: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:2
-msgid "Take Vector Screenshot"
+msgid "Save vector images of application windows"
 msgstr ""
 
 #: ../menu-data/gtkam:gtkam.desktop.in.h:1
-msgid "Browse and download images from an attached digital camera"
+msgid "Gtkam Digital Camera Browser"
 msgstr ""
 
 #: ../menu-data/gtkam:gtkam.desktop.in.h:2
-msgid "Gtkam Digital Camera Browser"
+msgid "Browse and download images from an attached digital camera"
 msgstr ""
 
 #: ../menu-data/gtkatlantic:gtkatlantic.desktop.in.h:1
-msgid "Connect to a Monopd server"
+msgid "GtkAtlantic"
 msgstr ""
 
 #: ../menu-data/gtkatlantic:gtkatlantic.desktop.in.h:2
-msgid "GtkAtlantic"
+msgid "Connect to a Monopd server"
 msgstr ""
 
 #: ../menu-data/gtkballs:gtkballs.desktop.in.h:1
@@ -7332,35 +7419,35 @@
 msgstr ""
 
 #: ../menu-data/gtkguitune:gtkguitune.desktop.in.h:1
-msgid "Tune your Guitar"
+msgid "gtkGuitune"
 msgstr ""
 
 #: ../menu-data/gtkguitune:gtkguitune.desktop.in.h:2
-msgid "gtkGuitune"
+msgid "Tune your Guitar"
 msgstr ""
 
 #: ../menu-data/gtkhash:gtkhash.desktop.in.h:1
-msgid "Compute message digests and checksums"
+msgid "GtkHash"
 msgstr ""
 
 #: ../menu-data/gtkhash:gtkhash.desktop.in.h:2
-msgid "GtkHash"
+msgid "Compute message digests and checksums"
 msgstr ""
 
 #: ../menu-data/gtklick:gtklick.desktop.in.h:1
-msgid "A Simple Metronome"
+msgid "gtklick"
 msgstr ""
 
 #: ../menu-data/gtklick:gtklick.desktop.in.h:2
-msgid "gtklick"
+msgid "A Simple Metronome"
 msgstr ""
 
 #: ../menu-data/gtkorphan:gtkorphan.desktop.in.h:1
-msgid "A graphical tool to find and remove orphaned libraries"
+msgid "Remove orphaned packages"
 msgstr ""
 
 #: ../menu-data/gtkorphan:gtkorphan.desktop.in.h:2
-msgid "Remove orphaned packages"
+msgid "A graphical tool to find and remove orphaned libraries"
 msgstr ""
 
 #: ../menu-data/gtkperf:gtkperf.desktop.in.h:1
@@ -7380,27 +7467,27 @@
 msgstr ""
 
 #: ../menu-data/gtkterm:gtkterm.desktop.in.h:1
-msgid "Communicate with the serial port"
+msgid "Serial port terminal"
 msgstr ""
 
 #: ../menu-data/gtkterm:gtkterm.desktop.in.h:2
-msgid "Serial port terminal"
+msgid "Communicate with the serial port"
 msgstr ""
 
 #: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:1
-msgid "Connect to your VNC servers"
+msgid "Gtk VNC Viewer"
 msgstr ""
 
 #: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:2
-msgid "Gtk VNC Viewer"
+msgid "Connect to your VNC servers"
 msgstr ""
 
 #: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:1
-msgid "A whiteboard written in GTK using the wiimote"
+msgid "GTK Wiimote Whiteboard"
 msgstr ""
 
 #: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:2
-msgid "GTK Wiimote Whiteboard"
+msgid "A whiteboard written in GTK using the wiimote"
 msgstr ""
 
 #: ../menu-data/gtodo:gtodo.desktop.in.h:1
@@ -7444,11 +7531,11 @@
 msgstr ""
 
 #: ../menu-data/gufw:gufw.desktop.in.h:1
-msgid "Allows you to configure ufw firewall"
+msgid "Firewall Configuration"
 msgstr ""
 
 #: ../menu-data/gufw:gufw.desktop.in.h:2
-msgid "Firewall Configuration"
+msgid "Allows you to configure ufw firewall"
 msgstr ""
 
 #: ../menu-data/gui-apt-key:gui-apt-key.desktop.in.h:1
@@ -7460,11 +7547,11 @@
 msgstr ""
 
 #: ../menu-data/guitarix:guitarix.desktop.in.h:1
-msgid "Simple mono amplifier simulation"
+msgid "guitarix"
 msgstr ""
 
 #: ../menu-data/guitarix:guitarix.desktop.in.h:2
-msgid "guitarix"
+msgid "Simple mono amplifier simulation"
 msgstr ""
 
 #: ../menu-data/gummi:gummi.desktop.in.h:1
@@ -7488,84 +7575,84 @@
 msgstr ""
 
 #: ../menu-data/gurlchecker:gurlchecker.desktop.in.h:1
-msgid "Graphical Web Links checker"
+msgid "gurlchecker"
 msgstr ""
 
 #: ../menu-data/gurlchecker:gurlchecker.desktop.in.h:2
-msgid "gurlchecker"
+msgid "Graphical Web Links checker"
 msgstr ""
 
 #: ../menu-data/guvcview:guvcview.desktop.in.h:1
-msgid "A video viewer and capturer for the linux uvc driver"
+msgid "guvcview"
 msgstr ""
 
 #: ../menu-data/guvcview:guvcview.desktop.in.h:2
-msgid "guvcview"
+msgid "A video viewer and capturer for the linux uvc driver"
 msgstr ""
 
 #: ../menu-data/guymager:guymager.desktop.in.h:1
-msgid "Fast forensic imager"
+msgid "Guymager"
 msgstr ""
 
 #: ../menu-data/guymager:guymager.desktop.in.h:2
-msgid "Guymager"
+msgid "Fast forensic imager"
 msgstr ""
 
 #: ../menu-data/gv:gv.desktop.in.h:1
-msgid "View PS and/or PDF files"
+msgid "gv"
 msgstr ""
 
 #: ../menu-data/gv:gv.desktop.in.h:2
-msgid "gv"
+msgid "View PS and/or PDF files"
 msgstr ""
 
 #: ../menu-data/gvb:gvb.desktop.in.h:1
-msgid "Gvb"
+msgid "Play with waves and vibrations"
 msgstr ""
 
 #: ../menu-data/gvb:gvb.desktop.in.h:2
-msgid "Play with waves and vibrations"
+msgid "Gvb"
 msgstr ""
 
 #: ../menu-data/gvrng:gvrng.desktop.in.h:1
-msgid "Guido van Robot NG"
+msgid "GvRng"
 msgstr ""
 
 #: ../menu-data/gvrng:gvrng.desktop.in.h:2
-msgid "GvRng"
+msgid "Guido van Robot NG"
 msgstr ""
 
 #: ../menu-data/gwaei:gwaei.desktop.in.h:1
-msgid "Enter a Japanese or English word to easily get translations."
+msgid "gWaei Japanese-English Dictionary"
 msgstr ""
 
 #: ../menu-data/gwaei:gwaei.desktop.in.h:2
-msgid "gWaei Japanese-English Dictionary"
+msgid "Enter a Japanese or English word to easily get translations."
 msgstr ""
 
 #: ../menu-data/gwakeonlan:gwakeonlan.desktop.in.h:1
-msgid ""
-"A GTK+ utility to awake turned off machine using the Wake On LAN feature."
+msgid "gWakeOnLan"
 msgstr ""
 
 #: ../menu-data/gwakeonlan:gwakeonlan.desktop.in.h:2
-msgid "gWakeOnLan"
+msgid ""
+"A GTK+ utility to awake turned off machine using the Wake On LAN feature."
 msgstr ""
 
 #: ../menu-data/gwaterfall:waterfall.desktop.in.h:1
-msgid "View all characters of a font in all sizes."
+msgid "Waterfall"
 msgstr ""
 
 #: ../menu-data/gwaterfall:waterfall.desktop.in.h:2
-msgid "Waterfall"
+msgid "View all characters of a font in all sizes."
 msgstr ""
 
 #: ../menu-data/gwave:gwave.desktop.in.h:1
-msgid "A waveform viewer eg for spice simulators "
+msgid "gwave"
 msgstr ""
 
 #: ../menu-data/gwave:gwave.desktop.in.h:2
-msgid "gwave"
+msgid "A waveform viewer eg for spice simulators "
 msgstr ""
 
 #: ../menu-data/gwc:gwc.desktop.in.h:1
@@ -7585,22 +7672,26 @@
 msgstr ""
 
 #: ../menu-data/gwenrename:kde4__gwenrename.desktop.in.h:1
-msgid "A batch renaming tool for KDE"
+msgid "GwenRename"
 msgstr ""
 
 #: ../menu-data/gwenrename:kde4__gwenrename.desktop.in.h:2
-msgid "GwenRename"
+msgid "A batch renaming tool for KDE"
 msgstr ""
 
 #: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:1
-msgid "A simple image viewer"
+msgid "Gwenview"
 msgstr ""
 
 #: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:2
-msgid "Gwenview"
+msgid "A simple image viewer"
 msgstr ""
 
 #: ../menu-data/gwhere:gwhere.desktop.in.h:1
+msgid "Removable media catalog managment"
+msgstr ""
+
+#: ../menu-data/gwhere:gwhere.desktop.in.h:2
 msgid ""
 "GWhere allows to manage a database of yours CDs and others removable media "
 "(hard disks, floppy drive, Zip drive, CD-ROM, etc...). With GWhere it's easy "
@@ -7608,10 +7699,6 @@
 "in the drive at each once."
 msgstr ""
 
-#: ../menu-data/gwhere:gwhere.desktop.in.h:2
-msgid "Removable media catalog managment"
-msgstr ""
-
 #: ../menu-data/gwibber:gwibber.desktop.in.h:1
 msgid "Gwibber Social Client"
 msgstr ""
@@ -7621,11 +7708,11 @@
 msgstr ""
 
 #: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:1
-msgid "GNUstep Workspace Manager"
+msgid "GWorkspace"
 msgstr ""
 
 #: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:2
-msgid "GWorkspace"
+msgid "GNUstep Workspace Manager"
 msgstr ""
 
 #: ../menu-data/gworldclock:gworldclock.desktop.in.h:1
@@ -7643,7 +7730,7 @@
 #: ../menu-data/gwrite:gwrite.desktop.in.h:2
 #: ../menu-data/leafpad:leafpad.desktop.in.h:2
 #: ../menu-data/mousepad:mousepad.desktop.in.h:2
-#: ../menu-data/x2:x2.desktop.in.h:1
+#: ../menu-data/x2:x2.desktop.in.h:2
 msgid "Simple text editor"
 msgstr ""
 
@@ -7656,19 +7743,19 @@
 msgstr ""
 
 #: ../menu-data/gxmms2:gxmms2.desktop.in.h:1
-msgid "Play music"
+msgid "gxmms2"
 msgstr ""
 
 #: ../menu-data/gxmms2:gxmms2.desktop.in.h:2
-msgid "gxmms2"
+msgid "Play music"
 msgstr ""
 
 #: ../menu-data/gxneur:gxneur.desktop.in.h:1
-msgid "Automatic keyboard layout switcher"
+msgid "gXNeur"
 msgstr ""
 
 #: ../menu-data/gxneur:gxneur.desktop.in.h:2
-msgid "gXNeur"
+msgid "Automatic keyboard layout switcher"
 msgstr ""
 
 #: ../menu-data/gxtuner:gxtuner.desktop.in.h:1
@@ -7680,63 +7767,55 @@
 msgstr ""
 
 #: ../menu-data/gyrus:gyrus.desktop.in.h:1
-msgid "Administer the mailboxes of your IMAP Cyrus servers"
+msgid "Gyrus IMAP Cyrus Administrator"
 msgstr ""
 
 #: ../menu-data/gyrus:gyrus.desktop.in.h:2
-msgid "Gyrus IMAP Cyrus Administrator"
+msgid "Administer the mailboxes of your IMAP Cyrus servers"
 msgstr ""
 
 #: ../menu-data/hamfax:hamfax.desktop.in.h:1
-msgid "Send and receive radio facsimiles"
+msgid "hamfax"
 msgstr ""
 
 #: ../menu-data/hamfax:hamfax.desktop.in.h:2
-msgid "hamfax"
+msgid "Send and receive radio facsimiles"
 msgstr ""
 
 #: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:1
-msgid "Project Hamster - track your time"
+msgid "Time Tracker"
 msgstr ""
 
 #: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:2
-msgid "Time Tracker"
+msgid "Project Hamster - track your time"
 msgstr ""
 
 #: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:1
-msgid "Foo2ZJS Firmware Downloader and Installer"
+msgid "Foo2ZJS Firmware Installer (Hannah)"
 msgstr ""
 
 #: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:2
-msgid "Foo2ZJS Firmware Installer (Hannah)"
+msgid "Foo2ZJS Firmware Downloader and Installer"
 msgstr ""
 
 #: ../menu-data/hannah:hannah.desktop.in.h:1
-msgid "A pacman-like game"
+msgid "Help Hannah's Horse"
 msgstr ""
 
 #: ../menu-data/hannah:hannah.desktop.in.h:2
-msgid "Help Hannah's Horse"
+msgid "A pacman-like game"
 msgstr ""
 
 #: ../menu-data/hardinfo:hardinfo.desktop.in.h:1
 msgid "System Profiler and Benchmark"
 msgstr ""
 
-#: ../menu-data/harpia:harpia.desktop.in.h:1
-msgid "Harpia"
-msgstr ""
-
-#: ../menu-data/harpia:harpia.desktop.in.h:2
-msgid "Image Processing and Computer Vision Automatic Programming Tool"
-msgstr ""
-
 #: ../menu-data/hasciicam:hasciicam.desktop.in.h:1
-msgid "(h)ascii for the masses!"
+msgid "HasciiCam"
 msgstr ""
 
 #: ../menu-data/hasciicam:hasciicam.desktop.in.h:2
-msgid "HasciiCam"
+msgid "(h)ascii for the masses!"
 msgstr ""
 
 #: ../menu-data/hatari:hatariui.desktop.in.h:1
@@ -7744,51 +7823,51 @@
 msgstr ""
 
 #: ../menu-data/hdfview:hdfview.desktop.in.h:1
-msgid "HDF4/5 Data Browser"
+msgid "hdfview"
 msgstr ""
 
 #: ../menu-data/hdfview:hdfview.desktop.in.h:2
-msgid "hdfview"
+msgid "HDF4/5 Data Browser"
 msgstr ""
 
 #: ../menu-data/hdhomerun-config-gui:hdhr.desktop.in.h:1
-msgid "A GUI for configuration of HDHomeRun devices"
+msgid "HDHomeRun Config GUI"
 msgstr ""
 
 #: ../menu-data/hdhomerun-config-gui:hdhr.desktop.in.h:2
-msgid "HDHomeRun Config GUI"
+msgid "A GUI for configuration of HDHomeRun devices"
 msgstr ""
 
 #: ../menu-data/hedgewars:hedgewars.desktop.in.h:1
-msgid "Fighting Hedgehogs"
+msgid "Hedgewars"
 msgstr ""
 
 #: ../menu-data/hedgewars:hedgewars.desktop.in.h:2
-msgid "Hedgewars"
+msgid "Fighting Hedgehogs"
 msgstr ""
 
 #: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:1
-msgid "GNUstep Help Viewer"
+msgid "HelpViewer"
 msgstr ""
 
 #: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:2
-msgid "HelpViewer"
+msgid "GNUstep Help Viewer"
 msgstr ""
 
 #: ../menu-data/herculesstudio:herculesstudio.desktop.in.h:1
-msgid "GUI front-end of hercules emulator"
+msgid "HerculesStudio"
 msgstr ""
 
 #: ../menu-data/herculesstudio:herculesstudio.desktop.in.h:2
-msgid "HerculesStudio"
+msgid "GUI front-end of hercules emulator"
 msgstr ""
 
 #: ../menu-data/heroes-common:heroes.desktop.in.h:1
-msgid "Collect powerups and avoid your opponents' trails"
+msgid "Heroes"
 msgstr ""
 
 #: ../menu-data/heroes-common:heroes.desktop.in.h:2
-msgid "Heroes"
+msgid "Collect powerups and avoid your opponents' trails"
 msgstr ""
 
 #: ../menu-data/hex-a-hop:hex-a-hop.desktop.in.h:1
@@ -7832,11 +7911,11 @@
 msgstr ""
 
 #: ../menu-data/hocr-gtk:sane-pygtk.desktop.in.h:1
-msgid "A minimal program to work with scanner."
+msgid "sane-pygtk"
 msgstr ""
 
 #: ../menu-data/hocr-gtk:sane-pygtk.desktop.in.h:2
-msgid "sane-pygtk"
+msgid "A minimal program to work with scanner."
 msgstr ""
 
 #: ../menu-data/holdingnuts:holdingnuts.desktop.in.h:1
@@ -7856,11 +7935,11 @@
 msgstr ""
 
 #: ../menu-data/homebank:homebank.desktop.in.h:1
-msgid "Free, easy, personal accounting for everyone."
+msgid "HomeBank"
 msgstr ""
 
 #: ../menu-data/homebank:homebank.desktop.in.h:2
-msgid "HomeBank"
+msgid "Free, easy, personal accounting for everyone."
 msgstr ""
 
 #: ../menu-data/horae:artemis.desktop.in.h:1
@@ -7904,27 +7983,27 @@
 msgstr ""
 
 #: ../menu-data/hotssh:hotssh.desktop.in.h:1
-msgid "Connect to a remote computer using Secure Shell"
+msgid "Secure Shell"
 msgstr ""
 
 #: ../menu-data/hotssh:hotssh.desktop.in.h:2
-msgid "Secure Shell"
+msgid "Connect to a remote computer using Secure Shell"
 msgstr ""
 
 #: ../menu-data/hotwire:hotwire.desktop.in.h:1
-msgid "Execute text commands"
+msgid "Hotwire Shell"
 msgstr ""
 
 #: ../menu-data/hotwire:hotwire.desktop.in.h:2
-msgid "Hotwire Shell"
+msgid "Execute text commands"
 msgstr ""
 
 #: ../menu-data/hplip-gui:hplip.desktop.in.h:1
-msgid "HP Printing System Control Center"
+msgid "HPLIP Toolbox"
 msgstr ""
 
 #: ../menu-data/hplip-gui:hplip.desktop.in.h:2
-msgid "HPLIP Toolbox"
+msgid "HP Printing System Control Center"
 msgstr ""
 
 #: ../menu-data/htop:htop.desktop.in.h:1
@@ -7935,49 +8014,36 @@
 msgid "Show System Processes"
 msgstr ""
 
-#: ../menu-data/hugin:calibrate_lens_gui.desktop.in.h:1
-msgid "Hugin Calibrate Lens"
-msgstr ""
-
-#: ../menu-data/hugin:calibrate_lens_gui.desktop.in.h:2
-#: ../menu-data/hugin:hugin.desktop.in.h:2
-msgid "Stitch photographs together"
-msgstr ""
-
-#: ../menu-data/hugin:hugin.desktop.in.h:1
-msgid "Hugin Panorama Creator"
-msgstr ""
-
 #: ../menu-data/hydra-gtk:hydra-gtk.desktop.in.h:1
-msgid "A fast network logon cracker"
+msgid "XHydra"
 msgstr ""
 
 #: ../menu-data/hydra-gtk:hydra-gtk.desktop.in.h:2
-msgid "XHydra"
+msgid "A fast network logon cracker"
 msgstr ""
 
 #: ../menu-data/hydrogen:hydrogen.desktop.in.h:1
-msgid "Create drum sequences"
+msgid "Hydrogen"
 msgstr ""
 
 #: ../menu-data/hydrogen:hydrogen.desktop.in.h:2
-msgid "Hydrogen Drum Machine"
+msgid "Create drum sequences"
 msgstr ""
 
 #: ../menu-data/iagno:iagno.desktop.in.h:1
-msgid "Dominate the board in a classic version of Reversi"
+msgid "Iagno"
 msgstr ""
 
 #: ../menu-data/iagno:iagno.desktop.in.h:2
-msgid "Iagno"
+msgid "Dominate the board in a classic version of Reversi"
 msgstr ""
 
 #: ../menu-data/ibus:ibus-setup.desktop.in.h:1
-msgid "Adjust methods for keyboard input."
+msgid "Keyboard Input Methods"
 msgstr ""
 
 #: ../menu-data/ibus:ibus-setup.desktop.in.h:2
-msgid "Keyboard Input Methods"
+msgid "Adjust methods for keyboard input."
 msgstr ""
 
 #: ../menu-data/ibus:ibus.desktop.in.h:1
@@ -7997,11 +8063,11 @@
 msgstr ""
 
 #: ../menu-data/icecc-monitor:kde4__icemon.desktop.in.h:1
-msgid "A monitor for an Icecream compilation network"
+msgid "Icemon"
 msgstr ""
 
 #: ../menu-data/icecc-monitor:kde4__icemon.desktop.in.h:2
-msgid "Icemon"
+msgid "A monitor for an Icecream compilation network"
 msgstr ""
 
 #: ../menu-data/icedtea-netx-common:icedtea-netx-javaws.desktop.in.h:1
@@ -8057,11 +8123,11 @@
 msgstr ""
 
 #: ../menu-data/ifpgui:ifpgui.desktop.in.h:1
-msgid "KDE-style GUI for iRiver iFP flash players "
+msgid "ifpgui"
 msgstr ""
 
 #: ../menu-data/ifpgui:ifpgui.desktop.in.h:2
-msgid "ifpgui"
+msgid "KDE-style GUI for iRiver iFP flash players "
 msgstr ""
 
 #: ../menu-data/ifrit:ifrit.desktop.in.h:1
@@ -8073,23 +8139,23 @@
 msgstr ""
 
 #: ../menu-data/ii-esu:ii-esu.desktop.in.h:1
-msgid "HIZ's ES"
+msgid "ii-esu"
 msgstr ""
 
 #: ../menu-data/ii-esu:ii-esu.desktop.in.h:2
-msgid "ii-esu"
+msgid "HIZ's ES"
 msgstr ""
 
 #: ../menu-data/ike-qtgui:ike.desktop.in.h:1
-msgid "Application to manage remote site configurations"
+msgid "Shrew Soft VPN Access Manager"
 msgstr ""
 
 #: ../menu-data/ike-qtgui:ike.desktop.in.h:2
-msgid "Shrew Soft VPN Access Manager"
+msgid "Application to manage remote site configurations"
 msgstr ""
 
 #: ../menu-data/im-config:im-config.desktop.in.h:1
-#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:2
+#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1
 msgid "Input Method"
 msgstr ""
 
@@ -8103,11 +8169,11 @@
 msgstr ""
 
 #: ../menu-data/imagej:imagej.desktop.in.h:1
-msgid "Image processing and analysis"
+msgid "ImageJ"
 msgstr ""
 
 #: ../menu-data/imagej:imagej.desktop.in.h:2
-msgid "ImageJ"
+msgid "Image processing and analysis"
 msgstr ""
 
 #: ../menu-data/imageshack-uploader:imageshackuploader.desktop.in.h:1
@@ -8118,12 +8184,20 @@
 msgid "Upload your images and videos to ImageShack"
 msgstr ""
 
+#: ../menu-data/imagevis3d:imagevis3d.desktop.in.h:1
+msgid "ImageVis3D"
+msgstr ""
+
+#: ../menu-data/imagevis3d:imagevis3d.desktop.in.h:2
+msgid "Desktop volume rendering application for large data"
+msgstr ""
+
 #: ../menu-data/imagination:imagination.desktop.in.h:1
-msgid "A lightweight DVD slideshow maker using GTK+2"
+msgid "Imagination"
 msgstr ""
 
 #: ../menu-data/imagination:imagination.desktop.in.h:2
-msgid "Imagination"
+msgid "A lightweight DVD slideshow maker using GTK+2"
 msgstr ""
 
 #: ../menu-data/imview:imview.desktop.in.h:1
@@ -8135,31 +8209,31 @@
 msgstr ""
 
 #: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:1
+msgid "System Load Indicator"
+msgstr ""
+
+#: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:2
 msgid ""
 "A system load monitor capable of displaying graphs for CPU, ram, and swap "
 "space use, plus network traffic."
 msgstr ""
 
-#: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:2
-msgid "System Load Indicator"
+#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:1
+msgid "Weather Indicator"
 msgstr ""
 
-#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:1
+#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:2
 msgid ""
 "A weather indicator that displays information for one or multiple places in "
 "the world"
 msgstr ""
 
-#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:2
-msgid "Weather Indicator"
-msgstr ""
-
 #: ../menu-data/inkscape:inkscape.desktop.in.h:1
-msgid "Create and edit Scalable Vector Graphics images"
+msgid "Inkscape Vector Graphics Editor"
 msgstr ""
 
 #: ../menu-data/inkscape:inkscape.desktop.in.h:2
-msgid "Inkscape Vector Graphics Editor"
+msgid "Create and edit Scalable Vector Graphics images"
 msgstr ""
 
 #: ../menu-data/insanity-tools:insanity-gtk.desktop.in.h:1
@@ -8179,43 +8253,67 @@
 msgstr ""
 
 #: ../menu-data/iok:iok.desktop.in.h:1
-msgid "Enter Indic characters with a virtual keyboard"
+msgid "Indic Onscreen Keyboard"
 msgstr ""
 
 #: ../menu-data/iok:iok.desktop.in.h:2
-msgid "Indic Onscreen Keyboard"
+msgid "Enter Indic characters with a virtual keyboard"
 msgstr ""
 
 #: ../menu-data/iptux:iptux.desktop.in.h:1
-msgid "Lan communication software"
+msgid "iptux"
 msgstr ""
 
 #: ../menu-data/iptux:iptux.desktop.in.h:2
-msgid "iptux"
+msgid "Lan communication software"
+msgstr ""
+
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:1
+msgid "Enhanced interactive Python qtconsole"
+msgstr ""
+
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:2
+msgid "IPython Qt console"
+msgstr ""
+
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:3
+msgid "Pylab"
+msgstr ""
+
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:4
+msgid "Pylab (inline plots)"
+msgstr ""
+
+#: ../menu-data/ipython:ipython.desktop.in.h:1
+msgid "Enhanced interactive Python shell"
+msgstr ""
+
+#: ../menu-data/ipython:ipython.desktop.in.h:2
+msgid "ipython"
 msgstr ""
 
 #: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:1
-msgid "A simple OBEX file transfer applet"
+msgid "Ircp Tray"
 msgstr ""
 
 #: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:2
-msgid "Ircp Tray"
+msgid "A simple OBEX file transfer applet"
 msgstr ""
 
 #: ../menu-data/iriverter:iriverter.desktop.in.h:1
-msgid "Convert videos for your handheld device"
+msgid "iriverter"
 msgstr ""
 
 #: ../menu-data/iriverter:iriverter.desktop.in.h:2
-msgid "iriverter"
+msgid "Convert videos for your handheld device"
 msgstr ""
 
 #: ../menu-data/isag:isag.desktop.in.h:1
-msgid "Interactive System Activity Grapher for sysstat"
+msgid "Isag System Activity Grapher"
 msgstr ""
 
 #: ../menu-data/isag:isag.desktop.in.h:2
-msgid "Isag System Activity Grapher"
+msgid "Interactive System Activity Grapher for sysstat"
 msgstr ""
 
 #: ../menu-data/isomaster:isomaster.desktop.in.h:1
@@ -8235,11 +8333,11 @@
 msgstr ""
 
 #: ../menu-data/italc-master:italc.desktop.in.h:1
-msgid "Computer room overview"
+msgid "iTalc master interface"
 msgstr ""
 
 #: ../menu-data/italc-master:italc.desktop.in.h:2
-msgid "iTalc master interface"
+msgid "Computer room overview"
 msgstr ""
 
 #: ../menu-data/itksnap:itksnap.desktop.in.h:1
@@ -8251,19 +8349,19 @@
 msgstr ""
 
 #: ../menu-data/jaaa:jaaa-alsa.desktop.in.h:1
-msgid "Analyse or generate an Audio signal through ALSA"
+msgid "Jaaa (with ALSA support)"
 msgstr ""
 
 #: ../menu-data/jaaa:jaaa-alsa.desktop.in.h:2
-msgid "Jaaa (with ALSA support)"
+msgid "Analyse or generate an Audio signal through ALSA"
 msgstr ""
 
 #: ../menu-data/jabref:jabref.desktop.in.h:1
-msgid "Graphical editor for BibTex bibliographies"
+msgid "JabRef"
 msgstr ""
 
 #: ../menu-data/jabref:jabref.desktop.in.h:2
-msgid "JabRef"
+msgid "Graphical editor for BibTex bibliographies"
 msgstr ""
 
 #: ../menu-data/jack-keyboard:jack-keyboard.desktop.in.h:1
@@ -8311,11 +8409,11 @@
 msgstr ""
 
 #: ../menu-data/jamin:jamin.desktop.in.h:1
-msgid "JACK Audio Mastering interface"
+msgid "JAMin"
 msgstr ""
 
 #: ../menu-data/jamin:jamin.desktop.in.h:2
-msgid "JAMin"
+msgid "JACK Audio Mastering interface"
 msgstr ""
 
 #: ../menu-data/jampal:jampal.desktop.in.h:1
@@ -8327,27 +8425,27 @@
 msgstr ""
 
 #: ../menu-data/japa:japa-alsa.desktop.in.h:1
-msgid "Analyse an Audio signal through ALSA"
+msgid "Japa (with ALSA support)"
 msgstr ""
 
 #: ../menu-data/japa:japa-alsa.desktop.in.h:2
-msgid "Japa (with ALSA support)"
+msgid "Analyse an Audio signal through ALSA"
 msgstr ""
 
 #: ../menu-data/japa:japa-jack.desktop.in.h:1
-msgid "Analyse an Audio signal through JACK"
+msgid "Japa (with JACK support)"
 msgstr ""
 
 #: ../menu-data/japa:japa-jack.desktop.in.h:2
-msgid "Japa (with JACK support)"
+msgid "Analyse an Audio signal through JACK"
 msgstr ""
 
 #: ../menu-data/jargoninformatique:jargoninformatique.desktop.in.h:1
-msgid "French computering dictionary"
+msgid "Jargon Informatique"
 msgstr ""
 
 #: ../menu-data/jargoninformatique:jargoninformatique.desktop.in.h:2
-msgid "Jargon Informatique"
+msgid "French computering dictionary"
 msgstr ""
 
 #: ../menu-data/javamorph:javamorph.desktop.in.h:1
@@ -8367,11 +8465,11 @@
 msgstr ""
 
 #: ../menu-data/jcgui:Jc_Gui.desktop.in.h:1
-msgid "Host for jconvolver"
+msgid "Jc_Gui"
 msgstr ""
 
 #: ../menu-data/jcgui:Jc_Gui.desktop.in.h:2
-msgid "Jc_Gui"
+msgid "Host for jconvolver"
 msgstr ""
 
 #: ../menu-data/jclic:jclic.desktop.in.h:1
@@ -8392,34 +8490,34 @@
 msgid "JD is a 2ch browser based on gtkmm2."
 msgstr ""
 
-#: ../menu-data/jedit:jedit.desktop.in.h:2
+#: ../menu-data/jedit:jedit.desktop.in.h:1
 msgid "jEdit"
 msgstr ""
 
 #: ../menu-data/jeex:jeex.desktop.in.h:1
-msgid "Hexadecimal Editor for Linux"
+msgid "Jeex"
 msgstr ""
 
 #: ../menu-data/jeex:jeex.desktop.in.h:2
-msgid "Jeex"
+msgid "Hexadecimal Editor for Linux"
 msgstr ""
 
 #: ../menu-data/jemboss:jemboss.desktop.in.h:1
-msgid ""
-"Graphical user interface for the European Molecular Biology Open Software "
-"Suite."
+msgid "Jemboss"
 msgstr ""
 
 #: ../menu-data/jemboss:jemboss.desktop.in.h:2
-msgid "Jemboss"
+msgid ""
+"Graphical user interface for the European Molecular Biology Open Software "
+"Suite."
 msgstr ""
 
 #: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:1
-msgid "Calculate Fractions is fun!"
+msgid "JFractionLab"
 msgstr ""
 
 #: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:2
-msgid "JFractionLab"
+msgid "Calculate Fractions is fun!"
 msgstr ""
 
 #: ../menu-data/jftp:jftp.desktop.in.h:1
@@ -8431,36 +8529,36 @@
 msgstr ""
 
 #: ../menu-data/jhbuild:jhbuild.desktop.in.h:1
-msgid "Build GNOME modules"
+msgid "GNOME Build Tool"
 msgstr ""
 
 #: ../menu-data/jhbuild:jhbuild.desktop.in.h:2
-msgid "GNOME Build Tool"
+msgid "Build GNOME modules"
 msgstr ""
 
 #: ../menu-data/jigzo:jigzo.desktop.in.h:1
-msgid "Photo puzzle game for children"
+msgid "jigzo"
 msgstr ""
 
 #: ../menu-data/jigzo:jigzo.desktop.in.h:2
-msgid "jigzo"
+msgid "Photo puzzle game for children"
 msgstr ""
 
 #: ../menu-data/jkmeter:jkmeter.desktop.in.h:1
-#: ../menu-data/meterbridge:meterbridge.desktop.in.h:1
-msgid "Audio level meter for JACK"
+msgid "Jkmeter"
 msgstr ""
 
 #: ../menu-data/jkmeter:jkmeter.desktop.in.h:2
-msgid "Jkmeter"
+#: ../menu-data/meterbridge:meterbridge.desktop.in.h:2
+msgid "Audio level meter for JACK"
 msgstr ""
 
 #: ../menu-data/jlgui:jlgui.desktop.in.h:1
-msgid "graphical music player"
+msgid "jlGui"
 msgstr ""
 
 #: ../menu-data/jlgui:jlgui.desktop.in.h:2
-msgid "jlGui"
+msgid "graphical music player"
 msgstr ""
 
 #: ../menu-data/jmeter:jmeter.desktop.in.h:1
@@ -8488,19 +8586,19 @@
 msgstr ""
 
 #: ../menu-data/jnoisemeter:jnoisemeter.desktop.in.h:1
-msgid "Audio test signals meter for JACK"
+msgid "Jnoisemeter"
 msgstr ""
 
 #: ../menu-data/jnoisemeter:jnoisemeter.desktop.in.h:2
-msgid "Jnoisemeter"
+msgid "Audio test signals meter for JACK"
 msgstr ""
 
 #: ../menu-data/jobs-admin:jobs-admin.desktop.in.h:1
-msgid "Manage system jobs present on your computer"
+msgid "System Jobs"
 msgstr ""
 
 #: ../menu-data/jobs-admin:jobs-admin.desktop.in.h:2
-msgid "System Jobs"
+msgid "Manage system jobs present on your computer"
 msgstr ""
 
 #: ../menu-data/jockey-gtk:jockey-gtk.desktop.in.h:1
@@ -8522,11 +8620,11 @@
 msgstr ""
 
 #: ../menu-data/josm:josm.desktop.in.h:1
-msgid "Editor for OpenStreetMap.org"
+msgid "Josm"
 msgstr ""
 
 #: ../menu-data/josm:josm.desktop.in.h:2
-msgid "Josm"
+msgid "Editor for OpenStreetMap.org"
 msgstr ""
 
 #: ../menu-data/jovie:kde4__jovieapp.desktop.in.h:1
@@ -8538,43 +8636,43 @@
 msgstr ""
 
 #: ../menu-data/jpilot:jpilot.desktop.in.h:1
-msgid "Desktop organizer application for the Palm Pilot"
+msgid "J-Pilot"
 msgstr ""
 
 #: ../menu-data/jpilot:jpilot.desktop.in.h:2
-msgid "J-Pilot"
+msgid "Desktop organizer application for the Palm Pilot"
 msgstr ""
 
 #: ../menu-data/jscribble:jscribble.desktop.in.h:1
-msgid "Infinite Notepad"
+msgid "jscribble"
 msgstr ""
 
 #: ../menu-data/jscribble:jscribble.desktop.in.h:2
-msgid "jscribble"
+msgid "Infinite Notepad"
 msgstr ""
 
 #: ../menu-data/jstest-gtk:jstest-gtk.desktop.in.h:1
-msgid "Joystick testing and configuration tool"
+msgid "jstest-gtk"
 msgstr ""
 
 #: ../menu-data/jstest-gtk:jstest-gtk.desktop.in.h:2
-msgid "jstest-gtk"
+msgid "Joystick testing and configuration tool"
 msgstr ""
 
 #: ../menu-data/jsymphonic:jsymphonic.desktop.in.h:1
-msgid "File manager for Sony MP3 players"
+msgid "JSymphonic"
 msgstr ""
 
 #: ../menu-data/jsymphonic:jsymphonic.desktop.in.h:2
-msgid "JSymphonic"
+msgid "File manager for Sony MP3 players"
 msgstr ""
 
 #: ../menu-data/juffed:juffed.desktop.in.h:1
-msgid "Advanced text editor"
+msgid "JuffEd text editor"
 msgstr ""
 
 #: ../menu-data/juffed:juffed.desktop.in.h:2
-msgid "JuffEd text editor"
+msgid "Advanced text editor"
 msgstr ""
 
 #: ../menu-data/juk:kde4__juk.desktop.in.h:1
@@ -8590,11 +8688,11 @@
 msgstr ""
 
 #: ../menu-data/jumpnbump:jumpnbump.desktop.in.h:1
-msgid "Jump on your opponents to make them explode"
+msgid "Jump'n'Bump"
 msgstr ""
 
 #: ../menu-data/jumpnbump:jumpnbump.desktop.in.h:2
-msgid "Jump'n'Bump"
+msgid "Jump on your opponents to make them explode"
 msgstr ""
 
 #: ../menu-data/jxplorer:jxplorer.desktop.in.h:1
@@ -8614,11 +8712,11 @@
 msgstr ""
 
 #: ../menu-data/k3d:k3d.desktop.in.h:1
-msgid "Free-as-in-freedom 3D modeling and animation software"
+msgid "K-3D"
 msgstr ""
 
 #: ../menu-data/k3d:k3d.desktop.in.h:2
-msgid "K-3D"
+msgid "Free-as-in-freedom 3D modeling and animation software"
 msgstr ""
 
 #: ../menu-data/k3dsurf:k3dsurf.desktop.in.h:1
@@ -8630,19 +8728,19 @@
 msgstr ""
 
 #: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:1
-msgid "Directory statistics and disk usage"
+msgid "K4DirStat"
 msgstr ""
 
 #: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:2
-msgid "K4DirStat"
+msgid "Directory statistics and disk usage"
 msgstr ""
 
 #: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:1
-msgid "DVD9 to DVD5 backup tool"
+msgid "k9copy"
 msgstr ""
 
 #: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:2
-msgid "k9copy"
+msgid "DVD9 to DVD5 backup tool"
 msgstr ""
 
 #: ../menu-data/kabikaboo:kabikaboo.desktop.in.h:1
@@ -8653,24 +8751,20 @@
 msgid "Manage large collections of notes"
 msgstr ""
 
-#: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1
-msgid "Kontact Touch Contacts"
-msgstr ""
-
 #: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:1
-msgid "Contact Manager"
+msgid "KAddressBook"
 msgstr ""
 
 #: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:2
-msgid "KAddressBook"
+msgid "Contact Manager"
 msgstr ""
 
 #: ../menu-data/kadu:kadu.desktop.in.h:1
-msgid "Gadu-Gadu/XMPP protocol client"
+msgid "Kadu"
 msgstr ""
 
 #: ../menu-data/kadu:kadu.desktop.in.h:2
-msgid "Kadu"
+msgid "Gadu-Gadu/XMPP protocol client"
 msgstr ""
 
 #: ../menu-data/kaffeine:kde4__kaffeine.desktop.in.h:1
@@ -8718,11 +8812,11 @@
 msgstr ""
 
 #: ../menu-data/kamerka:kde4__kamerka.desktop.in.h:1
-msgid "Fancy-looking animated application for taking photos from webcam"
+msgid "Kamerka"
 msgstr ""
 
 #: ../menu-data/kamerka:kde4__kamerka.desktop.in.h:2
-msgid "Kamerka"
+msgid "Fancy-looking animated application for taking photos from webcam"
 msgstr ""
 
 #: ../menu-data/kamoso:kde4__kamoso.desktop.in.h:1
@@ -8738,43 +8832,43 @@
 msgstr ""
 
 #: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:1
-msgid "KDE Letter Order Game"
+msgid "Kanagram"
 msgstr ""
 
 #: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:2
-msgid "Kanagram"
+msgid "KDE Letter Order Game"
 msgstr ""
 
 #: ../menu-data/kanatest:kanatest.desktop.in.h:1
-msgid "Drill game to learn Japanese kana characters"
+msgid "Kana test"
 msgstr ""
 
 #: ../menu-data/kanatest:kanatest.desktop.in.h:2
-msgid "Kana test"
+msgid "Drill game to learn Japanese kana characters"
 msgstr ""
 
 #: ../menu-data/kanyremote:kanyremote.desktop.in.h:1
-msgid "Bluetooth remote control for KDE"
+msgid "kanyremote"
 msgstr ""
 
 #: ../menu-data/kanyremote:kanyremote.desktop.in.h:2
-msgid "kanyremote"
+msgid "Bluetooth remote control for KDE"
 msgstr ""
 
 #: ../menu-data/kapman:kde4__kapman.desktop.in.h:1
-msgid "Eat pills escaping ghosts"
+msgid "Kapman"
 msgstr ""
 
 #: ../menu-data/kapman:kde4__kapman.desktop.in.h:2
-msgid "Kapman"
+msgid "Eat pills escaping ghosts"
 msgstr ""
 
 #: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:1
-msgid "KAppTemplate"
+msgid "KDE Template Generator"
 msgstr ""
 
 #: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:2
-msgid "KDE Template Generator"
+msgid "KAppTemplate"
 msgstr ""
 
 #: ../menu-data/kasumi:kasumi.desktop.in.h:1
@@ -8810,27 +8904,27 @@
 msgstr ""
 
 #: ../menu-data/kayali:kayali.desktop.in.h:1
-msgid "A Computer Algebra System"
+msgid "Kayali"
 msgstr ""
 
 #: ../menu-data/kayali:kayali.desktop.in.h:2
-msgid "Kayali"
+msgid "A Computer Algebra System"
 msgstr ""
 
 #: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:1
-msgid "Backup your data with an easy to use user interface"
+msgid "KBackup"
 msgstr ""
 
 #: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:2
-msgid "KBackup"
+msgid "Backup your data with an easy to use user interface"
 msgstr ""
 
 #: ../menu-data/kball:kball.desktop.in.h:1
-msgid "Find the exit"
+msgid "KBall"
 msgstr ""
 
 #: ../menu-data/kball:kball.desktop.in.h:2
-msgid "KBall"
+msgid "Find the exit"
 msgstr ""
 
 #: ../menu-data/kbattleship:kde4__kbattleship.desktop.in.h:1
@@ -8842,11 +8936,11 @@
 msgstr ""
 
 #: ../menu-data/kbedic:kbedic.desktop.in.h:1
-msgid "Bulgarian English dictionary"
+msgid "kbe Dictionary"
 msgstr ""
 
 #: ../menu-data/kbedic:kbedic.desktop.in.h:2
-msgid "kbe Dictionary"
+msgid "Bulgarian English dictionary"
 msgstr ""
 
 #: ../menu-data/kbibtex:kde4__kbibtex.desktop.in.h:1
@@ -8866,35 +8960,35 @@
 msgstr ""
 
 #: ../menu-data/kblocks:kde4__kblocks.desktop.in.h:1
-msgid "Falling Blocks Game"
+msgid "KBlocks"
 msgstr ""
 
 #: ../menu-data/kblocks:kde4__kblocks.desktop.in.h:2
-msgid "KBlocks"
+msgid "Falling Blocks Game"
 msgstr ""
 
 #: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:1
-msgid "Ball Bouncing Game"
+msgid "KBounce"
 msgstr ""
 
 #: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:2
-msgid "KBounce"
+msgid "Ball Bouncing Game"
 msgstr ""
 
 #: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:1
-msgid "Breakout-like Game"
+msgid "KBreakOut"
 msgstr ""
 
 #: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:2
-msgid "KBreakOut"
+msgid "Breakout-like Game"
 msgstr ""
 
 #: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:1
-msgid "KBruch"
+msgid "Practice exercises with fractions"
 msgstr ""
 
 #: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:2
-msgid "Practice exercises with fractions"
+msgid "KBruch"
 msgstr ""
 
 #: ../menu-data/kcachegrind:kde4__kcachegrind.desktop.in.h:1
@@ -8914,11 +9008,11 @@
 msgstr ""
 
 #: ../menu-data/kcemu:kcemu.desktop.in.h:1
-msgid "Emulator for KC85 and compatible computer"
+msgid "KCemu"
 msgstr ""
 
 #: ../menu-data/kcemu:kcemu.desktop.in.h:2
-msgid "KCemu"
+msgid "Emulator for KC85 and compatible computer"
 msgstr ""
 
 #: ../menu-data/kcharselect:kde4__KCharSelect.desktop.in.h:1
@@ -8930,21 +9024,21 @@
 msgstr ""
 
 #: ../menu-data/kcheckgmail:kde4__kcheckgmail.desktop.in.h:1
-msgid ""
-"A Kicker applet to display how many email messages you have in your Gmail "
-"account."
+msgid "KCheckGMail"
 msgstr ""
 
 #: ../menu-data/kcheckgmail:kde4__kcheckgmail.desktop.in.h:2
-msgid "KCheckGMail"
+msgid ""
+"A Kicker applet to display how many email messages you have in your Gmail "
+"account."
 msgstr ""
 
 #: ../menu-data/kchmviewer:kde4__kchmviewer.desktop.in.h:1
-msgid "A viewer of CHM (MS-Help) files"
+msgid "KchmViewer"
 msgstr ""
 
 #: ../menu-data/kchmviewer:kde4__kchmviewer.desktop.in.h:2
-msgid "KchmViewer"
+msgid "A viewer of CHM (MS-Help) files"
 msgstr ""
 
 #: ../menu-data/kcollectd:kde4__kcollectd.desktop.in.h:1
@@ -8972,19 +9066,19 @@
 msgstr ""
 
 #: ../menu-data/kdbg:kde4__kdbg.desktop.in.h:1
-msgid "Debug programs"
+msgid "KDbg"
 msgstr ""
 
 #: ../menu-data/kdbg:kde4__kdbg.desktop.in.h:2
-msgid "KDbg"
+msgid "Debug programs"
 msgstr ""
 
 #: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:1
-msgid "Touchpad management"
+msgid "synaptiks"
 msgstr ""
 
 #: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:2
-msgid "synaptiks"
+msgid "Touchpad management"
 msgstr ""
 
 #: ../menu-data/kde-runtime-data:kde4__nepomukbackup.desktop.in.h:1
@@ -9007,21 +9101,21 @@
 msgid "Network Folder Wizard"
 msgstr ""
 
-#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:2
+#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:1
 msgid "KFontView"
 msgstr ""
 
 #: ../menu-data/kde-workspace-bin:kde4__krandrtray.desktop.in.h:1
-msgid "A panel applet for resizing and reorientating X screens."
+msgid "KRandRTray"
 msgstr ""
 
 #: ../menu-data/kde-workspace-bin:kde4__krandrtray.desktop.in.h:2
-msgid "KRandRTray"
+msgid "A panel applet for resizing and reorientating X screens."
 msgstr ""
 
-#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:2
-#: ../menu-data/okular:kde4__okular.desktop.in.h:2
-#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:2
+#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:1
+#: ../menu-data/okular:kde4__okular.desktop.in.h:1
+#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:1
 msgid "Okular"
 msgstr ""
 
@@ -9052,41 +9146,46 @@
 msgstr ""
 
 #: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:1
-msgid "Akonadi Tray Utility"
+msgid "Akonaditray"
 msgstr ""
 
 #: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:2
-msgid "Akonaditray"
+msgid "Akonadi Tray Utility"
 msgstr ""
 
-#: ../menu-data/kdepim-wizards:kde4__groupwarewizard.desktop.in.h:1
-msgid "KDE Groupware Wizard"
+#: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:1
+msgid "KDE Source Builder"
 msgstr ""
 
-#: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:1
+#: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:2
 msgid ""
 "Builds the KDE Platform and associated software from its source code. A "
 "command-line only program."
 msgstr ""
 
-#: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:2
-msgid "KDE Source Builder"
-msgstr ""
-
 #: ../menu-data/kdesvn:kde4__kdesvn.desktop.in.h:1
-msgid "A Subversion client for KDE"
+msgid "kdesvn"
 msgstr ""
 
 #: ../menu-data/kdesvn:kde4__kdesvn.desktop.in.h:2
-msgid "kdesvn"
+msgid "A Subversion client for KDE"
 msgstr ""
 
 #: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:1
-msgid "Integrated Development Environment"
+msgid "KDevelop 4"
 msgstr ""
 
 #: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:2
-msgid "KDevelop 4"
+#: ../menu-data/netbeans:netbeans.desktop.in.h:2
+msgid "Integrated Development Environment"
+msgstr ""
+
+#: ../menu-data/kdevelop:kde4__kdevelop_ps.desktop.in.h:1
+msgid "KDevelop 4 (Pick Session)"
+msgstr ""
+
+#: ../menu-data/kdevelop:kde4__kdevelop_ps.desktop.in.h:2
+msgid "Integrated Development Environment (Pick Session to start with)"
 msgstr ""
 
 #: ../menu-data/kdf:kde4__kdf.desktop.in.h:1
@@ -9106,25 +9205,29 @@
 msgstr ""
 
 #: ../menu-data/kdiff3:kde4__kdiff3.desktop.in.h:1
-msgid "A File And Directory Comparison And Merge Tool"
+msgid "KDiff3"
 msgstr ""
 
 #: ../menu-data/kdiff3:kde4__kdiff3.desktop.in.h:2
-msgid "KDiff3"
+msgid "A File And Directory Comparison And Merge Tool"
 msgstr ""
 
 #: ../menu-data/kdocker:kdocker.desktop.in.h:1
-msgid "Docks any application into system tray"
+msgid "KDocker"
 msgstr ""
 
 #: ../menu-data/kdocker:kdocker.desktop.in.h:2
-msgid "KDocker"
+msgid "Docks any application into system tray"
 msgstr ""
 
 #: ../menu-data/kdrill:kdrill.desktop.in.h:1
 msgid "KDrill"
 msgstr ""
 
+#: ../menu-data/kedpm-gtk:kedpm-gtk.desktop.in.h:1
+msgid "Ked Password Manager"
+msgstr ""
+
 #: ../menu-data/keepass2:keepass2.desktop.in.h:1
 msgid "KeePass2"
 msgstr ""
@@ -9134,11 +9237,11 @@
 msgstr ""
 
 #: ../menu-data/keepassx:keepassx.desktop.in.h:1
-msgid "Cross Platform Password Manager"
+msgid "KeePassX"
 msgstr ""
 
 #: ../menu-data/keepassx:keepassx.desktop.in.h:2
-msgid "KeePassX"
+msgid "Cross Platform Password Manager"
 msgstr ""
 
 #: ../menu-data/kepas:kde4__kepas.desktop.in.h:1
@@ -9158,19 +9261,19 @@
 msgstr ""
 
 #: ../menu-data/keurocalc:kde4__keurocalc.desktop.in.h:1
-msgid "A currency converter and calculator"
+msgid "KEuroCalc"
 msgstr ""
 
 #: ../menu-data/keurocalc:kde4__keurocalc.desktop.in.h:2
-msgid "KEuroCalc"
+msgid "A currency converter and calculator"
 msgstr ""
 
 #: ../menu-data/kexi:kde4__kexi.desktop.in.h:1
-msgid "Develop desktop database applications"
+msgid "Kexi"
 msgstr ""
 
 #: ../menu-data/kexi:kde4__kexi.desktop.in.h:2
-msgid "Kexi"
+msgid "Develop desktop database applications"
 msgstr ""
 
 #: ../menu-data/keyboardcast:keyboardcast.desktop.in.h:1
@@ -9190,19 +9293,19 @@
 msgstr ""
 
 #: ../menu-data/keysafe:keysafe.desktop.in.h:1
-msgid "A password safe"
+msgid "KeySafe"
 msgstr ""
 
 #: ../menu-data/keysafe:keysafe.desktop.in.h:2
-msgid "KeySafe"
+msgid "A password safe"
 msgstr ""
 
 #: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:1
-msgid "Edit keyboard maps for keytouch"
+msgid "KeyTouch Editor"
 msgstr ""
 
 #: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:2
-msgid "KeyTouch Editor"
+msgid "Edit keyboard maps for keytouch"
 msgstr ""
 
 #: ../menu-data/kfilereplace:kde4__kfilereplace.desktop.in.h:1
@@ -9226,62 +9329,62 @@
 msgstr ""
 
 #: ../menu-data/kfourinline:kde4__kfourinline.desktop.in.h:1
-msgid "Four-in-a-row Board Game"
+msgid "KFourInLine"
 msgstr ""
 
 #: ../menu-data/kfourinline:kde4__kfourinline.desktop.in.h:2
-msgid "KFourInLine"
+msgid "Four-in-a-row Board Game"
 msgstr ""
 
 #: ../menu-data/kfritz:kde4__kfritz.desktop.in.h:1
-msgid ""
-"Access call history and phone book of your Fritz!Box and get notifications "
-"on incoming and outgoing calls."
+msgid "KFritz"
 msgstr ""
 
 #: ../menu-data/kfritz:kde4__kfritz.desktop.in.h:2
-msgid "KFritz"
+msgid ""
+"Access call history and phone book of your Fritz!Box and get notifications "
+"on incoming and outgoing calls."
 msgstr ""
 
 #: ../menu-data/kftpgrabber:kde4__kftpgrabber.desktop.in.h:1
-msgid "A graphical FTP client"
+msgid "KFTPGrabber"
 msgstr ""
 
 #: ../menu-data/kftpgrabber:kde4__kftpgrabber.desktop.in.h:2
-msgid "KFTPGrabber"
+msgid "A graphical FTP client"
 msgstr ""
 
 #: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:1
-msgid "A Geography Learning Program"
+msgid "KGeography"
 msgstr ""
 
 #: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:2
-msgid "KGeography"
+msgid "A Geography Learning Program"
 msgstr ""
 
 #: ../menu-data/kget:kde4__kget.desktop.in.h:1
-#: ../menu-data/steadyflow:steadyflow.desktop.in.h:1
-msgid "Download Manager"
+msgid "KGet"
 msgstr ""
 
 #: ../menu-data/kget:kde4__kget.desktop.in.h:2
-msgid "KGet"
+#: ../menu-data/steadyflow:steadyflow.desktop.in.h:1
+msgid "Download Manager"
 msgstr ""
 
 #: ../menu-data/kgmailnotifier:kde4__kgmailnotifier.desktop.in.h:1
-msgid "A Gmail notifier applet for KDE"
+msgid "KGmailNotifier"
 msgstr ""
 
 #: ../menu-data/kgmailnotifier:kde4__kgmailnotifier.desktop.in.h:2
-msgid "KGmailNotifier"
+msgid "A Gmail notifier applet for KDE"
 msgstr ""
 
 #: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:1
-msgid "A game of action and puzzle-solving"
+msgid "KGoldrunner"
 msgstr ""
 
 #: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:2
-msgid "KGoldrunner"
+msgid "A game of action and puzzle-solving"
 msgstr ""
 
 #: ../menu-data/kgpg:kde4__kgpg.desktop.in.h:1
@@ -9293,27 +9396,27 @@
 msgstr ""
 
 #: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:1
-msgid "KGrab"
+msgid "Screen Grabbing Program"
 msgstr ""
 
 #: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:2
-msgid "Screen Grabbing Program"
+msgid "KGrab"
 msgstr ""
 
 #: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:1
-msgid "A Graphviz dot graph editor for KDE"
+msgid "kgrapheditor"
 msgstr ""
 
 #: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:2
-msgid "kgrapheditor"
+msgid "A Graphviz dot graph editor for KDE"
 msgstr ""
 
 #: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:1
-msgid "A Graphviz dot graph viewer for KDE"
+msgid "kgraphviewer"
 msgstr ""
 
 #: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:2
-msgid "kgraphviewer"
+msgid "A Graphviz dot graph viewer for KDE"
 msgstr ""
 
 #: ../menu-data/khangman:kde4__khangman.desktop.in.h:1
@@ -9325,11 +9428,11 @@
 msgstr ""
 
 #: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:1
-msgid "Convert Khmer between Unicode and legacy Khmer encodings."
+msgid "Khmer Converter"
 msgstr ""
 
 #: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:2
-msgid "Khmer Converter"
+msgid "Convert Khmer between Unicode and legacy Khmer encodings."
 msgstr ""
 
 #: ../menu-data/kicad:kicad.desktop.in.h:1
@@ -9345,32 +9448,32 @@
 msgstr ""
 
 #: ../menu-data/kid3-qt:kid3-qt.desktop.in.h:1
-#: ../menu-data/kid3:kde4__kid3.desktop.in.h:1
-msgid "Audio Tagger"
+msgid "Kid3-qt"
 msgstr ""
 
 #: ../menu-data/kid3-qt:kid3-qt.desktop.in.h:2
-msgid "Kid3-qt"
+#: ../menu-data/kid3:kde4__kid3.desktop.in.h:2
+msgid "Audio Tagger"
 msgstr ""
 
-#: ../menu-data/kid3:kde4__kid3.desktop.in.h:2
+#: ../menu-data/kid3:kde4__kid3.desktop.in.h:1
 msgid "Kid3"
 msgstr ""
 
 #: ../menu-data/kig:kde4__kig.desktop.in.h:1
-msgid "Explore Geometric Constructions"
+msgid "Kig"
 msgstr ""
 
 #: ../menu-data/kig:kde4__kig.desktop.in.h:2
-msgid "Kig"
+msgid "Explore Geometric Constructions"
 msgstr ""
 
 #: ../menu-data/kigo:kde4__kigo.desktop.in.h:1
-msgid "Go Board Game"
+msgid "Kigo"
 msgstr ""
 
 #: ../menu-data/kigo:kde4__kigo.desktop.in.h:2
-msgid "Kigo"
+msgid "Go Board Game"
 msgstr ""
 
 #: ../menu-data/kiki-the-nano-bot:kiki-the-nano-bot.desktop.in.h:1
@@ -9386,11 +9489,11 @@
 msgstr ""
 
 #: ../menu-data/kildclient:kildclient.desktop.in.h:1
-msgid "Connect to MUDs (Multi User Dungeons)"
+msgid "KildClient"
 msgstr ""
 
 #: ../menu-data/kildclient:kildclient.desktop.in.h:2
-msgid "KildClient"
+msgid "Connect to MUDs (Multi User Dungeons)"
 msgstr ""
 
 #: ../menu-data/kile:kde4__kile.desktop.in.h:1
@@ -9406,35 +9509,44 @@
 msgstr ""
 
 #: ../menu-data/kimagemapeditor:kde4__kimagemapeditor.desktop.in.h:1
-msgid "HTML Image Map Editor"
+msgid "KImageMapEditor"
 msgstr ""
 
 #: ../menu-data/kimagemapeditor:kde4__kimagemapeditor.desktop.in.h:2
-msgid "KImageMapEditor"
+msgid "HTML Image Map Editor"
 msgstr ""
 
 #: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:1
-msgid "Info Center"
+msgid "KInfoCenter"
 msgstr ""
 
 #: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:2
-msgid "KInfoCenter"
+msgid "Info Center"
 msgstr ""
 
 #: ../menu-data/kino:Kino.desktop.in.h:1
-msgid "Edit DV video"
+msgid "Kino"
 msgstr ""
 
 #: ../menu-data/kino:Kino.desktop.in.h:2
-msgid "Kino"
+msgid "Edit DV video"
 msgstr ""
 
 #: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:1
-msgid "KDE Image Plugins Interface"
+msgid "KIPI Plugins"
 msgstr ""
 
 #: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:2
-msgid "KIPI Plugins"
+msgid "KDE Image Plugins Interface"
+msgstr ""
+
+#. X-DocPath=photolayoutseditor/index.html
+#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:2
+msgid "Photo Layouts Editor"
+msgstr ""
+
+#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:3
+msgid "Create beautiful and professional photo layouts from your photos"
 msgstr ""
 
 #: ../menu-data/kiriki:kde4__kiriki.desktop.in.h:1
@@ -9446,11 +9558,11 @@
 msgstr ""
 
 #: ../menu-data/kita2:kde__kita2.desktop.in.h:1
-msgid "2ch client for KDE"
+msgid "Kita2"
 msgstr ""
 
 #: ../menu-data/kita2:kde__kita2.desktop.in.h:2
-msgid "Kita2"
+msgid "2ch client for KDE"
 msgstr ""
 
 #: ../menu-data/kiten:kde4__kiten.desktop.in.h:1
@@ -9462,11 +9574,11 @@
 msgstr ""
 
 #: ../menu-data/kitsune:kitsune.desktop.in.h:1
-msgid "Countdown"
+msgid "Kitsune"
 msgstr ""
 
 #: ../menu-data/kitsune:kitsune.desktop.in.h:2
-msgid "Kitsune"
+msgid "Countdown"
 msgstr ""
 
 #: ../menu-data/kjots:kde4__Kjots.desktop.in.h:1
@@ -9490,11 +9602,11 @@
 msgstr ""
 
 #: ../menu-data/klatexformula:klatexformula.desktop.in.h:1
-msgid "Generate images from LaTeX equations"
+msgid "KLatexFormula"
 msgstr ""
 
 #: ../menu-data/klatexformula:klatexformula.desktop.in.h:2
-msgid "KLatexFormula"
+msgid "Generate images from LaTeX equations"
 msgstr ""
 
 #: ../menu-data/klavaro:klavaro.desktop.in.h:1
@@ -9507,20 +9619,20 @@
 
 #: ../menu-data/kleopatra:kde4__kleopatra.desktop.in.h:1
 #: ../menu-data/kleopatra:kde4__kleopatra_import.desktop.in.h:1
-msgid "Certificate Manager and Unified Crypto GUI"
+msgid "Kleopatra"
 msgstr ""
 
 #: ../menu-data/kleopatra:kde4__kleopatra.desktop.in.h:2
 #: ../menu-data/kleopatra:kde4__kleopatra_import.desktop.in.h:2
-msgid "Kleopatra"
+msgid "Certificate Manager and Unified Crypto GUI"
 msgstr ""
 
 #: ../menu-data/klettres:kde4__klettres.desktop.in.h:1
-msgid "KLettres"
+msgid "a KDE program to learn the alphabet"
 msgstr ""
 
 #: ../menu-data/klettres:kde4__klettres.desktop.in.h:2
-msgid "a KDE program to learn the alphabet"
+msgid "KLettres"
 msgstr ""
 
 #: ../menu-data/klickety:kde4__klickety.desktop.in.h:1
@@ -9528,19 +9640,19 @@
 msgstr ""
 
 #: ../menu-data/klickety:kde4__ksame.desktop.in.h:1
-msgid "Board Game"
+msgid "SameGame"
 msgstr ""
 
 #: ../menu-data/klickety:kde4__ksame.desktop.in.h:2
-msgid "SameGame"
+msgid "Board Game"
 msgstr ""
 
 #: ../menu-data/klines:kde4__klines.desktop.in.h:1
-msgid "Kolor Lines"
+msgid "Tactical Game"
 msgstr ""
 
 #: ../menu-data/klines:kde4__klines.desktop.in.h:2
-msgid "Tactical Game"
+msgid "Kolor Lines"
 msgstr ""
 
 #: ../menu-data/klinkstatus:kde4__klinkstatus.desktop.in.h:1
@@ -9552,19 +9664,19 @@
 msgstr ""
 
 #: ../menu-data/klipper:kde4__klipper.desktop.in.h:1
-msgid "A cut & paste history utility"
+msgid "Klipper"
 msgstr ""
 
 #: ../menu-data/klipper:kde4__klipper.desktop.in.h:2
-msgid "Klipper"
+msgid "A cut & paste history utility"
 msgstr ""
 
 #: ../menu-data/klog:kde4__klog.desktop.in.h:1
-msgid "KDE Ham Radio logging program"
+msgid "KLog"
 msgstr ""
 
 #: ../menu-data/klog:kde4__klog.desktop.in.h:2
-msgid "KLog"
+msgid "KDE Ham Radio logging program"
 msgstr ""
 
 #: ../menu-data/kluppe:kluppe.desktop.in.h:1
@@ -9592,7 +9704,7 @@
 msgstr ""
 
 #: ../menu-data/kmail-mobile:kde4__kmail-mobile.desktop.in.h:1
-msgid "Kontact Touch Mail"
+msgid "Mail"
 msgstr ""
 
 #: ../menu-data/kmail:kde4__KMail2.desktop.in.h:1
@@ -9624,19 +9736,19 @@
 msgstr ""
 
 #: ../menu-data/kmetronome:kde4__kmetronome.desktop.in.h:1
-msgid "KDE MIDI Metronome Using ALSA Sequencer"
+msgid "KMetronome"
 msgstr ""
 
 #: ../menu-data/kmetronome:kde4__kmetronome.desktop.in.h:2
-msgid "KMetronome"
+msgid "KDE MIDI Metronome Using ALSA Sequencer"
 msgstr ""
 
 #: ../menu-data/kmidimon:kde4__kmidimon.desktop.in.h:1
-msgid "ALSA Sequencer MIDI monitor"
+msgid "KMidimon"
 msgstr ""
 
 #: ../menu-data/kmidimon:kde4__kmidimon.desktop.in.h:2
-msgid "KMidimon"
+msgid "ALSA Sequencer MIDI monitor"
 msgstr ""
 
 #: ../menu-data/kmines:kde4__kmines.desktop.in.h:1
@@ -9648,19 +9760,19 @@
 msgstr ""
 
 #: ../menu-data/kmix:kde4__kmix.desktop.in.h:1
-msgid "KMix"
+msgid "Sound Mixer"
 msgstr ""
 
 #: ../menu-data/kmix:kde4__kmix.desktop.in.h:2
-msgid "Sound Mixer"
+msgid "KMix"
 msgstr ""
 
 #: ../menu-data/kmldonkey:kde4__kmldonkey.desktop.in.h:1
-msgid "An MLDonkey frontend for KDE"
+msgid "KMLDonkey"
 msgstr ""
 
 #: ../menu-data/kmldonkey:kde4__kmldonkey.desktop.in.h:2
-msgid "KMLDonkey"
+msgid "An MLDonkey frontend for KDE"
 msgstr ""
 
 #: ../menu-data/kmousetool:kde4__kmousetool.desktop.in.h:1
@@ -9720,11 +9832,11 @@
 msgstr ""
 
 #: ../menu-data/knights:kde4__knights.desktop.in.h:1
-msgid "Chess game"
+msgid "Knights"
 msgstr ""
 
 #: ../menu-data/knights:kde4__knights.desktop.in.h:2
-msgid "Knights"
+msgid "Chess game"
 msgstr ""
 
 #: ../menu-data/knode:kde4__KNode.desktop.in.h:1
@@ -9736,23 +9848,23 @@
 msgstr ""
 
 #: ../menu-data/knotes-mobile:kde4__notes-mobile.desktop.in.h:1
-msgid "Kontact Touch Notes"
+msgid "Notes"
 msgstr ""
 
 #: ../menu-data/knotes:kde4__knotes.desktop.in.h:1
-msgid "KNotes"
+msgid "Popup Notes"
 msgstr ""
 
 #: ../menu-data/knotes:kde4__knotes.desktop.in.h:2
-msgid "Popup Notes"
+msgid "KNotes"
 msgstr ""
 
 #: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:1
-msgid "Destroy enemy bases in space"
+msgid "Kobo Deluxe"
 msgstr ""
 
 #: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:2
-msgid "Kobo Deluxe"
+msgid "Destroy enemy bases in space"
 msgstr ""
 
 #: ../menu-data/kodos:kodos.desktop.in.h:1
@@ -9776,11 +9888,11 @@
 msgstr ""
 
 #: ../menu-data/kollision:kde4__kollision.desktop.in.h:1
-msgid "A simple ball dodging game"
+msgid "Kollision"
 msgstr ""
 
 #: ../menu-data/kollision:kde4__kollision.desktop.in.h:2
-msgid "Kollision"
+msgid "A simple ball dodging game"
 msgstr ""
 
 #: ../menu-data/kolourpaint4:kde4__kolourpaint.desktop.in.h:1
@@ -9792,35 +9904,35 @@
 msgstr ""
 
 #: ../menu-data/komparator:kde4__komparator4.desktop.in.h:1
-msgid "A KDE Directory Synchronization Application"
+msgid "Komparator4"
 msgstr ""
 
 #: ../menu-data/komparator:kde4__komparator4.desktop.in.h:2
-msgid "Komparator4"
+msgid "A KDE Directory Synchronization Application"
 msgstr ""
 
 #: ../menu-data/kompare:kde4__kompare.desktop.in.h:1
-msgid "Diff/Patch Frontend"
+msgid "Kompare"
 msgstr ""
 
 #: ../menu-data/kompare:kde4__kompare.desktop.in.h:2
-msgid "Kompare"
+msgid "Diff/Patch Frontend"
 msgstr ""
 
 #: ../menu-data/kompozer:kompozer.desktop.in.h:1
-msgid "Create Web Pages"
+msgid "KompoZer"
 msgstr ""
 
 #: ../menu-data/kompozer:kompozer.desktop.in.h:2
-msgid "KompoZer"
+msgid "Create Web Pages"
 msgstr ""
 
 #: ../menu-data/konquest:kde4__konquest.desktop.in.h:1
-msgid "Galactic Strategy Game"
+msgid "Konquest"
 msgstr ""
 
 #: ../menu-data/konquest:kde4__konquest.desktop.in.h:2
-msgid "Konquest"
+msgid "Galactic Strategy Game"
 msgstr ""
 
 #: ../menu-data/konsole:kde4__konsole.desktop.in.h:1
@@ -9856,17 +9968,17 @@
 msgstr ""
 
 #: ../menu-data/kopete:kde4__kopete.desktop.in.h:1
-#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:1
-#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:1
-msgid "Instant Messenger"
+msgid "Kopete"
 msgstr ""
 
 #: ../menu-data/kopete:kde4__kopete.desktop.in.h:2
-msgid "Kopete"
+#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:2
+#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:2
+msgid "Instant Messenger"
 msgstr ""
 
 #: ../menu-data/korganizer-mobile:kde4__korganizer-mobile.desktop.in.h:1
-msgid "Kontact Touch Calendar"
+msgid "Calendar"
 msgstr ""
 
 #: ../menu-data/korganizer:kde4__korganizer-import.desktop.in.h:1
@@ -9880,11 +9992,11 @@
 msgstr ""
 
 #: ../menu-data/koules:koules.desktop.in.h:1
-msgid "Push your enemies away, but stay away from obstacles"
+msgid "koules"
 msgstr ""
 
 #: ../menu-data/koules:koules.desktop.in.h:2
-msgid "koules"
+msgid "Push your enemies away, but stay away from obstacles"
 msgstr ""
 
 #: ../menu-data/kover:kde4__kover.desktop.in.h:1
@@ -9903,14 +10015,6 @@
 msgid "Patience Card Game"
 msgstr ""
 
-#: ../menu-data/kphone:kphone.desktop.in.h:1
-msgid "Kphone"
-msgstr ""
-
-#: ../menu-data/kphone:kphone.desktop.in.h:2
-msgid "Voice over IP (VoIP) phone application"
-msgstr ""
-
 #: ../menu-data/kphotoalbum:kde4__kphotoalbum.desktop.in.h:1
 msgid "KPhotoAlbum"
 msgstr ""
@@ -9923,12 +10027,7 @@
 msgid "KPlato"
 msgstr ""
 
-#: ../menu-data/kplato:kde4__kplato.desktop.in.h:2
-#: ../menu-data/planner:planner.desktop.in.h:2
-msgid "Project Management"
-msgstr ""
-
-#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:1
+#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:2
 msgid "KPlayer"
 msgstr ""
 
@@ -9944,16 +10043,12 @@
 msgid "KPresenter"
 msgstr ""
 
-#: ../menu-data/kpresenter:kde4__kpresenter.desktop.in.h:2
-msgid "Write presentation documents"
-msgstr ""
-
 #: ../menu-data/kradio4:kde4__kradio4.desktop.in.h:1
-msgid "V4L/V4L2-Radio Application for KDE4"
+msgid "kradio4"
 msgstr ""
 
 #: ../menu-data/kradio4:kde4__kradio4.desktop.in.h:2
-msgid "kradio4"
+msgid "V4L/V4L2-Radio Application for KDE4"
 msgstr ""
 
 #: ../menu-data/kradioripper:kde4__kradioripper.desktop.in.h:1
@@ -10021,28 +10116,31 @@
 msgstr ""
 
 #: ../menu-data/krfb:kde4__krfb.desktop.in.h:1
-#: ../menu-data/vino:vino-preferences.desktop.in.h:2
-msgid "Desktop Sharing"
+msgid "Krfb"
 msgstr ""
 
 #: ../menu-data/krfb:kde4__krfb.desktop.in.h:2
-msgid "Krfb"
+#: ../menu-data/vino:vino-preferences.desktop.in.h:1
+msgid "Desktop Sharing"
 msgstr ""
 
 #: ../menu-data/krita:kde4__krita.desktop.in.h:1
-msgid "Edit and paint images"
+#: ../menu-data/krita:kde4__krita_odg.desktop.in.h:1
+#: ../menu-data/krita:kde4__krita_psd.desktop.in.h:1
+msgid "Krita"
 msgstr ""
 
 #: ../menu-data/krita:kde4__krita.desktop.in.h:2
-msgid "Krita"
+msgid "Edit and paint images"
 msgstr ""
 
 #: ../menu-data/kruler:kde4__kruler.desktop.in.h:1
-msgid "KRuler"
+#: ../menu-data/screenruler:screenruler.desktop.in.h:1
+msgid "Screen Ruler"
 msgstr ""
 
 #: ../menu-data/kruler:kde4__kruler.desktop.in.h:2
-msgid "Screen Ruler"
+msgid "KRuler"
 msgstr ""
 
 #: ../menu-data/krusader:kde4__krusader.desktop.in.h:1
@@ -10057,6 +10155,14 @@
 msgid "KsCD"
 msgstr ""
 
+#: ../menu-data/kscope:kscope.desktop.in.h:1
+msgid "KScope"
+msgstr ""
+
+#: ../menu-data/kscope:kscope.desktop.in.h:2
+msgid "Source editing environment"
+msgstr ""
+
 #: ../menu-data/kseg:kseg.desktop.in.h:1
 msgid "KSeg Geometry Sketchpad"
 msgstr ""
@@ -10074,11 +10180,11 @@
 msgstr ""
 
 #: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:1
-msgid "An advanced shut down utility"
+msgid "KShutdown"
 msgstr ""
 
 #: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:2
-msgid "KShutdown"
+msgid "An advanced shut down utility"
 msgstr ""
 
 #: ../menu-data/ksirk:kde4__ksirk.desktop.in.h:1
@@ -10090,11 +10196,11 @@
 msgstr ""
 
 #: ../menu-data/ksnapshot:kde4__ksnapshot.desktop.in.h:1
-msgid "KSnapshot"
+msgid "Screen Capture Program"
 msgstr ""
 
 #: ../menu-data/ksnapshot:kde4__ksnapshot.desktop.in.h:2
-msgid "Screen Capture Program"
+msgid "KSnapshot"
 msgstr ""
 
 #: ../menu-data/kspaceduel:kde4__kspaceduel.desktop.in.h:1
@@ -10109,32 +10215,28 @@
 msgid "KSpread"
 msgstr ""
 
-#: ../menu-data/kspread:kde4__kspread.desktop.in.h:2
-msgid "Write spreadsheet documents"
-msgstr ""
-
 #: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:1
-msgid "Connect the dots to create squares"
+msgid "KSquares"
 msgstr ""
 
 #: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:2
-msgid "KSquares"
+msgid "Connect the dots to create squares"
 msgstr ""
 
 #: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:1
-msgid "Enter passphrase to authenticate to the ssh agent"
+msgid "SSH AskPass"
 msgstr ""
 
 #: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:2
-msgid "SSH AskPass"
+msgid "Enter passphrase to authenticate to the ssh agent"
 msgstr ""
 
 #: ../menu-data/kst:kst.desktop.in.h:1
-msgid "Data Viewer"
+msgid "Kst"
 msgstr ""
 
 #: ../menu-data/kst:kst.desktop.in.h:2
-msgid "Kst"
+msgid "Data Viewer"
 msgstr ""
 
 #: ../menu-data/kstars:kde4__kstars.desktop.in.h:1
@@ -10186,7 +10288,7 @@
 msgstr ""
 
 #: ../menu-data/ktikz:kde4__ktikz.desktop.in.h:2
-#: ../menu-data/qtikz:qtikz.desktop.in.h:1
+#: ../menu-data/qtikz:qtikz.desktop.in.h:2
 msgid "Program for creating TikZ (from the LaTeX pgf package) diagrams"
 msgstr ""
 
@@ -10207,35 +10309,35 @@
 msgstr ""
 
 #: ../menu-data/ktoon:ktoon.desktop.in.h:1
-msgid "Animation"
+msgid "KToon"
 msgstr ""
 
 #: ../menu-data/ktoon:ktoon.desktop.in.h:2
-msgid "KToon"
+msgid "Animation"
 msgstr ""
 
 #: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:1
-msgid "A BitTorrent program for KDE"
+msgid "KTorrent"
 msgstr ""
 
 #: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:2
-msgid "KTorrent"
+msgid "A BitTorrent program for KDE"
 msgstr ""
 
 #: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:1
-msgid "KTouch"
+msgid "Touch Typing Tutor"
 msgstr ""
 
 #: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:2
-msgid "Touch Typing Tutor"
+msgid "KTouch"
 msgstr ""
 
 #: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:1
-msgid "KSnake"
+msgid "Snake-like Game"
 msgstr ""
 
 #: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:2
-msgid "Snake-like Game"
+msgid "KSnake"
 msgstr ""
 
 #: ../menu-data/ktron:kde4__ktron.desktop.in.h:1
@@ -10243,27 +10345,27 @@
 msgstr ""
 
 #: ../menu-data/ktuberling:kde4__ktuberling.desktop.in.h:1
-msgid "Picture Game for Children"
+msgid "Potato Guy"
 msgstr ""
 
 #: ../menu-data/ktuberling:kde4__ktuberling.desktop.in.h:2
-msgid "Potato Guy"
+msgid "Picture Game for Children"
 msgstr ""
 
 #: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:1
-msgid "Educational Programming Environment"
+msgid "KTurtle"
 msgstr ""
 
 #: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:2
-msgid "KTurtle"
+msgid "Educational Programming Environment"
 msgstr ""
 
 #: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:1
-msgid "A 3-D game based on Rubik's Cube"
+msgid "Kubrick"
 msgstr ""
 
 #: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:2
-msgid "Kubrick"
+msgid "A 3-D game based on Rubik's Cube"
 msgstr ""
 
 #: ../menu-data/kuiviewer:kde4__kuiviewer.desktop.in.h:1
@@ -10275,11 +10377,11 @@
 msgstr ""
 
 #: ../menu-data/kupfer:kupfer.desktop.in.h:1
-msgid "Convenient command and access tool for applications and documents"
+msgid "Kupfer"
 msgstr ""
 
 #: ../menu-data/kupfer:kupfer.desktop.in.h:2
-msgid "Kupfer"
+msgid "Convenient command and access tool for applications and documents"
 msgstr ""
 
 #: ../menu-data/kuser:kde4__kuser.desktop.in.h:1
@@ -10291,27 +10393,27 @@
 msgstr ""
 
 #: ../menu-data/kvirc:kvirc.desktop.in.h:1
-msgid "Connect to Internet Relay Chat"
+msgid "KVIrc"
 msgstr ""
 
 #: ../menu-data/kvirc:kvirc.desktop.in.h:2
-msgid "KVIrc"
+msgid "Connect to Internet Relay Chat"
 msgstr ""
 
 #: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:1
-msgid "A virtual keyboard for KDE"
+msgid "Kvkbd"
 msgstr ""
 
 #: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:2
-msgid "Kvkbd"
+msgid "A virtual keyboard for KDE"
 msgstr ""
 
 #: ../menu-data/kvpm:kvpm.desktop.in.h:1
-msgid "KDE Volume Partition Manager"
+msgid "KVPM"
 msgstr ""
 
 #: ../menu-data/kvpm:kvpm.desktop.in.h:2
-msgid "KVPM"
+msgid "KDE Volume Partition Manager"
 msgstr ""
 
 #: ../menu-data/kvpnc:kde4__kvpnc.desktop.in.h:1
@@ -10331,11 +10433,11 @@
 msgstr ""
 
 #: ../menu-data/kwave:kde4__kwave.desktop.in.h:1
-msgid "A sound editor for KDE"
+msgid "Kwave Sound Editor"
 msgstr ""
 
 #: ../menu-data/kwave:kde4__kwave.desktop.in.h:2
-msgid "Kwave Sound Editor"
+msgid "A sound editor for KDE"
 msgstr ""
 
 #: ../menu-data/kword:kde4__kword.desktop.in.h:1
@@ -10354,16 +10456,16 @@
 msgid "KWordQuiz"
 msgstr ""
 
-#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1
+#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:2
 msgid "KWrite"
 msgstr ""
 
 #: ../menu-data/kx11grab:kde4__kx11grab.desktop.in.h:1
-msgid "Application for recording x11 windows"
+msgid "kx11grab"
 msgstr ""
 
 #: ../menu-data/kx11grab:kde4__kx11grab.desktop.in.h:2
-msgid "kx11grab"
+msgid "Application for recording x11 windows"
 msgstr ""
 
 #: ../menu-data/l2tp-ipsec-vpn:L2TP-Ipsec-VPN-Manager.desktop.in.h:1
@@ -10375,11 +10477,11 @@
 msgstr ""
 
 #: ../menu-data/l2tp-ipsec-vpn:L2tpIPsecVpn-Applet.desktop.in.h:1
-msgid "Control your L2TP IPsec VPN connections"
+msgid "L2TP Ipsec VPN Applet"
 msgstr ""
 
 #: ../menu-data/l2tp-ipsec-vpn:L2tpIPsecVpn-Applet.desktop.in.h:2
-msgid "L2TP Ipsec VPN Applet"
+msgid "Control your L2TP IPsec VPN connections"
 msgstr ""
 
 #: ../menu-data/laby:laby.desktop.in.h:1
@@ -10399,35 +10501,35 @@
 msgstr ""
 
 #: ../menu-data/laditools:ladiconf.desktop.in.h:1
-msgid "JACK and LASH control application configuration"
+msgid "Linux Audio Configuration"
 msgstr ""
 
 #: ../menu-data/laditools:ladiconf.desktop.in.h:2
-msgid "Linux Audio Configuration"
+msgid "JACK and LASH control application configuration"
 msgstr ""
 
 #: ../menu-data/laditools:laditray.desktop.in.h:1
-msgid "JACK and LASH control tray application"
+msgid "LADITray"
 msgstr ""
 
 #: ../menu-data/laditools:laditray.desktop.in.h:2
-msgid "LADITray"
+msgid "JACK and LASH control tray application"
 msgstr ""
 
 #: ../menu-data/landell:landell.desktop.in.h:1
-msgid "Audio and video streams manager"
+msgid "Landell"
 msgstr ""
 
 #: ../menu-data/landell:landell.desktop.in.h:2
-msgid "Landell"
+msgid "Audio and video streams manager"
 msgstr ""
 
 #: ../menu-data/language-selector-gnome:language-selector.desktop.in.h:1
-msgid "Configure multiple and native language support on your system"
+msgid "Language Support"
 msgstr ""
 
 #: ../menu-data/language-selector-gnome:language-selector.desktop.in.h:2
-msgid "Language Support"
+msgid "Configure multiple and native language support on your system"
 msgstr ""
 
 #: ../menu-data/lastfm:lastfm.desktop.in.h:1
@@ -10447,35 +10549,35 @@
 msgstr ""
 
 #: ../menu-data/latexdraw:latexdraw.desktop.in.h:1
-msgid "Graphical editor for PSTricks"
+msgid "LaTeXDraw"
 msgstr ""
 
 #: ../menu-data/latexdraw:latexdraw.desktop.in.h:2
-msgid "LaTeXDraw"
+msgid "Graphical editor for PSTricks"
 msgstr ""
 
 #: ../menu-data/latexila-data:latexila.desktop.in.h:1
-msgid "Edit LaTeX documents"
+msgid "LaTeXila"
 msgstr ""
 
 #: ../menu-data/latexila-data:latexila.desktop.in.h:2
-msgid "LaTeXila"
+msgid "Edit LaTeX documents"
 msgstr ""
 
-#: ../menu-data/lazarus-ide-0.9.30:lazarus-0.9.30.desktop.in.h:1
-msgid "Lazarus (0.9.30)"
+#: ../menu-data/lazarus-ide-0.9.30.2:lazarus-0.9.30.2.desktop.in.h:1
+msgid "Lazarus (0.9.30.2)"
 msgstr ""
 
-#: ../menu-data/lazarus-ide-0.9.30:lazarus-0.9.30.desktop.in.h:2
-msgid "Lazarus IDE (0.9.30)"
+#: ../menu-data/lazarus-ide-0.9.30.2:lazarus-0.9.30.2.desktop.in.h:2
+msgid "Lazarus IDE (0.9.30.2)"
 msgstr ""
 
 #: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:1
-msgid "A ball-and-paddle game with nice graphics."
+msgid "LBreakout2"
 msgstr ""
 
 #: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:2
-msgid "LBreakout2"
+msgid "A ball-and-paddle game with nice graphics."
 msgstr ""
 
 #: ../menu-data/lcrt:lcrt.desktop.in.h:1
@@ -10487,32 +10589,32 @@
 msgstr ""
 
 #: ../menu-data/lebiniou:lebiniou.desktop.in.h:1
-msgid "Displays images that evolve with sound"
+msgid "Le Biniou"
 msgstr ""
 
 #: ../menu-data/lebiniou:lebiniou.desktop.in.h:2
-msgid "Le Biniou"
+msgid "Displays images that evolve with sound"
 msgstr ""
 
 #: ../menu-data/lekhonee-gnome:lekhonee-gnome.desktop.in.h:1
-#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:1
-msgid "A Wordpress blog client"
+msgid "Lekhonee Gnome"
 msgstr ""
 
 #: ../menu-data/lekhonee-gnome:lekhonee-gnome.desktop.in.h:2
-msgid "Lekhonee Gnome"
+#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:2
+msgid "A Wordpress blog client"
 msgstr ""
 
-#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:2
+#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:1
 msgid "Lekhonee"
 msgstr ""
 
 #: ../menu-data/lemonpos:kde4__lemon.desktop.in.h:1
-msgid "Lemon Point of sale"
+msgid "lemon"
 msgstr ""
 
 #: ../menu-data/lemonpos:kde4__lemon.desktop.in.h:2
-msgid "lemon"
+msgid "Lemon Point of sale"
 msgstr ""
 
 #: ../menu-data/lernid:lernid.desktop.in.h:1
@@ -10544,11 +10646,11 @@
 msgstr ""
 
 #: ../menu-data/librecad:librecad.desktop.in.h:1
-msgid "A professional CAD System"
+msgid "LibreCAD"
 msgstr ""
 
 #: ../menu-data/librecad:librecad.desktop.in.h:2
-msgid "LibreCAD"
+msgid "A professional CAD System"
 msgstr ""
 
 #: ../menu-data/libreoffice-base:libreoffice-base.desktop.in.h:1
@@ -10561,22 +10663,14 @@
 "information by using Base."
 msgstr ""
 
-#: ../menu-data/libreoffice-base:libreoffice-base.desktop.in.h:3
-msgid "New Database"
-msgstr ""
-
 #: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:1
 msgid "LibreOffice Calc"
 msgstr ""
 
 #: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:2
-msgid "New Spreadsheet"
-msgstr ""
-
-#: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:3
 msgid ""
-"Perform calculation, analyze information and manage lists in spreadsheets by "
-"using Calc."
+"Perform calculations, analyze information and manage lists in spreadsheets "
+"by using Calc."
 msgstr ""
 
 #: ../menu-data/libreoffice-common:libreoffice-startcenter.desktop.in.h:1
@@ -10590,84 +10684,76 @@
 msgstr ""
 
 #: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:1
-msgid "Create and edit drawings, flow charts, and logos by using Draw."
+msgid "LibreOffice Draw"
 msgstr ""
 
 #: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:2
-msgid "LibreOffice Draw"
+msgid "Create and edit drawings, flow charts, and logos by using Draw."
 msgstr ""
 
-#: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:3
-msgid "New Drawing"
+#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:1
+msgid "LibreOffice Impress"
 msgstr ""
 
-#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:1
+#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:2
 msgid ""
 "Create and edit presentations for slideshows, meeting and Web pages by using "
 "Impress."
 msgstr ""
 
-#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:2
-msgid "LibreOffice Impress"
-msgstr ""
-
-#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:3
-msgid "New Presentation"
-msgstr ""
-
 #: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:1
-msgid "Create and edit scientific formulas and equations by using Math."
+msgid "LibreOffice Math"
 msgstr ""
 
 #: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:2
-msgid "LibreOffice Math"
+msgid "Create and edit scientific formulas and equations by using Math."
 msgstr ""
 
-#: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:3
-msgid "New Formula"
+#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:1
+msgid "LibreOffice Writer"
 msgstr ""
 
-#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:1
+#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:2
 msgid ""
 "Create and edit text and graphics in letters, reports, documents and Web "
 "pages by using Writer."
 msgstr ""
 
-#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:2
-msgid "LibreOffice Writer"
-msgstr ""
-
-#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:3
-msgid "New Document"
-msgstr ""
-
-#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:2
-#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:2
+#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:1
+#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:1
 msgid "Licq"
 msgstr ""
 
 #: ../menu-data/lifeograph:lifeograph.desktop.in.h:1
-msgid "Keep a private journal of your life"
+msgid "Lifeograph"
 msgstr ""
 
 #: ../menu-data/lifeograph:lifeograph.desktop.in.h:2
-msgid "Lifeograph"
+msgid "Keep a private journal of your life"
 msgstr ""
 
 #: ../menu-data/liferea:liferea.desktop.in.h:1
-msgid "Download and view feeds"
+msgid "Liferea Feed Reader"
 msgstr ""
 
 #: ../menu-data/liferea:liferea.desktop.in.h:2
-msgid "Liferea Feed Reader"
+msgid "Download and view feeds"
+msgstr ""
+
+#: ../menu-data/lightsoff:lightsoff.desktop.in.h:1
+msgid "Lights Off"
+msgstr ""
+
+#: ../menu-data/lightsoff:lightsoff.desktop.in.h:2
+msgid "Turn off all the lights"
 msgstr ""
 
 #: ../menu-data/lightspark:lightspark.desktop.in.h:1
-msgid "An alternative flash player"
+msgid "Lightspark"
 msgstr ""
 
 #: ../menu-data/lightspark:lightspark.desktop.in.h:2
-msgid "Lightspark"
+msgid "An alternative flash player"
 msgstr ""
 
 #: ../menu-data/lightyears:lightyears.desktop.in.h:1
@@ -10699,11 +10785,11 @@
 msgstr ""
 
 #: ../menu-data/lingot:lingot.desktop.in.h:1
-msgid "LINGOT Is Not a Guitar-Only Tuner"
+msgid "Lingot"
 msgstr ""
 
 #: ../menu-data/lingot:lingot.desktop.in.h:2
-msgid "Lingot"
+msgid "LINGOT Is Not a Guitar-Only Tuner"
 msgstr ""
 
 #: ../menu-data/links2:links2.desktop.in.h:1
@@ -10722,7 +10808,7 @@
 msgid "Linphone is a web-phone"
 msgstr ""
 
-#: ../menu-data/linpsk:linpsk.desktop.in.h:2
+#: ../menu-data/linpsk:linpsk.desktop.in.h:1
 msgid "Linpsk"
 msgstr ""
 
@@ -10743,19 +10829,19 @@
 msgstr ""
 
 #: ../menu-data/linuxdcpp:linuxdcpp.desktop.in.h:1
-msgid "A file-sharing client for the Direct Connect network"
+msgid "LinuxDC++"
 msgstr ""
 
 #: ../menu-data/linuxdcpp:linuxdcpp.desktop.in.h:2
-msgid "LinuxDC++"
+msgid "A file-sharing client for the Direct Connect network"
 msgstr ""
 
 #: ../menu-data/liquidwar:liquidwar.desktop.in.h:1
-msgid "A unique multiplayer wargame"
+msgid "Liquid War"
 msgstr ""
 
 #: ../menu-data/liquidwar:liquidwar.desktop.in.h:2
-msgid "Liquid War"
+msgid "A unique multiplayer wargame"
 msgstr ""
 
 #: ../menu-data/listen:listen.desktop.in.h:1
@@ -10767,27 +10853,27 @@
 msgstr ""
 
 #: ../menu-data/literki:literki.desktop.in.h:1
-msgid "Hacker's keyboard"
+msgid "Literki"
 msgstr ""
 
 #: ../menu-data/literki:literki.desktop.in.h:2
-msgid "Literki"
+msgid "Hacker's keyboard"
 msgstr ""
 
 #: ../menu-data/littlewizard:littlewizard.desktop.in.h:1
-msgid "Development environment for children"
+msgid "Little Wizard"
 msgstr ""
 
 #: ../menu-data/littlewizard:littlewizard.desktop.in.h:2
-msgid "Little Wizard"
+msgid "Development environment for children"
 msgstr ""
 
 #: ../menu-data/live-magic:live-magic.desktop.in.h:1
-msgid "Create Debian Live systems (LiveCDs, etc.)"
+msgid "Live Magic"
 msgstr ""
 
 #: ../menu-data/live-magic:live-magic.desktop.in.h:2
-msgid "Live Magic"
+msgid "Create Debian Live systems (LiveCDs, etc.)"
 msgstr ""
 
 #: ../menu-data/livemix:livemix.desktop.in.h:1
@@ -10807,35 +10893,35 @@
 msgstr ""
 
 #: ../menu-data/ll-scope:ll-scope.desktop.in.h:1
-msgid "An oscilloscope DSSI plugin"
+msgid "Oscilloscope"
 msgstr ""
 
 #: ../menu-data/ll-scope:ll-scope.desktop.in.h:2
-msgid "Oscilloscope"
+msgid "An oscilloscope DSSI plugin"
 msgstr ""
 
 #: ../menu-data/lletters:lletters.desktop.in.h:1
-msgid "GTK letters-learning game for small children"
+msgid "Linux Letters and Numbers"
 msgstr ""
 
 #: ../menu-data/lletters:lletters.desktop.in.h:2
-msgid "Linux Letters and Numbers"
+msgid "GTK letters-learning game for small children"
 msgstr ""
 
 #: ../menu-data/llk-linux:llk_linux.desktop.in.h:1
-msgid "Gtk based LianLianKan Game."
+msgid "llk_linux"
 msgstr ""
 
 #: ../menu-data/llk-linux:llk_linux.desktop.in.h:2
-msgid "llk_linux"
+msgid "Gtk based LianLianKan Game."
 msgstr ""
 
 #: ../menu-data/lmarbles:lmarbles.desktop.in.h:1
-msgid "Build figures out of colored marbles"
+msgid "LMarbles"
 msgstr ""
 
 #: ../menu-data/lmarbles:lmarbles.desktop.in.h:2
-msgid "LMarbles"
+msgid "Build figures out of colored marbles"
 msgstr ""
 
 #: ../menu-data/lmemory:lmemory.desktop.in.h:1
@@ -10855,19 +10941,19 @@
 msgstr ""
 
 #: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:1
-msgid "Computer-Aided Translation System"
+msgid "Lokalize"
 msgstr ""
 
 #: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:2
-msgid "Lokalize"
+msgid "Computer-Aided Translation System"
 msgstr ""
 
 #: ../menu-data/lombard:lombard.desktop.in.h:1
-msgid "Create and edit movies"
+msgid "Lombard Video Editor"
 msgstr ""
 
 #: ../menu-data/lombard:lombard.desktop.in.h:2
-msgid "Lombard Video Editor"
+msgid "Create and edit movies"
 msgstr ""
 
 #: ../menu-data/londonlaw:londonlaw.desktop.in.h:1
@@ -10887,43 +10973,43 @@
 msgstr ""
 
 #: ../menu-data/loqui:loqui.desktop.in.h:1
-msgid "IRC client"
+msgid "Loqui"
 msgstr ""
 
 #: ../menu-data/loqui:loqui.desktop.in.h:2
-msgid "Loqui"
+msgid "IRC client"
 msgstr ""
 
 #: ../menu-data/lostirc:lostirc.desktop.in.h:1
-msgid "Chat on IRC-networks"
+msgid "LostIRC"
 msgstr ""
 
 #: ../menu-data/lostirc:lostirc.desktop.in.h:2
-msgid "LostIRC"
+msgid "Chat on IRC-networks"
 msgstr ""
 
 #: ../menu-data/lottanzb:lottanzb.desktop.in.h:1
-msgid "Download from the Usenet with the help of NZB files"
+msgid "LottaNZB Usenet Downloader"
 msgstr ""
 
 #: ../menu-data/lottanzb:lottanzb.desktop.in.h:2
-msgid "LottaNZB Usenet Downloader"
+msgid "Download from the Usenet with the help of NZB files"
 msgstr ""
 
 #: ../menu-data/love:love.desktop.in.h:1
-msgid "Games development framework in lua"
+msgid "LÖVE"
 msgstr ""
 
 #: ../menu-data/love:love.desktop.in.h:2
-msgid "LÖVE"
+msgid "Games development framework in lua"
 msgstr ""
 
 #: ../menu-data/lprof:lprof.desktop.in.h:1
-msgid "Hardware ICC Profiler"
+msgid "LProf"
 msgstr ""
 
 #: ../menu-data/lprof:lprof.desktop.in.h:2
-msgid "LProf"
+msgid "Hardware ICC Profiler"
 msgstr ""
 
 #: ../menu-data/lshw-gtk:lshw-gtk.desktop.in.h:1
@@ -10935,11 +11021,11 @@
 msgstr ""
 
 #: ../menu-data/lskat:kde4__lskat.desktop.in.h:1
-msgid "Card Game"
+msgid "LSkat"
 msgstr ""
 
 #: ../menu-data/lskat:kde4__lskat.desktop.in.h:2
-msgid "LSkat"
+msgid "Card Game"
 msgstr ""
 
 #: ../menu-data/ltris:ltris.desktop.in.h:1
@@ -10959,27 +11045,36 @@
 msgstr ""
 
 #: ../menu-data/luakit:luakit.desktop.in.h:1
-msgid "Fast, small, webkit based micro-browser extensible by Lua"
+msgid "Luakit"
 msgstr ""
 
 #: ../menu-data/luakit:luakit.desktop.in.h:2
-msgid "Luakit"
+msgid "Fast, small, webkit based micro-browser extensible by Lua"
+msgstr ""
+
+#: ../menu-data/lubuntu-software-center:lubuntu-software-center.desktop.in.h:1
+msgid "Lubuntu Software Center"
+msgstr ""
+
+#: ../menu-data/lubuntu-software-center:lubuntu-software-center.desktop.in.h:2
+#: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:2
+msgid "Lets you choose from thousands of applications available for Ubuntu"
 msgstr ""
 
 #: ../menu-data/luciole:luciole.desktop.in.h:1
-msgid "Image Per Image capture tool for making animation movies."
+msgid "Luciole"
 msgstr ""
 
 #: ../menu-data/luciole:luciole.desktop.in.h:2
-msgid "Luciole"
+msgid "Image Per Image capture tool for making animation movies."
 msgstr ""
 
 #: ../menu-data/luckybackup:luckybackup.desktop.in.h:1
-msgid "Backup & sync your data with the power of rsync"
+msgid "luckyBackup"
 msgstr ""
 
 #: ../menu-data/luckybackup:luckybackup.desktop.in.h:2
-msgid "luckyBackup"
+msgid "Backup & sync your data with the power of rsync"
 msgstr ""
 
 #: ../menu-data/lugaru:lugaru.desktop.in.h:1
@@ -11009,11 +11104,11 @@
 msgstr ""
 
 #: ../menu-data/lxinput:lxinput.desktop.in.h:1
-msgid "Configure keyboard, mouse, and other input devices"
+msgid "Keyboard and Mouse"
 msgstr ""
 
 #: ../menu-data/lxinput:lxinput.desktop.in.h:2
-msgid "Keyboard and Mouse"
+msgid "Configure keyboard, mouse, and other input devices"
 msgstr ""
 
 #: ../menu-data/lxkeymap:lxkeymap.desktop.in.h:1
@@ -11025,11 +11120,11 @@
 msgstr ""
 
 #: ../menu-data/lxtask:lxtask.desktop.in.h:1
-msgid "Manage running processes"
+msgid "Task Manager"
 msgstr ""
 
 #: ../menu-data/lxtask:lxtask.desktop.in.h:2
-msgid "Task Manager"
+msgid "Manage running processes"
 msgstr ""
 
 #: ../menu-data/lybniz:lybniz.desktop.in.h:1
@@ -11049,11 +11144,11 @@
 msgstr ""
 
 #: ../menu-data/lynkeos.app:Lynkeos.desktop.in.h:1
-msgid "Filtering of astronomical images"
+msgid "Lynkeos Image Processor"
 msgstr ""
 
 #: ../menu-data/lynkeos.app:Lynkeos.desktop.in.h:2
-msgid "Lynkeos Image Processor"
+msgid "Filtering of astronomical images"
 msgstr ""
 
 #: ../menu-data/lyricue:lyricue.desktop.in.h:1
@@ -11073,11 +11168,11 @@
 msgstr ""
 
 #: ../menu-data/madbomber:madbomber.desktop.in.h:1
-msgid "Catch the Bombs"
+msgid "Mad Bomber"
 msgstr ""
 
 #: ../menu-data/madbomber:madbomber.desktop.in.h:2
-msgid "Mad Bomber"
+msgid "Catch the Bombs"
 msgstr ""
 
 #: ../menu-data/maelstrom:maelstrom.desktop.in.h:1
@@ -11112,28 +11207,36 @@
 msgid "Play classic Mahjong puzzle game"
 msgstr ""
 
+#: ../menu-data/mahjongg:mahjongg.desktop.in.h:1
+msgid "Mahjongg"
+msgstr ""
+
+#: ../menu-data/mahjongg:mahjongg.desktop.in.h:2
+msgid "Disassemble a pile of tiles by removing matching pairs"
+msgstr ""
+
 #: ../menu-data/mail-notification:mail-notification.desktop.in.h:1
-msgid "Get notified when new mail arrives"
+msgid "Mail Notification"
 msgstr ""
 
 #: ../menu-data/mail-notification:mail-notification.desktop.in.h:2
-msgid "Mail Notification"
+msgid "Get notified when new mail arrives"
 msgstr ""
 
 #: ../menu-data/mana:mana.desktop.in.h:1
-msgid "A 2D MMORPG client"
+msgid "Mana"
 msgstr ""
 
 #: ../menu-data/mana:mana.desktop.in.h:2
-msgid "Mana"
+msgid "A 2D MMORPG client"
 msgstr ""
 
 #: ../menu-data/mandelbulber:mandelbulber.desktop.in.h:1
-msgid "Mandebulber"
+msgid "Visit 3D Fractal World"
 msgstr ""
 
 #: ../menu-data/mandelbulber:mandelbulber.desktop.in.h:2
-msgid "Visit 3D Fractal World"
+msgid "Mandebulber"
 msgstr ""
 
 #: ../menu-data/mangler:mangler.desktop.in.h:1
@@ -11153,19 +11256,27 @@
 msgstr ""
 
 #: ../menu-data/marble:kde4__marble.desktop.in.h:1
-msgid "Desktop Globe"
+msgid "Marble"
 msgstr ""
 
 #: ../menu-data/marble:kde4__marble.desktop.in.h:2
-msgid "Marble"
+msgid "Desktop Globe"
+msgstr ""
+
+#: ../menu-data/massif-visualizer:kde4__massif-visualizer.desktop.in.h:1
+msgid "Massif-Visualizer"
+msgstr ""
+
+#: ../menu-data/massif-visualizer:kde4__massif-visualizer.desktop.in.h:2
+msgid "Visualization of Memory Profiling Data"
 msgstr ""
 
 #: ../menu-data/massxpert:massxpert.desktop.in.h:1
-msgid "Bio-polymer mass spectrometry software"
+msgid "massXpert"
 msgstr ""
 
 #: ../menu-data/massxpert:massxpert.desktop.in.h:2
-msgid "massXpert"
+msgid "Bio-polymer mass spectrometry software"
 msgstr ""
 
 #: ../menu-data/matchbox-keyboard:inputmethods__matchbox-keyboard.desktop.in.h:1
@@ -11177,19 +11288,19 @@
 msgstr ""
 
 #: ../menu-data/mathomatic:mathomatic.desktop.in.h:1
-msgid "Do symbolic mathematics and quick calculations"
+msgid "Mathomatic"
 msgstr ""
 
 #: ../menu-data/mathomatic:mathomatic.desktop.in.h:2
-msgid "Mathomatic"
+msgid "Do symbolic mathematics and quick calculations"
 msgstr ""
 
 #: ../menu-data/mathwar:MathWar.desktop.in.h:1
-msgid "A simple math game for kids"
+msgid "MathWar"
 msgstr ""
 
 #: ../menu-data/mathwar:MathWar.desktop.in.h:2
-msgid "MathWar"
+msgid "A simple math game for kids"
 msgstr ""
 
 #: ../menu-data/matlab-support:matlab.desktop.in.h:1
@@ -11201,19 +11312,19 @@
 msgstr ""
 
 #: ../menu-data/mc:mc.desktop.in.h:1
-msgid "File manager"
+msgid "Midnight Commander"
 msgstr ""
 
 #: ../menu-data/mc:mc.desktop.in.h:2
-msgid "Midnight Commander"
+msgid "File manager"
 msgstr ""
 
 #: ../menu-data/mcrl2:mcrl2-gui.desktop.in.h:1
-msgid "Graphical front end for mCRL2 toolset"
+msgid "mCRL2"
 msgstr ""
 
 #: ../menu-data/mcrl2:mcrl2-gui.desktop.in.h:2
-msgid "mCRL2"
+msgid "Graphical front end for mCRL2 toolset"
 msgstr ""
 
 #: ../menu-data/mcu8051ide:mcu8051ide.desktop.in.h:1
@@ -11233,11 +11344,19 @@
 msgstr ""
 
 #: ../menu-data/me-tv:me-tv.desktop.in.h:1
-msgid "A digital television (DVB) viewer for GNOME"
+msgid "Me TV"
 msgstr ""
 
 #: ../menu-data/me-tv:me-tv.desktop.in.h:2
-msgid "Me TV"
+msgid "A digital television (DVB) viewer for GNOME"
+msgstr ""
+
+#: ../menu-data/mediainfo-gui:mediainfo-gui.desktop.in.h:1
+msgid "MediaInfo"
+msgstr ""
+
+#: ../menu-data/mediainfo-gui:mediainfo-gui.desktop.in.h:2
+msgid "Supplies technical and tag information about a video or audio file"
 msgstr ""
 
 #: ../menu-data/mediathekview:mediathekview.desktop.in.h:1
@@ -11257,12 +11376,12 @@
 msgstr ""
 
 #: ../menu-data/medit:medit.desktop.in.h:1
-#: ../menu-data/nedit:nedit.desktop.in.h:2
-msgid "Text editor"
+msgid "medit"
 msgstr ""
 
 #: ../menu-data/medit:medit.desktop.in.h:2
-msgid "medit"
+#: ../menu-data/nedit:nedit.desktop.in.h:2
+msgid "Text editor"
 msgstr ""
 
 #: ../menu-data/mednafen:mednafen.desktop.in.h:1
@@ -11273,28 +11392,36 @@
 msgid "Multi-system video game emulator"
 msgstr ""
 
+#: ../menu-data/megaglest:megaglest.desktop.in.h:1
+msgid "A real time strategy game."
+msgstr ""
+
+#: ../menu-data/megaglest:megaglest.desktop.in.h:2
+msgid "MegaGlest"
+msgstr ""
+
 #: ../menu-data/meld:meld.desktop.in.h:1
-msgid "Compare and merge your files"
+msgid "Meld Diff Viewer"
 msgstr ""
 
 #: ../menu-data/meld:meld.desktop.in.h:2
-msgid "Meld Diff Viewer"
+msgid "Compare and merge your files"
 msgstr ""
 
 #: ../menu-data/melting-gui:melting-gui.desktop.in.h:1
-msgid "\"Computes the melting temperature for a nucleic acid duplex.\""
+msgid "Melting"
 msgstr ""
 
 #: ../menu-data/melting-gui:melting-gui.desktop.in.h:2
-msgid "Melting"
+msgid "\"Computes the melting temperature for a nucleic acid duplex.\""
 msgstr ""
 
 #: ../menu-data/memaker:memaker.desktop.in.h:1
-msgid "Builds avatars for all your applications."
+msgid "MeMaker"
 msgstr ""
 
 #: ../menu-data/memaker:memaker.desktop.in.h:2
-msgid "MeMaker"
+msgid "Builds avatars for all your applications."
 msgstr ""
 
 #: ../menu-data/meritous:meritous.desktop.in.h:1
@@ -11325,68 +11452,68 @@
 msgid "Metacity"
 msgstr ""
 
-#: ../menu-data/meterbridge:meterbridge.desktop.in.h:2
+#: ../menu-data/meterbridge:meterbridge.desktop.in.h:1
 msgid "Meterbridge"
 msgstr ""
 
 #: ../menu-data/mgm:mgm.desktop.in.h:1
-msgid "A highly configurable, very gaudy system load meter"
+msgid "MGM System Monitor"
 msgstr ""
 
 #: ../menu-data/mgm:mgm.desktop.in.h:2
-msgid "MGM System Monitor"
+msgid "A highly configurable, very gaudy system load meter"
 msgstr ""
 
 #: ../menu-data/mhwaveedit:mhwaveedit.desktop.in.h:1
-msgid "Record, play, edit and convert sound files"
+msgid "mhWaveEdit"
 msgstr ""
 
 #: ../menu-data/mhwaveedit:mhwaveedit.desktop.in.h:2
-msgid "mhWaveEdit"
+msgid "Record, play, edit and convert sound files"
 msgstr ""
 
 #: ../menu-data/micropolis:micropolis.desktop.in.h:1
-msgid "A real-time city management simulator"
+msgid "Micropolis"
 msgstr ""
 
 #: ../menu-data/micropolis:micropolis.desktop.in.h:2
-msgid "Micropolis"
+msgid "A real-time city management simulator"
 msgstr ""
 
 #: ../menu-data/midori:midori-private.desktop.in.h:1
-msgid "Open a new private browsing window"
+msgid "Midori Private Browsing"
 msgstr ""
 
 #: ../menu-data/midori:midori-private.desktop.in.h:2
-msgid "Private Browsing"
+msgid "Open a new private browsing window"
 msgstr ""
 
 #: ../menu-data/midori:midori.desktop.in.h:1
-msgid "Lightweight web browser"
+msgid "Midori"
 msgstr ""
 
 #: ../menu-data/midori:midori.desktop.in.h:2
-msgid "Midori"
+msgid "Lightweight web browser"
 msgstr ""
 
 #: ../menu-data/midori:midori.desktop.in.h:3
-msgid "New P_rivate Browsing Window"
+msgid "New _Tab"
 msgstr ""
 
 #: ../menu-data/midori:midori.desktop.in.h:4
-msgid "New _Tab"
+msgid "New _Window"
 msgstr ""
 
 #: ../menu-data/midori:midori.desktop.in.h:5
-msgid "New _Window"
+msgid "New P_rivate Browsing Window"
 msgstr ""
 
 #: ../menu-data/milkytracker:milkytracker.desktop.in.h:1
-msgid "Fasttracker 2 Clone"
+msgid "MilkyTracker"
 msgstr ""
 
 #: ../menu-data/milkytracker:milkytracker.desktop.in.h:2
-msgid "MilkyTracker"
+msgid "Fasttracker 2 Clone"
 msgstr ""
 
 #: ../menu-data/milkytracker:milkytracker.desktop.in.h:3
@@ -11394,17 +11521,29 @@
 msgstr ""
 
 #: ../menu-data/minbar:minbar.desktop.in.h:1
-msgid "Islamic prayer times"
+msgid "Minbar Prayer Times"
 msgstr ""
 
 #: ../menu-data/minbar:minbar.desktop.in.h:2
-msgid "Minbar Prayer Times"
+msgid "Islamic prayer times"
 msgstr ""
 
-#: ../menu-data/mines.app:Mines.desktop.in.h:1
+#: ../menu-data/mined:mined.desktop.in.h:1
+msgid "MinEd"
+msgstr ""
+
+#: ../menu-data/mines.app:Mines.desktop.in.h:2
 msgid "GNUstep minesweeper game"
 msgstr ""
 
+#: ../menu-data/minetest:minetest.desktop.in.h:1
+msgid "Minetest"
+msgstr ""
+
+#: ../menu-data/minetest:minetest.desktop.in.h:2
+msgid "InfiniMiner/Minecraft-inspired open game world"
+msgstr ""
+
 #: ../menu-data/minirok:kde4__minirok.desktop.in.h:1
 msgid "Minirok"
 msgstr ""
@@ -11417,29 +11556,21 @@
 msgid "Watch YouTube videos"
 msgstr ""
 
-#: ../menu-data/minitunes:minitunes.desktop.in.h:1
-msgid "Minitunes"
-msgstr ""
-
-#: ../menu-data/minitunes:minitunes.desktop.in.h:2
-msgid "Play your music collection"
-msgstr ""
-
 #: ../menu-data/mirage:mirage.desktop.in.h:1
-msgid "A fast GTK+ Image Viewer"
+msgid "Mirage"
 msgstr ""
 
 #: ../menu-data/mirage:mirage.desktop.in.h:2
-msgid "Mirage"
+msgid "A fast GTK+ Image Viewer"
 msgstr ""
 
 #: ../menu-data/miro:miro.desktop.in.h:1
-msgid ""
-"Fully featured video and music player, podcast client, and bittorrent client"
+msgid "Miro music and video player"
 msgstr ""
 
 #: ../menu-data/miro:miro.desktop.in.h:2
-msgid "Miro music and video player"
+msgid ""
+"Fully featured video and music player, podcast client, and bittorrent client"
 msgstr ""
 
 #: ../menu-data/mirrormagic:mirrormagic.desktop.in.h:1
@@ -11447,43 +11578,43 @@
 msgstr ""
 
 #: ../menu-data/mistelix:mistelix.desktop.in.h:1
-msgid "Author DVDs and slideshows"
+msgid "Mistelix"
 msgstr ""
 
 #: ../menu-data/mistelix:mistelix.desktop.in.h:2
-msgid "Mistelix"
+msgid "Author DVDs and slideshows"
 msgstr ""
 
 #: ../menu-data/mixxx:mixxx.desktop.in.h:1
-msgid "A digital DJ interface"
+msgid "Mixxx"
 msgstr ""
 
 #: ../menu-data/mixxx:mixxx.desktop.in.h:2
-msgid "Mixxx"
+msgid "A digital DJ interface"
 msgstr ""
 
 #: ../menu-data/mkvtoolnix-gui:mkvinfo.desktop.in.h:1
-msgid "Show information about MKV files"
+msgid "mkvinfo"
 msgstr ""
 
 #: ../menu-data/mkvtoolnix-gui:mkvinfo.desktop.in.h:2
-msgid "mkvinfo"
+msgid "Show information about MKV files"
 msgstr ""
 
 #: ../menu-data/mkvtoolnix-gui:mkvmergeGUI.desktop.in.h:1
-msgid "MKV files creator"
+msgid "mkvmerge GUI"
 msgstr ""
 
 #: ../menu-data/mkvtoolnix-gui:mkvmergeGUI.desktop.in.h:2
-msgid "mkvmerge GUI"
+msgid "MKV files creator"
 msgstr ""
 
 #: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:1
-msgid "Graphical frontend for MLDonkey"
+msgid "MLDonkey"
 msgstr ""
 
 #: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:2
-msgid "MLDonkey"
+msgid "Graphical frontend for MLDonkey"
 msgstr ""
 
 #: ../menu-data/mlterm-common:mlterm.desktop.in.h:1
@@ -11495,51 +11626,51 @@
 msgstr ""
 
 #: ../menu-data/mm3d:mm3d.desktop.in.h:1
-msgid "Create and edit 3D models and animations"
+msgid "Misfit Model 3D"
 msgstr ""
 
 #: ../menu-data/mm3d:mm3d.desktop.in.h:2
-msgid "Misfit Model 3D"
+msgid "Create and edit 3D models and animations"
 msgstr ""
 
 #: ../menu-data/mmass:mmass.desktop.in.h:1
-msgid "Mass spectrum viewer and data analysis proteomics tool"
+msgid "mMass"
 msgstr ""
 
 #: ../menu-data/mmass:mmass.desktop.in.h:2
-msgid "mMass"
+msgid "Mass spectrum viewer and data analysis proteomics tool"
 msgstr ""
 
 #: ../menu-data/mmpong-gl:mmpong-gl.desktop.in.h:1
-msgid "massively multiplayer pong game"
+msgid "mmpong-gl"
 msgstr ""
 
 #: ../menu-data/mmpong-gl:mmpong-gl.desktop.in.h:2
-msgid "mmpong-gl"
+msgid "massively multiplayer pong game"
 msgstr ""
 
 #: ../menu-data/mnemosyne:mnemosyne.desktop.in.h:1
-msgid "A flash card program to make your review process more efficient"
+msgid "Mnemosyne"
 msgstr ""
 
 #: ../menu-data/mnemosyne:mnemosyne.desktop.in.h:2
-msgid "Mnemosyne"
+msgid "A flash card program to make your review process more efficient"
 msgstr ""
 
 #: ../menu-data/model-builder:model-builder.desktop.in.h:1
-msgid "Graphical ODE simulator"
+msgid "Model Builder"
 msgstr ""
 
 #: ../menu-data/model-builder:model-builder.desktop.in.h:2
-msgid "Model Builder"
+msgid "Graphical ODE simulator"
 msgstr ""
 
 #: ../menu-data/mokomaze:mokomaze.desktop.in.h:1
-msgid "Ball-in-the-labyrinth game"
+msgid "Mokomaze"
 msgstr ""
 
 #: ../menu-data/mokomaze:mokomaze.desktop.in.h:2
-msgid "Mokomaze"
+msgid "Ball-in-the-labyrinth game"
 msgstr ""
 
 #: ../menu-data/monajat-applet:monajat.desktop.in.h:1
@@ -11559,11 +11690,11 @@
 msgstr ""
 
 #: ../menu-data/monkeystudio:monkeystudio.desktop.in.h:1
-msgid "MkS IDE"
+msgid "Monkey Studio IDE"
 msgstr ""
 
 #: ../menu-data/monkeystudio:monkeystudio.desktop.in.h:2
-msgid "Monkey Studio IDE"
+msgid "MkS IDE"
 msgstr ""
 
 #: ../menu-data/mono-runtime:mono-runtime-terminal.desktop.in.h:1
@@ -11575,29 +11706,29 @@
 msgstr ""
 
 #: ../menu-data/mono-tools-gui:gsharp.desktop.in.h:1
-msgid ""
-"Write C# in an interactive shell, and inject your code into running Mono "
-"processes"
+msgid "gsharp"
 msgstr ""
 
 #: ../menu-data/mono-tools-gui:gsharp.desktop.in.h:2
-msgid "gsharp"
+msgid ""
+"Write C# in an interactive shell, and inject your code into running Mono "
+"processes"
 msgstr ""
 
 #: ../menu-data/mono-tools-gui:ilcontrast.desktop.in.h:1
-msgid "Identify differences in the API exposed by mono library assemblies."
+msgid "Mono IL Contrast"
 msgstr ""
 
 #: ../menu-data/mono-tools-gui:ilcontrast.desktop.in.h:2
-msgid "Mono IL Contrast"
+msgid "Identify differences in the API exposed by mono library assemblies."
 msgstr ""
 
 #: ../menu-data/monodevelop:monodevelop.desktop.in.h:1
-msgid "Develop .NET applications in an Integrated Development Environment"
+msgid "MonoDevelop"
 msgstr ""
 
 #: ../menu-data/monodevelop:monodevelop.desktop.in.h:2
-msgid "MonoDevelop"
+msgid "Develop .NET applications in an Integrated Development Environment"
 msgstr ""
 
 #: ../menu-data/monodoc-browser:monodoc.desktop.in.h:1
@@ -11617,27 +11748,27 @@
 msgstr ""
 
 #: ../menu-data/monster-masher:monster-masher.desktop.in.h:1
-msgid "Mash monsters and save the gnomes"
+msgid "Monster Masher"
 msgstr ""
 
 #: ../menu-data/monster-masher:monster-masher.desktop.in.h:2
-msgid "Monster Masher"
+msgid "Mash monsters and save the gnomes"
 msgstr ""
 
 #: ../menu-data/monsterz:monsterz.desktop.in.h:1
-msgid "Little arcade puzzle game, similar to the famous Bejeweled"
+msgid "Monsterz"
 msgstr ""
 
 #: ../menu-data/monsterz:monsterz.desktop.in.h:2
-msgid "Monsterz"
+msgid "Little arcade puzzle game, similar to the famous Bejeweled"
 msgstr ""
 
 #: ../menu-data/moon-lander:moon-lander.desktop.in.h:1
-msgid "Fun game based on the classic moon lander"
+msgid "Moonlander"
 msgstr ""
 
 #: ../menu-data/moon-lander:moon-lander.desktop.in.h:2
-msgid "Moonlander"
+msgid "Fun game based on the classic moon lander"
 msgstr ""
 
 #: ../menu-data/moovida:moovida.desktop.in.h:1
@@ -11649,11 +11780,11 @@
 msgstr ""
 
 #: ../menu-data/moserial:moserial.desktop.in.h:1
-msgid "A serial terminal optimized for logging and file capture"
+msgid "moserial Terminal"
 msgstr ""
 
 #: ../menu-data/moserial:moserial.desktop.in.h:2
-msgid "moserial Terminal"
+msgid "A serial terminal optimized for logging and file capture"
 msgstr ""
 
 #: ../menu-data/mountmanager:mountmanager-gtk.desktop.in.h:1
@@ -11672,13 +11803,13 @@
 msgid "Mousepad"
 msgstr ""
 
-#: ../menu-data/mp3diags:mp3diags.desktop.in.h:1
-msgid "MP3 Diags"
+#. DocPath=
+#: ../menu-data/mp3diags:mp3diags.desktop.in.h:2
+msgid "MP3 Diags - diagnosis and repair tool"
 msgstr ""
 
-#. DocPath=
 #: ../menu-data/mp3diags:mp3diags.desktop.in.h:3
-msgid "MP3 Diags - diagnosis and repair tool"
+msgid "MP3 Diags"
 msgstr ""
 
 #: ../menu-data/mp3splt-gtk:mp3splt-gtk.desktop.in.h:1
@@ -11690,19 +11821,28 @@
 msgstr ""
 
 #: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:1
-msgid "GNUstep client for MPD"
+msgid "MPDCon"
 msgstr ""
 
 #: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:2
-msgid "MPDCon"
+msgid "GNUstep client for MPD"
+msgstr ""
+
+#: ../menu-data/mplayer-gui:mplayer.desktop.in.h:1
+msgid "MPlayer Media Player"
+msgstr ""
+
+#: ../menu-data/mplayer-gui:mplayer.desktop.in.h:2
+#: ../menu-data/totem:totem.desktop.in.h:2
+msgid "Play movies and songs"
 msgstr ""
 
 #: ../menu-data/mplinuxman:mplinuxman.desktop.in.h:1
-msgid "Manage your MPMan portable mp3 player"
+msgid "Mplinuxman"
 msgstr ""
 
 #: ../menu-data/mplinuxman:mplinuxman.desktop.in.h:2
-msgid "Mplinuxman"
+msgid "Manage your MPMan portable mp3 player"
 msgstr ""
 
 #: ../menu-data/mricron:dcm2niigui.desktop.in.h:1
@@ -11714,11 +11854,11 @@
 msgstr ""
 
 #: ../menu-data/mricron:mricron-npm.desktop.in.h:1
-msgid "NPM"
+msgid "Non-parametric MRI Analysis"
 msgstr ""
 
 #: ../menu-data/mricron:mricron-npm.desktop.in.h:2
-msgid "Non-parametric MRI Analysis"
+msgid "NPM"
 msgstr ""
 
 #: ../menu-data/mricron:mricron.desktop.in.h:1
@@ -11754,11 +11894,11 @@
 msgstr ""
 
 #: ../menu-data/mu-cade:mu-cade.desktop.in.h:1
-msgid "Kenta Cho's Mu-cade"
+msgid "Mu-cade"
 msgstr ""
 
 #: ../menu-data/mu-cade:mu-cade.desktop.in.h:2
-msgid "Mu-cade"
+msgid "Kenta Cho's Mu-cade"
 msgstr ""
 
 #: ../menu-data/mudlet:mudlet.desktop.in.h:1
@@ -11778,11 +11918,11 @@
 msgstr ""
 
 #: ../menu-data/mumble:mumble.desktop.in.h:1
-msgid "A low-latency, high quality voice chat program for gaming"
+msgid "Mumble"
 msgstr ""
 
 #: ../menu-data/mumble:mumble.desktop.in.h:2
-msgid "Mumble"
+msgid "A low-latency, high quality voice chat program for gaming"
 msgstr ""
 
 #: ../menu-data/muon-installer:kde4__muon-installer.desktop.in.h:1
@@ -11798,7 +11938,7 @@
 msgstr ""
 
 #: ../menu-data/muon-updater:kde4__muon-updater.desktop.in.h:2
-#: ../menu-data/update-manager:update-manager.desktop.in.h:2
+#: ../menu-data/update-manager:update-manager.desktop.in.h:1
 msgid "Update Manager"
 msgstr ""
 
@@ -11827,35 +11967,43 @@
 msgstr ""
 
 #: ../menu-data/muse:muse.desktop.in.h:1
-msgid "Midi Music Editor"
+msgid "MusE"
 msgstr ""
 
 #: ../menu-data/muse:muse.desktop.in.h:2
-msgid "MusE"
+msgid "Midi Music Editor"
 msgstr ""
 
 #: ../menu-data/museeq:museeq.desktop.in.h:1
-msgid "C++/QT3 Museek client"
+msgid "Museeq"
 msgstr ""
 
 #: ../menu-data/museeq:museeq.desktop.in.h:2
-msgid "Museeq"
+msgid "C++/QT3 Museek client"
 msgstr ""
 
 #: ../menu-data/musescore:mscore.desktop.in.h:1
-msgid "MuseScore"
+msgid "WYSIWYG Music score typesetter"
 msgstr ""
 
 #: ../menu-data/musescore:mscore.desktop.in.h:2
-msgid "WYSIWYG Music score typesetter"
+msgid "MuseScore"
 msgstr ""
 
 #: ../menu-data/musetup-gtk:musetup-gtk.desktop.in.h:1
-msgid "Museek daemon configuration tool"
+msgid "Musetup-gtk"
 msgstr ""
 
 #: ../menu-data/musetup-gtk:musetup-gtk.desktop.in.h:2
-msgid "Musetup-gtk"
+msgid "Museek daemon configuration tool"
+msgstr ""
+
+#: ../menu-data/musique:musique.desktop.in.h:1
+msgid "Musique"
+msgstr ""
+
+#: ../menu-data/musique:musique.desktop.in.h:2
+msgid "Play your music collection"
 msgstr ""
 
 #: ../menu-data/mutt:mutt.desktop.in.h:1
@@ -11871,11 +12019,11 @@
 msgstr ""
 
 #: ../menu-data/mx44:mx44.desktop.in.h:1
-msgid "Polyphonic, multichannel midi realtime software synthesizer"
+msgid "mx44"
 msgstr ""
 
 #: ../menu-data/mx44:mx44.desktop.in.h:2
-msgid "mx44"
+msgid "Polyphonic, multichannel midi realtime software synthesizer"
 msgstr ""
 
 #: ../menu-data/mypaint:mypaint.desktop.in.h:1
@@ -11886,36 +12034,20 @@
 msgid "Painting program for digital artists"
 msgstr ""
 
-#: ../menu-data/mysql-admin:MySQLAdministrator.desktop.in.h:1
-msgid "MySQL Administration Tool"
-msgstr ""
-
-#: ../menu-data/mysql-admin:MySQLAdministrator.desktop.in.h:2
-msgid "MySQL Administrator"
-msgstr ""
-
 #: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:1
-msgid "GUI client for MySQL"
-msgstr ""
-
-#: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:2
 msgid "MySQL Navigator"
 msgstr ""
 
-#: ../menu-data/mysql-query-browser:MySQLQueryBrowser.desktop.in.h:1
-msgid "MySQL Query Browser"
-msgstr ""
-
-#: ../menu-data/mysql-query-browser:MySQLQueryBrowser.desktop.in.h:2
-msgid "MySQL Query Tool"
+#: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:2
+msgid "GUI client for MySQL"
 msgstr ""
 
 #: ../menu-data/mythnettv-gui:mythnettv.desktop.in.h:1
-msgid "A video RSS grabber"
+msgid "MythNetTV"
 msgstr ""
 
 #: ../menu-data/mythnettv-gui:mythnettv.desktop.in.h:2
-msgid "MythNetTV"
+msgid "A video RSS grabber"
 msgstr ""
 
 #: ../menu-data/mythtv-backend:mythtv-setup.desktop.in.h:1
@@ -11927,35 +12059,43 @@
 msgstr ""
 
 #: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:1
-msgid "A frontend for all content on a mythtv-backend"
+msgid "MythTV Frontend"
 msgstr ""
 
 #: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:2
-msgid "MythTV Frontend"
+msgid "A frontend for all content on a mythtv-backend"
+msgstr ""
+
+#: ../menu-data/myunity:myunity.desktop.in.h:1
+msgid "MyUnity"
+msgstr ""
+
+#: ../menu-data/myunity:myunity.desktop.in.h:2
+msgid "Configuratore per Unity"
 msgstr ""
 
 #: ../menu-data/nagstamon:nagstamon.desktop.in.h:1
-msgid "Nagios status monitor "
+msgid "nagstamon"
 msgstr ""
 
 #: ../menu-data/nagstamon:nagstamon.desktop.in.h:2
-msgid "nagstamon"
+msgid "Nagios status monitor "
 msgstr ""
 
 #: ../menu-data/nanny:nanny-admin-console.desktop.in.h:1
-msgid "Nanny parental control admin console"
+msgid "Parental Control"
 msgstr ""
 
 #: ../menu-data/nanny:nanny-admin-console.desktop.in.h:2
-msgid "Parental Control"
+msgid "Nanny parental control admin console"
 msgstr ""
 
 #: ../menu-data/nautilus-actions:nact.desktop.in.h:1
-msgid "Configure items to be added to the Nautilus context menus"
+msgid "Nautilus-Actions Configuration Tool"
 msgstr ""
 
 #: ../menu-data/nautilus-actions:nact.desktop.in.h:2
-msgid "Nautilus-Actions Configuration Tool"
+msgid "Configure items to be added to the Nautilus context menus"
 msgstr ""
 
 #: ../menu-data/nautilus-compare:nautilus-compare-preferences.desktop.in.h:1
@@ -11983,11 +12123,11 @@
 msgstr ""
 
 #: ../menu-data/nautilus-scripts-manager:nautilus-scripts-manager.desktop.in.h:1
-msgid "Enable or disable Nautilus scripts"
+msgid "Nautilus scripts manager"
 msgstr ""
 
 #: ../menu-data/nautilus-scripts-manager:nautilus-scripts-manager.desktop.in.h:2
-msgid "Nautilus scripts manager"
+msgid "Enable or disable Nautilus scripts"
 msgstr ""
 
 #: ../menu-data/navit:navit.desktop.in.h:1
@@ -12039,19 +12179,19 @@
 msgstr ""
 
 #: ../menu-data/ncmpcpp:ncmpcpp.desktop.in.h:1
-msgid "NCurses Music Player Client"
+msgid "Ncmpcpp"
 msgstr ""
 
 #: ../menu-data/ncmpcpp:ncmpcpp.desktop.in.h:2
-msgid "Ncmpcpp"
+msgid "NCurses Music Player Client"
 msgstr ""
 
 #: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:1
-msgid "Ndiswrapper driver installation tool"
+msgid "Windows Wireless Drivers"
 msgstr ""
 
 #: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:2
-msgid "Windows Wireless Drivers"
+msgid "Ndiswrapper driver installation tool"
 msgstr ""
 
 #: ../menu-data/nedit:nedit.desktop.in.h:1
@@ -12067,11 +12207,11 @@
 msgstr ""
 
 #: ../menu-data/nemiver:nemiver.desktop.in.h:1
-msgid "Debug Applications"
+msgid "Nemiver C/C++ Debugger"
 msgstr ""
 
 #: ../menu-data/nemiver:nemiver.desktop.in.h:2
-msgid "Nemiver C/C++ Debugger"
+msgid "Debug Applications"
 msgstr ""
 
 #: ../menu-data/netapplet:netapplet.desktop.in.h:1
@@ -12082,6 +12222,10 @@
 msgid "Network Selector Panel Applet"
 msgstr ""
 
+#: ../menu-data/netbeans:netbeans.desktop.in.h:1
+msgid "NetBeans IDE 7.0.1"
+msgstr ""
+
 #: ../menu-data/netemul:netemul.desktop.in.h:1
 msgid "NetEmul"
 msgstr ""
@@ -12090,7 +12234,7 @@
 msgid "The LAN network simulator"
 msgstr ""
 
-#: ../menu-data/netgen:netgen.desktop.in.h:2
+#: ../menu-data/netgen:netgen.desktop.in.h:1
 msgid "Netgen Mesh Generator"
 msgstr ""
 
@@ -12114,37 +12258,37 @@
 msgid "Netrek"
 msgstr ""
 
-#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:2
+#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:1
 msgid "NetSurf Web Browser"
 msgstr ""
 
-#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1
+#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr ""
 
 #: ../menu-data/neverball:neverball.desktop.in.h:1
-msgid "A 3D arcade game with a ball"
+msgid "Neverball"
 msgstr ""
 
 #: ../menu-data/neverball:neverball.desktop.in.h:2
-msgid "Neverball"
+msgid "A 3D arcade game with a ball"
 msgstr ""
 
 #: ../menu-data/neverputt:neverputt.desktop.in.h:1
-msgid "A 3D mini golf game"
+msgid "Neverputt"
 msgstr ""
 
 #: ../menu-data/neverputt:neverputt.desktop.in.h:2
-msgid "Neverputt"
+msgid "A 3D mini golf game"
 msgstr ""
 
 #: ../menu-data/nexuiz:nexuiz.desktop.in.h:1
-msgid ""
-"A networked 3D first person shooter game with high-quality graphic effects"
+msgid "Nexuiz"
 msgstr ""
 
 #: ../menu-data/nexuiz:nexuiz.desktop.in.h:2
-msgid "Nexuiz"
+msgid ""
+"A networked 3D first person shooter game with high-quality graphic effects"
 msgstr ""
 
 #: ../menu-data/nfoview:nfoview.desktop.in.h:1
@@ -12172,11 +12316,11 @@
 msgstr ""
 
 #: ../menu-data/nip2:nip2.desktop.in.h:1
-msgid "Image manipulation program based on VIPS"
+msgid "nip2"
 msgstr ""
 
 #: ../menu-data/nip2:nip2.desktop.in.h:2
-msgid "nip2"
+msgid "Image manipulation program based on VIPS"
 msgstr ""
 
 #: ../menu-data/njam:njam.desktop.in.h:1
@@ -12188,48 +12332,48 @@
 msgstr ""
 
 #: ../menu-data/njplot:njplot.desktop.in.h:1
-msgid ""
-"Displays, modifies and exports in PostScript format phylogenetic trees"
+msgid "NJplot"
 msgstr ""
 
 #: ../menu-data/njplot:njplot.desktop.in.h:2
-msgid "NJplot"
+msgid ""
+"Displays, modifies and exports in PostScript format phylogenetic trees"
 msgstr ""
 
 #: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:1
-msgid "Is a Qt4 interface for nmap scanner"
+msgid "NmapSI4 - User mode"
 msgstr ""
 
 #: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:2
-msgid "NmapSI4 - User mode"
+msgid "Is a Qt4 interface for nmap scanner"
 msgstr ""
 
 #: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:1
-msgid "An Abstract Shooter by Kenta Cho"
+msgid "Noiz2sa"
 msgstr ""
 
 #: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:2
-msgid "Noiz2sa"
+msgid "An Abstract Shooter by Kenta Cho"
 msgstr ""
 
 #: ../menu-data/notification-daemon:notification-daemon.desktop.in.h:1
-msgid "Display notifications"
+msgid "Notification Daemon"
 msgstr ""
 
 #: ../menu-data/notification-daemon:notification-daemon.desktop.in.h:2
-msgid "Notification Daemon"
+msgid "Display notifications"
 msgstr ""
 
-#: ../menu-data/nted:nted.desktop.in.h:2
+#: ../menu-data/nted:nted.desktop.in.h:1
 msgid "NtEd"
 msgstr ""
 
 #: ../menu-data/ntfs-config:ntfs-config.desktop.in.h:1
-msgid "Enable/disable write support for NTFS with a simple click."
+msgid "NTFS Configuration Tool"
 msgstr ""
 
 #: ../menu-data/ntfs-config:ntfs-config.desktop.in.h:2
-msgid "NTFS Configuration Tool"
+msgid "Enable/disable write support for NTFS with a simple click."
 msgstr ""
 
 #: ../menu-data/nuapplet:nuapplet2.desktop.in.h:1
@@ -12256,44 +12400,62 @@
 msgid "Network UPS Tools GUI client"
 msgstr ""
 
+#: ../menu-data/nvclock-gtk:nvclock.desktop.in.h:1
+msgid "NVCLOCK"
+msgstr ""
+
+#: ../menu-data/nvclock-gtk:nvclock.desktop.in.h:2
+msgid "Overclock and Monitor NVIDIA cards"
+msgstr ""
+
 #: ../menu-data/nvtv:nvtv.desktop.in.h:1
-msgid "Control the TV output of NVidia video cards"
+msgid "Nvtv TV Out"
 msgstr ""
 
 #: ../menu-data/nvtv:nvtv.desktop.in.h:2
-msgid "Nvtv TV Out"
+msgid "Control the TV output of NVidia video cards"
 msgstr ""
 
 #: ../menu-data/nzb:nzb.desktop.in.h:1
-msgid "Grab nzb files"
+msgid "Nzb"
 msgstr ""
 
 #: ../menu-data/nzb:nzb.desktop.in.h:2
-msgid "Nzb"
+msgid "Grab nzb files"
 msgstr ""
 
 #: ../menu-data/obconf:obconf.desktop.in.h:1
-msgid "Configure and personalize the Openbox window manager"
+msgid "Openbox Configuration Manager"
 msgstr ""
 
 #: ../menu-data/obconf:obconf.desktop.in.h:2
-msgid "Openbox Configuration Manager"
+msgid "Configure and personalize the Openbox window manager"
 msgstr ""
 
 #: ../menu-data/obextool:obextool.desktop.in.h:1
-msgid "A GUI for bluetooth transfers"
+msgid "ObexTool"
 msgstr ""
 
 #: ../menu-data/obextool:obextool.desktop.in.h:2
-msgid "ObexTool"
+msgid "A GUI for bluetooth transfers"
 msgstr ""
 
 #: ../menu-data/objcryst-fox:fox.desktop.in.h:1
-msgid "Crystal structure determination"
+msgid "Fox"
 msgstr ""
 
 #: ../menu-data/objcryst-fox:fox.desktop.in.h:2
-msgid "Fox"
+msgid "Crystal structure determination"
+msgstr ""
+
+#: ../menu-data/oce-draw:oce-draw.desktop.in.h:1
+#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:1
+msgid "OpenCASCADE"
+msgstr ""
+
+#: ../menu-data/oce-draw:oce-draw.desktop.in.h:2
+#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:2
+msgid "OpenCASCADE DRAWEXE test harness"
 msgstr ""
 
 #: ../menu-data/ocrfeeder:ocrfeeder.desktop.in.h:1
@@ -12313,27 +12475,31 @@
 msgstr ""
 
 #: ../menu-data/oggconvert:oggconvert.desktop.in.h:1
-msgid "Convert media files to Free formats"
+msgid "OggConvert"
 msgstr ""
 
 #: ../menu-data/oggconvert:oggconvert.desktop.in.h:2
-msgid "OggConvert"
+msgid "Convert media files to Free formats"
 msgstr ""
 
 #: ../menu-data/ogmrip:ogmrip.desktop.in.h:1
-msgid "A DVD encoder"
+msgid "DVD Encoder OGMRip"
 msgstr ""
 
 #: ../menu-data/ogmrip:ogmrip.desktop.in.h:2
-msgid "DVD Encoder OGMRip"
+msgid "A DVD encoder"
 msgstr ""
 
 #: ../menu-data/okteta:kde4__okteta.desktop.in.h:1
-msgid "Hex Editor"
+msgid "Okteta"
 msgstr ""
 
 #: ../menu-data/okteta:kde4__okteta.desktop.in.h:2
-msgid "Okteta"
+msgid "Hex Editor"
+msgstr ""
+
+#: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:1
+msgid "okular"
 msgstr ""
 
 #: ../menu-data/omaque:kde4__omaque.desktop.in.h:1
@@ -12341,51 +12507,51 @@
 msgstr ""
 
 #: ../menu-data/omegat:omegat.desktop.in.h:1
-msgid "Computer-Assisted Translation tool"
+msgid "OmegaT"
 msgstr ""
 
 #: ../menu-data/omegat:omegat.desktop.in.h:2
-msgid "OmegaT"
+msgid "Computer-Assisted Translation tool"
 msgstr ""
 
 #: ../menu-data/onboard:onboard.desktop.in.h:1
-msgid "Flexible onscreen keyboard for GNOME"
+msgid "Onboard"
 msgstr ""
 
 #: ../menu-data/onboard:onboard.desktop.in.h:2
-msgid "Onboard"
+msgid "Flexible onscreen keyboard for GNOME"
 msgstr ""
 
 #: ../menu-data/oneisenough:oneisenough.desktop.in.h:1
-msgid "2D platform game about communist and capitalist balls"
+msgid "One Is Enough"
 msgstr ""
 
 #: ../menu-data/oneisenough:oneisenough.desktop.in.h:2
-msgid "One Is Enough"
+msgid "2D platform game about communist and capitalist balls"
 msgstr ""
 
 #: ../menu-data/ontv:ontv.desktop.in.h:1
-msgid "Monitor TV programs"
+msgid "OnTV"
 msgstr ""
 
 #: ../menu-data/ontv:ontv.desktop.in.h:2
-msgid "OnTV"
+msgid "Monitor TV programs"
 msgstr ""
 
 #: ../menu-data/oolite:oolite.desktop.in.h:1
-msgid "An OpenGL Elite-like space game"
+msgid "Oolite"
 msgstr ""
 
 #: ../menu-data/oolite:oolite.desktop.in.h:2
-msgid "Oolite"
+msgid "An OpenGL Elite-like space game"
 msgstr ""
 
 #: ../menu-data/open-axiom:open-axiom.desktop.in.h:1
-msgid "Open scientific computation platform"
+msgid "OpenAxiom"
 msgstr ""
 
 #: ../menu-data/open-axiom:open-axiom.desktop.in.h:2
-msgid "OpenAxiom"
+msgid "Open scientific computation platform"
 msgstr ""
 
 #: ../menu-data/open-invaders:open-invaders.desktop.in.h:1
@@ -12397,29 +12563,29 @@
 msgstr ""
 
 #: ../menu-data/openarena:openarena.desktop.in.h:1
-msgid ""
-"A fast-paced 3D first-person shooter, similar to id Software Inc.'s Quake "
-"III Arena"
+msgid "OpenArena"
 msgstr ""
 
 #: ../menu-data/openarena:openarena.desktop.in.h:2
-msgid "OpenArena"
+msgid ""
+"A fast-paced 3D first-person shooter, similar to id Software Inc.'s Quake "
+"III Arena"
 msgstr ""
 
 #: ../menu-data/openbmap-logger:openBmap.desktop.in.h:1
-msgid "Logs GSM and GPS and uploads to openBmap."
+msgid "OBM"
 msgstr ""
 
 #: ../menu-data/openbmap-logger:openBmap.desktop.in.h:2
-msgid "OBM"
+msgid "Logs GSM and GPS and uploads to openBmap."
 msgstr ""
 
 #: ../menu-data/openbox:openbox.desktop.in.h:1
-msgid "Log in using the Openbox window manager (without a session manager)"
+msgid "Openbox"
 msgstr ""
 
 #: ../menu-data/openbox:openbox.desktop.in.h:2
-msgid "Openbox"
+msgid "Log in using the Openbox window manager (without a session manager)"
 msgstr ""
 
 #: ../menu-data/openbve:openbve.desktop.in.h:1
@@ -12430,14 +12596,6 @@
 msgid "Train/railway simulator compatible with 'BVE Trainsim' routes"
 msgstr ""
 
-#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:1
-msgid "OpenCASCADE"
-msgstr ""
-
-#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:2
-msgid "OpenCASCADE DRAWEXE test harness"
-msgstr ""
-
 #: ../menu-data/opencity:opencity.desktop.in.h:1
 msgid "OpenCity"
 msgstr ""
@@ -12463,11 +12621,11 @@
 msgstr ""
 
 #: ../menu-data/openfetion:openfetion.desktop.in.h:1
-msgid "Fetion For Linux"
+msgid "OpenFetion"
 msgstr ""
 
 #: ../menu-data/openfetion:openfetion.desktop.in.h:2
-msgid "OpenFetion"
+msgid "Fetion For Linux"
 msgstr ""
 
 #: ../menu-data/openjdk-6-jre:openjdk-6-java.desktop.in.h:1
@@ -12479,59 +12637,59 @@
 msgstr ""
 
 #: ../menu-data/openrocket:openrocket.desktop.in.h:1
-msgid "Design and simulate model rockets"
+msgid "OpenRocket"
 msgstr ""
 
 #: ../menu-data/openrocket:openrocket.desktop.in.h:2
-msgid "OpenRocket"
+msgid "Design and simulate model rockets"
 msgstr ""
 
 #: ../menu-data/openshot:openshot.desktop.in.h:1
-msgid "Create and edit videos and movies"
+msgid "OpenShot Video Editor"
 msgstr ""
 
 #: ../menu-data/openshot:openshot.desktop.in.h:2
-msgid "OpenShot Video Editor"
+msgid "Create and edit videos and movies"
 msgstr ""
 
 #: ../menu-data/openstv:openstv.desktop.in.h:1
-msgid "Conduct a Single Transferable Vote election"
+msgid "OpenSTV Voting Software"
 msgstr ""
 
 #: ../menu-data/openstv:openstv.desktop.in.h:2
-msgid "OpenSTV Voting Software"
+msgid "Conduct a Single Transferable Vote election"
 msgstr ""
 
 #: ../menu-data/openteacher:openteacher.desktop.in.h:1
-msgid "Learn words in a foreign language."
+msgid "OpenTeacher"
 msgstr ""
 
 #: ../menu-data/openteacher:openteacher.desktop.in.h:2
-msgid "OpenTeacher"
+msgid "Learn words in a foreign language."
 msgstr ""
 
 #: ../menu-data/openttd:openttd.desktop.in.h:1
-msgid "A clone of Transport Tycoon Deluxe"
+msgid "OpenTTD"
 msgstr ""
 
 #: ../menu-data/openttd:openttd.desktop.in.h:2
-msgid "OpenTTD"
+msgid "A clone of Transport Tycoon Deluxe"
 msgstr ""
 
 #: ../menu-data/openuniverse:openuniverse.desktop.in.h:1
-msgid "Explore the solar system in this accurate simulation"
+msgid "OpenUniverse Space Simulator"
 msgstr ""
 
 #: ../menu-data/openuniverse:openuniverse.desktop.in.h:2
-msgid "OpenUniverse Space Simulator"
+msgid "Explore the solar system in this accurate simulation"
 msgstr ""
 
 #: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:1
-msgid "GTK+-2 Client for OpenVAS Security Scanner"
+msgid "OpenVAS-Client"
 msgstr ""
 
 #: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:2
-msgid "OpenVAS-Client"
+msgid "GTK+-2 Client for OpenVAS Security Scanner"
 msgstr ""
 
 #: ../menu-data/openwalnut-qt4:openwalnut.desktop.in.h:1
@@ -12547,11 +12705,11 @@
 msgstr ""
 
 #: ../menu-data/optgeo:optgeo.desktop.in.h:1
-msgid "Interactive tool to study and simulate optic assemblies"
+msgid "OptGeo"
 msgstr ""
 
 #: ../menu-data/optgeo:optgeo.desktop.in.h:2
-msgid "OptGeo"
+msgid "Interactive tool to study and simulate optic assemblies"
 msgstr ""
 
 #: ../menu-data/orage:globaltime.desktop.in.h:1
@@ -12563,11 +12721,11 @@
 msgstr ""
 
 #: ../menu-data/orage:xfcalendar.desktop.in.h:1
-msgid "Desktop calendar"
+msgid "Orage Calendar"
 msgstr ""
 
 #: ../menu-data/orage:xfcalendar.desktop.in.h:2
-msgid "Orage Calendar"
+msgid "Desktop calendar"
 msgstr ""
 
 #: ../menu-data/orage:xfce-xfcalendar-settings.desktop.in.h:1
@@ -12579,11 +12737,11 @@
 msgstr ""
 
 #: ../menu-data/orbital-eunuchs-sniper:orbital-eunuchs-sniper.desktop.in.h:1
-msgid "Anti-terrorist Satellite Sniping Game"
+msgid "Orbital Eunuchs Sniper"
 msgstr ""
 
 #: ../menu-data/orbital-eunuchs-sniper:orbital-eunuchs-sniper.desktop.in.h:2
-msgid "Orbital Eunuchs Sniper"
+msgid "Anti-terrorist Satellite Sniping Game"
 msgstr ""
 
 #: ../menu-data/oregano:oregano.desktop.in.h:1
@@ -12603,19 +12761,19 @@
 msgstr ""
 
 #: ../menu-data/othman:Othman.desktop.in.h:1
-msgid "Electronic Mus-haf"
+msgid "Othman Quran Browser"
 msgstr ""
 
 #: ../menu-data/othman:Othman.desktop.in.h:2
-msgid "Othman Quran Browser"
+msgid "Electronic Mus-haf"
 msgstr ""
 
 #: ../menu-data/out-of-order:out-of-order.desktop.in.h:1
-msgid "Adventure Game"
+msgid "Out Of Order"
 msgstr ""
 
 #: ../menu-data/out-of-order:out-of-order.desktop.in.h:2
-msgid "Out Of Order"
+msgid "Adventure Game"
 msgstr ""
 
 #: ../menu-data/overgod:overgod.desktop.in.h:1
@@ -12636,11 +12794,11 @@
 msgstr ""
 
 #: ../menu-data/pacemaker-mgmt-client:crm_gui.desktop.in.h:1
-msgid "Pacemaker CRM GUI"
+msgid "Pacemaker GUI"
 msgstr ""
 
 #: ../menu-data/pacemaker-mgmt-client:crm_gui.desktop.in.h:2
-msgid "Pacemaker GUI"
+msgid "Pacemaker CRM GUI"
 msgstr ""
 
 #: ../menu-data/packagesearch:packagesearch.desktop.in.h:1
@@ -12660,11 +12818,11 @@
 msgstr ""
 
 #: ../menu-data/pacman:pacman.desktop.in.h:1
-msgid "A simple clone of the classic arcade game"
+msgid "Pacman"
 msgstr ""
 
 #: ../menu-data/pacman:pacman.desktop.in.h:2
-msgid "Pacman"
+msgid "A simple clone of the classic arcade game"
 msgstr ""
 
 #: ../menu-data/padre:padre.desktop.in.h:1
@@ -12684,26 +12842,26 @@
 msgstr ""
 
 #: ../menu-data/palapeli:kde4__palapeli.desktop.in.h:1
-msgid "Jigsaw puzzle game"
+msgid "Palapeli"
 msgstr ""
 
 #: ../menu-data/palapeli:kde4__palapeli.desktop.in.h:2
-msgid "Palapeli"
+msgid "Jigsaw puzzle game"
 msgstr ""
 
 #: ../menu-data/paman:paman.desktop.in.h:1
-msgid "Manage your PulseAudio sound server"
+msgid "PulseAudio Manager"
 msgstr ""
 
 #: ../menu-data/paman:paman.desktop.in.h:2
-msgid "PulseAudio Manager"
+msgid "Manage your PulseAudio sound server"
 msgstr ""
 
 #: ../menu-data/pan:pan.desktop.in.h:1
 msgid "Pan Newsreader"
 msgstr ""
 
-#: ../menu-data/pan:pan.desktop.in.h:2 ../menu-data/xpn:xpn.desktop.in.h:1
+#: ../menu-data/pan:pan.desktop.in.h:2 ../menu-data/xpn:xpn.desktop.in.h:2
 msgid "Read News from Usenet"
 msgstr ""
 
@@ -12731,7 +12889,7 @@
 msgid "ParaView allows viewing of large data sets"
 msgstr ""
 
-#: ../menu-data/parcellite:parcellite.desktop.in.h:2
+#: ../menu-data/parcellite:parcellite.desktop.in.h:1
 msgid "Parcellite"
 msgstr ""
 
@@ -12748,11 +12906,11 @@
 msgstr ""
 
 #: ../menu-data/parsec47:parsec47.desktop.in.h:1
-msgid "Kenta Cho's PARSEC47"
+msgid "PARSEC47"
 msgstr ""
 
 #: ../menu-data/parsec47:parsec47.desktop.in.h:2
-msgid "PARSEC47"
+msgid "Kenta Cho's PARSEC47"
 msgstr ""
 
 #: ../menu-data/partitionmanager:kde4__partitionmanager.desktop.in.h:1
@@ -12763,6 +12921,14 @@
 msgid "Manage disks, partitions and file systems"
 msgstr ""
 
+#: ../menu-data/pasaffe:pasaffe.desktop.in.h:1
+msgid "Pasaffe"
+msgstr ""
+
+#: ../menu-data/pasaffe:pasaffe.desktop.in.h:2
+msgid "Pasaffe password manager"
+msgstr ""
+
 #: ../menu-data/passage:passage.desktop.in.h:1
 msgid "Passage"
 msgstr ""
@@ -12780,20 +12946,20 @@
 msgstr ""
 
 #: ../menu-data/patchage:patchage.desktop.in.h:1
-msgid ""
-"Connect audio and MIDI applications together and manage audio sessions"
+msgid "Patchage"
 msgstr ""
 
 #: ../menu-data/patchage:patchage.desktop.in.h:2
-msgid "Patchage"
+msgid ""
+"Connect audio and MIDI applications together and manage audio sessions"
 msgstr ""
 
 #: ../menu-data/pathogen:pathogen.desktop.in.h:1
-msgid "Destroy the pathogens"
+msgid "Pathogen"
 msgstr ""
 
 #: ../menu-data/pathogen:pathogen.desktop.in.h:2
-msgid "Pathogen"
+msgid "Destroy the pathogens"
 msgstr ""
 
 #: ../menu-data/pathological:pathological.desktop.in.h:1
@@ -12805,35 +12971,35 @@
 msgstr ""
 
 #: ../menu-data/pauker:pauker.desktop.in.h:1
-msgid "Generic card based learning program"
+msgid "Pauker"
 msgstr ""
 
 #: ../menu-data/pauker:pauker.desktop.in.h:2
-msgid "Pauker"
+msgid "Generic card based learning program"
 msgstr ""
 
 #: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:1
-msgid "Adjust the volume level"
+msgid "PulseAudio Volume Control"
 msgstr ""
 
 #: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:2
-msgid "PulseAudio Volume Control"
+msgid "Adjust the volume level"
 msgstr ""
 
 #: ../menu-data/pavumeter:pavumeter.desktop.in.h:1
-msgid "Monitor the output volume"
+msgid "PulseAudio Volume Meter (Playback)"
 msgstr ""
 
 #: ../menu-data/pavumeter:pavumeter.desktop.in.h:2
-msgid "PulseAudio Volume Meter (Playback)"
+msgid "Monitor the output volume"
 msgstr ""
 
 #: ../menu-data/paw++:paw++.desktop.in.h:1
-msgid "Analyze and graphically present experimental data"
+msgid "Paw++ (Physics Analysis Workstation)"
 msgstr ""
 
 #: ../menu-data/paw++:paw++.desktop.in.h:2
-msgid "Paw++ (Physics Analysis Workstation)"
+msgid "Analyze and graphically present experimental data"
 msgstr ""
 
 #: ../menu-data/pcalendar:pcalendar.desktop.in.h:1
@@ -12846,14 +13012,14 @@
 msgstr ""
 
 #: ../menu-data/pcb-common:pcb.desktop.in.h:1
-msgid "Create and edit printed circuit board designs"
+msgid "PCB Designer"
 msgstr ""
 
 #: ../menu-data/pcb-common:pcb.desktop.in.h:2
-msgid "PCB Designer"
+msgid "Create and edit printed circuit board designs"
 msgstr ""
 
-#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:1
+#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:2
 msgid "Browse the file system and manage the files"
 msgstr ""
 
@@ -12881,12 +13047,20 @@
 msgid "Sony PlayStation emulator"
 msgstr ""
 
+#: ../menu-data/pdf-presenter-console:pdf-presenter-console.desktop.in.h:1
+msgid "PDF Presenter Console"
+msgstr ""
+
+#: ../menu-data/pdf-presenter-console:pdf-presenter-console.desktop.in.h:2
+msgid "Presentation program for PDF files"
+msgstr ""
+
 #: ../menu-data/pdfchain:pdfchain.desktop.in.h:1
-msgid "GUI for PDFTK - A graphical tool for manipulating PDF"
+msgid "PDF Chain"
 msgstr ""
 
 #: ../menu-data/pdfchain:pdfchain.desktop.in.h:2
-msgid "PDF Chain"
+msgid "GUI for the PDFTK - A graphical tool for manipulating PDF"
 msgstr ""
 
 #: ../menu-data/pdfedit:pdfedit.desktop.in.h:1
@@ -12902,27 +13076,27 @@
 msgstr ""
 
 #: ../menu-data/pdfsam:pdfsam.desktop.in.h:1
-msgid "A tool to split and merge pdf documents"
+msgid "pdfsam"
 msgstr ""
 
 #: ../menu-data/pdfsam:pdfsam.desktop.in.h:2
-msgid "pdfsam"
+msgid "A tool to split and merge pdf documents"
 msgstr ""
 
 #: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:1
-msgid "PDF Merging, Rearranging, Splitting, Rotating and Cropping"
+msgid "PDF-Shuffler"
 msgstr ""
 
 #: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:2
-msgid "PDF-Shuffler"
+msgid "PDF Merging, Rearranging, Splitting, Rotating and Cropping"
 msgstr ""
 
 #: ../menu-data/peg-e:peg-e.desktop.in.h:1
-msgid "Peg elimination game"
+msgid "Peg-E"
 msgstr ""
 
 #: ../menu-data/peg-e:peg-e.desktop.in.h:2
-msgid "Peg-E"
+msgid "Peg elimination game"
 msgstr ""
 
 #: ../menu-data/peg-solitaire:peg-solitaire.desktop.in.h:1
@@ -12938,67 +13112,67 @@
 msgstr ""
 
 #: ../menu-data/pencil:pencil.desktop.in.h:1
-msgid "Draw cartoons"
+msgid "Pencil"
 msgstr ""
 
 #: ../menu-data/pencil:pencil.desktop.in.h:2
-msgid "Pencil"
+msgid "Draw cartoons"
 msgstr ""
 
 #: ../menu-data/penguin-command:penguin-command.desktop.in.h:1
-msgid "A Missile Command clone"
+msgid "Penguin Command"
 msgstr ""
 
 #: ../menu-data/penguin-command:penguin-command.desktop.in.h:2
-msgid "Penguin Command"
+msgid "A Missile Command clone"
 msgstr ""
 
 #: ../menu-data/penguintv:penguintv.desktop.in.h:1
-msgid "Aggregates rss feeds, podcasts, and video blogs"
+msgid "PenguinTV Media Aggregator"
 msgstr ""
 
 #: ../menu-data/penguintv:penguintv.desktop.in.h:2
-msgid "PenguinTV Media Aggregator"
+msgid "Aggregates rss feeds, podcasts, and video blogs"
 msgstr ""
 
 #: ../menu-data/pente:pente.desktop.in.h:1
-msgid "Five in a row game for X"
+msgid "Pente"
 msgstr ""
 
 #: ../menu-data/pente:pente.desktop.in.h:2
-msgid "Pente"
+msgid "Five in a row game for X"
+msgstr ""
+
+#: ../menu-data/pentobi:pentobi.desktop.in.h:1
+msgid "Pentobi"
+msgstr ""
+
+#: ../menu-data/pentobi:pentobi.desktop.in.h:2
+msgid "Computer program that plays the board game Blokus"
 msgstr ""
 
 #: ../menu-data/performous:performous.desktop.in.h:1
-msgid "A karaoke game"
+msgid "Performous"
 msgstr ""
 
 #: ../menu-data/performous:performous.desktop.in.h:2
-msgid "Performous"
+msgid "A karaoke game"
 msgstr ""
 
 #: ../menu-data/perlprimer:perlprimer.desktop.in.h:1
-msgid "Graphical design of primers for PCR and sequencing"
+msgid "PerlPrimer"
 msgstr ""
 
 #: ../menu-data/perlprimer:perlprimer.desktop.in.h:2
-msgid "PerlPrimer"
+msgid "Graphical design of primers for PCR and sequencing"
 msgstr ""
 
 #: ../menu-data/perroquet:perroquet.desktop.in.h:1
-msgid "Oral comprehension teacher"
-msgstr ""
-
-#: ../menu-data/perroquet:perroquet.desktop.in.h:2
 msgid "Perroquet"
 msgstr ""
 
-#: ../menu-data/pessulus:pessulus.desktop.in.h:1
-msgid "Configure the lockdown policy"
-msgstr ""
-
-#: ../menu-data/pessulus:pessulus.desktop.in.h:2
-msgid "Lockdown Editor"
+#: ../menu-data/perroquet:perroquet.desktop.in.h:2
+msgid "Oral comprehension teacher"
 msgstr ""
 
 #: ../menu-data/petri-foo:petri-foo.desktop.in.h:1
@@ -13006,16 +13180,16 @@
 msgstr ""
 
 #: ../menu-data/petri-foo:petri-foo.desktop.in.h:2
-#: ../menu-data/specimen:specimen.desktop.in.h:1
+#: ../menu-data/specimen:specimen.desktop.in.h:2
 msgid "Sound Sampler"
 msgstr ""
 
 #: ../menu-data/pgadmin3:pgadmin3.desktop.in.h:1
-msgid "PostgreSQL Administration Tool"
+msgid "pgAdmin III"
 msgstr ""
 
 #: ../menu-data/pgadmin3:pgadmin3.desktop.in.h:2
-msgid "pgAdmin III"
+msgid "PostgreSQL Administration Tool"
 msgstr ""
 
 #: ../menu-data/phasex:phasex.desktop.in.h:1
@@ -13027,11 +13201,19 @@
 msgstr ""
 
 #: ../menu-data/phatch:phatch.desktop.in.h:1
-msgid "Easily batch process images and edit metadata"
+msgid "Phatch PHoto bATCH Processor"
 msgstr ""
 
 #: ../menu-data/phatch:phatch.desktop.in.h:2
-msgid "Phatch PHoto bATCH Processor"
+msgid "Easily batch process images and edit metadata"
+msgstr ""
+
+#: ../menu-data/phlipple:phlipple.desktop.in.h:1
+msgid "Phlipple"
+msgstr ""
+
+#: ../menu-data/phlipple:phlipple.desktop.in.h:2
+msgid "Phlipping squares will never be the same again"
 msgstr ""
 
 #: ../menu-data/phoronix-test-suite:phoronix-test-suite.desktop.in.h:1
@@ -13043,20 +13225,28 @@
 msgstr ""
 
 #: ../menu-data/photofilmstrip:photofilmstrip.desktop.in.h:1
-msgid "Create animated slideshows"
+msgid "PhotoFilmStrip"
 msgstr ""
 
 #: ../menu-data/photofilmstrip:photofilmstrip.desktop.in.h:2
-msgid "PhotoFilmStrip"
+msgid "Create animated slideshows"
 msgstr ""
 
-#: ../menu-data/photoprint:fotoprint.desktop.in.h:1
-msgid "Color managed printing of multiple photos on single page"
+#. Encoding=UTF-8
+#: ../menu-data/photoprint:fotoprint.desktop.in.h:2
+msgid "PhotoPrint"
 msgstr ""
 
-#. Encoding=UTF-8
 #: ../menu-data/photoprint:fotoprint.desktop.in.h:3
-msgid "PhotoPrint"
+msgid "Color managed printing of multiple photos on single page"
+msgstr ""
+
+#: ../menu-data/pianobooster:pianobooster.desktop.in.h:1
+msgid "Piano Booster"
+msgstr ""
+
+#: ../menu-data/pianobooster:pianobooster.desktop.in.h:2
+msgid "Learn the piano just by playing a game"
 msgstr ""
 
 #: ../menu-data/picard:picard.desktop.in.h:1
@@ -13076,12 +13266,12 @@
 msgstr ""
 
 #: ../menu-data/pidgin:pidgin.desktop.in.h:1
-msgid ""
-"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgid "Pidgin Internet Messenger"
 msgstr ""
 
 #: ../menu-data/pidgin:pidgin.desktop.in.h:2
-msgid "Pidgin Internet Messenger"
+msgid ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
 
 #: ../menu-data/pinball:pinball.desktop.in.h:1
@@ -13093,19 +13283,19 @@
 msgstr ""
 
 #: ../menu-data/pingus:pingus.desktop.in.h:1
-msgid "Guide a horde of penguins through various obstacles"
+msgid "Pingus"
 msgstr ""
 
 #: ../menu-data/pingus:pingus.desktop.in.h:2
-msgid "Pingus"
+msgid "Guide a horde of penguins through various obstacles"
 msgstr ""
 
 #: ../menu-data/pino:pino.desktop.in.h:1
-msgid "Fast, easy, and free Twitter and Identi.ca client"
+msgid "Pino - Twitter and Identi.ca client"
 msgstr ""
 
 #: ../menu-data/pino:pino.desktop.in.h:2
-msgid "Pino - Twitter and Identi.ca client"
+msgid "Fast, easy, and free Twitter and Identi.ca client"
 msgstr ""
 
 #: ../menu-data/pinot:pinot.desktop.in.h:1
@@ -13133,11 +13323,11 @@
 msgstr ""
 
 #: ../menu-data/pipewalker:pipewalker.desktop.in.h:1
-msgid "Connect all hosts to network!"
+msgid "PipeWalker"
 msgstr ""
 
 #: ../menu-data/pipewalker:pipewalker.desktop.in.h:2
-msgid "PipeWalker"
+msgid "Connect all hosts to network!"
 msgstr ""
 
 #: ../menu-data/pithos:pithos.desktop.in.h:1
@@ -13149,65 +13339,65 @@
 msgstr ""
 
 #: ../menu-data/pitivi:pitivi.desktop.in.h:1
-msgid "Create and edit your own movies"
+msgid "Pitivi Video Editor"
 msgstr ""
 
 #: ../menu-data/pitivi:pitivi.desktop.in.h:2
-msgid "Pitivi Video Editor"
+msgid "Create and edit your own movies"
 msgstr ""
 
 #: ../menu-data/pixbros:pixbros.desktop.in.h:1
-msgid "2D game inspired in Bubble Bobble, Snow Bros and Tumble Pop"
+msgid "PIX Bros"
 msgstr ""
 
 #: ../menu-data/pixbros:pixbros.desktop.in.h:2
-msgid "PIX Bros"
+msgid "2D game inspired in Bubble Bobble, Snow Bros and Tumble Pop"
 msgstr ""
 
 #: ../menu-data/pixelize:pixelize.desktop.in.h:1
-msgid "Create an image consisting of many small images"
+msgid "Pixelize"
 msgstr ""
 
 #: ../menu-data/pixelize:pixelize.desktop.in.h:2
-msgid "Pixelize"
+msgid "Create an image consisting of many small images"
 msgstr ""
 
 #: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:1
-msgid "Help the frog cross the street"
+msgid "PIX Frogger"
 msgstr ""
 
 #: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:2
-msgid "PIX Frogger"
+msgid "Help the frog cross the street"
 msgstr ""
 
 #: ../menu-data/planets:planets.desktop.in.h:1
-msgid ""
-"A simple interactive program for playing with simulations of planetary "
-"systems"
+msgid "Planets"
 msgstr ""
 
 #: ../menu-data/planets:planets.desktop.in.h:2
-msgid "Planets"
+msgid ""
+"A simple interactive program for playing with simulations of planetary "
+"systems"
 msgstr ""
 
-#: ../menu-data/planner:planner.desktop.in.h:1
+#: ../menu-data/planner:planner.desktop.in.h:2
 msgid "Planner Project Management"
 msgstr ""
 
 #: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:1
-msgid "An engine for cool desktop eyecandy."
+msgid "SuperKaramba"
 msgstr ""
 
 #: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:2
-msgid "SuperKaramba"
+msgid "An engine for cool desktop eyecandy."
 msgstr ""
 
 #: ../menu-data/playitslowly:playitslowly.desktop.in.h:1
-msgid "A tool to play back a piece of music at a different speed or pitch"
+msgid "Play it Slowly"
 msgstr ""
 
 #: ../menu-data/playitslowly:playitslowly.desktop.in.h:2
-msgid "Play it Slowly"
+msgid "A tool to play back a piece of music at a different speed or pitch"
 msgstr ""
 
 #: ../menu-data/playonlinux:PlayOnLinux.desktop.in.h:1
@@ -13215,43 +13405,43 @@
 msgstr ""
 
 #: ../menu-data/plee-the-bear:plee-the-bear.desktop.in.h:1
-msgid "Catch your son, he ate all the honey then ran away"
+msgid "Plee the Bear"
 msgstr ""
 
 #: ../menu-data/plee-the-bear:plee-the-bear.desktop.in.h:2
-msgid "Plee the Bear"
+msgid "Catch your son, he ate all the honey then ran away"
 msgstr ""
 
 #: ../menu-data/ploader:ploader.desktop.in.h:1
-msgid "application to upload your pictures to your Piwigo gallery"
+msgid "pLoader"
 msgstr ""
 
 #: ../menu-data/ploader:ploader.desktop.in.h:2
-msgid "pLoader"
+msgid "application to upload your pictures to your Piwigo gallery"
 msgstr ""
 
 #: ../menu-data/plopfolio.app:PlopFolio.desktop.in.h:1
-msgid "Personal dashboard for GNUstep"
+msgid "PlopFolio"
 msgstr ""
 
 #: ../menu-data/plopfolio.app:PlopFolio.desktop.in.h:2
-msgid "PlopFolio"
+msgid "Personal dashboard for GNUstep"
 msgstr ""
 
 #: ../menu-data/plotdrop:plotdrop.desktop.in.h:1
-msgid "Drag and Drop graph plotting"
+msgid "PlotDrop"
 msgstr ""
 
 #: ../menu-data/plotdrop:plotdrop.desktop.in.h:2
-msgid "PlotDrop"
+msgid "Drag and Drop graph plotting"
 msgstr ""
 
 #: ../menu-data/podbrowser:podbrowser.desktop.in.h:1
-msgid "Browse Perl Documentation"
+msgid "Pod Browser"
 msgstr ""
 
 #: ../menu-data/podbrowser:podbrowser.desktop.in.h:2
-msgid "Pod Browser"
+msgid "Browse Perl Documentation"
 msgstr ""
 
 #: ../menu-data/poe.app:Poe.desktop.in.h:1
@@ -13263,11 +13453,11 @@
 msgstr ""
 
 #: ../menu-data/poedit:poedit.desktop.in.h:1
-msgid "Gettext catalogs editor"
+msgid "Poedit"
 msgstr ""
 
 #: ../menu-data/poedit:poedit.desktop.in.h:2
-msgid "Poedit"
+msgid "Gettext catalogs editor"
 msgstr ""
 
 #: ../menu-data/pokerth:pokerth.desktop.in.h:1
@@ -13279,35 +13469,35 @@
 msgstr ""
 
 #: ../menu-data/pondus:pondus.desktop.in.h:1
-msgid "Keep track of your weight"
+msgid "Pondus"
 msgstr ""
 
 #: ../menu-data/pondus:pondus.desktop.in.h:2
-msgid "Pondus"
+msgid "Keep track of your weight"
 msgstr ""
 
 #: ../menu-data/pornview:Graphics__pornview.desktop.in.h:1
-msgid "Photo/Movie collection manager"
+msgid "PornView"
 msgstr ""
 
 #: ../menu-data/pornview:Graphics__pornview.desktop.in.h:2
-msgid "PornView"
+msgid "Photo/Movie collection manager"
 msgstr ""
 
 #: ../menu-data/posterazor:posterazor.desktop.in.h:1
-msgid "Cuts a raster image into multipage PDF documents"
+msgid "PosteRazor"
 msgstr ""
 
 #: ../menu-data/posterazor:posterazor.desktop.in.h:2
-msgid "PosteRazor"
+msgid "Cuts a raster image into multipage PDF documents"
 msgstr ""
 
 #: ../menu-data/postler:postler.desktop.in.h:1
-msgid "Lean mail interface"
+msgid "Postler"
 msgstr ""
 
 #: ../menu-data/postler:postler.desktop.in.h:2
-msgid "Postler"
+msgid "Lean mail interface"
 msgstr ""
 
 #: ../menu-data/postr:postr.desktop.in.h:1
@@ -13319,35 +13509,35 @@
 msgstr ""
 
 #: ../menu-data/pouetchess:pouetChess.desktop.in.h:1
-msgid "Play a game of chess, either against another player or against the AI"
+msgid "pouetChess"
 msgstr ""
 
 #: ../menu-data/pouetchess:pouetChess.desktop.in.h:2
-msgid "pouetChess"
+msgid "Play a game of chess, either against another player or against the AI"
 msgstr ""
 
 #: ../menu-data/powder:powder.desktop.in.h:1
-msgid "Graphical dungeon crawling game"
+msgid "Powder"
 msgstr ""
 
 #: ../menu-data/powder:powder.desktop.in.h:2
-msgid "Powder"
+msgid "Graphical dungeon crawling game"
 msgstr ""
 
 #: ../menu-data/powermanga:powermanga.desktop.in.h:1
-msgid "Play a vertical shoot 'em up game"
+msgid "Powermanga"
 msgstr ""
 
 #: ../menu-data/powermanga:powermanga.desktop.in.h:2
-msgid "Powermanga"
+msgid "Play a vertical shoot 'em up game"
 msgstr ""
 
 #: ../menu-data/pptview:pptview.desktop.in.h:1
-msgid "PowerPoint Viewer"
+msgid "View PowerPoint presentations"
 msgstr ""
 
 #: ../menu-data/pptview:pptview.desktop.in.h:2
-msgid "View PowerPoint presentations"
+msgid "PowerPoint Viewer"
 msgstr ""
 
 #: ../menu-data/pq:pq.desktop.in.h:1
@@ -13359,30 +13549,39 @@
 msgstr ""
 
 #: ../menu-data/praat:praat.desktop.in.h:1
-msgid "Analyze, synthesize and manipulate speech"
+msgid "Praat Speech Analyzer"
 msgstr ""
 
 #: ../menu-data/praat:praat.desktop.in.h:2
-msgid "Praat Speech Analyzer"
+msgid "Analyze, synthesize and manipulate speech"
 msgstr ""
 
 #: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:1
-msgid "Batch renaming of files."
+msgid "PrefixSuffix"
 msgstr ""
 
 #: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:2
-msgid "PrefixSuffix"
+msgid "Batch renaming of files."
 msgstr ""
 
 #: ../menu-data/prelude-notify:prelude-notify.desktop.in.h:1
-msgid "Graphical notification applet for prelude"
+msgid "prelude-notify"
 msgstr ""
 
 #: ../menu-data/prelude-notify:prelude-notify.desktop.in.h:2
-msgid "prelude-notify"
+msgid "Graphical notification applet for prelude"
 msgstr ""
 
-#: ../menu-data/preview.app:Preview.desktop.in.h:2
+#: ../menu-data/prerex:prerex.desktop.in.h:1
+msgid "prerex"
+msgstr ""
+
+#: ../menu-data/prerex:prerex.desktop.in.h:2
+#: ../menu-data/vprerex:vprerex.desktop.in.h:2
+msgid "Edit course prerequisite charts"
+msgstr ""
+
+#: ../menu-data/preview.app:Preview.desktop.in.h:1
 msgid "Preview"
 msgstr ""
 
@@ -13395,11 +13594,11 @@
 msgstr ""
 
 #: ../menu-data/primrose:primrose.desktop.in.h:1
-msgid "Captivating tile-clearing puzzle game"
+msgid "Primrose"
 msgstr ""
 
 #: ../menu-data/primrose:primrose.desktop.in.h:2
-msgid "Primrose"
+msgid "Captivating tile-clearing puzzle game"
 msgstr ""
 
 #: ../menu-data/project-x:projectx.desktop.in.h:1
@@ -13419,36 +13618,36 @@
 msgstr ""
 
 #: ../menu-data/projectl:projectl.desktop.in.h:1
-msgid "HIZ's ProjectL"
+msgid "ProjectL"
 msgstr ""
 
 #: ../menu-data/projectl:projectl.desktop.in.h:2
-msgid "ProjectL"
+msgid "HIZ's ProjectL"
 msgstr ""
 
 #: ../menu-data/projectm-jack:projectM-jack.desktop.in.h:1
-msgid ""
-"A milkdrop based music visualizer visualizing JackAudio streams on a Qt4 GUI"
+msgid "projectM Jack Audio Visualization"
 msgstr ""
 
 #: ../menu-data/projectm-jack:projectM-jack.desktop.in.h:2
-msgid "projectM Jack Audio Visualization"
+msgid ""
+"A milkdrop based music visualizer visualizing JackAudio streams on a Qt4 GUI"
 msgstr ""
 
 #: ../menu-data/projectm-pulseaudio:projectM-pulseaudio.desktop.in.h:1
-msgid "Visualization of PulseAudio streams with projectM"
+msgid "projectM PulseAudio Visualization"
 msgstr ""
 
 #: ../menu-data/projectm-pulseaudio:projectM-pulseaudio.desktop.in.h:2
-msgid "projectM PulseAudio Visualization"
+msgid "Visualization of PulseAudio streams with projectM"
 msgstr ""
 
 #: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:1
-msgid "IDE for GNUstep"
+msgid "Project Manager IDE"
 msgstr ""
 
 #: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:2
-msgid "Project Manager IDE"
+msgid "IDE for GNUstep"
 msgstr ""
 
 #: ../menu-data/promoe:promoe.desktop.in.h:1
@@ -13468,37 +13667,37 @@
 msgstr ""
 
 #: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:1
-#: ../menu-data/psi-plus:psi-plus.desktop.in.h:1
-#: ../menu-data/psi:psi.desktop.in.h:1
-msgid "Communicate over the Jabber network"
+msgid "Psi Plus Webkit"
 msgstr ""
 
 #: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:2
-msgid "Psi Plus Webkit"
+#: ../menu-data/psi-plus:psi-plus.desktop.in.h:2
+#: ../menu-data/psi:psi.desktop.in.h:2
+msgid "Communicate over the Jabber network"
 msgstr ""
 
-#: ../menu-data/psi-plus:psi-plus.desktop.in.h:2
+#: ../menu-data/psi-plus:psi-plus.desktop.in.h:1
 msgid "Psi+"
 msgstr ""
 
-#: ../menu-data/psi:psi.desktop.in.h:2
+#: ../menu-data/psi:psi.desktop.in.h:1
 msgid "Psi"
 msgstr ""
 
 #: ../menu-data/pspp:pspp.desktop.in.h:1
-msgid "Analyze statistical data with a free alternative to SPSS"
+msgid "GNU PSPP"
 msgstr ""
 
 #: ../menu-data/pspp:pspp.desktop.in.h:2
-msgid "GNU PSPP"
+msgid "Analyze statistical data with a free alternative to SPSS"
 msgstr ""
 
 #: ../menu-data/psychopy:psychopy.desktop.in.h:1
-msgid "PsychoPy"
+msgid "Psychology Stimuli IDE"
 msgstr ""
 
 #: ../menu-data/psychopy:psychopy.desktop.in.h:2
-msgid "Psychology Stimuli IDE"
+msgid "PsychoPy"
 msgstr ""
 
 #: ../menu-data/pterm:pterm.desktop.in.h:1
@@ -13510,19 +13709,19 @@
 msgstr ""
 
 #: ../menu-data/puddletag:puddletag.desktop.in.h:1
-msgid "Audio Tag Editor"
+msgid "puddletag"
 msgstr ""
 
 #: ../menu-data/puddletag:puddletag.desktop.in.h:2
-msgid "puddletag"
+msgid "Audio Tag Editor"
 msgstr ""
 
 #: ../menu-data/pureadmin:pureadmin.desktop.in.h:1
-msgid "Administer and monitor your FTP server"
+msgid "PureAdmin"
 msgstr ""
 
 #: ../menu-data/pureadmin:pureadmin.desktop.in.h:2
-msgid "PureAdmin"
+msgid "Administer and monitor your FTP server"
 msgstr ""
 
 #: ../menu-data/puredata-core:puredata.desktop.in.h:1
@@ -13534,35 +13733,43 @@
 msgstr ""
 
 #: ../menu-data/purrr:purrr.desktop.in.h:1
-msgid "A Mass-renamer for files"
+msgid "Purrr"
 msgstr ""
 
 #: ../menu-data/purrr:purrr.desktop.in.h:2
-msgid "Purrr"
+msgid "A Mass-renamer for files"
 msgstr ""
 
 #: ../menu-data/putty:putty.desktop.in.h:1
-msgid "Connect to an SSH server with PuTTY"
+msgid "PuTTY SSH Client"
 msgstr ""
 
 #: ../menu-data/putty:putty.desktop.in.h:2
-msgid "PuTTY SSH Client"
+msgid "Connect to an SSH server with PuTTY"
 msgstr ""
 
 #: ../menu-data/pybackpack:pybackpack.desktop.in.h:1
-msgid "Back up important files"
+msgid "File Backup Manager"
 msgstr ""
 
 #: ../menu-data/pybackpack:pybackpack.desktop.in.h:2
-msgid "File Backup Manager"
+msgid "Back up important files"
+msgstr ""
+
+#: ../menu-data/pybik:pybik.desktop.in.h:1
+msgid "Pybik"
+msgstr ""
+
+#: ../menu-data/pybik:pybik.desktop.in.h:2
+msgid "The magic cube"
 msgstr ""
 
 #: ../menu-data/pybliographer:pybliographic.desktop.in.h:1
-msgid "Manage bibliographic databases"
+msgid "Pybliographic Bibliography Manager"
 msgstr ""
 
 #: ../menu-data/pybliographer:pybliographic.desktop.in.h:2
-msgid "Pybliographic Bibliography Manager"
+msgid "Manage bibliographic databases"
 msgstr ""
 
 #: ../menu-data/pybridge:pybridge.desktop.in.h:1
@@ -13580,19 +13787,19 @@
 msgstr ""
 
 #: ../menu-data/pygmy:pygmy.desktop.in.h:1
-msgid "GTK+ MPD client"
+msgid "Pygmy"
 msgstr ""
 
 #: ../menu-data/pygmy:pygmy.desktop.in.h:2
-msgid "Pygmy"
+msgid "GTK+ MPD client"
 msgstr ""
 
 #: ../menu-data/pykaraoke-bin:pykaraoke_mini.desktop.in.h:1
-msgid "Minimum-interface PyKaraoke"
+msgid "PyKaraoke Mini"
 msgstr ""
 
 #: ../menu-data/pykaraoke-bin:pykaraoke_mini.desktop.in.h:2
-msgid "PyKaraoke Mini"
+msgid "Minimum-interface PyKaraoke"
 msgstr ""
 
 #: ../menu-data/pykaraoke:pykaraoke.desktop.in.h:1
@@ -13604,35 +13811,35 @@
 msgstr ""
 
 #: ../menu-data/pymca:edfviewer.desktop.in.h:1
-msgid "Display files in ESRF Data Format"
+msgid "EDFviewer"
 msgstr ""
 
 #: ../menu-data/pymca:edfviewer.desktop.in.h:2
-msgid "EDFviewer"
+msgid "Display files in ESRF Data Format"
 msgstr ""
 
 #: ../menu-data/pymca:elementsinfo.desktop.in.h:1
-msgid "Display X-ray information on elements"
+msgid "Elementsinfo"
 msgstr ""
 
 #: ../menu-data/pymca:elementsinfo.desktop.in.h:2
-msgid "Elementsinfo"
+msgid "Display X-ray information on elements"
 msgstr ""
 
 #: ../menu-data/pymca:peakidentifier.desktop.in.h:1
-msgid "Find the energy of X-ray spectral lines"
+msgid "Peakidentifier"
 msgstr ""
 
 #: ../menu-data/pymca:peakidentifier.desktop.in.h:2
-msgid "Peakidentifier"
+msgid "Find the energy of X-ray spectral lines"
 msgstr ""
 
 #: ../menu-data/pymca:pymca.desktop.in.h:1
-msgid "Analyse X-ray Fluorescence data"
+msgid "PyMCA"
 msgstr ""
 
 #: ../menu-data/pymca:pymca.desktop.in.h:2
-msgid "PyMCA"
+msgid "Analyse X-ray Fluorescence data"
 msgstr ""
 
 #: ../menu-data/pymca:pymcaroitool.desktop.in.h:1
@@ -13644,11 +13851,11 @@
 msgstr ""
 
 #: ../menu-data/pymol:pymol.desktop.in.h:1
-msgid "Model molecular structures and produce high-quality images of them"
+msgid "PyMOL Molecular Graphics System"
 msgstr ""
 
 #: ../menu-data/pymol:pymol.desktop.in.h:2
-msgid "PyMOL Molecular Graphics System"
+msgid "Model molecular structures and produce high-quality images of them"
 msgstr ""
 
 #: ../menu-data/pynagram:pynagram.desktop.in.h:1
@@ -13664,11 +13871,11 @@
 msgstr ""
 
 #: ../menu-data/pypar2:pypar2.desktop.in.h:1
-msgid "A graphical frontend for the par2 utility"
+msgid "PyPar2"
 msgstr ""
 
 #: ../menu-data/pypar2:pypar2.desktop.in.h:2
-msgid "PyPar2"
+msgid "A graphical frontend for the par2 utility"
 msgstr ""
 
 #: ../menu-data/pype:pype.desktop.in.h:1
@@ -13683,32 +13890,32 @@
 msgid "PyPI Browser"
 msgstr ""
 
-#: ../menu-data/pyprompter:pyprompter.desktop.in.h:2
+#: ../menu-data/pyprompter:pyprompter.desktop.in.h:1
 msgid "pyprompter"
 msgstr ""
 
 #: ../menu-data/pyracerz:pyracerz.desktop.in.h:1
-msgid "2D racing game"
+msgid "pyRacerz"
 msgstr ""
 
 #: ../menu-data/pyracerz:pyracerz.desktop.in.h:2
-msgid "pyRacerz"
+msgid "2D racing game"
 msgstr ""
 
 #: ../menu-data/pyragua:pyragua.desktop.in.h:1
-msgid "A fast and lightweight IDE using wxPython"
+msgid "Pyragua"
 msgstr ""
 
 #: ../menu-data/pyragua:pyragua.desktop.in.h:2
-msgid "Pyragua"
+msgid "A fast and lightweight IDE using wxPython"
 msgstr ""
 
 #: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:1
-msgid "Mass rename files"
+msgid "pyRenamer"
 msgstr ""
 
 #: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:2
-msgid "pyRenamer"
+msgid "Mass rename files"
 msgstr ""
 
 #: ../menu-data/pyrocket:pyrocket.desktop.in.h:1
@@ -13719,28 +13926,36 @@
 msgid "Enabling Cubicle Warfare on Linux"
 msgstr ""
 
+#: ../menu-data/pyromaths:pyromaths.desktop.in.h:1
+msgid "Pyromaths"
+msgstr ""
+
+#: ../menu-data/pyromaths:pyromaths.desktop.in.h:2
+msgid "Générateur d'exercices de maths"
+msgstr ""
+
 #: ../menu-data/pyroom:pyroom.desktop.in.h:1
-msgid "Distraction free full-screen text editor"
+msgid "PyRoom"
 msgstr ""
 
 #: ../menu-data/pyroom:pyroom.desktop.in.h:2
-msgid "PyRoom"
+msgid "Distraction free full-screen text editor"
 msgstr ""
 
 #: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:1
-msgid "A classical game of words"
+msgid "PyScrabble"
 msgstr ""
 
 #: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:2
-msgid "PyScrabble"
+msgid "A classical game of words"
 msgstr ""
 
 #: ../menu-data/pysdm:pysdm.desktop.in.h:1
-msgid "Management of Storage Devices"
+msgid "Storage Device Manager"
 msgstr ""
 
 #: ../menu-data/pysdm:pysdm.desktop.in.h:2
-msgid "Storage Device Manager"
+msgid "Management of Storage Devices"
 msgstr ""
 
 #: ../menu-data/pysolfc:pysol.desktop.in.h:1
@@ -13748,11 +13963,11 @@
 msgstr ""
 
 #: ../menu-data/pysycache:pysycache-admin.desktop.in.h:1
-msgid "Configuration of PySyCache"
+msgid "Pysycache Admin"
 msgstr ""
 
 #: ../menu-data/pysycache:pysycache-admin.desktop.in.h:2
-msgid "Pysycache Admin"
+msgid "Configuration of PySyCache"
 msgstr ""
 
 #: ../menu-data/pysycache:pysycache.desktop.in.h:1
@@ -13764,19 +13979,19 @@
 msgstr ""
 
 #: ../menu-data/python-acidobasic:pyacidobasic.desktop.in.h:1
-msgid "Interactive tool to simulate acido-basic titrations"
+msgid "pyAcidoBasic"
 msgstr ""
 
 #: ../menu-data/python-acidobasic:pyacidobasic.desktop.in.h:2
-msgid "pyAcidoBasic"
+msgid "Interactive tool to simulate acido-basic titrations"
 msgstr ""
 
 #: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:1
-msgid "Automate your desktop using Dogtail"
+msgid "Dogtail Script Recorder"
 msgstr ""
 
 #: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:2
-msgid "Dogtail Script Recorder"
+msgid "Automate your desktop using Dogtail"
 msgstr ""
 
 #: ../menu-data/python-dogtail:sniff.desktop.in.h:1
@@ -13821,35 +14036,35 @@
 msgstr ""
 
 #: ../menu-data/python-lunch:lunch.desktop.in.h:1
-msgid "Distributed Process Launcher"
+msgid "Lunch"
 msgstr ""
 
 #: ../menu-data/python-lunch:lunch.desktop.in.h:2
-msgid "Lunch"
+msgid "Distributed Process Launcher"
 msgstr ""
 
 #: ../menu-data/python-mecavideo:pymecavideo.desktop.in.h:1
-msgid "Interactive tool to track moving points in video framesets"
+msgid "pyMecaVideo"
 msgstr ""
 
 #: ../menu-data/python-mecavideo:pymecavideo.desktop.in.h:2
-msgid "pyMecaVideo"
+msgid "Interactive tool to track moving points in video framesets"
 msgstr ""
 
 #: ../menu-data/python-poker2d:python-poker2d.desktop.in.h:1
-msgid "Multiplayer online poker"
+msgid "poker2D"
 msgstr ""
 
 #: ../menu-data/python-poker2d:python-poker2d.desktop.in.h:2
-msgid "poker2D"
+msgid "Multiplayer online poker"
 msgstr ""
 
 #: ../menu-data/python-web2py:web2py.desktop.in.h:1
-msgid "Enterprise web development framework using Python"
+msgid "web2py"
 msgstr ""
 
 #: ../menu-data/python-web2py:web2py.desktop.in.h:2
-msgid "web2py"
+msgid "Enterprise web development framework using Python"
 msgstr ""
 
 #: ../menu-data/python-whiteboard:python-whiteboard.desktop.in.h:1
@@ -13857,11 +14072,11 @@
 msgstr ""
 
 #: ../menu-data/python-wxglade:wxglade.desktop.in.h:1
-msgid "GUI designer written in Python with wxPython"
+msgid "wxGlade"
 msgstr ""
 
 #: ../menu-data/python-wxglade:wxglade.desktop.in.h:2
-msgid "wxGlade"
+msgid "GUI designer written in Python with wxPython"
 msgstr ""
 
 #: ../menu-data/pythoncad:pythoncad.desktop.in.h:1
@@ -13873,30 +14088,30 @@
 msgstr ""
 
 #: ../menu-data/pytrainer:pytrainer.desktop.in.h:1
-msgid "The Free Sport Training Center"
+msgid "pytrainer"
 msgstr ""
 
 #: ../menu-data/pytrainer:pytrainer.desktop.in.h:2
-msgid "pyTrainer"
+msgid "The Free Sport Training Center"
 msgstr ""
 
 #: ../menu-data/q4wine:q4wine.desktop.in.h:1
-msgid "Q4Wine"
+msgid "Qt4 utility for Wine applications and prefixes management."
 msgstr ""
 
 #: ../menu-data/q4wine:q4wine.desktop.in.h:2
-msgid "Qt4 utility for Wine applications and prefixes management."
+msgid "Q4Wine"
 msgstr ""
 
 #: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:1
-msgid "Powerful and easy to use calculator"
+msgid "Qalculate!"
 msgstr ""
 
 #: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:2
-msgid "Qalculate!"
+msgid "Powerful and easy to use calculator"
 msgstr ""
 
-#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:2
+#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:1
 msgid "QApt Package Installer"
 msgstr ""
 
@@ -13909,19 +14124,19 @@
 msgstr ""
 
 #: ../menu-data/qasconfig:qasconfig.desktop.in.h:1
-msgid "ALSA configuration browser"
+msgid "QasConfig"
 msgstr ""
 
 #: ../menu-data/qasconfig:qasconfig.desktop.in.h:2
-msgid "QasConfig"
+msgid "ALSA configuration browser"
 msgstr ""
 
 #: ../menu-data/qasmixer:qasmixer.desktop.in.h:1
-msgid "Graphical mixer application for the ALSA"
+msgid "QasMixer"
 msgstr ""
 
 #: ../menu-data/qasmixer:qasmixer.desktop.in.h:2
-msgid "QasMixer"
+msgid "Graphical mixer application for the ALSA"
 msgstr ""
 
 #: ../menu-data/qbittorrent:qBittorrent.desktop.in.h:2
@@ -13929,16 +14144,16 @@
 msgstr ""
 
 #: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:1
+msgid "qcomicbook"
+msgstr ""
+
+#: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:2
 msgid ""
 "QComicBook is a viewer for comic book archives (cbz, cbr, cbt). QComicBook "
 "has specific features like page preview, thumbnails view, bookmarks, manga "
 "mode for easing comicbook reading."
 msgstr ""
 
-#: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:2
-msgid "qcomicbook"
-msgstr ""
-
 #: ../menu-data/qdacco:qdacco.desktop.in.h:1
 msgid "Qdacco dictionary"
 msgstr ""
@@ -13948,28 +14163,36 @@
 msgstr ""
 
 #: ../menu-data/qdevelop:qdevelop.desktop.in.h:1
-msgid "Development environment for Qt4"
+msgid "QDevelop"
 msgstr ""
 
 #: ../menu-data/qdevelop:qdevelop.desktop.in.h:2
-msgid "QDevelop"
+msgid "Development environment for Qt4"
 msgstr ""
 
-#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:1
-msgid "An electric diagrams editor."
+#: ../menu-data/qdigidoc:qdigidoc-client.desktop.in.h:1
+msgid "DigiDoc3 Client"
+msgstr ""
+
+#: ../menu-data/qdigidoc:qdigidoc-crypto.desktop.in.h:1
+msgid "DigiDoc3 Crypto"
 msgstr ""
 
 #. Encoding=UTF-8
-#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:3
+#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:2
 msgid "QElectroTech"
 msgstr ""
 
+#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:3
+msgid "An electric diagrams editor."
+msgstr ""
+
 #: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:1
-msgid "Manage virtual machine configurations"
+msgid "Qemu Launcher"
 msgstr ""
 
 #: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:2
-msgid "Qemu Launcher"
+msgid "Manage virtual machine configurations"
 msgstr ""
 
 #: ../menu-data/qemulator:qemulator.desktop.in.h:1
@@ -13980,28 +14203,32 @@
 msgid "Qemulator"
 msgstr ""
 
+#: ../menu-data/qesteidutil:qesteidutil.desktop.in.h:1
+msgid "ID-card Utility"
+msgstr ""
+
 #: ../menu-data/qfreefax:qfreefax.desktop.in.h:1
-msgid "GUI for fax fonctionality provided by French ISP \"Free\""
+msgid "qFreeFax"
 msgstr ""
 
 #: ../menu-data/qfreefax:qfreefax.desktop.in.h:2
-msgid "qFreeFax"
+msgid "GUI for fax fonctionality provided by French ISP \"Free\""
 msgstr ""
 
 #: ../menu-data/qgis:qgis.desktop.in.h:1
-msgid "Geographical Information System"
+msgid "Quantum GIS"
 msgstr ""
 
 #: ../menu-data/qgis:qgis.desktop.in.h:2
-msgid "Quantum GIS"
+msgid "Geographical Information System"
 msgstr ""
 
 #: ../menu-data/qgit:qgit.desktop.in.h:1
-msgid "git GUI viewer"
+msgid "qgit"
 msgstr ""
 
 #: ../menu-data/qgit:qgit.desktop.in.h:2
-msgid "qgit"
+msgid "git GUI viewer"
 msgstr ""
 
 #: ../menu-data/qgo:kde__qgo.desktop.in.h:1
@@ -14017,11 +14244,11 @@
 msgstr ""
 
 #: ../menu-data/qlandkartegt:qlandkartegt.desktop.in.h:1
-msgid "GPS device mapping utility"
+msgid "QLandkarteGT"
 msgstr ""
 
 #: ../menu-data/qlandkartegt:qlandkartegt.desktop.in.h:2
-msgid "QLandkarteGT"
+msgid "GPS device mapping utility"
 msgstr ""
 
 #: ../menu-data/qliss3d:qliss3d.desktop.in.h:1
@@ -14033,20 +14260,20 @@
 msgstr ""
 
 #: ../menu-data/qlix:qlix.desktop.in.h:1
-msgid ""
-"Manage tracks, files, and playlists between a host computer and an MTP device"
+msgid "Qlix"
 msgstr ""
 
 #: ../menu-data/qlix:qlix.desktop.in.h:2
-msgid "Qlix"
+msgid ""
+"Manage tracks, files, and playlists between a host computer and an MTP device"
 msgstr ""
 
 #: ../menu-data/qmidiarp:qmidiarp.desktop.in.h:1
-msgid "Arpeggiator-Sequencer-LFO"
+msgid "QMidiArp"
 msgstr ""
 
 #: ../menu-data/qmidiarp:qmidiarp.desktop.in.h:2
-msgid "QMidiArp"
+msgid "Arpeggiator-Sequencer-LFO"
 msgstr ""
 
 #: ../menu-data/qmidinet:qmidinet.desktop.in.h:1
@@ -14057,21 +14284,21 @@
 msgid "QmidiNet is a MIDI Network Gateway via UDP/IP Multicast"
 msgstr ""
 
-#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:1
-msgid "MIDI router and filter utility"
+#. Icon=qmidiroute
+#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:2
+msgid "QMidiRoute"
 msgstr ""
 
-#. Icon=qmidiroute
 #: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:3
-msgid "QMidiRoute"
+msgid "MIDI router and filter utility"
 msgstr ""
 
 #: ../menu-data/qmk-groundstation:qmk-groundstation.desktop.in.h:1
-msgid "A tool to configure a Mikrokopter "
+msgid "QMK-Groundstation"
 msgstr ""
 
 #: ../menu-data/qmk-groundstation:qmk-groundstation.desktop.in.h:2
-msgid "QMK-Groundstation"
+msgid "A tool to configure a Mikrokopter "
 msgstr ""
 
 #: ../menu-data/qmmp:qmmp.desktop.in.h:1
@@ -14083,11 +14310,11 @@
 msgstr ""
 
 #: ../menu-data/qmpdclient:qmpdclient.desktop.in.h:1
-msgid "A nicer MPD client"
+msgid "QMPDClient"
 msgstr ""
 
 #: ../menu-data/qmpdclient:qmpdclient.desktop.in.h:2
-msgid "QMPDClient"
+msgid "A nicer MPD client"
 msgstr ""
 
 #: ../menu-data/qprogram-starter:qprogram-starter.desktop.in.h:1
@@ -14095,19 +14322,19 @@
 msgstr ""
 
 #: ../menu-data/qpxtool:qpxtool.desktop.in.h:1
-msgid "CD/DVD media quality checker"
+msgid "QPxTool"
 msgstr ""
 
 #: ../menu-data/qpxtool:qpxtool.desktop.in.h:2
-msgid "QPxTool"
+msgid "CD/DVD media quality checker"
 msgstr ""
 
 #: ../menu-data/qrfcview:qrfcview.desktop.in.h:1
-msgid "Downloads and displays RFC"
+msgid "qRFCView"
 msgstr ""
 
 #: ../menu-data/qrfcview:qrfcview.desktop.in.h:2
-msgid "qRFCView"
+msgid "Downloads and displays RFC"
 msgstr ""
 
 #: ../menu-data/qsampler:qsampler.desktop.in.h:1
@@ -14131,19 +14358,19 @@
 msgstr ""
 
 #: ../menu-data/qsource-highlight:qsource-highlight.desktop.in.h:1
-msgid "Highlight your sources"
+msgid "QSource-Highlight"
 msgstr ""
 
 #: ../menu-data/qsource-highlight:qsource-highlight.desktop.in.h:2
-msgid "QSource-Highlight"
+msgid "Highlight your sources"
 msgstr ""
 
 #: ../menu-data/qstardict:qstardict.desktop.in.h:1
-msgid "QStarDict"
+msgid "QStarDict is Qt version of StarDict"
 msgstr ""
 
 #: ../menu-data/qstardict:qstardict.desktop.in.h:2
-msgid "QStarDict is Qt version of StarDict"
+msgid "QStarDict"
 msgstr ""
 
 #: ../menu-data/qsynth:qsynth.desktop.in.h:1
@@ -14179,27 +14406,27 @@
 msgstr ""
 
 #: ../menu-data/qt3-qtconfig:qt3config.desktop.in.h:1
-msgid "A graphical configuration tool for programs using Qt 3"
+msgid "Qt3 Configuration"
 msgstr ""
 
 #: ../menu-data/qt3-qtconfig:qt3config.desktop.in.h:2
-msgid "Qt3 Configuration"
+msgid "A graphical configuration tool for programs using Qt 3"
 msgstr ""
 
 #: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:1
-msgid "Interface Designer"
+msgid "Qt 4 Designer"
 msgstr ""
 
 #: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:2
-msgid "Qt 4 Designer"
+msgid "Interface Designer"
 msgstr ""
 
 #: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:1
-msgid "Document Browser"
+msgid "Qt 4 Assistant"
 msgstr ""
 
 #: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:2
-msgid "Qt 4 Assistant"
+msgid "Document Browser"
 msgstr ""
 
 #: ../menu-data/qt4-dev-tools:linguist-qt4.desktop.in.h:1
@@ -14223,35 +14450,35 @@
 msgstr ""
 
 #: ../menu-data/qtemu:qtemu.desktop.in.h:1
-msgid "Frontend to QEMU virtual machine monitor"
+msgid "QtEmu"
 msgstr ""
 
 #: ../menu-data/qtemu:qtemu.desktop.in.h:2
-msgid "QtEmu"
+msgid "Frontend to QEMU virtual machine monitor"
 msgstr ""
 
-#: ../menu-data/qterm:qterm.desktop.in.h:2
+#: ../menu-data/qterm:qterm.desktop.in.h:1
 msgid "QTerm"
 msgstr ""
 
 #: ../menu-data/qtgain:QtGain.desktop.in.h:1
-msgid "Add \"gain\" tags to your audio files"
+msgid "QtGain"
 msgstr ""
 
 #: ../menu-data/qtgain:QtGain.desktop.in.h:2
-msgid "QtGain"
+msgid "Add \"gain\" tags to your audio files"
 msgstr ""
 
-#: ../menu-data/qtikz:qtikz.desktop.in.h:2
+#: ../menu-data/qtikz:qtikz.desktop.in.h:1
 msgid "QTikZ"
 msgstr ""
 
 #: ../menu-data/qtiplot:qtiplot.desktop.in.h:1
-msgid "Analyze and plot scientific data"
+msgid "QtiPlot"
 msgstr ""
 
 #: ../menu-data/qtiplot:qtiplot.desktop.in.h:2
-msgid "QtiPlot"
+msgid "Analyze and plot scientific data"
 msgstr ""
 
 #: ../menu-data/qtm:qtm.desktop.in.h:1
@@ -14263,19 +14490,19 @@
 msgstr ""
 
 #: ../menu-data/qtnx:qtnx.desktop.in.h:1
-msgid "Client for NX remote desktop"
+msgid "QTNX"
 msgstr ""
 
 #: ../menu-data/qtnx:qtnx.desktop.in.h:2
-msgid "QTNX"
+msgid "Client for NX remote desktop"
 msgstr ""
 
 #: ../menu-data/qtoctave:qtoctave.desktop.in.h:1
-msgid "Graphical Qt frontend for GNU Octave"
+msgid "QtOctave"
 msgstr ""
 
 #: ../menu-data/qtoctave:qtoctave.desktop.in.h:2
-msgid "QtOctave"
+msgid "Graphical Qt frontend for GNU Octave"
 msgstr ""
 
 #: ../menu-data/qtodo:qtodo.desktop.in.h:1
@@ -14325,60 +14552,84 @@
 msgstr ""
 
 #: ../menu-data/quadrapassel:quadrapassel.desktop.in.h:1
-msgid "Fit falling blocks together"
+msgid "Quadrapassel"
 msgstr ""
 
 #: ../menu-data/quadrapassel:quadrapassel.desktop.in.h:2
-msgid "Quadrapassel"
+msgid "Fit falling blocks together"
 msgstr ""
 
 #: ../menu-data/quake3:quake3.desktop.in.h:1
-msgid "Play the original Quake III Arena"
+msgid "Quake III Arena"
 msgstr ""
 
 #: ../menu-data/quake3:quake3.desktop.in.h:2
-msgid "Quake III Arena"
+msgid "Play the original Quake III Arena"
+msgstr ""
+
+#: ../menu-data/quake:quake-armagon.desktop.in.h:1
+msgid "Quake: Scourge of Armagon"
+msgstr ""
+
+#: ../menu-data/quake:quake-armagon.desktop.in.h:2
+msgid "Mission Pack 1 for the classic first person shooter"
+msgstr ""
+
+#: ../menu-data/quake:quake-dissolution.desktop.in.h:1
+msgid "Quake: Dissolution of Eternity"
+msgstr ""
+
+#: ../menu-data/quake:quake-dissolution.desktop.in.h:2
+msgid "Mission Pack 2 for the classic first person shooter"
+msgstr ""
+
+#: ../menu-data/quake:quake.desktop.in.h:1
+msgid "Quake"
+msgstr ""
+
+#: ../menu-data/quake:quake.desktop.in.h:2
+msgid "Classic first person shooter"
 msgstr ""
 
 #: ../menu-data/quarry:quarry.desktop.in.h:1
-msgid "A multi-purpose board game GUI for Go, Amazons and Reversi"
+msgid "Quarry"
 msgstr ""
 
 #: ../menu-data/quarry:quarry.desktop.in.h:2
-msgid "Quarry"
+msgid "A multi-purpose board game GUI for Go, Amazons and Reversi"
 msgstr ""
 
 #: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:1
 #: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:1
-#: ../menu-data/quassel-qt4:quassel.desktop.in.h:1
-#: ../menu-data/quassel:kde4__quassel.desktop.in.h:1
-msgid "Distributed IRC client with central core component"
+msgid "Quassel IRC (Client only)"
 msgstr ""
 
 #: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:2
 #: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:2
-msgid "Quassel IRC (Client only)"
-msgstr ""
-
 #: ../menu-data/quassel-qt4:quassel.desktop.in.h:2
 #: ../menu-data/quassel:kde4__quassel.desktop.in.h:2
+msgid "Distributed IRC client with central core component"
+msgstr ""
+
+#: ../menu-data/quassel-qt4:quassel.desktop.in.h:1
+#: ../menu-data/quassel:kde4__quassel.desktop.in.h:1
 msgid "Quassel IRC"
 msgstr ""
 
 #: ../menu-data/qucs:qucs.desktop.in.h:1
-msgid "A Universal Circuit Simulator"
+msgid "Qucs"
 msgstr ""
 
 #: ../menu-data/qucs:qucs.desktop.in.h:2
-msgid "Qucs"
+msgid "A Universal Circuit Simulator"
 msgstr ""
 
 #: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:1
-msgid "A graphical interface for easily configuring Synergy"
+msgid "QuickSynergy"
 msgstr ""
 
 #: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:2
-msgid "QuickSynergy"
+msgid "A graphical interface for easily configuring Synergy"
 msgstr ""
 
 #: ../menu-data/quitcount:quitcount.desktop.in.h:1
@@ -14390,11 +14641,11 @@
 msgstr ""
 
 #: ../menu-data/quodlibet:quodlibet.desktop.in.h:1
-msgid "Listen to, browse, or edit your audio collection"
+msgid "Quod Libet"
 msgstr ""
 
 #: ../menu-data/quodlibet:quodlibet.desktop.in.h:2
-msgid "Quod Libet"
+msgid "Listen to, browse, or edit your audio collection"
 msgstr ""
 
 #: ../menu-data/qutecom:qutecom.desktop.in.h:1
@@ -14408,27 +14659,27 @@
 msgstr ""
 
 #: ../menu-data/qutim:qutim.desktop.in.h:1
-msgid "Communicate over IM"
+msgid "qutIM"
 msgstr ""
 
 #: ../menu-data/qutim:qutim.desktop.in.h:2
-msgid "qutIM"
+msgid "Communicate over IM"
 msgstr ""
 
 #: ../menu-data/qv4l2:qv4l2.desktop.in.h:1
-msgid "Allow testing Video4Linux devices"
+msgid "QT V4L2 test Utility"
 msgstr ""
 
 #: ../menu-data/qv4l2:qv4l2.desktop.in.h:2
-msgid "QT V4L2 test Utility"
+msgid "Allow testing Video4Linux devices"
 msgstr ""
 
 #: ../menu-data/qviaggiatreno:qviaggiatreno.desktop.in.h:1
-msgid "Interfaccia grafica per ViaggiaTreno"
+msgid "QViaggiaTreno"
 msgstr ""
 
 #: ../menu-data/qviaggiatreno:qviaggiatreno.desktop.in.h:2
-msgid "QViaggiaTreno"
+msgid "Interfaccia grafica per ViaggiaTreno"
 msgstr ""
 
 #: ../menu-data/qwbfsmanager:QWBFSManager.desktop.in.h:1
@@ -14442,35 +14693,27 @@
 msgstr ""
 
 #: ../menu-data/qweborf:qweborf.desktop.in.h:1
-msgid "Shares files using the HTTP protocol"
-msgstr ""
-
-#: ../menu-data/qweborf:qweborf.desktop.in.h:2
 msgid "qweborf"
 msgstr ""
 
-#: ../menu-data/qwit:qwit.desktop.in.h:1
-msgid "Qt4 Twitter Client"
-msgstr ""
-
-#: ../menu-data/qwit:qwit.desktop.in.h:2
-msgid "Qwit"
+#: ../menu-data/qweborf:qweborf.desktop.in.h:2
+msgid "Shares files using the HTTP protocol"
 msgstr ""
 
 #: ../menu-data/qwo:qwo.desktop.in.h:1
-msgid "An input method for touchscreens"
+msgid "qwo"
 msgstr ""
 
 #: ../menu-data/qwo:qwo.desktop.in.h:2
-msgid "qwo"
+msgid "An input method for touchscreens"
 msgstr ""
 
 #: ../menu-data/qxw:qxw.desktop.in.h:1
-msgid "Construct crossword puzzles"
+msgid "Qxw"
 msgstr ""
 
 #: ../menu-data/qxw:qxw.desktop.in.h:2
-msgid "Qxw"
+msgid "Construct crossword puzzles"
 msgstr ""
 
 #: ../menu-data/r-cran-rcmdr:Rcmdr.desktop.in.h:1
@@ -14494,38 +14737,38 @@
 msgstr ""
 
 #: ../menu-data/raincat:raincat.desktop.in.h:1
-msgid "2D puzzle game featuring a fuzzy little cat"
+msgid "Raincat"
 msgstr ""
 
 #: ../menu-data/raincat:raincat.desktop.in.h:2
-msgid "Raincat"
+msgid "2D puzzle game featuring a fuzzy little cat"
 msgstr ""
 
 #: ../menu-data/rakarrack:rakarrack.desktop.in.h:1
-msgid "Guitar Effects Processor"
+msgid "Rakarrack"
 msgstr ""
 
 #: ../menu-data/rakarrack:rakarrack.desktop.in.h:2
-msgid "Rakarrack"
+msgid "Guitar Effects Processor"
 msgstr ""
 
 #: ../menu-data/rapid-photo-downloader:rapid-photo-downloader.desktop.in.h:1
-msgid ""
-"Download photos and videos from cameras, memory cards and Portable Storage "
-"Devices"
+msgid "Rapid Photo Downloader"
 msgstr ""
 
 #: ../menu-data/rapid-photo-downloader:rapid-photo-downloader.desktop.in.h:2
-msgid "Rapid Photo Downloader"
+msgid ""
+"Download photos and videos from cameras, memory cards and Portable Storage "
+"Devices"
 msgstr ""
 
 #: ../menu-data/rapidsvn:rapidsvn.desktop.in.h:1
-#: ../menu-data/subcommander:subcommander.desktop.in.h:1
-msgid "A GUI Client for Subversion"
+msgid "RapidSVN"
 msgstr ""
 
 #: ../menu-data/rapidsvn:rapidsvn.desktop.in.h:2
-msgid "RapidSVN"
+#: ../menu-data/subcommander:subcommander.desktop.in.h:2
+msgid "A GUI Client for Subversion"
 msgstr ""
 
 #: ../menu-data/rasmol:rasmol-gtk.desktop.in.h:1
@@ -14553,11 +14796,11 @@
 msgstr ""
 
 #: ../menu-data/rbbr:rbbr.desktop.in.h:1
-msgid "Browse Ruby Classes and Modules"
+msgid "Ruby Browser"
 msgstr ""
 
 #: ../menu-data/rbbr:rbbr.desktop.in.h:2
-msgid "Ruby Browser"
+msgid "Browse Ruby Classes and Modules"
 msgstr ""
 
 #: ../menu-data/recoll:recoll-searchgui.desktop.in.h:1
@@ -14572,73 +14815,73 @@
 msgid "RecordItNow"
 msgstr ""
 
-#: ../menu-data/rednotebook:rednotebook.desktop.in.h:1
-msgid "Daily journal with calendar, templates and keyword searching "
+#. Encoding=UTF-­8 #Encoding causes problems
+#: ../menu-data/rednotebook:rednotebook.desktop.in.h:2
+msgid "RedNotebook"
 msgstr ""
 
-#. Encoding=UTF-­8 #Encoding causes problems
 #: ../menu-data/rednotebook:rednotebook.desktop.in.h:3
-msgid "RedNotebook"
+msgid "Daily journal with calendar, templates and keyword searching "
 msgstr ""
 
 #: ../menu-data/referencer:referencer.desktop.in.h:1
-msgid "Document organiser"
+msgid "Referencer"
 msgstr ""
 
 #: ../menu-data/referencer:referencer.desktop.in.h:2
-msgid "Referencer"
+msgid "Document organiser"
 msgstr ""
 
 #: ../menu-data/regexxer:regexxer.desktop.in.h:1
-msgid "Search and replace using regular expressions"
+msgid "regexxer Search Tool"
 msgstr ""
 
 #: ../menu-data/regexxer:regexxer.desktop.in.h:2
-msgid "regexxer Search Tool"
+msgid "Search and replace using regular expressions"
 msgstr ""
 
 #: ../menu-data/regina-normal:kde4__regina.desktop.in.h:1
-msgid "A Normal Surface Theory Calculator"
+msgid "Regina"
 msgstr ""
 
 #: ../menu-data/regina-normal:kde4__regina.desktop.in.h:2
-msgid "Regina"
+msgid "A Normal Surface Theory Calculator"
 msgstr ""
 
 #: ../menu-data/reinteract:reinteract.desktop.in.h:1
-msgid "Interactive Python shell"
+msgid "Reinteract"
 msgstr ""
 
 #: ../menu-data/reinteract:reinteract.desktop.in.h:2
-msgid "Reinteract"
+msgid "Interactive Python shell"
 msgstr ""
 
-#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:2
+#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:1
 msgid "rekonq"
 msgstr ""
 
 #: ../menu-data/relational:relational.desktop.in.h:1
-msgid "Learn and experiment relational algebra"
+msgid "Relational"
 msgstr ""
 
 #: ../menu-data/relational:relational.desktop.in.h:2
-msgid "Relational"
+msgid "Learn and experiment relational algebra"
 msgstr ""
 
 #: ../menu-data/reminiscence:reminiscence.desktop.in.h:1
-msgid "A port of FlashBack game engine"
+msgid "REminiscence"
 msgstr ""
 
 #: ../menu-data/reminiscence:reminiscence.desktop.in.h:2
-msgid "REminiscence"
+msgid "A port of FlashBack game engine"
 msgstr ""
 
 #: ../menu-data/remmina:remmina.desktop.in.h:1
-msgid "Connect to remote desktops"
+msgid "Remmina Remote Desktop Client"
 msgstr ""
 
 #: ../menu-data/remmina:remmina.desktop.in.h:2
-msgid "Remmina Remote Desktop Client"
+msgid "Connect to remote desktops"
 msgstr ""
 
 #: ../menu-data/renpy-demo:renpy-demo.desktop.in.h:1
@@ -14666,11 +14909,11 @@
 msgstr ""
 
 #: ../menu-data/resapplet:resapplet.desktop.in.h:1
-msgid "Change your screen resolution"
+msgid "Resolution Switcher"
 msgstr ""
 
 #: ../menu-data/resapplet:resapplet.desktop.in.h:2
-msgid "Resolution Switcher"
+msgid "Change your screen resolution"
 msgstr ""
 
 #: ../menu-data/retext:retext.desktop.in.h:1
@@ -14682,11 +14925,11 @@
 msgstr ""
 
 #: ../menu-data/revelation:revelation.desktop.in.h:1
-msgid "Organize and secure your passwords"
+msgid "Revelation Password Manager"
 msgstr ""
 
 #: ../menu-data/revelation:revelation.desktop.in.h:2
-msgid "Revelation Password Manager"
+msgid "Organize and secure your passwords"
 msgstr ""
 
 #: ../menu-data/rfdump:rfdump.desktop.in.h:1
@@ -14698,11 +14941,11 @@
 msgstr ""
 
 #: ../menu-data/rgbpaint:rgbpaint.desktop.in.h:1
-msgid "Very basic painting program"
+msgid "rgbPaint"
 msgstr ""
 
 #: ../menu-data/rgbpaint:rgbpaint.desktop.in.h:2
-msgid "rgbPaint"
+msgid "Very basic painting program"
 msgstr ""
 
 #: ../menu-data/rhinote:rhinote.desktop.in.h:1
@@ -14713,7 +14956,7 @@
 msgid "Virtual sticky-notes"
 msgstr ""
 
-#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2
+#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:1
 msgid "Rhythmbox Music Player"
 msgstr ""
 
@@ -14726,60 +14969,60 @@
 msgstr ""
 
 #: ../menu-data/ripoff:ripoff.desktop.in.h:1
-msgid "Rip audio from your CDs"
+msgid "RipOff"
 msgstr ""
 
 #: ../menu-data/ripoff:ripoff.desktop.in.h:2
-msgid "RipOff"
+msgid "Rip audio from your CDs"
 msgstr ""
 
 #: ../menu-data/ripperx:ripperx.desktop.in.h:1
-msgid "Rip Cds"
+msgid "Ripper X"
 msgstr ""
 
 #: ../menu-data/ripperx:ripperx.desktop.in.h:2
-msgid "Ripper X"
+msgid "Rip Cds"
 msgstr ""
 
 #: ../menu-data/ristretto:ristretto.desktop.in.h:1
-msgid "Look at your images's easily"
+msgid "Ristretto Image Viewer"
 msgstr ""
 
 #: ../menu-data/ristretto:ristretto.desktop.in.h:2
-msgid "Ristretto Image Viewer"
+msgid "Look at your images easily"
 msgstr ""
 
 #: ../menu-data/rkward:kde4__rkward.desktop.in.h:1
-msgid "GUI for the R-project"
+msgid "RKWard"
 msgstr ""
 
 #: ../menu-data/rkward:kde4__rkward.desktop.in.h:2
-msgid "RKWard"
+msgid "GUI for the R-project"
 msgstr ""
 
 #: ../menu-data/rlplot:rlplot.desktop.in.h:1
-msgid "Generate publication quality graphs"
+msgid "Rlplot Graph Generator"
 msgstr ""
 
 #: ../menu-data/rlplot:rlplot.desktop.in.h:2
-msgid "Rlplot Graph Generator"
+msgid "Generate publication quality graphs"
 msgstr ""
 
-#. GNOME and KDE 3 uses Comment.
-#: ../menu-data/rlvm:rlvm.desktop.in.h:2
-msgid "RealLive Emulator"
+#: ../menu-data/rlvm:rlvm.desktop.in.h:1
+msgid "rlvm"
 msgstr ""
 
+#. GNOME and KDE 3 uses Comment.
 #: ../menu-data/rlvm:rlvm.desktop.in.h:3
-msgid "rlvm"
+msgid "RealLive Emulator"
 msgstr ""
 
 #: ../menu-data/robocode:robocode.desktop.in.h:1
-msgid "Java programming game based on battle tanks"
+msgid "Robocode"
 msgstr ""
 
 #: ../menu-data/robocode:robocode.desktop.in.h:2
-msgid "Robocode"
+msgid "Java programming game based on battle tanks"
 msgstr ""
 
 #: ../menu-data/robocut:robocut.desktop.in.h:1
@@ -14791,11 +15034,11 @@
 msgstr ""
 
 #: ../menu-data/rocs:kde4__rocs.desktop.in.h:1
-msgid "Graph Theory Tool for Professors and Students."
+msgid "Rocs"
 msgstr ""
 
 #: ../menu-data/rocs:kde4__rocs.desktop.in.h:2
-msgid "Rocs"
+msgid "Graph Theory Tool for Professors and Students."
 msgstr ""
 
 #: ../menu-data/rootstock-gtk:rootstock.desktop.in.h:1
@@ -14811,12 +15054,12 @@
 msgstr ""
 
 #: ../menu-data/rott:rott.desktop.in.h:1
-msgid ""
-"A high quality, fast scrolling first-person perspective 3D action game"
+msgid "Rise of the Triad"
 msgstr ""
 
 #: ../menu-data/rott:rott.desktop.in.h:2
-msgid "Rise of the Triad"
+msgid ""
+"A high quality, fast scrolling first-person perspective 3D action game"
 msgstr ""
 
 #: ../menu-data/roxterm:roxterm.desktop.in.h:1
@@ -14824,35 +15067,35 @@
 msgstr ""
 
 #: ../menu-data/rrootage:rrootage.desktop.in.h:1
-msgid "Destroy autocreated battleships"
+msgid "rRootage"
 msgstr ""
 
 #: ../menu-data/rrootage:rrootage.desktop.in.h:2
-msgid "rRootage"
+msgid "Destroy autocreated battleships"
 msgstr ""
 
 #: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:1
-msgid "Makes sure you rest now and then"
+msgid "RSIBreak"
 msgstr ""
 
 #: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:2
-msgid "RSIBreak"
+msgid "Makes sure you rest now and then"
 msgstr ""
 
 #: ../menu-data/rubrica:rubrica2.desktop.in.h:1
-msgid "Manage contacts and addresses"
+msgid "Rubrica Addressbook"
 msgstr ""
 
 #: ../menu-data/rubrica:rubrica2.desktop.in.h:2
-msgid "Rubrica Addressbook"
+msgid "Manage contacts and addresses"
 msgstr ""
 
 #: ../menu-data/rutilt:rutilt.desktop.in.h:1
-msgid "Manage your wireless network interfaces"
+msgid "RutilT WLAN Manager"
 msgstr ""
 
 #: ../menu-data/rutilt:rutilt.desktop.in.h:2
-msgid "RutilT WLAN Manager"
+msgid "Manage your wireless network interfaces"
 msgstr ""
 
 #: ../menu-data/rygel:rygel.desktop.in.h:1
@@ -14863,20 +15106,12 @@
 msgid "UPnP/DLNA Services"
 msgstr ""
 
-#: ../menu-data/sabayon:sabayon.desktop.in.h:1
-msgid "Establish and Edit Profiles for Users"
-msgstr ""
-
-#: ../menu-data/sabayon:sabayon.desktop.in.h:2
-msgid "User Profile Editor"
-msgstr ""
-
 #: ../menu-data/sabnzbdplus:sabnzbdplus.desktop.in.h:1
-msgid "Download from usenet"
+msgid "SABnzbd+"
 msgstr ""
 
 #: ../menu-data/sabnzbdplus:sabnzbdplus.desktop.in.h:2
-msgid "SABnzbd+"
+msgid "Download from usenet"
 msgstr ""
 
 #: ../menu-data/sadms:sadms.desktop.in.h:1
@@ -14892,55 +15127,47 @@
 msgstr ""
 
 #: ../menu-data/sagasu:sagasu.desktop.in.h:1
-msgid "GNOME tool to find strings in a set of files"
+msgid "Sagasu"
 msgstr ""
 
 #: ../menu-data/sagasu:sagasu.desktop.in.h:2
-msgid "Sagasu"
+msgid "GNOME tool to find strings in a set of files"
 msgstr ""
 
 #: ../menu-data/sagcad:sagcad.desktop.in.h:1
-msgid "Draw and create"
+msgid "SagCAD"
 msgstr ""
 
 #: ../menu-data/sagcad:sagcad.desktop.in.h:2
-msgid "SagCAD"
+msgid "Draw and create"
 msgstr ""
 
 #: ../menu-data/sailcut:sailcut.desktop.in.h:1
-msgid "Sail Design Application"
+msgid "Sailcut CAD"
 msgstr ""
 
 #: ../menu-data/sailcut:sailcut.desktop.in.h:2
-msgid "Sailcut CAD"
+msgid "Sail Design Application"
 msgstr ""
 
 #: ../menu-data/sakura:sakura.desktop.in.h:1
 msgid "Sakura"
 msgstr ""
 
-#: ../menu-data/salasaga:salasaga.desktop.in.h:1
-msgid "Create eLearning for desktop applications"
-msgstr ""
-
-#: ../menu-data/salasaga:salasaga.desktop.in.h:2
-msgid "Salasaga"
-msgstr ""
-
 #: ../menu-data/sandboxgamemaker:sandboxgamemaker.desktop.in.h:1
-msgid "Create 3D games and worlds"
+msgid "Platinum Arts Sandbox Gamemaker"
 msgstr ""
 
 #: ../menu-data/sandboxgamemaker:sandboxgamemaker.desktop.in.h:2
-msgid "Platinum Arts Sandbox Gamemaker"
+msgid "Create 3D games and worlds"
 msgstr ""
 
 #: ../menu-data/sauerbraten:sauerbraten.desktop.in.h:1
-msgid "A networked, fast-paced 3D first-person shooter"
+msgid "Sauerbraten"
 msgstr ""
 
 #: ../menu-data/sauerbraten:sauerbraten.desktop.in.h:2
-msgid "Sauerbraten"
+msgid "A networked, fast-paced 3D first-person shooter"
 msgstr ""
 
 #: ../menu-data/sawfish:sawfish.desktop.in.h:1
@@ -14948,11 +15175,11 @@
 msgstr ""
 
 #: ../menu-data/scantailor:scantailor.desktop.in.h:1
-msgid "Interactive post-processing tool for scanned pages"
+msgid "Scan Tailor"
 msgstr ""
 
 #: ../menu-data/scantailor:scantailor.desktop.in.h:2
-msgid "Scan Tailor"
+msgid "Interactive post-processing tool for scanned pages"
 msgstr ""
 
 #: ../menu-data/scenic:scenic.desktop.in.h:1
@@ -14964,11 +15191,11 @@
 msgstr ""
 
 #: ../menu-data/scidavis:scidavis.desktop.in.h:1
-msgid "Application for scientific data analysis and visualization"
+msgid "SciDAVis"
 msgstr ""
 
 #: ../menu-data/scidavis:scidavis.desktop.in.h:2
-msgid "SciDAVis"
+msgid "Application for scientific data analysis and visualization"
 msgstr ""
 
 #: ../menu-data/scilab-cli:scilab-cli.desktop.in.h:1
@@ -14997,36 +15224,33 @@
 msgid "Setup utility for Smart Common Input Method platform"
 msgstr ""
 
+#: ../menu-data/scite:SciTE.desktop.in.h:1
 #: ../menu-data/scite:scite.desktop.in.h:1
-msgid "Programming editor"
+msgid "SciTE Text Editor"
+msgstr ""
+
+#: ../menu-data/scite:SciTE.desktop.in.h:2
+msgid "Edit your source files"
 msgstr ""
 
 #: ../menu-data/scite:scite.desktop.in.h:2
-msgid "SciTE Text Editor"
+msgid "Programming editor"
 msgstr ""
 
 #: ../menu-data/scolasync:scolasync.desktop.in.h:1
-msgid "Interactive tool to copy files to or from USB storage media"
+msgid "ScolaSync"
 msgstr ""
 
 #: ../menu-data/scolasync:scolasync.desktop.in.h:2
-msgid "ScolaSync"
+msgid "Interactive tool to copy files to or from USB storage media"
 msgstr ""
 
 #: ../menu-data/scolily:scolily.desktop.in.h:1
-msgid "Create scores on-the-fly by recording from mic"
-msgstr ""
-
-#: ../menu-data/scolily:scolily.desktop.in.h:2
 msgid "Scolily Score Recorder"
 msgstr ""
 
-#: ../menu-data/scorched3d:scorched3d.desktop.in.h:1
-msgid "3D artillery game similar to Scorched Earth"
-msgstr ""
-
-#: ../menu-data/scorched3d:scorched3d.desktop.in.h:2
-msgid "Scorched 3D"
+#: ../menu-data/scolily:scolily.desktop.in.h:2
+msgid "Create scores on-the-fly by recording from mic"
 msgstr ""
 
 #: ../menu-data/screenie-qt:screenie-qt.desktop.in.h:1
@@ -15038,68 +15262,72 @@
 msgstr ""
 
 #: ../menu-data/screenkey:screenkey.desktop.in.h:1
-msgid "Screencast your keys"
+msgid "Screenkey"
 msgstr ""
 
 #: ../menu-data/screenkey:screenkey.desktop.in.h:2
-msgid "Screenkey"
+msgid "Screencast your keys"
 msgstr ""
 
 #: ../menu-data/screenlets:screenlets-manager.desktop.in.h:1
-msgid "A graphical tool to manage your Screenlets."
+msgid "Screenlets"
 msgstr ""
 
 #: ../menu-data/screenlets:screenlets-manager.desktop.in.h:2
-msgid "Screenlets"
+msgid "A graphical tool to manage your Screenlets."
 msgstr ""
 
-#: ../menu-data/scribes:scribes.desktop.in.h:2
+#: ../menu-data/screenruler:screenruler.desktop.in.h:2
+msgid "Measure objects on your screen"
+msgstr ""
+
+#: ../menu-data/scribes:scribes.desktop.in.h:1
 msgid "Scribes Text Editor"
 msgstr ""
 
 #: ../menu-data/scribus-ng:scribus-ng.desktop.in.h:1
-#: ../menu-data/scribus:scribus.desktop.in.h:1
-msgid "Page Layout and Publication"
+msgid "ScribusNG"
 msgstr ""
 
 #: ../menu-data/scribus-ng:scribus-ng.desktop.in.h:2
-msgid "ScribusNG"
+#: ../menu-data/scribus:scribus.desktop.in.h:2
+msgid "Page Layout and Publication"
 msgstr ""
 
-#: ../menu-data/scribus:scribus.desktop.in.h:2
+#: ../menu-data/scribus:scribus.desktop.in.h:1
 msgid "Scribus"
 msgstr ""
 
 #: ../menu-data/scummvm-data:scummvm.desktop.in.h:1
-msgid "Interpreter for several adventure games"
+msgid "ScummVM"
 msgstr ""
 
 #: ../menu-data/scummvm-data:scummvm.desktop.in.h:2
-msgid "ScummVM"
+msgid "Interpreter for several adventure games"
 msgstr ""
 
 #: ../menu-data/sdl-ball:sdl-ball.desktop.in.h:1
-msgid "Breakout Game"
+msgid "SDL-Ball"
 msgstr ""
 
 #: ../menu-data/sdl-ball:sdl-ball.desktop.in.h:2
-msgid "SDL-Ball"
+msgid "Breakout Game"
 msgstr ""
 
 #: ../menu-data/sdlbasic:sdlbasic.desktop.in.h:1
-msgid "Multiplatform basic interpreter for the development of videogames"
+msgid "sdlBasic"
 msgstr ""
 
 #: ../menu-data/sdlbasic:sdlbasic.desktop.in.h:2
-msgid "sdlBasic"
+msgid "Multiplatform basic interpreter for the development of videogames"
 msgstr ""
 
 #: ../menu-data/seahorse:seahorse.desktop.in.h:1
-msgid "Manage your passwords and encryption keys"
+msgid "Passwords and Keys"
 msgstr ""
 
 #: ../menu-data/seahorse:seahorse.desktop.in.h:2
-msgid "Passwords and Keys"
+msgid "Manage your passwords and encryption keys"
 msgstr ""
 
 #: ../menu-data/seamonkey:seamonkey.desktop.in.h:1
@@ -15115,60 +15343,68 @@
 msgstr ""
 
 #: ../menu-data/searchmonkey:searchmonkey.desktop.in.h:1
-msgid "Regular expression power search utilty"
+msgid "Searchmonkey"
 msgstr ""
 
 #: ../menu-data/searchmonkey:searchmonkey.desktop.in.h:2
-msgid "Searchmonkey"
+msgid "Regular expression power search utilty"
 msgstr ""
 
 #: ../menu-data/seaview:seaview.desktop.in.h:1
-msgid ""
-"Edits multiple sequence alignments and prints them in PostScript format."
+msgid "SeaView"
 msgstr ""
 
 #: ../menu-data/seaview:seaview.desktop.in.h:2
-msgid "SeaView"
+msgid ""
+"Edits multiple sequence alignments and prints them in PostScript format."
 msgstr ""
 
 #: ../menu-data/secpanel:secpanel.desktop.in.h:1
-msgid "A graphical user interface for SSH and SCP"
+msgid "SecPanel"
 msgstr ""
 
 #: ../menu-data/secpanel:secpanel.desktop.in.h:2
-msgid "SecPanel"
+msgid "A graphical user interface for SSH and SCP"
 msgstr ""
 
 #: ../menu-data/semantik:kde4__semantik.desktop.in.h:1
-msgid "Mind mapping software"
+msgid "Semantik"
 msgstr ""
 
 #: ../menu-data/semantik:kde4__semantik.desktop.in.h:2
-msgid "Semantik"
+msgid "Mind mapping software"
 msgstr ""
 
 #: ../menu-data/sentinella:kde4__sentinella.desktop.in.h:1
-msgid "Action launcher based on system activity"
+msgid "Sentinella"
 msgstr ""
 
 #: ../menu-data/sentinella:kde4__sentinella.desktop.in.h:2
-msgid "Sentinella"
+msgid "Action launcher based on system activity"
 msgstr ""
 
 #: ../menu-data/seq24:seq24.desktop.in.h:1
-msgid "MIDI Sequencer"
+msgid "Seq24"
 msgstr ""
 
 #: ../menu-data/seq24:seq24.desktop.in.h:2
-msgid "Seq24"
+msgid "MIDI Sequencer"
 msgstr ""
 
 #: ../menu-data/series60-remote:series60-remote.desktop.in.h:1
-msgid "Application to manage your S60 mobile phone"
+msgid "Series60-Remote"
 msgstr ""
 
 #: ../menu-data/series60-remote:series60-remote.desktop.in.h:2
-msgid "Series60-Remote"
+msgid "Application to manage your S60 mobile phone"
+msgstr ""
+
+#: ../menu-data/sflphone-gnome:sflphone.desktop.in.h:1
+msgid "SFLphone VoIP Client"
+msgstr ""
+
+#: ../menu-data/sflphone-gnome:sflphone.desktop.in.h:2
+msgid "Call and receive calls with SIP or IAX protocols"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:blackboxgame.desktop.in.h:1
@@ -15217,13 +15453,13 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:filling.desktop.in.h:1
-msgid ""
-"Fill in digits so that each connected region of squares containing the same "
-"digit has an area equal to that digit"
+msgid "Filling"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:filling.desktop.in.h:2
-msgid "Filling"
+msgid ""
+"Fill in digits so that each connected region of squares containing the same "
+"digit has an area equal to that digit"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:flipgame.desktop.in.h:1
@@ -15235,37 +15471,37 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:1
-msgid ""
-"Draw edges along the grid lines which divide the rectangle under certain "
-"rules"
+msgid "Galaxies"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:2
-msgid "Galaxies"
+msgid ""
+"Draw edges along the grid lines which divide the rectangle under certain "
+"rules"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:guess.desktop.in.h:1
-msgid "Game similar to the famous 'Mastermind'"
+msgid "Guess"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:guess.desktop.in.h:2
-msgid "Guess"
+msgid "Game similar to the famous 'Mastermind'"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:inertia.desktop.in.h:1
-msgid "Collect all the gems without running into any mines"
+msgid "Inertia"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:inertia.desktop.in.h:2
-msgid "Inertia"
+msgid "Collect all the gems without running into any mines"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:keen.desktop.in.h:1
-msgid "Game based on KenKen"
+msgid "Keen"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:keen.desktop.in.h:2
-msgid "Keen"
+msgid "Game based on KenKen"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:lightup.desktop.in.h:1
@@ -15277,11 +15513,11 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:loopy.desktop.in.h:1
-msgid "Draw lines around a digit according to the number in it"
+msgid "Loopy"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:loopy.desktop.in.h:2
-msgid "Loopy"
+msgid "Draw lines around a digit according to the number in it"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:magnets.desktop.in.h:1
@@ -15293,13 +15529,13 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:map.desktop.in.h:1
-msgid ""
-"Colour each region with one of four colours so that no two regions sharing a "
-"boundary have the same colour"
+msgid "Map"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:map.desktop.in.h:2
-msgid "Map"
+msgid ""
+"Colour each region with one of four colours so that no two regions sharing a "
+"boundary have the same colour"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:netgame.desktop.in.h:1
@@ -15311,20 +15547,20 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:netslide.desktop.in.h:1
-msgid ""
-"Game combining the grid generation of Net with the movement of Sixteen"
+msgid "Netslide"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:netslide.desktop.in.h:2
-msgid "Netslide"
+msgid ""
+"Game combining the grid generation of Net with the movement of Sixteen"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:pattern.desktop.in.h:1
-msgid "Fill in the entire grid black or white"
+msgid "Pattern"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:pattern.desktop.in.h:2
-msgid "Pattern"
+msgid "Fill in the entire grid black or white"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:pegs.desktop.in.h:1
@@ -15336,11 +15572,11 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:range.desktop.in.h:1
-msgid "Fill the grid so the range of each numbered square matches the number"
+msgid "Range"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:range.desktop.in.h:2
-msgid "Range"
+msgid "Fill the grid so the range of each numbered square matches the number"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:rect.desktop.in.h:1
@@ -15353,45 +15589,45 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:samegame.desktop.in.h:1
-msgid ""
-"Clear the grid of coloured squares by highlighting contiguous regions of "
-"more than one coloured square"
+msgid "Same Game"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:samegame.desktop.in.h:2
-msgid "Same Game"
+msgid ""
+"Clear the grid of coloured squares by highlighting contiguous regions of "
+"more than one coloured square"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:signpost.desktop.in.h:1
-msgid "Link the squares of a grid according to the arrows on them"
+msgid "Signpost"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:signpost.desktop.in.h:2
-msgid "Signpost"
+msgid "Link the squares of a grid according to the arrows on them"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:singles.desktop.in.h:1
-msgid "Puzzle game based on Hitori"
+msgid "Singles"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:singles.desktop.in.h:2
-msgid "Singles"
+msgid "Puzzle game based on Hitori"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:1
-msgid "Game similar to Fifteen, but with a different type of move"
+msgid "Sixteen"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:2
-msgid "Sixteen"
+msgid "Game similar to Fifteen, but with a different type of move"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:slant.desktop.in.h:1
-msgid "Draw a diagonal line and choose which way each line slants"
+msgid "Slant"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:slant.desktop.in.h:2
-msgid "Slant"
+msgid "Draw a diagonal line and choose which way each line slants"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:solo.desktop.in.h:1
@@ -15403,43 +15639,43 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:tents.desktop.in.h:1
-msgid "Place tents in some of the remaining squares, under some conditions"
+msgid "Tents"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:tents.desktop.in.h:2
-msgid "Tents"
+msgid "Place tents in some of the remaining squares, under some conditions"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:towers.desktop.in.h:1
-msgid "Puzzle game based on Skyscrapers"
+msgid "Towers"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:towers.desktop.in.h:2
-msgid "Towers"
+msgid "Puzzle game based on Skyscrapers"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:1
-msgid "Arrange the numbers into ascending order "
+msgid "Twiddle"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:2
-msgid "Twiddle"
+msgid "Arrange the numbers into ascending order "
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:unequal.desktop.in.h:1
-msgid "Fully populate the grid with numbers under some conditions"
+msgid "Unequal"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:unequal.desktop.in.h:2
-msgid "Unequal"
+msgid "Fully populate the grid with numbers under some conditions"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:untangle.desktop.in.h:1
-msgid "Position the points so that no line crosses another"
+msgid "Untangle"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:untangle.desktop.in.h:2
-msgid "Untangle"
+msgid "Position the points so that no line crosses another"
 msgstr ""
 
 #: ../menu-data/shisen.app:Shisen.desktop.in.h:1
@@ -15447,11 +15683,11 @@
 msgstr ""
 
 #: ../menu-data/shoes:shoes.desktop.in.h:1
-msgid "Interpreter for Shoes programs"
+msgid "Shoes"
 msgstr ""
 
 #: ../menu-data/shoes:shoes.desktop.in.h:2
-msgid "Shoes"
+msgid "Interpreter for Shoes programs"
 msgstr ""
 
 #: ../menu-data/shotwell:shotwell.desktop.in.h:1
@@ -15462,32 +15698,32 @@
 msgid "Shotwell Photo Manager"
 msgstr ""
 
-#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:2
+#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:1
 msgid "showFoto"
 msgstr ""
 
 #: ../menu-data/showq:showq.desktop.in.h:1
-msgid "MIDI controllable audio player"
+msgid "ShowQ"
 msgstr ""
 
 #: ../menu-data/showq:showq.desktop.in.h:2
-msgid "ShowQ"
+msgid "MIDI controllable audio player"
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:1
-msgid "Capture an area of the screen"
+msgid "Shutter"
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:2
-msgid "Capture the current active window"
+msgid "Capture, edit and share screenshots"
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:3
-msgid "Capture the entire screen"
+msgid "Capture an area of the screen"
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:4
-msgid "Capture, edit and share screenshots"
+msgid "Capture the entire screen"
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:5
@@ -15495,7 +15731,7 @@
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:6
-msgid "Shutter"
+msgid "Capture the current active window"
 msgstr ""
 
 #: ../menu-data/sigviewer:sigviewer.desktop.in.h:1
@@ -15507,84 +15743,76 @@
 "Viewer for biosignals such as EEG, EMG, and ECG. http://sigviewer.sf.net"
 msgstr ""
 
-#: ../menu-data/sim-qt:kde__sim.desktop.in.h:1
-msgid "SIM Instant Messenger"
-msgstr ""
-
-#: ../menu-data/sim-qt:kde__sim.desktop.in.h:2
-msgid "Sim-IM"
-msgstr ""
-
 #: ../menu-data/simdock:simdock.desktop.in.h:1
-msgid "A dockbar for GNOME"
+msgid "SimDock"
 msgstr ""
 
 #: ../menu-data/simdock:simdock.desktop.in.h:2
-msgid "SimDock"
+msgid "A dockbar for GNOME"
 msgstr ""
 
 #: ../menu-data/simple-image-reducer:simple-image-reducer.desktop.in.h:1
-msgid "Reduce and rotate images in three-four clicks."
+msgid "Simple Image Reducer"
 msgstr ""
 
 #: ../menu-data/simple-image-reducer:simple-image-reducer.desktop.in.h:2
-msgid "Simple Image Reducer"
+msgid "Reduce and rotate images in three-four clicks."
 msgstr ""
 
 #: ../menu-data/simple-scan:simple-scan.desktop.in.h:1
-msgid "Scan Documents"
+msgid "Simple Scan"
 msgstr ""
 
 #: ../menu-data/simple-scan:simple-scan.desktop.in.h:2
-msgid "Simple Scan"
+msgid "Scan Documents"
 msgstr ""
 
 #: ../menu-data/sineshaper:sineshaper.desktop.in.h:1
-msgid "Monophonic synth plugin with two oscillators and waveshapers"
+msgid "Sineshaper"
 msgstr ""
 
 #: ../menu-data/sineshaper:sineshaper.desktop.in.h:2
-msgid "Sineshaper"
+msgid "Monophonic synth plugin with two oscillators and waveshapers"
 msgstr ""
 
 #: ../menu-data/singularity:singularity.desktop.in.h:1
-msgid "Become the singularity"
+msgid "Singularity"
 msgstr ""
 
 #: ../menu-data/singularity:singularity.desktop.in.h:2
-msgid "Singularity"
+msgid "Become the singularity"
 msgstr ""
 
 #: ../menu-data/sitplus:sitplus.desktop.in.h:1
-msgid "Framework for ludic-therapeutic activities"
+msgid "Sitplus"
 msgstr ""
 
 #: ../menu-data/sitplus:sitplus.desktop.in.h:2
-msgid "Sitplus"
+msgid "Framework for ludic-therapeutic activities"
 msgstr ""
 
 #: ../menu-data/sixpack:SIXpack.desktop.in.h:1
-msgid "EXAFS data analysis"
+msgid "SIXpack"
 msgstr ""
 
 #: ../menu-data/sixpack:SIXpack.desktop.in.h:2
-msgid "SIXpack"
+msgid "EXAFS data analysis"
 msgstr ""
 
 #: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:1
-msgid "Scan and save images"
+msgid "Skanlite"
 msgstr ""
 
 #: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:2
-msgid "Skanlite"
+msgid "Scan and save images"
 msgstr ""
 
 #: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:1
-msgid "Manage your money"
+msgid "skrooge"
 msgstr ""
 
 #: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:2
-msgid "skrooge"
+msgid "Manage your money"
 msgstr ""
 
 #: ../menu-data/slashem-gtk:slashem-gtk.desktop.in.h:1
@@ -15604,19 +15832,11 @@
 msgstr ""
 
 #: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:1
-msgid "Super Lotsa Added Stuff Hack - Extended Magic (X11)"
-msgstr ""
-
-#: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:2
 msgid "X Slash'EM"
 msgstr ""
 
-#: ../menu-data/slicer:slicer.desktop.in.h:1
-msgid "3D Slicer"
-msgstr ""
-
-#: ../menu-data/slicer:slicer.desktop.in.h:2
-msgid "Start 3D Slicer"
+#: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:2
+msgid "Super Lotsa Added Stuff Hack - Extended Magic (X11)"
 msgstr ""
 
 #: ../menu-data/slimevolley:slimevolley.desktop.in.h:1
@@ -15636,67 +15856,67 @@
 msgstr ""
 
 #: ../menu-data/slingshot:slingshot.desktop.in.h:1
-msgid "2D space shooting game with gravity"
+msgid "Slingshot"
 msgstr ""
 
 #: ../menu-data/slingshot:slingshot.desktop.in.h:2
-msgid "Slingshot"
+msgid "2D space shooting game with gravity"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-floormaker.desktop.in.h:1
-msgid "Edit SLUDGE floor plans"
+msgid "SLUDGE Floor Maker"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-floormaker.desktop.in.h:2
-msgid "SLUDGE Floor Maker"
+msgid "Edit SLUDGE floor plans"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-projectmanager.desktop.in.h:1
-msgid "Manage and compile SLUDGE projects"
+msgid "SLUDGE Project Manager"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-projectmanager.desktop.in.h:2
-msgid "SLUDGE Project Manager"
+msgid "Manage and compile SLUDGE projects"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-spritebankeditor.desktop.in.h:1
-msgid "Edit SLUDGE sprite banks"
+msgid "SLUDGE Sprite Bank Editor"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-spritebankeditor.desktop.in.h:2
-msgid "SLUDGE Sprite Bank Editor"
+msgid "Edit SLUDGE sprite banks"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-translationeditor.desktop.in.h:1
-msgid "Edit SLUDGE translation files"
+msgid "SLUDGE Translation Editor"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-translationeditor.desktop.in.h:2
-msgid "SLUDGE Translation Editor"
+msgid "Edit SLUDGE translation files"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-zbuffermaker.desktop.in.h:1
-msgid "Edit SLUDGE z-buffer files"
+msgid "SLUDGE Z-Buffer Maker"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-zbuffermaker.desktop.in.h:2
-msgid "SLUDGE Z-Buffer Maker"
+msgid "Edit SLUDGE z-buffer files"
 msgstr ""
 
 #: ../menu-data/sludge-engine:sludge-engine.desktop.in.h:1
-msgid "Play SLUDGE games"
+msgid "SLUDGE Engine"
 msgstr ""
 
 #: ../menu-data/sludge-engine:sludge-engine.desktop.in.h:2
-msgid "SLUDGE Engine"
+msgid "Play SLUDGE games"
 msgstr ""
 
 #: ../menu-data/sm:sm.desktop.in.h:1
-msgid "Displays a short text fullscreen"
+msgid "Screen-Message"
 msgstr ""
 
 #: ../menu-data/sm:sm.desktop.in.h:2
-msgid "Screen-Message"
+msgid "Displays a short text fullscreen"
 msgstr ""
 
 #: ../menu-data/smartpm:smart.desktop.in.h:1
@@ -15712,11 +15932,11 @@
 msgstr ""
 
 #: ../menu-data/smc:smc.desktop.in.h:1
-msgid "A 2D platform game with style similar to classic sidescroller games"
+msgid "Secret Maryo Chronicles"
 msgstr ""
 
 #: ../menu-data/smc:smc.desktop.in.h:2
-msgid "Secret Maryo Chronicles"
+msgid "A 2D platform game with style similar to classic sidescroller games"
 msgstr ""
 
 #: ../menu-data/smplayer:smplayer.desktop.in.h:1
@@ -15728,35 +15948,35 @@
 msgstr ""
 
 #: ../menu-data/smuxi-frontend-gnome:smuxi-frontend-gnome.desktop.in.h:1
-msgid "Chat with other people on IRC"
+msgid "Smuxi IRC Client"
 msgstr ""
 
 #: ../menu-data/smuxi-frontend-gnome:smuxi-frontend-gnome.desktop.in.h:2
-msgid "Smuxi IRC Client"
+msgid "Chat with other people on IRC"
 msgstr ""
 
 #: ../menu-data/snake4:snake4.desktop.in.h:1
-msgid "Fruit-eating snake game"
+msgid "Snake4"
 msgstr ""
 
 #: ../menu-data/snake4:snake4.desktop.in.h:2
-msgid "Snake4"
+msgid "Fruit-eating snake game"
 msgstr ""
 
 #: ../menu-data/snappea:snappea.desktop.in.h:1
-msgid "Create and study hyperbolic 3-manifolds"
+msgid "Snappea 3-Manifold Creator"
 msgstr ""
 
 #: ../menu-data/snappea:snappea.desktop.in.h:2
-msgid "Snappea 3-Manifold Creator"
+msgid "Create and study hyperbolic 3-manifolds"
 msgstr ""
 
 #: ../menu-data/snowballz:snowball.desktop.in.h:1
-msgid "Command your army of penguins"
+msgid "SnowballZ"
 msgstr ""
 
 #: ../menu-data/snowballz:snowball.desktop.in.h:2
-msgid "SnowballZ"
+msgid "Command your army of penguins"
 msgstr ""
 
 #: ../menu-data/socnetv:socnetv.desktop.in.h:1
@@ -15768,29 +15988,25 @@
 msgstr ""
 
 #: ../menu-data/sofa-apps:sofa.desktop.in.h:1
-msgid "Open Source Framework for Medical Simulation"
+msgid "SOFA"
 msgstr ""
 
 #: ../menu-data/sofa-apps:sofa.desktop.in.h:2
-msgid "SOFA"
+msgid "Open Source Framework for Medical Simulation"
 msgstr ""
 
 #: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:1
-msgid "Lets you choose from thousands of applications available for Ubuntu"
-msgstr ""
-
-#: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:2
 msgid "Ubuntu Software Center"
 msgstr ""
 
 #: ../menu-data/software-properties-gtk:software-properties-gtk.desktop.in.h:1
 #: ../menu-data/software-properties-kde:software-properties-kde.desktop.in.h:1
-msgid "Configure the sources for installable software and updates"
+msgid "Software Sources"
 msgstr ""
 
 #: ../menu-data/software-properties-gtk:software-properties-gtk.desktop.in.h:2
 #: ../menu-data/software-properties-kde:software-properties-kde.desktop.in.h:2
-msgid "Software Sources"
+msgid "Configure the sources for installable software and updates"
 msgstr ""
 
 #: ../menu-data/solarwolf:solarwolf.desktop.in.h:1
@@ -15798,19 +16014,19 @@
 msgstr ""
 
 #: ../menu-data/solfege:solfege.desktop.in.h:1
-msgid "Ear training"
+msgid "GNU Solfege"
 msgstr ""
 
 #: ../menu-data/solfege:solfege.desktop.in.h:2
-msgid "GNU Solfege"
+msgid "Ear training"
 msgstr ""
 
 #: ../menu-data/sonata:sonata.desktop.in.h:1
-msgid "An elegant GTK+ MPD client"
+msgid "Sonata"
 msgstr ""
 
 #: ../menu-data/sonata:sonata.desktop.in.h:2
-msgid "Sonata"
+msgid "An elegant GTK+ MPD client"
 msgstr ""
 
 #: ../menu-data/songwrite:songwrite.desktop.in.h:1
@@ -15834,43 +16050,43 @@
 msgstr ""
 
 #: ../menu-data/sound-juicer:sound-juicer.desktop.in.h:1
-msgid "Copy music from your CDs"
+msgid "Sound Juicer Audio CD Extractor"
 msgstr ""
 
 #: ../menu-data/sound-juicer:sound-juicer.desktop.in.h:2
-msgid "Sound Juicer Audio CD Extractor"
+msgid "Copy music from your CDs"
 msgstr ""
 
 #: ../menu-data/soundconverter:soundconverter.desktop.in.h:1
-msgid "Convert audio files into other formats"
+msgid "Sound Converter"
 msgstr ""
 
 #: ../menu-data/soundconverter:soundconverter.desktop.in.h:2
-msgid "Sound Converter"
+msgid "Convert audio files into other formats"
 msgstr ""
 
 #: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:1
-msgid "An audio file converter"
+msgid "soundKonverter"
 msgstr ""
 
 #: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:2
-msgid "soundKonverter"
+msgid "An audio file converter"
 msgstr ""
 
 #: ../menu-data/source-highlight-ide:source-highlight-ide.desktop.in.h:1
-msgid "Develop, modify or debug a source-highlight definition file"
+msgid "Source-Highlight-IDE"
 msgstr ""
 
 #: ../menu-data/source-highlight-ide:source-highlight-ide.desktop.in.h:2
-msgid "Source-Highlight-IDE"
+msgid "Develop, modify or debug a source-highlight definition file"
 msgstr ""
 
 #: ../menu-data/spacezero:spacezero.desktop.in.h:1
-msgid "Real Time Strategy 2D space combat multiplayer net game."
+msgid "Spacezero"
 msgstr ""
 
 #: ../menu-data/spacezero:spacezero.desktop.in.h:2
-msgid "Spacezero"
+msgid "Real Time Strategy 2D space combat multiplayer net game."
 msgstr ""
 
 #: ../menu-data/sparkleshare:sparkleshare.desktop.in.h:1
@@ -15882,23 +16098,23 @@
 msgstr ""
 
 #: ../menu-data/spe:spe.desktop.in.h:1
-msgid "Integrated Python Development Environment"
+msgid "SPE (Stani's Python Editor)"
 msgstr ""
 
 #: ../menu-data/spe:spe.desktop.in.h:2
-msgid "SPE (Stani's Python Editor)"
+msgid "Integrated Python Development Environment"
 msgstr ""
 
-#: ../menu-data/specimen:specimen.desktop.in.h:2
+#: ../menu-data/specimen:specimen.desktop.in.h:1
 msgid "Specimen"
 msgstr ""
 
 #: ../menu-data/specto:specto.desktop.in.h:1
-msgid "Be notified of everything"
+msgid "Specto"
 msgstr ""
 
 #: ../menu-data/specto:specto.desktop.in.h:2
-msgid "Specto"
+msgid "Be notified of everything"
 msgstr ""
 
 #: ../menu-data/spectools:spectool_gtk.desktop.in.h:1
@@ -15910,35 +16126,35 @@
 msgstr ""
 
 #: ../menu-data/speedcrunch:speedcrunch.desktop.in.h:1
-msgid "High precision calculator"
+msgid "SpeedCrunch"
 msgstr ""
 
 #: ../menu-data/speedcrunch:speedcrunch.desktop.in.h:2
-msgid "SpeedCrunch"
+msgid "High precision calculator"
 msgstr ""
 
 #: ../menu-data/spek:spek.desktop.in.h:1
-msgid "Spek Spectrum Analyser"
+msgid "View spectrograms of your audio files"
 msgstr ""
 
 #: ../menu-data/spek:spek.desktop.in.h:2
-msgid "View spectrograms of your audio files"
+msgid "Spek Spectrum Analyser"
 msgstr ""
 
 #: ../menu-data/spim:xspim.desktop.in.h:1
-msgid "Graphical MIPS32 Assembly language emulator"
+msgid "xSPIM"
 msgstr ""
 
 #: ../menu-data/spim:xspim.desktop.in.h:2
-msgid "xSPIM"
+msgid "Graphical MIPS32 Assembly language emulator"
 msgstr ""
 
 #: ../menu-data/spotlighter:spotlighter.desktop.in.h:1
-msgid "Show and move a spotlight on the desktop"
+msgid "Spotlighter"
 msgstr ""
 
 #: ../menu-data/spotlighter:spotlighter.desktop.in.h:2
-msgid "Spotlighter"
+msgid "Show and move a spotlight on the desktop"
 msgstr ""
 
 #: ../menu-data/spout:spout.desktop.in.h:1
@@ -15946,51 +16162,51 @@
 msgstr ""
 
 #: ../menu-data/spring:spring.desktop.in.h:1
-msgid "An open source RTS with similar gameplay to TA"
+msgid "Spring"
 msgstr ""
 
 #: ../menu-data/spring:spring.desktop.in.h:2
-msgid "Spring"
+msgid "An open source RTS with similar gameplay to TA"
 msgstr ""
 
 #: ../menu-data/springlobby:springlobby.desktop.in.h:1
-msgid "Play real-time strategy games using the Spring engine"
+msgid "SpringLobby"
 msgstr ""
 
 #: ../menu-data/springlobby:springlobby.desktop.in.h:2
-msgid "SpringLobby"
+msgid "Play real-time strategy games using the Spring engine"
 msgstr ""
 
 #: ../menu-data/spyder:spyder.desktop.in.h:1
-msgid "Python IDE for scientists"
+msgid "spyder"
 msgstr ""
 
 #: ../menu-data/spyder:spyder.desktop.in.h:2
-msgid "spyder"
+msgid "Python IDE for scientists"
 msgstr ""
 
 #: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:1
-msgid "GUI editor for SQLite databases"
+msgid "SQLite database browser"
 msgstr ""
 
 #: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:2
-msgid "SQLite database browser"
+msgid "GUI editor for SQLite databases"
 msgstr ""
 
 #: ../menu-data/sqliteman:sqliteman.desktop.in.h:1
-msgid "Administer and develop your Sqlite3 databases"
+msgid "Sqliteman"
 msgstr ""
 
 #: ../menu-data/sqliteman:sqliteman.desktop.in.h:2
-msgid "Sqliteman"
+msgid "Administer and develop your Sqlite3 databases"
 msgstr ""
 
 #: ../menu-data/squeak-vm:squeak.desktop.in.h:1
-msgid " Programming system and content development tool"
+msgid "Squeak"
 msgstr ""
 
 #: ../menu-data/squeak-vm:squeak.desktop.in.h:2
-msgid "Squeak"
+msgid " Programming system and content development tool"
 msgstr ""
 
 #: ../menu-data/squeeze:squeeze.desktop.in.h:1
@@ -16011,19 +16227,19 @@
 msgstr ""
 
 #: ../menu-data/stackapplet:stackapplet.desktop.in.h:1
-msgid "Launch the StackApplet indicator"
+msgid "StackApplet"
 msgstr ""
 
 #: ../menu-data/stackapplet:stackapplet.desktop.in.h:2
-msgid "StackApplet"
+msgid "Launch the StackApplet indicator"
 msgstr ""
 
 #: ../menu-data/stardict-common:stardict.desktop.in.h:1
-msgid "Lookup words"
+msgid "StarDict"
 msgstr ""
 
 #: ../menu-data/stardict-common:stardict.desktop.in.h:2
-msgid "StarDict"
+msgid "Lookup words"
 msgstr ""
 
 #: ../menu-data/starplot:starplot.desktop.in.h:1
@@ -16035,11 +16251,11 @@
 msgstr ""
 
 #: ../menu-data/startupmanager:startupmanager.desktop.in.h:1
-msgid "Change settings for the bootloader and splash screen"
+msgid "StartUp-Manager"
 msgstr ""
 
 #: ../menu-data/startupmanager:startupmanager.desktop.in.h:2
-msgid "StartUp-Manager"
+msgid "Change settings for the bootloader and splash screen"
 msgstr ""
 
 #: ../menu-data/starvoyager:starvoyager.desktop.in.h:1
@@ -16051,27 +16267,27 @@
 msgstr ""
 
 #: ../menu-data/stella:stella.desktop.in.h:1
-msgid "A multi-platform Atari 2600 emulator"
+msgid "Stella"
 msgstr ""
 
 #: ../menu-data/stella:stella.desktop.in.h:2
-msgid "Stella"
+msgid "A multi-platform Atari 2600 emulator"
 msgstr ""
 
 #: ../menu-data/stellarium:stellarium.desktop.in.h:1
-msgid "Planetarium"
+msgid "Stellarium"
 msgstr ""
 
 #: ../menu-data/stellarium:stellarium.desktop.in.h:2
-msgid "Stellarium"
+msgid "Planetarium"
 msgstr ""
 
 #: ../menu-data/step:kde4__step.desktop.in.h:1
-msgid "Simulate physics experiments"
+msgid "Step"
 msgstr ""
 
 #: ../menu-data/step:kde4__step.desktop.in.h:2
-msgid "Step"
+msgid "Simulate physics experiments"
 msgstr ""
 
 #: ../menu-data/stepbill.app:StepBill.desktop.in.h:1
@@ -16083,19 +16299,19 @@
 msgstr ""
 
 #: ../menu-data/stopmotion:stopmotion.desktop.in.h:1
-msgid "Program to create stop-motion animations"
+msgid "Stopmotion"
 msgstr ""
 
 #: ../menu-data/stopmotion:stopmotion.desktop.in.h:2
-msgid "Stopmotion"
+msgid "Program to create stop-motion animations"
 msgstr ""
 
 #: ../menu-data/stopwatch:stopwatch.desktop.in.h:1
-msgid "A virtual stopwatch"
+msgid "Stopwatch"
 msgstr ""
 
 #: ../menu-data/stopwatch:stopwatch.desktop.in.h:2
-msgid "Stopwatch"
+msgid "A virtual stopwatch"
 msgstr ""
 
 #: ../menu-data/stormbaancoureur:stormbaancoureur.desktop.in.h:1
@@ -16107,27 +16323,27 @@
 msgstr ""
 
 #: ../menu-data/streamtuner2:streamtuner2.desktop.in.h:1
-msgid "Listen to shoutcast/xiph/live365 music stations"
+msgid "streamtuner2"
 msgstr ""
 
 #: ../menu-data/streamtuner2:streamtuner2.desktop.in.h:2
-msgid "streamtuner2"
+msgid "Listen to shoutcast/xiph/live365 music stations"
 msgstr ""
 
 #: ../menu-data/streamtuner:streamtuner.desktop.in.h:1
-msgid "Browse Internet stream directories"
+msgid "streamtuner"
 msgstr ""
 
 #: ../menu-data/streamtuner:streamtuner.desktop.in.h:2
-msgid "streamtuner"
+msgid "Browse Internet stream directories"
 msgstr ""
 
 #: ../menu-data/stretchplayer:stretchplayer.desktop.in.h:1
-msgid "Audio file player with time stretch"
+msgid "StretchPlayer"
 msgstr ""
 
 #: ../menu-data/stretchplayer:stretchplayer.desktop.in.h:2
-msgid "StretchPlayer"
+msgid "Audio file player with time stretch"
 msgstr ""
 
 #: ../menu-data/stroq:stroq.desktop.in.h:1
@@ -16139,39 +16355,39 @@
 msgstr ""
 
 #: ../menu-data/structure-synth:structure-synth.desktop.in.h:1
-msgid "Application for creating 3D structures"
+msgid "Structure Synth"
 msgstr ""
 
 #: ../menu-data/structure-synth:structure-synth.desktop.in.h:2
-msgid "Structure Synth"
+msgid "Application for creating 3D structures"
 msgstr ""
 
-#: ../menu-data/subcommander:subcommander.desktop.in.h:2
+#: ../menu-data/subcommander:subcommander.desktop.in.h:1
 msgid "Subcommander"
 msgstr ""
 
 #: ../menu-data/subdownloader:subdownloader.desktop.in.h:1
-msgid "Application to download/upload subtitles of your movies."
+msgid "SubDownloader"
 msgstr ""
 
 #: ../menu-data/subdownloader:subdownloader.desktop.in.h:2
-msgid "SubDownloader"
+msgid "Application to download/upload subtitles of your movies."
 msgstr ""
 
 #: ../menu-data/subtitlecomposer:kde4__subtitlecomposer.desktop.in.h:1
-msgid "KDE subtitle editor"
+msgid "Subtitle Composer"
 msgstr ""
 
 #: ../menu-data/subtitlecomposer:kde4__subtitlecomposer.desktop.in.h:2
-msgid "Subtitle Composer"
+msgid "KDE subtitle editor"
 msgstr ""
 
 #: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:1
-msgid "A subtitle editor based on GStreamer and Gtk+"
+msgid "Subtitle Editor"
 msgstr ""
 
 #: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:2
-msgid "Subtitle Editor"
+msgid "A subtitle editor based on GStreamer and Gtk+"
 msgstr ""
 
 #: ../menu-data/sugar-emulator-0.84:sugar-emulator.desktop.in.h:1
@@ -16189,19 +16405,19 @@
 msgstr ""
 
 #: ../menu-data/sunflow:sunflow.desktop.in.h:1
-msgid "Photorealistic Rendering Engine"
+msgid "Sunflow"
 msgstr ""
 
 #: ../menu-data/sunflow:sunflow.desktop.in.h:2
-msgid "Sunflow"
+msgid "Photorealistic Rendering Engine"
 msgstr ""
 
 #: ../menu-data/supercollider-emacs:scel.desktop.in.h:1
-msgid "Emacs environment for SuperCollider"
+msgid "SuperCollider Emacs (scel)"
 msgstr ""
 
 #: ../menu-data/supercollider-emacs:scel.desktop.in.h:2
-msgid "SuperCollider Emacs (scel)"
+msgid "Emacs environment for SuperCollider"
 msgstr ""
 
 #: ../menu-data/supercollider-vim:scvim.desktop.in.h:1
@@ -16213,19 +16429,19 @@
 msgstr ""
 
 #: ../menu-data/supertux-stable:supertux.desktop.in.h:1
-msgid "A Super Mario inspired penguin platform game"
+msgid "SuperTux"
 msgstr ""
 
 #: ../menu-data/supertux-stable:supertux.desktop.in.h:2
-msgid "SuperTux"
+msgid "A Super Mario inspired penguin platform game"
 msgstr ""
 
 #: ../menu-data/supertux:supertux2.desktop.in.h:1
-msgid "Play a classic 2D platform game"
+msgid "SuperTux 2"
 msgstr ""
 
 #: ../menu-data/supertux:supertux2.desktop.in.h:2
-msgid "SuperTux 2"
+msgid "Play a classic 2D platform game"
 msgstr ""
 
 #: ../menu-data/supertuxkart:supertuxkart.desktop.in.h:1
@@ -16245,27 +16461,27 @@
 msgstr ""
 
 #: ../menu-data/survex-svxedit:survex-svxedit.desktop.in.h:1
-msgid "Enter cave survey data for Survex"
+msgid "SvxEdit Cave Survey Data Editor"
 msgstr ""
 
 #: ../menu-data/survex-svxedit:survex-svxedit.desktop.in.h:2
-msgid "SvxEdit Cave Survey Data Editor"
+msgid "Enter cave survey data for Survex"
 msgstr ""
 
 #: ../menu-data/svn-workbench:svn-workbench.desktop.in.h:1
-msgid "A Workbench for Subversion"
+msgid "SVN Workbench"
 msgstr ""
 
 #: ../menu-data/svn-workbench:svn-workbench.desktop.in.h:2
-msgid "SVN Workbench"
+msgid "A Workbench for Subversion"
 msgstr ""
 
 #: ../menu-data/swami:swami.desktop.in.h:1
-msgid "Create, play and organize MIDI instruments and sounds"
+msgid "Swami Instrument Editor"
 msgstr ""
 
 #: ../menu-data/swami:swami.desktop.in.h:2
-msgid "Swami Instrument Editor"
+msgid "Create, play and organize MIDI instruments and sounds"
 msgstr ""
 
 #: ../menu-data/sweep:sweep.desktop.in.h:1
@@ -16285,38 +16501,46 @@
 msgstr ""
 
 #: ../menu-data/sweethome3d:sweethome3d.desktop.in.h:1
-msgid "Interior 2D design application with 3D preview"
+msgid "Sweet Home 3D"
 msgstr ""
 
 #: ../menu-data/sweethome3d:sweethome3d.desktop.in.h:2
-msgid "Sweet Home 3D"
+msgid "Interior 2D design application with 3D preview"
+msgstr ""
+
+#: ../menu-data/swell-foop:swell-foop.desktop.in.h:1
+msgid "Swell Foop"
+msgstr ""
+
+#: ../menu-data/swell-foop:swell-foop.desktop.in.h:2
+msgid "Clear the screen by removing groups of colored and shaped tiles"
 msgstr ""
 
 #: ../menu-data/sylph-searcher:sylph-searcher.desktop.in.h:1
-msgid "Full-text search program for Sylpheed"
+msgid "Sylph-Searcher"
 msgstr ""
 
 #: ../menu-data/sylph-searcher:sylph-searcher.desktop.in.h:2
-msgid "Sylph-Searcher"
+msgid "Full-text search program for Sylpheed"
 msgstr ""
 
 #: ../menu-data/sylpheed:sylpheed.desktop.in.h:1
-msgid "E-Mail client"
+msgid "Sylpheed"
 msgstr ""
 
 #: ../menu-data/sylpheed:sylpheed.desktop.in.h:2
-msgid "Sylpheed"
+msgid "E-Mail client"
 msgstr ""
 
 #: ../menu-data/synapse:synapse.desktop.in.h:1
-msgid "Search everything you do."
+msgid "Synapse"
 msgstr ""
 
 #: ../menu-data/synapse:synapse.desktop.in.h:2
-msgid "Synapse"
+msgid "Search everything you do."
 msgstr ""
 
-#: ../menu-data/synaptic:synaptic.desktop.in.h:2
+#: ../menu-data/synaptic:synaptic.desktop.in.h:1
 msgid "Synaptic Package Manager"
 msgstr ""
 
@@ -16329,43 +16553,43 @@
 msgstr ""
 
 #: ../menu-data/synce-trayicon:synce-trayicon.desktop.in.h:1
-msgid "SynCE PDA control for GNOME"
+msgid "SynCE Tray Icon"
 msgstr ""
 
 #: ../menu-data/synce-trayicon:synce-trayicon.desktop.in.h:2
-msgid "SynCE Tray Icon"
+msgid "SynCE PDA control for GNOME"
 msgstr ""
 
 #: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:1
-msgid "Configure Sync Mail Dir"
+msgid "Sync Mail Dir"
 msgstr ""
 
 #: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:2
-msgid "Sync Mail Dir"
+msgid "Configure Sync Mail Dir"
 msgstr ""
 
 #: ../menu-data/syncropated:syncropated.desktop.in.h:1
-msgid "Media Syncronizer"
+msgid "Syncropated!"
 msgstr ""
 
 #: ../menu-data/syncropated:syncropated.desktop.in.h:2
-msgid "Syncropated!"
+msgid "Media Syncronizer"
 msgstr ""
 
 #: ../menu-data/sysinfo:sysinfo.desktop.in.h:1
-msgid "Display detailed computer/system information"
+msgid "Sysinfo"
 msgstr ""
 
 #: ../menu-data/sysinfo:sysinfo.desktop.in.h:2
-msgid "Sysinfo"
+msgid "Display detailed computer/system information"
 msgstr ""
 
 #: ../menu-data/sysprof:sysprof.desktop.in.h:1
-msgid "A system-wide linux profiler"
+msgid "Sysprof Profiler"
 msgstr ""
 
 #: ../menu-data/sysprof:sysprof.desktop.in.h:2
-msgid "Sysprof Profiler"
+msgid "A system-wide linux profiler"
 msgstr ""
 
 #: ../menu-data/system-config-audit:system-config-audit.desktop.in.h:1
@@ -16385,49 +16609,61 @@
 msgstr ""
 
 #: ../menu-data/system-config-date:system-config-date.desktop.in.h:1
-msgid "Change system date and time"
+msgid "Date & Time"
 msgstr ""
 
 #: ../menu-data/system-config-date:system-config-date.desktop.in.h:2
-msgid "Date & Time"
+msgid "Change system date and time"
 msgstr ""
 
 #: ../menu-data/system-config-kickstart:system-config-kickstart.desktop.in.h:1
-msgid "Create a kickstart file"
+msgid "Kickstart"
 msgstr ""
 
 #: ../menu-data/system-config-kickstart:system-config-kickstart.desktop.in.h:2
-msgid "Kickstart"
+msgid "Create a kickstart file"
 msgstr ""
 
 #: ../menu-data/system-config-lvm:system-config-lvm.desktop.in.h:1
-msgid "Configure LVM in a graphical setting"
+msgid "Logical Volume Management"
 msgstr ""
 
 #: ../menu-data/system-config-lvm:system-config-lvm.desktop.in.h:2
-msgid "Logical Volume Management"
+msgid "Configure LVM in a graphical setting"
 msgstr ""
 
 #: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:1
-msgid "Configure printers"
+msgid "Printing"
 msgstr ""
 
 #: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:2
-msgid "Printing"
+msgid "Configure printers"
 msgstr ""
 
 #: ../menu-data/system-config-samba:system-config-samba.desktop.in.h:1
-msgid "Create, modify, and delete samba shares"
+msgid "Samba"
 msgstr ""
 
 #: ../menu-data/system-config-samba:system-config-samba.desktop.in.h:2
-msgid "Samba"
+msgid "Create, modify, and delete samba shares"
+msgstr ""
+
+#: ../menu-data/systemsettings:kde4__kdesystemsettings.desktop.in.h:1
+msgid "KDE System Settings"
 msgstr ""
 
 #: ../menu-data/systemsettings:kde4__systemsettings.desktop.in.h:1
 msgid "System Settings"
 msgstr ""
 
+#: ../menu-data/tagainijisho:tagainijisho.desktop.in.h:1
+msgid "Tagaini Jisho"
+msgstr ""
+
+#: ../menu-data/tagainijisho:tagainijisho.desktop.in.h:2
+msgid "A free Japanese dictionary and study assistant"
+msgstr ""
+
 #: ../menu-data/tagtool:tagtool.desktop.in.h:1
 msgid "Audio Tag Tool"
 msgstr ""
@@ -16437,55 +16673,55 @@
 msgstr ""
 
 #: ../menu-data/tagua:kde4__tagua.desktop.in.h:1
-msgid "A generic board game application."
+msgid "Tagua"
 msgstr ""
 
 #: ../menu-data/tagua:kde4__tagua.desktop.in.h:2
-msgid "Tagua"
+msgid "A generic board game application."
 msgstr ""
 
 #: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:1
-msgid "An IRC Client for GNUstep and Mac OS X"
+msgid "TalkSoup"
 msgstr ""
 
 #: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:2
-msgid "TalkSoup"
+msgid "An IRC Client for GNUstep and Mac OS X"
 msgstr ""
 
 #: ../menu-data/tangerine:tangerine.desktop.in.h:1
-msgid "Share your music with close friends"
+msgid "Tangerine Media Sharing"
 msgstr ""
 
 #: ../menu-data/tangerine:tangerine.desktop.in.h:2
-msgid "Tangerine Media Sharing"
+msgid "Share your music with close friends"
 msgstr ""
 
 #: ../menu-data/tanglet:tanglet.desktop.in.h:1
-msgid "Single player variant of Boggle"
+msgid "Tanglet"
 msgstr ""
 
 #: ../menu-data/tanglet:tanglet.desktop.in.h:2
-msgid "Tanglet"
+msgid "Single player variant of Boggle"
 msgstr ""
 
 #: ../menu-data/tasks-mobile:kde4__tasks-mobile.desktop.in.h:1
-msgid "Kontact Touch Tasks"
+msgid "Tasks"
 msgstr ""
 
 #: ../menu-data/tasque:tasque.desktop.in.h:1
-msgid "Easy quick task management"
+msgid "Tasque"
 msgstr ""
 
 #: ../menu-data/tasque:tasque.desktop.in.h:2
-msgid "Tasque"
+msgid "Easy quick task management"
 msgstr ""
 
 #: ../menu-data/tatan:tatan.desktop.in.h:1
-msgid "HIZ's Tatan"
+msgid "Tatan"
 msgstr ""
 
 #: ../menu-data/tatan:tatan.desktop.in.h:2
-msgid "Tatan"
+msgid "HIZ's Tatan"
 msgstr ""
 
 #: ../menu-data/taxbird:taxbird.desktop.in.h:1
@@ -16496,6 +16732,46 @@
 msgid "freier Elster-Client für Linux"
 msgstr ""
 
+#: ../menu-data/tcos-configurator:tcos-configurator.desktop.in.h:1
+msgid "TCOS Server Configurator"
+msgstr ""
+
+#: ../menu-data/tcos-configurator:tcos-configurator.desktop.in.h:2
+msgid "Configure TCOS server daemons and users"
+msgstr ""
+
+#: ../menu-data/tcos-standalone:tcos-standalone.desktop.in.h:1
+msgid "TCOS Standalone"
+msgstr ""
+
+#: ../menu-data/tcos-standalone:tcos-standalone.desktop.in.h:2
+msgid "Configure standalone mode of TCOS"
+msgstr ""
+
+#: ../menu-data/tcosconfig:tcosconfig.desktop.in.h:1
+msgid "TCOS-config"
+msgstr ""
+
+#: ../menu-data/tcosconfig:tcosconfig.desktop.in.h:2
+msgid "Configure and make bootable initramfs images for thin client networks"
+msgstr ""
+
+#: ../menu-data/tcosmonitor:tcosmonitor.desktop.in.h:1
+msgid "TcosMonitor"
+msgstr ""
+
+#: ../menu-data/tcosmonitor:tcosmonitor.desktop.in.h:2
+msgid "Thin client network monitor"
+msgstr ""
+
+#: ../menu-data/tcosmonitor:tcospersonalize.desktop.in.h:1
+msgid "TcosPersonalize"
+msgstr ""
+
+#: ../menu-data/tcosmonitor:tcospersonalize.desktop.in.h:2
+msgid "Configure a simple TCOS thin client"
+msgstr ""
+
 #: ../menu-data/tea:tea.desktop.in.h:1
 msgid "TEA Text Editor"
 msgstr ""
@@ -16513,11 +16789,11 @@
 msgstr ""
 
 #: ../menu-data/teeworlds:teeworlds.desktop.in.h:1
-msgid "An online multi-player platform 2D shooter"
+msgid "Teeworlds"
 msgstr ""
 
 #: ../menu-data/teeworlds:teeworlds.desktop.in.h:2
-msgid "Teeworlds"
+msgid "An online multi-player platform 2D shooter"
 msgstr ""
 
 #: ../menu-data/teg:teg.desktop.in.h:1
@@ -16529,19 +16805,19 @@
 msgstr ""
 
 #: ../menu-data/tegaki-recognize:tegaki-recognize.desktop.in.h:1
-msgid "Handwriting Recognition"
+msgid "Tegaki Recognize"
 msgstr ""
 
 #: ../menu-data/tegaki-recognize:tegaki-recognize.desktop.in.h:2
-msgid "Tegaki Recognize"
+msgid "Handwriting Recognition"
 msgstr ""
 
 #: ../menu-data/tekka:tekka.desktop.in.h:1
-msgid "Chat on IRC"
+msgid "tekka IRC Client"
 msgstr ""
 
 #: ../menu-data/tekka:tekka.desktop.in.h:2
-msgid "tekka IRC Client"
+msgid "Chat on IRC"
 msgstr ""
 
 #: ../menu-data/telegnome:telegnome.desktop.in.h:1
@@ -16553,11 +16829,11 @@
 msgstr ""
 
 #: ../menu-data/teleport:teleport.desktop.in.h:1
-msgid "Move applications between displays"
+msgid "Teleport"
 msgstr ""
 
 #: ../menu-data/teleport:teleport.desktop.in.h:2
-msgid "Teleport"
+msgid "Move applications between displays"
 msgstr ""
 
 #: ../menu-data/tellico:kde4__tellico.desktop.in.h:1
@@ -16569,63 +16845,63 @@
 msgstr ""
 
 #: ../menu-data/tennix:tennix.desktop.in.h:1
-msgid "Play tennis against the computer or a friend"
+msgid "Tennix!"
 msgstr ""
 
 #: ../menu-data/tennix:tennix.desktop.in.h:2
-msgid "Tennix!"
+msgid "Play tennis against the computer or a friend"
 msgstr ""
 
-#: ../menu-data/terminal.app:Terminal.desktop.in.h:1
+#: ../menu-data/terminal.app:Terminal.desktop.in.h:2
 msgid "A terminal emulator"
 msgstr ""
 
 #: ../menu-data/terminator:terminator.desktop.in.h:1
-msgid "Multiple terminals in one window"
+msgid "Terminator"
 msgstr ""
 
 #: ../menu-data/terminator:terminator.desktop.in.h:2
-msgid "Terminator"
+msgid "Multiple terminals in one window"
 msgstr ""
 
 #: ../menu-data/termit:termit.desktop.in.h:1
-msgid "Lightweight terminal emulator"
+msgid "Termit"
 msgstr ""
 
 #: ../menu-data/termit:termit.desktop.in.h:2
-msgid "Termit"
+msgid "Lightweight terminal emulator"
 msgstr ""
 
 #: ../menu-data/terraintool:terraintool.desktop.in.h:1
-msgid "Generate surface mesh in survex format"
+msgid "Terraintool surface mesh generator"
 msgstr ""
 
 #: ../menu-data/terraintool:terraintool.desktop.in.h:2
-msgid "Terraintool surface mesh generator"
+msgid "Generate surface mesh in survex format"
 msgstr ""
 
 #: ../menu-data/testdrive-gtk:testdrive-gtk.desktop.in.h:1
-msgid "Download and run an Ubuntu ISO in a Virtual Machine"
+msgid "Test Drive an Ubuntu ISO"
 msgstr ""
 
 #: ../menu-data/testdrive-gtk:testdrive-gtk.desktop.in.h:2
-msgid "Test Drive an Ubuntu ISO"
+msgid "Download and run an Ubuntu ISO in a Virtual Machine"
 msgstr ""
 
 #: ../menu-data/tetraproc:tetraproc.desktop.in.h:1
-msgid "Tetrahedral Microphone Processor for Ambisonic Recording"
+msgid "Tetraproc"
 msgstr ""
 
 #: ../menu-data/tetraproc:tetraproc.desktop.in.h:2
-msgid "Tetraproc"
+msgid "Tetrahedral Microphone Processor for Ambisonic Recording"
 msgstr ""
 
 #: ../menu-data/tetzle:tetzle.desktop.in.h:1
-msgid "Jigsaw puzzle with tetromino pieces"
+msgid "Tetzle"
 msgstr ""
 
 #: ../menu-data/tetzle:tetzle.desktop.in.h:2
-msgid "Tetzle"
+msgid "Jigsaw puzzle with tetromino pieces"
 msgstr ""
 
 #: ../menu-data/tex-guy:tex-guy.desktop.in.h:1
@@ -16637,11 +16913,11 @@
 msgstr ""
 
 #: ../menu-data/texmacs-common:texmacs.desktop.in.h:1
-msgid "A structured wysiwyg scientific text editor"
+msgid "GNU TeXmacs Editor"
 msgstr ""
 
 #: ../menu-data/texmacs-common:texmacs.desktop.in.h:2
-msgid "GNU TeXmacs Editor"
+msgid "A structured wysiwyg scientific text editor"
 msgstr ""
 
 #: ../menu-data/texmaker:texmaker.desktop.in.h:1
@@ -16661,44 +16937,44 @@
 msgstr ""
 
 #: ../menu-data/texworks:texworks.desktop.in.h:1
-msgid ""
-"A simple environment for editing, typesetting, and previewing TeX documents"
+msgid "TeXworks"
 msgstr ""
 
 #: ../menu-data/texworks:texworks.desktop.in.h:2
-msgid "TeXworks"
+msgid ""
+"A simple environment for editing, typesetting, and previewing TeX documents"
 msgstr ""
 
 #: ../menu-data/tgif:tgif.desktop.in.h:1
-msgid "Interactive 2-D vector drawing program for X11"
+msgid "Tgif"
 msgstr ""
 
 #: ../menu-data/tgif:tgif.desktop.in.h:2
-msgid "Tgif"
+msgid "Interactive 2-D vector drawing program for X11"
 msgstr ""
 
 #: ../menu-data/thawab:thawab.desktop.in.h:1
-msgid "Electronic Arabic/Islamic Encyclopedia"
+msgid "Thawab"
 msgstr ""
 
 #: ../menu-data/thawab:thawab.desktop.in.h:2
-msgid "Thawab"
+msgid "Electronic Arabic/Islamic Encyclopedia"
 msgstr ""
 
 #: ../menu-data/themonospot:themonospot.desktop.in.h:1
-msgid "themonospot"
+msgid "themonospot - extract information from avi or mkv files"
 msgstr ""
 
 #: ../menu-data/themonospot:themonospot.desktop.in.h:2
-msgid "themonospot - extract information from avi or mkv files"
+msgid "themonospot"
 msgstr ""
 
 #: ../menu-data/theorur:theorur.desktop.in.h:1
-msgid "Broadcast multimedia streams over an Icecast system"
+msgid "Theorur"
 msgstr ""
 
 #: ../menu-data/theorur:theorur.desktop.in.h:2
-msgid "Theorur"
+msgid "Broadcast multimedia streams over an Icecast system"
 msgstr ""
 
 #: ../menu-data/therion-viewer:therion-viewer.desktop.in.h:1
@@ -16710,71 +16986,67 @@
 msgstr ""
 
 #: ../menu-data/therion:therion.desktop.in.h:1
-msgid "Draw up surveys in Therion format"
+msgid "Therion"
 msgstr ""
 
 #: ../menu-data/therion:therion.desktop.in.h:2
-msgid "Therion"
+msgid "Draw up surveys in Therion format"
 msgstr ""
 
 #: ../menu-data/thin-client-manager-gnome:student-control-panel.desktop.in.h:1
-msgid "Control Thin Client connections"
+msgid "Thin Client Manager"
 msgstr ""
 
 #: ../menu-data/thin-client-manager-gnome:student-control-panel.desktop.in.h:2
-msgid "Thin Client Manager"
+msgid "Control Thin Client connections"
 msgstr ""
 
 #: ../menu-data/thoggen:thoggen.desktop.in.h:1
-msgid "Extracts Video from your DVDs"
+msgid "Thoggen DVD Ripper"
 msgstr ""
 
 #: ../menu-data/thoggen:thoggen.desktop.in.h:2
-msgid "Thoggen DVD Ripper"
+msgid "Extracts Video from your DVDs"
 msgstr ""
 
 #: ../menu-data/threadscope:threadscope.desktop.in.h:1
-msgid "Haskell GHC thread profiler"
+msgid "threadscope"
 msgstr ""
 
 #: ../menu-data/threadscope:threadscope.desktop.in.h:2
-msgid "threadscope"
+msgid "Haskell GHC thread profiler"
 msgstr ""
 
 #: ../menu-data/thunar:Thunar.desktop.in.h:1
-msgid "Browse the filesystem with the file manager"
+msgid "Thunar File Manager"
 msgstr ""
 
 #: ../menu-data/thunar:Thunar.desktop.in.h:2
-msgid "Thunar File Manager"
+msgid "Browse the filesystem with the file manager"
 msgstr ""
 
 #: ../menu-data/thunderbird:thunderbird.desktop.in.h:1
-msgid "Compose New Message"
+msgid "Thunderbird Mail"
 msgstr ""
 
-#: ../menu-data/thunderbird:thunderbird.desktop.in.h:3
+#: ../menu-data/thunderbird:thunderbird.desktop.in.h:2
 msgid "Send and receive mail with Thunderbird"
 msgstr ""
 
-#: ../menu-data/thunderbird:thunderbird.desktop.in.h:4
-msgid "Thunderbird Mail"
-msgstr ""
-
 #: ../menu-data/tickr:tickr.desktop.in.h:1
-msgid "GTK-based highly graphically-customizable RSS Ticker"
+msgid "Tickr - RSS Feed Reader"
 msgstr ""
 
 #: ../menu-data/tickr:tickr.desktop.in.h:2
-msgid "Tickr - RSS Feed Reader"
+msgid "GTK-based highly graphically-customizable RSS Ticker"
 msgstr ""
 
 #: ../menu-data/tictactoe-ng:tictactoe-ng.desktop.in.h:1
-msgid "Simple, fun tic tac toe game for GNOME"
+msgid "Tic Tac Toe"
 msgstr ""
 
 #: ../menu-data/tictactoe-ng:tictactoe-ng.desktop.in.h:2
-msgid "Tic Tac Toe"
+msgid "Simple, fun tic tac toe game for GNOME"
 msgstr ""
 
 #: ../menu-data/tiger:tiger.desktop.in.h:1
@@ -16806,86 +17078,70 @@
 msgstr ""
 
 #: ../menu-data/tint2:tint2conf.desktop.in.h:1
-msgid "Customize the panel settings"
+msgid "Panel tint2"
 msgstr ""
 
 #: ../menu-data/tint2:tint2conf.desktop.in.h:2
-msgid "Panel tint2"
+msgid "Customize the panel settings"
 msgstr ""
 
 #: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:1
-msgid "A tool to train your ears to hear relative pitch"
-msgstr ""
-
-#: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:2
 msgid "Tiny Ear Trainer"
 msgstr ""
 
-#: ../menu-data/tipptrainer:tipptrainer.desktop.in.h:1
-msgid "A program to learn touch typing"
-msgstr ""
-
-#: ../menu-data/tipptrainer:tipptrainer.desktop.in.h:2
-msgid "Tipptrainer Typing Tutor"
+#: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:2
+msgid "A tool to train your ears to hear relative pitch"
 msgstr ""
 
 #: ../menu-data/titanion:titanion.desktop.in.h:1
-msgid "Kenta Cho's Titanion"
+msgid "Titanion"
 msgstr ""
 
 #: ../menu-data/titanion:titanion.desktop.in.h:2
-msgid "Titanion"
+msgid "Kenta Cho's Titanion"
 msgstr ""
 
 #: ../menu-data/tkabber:tkabber.desktop.in.h:1
-msgid "Communicate via XMPP (Jabber) protocol"
+msgid "Tkabber"
 msgstr ""
 
 #: ../menu-data/tkabber:tkabber.desktop.in.h:2
-msgid "Tkabber"
+msgid "Communicate via XMPP (Jabber) protocol"
 msgstr ""
 
 #: ../menu-data/tkcvs:tkcvs.desktop.in.h:1
-msgid "A graphical frontend to CVS and Subversion."
-msgstr ""
-
-#: ../menu-data/tkcvs:tkcvs.desktop.in.h:2
 msgid "tkcvs"
 msgstr ""
 
-#: ../menu-data/tkdiff:tkdiff.desktop.in.h:1
-msgid "TkDiff File Comparison"
-msgstr ""
-
-#: ../menu-data/tkdiff:tkdiff.desktop.in.h:2
-msgid "TkDiff is a graphical front-end for the standard Unix 'diff' utility."
+#: ../menu-data/tkcvs:tkcvs.desktop.in.h:2
+msgid "A graphical frontend to CVS and Subversion."
 msgstr ""
 
 #: ../menu-data/tkgate:tkgate.desktop.in.h:1
-msgid "Event driven digital circuit simulator with Tcl/Tk"
+msgid "tkgate Circuit Simulator"
 msgstr ""
 
 #: ../menu-data/tkgate:tkgate.desktop.in.h:2
-msgid "tkgate Circuit Simulator"
+msgid "Event driven digital circuit simulator with Tcl/Tk"
 msgstr ""
 
 #: ../menu-data/tmw:tmw.desktop.in.h:1
-msgid "The Mana World 2D MMORPG client"
+msgid "The Mana world"
 msgstr ""
 
 #: ../menu-data/tmw:tmw.desktop.in.h:2
-msgid "The Mana world"
+msgid "The Mana World 2D MMORPG client"
 msgstr ""
 
 #: ../menu-data/tomatoes:tomatoes.desktop.in.h:1
-msgid "How many tomatoes can you smash in ten short minutes?"
+msgid "I Have No Tomatoes"
 msgstr ""
 
 #: ../menu-data/tomatoes:tomatoes.desktop.in.h:2
-msgid "I Have No Tomatoes"
+msgid "How many tomatoes can you smash in ten short minutes?"
 msgstr ""
 
-#: ../menu-data/tomboy:tomboy.desktop.in.h:2
+#: ../menu-data/tomboy:tomboy.desktop.in.h:1
 msgid "Tomboy Notes"
 msgstr ""
 
@@ -16898,35 +17154,35 @@
 msgstr ""
 
 #: ../menu-data/toppler:toppler.desktop.in.h:1
-msgid "A clone of the 'Nebulus' game on old 8 and 16 bit machines."
+msgid "Tower Toppler"
 msgstr ""
 
 #: ../menu-data/toppler:toppler.desktop.in.h:2
-msgid "Tower Toppler"
+msgid "A clone of the 'Nebulus' game on old 8 and 16 bit machines."
 msgstr ""
 
 #: ../menu-data/tora:tora.desktop.in.h:1
-msgid "A graphical toolkit for database administration and development"
+msgid "TOra"
 msgstr ""
 
 #: ../menu-data/tora:tora.desktop.in.h:2
-msgid "TOra"
+msgid "A graphical toolkit for database administration and development"
 msgstr ""
 
 #: ../menu-data/torchat:torchat.desktop.in.h:1
-msgid "Decentralized instant messenger built on top of the Tor Network"
+msgid "TorChat"
 msgstr ""
 
 #: ../menu-data/torchat:torchat.desktop.in.h:2
-msgid "TorChat"
+msgid "Decentralized instant messenger built on top of the Tor Network"
 msgstr ""
 
 #: ../menu-data/torcs:torcs.desktop.in.h:1
-msgid "3D racing cars simulator game"
+msgid "TORCS"
 msgstr ""
 
 #: ../menu-data/torcs:torcs.desktop.in.h:2
-msgid "TORCS"
+msgid "3D racing cars simulator game"
 msgstr ""
 
 #: ../menu-data/tortoisehg:tortoisehg.desktop.in.h:1
@@ -16934,35 +17190,31 @@
 msgstr ""
 
 #: ../menu-data/torus-trooper-pure:torus-trooper-pure.desktop.in.h:1
-msgid "HIZ's version of Torus Trooper"
+msgid "Torus Trooper Pure"
 msgstr ""
 
 #: ../menu-data/torus-trooper-pure:torus-trooper-pure.desktop.in.h:2
-msgid "Torus Trooper Pure"
+msgid "HIZ's version of Torus Trooper"
 msgstr ""
 
 #: ../menu-data/torus-trooper:torus-trooper.desktop.in.h:1
-msgid "Kenta Cho's Torus Trooper"
+msgid "Torus Trooper"
 msgstr ""
 
 #: ../menu-data/torus-trooper:torus-trooper.desktop.in.h:2
-msgid "Torus Trooper"
+msgid "Kenta Cho's Torus Trooper"
 msgstr ""
 
 #: ../menu-data/totem:totem.desktop.in.h:1
 msgid "Movie Player"
 msgstr ""
 
-#: ../menu-data/totem:totem.desktop.in.h:2
-msgid "Play movies and songs"
-msgstr ""
-
 #: ../menu-data/tovidgui:tovidgui.desktop.in.h:1
-msgid "Author videos to DVD with menus"
+msgid "tovid GUI"
 msgstr ""
 
 #: ../menu-data/tovidgui:tovidgui.desktop.in.h:2
-msgid "tovid GUI"
+msgid "Author videos to DVD with menus"
 msgstr ""
 
 #: ../menu-data/trackballs:trackballs.desktop.in.h:1
@@ -16992,19 +17244,19 @@
 msgstr ""
 
 #: ../menu-data/transfermii-gui:transfermii-gui.desktop.in.h:1
-msgid "Transfer miis from a wiimote"
+msgid "Transfermii"
 msgstr ""
 
 #: ../menu-data/transfermii-gui:transfermii-gui.desktop.in.h:2
-msgid "Transfermii"
+msgid "Transfer miis from a wiimote"
 msgstr ""
 
 #: ../menu-data/transgui:transgui.desktop.in.h:1
-msgid "GUI to remotely control a Transmission daemon"
+msgid "Transmission remote GUI"
 msgstr ""
 
 #: ../menu-data/transgui:transgui.desktop.in.h:2
-msgid "Transmission remote GUI"
+msgid "GUI to remotely control a Transmission daemon"
 msgstr ""
 
 #: ../menu-data/transmageddon:transmageddon.desktop.in.h:1
@@ -17015,11 +17267,11 @@
 msgid "Video format conversion tool"
 msgstr ""
 
-#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:2
+#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:1
 msgid "Transmission BitTorrent Client"
 msgstr ""
 
-#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:2
+#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:1
 msgid "Qtransmission Bittorrent Client"
 msgstr ""
 
@@ -17035,65 +17287,47 @@
 msgid "Office Document Reader"
 msgstr ""
 
-#: ../menu-data/tree-ppuzzle:tree-ppuzzle.desktop.in.h:1
-msgid ""
-"Reconstruction of phylogenetic trees by maximum likelihood (parallelized "
-"version)"
-msgstr ""
-
-#: ../menu-data/tree-ppuzzle:tree-ppuzzle.desktop.in.h:2
-msgid "tree-ppuzzle"
-msgstr ""
-
-#: ../menu-data/tree-puzzle:tree-puzzle.desktop.in.h:1
-msgid "Reconstruction of phylogenetic trees by maximum likelihood"
-msgstr ""
-
-#: ../menu-data/tree-puzzle:tree-puzzle.desktop.in.h:2
-msgid "tree-puzzle"
-msgstr ""
-
 #: ../menu-data/treeline:treeline.desktop.in.h:1
-msgid "Tree-like structured custom data manager"
+msgid "TreeLine"
 msgstr ""
 
 #: ../menu-data/treeline:treeline.desktop.in.h:2
-msgid "TreeLine"
+msgid "Tree-like structured custom data manager"
 msgstr ""
 
 #: ../menu-data/treeviewx:treeviewx.desktop.in.h:1
-msgid ""
-"Displays, modifies, prints and exports in SVG format phylogenetic trees"
+msgid "TreeView X"
 msgstr ""
 
 #: ../menu-data/treeviewx:treeviewx.desktop.in.h:2
-msgid "TreeView X"
+msgid ""
+"Displays, modifies, prints and exports in SVG format phylogenetic trees"
 msgstr ""
 
 #: ../menu-data/tremulous:tremulous.desktop.in.h:1
-msgid ""
-"Aliens vs Humans, First Person Shooter game with elements of Real Time "
-"Strategy"
+msgid "Tremulous"
 msgstr ""
 
 #: ../menu-data/tremulous:tremulous.desktop.in.h:2
-msgid "Tremulous"
+msgid ""
+"Aliens vs Humans, First Person Shooter game with elements of Real Time "
+"Strategy"
 msgstr ""
 
 #: ../menu-data/trigger-rally:trigger-rally.desktop.in.h:1
-msgid "3D rally racing car game"
+msgid "Trigger"
 msgstr ""
 
 #: ../menu-data/trigger-rally:trigger-rally.desktop.in.h:2
-msgid "Trigger"
+msgid "3D rally racing car game"
 msgstr ""
 
 #: ../menu-data/trimage:trimage.desktop.in.h:1
-msgid "A cross-platform tool for optimizing PNG and JPG files."
+msgid "Trimage image compressor"
 msgstr ""
 
 #: ../menu-data/trimage:trimage.desktop.in.h:2
-msgid "Trimage image compressor"
+msgid "A cross-platform tool for optimizing PNG and JPG files."
 msgstr ""
 
 #: ../menu-data/triplane:triplane.desktop.in.h:1
@@ -17104,6 +17338,10 @@
 msgid "side-scrolling dogfighting game"
 msgstr ""
 
+#: ../menu-data/triplea:triplea.desktop.in.h:1
+msgid "TripleA"
+msgstr ""
+
 #: ../menu-data/tritium:tritium.desktop.in.h:1
 msgid "Tritium"
 msgstr ""
@@ -17113,27 +17351,27 @@
 msgstr ""
 
 #: ../menu-data/trovacap:trovacap.desktop.in.h:1
-msgid "Computes Italian ZIP codes"
+msgid "TrovaCAP"
 msgstr ""
 
 #: ../menu-data/trovacap:trovacap.desktop.in.h:2
-msgid "TrovaCAP"
+msgid "Computes Italian ZIP codes"
 msgstr ""
 
 #: ../menu-data/trustedqsl:tqsl.desktop.in.h:1
-msgid "Sign QSO data for upload to LoTW"
+msgid "TrustedQSL"
 msgstr ""
 
 #: ../menu-data/trustedqsl:tqsl.desktop.in.h:2
-msgid "TrustedQSL"
+msgid "Sign QSO data for upload to LoTW"
 msgstr ""
 
 #: ../menu-data/tryton-client:tryton-client.desktop.in.h:1
-msgid "Access Tryton server"
+msgid "Tryton"
 msgstr ""
 
 #: ../menu-data/tryton-client:tryton-client.desktop.in.h:2
-msgid "Tryton"
+msgid "Access Tryton server"
 msgstr ""
 
 #: ../menu-data/tryton-neso:neso.desktop.in.h:1
@@ -17153,11 +17391,11 @@
 msgstr ""
 
 #: ../menu-data/tucan:tucan.desktop.in.h:1
-msgid "Download and upload manager for hosting sites."
+msgid "Tucan Manager"
 msgstr ""
 
 #: ../menu-data/tucan:tucan.desktop.in.h:2
-msgid "Tucan Manager"
+msgid "Download and upload manager for hosting sites."
 msgstr ""
 
 #: ../menu-data/tucnak2:tucnak2.desktop.in.h:1
@@ -17169,27 +17407,27 @@
 msgstr ""
 
 #: ../menu-data/tumiki-fighters:tumiki-fighters.desktop.in.h:1
-msgid "Kenta Cho's Tumiki Fighters"
+msgid "Tumiki Fighters"
 msgstr ""
 
 #: ../menu-data/tumiki-fighters:tumiki-fighters.desktop.in.h:2
-msgid "Tumiki Fighters"
+msgid "Kenta Cho's Tumiki Fighters"
 msgstr ""
 
 #: ../menu-data/tunapie:tunapie.desktop.in.h:1
-msgid "Lists audio and video streams from shoutcast and icecast"
+msgid "Tunapie"
 msgstr ""
 
 #: ../menu-data/tunapie:tunapie.desktop.in.h:2
-msgid "Tunapie"
+msgid "Lists audio and video streams from shoutcast and icecast"
 msgstr ""
 
 #: ../menu-data/tunnelx:tunnelx.desktop.in.h:1
-msgid "Draw cave surveys"
+msgid "Tunnel Cave Drawing Software"
 msgstr ""
 
 #: ../menu-data/tunnelx:tunnelx.desktop.in.h:2
-msgid "Tunnel Cave Drawing Software"
+msgid "Draw cave surveys"
 msgstr ""
 
 #: ../menu-data/turpial:turpial.desktop.in.h:1
@@ -17201,11 +17439,11 @@
 msgstr ""
 
 #: ../menu-data/turtleart:turtleart.desktop.in.h:1
-msgid "A Logo programming environment"
+msgid "TurtleArt"
 msgstr ""
 
 #: ../menu-data/turtleart:turtleart.desktop.in.h:2
-msgid "TurtleArt"
+msgid "A Logo programming environment"
 msgstr ""
 
 #: ../menu-data/tuxcards:tuxcards.desktop.in.h:1
@@ -17217,27 +17455,27 @@
 msgstr ""
 
 #: ../menu-data/tuxcmd:tuxcmd.desktop.in.h:1
-msgid "A two panel file manager"
+msgid "Tux Commander"
 msgstr ""
 
 #: ../menu-data/tuxcmd:tuxcmd.desktop.in.h:2
-msgid "Tux Commander"
+msgid "A two panel file manager"
 msgstr ""
 
 #: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:1
-msgid "2D Football Game"
+msgid "Tuxfootball"
 msgstr ""
 
 #: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:2
-msgid "Tuxfootball"
+msgid "2D Football Game"
 msgstr ""
 
 #: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:1
-msgid "Edit, playback guitar tablatures"
+msgid "tuxguitar"
 msgstr ""
 
 #: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:2
-msgid "tuxguitar"
+msgid "Edit, playback guitar tablatures"
 msgstr ""
 
 #: ../menu-data/tuxmath:tuxmath.desktop.in.h:1
@@ -17249,27 +17487,27 @@
 msgstr ""
 
 #: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:1
-msgid "A drawing program for children."
+msgid "Tux Paint"
 msgstr ""
 
 #: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:2
-msgid "Tux Paint"
+msgid "A drawing program for children."
 msgstr ""
 
 #: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:1
-msgid "Play Shufflepuck with Tux"
+msgid "Tuxpuck"
 msgstr ""
 
 #: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:2
-msgid "Tuxpuck"
+msgid "Play Shufflepuck with Tux"
 msgstr ""
 
 #: ../menu-data/tuxtype:tuxtype.desktop.in.h:1
-msgid "Educational typing tutor game starring Tux"
+msgid "Tux Typing"
 msgstr ""
 
 #: ../menu-data/tuxtype:tuxtype.desktop.in.h:2
-msgid "Tux Typing"
+msgid "Educational typing tutor game starring Tux"
 msgstr ""
 
 #: ../menu-data/tvtime:net-tvtime.desktop.in.h:1
@@ -17281,11 +17519,11 @@
 msgstr ""
 
 #: ../menu-data/twinkle:twinkle.desktop.in.h:1
-msgid "A SIP softphone"
+msgid "Twinkle"
 msgstr ""
 
 #: ../menu-data/twinkle:twinkle.desktop.in.h:2
-msgid "Twinkle"
+msgid "A SIP softphone"
 msgstr ""
 
 #: ../menu-data/tworld:tworld.desktop.in.h:1
@@ -17293,11 +17531,11 @@
 msgstr ""
 
 #: ../menu-data/txtreader:txtreader.desktop.in.h:1
-msgid "Read text novels and more"
+msgid "Txt Reader"
 msgstr ""
 
 #: ../menu-data/txtreader:txtreader.desktop.in.h:2
-msgid "Txt Reader"
+msgid "Read text novels and more"
 msgstr ""
 
 #: ../menu-data/uae:uae.desktop.in.h:1
@@ -17309,27 +17547,27 @@
 msgstr ""
 
 #: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:1
-msgid "Configure and manage your Ubuntu One account"
+msgid "Ubuntu One"
 msgstr ""
 
 #: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:2
-msgid "Ubuntu One"
+msgid "Configure and manage your Ubuntu One account"
 msgstr ""
 
 #: ../menu-data/ubuntustudio-controls:ubuntustudio-controls.desktop.in.h:1
-msgid "Change settings for multimedia production"
+msgid "Ubuntu Studio Controls"
 msgstr ""
 
 #: ../menu-data/ubuntustudio-controls:ubuntustudio-controls.desktop.in.h:2
-msgid "Ubuntu Studio Controls"
+msgid "Change settings for multimedia production"
 msgstr ""
 
 #: ../menu-data/uck:uck.desktop.in.h:1
-msgid "Customize your Ubuntu Desktop CDs easily"
+msgid "Ubuntu Customization Kit"
 msgstr ""
 
 #: ../menu-data/uck:uck.desktop.in.h:2
-msgid "Ubuntu Customization Kit"
+msgid "Customize your Ubuntu Desktop CDs easily"
 msgstr ""
 
 #: ../menu-data/udav:udav.desktop.in.h:1
@@ -17341,30 +17579,30 @@
 msgstr ""
 
 #: ../menu-data/ufraw:ufraw.desktop.in.h:1
-msgid "A utility to read and manipulate raw images from digital cameras"
+msgid "UFRaw"
 msgstr ""
 
 #: ../menu-data/ufraw:ufraw.desktop.in.h:2
-msgid "UFRaw"
+msgid "A utility to read and manipulate raw images from digital cameras"
 msgstr ""
 
 #: ../menu-data/ugene:ugene.desktop.in.h:1
-msgid "Integrated Bioinformatics Suite"
+msgid "Unipro UGENE"
 msgstr ""
 
 #: ../menu-data/ugene:ugene.desktop.in.h:2
-msgid "Unipro UGENE"
+msgid "Integrated Bioinformatics Suite"
 msgstr ""
 
 #: ../menu-data/uget:uget-gtk.desktop.in.h:1
-msgid "Download multiple URLs and apply it to one of setting/queue."
+msgid "uGet"
 msgstr ""
 
 #: ../menu-data/uget:uget-gtk.desktop.in.h:2
-msgid "uGet"
+msgid "Download multiple URLs and apply it to one of setting/queue."
 msgstr ""
 
-#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1
+#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:2
 msgid "Customize uim input method environment"
 msgstr ""
 
@@ -17377,27 +17615,27 @@
 msgstr ""
 
 #: ../menu-data/uima-utils:uima-cpegui.desktop.in.h:1
-msgid "Graphical interface to build UIMA CPE"
+msgid "UIMA CPE Gui"
 msgstr ""
 
 #: ../menu-data/uima-utils:uima-cpegui.desktop.in.h:2
-msgid "UIMA CPE Gui"
+msgid "Graphical interface to build UIMA CPE"
 msgstr ""
 
 #: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:1
-msgid "Simple UIMA analysis engine runner"
+msgid "UIMA Document Analyzer"
 msgstr ""
 
 #: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:2
-msgid "UIMA Document Analyzer"
+msgid "Simple UIMA analysis engine runner"
 msgstr ""
 
 #: ../menu-data/ukopp:ukopp.desktop.in.h:1
-msgid "Full and incremental backup with media verification"
+msgid "ukopp"
 msgstr ""
 
 #: ../menu-data/ukopp:ukopp.desktop.in.h:2
-msgid "ukopp"
+msgid "Full and incremental backup with media verification"
 msgstr ""
 
 #: ../menu-data/ultracopier:ultracopier.desktop.in.h:1
@@ -17409,102 +17647,102 @@
 msgstr ""
 
 #: ../menu-data/umbrello:kde4__umbrello.desktop.in.h:1
-msgid "UML Modeller"
+msgid "Umbrello"
 msgstr ""
 
 #: ../menu-data/umbrello:kde4__umbrello.desktop.in.h:2
-msgid "Umbrello"
+msgid "UML Modeller"
 msgstr ""
 
 #: ../menu-data/umit:umit.desktop.in.h:1
-msgid "Explore the network and scan ports"
+msgid "Umit Network Scanner"
 msgstr ""
 
 #: ../menu-data/umit:umit.desktop.in.h:2
-msgid "Umit Network Scanner"
+msgid "Explore the network and scan ports"
 msgstr ""
 
 #: ../menu-data/unetbootin:unetbootin.desktop.in.h:1
-msgid "Tool for creating Live USB drives"
+msgid "UNetbootin"
 msgstr ""
 
 #: ../menu-data/unetbootin:unetbootin.desktop.in.h:2
-msgid "UNetbootin"
+msgid "Tool for creating Live USB drives"
 msgstr ""
 
 #: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:1
-msgid "GTK interface for the unison file synchronization tool 2.32.52"
+#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:1
+msgid "Unison"
 msgstr ""
 
 #: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:2
-#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:2
-msgid "Unison"
+msgid "GTK interface for the unison file synchronization tool 2.32.52"
 msgstr ""
 
-#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:1
+#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:2
 msgid "GTK interface for the unison file synchronization tool 2.27.57"
 msgstr ""
 
 #: ../menu-data/unity-2d-launcher:unity-2d-launcher.desktop.in.h:1
-msgid "A Qt-based applications launcher"
+msgid "Unity 2d Launcher"
 msgstr ""
 
 #: ../menu-data/unity-2d-launcher:unity-2d-launcher.desktop.in.h:2
-msgid "Unity 2d Launcher"
+msgid "A Qt-based applications launcher"
 msgstr ""
 
 #: ../menu-data/unity-2d-panel:unity-2d-panel.desktop.in.h:1
-msgid "A Qt-based panel"
+msgid "Unity 2D Panel"
 msgstr ""
 
 #: ../menu-data/unity-2d-panel:unity-2d-panel.desktop.in.h:2
-msgid "Unity 2D Panel"
+msgid "A Qt-based panel"
 msgstr ""
 
 #: ../menu-data/unity-2d-places:unity-2d-places.desktop.in.h:1
-msgid "A Qt-based implementation of Unity Places"
+msgid "Unity 2D Places"
 msgstr ""
 
 #: ../menu-data/unity-2d-places:unity-2d-places.desktop.in.h:2
-msgid "Unity 2D Places"
+msgid "A Qt-based implementation of Unity Places"
 msgstr ""
 
-#: ../menu-data/update-manager:update-manager.desktop.in.h:1
+#: ../menu-data/update-manager:update-manager.desktop.in.h:2
 msgid "Show and install available updates"
 msgstr ""
 
 #: ../menu-data/upnp-inspector:upnp-inspector.desktop.in.h:1
-msgid " DLNA/UPnP device and service analyzer,control-point and test-tool"
+msgid "UPnP Inspector"
 msgstr ""
 
 #: ../menu-data/upnp-inspector:upnp-inspector.desktop.in.h:2
-msgid "UPnP Inspector"
+msgid " DLNA/UPnP device and service analyzer,control-point and test-tool"
 msgstr ""
 
 #: ../menu-data/upnp-router-control:upnp-router-control.desktop.in.h:1
-msgid "A simple program to manage UPnP IGD compliant routers"
+msgid "UPnP Router Control"
 msgstr ""
 
 #: ../menu-data/upnp-router-control:upnp-router-control.desktop.in.h:2
-msgid "UPnP Router Control"
+msgid "A simple program to manage UPnP IGD compliant routers"
 msgstr ""
 
 #: ../menu-data/uqm:uqm.desktop.in.h:1
-msgid "An interstellar adventure game"
+msgid "The Ur-Quan Masters"
 msgstr ""
 
 #: ../menu-data/uqm:uqm.desktop.in.h:2
-msgid "The Ur-Quan Masters"
+msgid "An interstellar adventure game"
 msgstr ""
 
 #: ../menu-data/usb-creator-gtk:usb-creator-gtk.desktop.in.h:1
 #: ../menu-data/usb-creator-kde:usb-creator-kde.desktop.in.h:1
-msgid "Create a startup disk using a CD or disc image"
+msgid "Startup Disk Creator"
 msgstr ""
 
 #: ../menu-data/usb-creator-gtk:usb-creator-gtk.desktop.in.h:2
 #: ../menu-data/usb-creator-kde:usb-creator-kde.desktop.in.h:2
-msgid "Startup Disk Creator"
+msgid "Create a startup disk using a CD or disc image"
 msgstr ""
 
 #: ../menu-data/usb-imagewriter:imagewriter.desktop.in.h:1
@@ -17536,11 +17774,11 @@
 msgstr ""
 
 #: ../menu-data/usermode:redhat-userpasswd.desktop.in.h:1
-msgid "Change your login password"
+msgid "Password"
 msgstr ""
 
 #: ../menu-data/usermode:redhat-userpasswd.desktop.in.h:2
-msgid "Password"
+msgid "Change your login password"
 msgstr ""
 
 #: ../menu-data/utf8-migration-tool:utf8migrationtool.desktop.in.h:1
@@ -17556,43 +17794,47 @@
 msgstr ""
 
 #: ../menu-data/v-sim-common:v-sim.desktop.in.h:1
-msgid "Atomic visualisation"
+msgid "V_Sim"
 msgstr ""
 
 #: ../menu-data/v-sim-common:v-sim.desktop.in.h:2
-msgid "V_Sim"
+msgid "Atomic visualisation"
 msgstr ""
 
 #: ../menu-data/v4l2ucp:v4l2ucp.desktop.in.h:1
-msgid "A universal control panel for V4L2 devices"
+msgid "Video4Linux Control Panel"
 msgstr ""
 
 #: ../menu-data/v4l2ucp:v4l2ucp.desktop.in.h:2
-msgid "Video4Linux Control Panel"
+msgid "A universal control panel for V4L2 devices"
 msgstr ""
 
 #: ../menu-data/vagalume:vagalume.desktop.in.h:1
+msgid "Last.fm Client"
+msgstr ""
+
+#: ../menu-data/vagalume:vagalume.desktop.in.h:2
 msgid "Vagalume Last.fm Client"
 msgstr ""
 
 #: ../menu-data/val-and-rick:val-and-rick.desktop.in.h:1
-msgid "Kenta Cho's Val & Rick"
+msgid "Val & Rick"
 msgstr ""
 
 #: ../menu-data/val-and-rick:val-and-rick.desktop.in.h:2
-msgid "Val & Rick"
+msgid "Kenta Cho's Val & Rick"
 msgstr ""
 
-#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:1
+#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:2
 msgid "Command Line Interface"
 msgstr ""
 
 #: ../menu-data/valknut:valknut.desktop.in.h:1
-msgid "Share files over the Direct Connect network"
+msgid "Valknut"
 msgstr ""
 
 #: ../menu-data/valknut:valknut.desktop.in.h:2
-msgid "Valknut"
+msgid "Share files over the Direct Connect network"
 msgstr ""
 
 #: ../menu-data/vbaexpress:vbaexpress.desktop.in.h:1
@@ -17604,27 +17846,27 @@
 msgstr ""
 
 #: ../menu-data/vectoroids:vectoroids.desktop.in.h:1
-msgid "A clone of the classic arcade game \"Asteroids\""
+msgid "Vectoroids"
 msgstr ""
 
 #: ../menu-data/vectoroids:vectoroids.desktop.in.h:2
-msgid "Vectoroids"
+msgid "A clone of the classic arcade game \"Asteroids\""
 msgstr ""
 
 #: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:1
-msgid "French conjugation system"
+msgid "Verbiste"
 msgstr ""
 
 #: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:2
-msgid "Verbiste"
+msgid "French conjugation system"
 msgstr ""
 
 #: ../menu-data/veusz:veusz.desktop.in.h:1
-msgid "For graphing and manipulation of scientific data"
+msgid "Veusz"
 msgstr ""
 
 #: ../menu-data/veusz:veusz.desktop.in.h:2
-msgid "Veusz"
+msgid "For graphing and manipulation of scientific data"
 msgstr ""
 
 #: ../menu-data/vice:x128.desktop.in.h:1
@@ -17652,11 +17894,11 @@
 msgstr ""
 
 #: ../menu-data/vidalia:vidalia.desktop.in.h:1
-msgid "Tor GUI"
+msgid "Vidalia"
 msgstr ""
 
 #: ../menu-data/vidalia:vidalia.desktop.in.h:2
-msgid "Vidalia"
+msgid "Tor GUI"
 msgstr ""
 
 #: ../menu-data/videocut:videocut.desktop.in.h:1
@@ -17668,11 +17910,11 @@
 msgstr ""
 
 #: ../menu-data/videoporama:videoporama.desktop.in.h:1
-msgid "Make and export image slideshows"
+msgid "Videoporama"
 msgstr ""
 
 #: ../menu-data/videoporama:videoporama.desktop.in.h:2
-msgid "Videoporama"
+msgid "Make and export image slideshows"
 msgstr ""
 
 #: ../menu-data/viewmol:viewmol.desktop.in.h:1
@@ -17680,81 +17922,77 @@
 msgstr ""
 
 #: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:1
-msgid "A spicy PDF Reader."
+msgid "ViewPDF"
 msgstr ""
 
 #: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:2
-msgid "ViewPDF"
+msgid "A spicy PDF Reader."
 msgstr ""
 
 #: ../menu-data/viking:viking.desktop.in.h:1
-msgid "Map Based GPS Data Manager (live data capable)."
+msgid "Viking"
 msgstr ""
 
 #: ../menu-data/viking:viking.desktop.in.h:2
-msgid "Viking"
+msgid "Map Based GPS Data Manager (live data capable)."
 msgstr ""
 
-#: ../menu-data/vim-gui-common:gvim.desktop.in.h:2
+#: ../menu-data/vim-gui-common:gvim.desktop.in.h:1
 msgid "GVim"
 msgstr ""
 
 #: ../menu-data/vinagre:vinagre.desktop.in.h:1
-msgid "Access remote desktops"
+msgid "Remote Desktop Viewer"
 msgstr ""
 
 #: ../menu-data/vinagre:vinagre.desktop.in.h:2
-msgid "Remote Desktop Viewer"
+msgid "Access remote desktops"
 msgstr ""
 
-#: ../menu-data/vino:vino-preferences.desktop.in.h:1
+#: ../menu-data/vino:vino-preferences.desktop.in.h:2
 msgid "Choose how other users can remotely view your desktop"
 msgstr ""
 
 #: ../menu-data/viridian:viridian.desktop.in.h:1
-msgid "Stand alone front end for Ampache."
+msgid "viridian"
 msgstr ""
 
 #: ../menu-data/viridian:viridian.desktop.in.h:2
-msgid "viridian"
+msgid "Stand alone front end for Ampache."
 msgstr ""
 
 #: ../menu-data/virt-manager:virt-manager.desktop.in.h:1
-msgid "Manage virtual machines"
+msgid "Virtual Machine Manager"
 msgstr ""
 
 #: ../menu-data/virt-manager:virt-manager.desktop.in.h:2
-msgid "Virtual Machine Manager"
+msgid "Manage virtual machines"
 msgstr ""
 
 #: ../menu-data/virtaal:virtaal.desktop.in.h:1
-msgid ""
-"A translation tool to help a human translator translate files into other "
-"languages"
+msgid "Virtaal"
 msgstr ""
 
 #: ../menu-data/virtaal:virtaal.desktop.in.h:2
-msgid "Virtaal"
+msgid ""
+"A translation tool to help a human translator translate files into other "
+"languages"
 msgstr ""
 
 #: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:1
-msgid "Run several virtual systems on a single host computer"
-msgstr ""
-
-#: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:2
 msgid "VirtualBox"
 msgstr ""
 
-#: ../menu-data/viruskiller:viruskiller.desktop.in.h:1
-msgid "Virus Killer"
+#: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:2
+msgid "Run several virtual systems on a single host computer"
 msgstr ""
 
 #: ../menu-data/visolate:visolate.desktop.in.h:1
-msgid "PCB CNC converter"
+msgid "Visolate"
 msgstr ""
 
 #: ../menu-data/visolate:visolate.desktop.in.h:2
-msgid "Visolate"
+msgid "PCB CNC converter"
 msgstr ""
 
 #: ../menu-data/visualboyadvance-gtk:VisualBoyAdvance.desktop.in.h:1
@@ -17766,43 +18004,43 @@
 msgstr ""
 
 #: ../menu-data/visualvm:visualvm.desktop.in.h:1
-msgid "All-in-One Java Troubleshooting Tool"
+msgid "VisualVM"
 msgstr ""
 
 #: ../menu-data/visualvm:visualvm.desktop.in.h:2
-msgid "VisualVM"
+msgid "All-in-One Java Troubleshooting Tool"
 msgstr ""
 
 #: ../menu-data/vitables:vitables.desktop.in.h:1
-msgid "PyTables & HDF5 Files Visualizer"
+msgid "ViTables"
 msgstr ""
 
 #: ../menu-data/vitables:vitables.desktop.in.h:2
-msgid "ViTables"
+msgid "PyTables & HDF5 Files Visualizer"
 msgstr ""
 
 #: ../menu-data/vite:vite.desktop.in.h:1
-msgid "A visual trace explorer"
+msgid "ViTE"
 msgstr ""
 
 #: ../menu-data/vite:vite.desktop.in.h:2
-msgid "ViTE"
+msgid "A visual trace explorer"
 msgstr ""
 
 #: ../menu-data/vkeybd:vkeybd.desktop.in.h:1
-msgid "MIDI Virtual Keyboard"
+msgid "Virtual MIDI Keyboard"
 msgstr ""
 
 #: ../menu-data/vkeybd:vkeybd.desktop.in.h:2
-msgid "Virtual MIDI Keyboard"
+msgid "MIDI Virtual Keyboard"
 msgstr ""
 
 #: ../menu-data/vlc:vlc.desktop.in.h:1
-msgid "Read, capture, broadcast your multimedia streams"
+msgid "VLC media player"
 msgstr ""
 
 #: ../menu-data/vlc:vlc.desktop.in.h:2
-msgid "VLC media player"
+msgid "Read, capture, broadcast your multimedia streams"
 msgstr ""
 
 #: ../menu-data/vmpk:vmpk.desktop.in.h:1
@@ -17823,27 +18061,31 @@
 msgstr ""
 
 #: ../menu-data/volumecontrol.app:VolumeControl.desktop.in.h:1
-msgid "Control your volume settings"
+msgid "VolumeControl"
 msgstr ""
 
 #: ../menu-data/volumecontrol.app:VolumeControl.desktop.in.h:2
-msgid "VolumeControl"
+msgid "Control your volume settings"
 msgstr ""
 
 #: ../menu-data/vor:vor.desktop.in.h:1
-msgid "Variations on Rockdodger"
+msgid "VoR"
 msgstr ""
 
 #: ../menu-data/vor:vor.desktop.in.h:2
-msgid "VoR"
+msgid "Variations on Rockdodger"
 msgstr ""
 
 #: ../menu-data/voxbo:vbview2.desktop.in.h:1
-msgid "VBView2"
+msgid "VoxBo Image Viewer"
 msgstr ""
 
 #: ../menu-data/voxbo:vbview2.desktop.in.h:2
-msgid "VoxBo Image Viewer"
+msgid "VBView2"
+msgstr ""
+
+#: ../menu-data/vprerex:vprerex.desktop.in.h:1
+msgid "vprerex"
 msgstr ""
 
 #: ../menu-data/vusb-analyzer:vusb-analyzer.desktop.in.h:1
@@ -17855,32 +18097,32 @@
 msgstr ""
 
 #: ../menu-data/vym:vym.desktop.in.h:1
-msgid "Create mind maps"
+msgid "VYM - View Your Mind"
 msgstr ""
 
 #: ../menu-data/vym:vym.desktop.in.h:2
-msgid "VYM - View Your Mind"
+msgid "Create mind maps"
 msgstr ""
 
 #: ../menu-data/w3af:w3af.desktop.in.h:1
-msgid "Web Application Attack and Audit Framework"
+msgid "w3af"
 msgstr ""
 
 #: ../menu-data/w3af:w3af.desktop.in.h:2
-msgid "w3af"
+msgid "Web Application Attack and Audit Framework"
 msgstr ""
 
 #: ../menu-data/wakeup:wakeup.desktop.in.h:1
-msgid ""
-"A talking and fully customizable alarm clock that will operate from poweroff"
+msgid "Wakeup"
 msgstr ""
 
 #: ../menu-data/wakeup:wakeup.desktop.in.h:2
-msgid "Wakeup"
+msgid ""
+"A talking and fully customizable alarm clock that will operate from poweroff"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:1
-msgid "Change Wallpaper"
+msgid "Wallch"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:2
@@ -17888,195 +18130,198 @@
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:3
-msgid "Live Earth Wallpaper"
+msgid "Start"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:4
-msgid "Next"
+msgid "Pause"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:5
-msgid "Pause"
+msgid "Stop"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:6
-msgid "Previous"
+msgid "Next"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:7
-msgid "Start"
+msgid "Previous"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:8
-msgid "Start Changing Wallpapers"
+msgid "Change Wallpaper"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:9
-msgid "Stop"
+msgid "Start Changing Wallpapers"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:10
-msgid "Wallch"
+msgid "Live Earth Wallpaper"
 msgstr ""
 
 #: ../menu-data/wally:wally.desktop__wally.desktop.in.h:1
-msgid "KDE4 Wallpaper changer"
+msgid "Wally"
 msgstr ""
 
 #: ../menu-data/wally:wally.desktop__wally.desktop.in.h:2
-msgid "Wally"
+msgid "KDE4 Wallpaper changer"
 msgstr ""
 
 #: ../menu-data/wammu:wammu.desktop.in.h:1
-msgid "Application for mobile phones - frontend for Gammu"
+msgid "Wammu"
 msgstr ""
 
 #: ../menu-data/wammu:wammu.desktop.in.h:2
-msgid "Wammu"
+msgid "Application for mobile phones - frontend for Gammu"
 msgstr ""
 
 #: ../menu-data/warmux:warmux.desktop.in.h:1
-msgid "A 2D game where funny characters launch funny weapons"
+msgid "Warmux"
 msgstr ""
 
 #: ../menu-data/warmux:warmux.desktop.in.h:2
-msgid "Warmux"
+msgid "A 2D game where funny characters launch funny weapons"
 msgstr ""
 
 #: ../menu-data/warsow:warsow.desktop.in.h:1
-msgid "A fast paced, networked 3D first person shooter"
+msgid "Warsow"
 msgstr ""
 
 #: ../menu-data/warsow:warsow.desktop.in.h:2
-msgid "Warsow"
+msgid "A fast paced, networked 3D first person shooter"
 msgstr ""
 
 #: ../menu-data/warzone2100:warzone2100.desktop.in.h:1
-msgid "Postnuclear realtime strategy"
+msgid "Warzone 2100"
 msgstr ""
 
 #: ../menu-data/warzone2100:warzone2100.desktop.in.h:2
-msgid "Warzone 2100"
+msgid "Postnuclear realtime strategy"
 msgstr ""
 
 #: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:1
-msgid "Split wave files into multiple chunks"
+msgid "Wavbreaker File Splitter"
 msgstr ""
 
 #: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:2
-msgid "Wavbreaker File Splitter"
+msgid "Split wave files into multiple chunks"
 msgstr ""
 
 #: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:1
-msgid "Manipulate sound files"
-msgstr ""
-
-#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:2
 msgid "wavesurfer"
 msgstr ""
 
-#: ../menu-data/webboard:webboard.desktop.in.h:1
-msgid ""
-"Publish text notes and source code on a pastebin server for collaborative "
-"debugging"
-msgstr ""
-
-#: ../menu-data/webboard:webboard.desktop.in.h:2
-msgid "WebBoard"
+#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:2
+msgid "Manipulate sound files"
 msgstr ""
 
 #: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:1
-msgid "Copy websites to your computer"
+msgid "WebHTTrack Website Copier"
 msgstr ""
 
 #: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:2
-msgid "WebHTTrack Website Copier"
+msgid "Copy websites to your computer"
 msgstr ""
 
 #: ../menu-data/webissues:webissues.desktop.in.h:1
-msgid "Desktop Client for the WebIssues team collaboration system"
+msgid "WebIssues"
 msgstr ""
 
 #: ../menu-data/webissues:webissues.desktop.in.h:2
-msgid "WebIssues"
+msgid "Desktop Client for the WebIssues team collaboration system"
 msgstr ""
 
 #: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:1
+msgid "Zoho Webservice Spreadsheet"
+msgstr ""
+
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:2
 msgid ""
 "Perform calculation, analyze information and manage lists in spreadsheets "
 "using Zoho web services."
 msgstr ""
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:2
-msgid "Zoho Webservice Spreadsheet"
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:1
+msgid "Zoho Webservice Presentation"
 msgstr ""
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:1
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:2
 msgid ""
 "Create and edit presentations for slideshows, meeting and Web pages using "
 "Zoho web services."
 msgstr ""
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:2
-msgid "Zoho Webservice Presentation"
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:1
+msgid "Zoho Webservice Word Processor"
 msgstr ""
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:1
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:2
 msgid ""
 "Create and edit text and graphics in letters, reports, documents and Web "
 "pages using Zoho web services."
 msgstr ""
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:2
-msgid "Zoho Webservice Word Processor"
+#: ../menu-data/weka:weka.desktop.in.h:1
+msgid "weka"
 msgstr ""
 
-#: ../menu-data/weka:weka.desktop.in.h:1
+#: ../menu-data/weka:weka.desktop.in.h:2
 msgid "Machine learning algorithms for data mining tasks"
 msgstr ""
 
-#: ../menu-data/weka:weka.desktop.in.h:2
-msgid "weka"
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10.desktop.in.h:1
+msgid "Battle for Wesnoth (1.10)"
 msgstr ""
 
-#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:1
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10.desktop.in.h:2
+#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:2
 msgid "A fantasy turn-based strategy game"
 msgstr ""
 
-#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:2
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10_editor.desktop.in.h:1
+msgid "Battle for Wesnoth Map Editor (1.10)"
+msgstr ""
+
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10_editor.desktop.in.h:2
+msgid "A map editor for Battle for Wesnoth maps"
+msgstr ""
+
+#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:1
 msgid "Battle for Wesnoth (1.8)"
 msgstr ""
 
 #: ../menu-data/whichwayisup:whichwayisup.desktop.in.h:1
-msgid "2D platform game with a slight rotational twist"
+msgid "Which Way is Up"
 msgstr ""
 
 #: ../menu-data/whichwayisup:whichwayisup.desktop.in.h:2
-msgid "Which Way is Up"
+msgid "2D platform game with a slight rotational twist"
 msgstr ""
 
 #: ../menu-data/wicd-gtk:wicd.desktop.in.h:1
-msgid "Start the Wicd client without system tray icon"
+msgid "Wicd Network Manager"
 msgstr ""
 
 #: ../menu-data/wicd-gtk:wicd.desktop.in.h:2
-msgid "Wicd Network Manager"
+msgid "Start the Wicd client without system tray icon"
 msgstr ""
 
 #: ../menu-data/wicd-kde:kde4__wicd-kde.desktop.in.h:1
-msgid "Wicd Client KDE"
+msgid "Wicd client"
 msgstr ""
 
 #: ../menu-data/wicd-kde:kde4__wicd-kde.desktop.in.h:2
-msgid "Wicd client"
+msgid "Wicd Client KDE"
 msgstr ""
 
 #: ../menu-data/widelands:widelands.desktop.in.h:1
-msgid "A a real-time build-up strategy game"
+msgid "Widelands"
 msgstr ""
 
 #: ../menu-data/widelands:widelands.desktop.in.h:2
-msgid "Widelands"
+msgid "A a real-time build-up strategy game"
 msgstr ""
 
 #: ../menu-data/widemargin:widemargin.desktop.in.h:1
@@ -18088,19 +18333,11 @@
 msgstr ""
 
 #: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:1
-msgid "Tool for connecting to wireless networks"
-msgstr ""
-
-#: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:2
 msgid "WiFi Radar"
 msgstr ""
 
-#: ../menu-data/wiican:wiican.desktop.in.h:1
-msgid "Wiican"
-msgstr ""
-
-#: ../menu-data/wiican:wiican.desktop.in.h:2
-msgid "Wiimote manager usage assistant and mapping manager"
+#: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:2
+msgid "Tool for connecting to wireless networks"
 msgstr ""
 
 #: ../menu-data/willowng-config-gnome:willowng.desktop.in.h:1
@@ -18119,27 +18356,27 @@
 msgstr ""
 
 #: ../menu-data/winefish:winefish.desktop.in.h:1
-msgid "LaTeX Editor based on Bluefish"
+msgid "Winefish LaTeX Editor"
 msgstr ""
 
 #: ../menu-data/winefish:winefish.desktop.in.h:2
-msgid "Winefish LaTeX Editor"
+msgid "LaTeX Editor based on Bluefish"
 msgstr ""
 
 #: ../menu-data/winff:winff.desktop.in.h:1
-msgid "GUI for FFMPEG"
+msgid "WinFF"
 msgstr ""
 
 #: ../menu-data/winff:winff.desktop.in.h:2
-msgid "WinFF"
+msgid "GUI for FFMPEG"
 msgstr ""
 
 #: ../menu-data/wings3d:wings3d.desktop.in.h:1
-msgid "Create and edit 3D models of objects"
+msgid "Wings3D polygon mesh modeller"
 msgstr ""
 
 #: ../menu-data/wings3d:wings3d.desktop.in.h:2
-msgid "Wings3D polygon mesh modeller"
+msgid "Create and edit 3D models of objects"
 msgstr ""
 
 #: ../menu-data/wininfo:xdg-wininfo.desktop.in.h:1
@@ -18151,47 +18388,55 @@
 msgstr ""
 
 #: ../menu-data/winpdb:winpdb.desktop.in.h:1
-msgid "Platform independent Python debugger"
+msgid "Winpdb"
 msgstr ""
 
 #: ../menu-data/winpdb:winpdb.desktop.in.h:2
-msgid "Winpdb"
+msgid "Platform independent Python debugger"
 msgstr ""
 
 #: ../menu-data/wireshark:wireshark.desktop.in.h:1
-msgid "Network traffic analyzer"
+msgid "Wireshark"
 msgstr ""
 
 #: ../menu-data/wireshark:wireshark.desktop.in.h:2
-msgid "Wireshark"
+msgid "Network traffic analyzer"
 msgstr ""
 
 #: ../menu-data/wizznic:wizznic.desktop.in.h:1
-msgid "A puzzle-block falling game."
+msgid "Wizznic"
 msgstr ""
 
 #: ../menu-data/wizznic:wizznic.desktop.in.h:2
-msgid "Wizznic"
+msgid "A puzzle-block falling game."
 msgstr ""
 
 #: ../menu-data/wmgui:wmgui.desktop.in.h:1
-msgid "Simple GTK gui to the wiimote to test and display the wiimote data."
+msgid "Wmgui"
 msgstr ""
 
 #: ../menu-data/wmgui:wmgui.desktop.in.h:2
-msgid "Wmgui"
+msgid "Simple GTK gui to the wiimote to test and display the wiimote data."
 msgstr ""
 
 #: ../menu-data/wmitime:wmitime.desktop.in.h:1
 msgid "Wmitime"
 msgstr ""
 
+#: ../menu-data/wolf4sdl:wolf4sdl.desktop.in.h:1
+msgid "Wolf4SDL"
+msgstr ""
+
+#: ../menu-data/wolf4sdl:wolf4sdl.desktop.in.h:2
+msgid "SDL-Port of Wolfenstein 3-D and Spear of Destiny"
+msgstr ""
+
 #: ../menu-data/worker:worker.desktop.in.h:1
-msgid "File manager for X."
+msgid "Worker"
 msgstr ""
 
 #: ../menu-data/worker:worker.desktop.in.h:2
-msgid "Worker"
+msgid "File manager for X."
 msgstr ""
 
 #: ../menu-data/workrave:workrave.desktop.in.h:1
@@ -18204,35 +18449,43 @@
 msgstr ""
 
 #: ../menu-data/wpagui:wpa_gui.desktop.in.h:1
-msgid "Graphical user interface for wpa_supplicant"
+msgid "wpa_gui"
 msgstr ""
 
 #: ../menu-data/wpagui:wpa_gui.desktop.in.h:2
-msgid "wpa_gui"
+msgid "Graphical user interface for wpa_supplicant"
 msgstr ""
 
 #: ../menu-data/wrapperfactory.app:WrapperFactory.desktop.in.h:1
-msgid "Graphically create Unix application wrappers for GNUstep"
+msgid "WrapperFactory"
 msgstr ""
 
 #: ../menu-data/wrapperfactory.app:WrapperFactory.desktop.in.h:2
-msgid "WrapperFactory"
+msgid "Graphically create Unix application wrappers for GNUstep"
+msgstr ""
+
+#: ../menu-data/writetype:writetype.desktop.in.h:1
+msgid "Writetype"
+msgstr ""
+
+#: ../menu-data/writetype:writetype.desktop.in.h:2
+msgid "A word processor to make typing easier"
 msgstr ""
 
 #: ../menu-data/wsjt:wsjt.desktop.in.h:1
-msgid "Amateur radio weak signal communications"
+msgid "WSJT"
 msgstr ""
 
 #: ../menu-data/wsjt:wsjt.desktop.in.h:2
-msgid "WSJT"
+msgid "Amateur radio weak signal communications"
 msgstr ""
 
 #: ../menu-data/wxbanker:wxbanker.desktop.in.h:1
-msgid "A lightweight personal finance manager"
+msgid "wxBanker Finance Manager"
 msgstr ""
 
 #: ../menu-data/wxbanker:wxbanker.desktop.in.h:2
-msgid "wxBanker Finance Manager"
+msgid "A lightweight personal finance manager"
 msgstr ""
 
 #: ../menu-data/wxformbuilder:wxformbuilder.desktop.in.h:1
@@ -18244,22 +18497,22 @@
 msgstr ""
 
 #: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:1
-msgid "Perform symbolic and numeric calculations using Maxima"
+msgid "wxMaxima"
 msgstr ""
 
 #: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:2
-msgid "wxMaxima"
+msgid "Perform symbolic and numeric calculations using Maxima"
 msgstr ""
 
 #: ../menu-data/x11vnc:x11vnc.desktop.in.h:1
-msgid "Share this desktop by VNC"
+msgid "X11VNC Server"
 msgstr ""
 
 #: ../menu-data/x11vnc:x11vnc.desktop.in.h:2
-msgid "X11VNC Server"
+msgid "Share this desktop by VNC"
 msgstr ""
 
-#: ../menu-data/x2:x2.desktop.in.h:2
+#: ../menu-data/x2:x2.desktop.in.h:1
 msgid "X2"
 msgstr ""
 
@@ -18273,35 +18526,35 @@
 msgstr ""
 
 #: ../menu-data/xacobeo:xacobeo.desktop.in.h:1
-msgid "Build and execute XPath queries"
+msgid "Xacobeo"
 msgstr ""
 
 #: ../menu-data/xacobeo:xacobeo.desktop.in.h:2
-msgid "Xacobeo"
+msgid "Build and execute XPath queries"
 msgstr ""
 
 #: ../menu-data/xaos:xaos.desktop.in.h:1
-msgid "Fractal Generator"
+msgid "Xaos - Fractal Zoomer"
 msgstr ""
 
 #: ../menu-data/xaos:xaos.desktop.in.h:2
-msgid "Xaos - Fractal Zoomer"
+msgid "Fractal Generator"
 msgstr ""
 
 #: ../menu-data/xaralx:xaralx.desktop.in.h:1
-msgid "Versatile vector graphics program"
+msgid "Xara Xtreme"
 msgstr ""
 
 #: ../menu-data/xaralx:xaralx.desktop.in.h:2
-msgid "Xara Xtreme"
+msgid "Versatile vector graphics program"
 msgstr ""
 
 #: ../menu-data/xarchiver:xarchiver.desktop.in.h:1
-msgid "A GTK+2 only archive manager"
+msgid "Xarchiver"
 msgstr ""
 
 #: ../menu-data/xarchiver:xarchiver.desktop.in.h:2
-msgid "Xarchiver"
+msgid "A GTK+2 only archive manager"
 msgstr ""
 
 #: ../menu-data/xawtv:xawtv.desktop.in.h:1
@@ -18313,77 +18566,77 @@
 msgstr ""
 
 #: ../menu-data/xbill:xbill.desktop.in.h:1
-msgid "Get rid of those Wingdows Viruses!"
+msgid "XBill"
 msgstr ""
 
 #: ../menu-data/xbill:xbill.desktop.in.h:2
-msgid "XBill"
+msgid "Get rid of those Wingdows Viruses!"
 msgstr ""
 
 #: ../menu-data/xboard:xboard.desktop.in.h:1
-msgid "Use an X Windows Chess Board"
+msgid "XBoard"
 msgstr ""
 
 #: ../menu-data/xboard:xboard.desktop.in.h:2
-msgid "XBoard"
+msgid "Use an X Windows Chess Board"
 msgstr ""
 
 #: ../menu-data/xboing:xboing.desktop.in.h:1
-msgid "Destroy some blocks"
+msgid "XBoing II"
 msgstr ""
 
 #: ../menu-data/xboing:xboing.desktop.in.h:2
-msgid "XBoing II"
+msgid "Destroy some blocks"
 msgstr ""
 
 #: ../menu-data/xca:xca.desktop.in.h:1
-msgid ""
-"A graphical user interface for handling and issuing X.509 compliant "
-"Certificates"
+msgid "XCA"
 msgstr ""
 
 #: ../menu-data/xca:xca.desktop.in.h:2
-msgid "XCA"
+msgid ""
+"A graphical user interface for handling and issuing X.509 compliant "
+"Certificates"
 msgstr ""
 
 #: ../menu-data/xcdroast:xcdroast.desktop.in.h:1
-msgid "Create a CD"
+msgid "X-CD-Roast"
 msgstr ""
 
 #: ../menu-data/xcdroast:xcdroast.desktop.in.h:2
-msgid "X-CD-Roast"
+msgid "Create a CD"
 msgstr ""
 
 #: ../menu-data/xcfa:xcfa.desktop.in.h:1
-msgid "X Convert File Audio. Programme pour convertir les fichiers audio."
+msgid "XCFA"
 msgstr ""
 
 #: ../menu-data/xcfa:xcfa.desktop.in.h:2
-msgid "XCFA"
+msgid "X Convert File Audio. Programme pour convertir les fichiers audio."
 msgstr ""
 
 #: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:1
-msgid "Chat with people using IRC"
+msgid "XChat-GNOME IRC Chat"
 msgstr ""
 
 #: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:2
-msgid "XChat-GNOME IRC Chat"
+msgid "Chat with people using IRC"
 msgstr ""
 
 #: ../menu-data/xchat:xchat.desktop.in.h:1
-msgid "Chat with other people using Internet Relay Chat"
+msgid "XChat IRC"
 msgstr ""
 
 #: ../menu-data/xchat:xchat.desktop.in.h:2
-msgid "XChat IRC"
+msgid "Chat with other people using Internet Relay Chat"
 msgstr ""
 
 #: ../menu-data/xchm:xchm.desktop.in.h:1
-msgid "Compiled HTML Help (CHM) file viewer"
+msgid "xCHM"
 msgstr ""
 
 #: ../menu-data/xchm:xchm.desktop.in.h:2
-msgid "xCHM"
+msgid "Compiled HTML Help (CHM) file viewer"
 msgstr ""
 
 #: ../menu-data/xdemineur:xdemineur.desktop.in.h:1
@@ -18395,39 +18648,39 @@
 msgstr ""
 
 #: ../menu-data/xdiagnose:xdiagnose.desktop.in.h:1
-msgid "X.org Diagnostic and Repair Utility"
+msgid "xdiagnose"
 msgstr ""
 
 #: ../menu-data/xdiagnose:xdiagnose.desktop.in.h:2
-msgid "xdiagnose"
+msgid "X.org Diagnostic and Repair Utility"
 msgstr ""
 
 #: ../menu-data/xdot:xdot.desktop.in.h:1
-msgid "Interactive viewer for Graphviz dot files"
+msgid "XDot"
 msgstr ""
 
 #: ../menu-data/xdot:xdot.desktop.in.h:2
-msgid "XDot"
+msgid "Interactive viewer for Graphviz dot files"
 msgstr ""
 
 #: ../menu-data/xdx:Xdx.desktop.in.h:1
-msgid "DX-cluster client for amateur radio"
+msgid "Xdx"
 msgstr ""
 
 #: ../menu-data/xdx:Xdx.desktop.in.h:2
-msgid "Xdx"
+msgid "DX-cluster client for amateur radio"
 msgstr ""
 
 #: ../menu-data/xenwatch:xenwatch.desktop.in.h:1
-msgid "watch xen domains"
+msgid "xenwatch"
 msgstr ""
 
 #: ../menu-data/xenwatch:xenwatch.desktop.in.h:2
-msgid "xenwatch"
+msgid "watch xen domains"
 msgstr ""
 
 #: ../menu-data/xfburn:xfburn.desktop.in.h:1
-msgid "Burn Image (xfburn)"
+msgid "Xfburn"
 msgstr ""
 
 #: ../menu-data/xfburn:xfburn.desktop.in.h:2
@@ -18435,7 +18688,7 @@
 msgstr ""
 
 #: ../menu-data/xfburn:xfburn.desktop.in.h:3
-msgid "Xfburn"
+msgid "Burn Image (xfburn)"
 msgstr ""
 
 #: ../menu-data/xfdesktop4:xfce-backdrop-settings.desktop.in.h:1
@@ -18447,19 +18700,19 @@
 msgstr ""
 
 #: ../menu-data/xfe:xfe.desktop.in.h:1
-msgid "A lightweight file manager for X Window"
+msgid "Xfe"
 msgstr ""
 
 #: ../menu-data/xfe:xfe.desktop.in.h:2
-msgid "Xfe"
+msgid "A lightweight file manager for X Window"
 msgstr ""
 
 #: ../menu-data/xfig:xfig.desktop.in.h:1
-msgid "Diagram editor"
+msgid "Xfig"
 msgstr ""
 
 #: ../menu-data/xfig:xfig.desktop.in.h:2
-msgid "Xfig"
+msgid "Diagram editor"
 msgstr ""
 
 #: ../menu-data/xflr5:xflr5.desktop.in.h:1
@@ -18471,35 +18724,35 @@
 msgstr ""
 
 #: ../menu-data/xfmpc:xfmpc.desktop.in.h:1
-msgid "MPD client written in GTK+ for Xfce"
+msgid "Xfmpc"
 msgstr ""
 
 #: ../menu-data/xfmpc:xfmpc.desktop.in.h:2
-msgid "Xfmpc"
+msgid "MPD client written in GTK+ for Xfce"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:1
-msgid "Configure window behavior and shortcuts"
+msgid "Window Manager"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:2
-msgid "Window Manager"
+msgid "Configure window behavior and shortcuts"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:1
-msgid "Fine-tune window behaviour and effects"
+msgid "Window Manager Tweaks"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:2
-msgid "Window Manager Tweaks"
+msgid "Fine-tune window behaviour and effects"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:1
-msgid "Set number and names of workspaces"
+msgid "Workspaces"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:2
-msgid "Workspaces"
+msgid "Set number and names of workspaces"
 msgstr ""
 
 #: ../menu-data/xgalaga:xgalaga.desktop.in.h:1
@@ -18511,18 +18764,18 @@
 msgstr ""
 
 #: ../menu-data/xgnokii:xgnokii.desktop.in.h:1
-msgid "Manage your mobile phone"
+msgid "Xgnokii"
 msgstr ""
 
 #: ../menu-data/xgnokii:xgnokii.desktop.in.h:2
-msgid "Xgnokii"
+msgid "Manage your mobile phone"
 msgstr ""
 
 #: ../menu-data/xhtml2ps:xhtml2ps.desktop.in.h:1
 msgid "xhtml2ps"
 msgstr ""
 
-#: ../menu-data/xine-ui:xine.desktop.in.h:2
+#: ../menu-data/xine-ui:xine.desktop.in.h:1
 msgid "xine"
 msgstr ""
 
@@ -18551,11 +18804,11 @@
 msgstr ""
 
 #: ../menu-data/xiphos:xiphos.desktop.in.h:1
-msgid "Study the Bible"
+msgid "Xiphos Bible Guide"
 msgstr ""
 
 #: ../menu-data/xiphos:xiphos.desktop.in.h:2
-msgid "Xiphos Bible Guide"
+msgid "Study the Bible"
 msgstr ""
 
 #: ../menu-data/xiterm+thai:xiterm+thai.desktop.in.h:1
@@ -18563,27 +18816,27 @@
 msgstr ""
 
 #: ../menu-data/xjadeo:xjadeo.desktop.in.h:1
-msgid "A simple video player that gets sync from jack transport."
+msgid "Xjadeo"
 msgstr ""
 
 #: ../menu-data/xjadeo:xjadeo.desktop.in.h:2
-msgid "Xjadeo"
+msgid "A simple video player that gets sync from jack transport."
 msgstr ""
 
 #: ../menu-data/xjump:xjump.desktop.in.h:1
-msgid "A jumping game"
+msgid "XJump"
 msgstr ""
 
 #: ../menu-data/xjump:xjump.desktop.in.h:2
-msgid "XJump"
+msgid "A jumping game"
 msgstr ""
 
 #: ../menu-data/xlog:xlog.desktop.in.h:1
-msgid "Amateur Radio logging program"
+msgid "Xlog"
 msgstr ""
 
 #: ../menu-data/xlog:xlog.desktop.in.h:2
-msgid "Xlog"
+msgid "Amateur Radio logging program"
 msgstr ""
 
 #: ../menu-data/xmabacus:xmabacus.desktop.in.h:2
@@ -18591,27 +18844,27 @@
 msgstr ""
 
 #: ../menu-data/xmahjongg:xmahjongg.desktop.in.h:1
-msgid "A colorful solitaire Mah Jongg game"
+msgid "xmahjongg"
 msgstr ""
 
 #: ../menu-data/xmahjongg:xmahjongg.desktop.in.h:2
-msgid "xmahjongg"
+msgid "A colorful solitaire Mah Jongg game"
 msgstr ""
 
 #: ../menu-data/xmakemol:xmakemol.desktop.in.h:1
-msgid "View and manipulate atomic and other chemical systems"
+msgid "XMakemol"
 msgstr ""
 
 #: ../menu-data/xmakemol:xmakemol.desktop.in.h:2
-msgid "XMakemol"
+msgid "View and manipulate atomic and other chemical systems"
 msgstr ""
 
 #: ../menu-data/xmaxima:xmaxima.desktop.in.h:1
-msgid "An interface to the Maxima Computer Algebra System"
+msgid "Maxima Algebra System"
 msgstr ""
 
 #: ../menu-data/xmaxima:xmaxima.desktop.in.h:2
-msgid "Maxima Algebra System"
+msgid "An interface to the Maxima Computer Algebra System"
 msgstr ""
 
 #: ../menu-data/xmille:xmille.desktop.in.h:1
@@ -18619,19 +18872,19 @@
 msgstr ""
 
 #: ../menu-data/xmlcopyeditor:xmlcopyeditor.desktop.in.h:1
-msgid "Edit XML documents"
+msgid "XML Copy Editor"
 msgstr ""
 
 #: ../menu-data/xmlcopyeditor:xmlcopyeditor.desktop.in.h:2
-msgid "XML Copy Editor"
+msgid "Edit XML documents"
 msgstr ""
 
 #: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:1
-msgid "XMMS2 tray icon"
+msgid "XMMS2tray"
 msgstr ""
 
 #: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:2
-msgid "XMMS2tray"
+msgid "XMMS2 tray icon"
 msgstr ""
 
 #: ../menu-data/xmonad:xmonad.desktop.in.h:1
@@ -18639,151 +18892,143 @@
 msgstr ""
 
 #: ../menu-data/xmotd:xmotd.desktop.in.h:1
-msgid "A message of the day browser for X"
+msgid "Message of the day"
 msgstr ""
 
 #: ../menu-data/xmotd:xmotd.desktop.in.h:2
-msgid "Message of the day"
+msgid "A message of the day browser for X"
 msgstr ""
 
 #: ../menu-data/xmoto:xmoto.desktop.in.h:1
-msgid "Motocross game"
+msgid "Xmoto"
 msgstr ""
 
 #: ../menu-data/xmoto:xmoto.desktop.in.h:2
-msgid "Xmoto"
+msgid "Motocross game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:1
-#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:1
-msgid "barrel game"
+msgid "xmbarrel"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:2
-msgid "xmbarrel"
+#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:2
+msgid "barrel game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:1
-#: ../menu-data/xpuzzles:xcubes.desktop.in.h:1
-msgid "cubes game"
+msgid "xmcubes"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:2
-msgid "xmcubes"
+#: ../menu-data/xpuzzles:xcubes.desktop.in.h:2
+msgid "cubes game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmdino.desktop.in.h:1
-#: ../menu-data/xpuzzles:xdino.desktop.in.h:1
-msgid "dino game"
+msgid "xmdino"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmdino.desktop.in.h:2
-msgid "xmdino"
+#: ../menu-data/xpuzzles:xdino.desktop.in.h:2
+msgid "dino game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:1
-#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:1
-msgid "hexagons game"
+msgid "xmhexagons"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:2
-msgid "xmhexagons"
+#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:2
+msgid "hexagons game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmmball.desktop.in.h:1
-#: ../menu-data/xpuzzles:xmball.desktop.in.h:1
-msgid "mball game"
+msgid "xmmball"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmmball.desktop.in.h:2
-msgid "xmmball"
+#: ../menu-data/xpuzzles:xmball.desktop.in.h:2
+msgid "mball game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:1
-#: ../menu-data/xpuzzles:xmlink.desktop.in.h:1
-msgid "mlink game"
+msgid "xmmlink"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:2
-msgid "xmmlink"
+#: ../menu-data/xpuzzles:xmlink.desktop.in.h:2
+msgid "mlink game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmoct.desktop.in.h:1
-#: ../menu-data/xpuzzles:xoct.desktop.in.h:1
-msgid "oct game"
+msgid "xmoct"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmoct.desktop.in.h:2
-msgid "xmoct"
+#: ../menu-data/xpuzzles:xoct.desktop.in.h:2
+msgid "oct game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:1
-#: ../menu-data/xpuzzles:xpanex.desktop.in.h:1
-msgid "panex game"
+msgid "xmpanex"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:2
-msgid "xmpanex"
+#: ../menu-data/xpuzzles:xpanex.desktop.in.h:2
+msgid "panex game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:1
-#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:1
-msgid "pyraminx game"
+msgid "xmpyraminx"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:2
-msgid "xmpyraminx"
+#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:2
+msgid "pyraminx game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:1
-#: ../menu-data/xpuzzles:xrubik.desktop.in.h:1
-msgid "rubik game"
+msgid "xmrubik"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:2
-msgid "xmrubik"
+#: ../menu-data/xpuzzles:xrubik.desktop.in.h:2
+msgid "rubik game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:1
-#: ../menu-data/xpuzzles:xskewb.desktop.in.h:1
-msgid "skewb game"
+msgid "xmskewb"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:2
-msgid "xmskewb"
+#: ../menu-data/xpuzzles:xskewb.desktop.in.h:2
+msgid "skewb game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:1
-#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:1
-msgid "triangles game"
+msgid "xmtriangles"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:2
-msgid "xmtriangles"
+#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:2
+msgid "triangles game"
 msgstr ""
 
 #: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:1
-msgid "Configure network card"
-msgstr ""
-
-#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:2
 msgid "xnetcardconfig"
 msgstr ""
 
-#: ../menu-data/xoids:xoids.desktop.in.h:1
-msgid "Pilot a spaceship and destroy asteroids and UFOs"
-msgstr ""
-
-#: ../menu-data/xoids:xoids.desktop.in.h:2
-msgid "Xoids"
+#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:2
+msgid "Configure network card"
 msgstr ""
 
 #: ../menu-data/xoo:xoo.desktop.in.h:1
-msgid "Handheld Device Simulator"
+msgid "Xoo"
 msgstr ""
 
 #: ../menu-data/xoo:xoo.desktop.in.h:2
-msgid "Xoo"
+msgid "Handheld Device Simulator"
 msgstr ""
 
 #: ../menu-data/xoscope:xoscope.desktop.in.h:1
@@ -18795,27 +19040,27 @@
 msgstr ""
 
 #: ../menu-data/xosview:xosview.desktop.in.h:1
-msgid "X based system monitor"
+msgid "Xosview"
 msgstr ""
 
 #: ../menu-data/xosview:xosview.desktop.in.h:2
-msgid "Xosview"
+msgid "X based system monitor"
 msgstr ""
 
 #: ../menu-data/xournal:xournal.desktop.in.h:1
-msgid "Take handwritten notes"
+msgid "Xournal"
 msgstr ""
 
 #: ../menu-data/xournal:xournal.desktop.in.h:2
-msgid "Xournal"
+msgid "Take handwritten notes"
 msgstr ""
 
 #: ../menu-data/xpad:xpad.desktop.in.h:1
-msgid "Jot down notes for later"
+msgid "Xpad"
 msgstr ""
 
 #: ../menu-data/xpad:xpad.desktop.in.h:2
-msgid "Xpad"
+msgid "Jot down notes for later"
 msgstr ""
 
 #: ../menu-data/xpaint:xpaint.desktop.in.h:1
@@ -18827,121 +19072,121 @@
 msgstr ""
 
 #: ../menu-data/xpdf:xpdf.desktop.in.h:1
-msgid "View PDF files"
+msgid "xpdf"
 msgstr ""
 
 #: ../menu-data/xpdf:xpdf.desktop.in.h:2
-msgid "xpdf"
+msgid "View PDF files"
 msgstr ""
 
-#: ../menu-data/xpn:xpn.desktop.in.h:2
+#: ../menu-data/xpn:xpn.desktop.in.h:1
 msgid "Xpn Newsreader"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:2
+#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:1
 msgid "xbarrel"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xcubes.desktop.in.h:2
+#: ../menu-data/xpuzzles:xcubes.desktop.in.h:1
 msgid "xcubes"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xdino.desktop.in.h:2
+#: ../menu-data/xpuzzles:xdino.desktop.in.h:1
 msgid "xdino"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:2
+#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:1
 msgid "xhexagons"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xmball.desktop.in.h:2
+#: ../menu-data/xpuzzles:xmball.desktop.in.h:1
 msgid "xmball"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xmlink.desktop.in.h:2
+#: ../menu-data/xpuzzles:xmlink.desktop.in.h:1
 msgid "xmlink"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xoct.desktop.in.h:2
+#: ../menu-data/xpuzzles:xoct.desktop.in.h:1
 msgid "xoct"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xpanex.desktop.in.h:2
+#: ../menu-data/xpuzzles:xpanex.desktop.in.h:1
 msgid "xpanex"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:2
+#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:1
 msgid "xpyraminx"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xrubik.desktop.in.h:2
+#: ../menu-data/xpuzzles:xrubik.desktop.in.h:1
 msgid "xrubik"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xskewb.desktop.in.h:2
+#: ../menu-data/xpuzzles:xskewb.desktop.in.h:1
 msgid "xskewb"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:2
+#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:1
 msgid "xtriangles"
 msgstr ""
 
 #: ../menu-data/xqf:xqf.desktop.in.h:1
-msgid "Locate and connect to game servers"
+msgid "XQF Game Server Browser"
 msgstr ""
 
 #: ../menu-data/xqf:xqf.desktop.in.h:2
-msgid "XQF Game Server Browser"
+msgid "Locate and connect to game servers"
 msgstr ""
 
 #: ../menu-data/xsane:xsane.desktop.in.h:1
-msgid ""
-"A program to work with scanner. Can be used as a scanning, copier, OCR, fax "
-"tools."
+msgid "XSane Image scanning program"
 msgstr ""
 
 #: ../menu-data/xsane:xsane.desktop.in.h:2
-msgid "XSane Image scanning program"
+msgid ""
+"A program to work with scanner. Can be used as a scanning, copier, OCR, fax "
+"tools."
 msgstr ""
 
 #: ../menu-data/xscavenger:xscavenger.desktop.in.h:1
-msgid "X11 clone of Lode Runner"
+msgid "XScavenger"
 msgstr ""
 
 #: ../menu-data/xscavenger:xscavenger.desktop.in.h:2
-msgid "XScavenger"
+msgid "X11 clone of Lode Runner"
 msgstr ""
 
 #: ../menu-data/xscorch:xscorch.desktop.in.h:1
-msgid "Clone of Scorched Earth"
+msgid "Xscorch"
 msgstr ""
 
 #: ../menu-data/xscorch:xscorch.desktop.in.h:2
-msgid "Xscorch"
+msgid "Clone of Scorched Earth"
 msgstr ""
 
 #: ../menu-data/xsddiagram:xsddiagram.desktop.in.h:1
-msgid "XML Schema Definition (XSD) diagram viewer"
+msgid "XSD Diagram"
 msgstr ""
 
 #: ../menu-data/xsddiagram:xsddiagram.desktop.in.h:2
-msgid "XSD Diagram"
+msgid "XML Schema Definition (XSD) diagram viewer"
 msgstr ""
 
 #: ../menu-data/xsensors:xsensors.desktop.in.h:1
-msgid "View hardware health"
+msgid "XSensors"
 msgstr ""
 
 #: ../menu-data/xsensors:xsensors.desktop.in.h:2
-msgid "XSensors"
+msgid "View hardware health"
 msgstr ""
 
 #: ../menu-data/xshogi:xshogi.desktop.in.h:1
-msgid "Play Shogi Game"
+msgid "Xshogi"
 msgstr ""
 
 #: ../menu-data/xshogi:xshogi.desktop.in.h:2
-msgid "Xshogi"
+msgid "Play Shogi Game"
 msgstr ""
 
 #: ../menu-data/xsol:xsol.desktop.in.h:1
@@ -18961,27 +19206,19 @@
 msgstr ""
 
 #: ../menu-data/xtide:xtide.desktop.in.h:1
-msgid "View tide and current predictions"
+msgid "XTide Tide Predictor"
 msgstr ""
 
 #: ../menu-data/xtide:xtide.desktop.in.h:2
-msgid "XTide Tide Predictor"
+msgid "View tide and current predictions"
 msgstr ""
 
 #: ../menu-data/xvattr:xvattr.desktop.in.h:1
-msgid "XVideo Settings Utility"
-msgstr ""
-
-#: ../menu-data/xvattr:xvattr.desktop.in.h:2
 msgid "gxvattr"
 msgstr ""
 
-#: ../menu-data/xvidcap:xvidcap.desktop.in.h:1
-msgid "X11 Screencam"
-msgstr ""
-
-#: ../menu-data/xvidcap:xvidcap.desktop.in.h:2
-msgid "XVidCap Screen Capture"
+#: ../menu-data/xvattr:xvattr.desktop.in.h:2
+msgid "XVideo Settings Utility"
 msgstr ""
 
 #: ../menu-data/xvile:uxvile.desktop.in.h:1
@@ -18989,36 +19226,36 @@
 msgstr ""
 
 #: ../menu-data/xvile:uxvile.desktop.in.h:2
-#: ../menu-data/xvile:xvile.desktop.in.h:1
+#: ../menu-data/xvile:xvile.desktop.in.h:2
 msgid "VI Like Emacs"
 msgstr ""
 
-#: ../menu-data/xvile:xvile.desktop.in.h:2
+#: ../menu-data/xvile:xvile.desktop.in.h:1
 msgid "XVile"
 msgstr ""
 
 #: ../menu-data/xwelltris:xwelltris.desktop.in.h:1
-msgid "Play a 3D Tetris like game"
+msgid "XWelltris"
 msgstr ""
 
 #: ../menu-data/xwelltris:xwelltris.desktop.in.h:2
-msgid "XWelltris"
+msgid "Play a 3D Tetris like game"
 msgstr ""
 
 #: ../menu-data/xword:xword.desktop.in.h:1
-msgid "Do crossword puzzles"
+msgid "Xword"
 msgstr ""
 
 #: ../menu-data/xword:xword.desktop.in.h:2
-msgid "Xword"
+msgid "Do crossword puzzles"
 msgstr ""
 
 #: ../menu-data/xxxterm:xxxterm.desktop.in.h:1
-msgid "Minimalist's Web Browser"
+msgid "xxxterm Browser"
 msgstr ""
 
 #: ../menu-data/xxxterm:xxxterm.desktop.in.h:2
-msgid "xxxterm Browser"
+msgid "Minimalist's Web Browser"
 msgstr ""
 
 #: ../menu-data/xyscan:xyscan.desktop.in.h:1
@@ -19030,15 +19267,15 @@
 msgstr ""
 
 #: ../menu-data/yabause-gtk:yabause-gtk.desktop.in.h:1
-#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:1
-msgid "Sega Saturn emulator"
+msgid "Yabause (Gtk port)"
 msgstr ""
 
 #: ../menu-data/yabause-gtk:yabause-gtk.desktop.in.h:2
-msgid "Yabause (Gtk port)"
+#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:2
+msgid "Sega Saturn emulator"
 msgstr ""
 
-#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:2
+#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:1
 msgid "Yabause (Qt port)"
 msgstr ""
 
@@ -19047,19 +19284,19 @@
 msgstr ""
 
 #: ../menu-data/yahtzeesharp:YahtzeeSharp.desktop.in.h:1
-msgid "An open source Yahtzee like game written in C#"
+msgid "YahtzeeSharp"
 msgstr ""
 
 #: ../menu-data/yahtzeesharp:YahtzeeSharp.desktop.in.h:2
-msgid "YahtzeeSharp"
+msgid "An open source Yahtzee like game written in C#"
 msgstr ""
 
 #: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:1
-msgid "A drop-down terminal emulator based on KDE Konsole technology."
+msgid "Yakuake"
 msgstr ""
 
 #: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:2
-msgid "Yakuake"
+msgid "A drop-down terminal emulator based on KDE Konsole technology."
 msgstr ""
 
 #: ../menu-data/yapet:yapet.desktop.in.h:1
@@ -19071,43 +19308,43 @@
 msgstr ""
 
 #: ../menu-data/yarssr:yarssr.desktop.in.h:1
-msgid "RSS reader for the notification area"
+msgid "Yarssr"
 msgstr ""
 
 #: ../menu-data/yarssr:yarssr.desktop.in.h:2
-msgid "Yarssr"
+msgid "RSS reader for the notification area"
 msgstr ""
 
 #: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:1
-msgid "Place phone calls over the Internet"
+msgid "Yate VoIP Client"
 msgstr ""
 
 #: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:2
-msgid "Yate VoIP Client"
+msgid "Place phone calls over the Internet"
 msgstr ""
 
 #: ../menu-data/yelp:yelp.desktop.in.h:1
-msgid "Get help with Unity"
+msgid "Help"
 msgstr ""
 
 #: ../menu-data/yelp:yelp.desktop.in.h:2
-msgid "Help"
+msgid "Get help with Unity"
 msgstr ""
 
 #: ../menu-data/ygraph:ygraph.desktop.in.h:1
-msgid "Produce simple xy-plots of scientific data"
+msgid "ygraph Scientific Data Plotter"
 msgstr ""
 
 #: ../menu-data/ygraph:ygraph.desktop.in.h:2
-msgid "ygraph Scientific Data Plotter"
+msgid "Produce simple xy-plots of scientific data"
 msgstr ""
 
 #: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:1
-msgid "A 3D platform game"
+msgid "Yo Frankie!"
 msgstr ""
 
 #: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:2
-msgid "Yo Frankie!"
+msgid "A 3D platform game"
 msgstr ""
 
 #: ../menu-data/yorick-cubeview:cubeview.desktop.in.h:1
@@ -19127,11 +19364,11 @@
 msgstr ""
 
 #: ../menu-data/yoshimi:yoshimi.desktop.in.h:1
-msgid "Software Synthesizer based on ZynAddSubFX"
+msgid "Yoshimi"
 msgstr ""
 
 #: ../menu-data/yoshimi:yoshimi.desktop.in.h:2
-msgid "Yoshimi"
+msgid "Software Synthesizer based on ZynAddSubFX"
 msgstr ""
 
 #: ../menu-data/youtranslate:youtranslate.desktop.in.h:1
@@ -19143,43 +19380,43 @@
 msgstr ""
 
 #: ../menu-data/z88:z88.desktop.in.h:1
-msgid " Finite Element Analysis Program"
+msgid "Z88"
 msgstr ""
 
 #: ../menu-data/z88:z88.desktop.in.h:2
-msgid "Z88"
+msgid " Finite Element Analysis Program"
 msgstr ""
 
 #: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:1
-msgid "TODO Management Application"
+msgid "Zanshin"
 msgstr ""
 
 #: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:2
-msgid "Zanshin"
+msgid "TODO Management Application"
 msgstr ""
 
 #: ../menu-data/zapping:zapping.desktop.in.h:1
-msgid "Lets you watch TV in a window"
+msgid "Zapping TV Viewer"
 msgstr ""
 
 #: ../menu-data/zapping:zapping.desktop.in.h:2
-msgid "Zapping TV Viewer"
+msgid "Lets you watch TV in a window"
 msgstr ""
 
 #: ../menu-data/zatacka:zatacka.desktop.in.h:1
-msgid "Arcade multiplayer game for 2-6 players"
+msgid "Zatacka"
 msgstr ""
 
 #: ../menu-data/zatacka:zatacka.desktop.in.h:2
-msgid "Zatacka"
+msgid "Arcade multiplayer game for 2-6 players"
 msgstr ""
 
 #: ../menu-data/zathura:zathura.desktop.in.h:1
-msgid "A minimalistic PDF viewer"
+msgid "Zathura"
 msgstr ""
 
 #: ../menu-data/zathura:zathura.desktop.in.h:2
-msgid "Zathura"
+msgid "A minimalistic PDF viewer"
 msgstr ""
 
 #: ../menu-data/zaz:zaz.desktop.in.h:1
@@ -19191,43 +19428,51 @@
 msgstr ""
 
 #: ../menu-data/zekr:zekr.desktop.in.h:1
-msgid "Study The Quran"
+msgid "Zekr "
 msgstr ""
 
 #: ../menu-data/zekr:zekr.desktop.in.h:2
-msgid "Zekr "
+msgid "Study The Quran"
 msgstr ""
 
 #: ../menu-data/zenmap:zenmap.desktop.in.h:1
-msgid "A cross-platform GUI for the Nmap Security Scanner."
+msgid "Zenmap"
 msgstr ""
 
 #: ../menu-data/zenmap:zenmap.desktop.in.h:2
-msgid "Zenmap"
+msgid "A cross-platform GUI for the Nmap Security Scanner."
 msgstr ""
 
 #: ../menu-data/zhone:zhone.desktop.in.h:1
-msgid "Feature Phone UI"
+msgid "Zhone"
 msgstr ""
 
 #: ../menu-data/zhone:zhone.desktop.in.h:2
-msgid "Zhone"
+msgid "Feature Phone UI"
 msgstr ""
 
 #: ../menu-data/zim:zim.desktop.in.h:1
-msgid "Edit text files \"wiki style\""
+msgid "Zim Desktop Wiki"
 msgstr ""
 
 #: ../menu-data/zim:zim.desktop.in.h:2
-msgid "Zim Desktop Wiki"
+msgid "Edit text files \"wiki style\""
+msgstr ""
+
+#: ../menu-data/zim:zim.desktop.in.h:3
+msgid "Quick Note"
+msgstr ""
+
+#: ../menu-data/zim:zim.desktop.in.h:4
+msgid "Quick Note from Clipboard"
 msgstr ""
 
 #: ../menu-data/zipper.app:Zipper.desktop.in.h:1
-msgid "GUI for various compressed file formats"
+msgid "Zipper"
 msgstr ""
 
 #: ../menu-data/zipper.app:Zipper.desktop.in.h:2
-msgid "Zipper"
+msgid "GUI for various compressed file formats"
 msgstr ""
 
 #: ../menu-data/zita-at1:zita-at1.desktop.in.h:1
@@ -19247,19 +19492,19 @@
 msgstr ""
 
 #: ../menu-data/zsnes:zsnes.desktop.in.h:1
-msgid "Play Super Nintendo (SNES) games"
+msgid "ZSNES Emulator"
 msgstr ""
 
 #: ../menu-data/zsnes:zsnes.desktop.in.h:2
-msgid "ZSNES Emulator"
+msgid "Play Super Nintendo (SNES) games"
 msgstr ""
 
 #: ../menu-data/zygrib:zygrib.desktop.in.h:1
-msgid "Multi-protocol Messaging Client"
+msgid "zyGrib GRIB file viewer"
 msgstr ""
 
 #: ../menu-data/zygrib:zygrib.desktop.in.h:2
-msgid "zyGrib GRIB file viewer"
+msgid "Multi-protocol Messaging Client"
 msgstr ""
 
 #: ../menu-data/zynaddsubfx:zynaddsubfx.desktop.in.h:1
@@ -19267,17 +19512,17 @@
 msgstr ""
 
 #: ../menu-data/zynjacku:lv2rack.desktop.in.h:1
-msgid "LV2 plugins host for JACK"
+msgid "Lv2rack"
 msgstr ""
 
 #: ../menu-data/zynjacku:lv2rack.desktop.in.h:2
-msgid "Lv2rack"
+msgid "LV2 plugins host for JACK"
 msgstr ""
 
 #: ../menu-data/zynjacku:zynjacku.desktop.in.h:1
-msgid "LV2 synths host for JACK"
+msgid "Zynjacku"
 msgstr ""
 
 #: ../menu-data/zynjacku:zynjacku.desktop.in.h:2
-msgid "Zynjacku"
+msgid "LV2 synths host for JACK"
 msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/apt.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/apt.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/apt.po	2012-01-02 18:13:59.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/apt.po	2012-02-23 07:17:15.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-29 19:46+0000\n"
-"PO-Revision-Date: 2011-12-06 07:13+0000\n"
+"POT-Creation-Date: 2012-02-14 10:00+0000\n"
+"PO-Revision-Date: 2012-02-14 12:51+0000\n"
 "Last-Translator: Dafydd Harries <Unknown>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
 "MIME-Version: 1.0\n"
@@ -15,154 +15,154 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:25+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: cy\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Ar Goll: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Canfuwyd dim pecyn"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448
+#: cmdline/apt-cache.cc:1452
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni ellir lleoli'r pecyn %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(heb ganfod)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Wedi Sefydlu: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Ymgeisydd: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(dim)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3230 cmdline/apt-internal-solver.cc:30
-#: cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3264 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -199,28 +199,28 @@
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Nid yw ymresymiadau mewn parau"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -236,12 +236,12 @@
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "Nid yw %s yn becyn DEB dilys."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -255,40 +255,40 @@
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267
+#: cmdline/apt-extracttemplates.cc:269
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ni ellir ysgrifennu i %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
+#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
+#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
 #, c-format
 msgid "Error processing directory %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -330,136 +330,136 @@
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Dim dewisiadau'n cyfateb"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn  `%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Ni ellir agor y ffeil DB2 %s: %s"
 
-#: ftparchive/cachedb.cc:123
+#: ftparchive/cachedb.cc:126
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Methodd stat() o %s"
 
-#: ftparchive/cachedb.cc:245
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Does dim cofnod rheoli gan yr archif"
 
-#: ftparchive/cachedb.cc:482
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Ni ellir cael cyrchydd"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "Rh: Ni ellir gwneud stat() o %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "G: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "Rh: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Methwyd datrys %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Methwyd cerdded y goeden"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Methwyd agor %s"
 
 # FIXME
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DatGysylltu %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Methwyd darllen y cyswllt %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Methwyd datgysylltu %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Methwyd cysylltu %s at %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Tarwyd y terfyn cyswllt %sB.\n"
 
-#: ftparchive/writer.cc:399
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Doedd dim maes pecyn gan yr archif"
 
-#: ftparchive/writer.cc:407 ftparchive/writer.cc:709
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: ftparchive/writer.cc:475 ftparchive/writer.cc:825
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Cynaliwr %s yw %s nid %s\n"
 
-#: ftparchive/writer.cc:719
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:723
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Methwyd neilltuo cof"
 
@@ -470,81 +470,69 @@
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
 #, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+msgid "Malformed override %s line %llu #1"
+msgstr ""
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
 #, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+msgid "Malformed override %s line %llu #2"
+msgstr ""
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
 #, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+msgid "Malformed override %s line %llu #3"
+msgstr ""
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
 msgid "Failed to read the override file %s"
 msgstr "Methwydd darllen y ffeil dargyfeirio %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
 
-#: ftparchive/multicompress.cc:165
+#: ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Methwyd creu pibell cyfathrebu at isbroses"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Methwyd creu FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Methodd fork()"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr ""
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Methwyd creu isbroses IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Methwyd gweithredu cywasgydd "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "datgywasgydd"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Methodd MA i isbroses/ffeil"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Methwyd darllen wrth gyfrifo MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Gwall wrth datgysylltu %s"
 
-#: ftparchive/multicompress.cc:485
+#: ftparchive/multicompress.cc:373
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Methwyd ailenwi %s at %s"
@@ -656,34 +644,34 @@
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
 
-#: cmdline/apt-get.cc:633
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:639
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Sefydliwyd]"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr ""
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Dylech ddewis un yn benodol i'w sefydlu."
 
-#: cmdline/apt-get.cc:681
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -691,178 +679,178 @@
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:699
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:722
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
 
-#: cmdline/apt-get.cc:787
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
 
-#: cmdline/apt-get.cc:804
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2093 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Yn cywiro dibyniaethau..."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " wedi methu."
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Ni ellir cywiro dibyniaethau"
 
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Ni ellir bychanu y set uwchraddio"
 
-#: cmdline/apt-get.cc:985
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Wedi Gorffen"
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain."
 
-#: cmdline/apt-get.cc:992
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
 
-#: cmdline/apt-get.cc:1017
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
 
-#: cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1145
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1150
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Mae angen cyrchu %sB o archifau.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1157
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1162
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2506
-#: cmdline/apt-get.cc:2509
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1190
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Does dim digon o le rhydd gennych yn %s."
 
-#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
 
-#: cmdline/apt-get.cc:1208
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 
-#: cmdline/apt-get.cc:1210
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -870,28 +858,28 @@
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Erthylu."
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
 
-#: cmdline/apt-get.cc:1321
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
-#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2583
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
-#: cmdline/apt-get.cc:1328
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -899,19 +887,19 @@
 "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
 "geidio defnyddio --fix-missing?"
 
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
 
-#: cmdline/apt-get.cc:1337
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1366
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -921,35 +909,35 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1370
+#: cmdline/apt-get.cc:1381
 msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1508
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1578
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 
-#: cmdline/apt-get.cc:1656
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1751
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -965,15 +953,15 @@
 #. "that package should be filed.") << endl;
 #. }
 #. 
-#: cmdline/apt-get.cc:1754 cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 
-#: cmdline/apt-get.cc:1758
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1765
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -982,7 +970,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1769
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -990,20 +978,20 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1790
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1889
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:"
 
 # FIXME
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1012,7 +1000,7 @@
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas
-#: cmdline/apt-get.cc:1908
+#: cmdline/apt-get.cc:1929
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1024,80 +1012,80 @@
 "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
 "heb gael eu symud allan o Incoming."
 
-#: cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: cmdline/apt-get.cc:2045
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:2095 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2119
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2143
 msgid "Failed"
 msgstr "Methwyd"
 
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Wedi Gorffen"
 
-#: cmdline/apt-get.cc:2194 cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2226 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2368
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
 
-#: cmdline/apt-get.cc:2408 cmdline/apt-get.cc:2720
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
 
-#: cmdline/apt-get.cc:2425
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2430
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1105,93 +1093,93 @@
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2483
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2520
+#: cmdline/apt-get.cc:2548
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2529
+#: cmdline/apt-get.cc:2557
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
-#: cmdline/apt-get.cc:2609
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
-#: cmdline/apt-get.cc:2622
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2644
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
-#: cmdline/apt-get.cc:2664
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
-#: cmdline/apt-get.cc:2683
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
 
-#: cmdline/apt-get.cc:2708
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) "
 "APT::Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2725
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
 
-#: cmdline/apt-get.cc:2745
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
-#: cmdline/apt-get.cc:2875
+#: cmdline/apt-get.cc:2909
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:2896
+#: cmdline/apt-get.cc:2930
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1200,7 +1188,7 @@
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:2919
+#: cmdline/apt-get.cc:2953
 #, c-format
 msgid ""
 "Failed to satisfy %s dependency for %s: Installed package %s is too new"
@@ -1208,44 +1196,44 @@
 "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
 "newydd"
 
-#: cmdline/apt-get.cc:2958
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2964
+#: cmdline/apt-get.cc:2998
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:2987
+#: cmdline/apt-get.cc:3021
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 
-#: cmdline/apt-get.cc:3003
+#: cmdline/apt-get.cc:3037
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 
-#: cmdline/apt-get.cc:3008
+#: cmdline/apt-get.cc:3042
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
-#: cmdline/apt-get.cc:3101 cmdline/apt-get.cc:3113
+#: cmdline/apt-get.cc:3135 cmdline/apt-get.cc:3147
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:3235
+#: cmdline/apt-get.cc:3269
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:3276
+#: cmdline/apt-get.cc:3310
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1291,7 +1279,7 @@
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3441
+#: cmdline/apt-get.cc:3475
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1299,33 +1287,33 @@
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Presennol "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Cyrchu:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Anwybyddu "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Gwall "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Gweithio]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1333,7 +1321,7 @@
 "in the drive '%s' and press enter\n"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:34
+#: cmdline/apt-internal-solver.cc:36
 msgid ""
 "Usage: apt-internal-resolver\n"
 "\n"
@@ -1349,46 +1337,46 @@
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-mark.cc:49
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, c-format
 msgid "%s set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1410,11 +1398,11 @@
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Cofnod pecyn anhysbys!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/apturl.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/apturl.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/apturl.po	2012-01-02 18:14:17.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/apturl.po	2012-02-23 07:17:28.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: apturl\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-10-14 08:13+0000\n"
-"PO-Revision-Date: 2010-12-18 01:32+0000\n"
+"PO-Revision-Date: 2012-02-03 01:24+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:55+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../apturl-gtk:50 ../apturl-kde:53
 msgid "User requested interrupt."
@@ -32,7 +32,7 @@
 #: ../AptUrl/Parser.py:99
 #, python-format
 msgid "Exception '%s'"
-msgstr ""
+msgstr "Eithriad '%s'"
 
 #: ../AptUrl/Parser.py:109
 #, python-format
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/checkbox.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/checkbox.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/checkbox.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/checkbox.po	2012-02-23 07:17:29.000000000 +0000
@@ -0,0 +1,3147 @@
+# Welsh translation for checkbox
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the checkbox package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: checkbox\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-16 16:07+0000\n"
+"PO-Revision-Date: 2010-12-23 08:31+0000\n"
+"Last-Translator: David Jones <Unknown>\n"
+"Language-Team: Welsh <cy@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#. Title of the user interface
+#: ../gtk/checkbox-gtk.ui.h:1 ../gtk/checkbox-gtk.desktop.in.h:1
+#: ../plugins/user_interface.py:42
+msgid "System Testing"
+msgstr ""
+
+#: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:538
+msgid "_Test"
+msgstr "Prawf"
+
+#: ../gtk/checkbox-gtk.ui.h:3
+msgid "_Yes"
+msgstr ""
+
+#: ../gtk/checkbox-gtk.ui.h:4
+msgid "_No"
+msgstr ""
+
+#: ../gtk/checkbox-gtk.ui.h:5
+msgid "_Skip this test"
+msgstr ""
+
+#: ../gtk/checkbox-gtk.ui.h:6 ../checkbox_cli/cli_interface.py:348
+#: ../checkbox_urwid/urwid_interface.py:261
+msgid "Further information:"
+msgstr ""
+
+#: ../gtk/checkbox-gtk.ui.h:7
+msgid "_Select All"
+msgstr "Dewis Popeth"
+
+#: ../gtk/checkbox-gtk.ui.h:8
+msgid "_Deselect All"
+msgstr ""
+
+#: ../gtk/checkbox-gtk.ui.h:9
+msgid "_Previous"
+msgstr ""
+
+#: ../gtk/checkbox-gtk.ui.h:10
+msgid "Ne_xt"
+msgstr "Nesa"
+
+#: ../gtk/checkbox-gtk.desktop.in.h:2
+msgid "Test your system and submit results to the Ubuntu Friendly project"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:7
+msgid "Test to detect audio devices"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check that internal speakers work correctly\n"
+"STEPS:\n"
+"    1. Make sure that no external speakers or headphones are connected\n"
+"       If testing a desktop, external speakers are allowed\n"
+"    2. Click the Test button to play a brief tone on your audio device\n"
+"VERIFICATION:\n"
+"    Did you hear a tone?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check that headphones connector works correctly\n"
+"STEPS:\n"
+"    1. Connect a pair of headphones to your audio device\n"
+"    2. Click the Test button to play a sound to your audio device\n"
+"VERIFICATION:\n"
+"    Did you hear a sound through the headphones and did the sound play "
+"without any distortion, clicks or other strange noises from your headphones?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:49
+msgid ""
+"PURPOSE:\n"
+"    This test will check that recording sound using the onboard microphone "
+"works correctly\n"
+"STEPS:\n"
+"    1. Disconnect any external microphones that you have plugged in\n"
+"    2. Click \"Test\", then speak into your internal microphone\n"
+"    3. After a few seconds, your speech will be played back to you.\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:66
+msgid ""
+"PURPOSE:\n"
+"    This test will check that recording sound using an external microphone "
+"works correctly\n"
+"STEPS:\n"
+"    1. Connect a microphone to your microphone port\n"
+"    2. Click \"Test\", then speak into the external microphone\n"
+"    3. After a few seconds, your speech will be played back to you\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:82
+msgid ""
+"PURPOSE:\n"
+"    This test will check that a USB audio device works correctly\n"
+"STEPS:\n"
+"    1. Connect a USB audio device to your system\n"
+"    2. Click \"Test\", then speak into the microphone\n"
+"    3. After a few seconds, your speech will be played back to you\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back through the USB headphones?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:99
+msgid ""
+"Play back a sound on the default output and listen for it on the  default "
+"input.  This makes the most sense when the output and input  are directly "
+"connected, as with a patch cable."
+msgstr ""
+
+#. description
+#: ../jobs/autotest.txt.in:6
+msgid ""
+"PURPOSE:\n"
+"   This test will attempt to install and run the Autotest Suite.  These "
+"tests can be destructive, so this test is blacklisted by default."
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:8
+msgid ""
+"Automated test to store bluetooth device information in checkbox report"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:14
+msgid ""
+"PURPOSE:\n"
+"    This test will check that bluetooth connection works correctly\n"
+"STEPS:\n"
+"    1. Enable bluetooth on any mobile device (PDA, smartphone, etc.)\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. In the device write the PIN code automatically chosen by the wizard\n"
+"    6. The device should pair with the computer\n"
+"    7. Right-click on the bluetooth icon and select browse files\n"
+"    8. Authorize the computer to browse the files in the device if needed\n"
+"    9. You should be able to browse the files\n"
+"VERIFICATION:\n"
+"    Did all the steps work?"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can transfer information through a "
+"bluetooth connection\n"
+"STEPS:\n"
+"    1. Make sure that you're able to browse the files in your mobile device\n"
+"    2. Copy a file from the computer to the mobile device\n"
+"    3. Copy a file from the mobile device to the computer\n"
+"VERIFICATION:\n"
+"    Were all files copied correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:47
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can record and hear audio using a "
+"bluetooth audio device\n"
+"STEPS:\n"
+"    1. Enable the bluetooth headset\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. In the device write the PIN code automatically chosen by the wizard\n"
+"    6. The device should pair with the computer\n"
+"    7. Click \"Test\" to record for five seconds and reproduce in the "
+"bluetooth device\n"
+"VERIFICATION:\n"
+"    Did you hear the sound you recorded in the bluetooth"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:65
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can use a bluetooth keyboard\n"
+"STEPS:\n"
+"    1. Enable the bluetooth keyboard\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. Click \"Test\"\n"
+"    6. Enter some text\n"
+"VERIFICATION:\n"
+"    Were you able to enter some text with the bluetooth keyboard?"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:81
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can use a bluetooth mouse\n"
+"STEPS:\n"
+"    1. Enable the bluetooth mouse\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. Move the mouse around the screen\n"
+"    6. Perform some single/double/right click operations\n"
+"VERIFICATION:\n"
+"    Did the mouse work as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/camera.txt.in:7
+msgid "This Automated test attempts to detect a camera."
+msgstr ""
+
+#. description
+#: ../jobs/camera.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the built-in camera works\n"
+"STEPS:\n"
+"    1. Click on Test to display a video capture from the camera for ten "
+"seconds.\n"
+"VERIFICATION:\n"
+"    Did you see the video capture?"
+msgstr ""
+
+#. description
+#: ../jobs/camera.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the built-in camera works\n"
+"STEPS:\n"
+"    1. Click on Test to display a still image from the camera\n"
+"VERIFICATION:\n"
+"    Did you see the image?"
+msgstr ""
+
+#. description
+#: ../jobs/codecs.txt.in:7
+msgid ""
+"PURPOSE:\n"
+"   This test will verify your system's ability to play Ogg Vorbis audio "
+"files.\n"
+"STEPS:\n"
+"   1. Click Test to play an Ogg Vorbis file (.ogg)\n"
+"   2. Please close the player to proceed.\n"
+"VERIFICATION:\n"
+"   Did the sample play correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/codecs.txt.in:22
+msgid ""
+"PURPOSE:\n"
+"   This test will verify your system's ability to play Wave Audio files.\n"
+"STEPS:\n"
+"   1. Select Test to play a Wave Audio format file (.wav)\n"
+"   2. Please close the player to proceed.\n"
+"VERIFICATION:\n"
+"   Did the sample play correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:8
+msgid ""
+"Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq)."
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:15
+msgid "Test for clock jitter."
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:23
+msgid "Test offlining CPUs in a multicore system."
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:30
+msgid "This test checks cpu topology for accuracy"
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:38
+msgid "This test checks that CPU frequency governors are obeyed when set."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:5
+msgid "Test if the atd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:11
+msgid "Test if the cron daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:17
+msgid "Test if the cupsd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:23
+msgid "Test if the getty daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:29
+msgid "Test if the init daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:35
+msgid "Test if the klogd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:41
+msgid "Test if the nmbd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:47
+msgid "Test if the smbd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:53
+msgid "Test if the syslogd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:61
+msgid "Test if the udevd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:67
+msgid "Test if the winbindd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:4
+msgid "Detects and displays disks attached to the system."
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:9
+msgid "Benchmark for each disk"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:23
+msgid "Check stats changes for each disk"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:40
+msgid "SMART test"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:56
+msgid "Maximum disk space used during a default installation test"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:71
+msgid "Verify system storage performs at or above baseline performance"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:88
+msgid ""
+"Verify that storage devices, such as Fibre Channel and RAID can be detected "
+"and perform under stress."
+msgstr ""
+
+#. description
+#: ../jobs/fingerprint.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a fingerprint reader will work properly for "
+"logging into your system.\n"
+"PREREQUISITES:\n"
+"   This test case assumes that there's a testing account from which test "
+"cases are run and a personal account that the tester uses to verify the "
+"fingerprint reader\n"
+"STEPS:\n"
+"   1. Click on the user switcher applet.\n"
+"   2. Select your user name.\n"
+"   3. A window should appear that provides the ability to login either "
+"typing your password or using fingerprint authentication.\n"
+"   4. Use the fingerprint reader to login.\n"
+"   5. Click on the user switcher applet.\n"
+"   6. Select the testing account to continue running tests.\n"
+"VERIFICATION:\n"
+"   Did the authentication procedure work correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/fingerprint.txt.in:20
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a fingerprint reader can be used to unlock a "
+"locked system.\n"
+"STEPS:\n"
+"   1. Click on the user switcher applet.\n"
+"   2. Select 'Lock screen'.\n"
+"   3. Press any key or move the mouse.\n"
+"   4. A window should appear that provides the ability to unlock either "
+"typing your password or using fingerprint authentication.\n"
+"   5. Use the fingerprint reader to unlock.\n"
+"   6. Your screen should be unlocked.\n"
+"VERIFICATION:\n"
+"   Did the authentication procedure work correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/firewire.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will check the system can detect the insertion of a FireWire "
+"HDD\n"
+"STEPS:\n"
+"    1. Click 'Test' to begin the test. This test will\n"
+"       timeout and fail if the insertion has not been detected within 10 "
+"seconds.\n"
+"    2. Plug a FireWire HDD into an available FireWire port.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the "
+"automatically\n"
+"    selected result"
+msgstr ""
+
+#. description
+#: ../jobs/firewire.txt.in:19
+msgid ""
+"This is an automated test which performs read/write operations on an "
+"attached FireWire HDD"
+msgstr ""
+
+#. description
+#: ../jobs/firewire.txt.in:27
+msgid ""
+" PURPOSE:\n"
+"   This test will check the system can detect the removal of a FireWire HDD\n"
+" STEPS:\n"
+"   1. Click 'Test' to begin the test. This test will timeout and fail if\n"
+"      the removal has not been detected within 10 seconds.\n"
+"   2. Remove the previously attached FireWire HDD from the FireWire port.\n"
+" VERIFICATION:\n"
+"   The verification of this test is automated. Do not change the "
+"automatically\n"
+"   selected result"
+msgstr ""
+
+#. description
+#: ../jobs/floppy.txt.in:4
+msgid "Floppy test"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:5
+msgid "Test to output the Xorg version"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:12
+msgid "Run gtkperf to make sure that GTK based test cases work"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:18
+msgid ""
+"PURPOSE:\n"
+"    This test will verify that the GUI is usable after manually changing "
+"resolution\n"
+"STEPS:\n"
+"    1. Open the Displays application\n"
+"    2. Select a new resolution from the dropdown list\n"
+"    3. Click on Apply\n"
+"    4. Select the original resolution from the dropdown list\n"
+"    5. Click on Apply\n"
+"VERIFICATION:\n"
+"    Did the resolution change as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will test display rotation\n"
+"STEPS:\n"
+"    1. Open the Displays application\n"
+"    2. Select a new rotation value from the dropdown list\n"
+"    3. Click on Apply\n"
+"    4. Click on Restore Previous Configuration\n"
+"    5. Click on Apply\n"
+"    6. Repeat 2-5 for different rotation values\n"
+"VERIFICATION:\n"
+"    Did the display rotation change as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:50
+msgid "Test that the X process is running."
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:56
+msgid "Test that the X is not running in failsafe mode."
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:63
+msgid ""
+"Test that X does not leak memory when running programs on systems with intel "
+"based graphics."
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:70
+msgid ""
+"PURPOSE:\n"
+"    This test will verify the default display resolution\n"
+"STEPS:\n"
+"    1. This display is using the following resolution:\n"
+"INFO:\n"
+"    $output\n"
+"VERIFICATION:\n"
+"    Is this acceptable for your display?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:85
+msgid ""
+"Ensure the current resolution meets or exceeds the recommended minimum "
+"resolution (800x600). See here for details:"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:85
+msgid "https://help.ubuntu.com/community/Installation/SystemRequirements"
+msgstr "https://help.ubuntu.com/community/Installation/SystemRequirements"
+
+#. description
+#: ../jobs/graphics.txt.in:95
+msgid ""
+"PURPOSE:\n"
+"    This test will test the default display\n"
+"STEPS:\n"
+"    1. Click \"Test\" to display a video test.\n"
+"VERIFICATION:\n"
+"    Do you see color bars and static?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:106
+msgid "Check that VESA drivers are not in use"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:113
+msgid ""
+"PURPOSE:\n"
+"    This test cycles through the detected video modes\n"
+"STEPS:\n"
+"    1. Click \"Test\" to start cycling through the video modes\n"
+"VERIFICATION:\n"
+"    Did the screen appear to be working for each mode?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:126
+msgid "Check that hardware is able to run compiz"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:133
+msgid "Check that hardware is able to run Unity 3D"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:139
+msgid ""
+"PURPOSE:\n"
+"    This test tests the basic 3D capabilities of your video card\n"
+"STEPS:\n"
+"    1. Click \"Test\" to execute an OpenGL demo. Press ESC at any time to "
+"close.\n"
+"    2. Verify that the animation is not jerky or slow.\n"
+"VERIFICATION:\n"
+"    1. Did the 3d animation appear?\n"
+"    2. Was the animation free from slowness/jerkiness?"
+msgstr ""
+
+#. description
+#: ../jobs/hibernate.txt.in:7
+msgid ""
+"PURPOSE:\n"
+"    This test will check to make sure your system can successfully hibernate "
+"(if supported)\n"
+"STEPS:\n"
+"    1. Click on Test\n"
+"    2. The system will hibernate and should wake itself within 5 minutes\n"
+"    3. If your system does not wake itself after 5 minutes, please press the "
+"power button to wake the system manually\n"
+"    4. If the system fails to resume from hibernate, please restart System "
+"Testing and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did the system successfully hibernate and did it work properly after "
+"waking up?"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:5
+msgid "Attaches a report of installed codecs for Intel HDA"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:10
+msgid "Attaches a report of CPU information"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:15
+msgid "Attaches a copy of /var/log/dmesg to the test results"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:20
+msgid "Attaches info on DMI"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:26
+msgid "Attaches dmidecode output"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:31
+msgid "Attaches very verbose lspci output."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:40
+msgid "Attaches the contents of the various modprobe conf files."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:45
+msgid "Attaches the contents of the /etc/modules file."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:50
+msgid "attaches the contents of various sysctl config files."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:54
+msgid "Attaches a report of sysfs attributes."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:65
+msgid ""
+"Attaches a dump of the udev database showing system hardware information."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:72
+msgid "Attaches a tarball of gcov data if present."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:77
+msgid "Attaches a list of the currently running kernel modules."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:85
+msgid "Captures a screenshot."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:91
+msgid "Attaches the screenshot captured in info/screenshot."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:96
+msgid "Gather log from the Firmware Test Suite run."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:103
+msgid "Attaches the contents of /proc/acpi/sleep if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:107
+msgid "Bootchart information."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:116
+msgid "SATA/IDE device information."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:133
+msgid "Attaches the bootchart png file for bootchart runs"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:142
+msgid "Attaches the bootchart log for bootchart test runs."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:150
+msgid "installs the installer bootchart tarball if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:155
+msgid "Attaches the installer debug log if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/input.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will test your pointing device\n"
+"STEPS:\n"
+"    1. Move the cursor using the pointing device or touch the screen.\n"
+"    2. Perform some single/double/right click operations.\n"
+"VERIFICATION:\n"
+"    Did the pointing device work as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/input.txt.in:17
+msgid ""
+"PURPOSE:\n"
+"    This test will test your keyboard\n"
+"STEPS:\n"
+"    1. Click on Test\n"
+"    2. On the open text area, use your keyboard to type something\n"
+"VERIFICATION:\n"
+"    Is your keyboard working properly?"
+msgstr ""
+
+#. description
+#: ../jobs/install.txt.in:6
+msgid ""
+"Tests to see that apt can access repositories and get updates (does not "
+"install updates). This is done to confirm that you could recover from an "
+"incomplete or broken update."
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will test the brightness key\n"
+"STEPS:\n"
+"    1. Press the brightness buttons on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the brightness change following to your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:14
+msgid ""
+"PURPOSE:\n"
+"    This test will test the volume keys\n"
+"STEPS:\n"
+"    1. Press the volume buttons on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the volume change following to your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:25
+msgid ""
+"PURPOSE:\n"
+"    This test will test the mute key\n"
+"STEPS:\n"
+"    1. Press the mute button on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the volume mute following your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:37
+msgid ""
+"PURPOSE:\n"
+"    This test will test the sleep key\n"
+"STEPS:\n"
+"    1. Press the sleep key on the keyboard\n"
+"    2. Wake your system up by pressing the power button\n"
+"VERIFICATION:\n"
+"    Did the system go to sleep after pressing the sleep key?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:49
+msgid ""
+"PURPOSE:\n"
+"    This test will test the battery information key\n"
+"STEPS:\n"
+"    1. Press the battery information key on the keyboard\n"
+"VERIFICATION:\n"
+"    Did a notification appear showing the battery status?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:60
+msgid ""
+"PURPOSE:\n"
+"    This test will test the wireless key\n"
+"STEPS:\n"
+"    1. Press the wireless key on the keyboard\n"
+"    2. Press the same key again\n"
+"VERIFICATION:\n"
+"    Did the wireless go off on the first press and on again on the second?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:74
+msgid ""
+"PURPOSE:\n"
+"    This test will test the media keys of your keyboard\n"
+"STEPS:\n"
+"    1. Click test to open a window on which to test the media control keys.\n"
+"    2. If all the keys work, the test will be marked as passed.\n"
+"    3. If your computer has no media control keys, Skip this test.\n"
+"    VERIFICATION:\n"
+"    Do the keys work as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:3
+msgid "Audio tests"
+msgstr "Profion sain"
+
+#. description
+#: ../jobs/local.txt.in:8
+msgid "Autotest Suite tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:13
+msgid "Bluetooth tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:18
+msgid "Camera tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:23
+msgid "Codec tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:28
+msgid "CPU tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:33
+msgid "System Daemon tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:38
+msgid "Disk tests"
+msgstr "Profion disg"
+
+#. description
+#: ../jobs/local.txt.in:43
+msgid "Fingerprint reader tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:48
+msgid "Firewire disk tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:53
+msgid "Floppy disk tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:58
+msgid "Graphics tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:63
+msgid "Hibernation tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:68
+msgid "Informational tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:73
+msgid "Input Devices tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:78
+msgid "Software Installation tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:83
+msgid "Hotkey tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:88
+msgid "Linux Test Project tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:93
+msgid "Mago Automated Desktop Testing"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:98
+msgid "Media Card tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:103
+msgid "Memory tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:108
+msgid "Miscellaneous tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:113
+msgid "Monitor tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:118
+msgid "Networking tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:123
+msgid "Optical Drive tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:128
+msgid "Panel Clock Verification tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:133
+msgid "PCMCIA/PCIX Card tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:138
+msgid "Peripheral tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:143
+msgid "Phoronix Test Suite tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:148
+msgid "Power Management tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:153
+msgid "QA Regression tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:158
+msgid "Server Services checks"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:163
+msgid "Suspend tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:168
+msgid "Unity tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:173
+msgid "USB tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:178
+msgid "User Applications"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:183
+msgid "Wireless networking tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:188
+msgid "Stress tests"
+msgstr ""
+
+#. description
+#: ../jobs/ltp.txt.in:3
+msgid ""
+"This test installs and runs Linux Test Project syscalls test. This can be "
+"destructive, thus this test is blacklisted by default."
+msgstr ""
+
+#. description
+#: ../jobs/mago.txt.in:8
+msgid ""
+"PURPOSE:\n"
+"   This test installs and runs the Mago Automated Desktop Testing suite."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Multimedia Card (MMC) media\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an MMC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:20
+msgid ""
+"This test is automated and executes after the mediacard/mmc-insert test is "
+"run. It tests reading and writing to the MMC card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:28
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of the MMC card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the MMC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:43
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an MMC card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an MMC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:59
+msgid ""
+"This test is automated and executes after the mediacard/mmc-insert-after-"
+"suspend test is run. It tests reading and writing to the MMC card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:67
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of an MMC card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the MMC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:81
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Secure Digital (SD) media card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SD card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:97
+msgid ""
+"This test is automated and executes after the mediacard/sd-insert test is "
+"run. It tests reading and writing to the SD card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:105
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SD card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SD card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:120
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an SD card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SD card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:136
+msgid ""
+"This test is automated and executes after the mediacard/sd-insert-after-"
+"suspend test is run. It tests reading and writing to the SD card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:144
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SD card from the systems card reader after the system "
+"has been suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SD card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:158
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Secure Digital High-Capacity (SDHC) media "
+"card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SDHC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:174
+msgid ""
+"This test is automated and executes after the mediacard/sdhc-insert test is "
+"run. It tests reading and writing to the SDHC card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:182
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SDHC card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SDHC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:197
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an SDHC media card after the system has been "
+"suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SDHC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:213
+msgid ""
+"This test is automated and executes after the mediacard/sdhc-insert-after-"
+"suspend test is run. It tests reading and writing to the SDHC card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:221
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of an SDHC card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SDHC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:235
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Compact Flash (CF) media card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert a CF card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:251
+msgid ""
+"This test is automated and executes after the mediacard/cf-insert test is "
+"run. It tests reading and writing to the CF card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:259
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of a CF card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the CF card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:274
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a CF card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert a CF card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:290
+msgid ""
+"This test is automated and executes after the mediacard/cf-insert-after-"
+"suspend test is run. It tests reading and writing to the CF card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:298
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of a CF card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the CF card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/memory.txt.in:5
+msgid ""
+"This test checks the amount of memory which is reporting in meminfo against "
+"the size of the memory modules detected by DMI."
+msgstr ""
+
+#. description
+#: ../jobs/memory.txt.in:14
+msgid "Test and exercise memory."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:8
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system can switch to a virtual terminal "
+"and back to X\n"
+"STEPS:\n"
+"    1. Click \"Test\" to switch to another virtual terminal and then back to "
+"X\n"
+"VERIFICATION:\n"
+"    Did your screen change temporarily to a text console and then switch "
+"back to your current session?"
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:21
+msgid "Run Firmware Test Suite (fwts) automated tests."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:31
+msgid ""
+"This will run some basic connectivity tests against a BMC, verifying that "
+"IPMI works."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:37
+msgid ""
+"   Determine if we need to run tests specific to portable computers that may "
+"not apply to desktops."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:45
+msgid ""
+"Test that the /var/crash directory doesn't contain anything. Lists the files "
+"contained within if it does, or echoes the status of the directory (doesn't "
+"exist/is empty)"
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:53
+msgid ""
+"Test to check that virtualization is supported and the test system has at "
+"least a minimal amount of RAM to function as an OpenStack Compute Node"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will check your VGA port. Skip if your system does not have a "
+"VGA port.\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the VGA port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:15
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DVI port. Skip if your system does not have a "
+"DVI port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the DVI port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:26
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DisplayPort port. Skip if your system does not "
+"have a DisplayPort port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the DisplayPort port "
+"on your system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:37
+msgid ""
+"PURPOSE:\n"
+"    This test will check your HDMI port. Skip if your system does not have a "
+"HDMI port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the HDMI port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:48
+msgid ""
+"PURPOSE:\n"
+"    This test will check your S-VIDEO port. Skip if your system does not "
+"have a S-VIDEO port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the S-VIDEO port on "
+"your system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:59
+msgid ""
+"PURPOSE:\n"
+"    This test will check your RCA port. Skip if your system does not have a "
+"RCA port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the RCA port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:70
+msgid ""
+"PURPOSE:\n"
+"    This test will check your monitor power saving capabilities\n"
+"STEPS:\n"
+"    1. Click \"Test\" to try the power saving capabilities of your monitor\n"
+"    2. Press any key or move the mouse to recover\n"
+"VERIFICATION:\n"
+"    Did the the monitor go blank and turn on again?"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:5
+msgid "Test to detect the available network controllers"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:11
+msgid "Tests whether the system has a working Internet connection."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:16
+msgid "Network Information"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:40
+msgid ""
+"This is an automated test to gather some info on the current state of your "
+"network devices. If no devices are found, the test will exit with an error."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:46
+msgid ""
+"PURPOSE:\n"
+"    This test will check your wired connection\n"
+"STEPS:\n"
+"    1. Click on the Network icon in the top panel\n"
+"    2. Select a network below the \"Wired network\" section\n"
+"    3. Click \"Test\" to verify that it's possible to establish a HTTP "
+"connection\n"
+"VERIFICATION:\n"
+"    Did a notification show and was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:59
+msgid ""
+"PURPOSE:\n"
+"    This test will check that a DSL modem can be configured and connected.\n"
+"STEPS:\n"
+"    1. Connect the telephone line to the computer\n"
+"    2. Click on the Network icon on the top panel.\n"
+"    3. Select \"Edit Connections\"\n"
+"    4. Select the \"DSL\" tab\n"
+"    5. Click on \"Add\" button\n"
+"    6. Configure the connection parameters properly\n"
+"    7. Click \"Test\" to verify that it's possible to establish an HTTP "
+"connection\n"
+"VERIFICATION:\n"
+"    Did a notification show and was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:76
+msgid ""
+"Automated test case to verify availability of some system on the network "
+"using ICMP ECHO packets."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:83 ../jobs/peripheral.txt.in:37
+msgid ""
+"Automated test case to make sure that it's possible to download files "
+"through HTTP"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:91
+msgid "Test to see if we can sync local clock to an NTP server"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:97
+msgid ""
+"Verify that an installation of checkbox-server on the network can be reached "
+"over SSH."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:103
+msgid "Try to enable a remote printer on the network and print a test page."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:108
+msgid ""
+"Automated test to walk multiple network cards and test each one in sequence."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:128
+msgid "Test to measure the network bandwidth"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:8
+msgid "Test to detect the optical drives"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check your optical devices ability to read CD media\n"
+"STEPS:\n"
+"    1. Insert appropriate non-blank media into your optical drive(s). Movie "
+"and Audio Disks may not work. Self-created data disks have the greatest "
+"chance of working.\n"
+"    2. If a file browser does not open automatically, open the file browser "
+"and access the disk.\n"
+"    3. Attempt to open a text file on the disk, or copy a file from the disk "
+"to your home directory.\n"
+"VERIFICATION:\n"
+"    Were you able to view files on the disk and either open a file to read "
+"or copy a file to your home directory?"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system's CD writing capabilities. This test "
+"requires a blank CD-R. If you do not have a blank CD-R, skip this test.\n"
+"STEPS:\n"
+"    1. Enter a blank CD-R into your drive\n"
+"    2. Click \"Test\" to begin.\n"
+"    3. When the CD tray ejects the media after burning, close it (DO NOT "
+"remove the disk, it is needed for the second portion of the test). Note, you "
+"must close the drive within 10 seconds or the test will time out.\n"
+"    4. When the test completes, proceed by clicking \"Next\"\n"
+"VERIFICATION:\n"
+"    This test should automatically select \"Yes\" if it passes, \"No\" if it "
+"fails."
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:47
+msgid ""
+"PURPOSE:\n"
+"    This test will check your CD audio playback capabilities\n"
+"STEPS:\n"
+"    1. Insert an audio CD in your optical drive\n"
+"    2. Open the Dash (click on the Ubuntu Circle of Friends button on the "
+"Launcher)\n"
+"    3. Click \"Listen to Music\" to open Banshee\n"
+"    4. Select the CD under \"Libraries\" in the left panel of Banshee\n"
+"    5. Click the Play button to listen to music\n"
+"    6. Stop playing after some time\n"
+"    7. Right click on the CD icon under \"Libraries\" and select \"Eject "
+"Disc\"\n"
+"    8. The CD should be ejected\n"
+"    9. Close Banshee\n"
+"VERIFICATION:\n"
+"    Did all the steps work?"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:70
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system's DVD writing capabilities. This test "
+"requires a blank DVD-R. If you do not have a blank DVD-R, skip this test.\n"
+"STEPS:\n"
+"    1. Enter a blank DVD-R into your drive\n"
+"    2. Click \"Test\" to begin.\n"
+"    3. When the CD tray ejects the media after burning, close it (DO NOT "
+"remove the disk, it is needed for the second portion of the test). Note, you "
+"must close the drive within 10 seconds or the test will time out.\n"
+"    4. When the test completes, proceed by clicking \"Next\"\n"
+"VERIFICATION:\n"
+"    This test should automatically select \"Yes\" if it passes, \"No\" if it "
+"fails."
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:84
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DVD movie playback capabilities. Note that "
+"installation of non-free software (codecs, player, etc) may be required "
+"prior to performing this test.\n"
+"STEPS:\n"
+"    1. Insert a DVD that contains any movie in your optical drive\n"
+"    2. Open the Dash (click on the Ubuntu Circle of Friends button on the "
+"Launcher)\n"
+"    3. Click \"Media Apps\" and then click on \"Movie Player\"\n"
+"    4. Play the movie using Movie Player, stop the movie after verifying "
+"that it plays\n"
+"    6. Eject the DVD\n"
+"VERIFICATION:\n"
+"    Did all the steps work?"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:102
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DVD  playback capabilities\n"
+"STEPS:\n"
+"    1. Insert a DVD that contains any movie in your optical drive\n"
+"    2. Click \"Test\" to play the DVD in Totem\n"
+"VERIFICATION:\n"
+"    Did the file play?"
+msgstr ""
+
+#. description
+#: ../jobs/panel_clock_test.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that the desktop clock displays the correct date "
+"and time\n"
+"VERIFICATION:\n"
+"   Is the clock in the upper right corner of your desktop displaying the "
+"correct date and time for your timezone?"
+msgstr ""
+
+#. description
+#: ../jobs/panel_clock_test.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that the desktop clock synchronizes with the system "
+"clock.\n"
+"STEPS:\n"
+"   1. Click the \"Test\" button and verify the clock moves ahead by 1 hour.\n"
+"   Note: It may take a minute or so for the clock to refresh\n"
+"   2. Right click on the clock, then click on \"Time & Date Settings...\"\n"
+"   3. Ensure that your clock application is set to manual.\n"
+"   4. Change the time 1 hour back\n"
+"   5. Close the window and reboot\n"
+"VERIFICATION:\n"
+"   Is your system clock displaying the correct date and time for your "
+"timezone?"
+msgstr ""
+
+#. description
+#: ../jobs/panel_reboot.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that you can reboot your system from the desktop "
+"menu\n"
+"STEPS:\n"
+"   1. Click the Gear icon in the upper right corner of the desktop and click "
+"on \"Shut Down\"\n"
+"   2. Click the \"Restart\" button on the left side of the Shut Down dialog\n"
+"   3. After logging back in, restart System Testing and it should resume "
+"here\n"
+"VERIFICATION:\n"
+"   Did your system restart and bring up the GUI login cleanly?"
+msgstr ""
+
+#. description
+#: ../jobs/pcmcia-pcix.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"    This will verify that a PCMCIA or ExpressCard slot can detect inserted "
+"devices\n"
+"STEPS:\n"
+"    1. Plug a PCMCIA or ExpressCard device into the computer\n"
+"VERIFICATION:\n"
+"    Was the device correctly detected?"
+msgstr ""
+
+#. description
+#: ../jobs/peripheral.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a network printer is usable\n"
+"STEPS:\n"
+"   1. Make sure that a printer is available in your network\n"
+"   2. Click on the Gear icon in the upper right corner and then click on "
+"Printers\n"
+"   3. If the printer isn't already listed, click on Add\n"
+"   4. The printer should be detected and proper configuration values  should "
+"be displayed\n"
+"   5. Print a test page\n"
+"VERIFICATION:\n"
+"   Were you able to print a test page to the network printer?"
+msgstr ""
+
+#. description
+#: ../jobs/peripheral.txt.in:18
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a USB DLS or Mobile Broadband modem works\n"
+"STEPS:\n"
+"   1. Connect the USB cable to the computer\n"
+"   2. Right click on the Network icon in the panel\n"
+"   3. Select 'Edit Connections'\n"
+"   4. Select the 'DSL' (for ADSL modem) or 'Mobile Broadband' (for 3G modem) "
+"tab\n"
+"   5. Click on add 'Add' button\n"
+"   6. Configure the connection parameters properly\n"
+"   7. Notify OSD should confirm that the connection has been established\n"
+"   8. Select Test to verify that it's possible to establish an HTTP "
+"connection\n"
+"VERIFICATION:\n"
+"   Was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/phoronix.txt.in:9
+msgid ""
+"PURPOSE:\n"
+"   This test will download and install the Phoronix Test Suite and run some "
+"selected benchmarking tests."
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system shutdown/booting cycle\n"
+"STEPS:\n"
+"    1. Shutdown your machine\n"
+"    2. Boot your machine\n"
+"    3. Repeat steps 1 and 2 at least 5 times\n"
+"VERIFICATION:\n"
+"    Did the system shutdown and rebooted correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:15
+msgid ""
+"PURPOSE:\n"
+"    This test will check your lid sensors\n"
+"STEPS:\n"
+"    1. Close your laptop lid\n"
+"VERIFICATION:\n"
+"   Does closing your laptop lid cause your system to suspend?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:32
+msgid ""
+"PURPOSE:\n"
+"    This test will check your lid sensors\n"
+"STEPS:\n"
+"    1. Click \"Test\"\n"
+"    2. Close and open the lid\n"
+"VERIFICATION:\n"
+"    Did the screen turn off while the lid was closed?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:50
+msgid ""
+"PURPOSE:\n"
+"    This test will check your lid sensors\n"
+"STEPS:\n"
+"    1. Click \"Test\"\n"
+"    2. Close the lid\n"
+"    3. Wait 5 seconds with the lid closed\n"
+"    4. Open the lid\n"
+"VERIFICATION:\n"
+"    Did the system resume when the lid was opened?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:66
+msgid "Make sure that the RTC (Real-Time Clock) device exists."
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:71
+msgid "Test ACPI Wakealarm (fwts wakealarm) "
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:80
+msgid ""
+"Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple "
+"regression check)"
+msgstr ""
+
+#. description
+#: ../jobs/qa_regression.txt.in:7
+msgid ""
+"PURPOSE:\n"
+"   This is to install and run the Ubuntu QA regression tests (destructive)"
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:5
+msgid "Verifies that sshd is running."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:11
+msgid "Verifies that Print/CUPs server is running."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:18
+msgid "Verifies that DNS server is running and working."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:25
+msgid "Verifies that Samba server is running."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:32
+msgid "Verifies that the LAMP stack is running (Apache, MySQL and PHP)."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:39
+msgid "Verifies that Tomcat server is running and working."
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:8
+msgid ""
+"PURPOSE:\n"
+"    Create jobs that use the CPU as much as possible for two hours. The test "
+"is considered passed if the system does not freeze."
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:18
+msgid ""
+"PURPOSE:\n"
+"    This test will enter and resume from hibernate for 30 iterations\n"
+"STEPS:\n"
+"    1. Ensure your system has no power-on or HDD passwords set, and that "
+"grub is set to boot Ubuntu by default if you have a multi-boot set-up\n"
+"    2. Click \"Test\" to start the test (very lengthy)\n"
+"    3. If your system does not wake itself after 2 minutes, you will need to "
+"press the power button\n"
+"    4. If the system fails to resume from hibernation and must be rebooted, "
+"please restart System Testing and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did the system successfully hibernate and wake 30 times?"
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:35
+msgid ""
+"PURPOSE:\n"
+"    This test will enter and resume from suspend for 30 iterations\n"
+"STEPS:\n"
+"    1. Click \"Test\" to start the test (very lengthy)\n"
+"    2. If the system fails to resume from suspend and must be rebooted, "
+"please restart System Testing and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did the system successfully suspend and resume 30 times?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:4
+msgid "Record the current network before suspending."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:9
+msgid "Record the current resolution before suspending."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:17
+msgid "Record mixer settings before suspending."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:24
+msgid "Verify that all the CPUs are online before suspending"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:31
+msgid ""
+"Dumps memory info to a file for comparison after suspend test has been run"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:49
+msgid ""
+"This test disconnects all connections and then connects to the wireless "
+"interface. It then checks the connection to confirm it's working as expected."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:83
+msgid ""
+"PURPOSE:\n"
+"    This test will check suspend and resume\n"
+"STEPS:\n"
+"    1. Click \"Test\" and your system will suspend for about 30 - 60 "
+"seconds\n"
+"    2. If your system does not wake itself up after 60 seconds, please press "
+"the power button momentarily to wake the system manually\n"
+"    3. If your system fails to wake at all and must be rebooted, restart "
+"System Testing after reboot and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did your system suspend and resume correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:96
+msgid "Test the network after resuming."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:102
+msgid ""
+"Test to see that we have the same resolution after resuming as before."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:111
+msgid ""
+"Verify that mixer settings after suspend are the same as before suspend."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:127
+msgid "Verify that all CPUs are online after resuming."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:144
+msgid "Verify that all memory is available after resuming from suspend."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:153
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the display is correct after suspend and "
+"resume\n"
+"VERIFICATION:\n"
+"    Does the display work normally after resuming from suspend?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:174
+msgid ""
+"This test checks that the wireless interface is working after suspending the "
+"system. It disconnects all interfaces and then connects to the wireless "
+"interface and checks that the connection is working as expected."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:186
+msgid ""
+"This test grabs the hardware address of the bluetooth adapter after suspend "
+"and compares it to the address grabbed before suspend."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:196
+msgid ""
+"This is an automated Bluetooth file transfer test. It sends an image to the "
+"device specified by the BTDEVADDR environment variable."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:206
+msgid ""
+"PURPOSE:\n"
+"    This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a "
+"specified device\n"
+"STEPS:\n"
+"    1. Click \"Test\" and you will be prompted to enter the Bluetooth device "
+"name of a device that can accept file transfers (It may take a few moments "
+"after entering the name for the file to begin sending)\n"
+"    2. Accept any prompts that appear on both devices\n"
+"VERIFICATION:\n"
+"    Was the data correctly transferred?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:220
+msgid ""
+"PURPOSE:\n"
+"    This test will cycle through the detected display modes\n"
+"STEPS:\n"
+"    1. Click \"Test\" and the display will cycle trough the display modes\n"
+"VERIFICATION:\n"
+"    Did your display look fine in the detected mode?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:232
+msgid ""
+"This test will check to make sure supported video modes work after a suspend "
+"and resume. This is done automatically by taking screenshots and uploading "
+"them as an attachment."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:241
+msgid ""
+"This attaches screenshots from the "
+"suspend/cycle_resolutions_after_suspend_auto test to the results submission."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:251
+msgid ""
+"This will check to make sure that your audio device works properly after a "
+"suspend and resume.  This may work fine with speakers and onboard "
+"microphone, however, it works best if used with a cable connecting the audio-"
+"out jack to the audio-in jack."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:260
+msgid "This is the automated version of suspend/suspend_advanced."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:269
+msgid ""
+"This automatically tests Wake-on-LAN capability with the aid of a suitably "
+"configured server. During this process the system will suspend, then "
+"automatically wake up after no more than 5 minutes."
+msgstr ""
+
+#. description
+#: ../jobs/unity.txt.in:6
+msgid ""
+"Xlib is required for unity testing. This checks for Xlib and installs it if "
+"not available."
+msgstr ""
+
+#. description
+#: ../jobs/unity.txt.in:13
+msgid ""
+"This test will verify that Unity is running and then run the autopilot.py "
+"test against the Unity interface."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:5
+msgid "Detects and shows USB devices attached to this system."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:12
+msgid ""
+"PURPOSE:\n"
+"    This test will check that your system detects USB storage devices.\n"
+"STEPS:\n"
+"    1. Plug in one or more USB keys or hard drives.\n"
+"    2. Click on \"Test\".\n"
+"INFO:\n"
+"    $output\n"
+"VERIFICATION:\n"
+"    Were the drives detected?"
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:28
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Plug a USB keyboard into the computer.\n"
+"    2. Click on \"Test\" and enter some text.\n"
+"VERIFICATION:\n"
+"    Does the keyboard work?"
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:41
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Plug a USB mouse into the computer.\n"
+"    2. Perform some single/double/right click operations.\n"
+"VERIFICATION:\n"
+"    Does the mouse work correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:55
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the insertion of\n"
+"    a USB storage device\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert a USB storage device (pen-drive/HDD).\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:72
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal of\n"
+"    a USB storage device\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the USB device.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:88
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Plug a USB HDD or thumbdrive into the computer.\n"
+"    2. An icon should appear on the Launcher.\n"
+"    3. Click \"Test\" to begin the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:104
+msgid "This test is automated and executes after the usb/insert test is run."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:111
+msgid ""
+"This is an automated version of usb/storage-automated and assumes that the  "
+"server has usb storage devices plugged in prior to checkbox execution. It  "
+"is intended for servers and SRU automated testing."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:119
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Connect a USB storage device to an external USB slot on this "
+"computer.\n"
+"    2. An icon should appear on the Launcher.\n"
+"    3. Confirm that the icon appears.\n"
+"    4. Eject the device.\n"
+"    5. Repeat with each external USB slot.\n"
+"VERIFICATION:\n"
+"    Do all USB slots work with the device?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:6
+msgid ""
+"PURPOSE:\n"
+" This test will check that the update manager can find updates.\n"
+"STEPS:\n"
+" 1. Click Test to launch update-manager.\n"
+" 2. Follow the prompts and if updates are found, install them.\n"
+" 3. When Update Manager has finished, please close the app by clicking the "
+"Close button in the lower right corner.\n"
+"VERIFICATION:\n"
+" Did Update manager find and install updates (Pass if no updates are found,\n"
+" but Fail if updates are found but not installed)"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:22
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can create a new folder.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. On the menu bar, click File -> Create Folder.\n"
+" 3. In the name box for the new folder, enter the name Test Folder and hit "
+"Enter.\n"
+" 4. Close the File browser.\n"
+"VERIFICATION:\n"
+" Do you now have a new folder called Test Folder?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:37
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can copy a folder\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the folder called Test Folder and click on Copy.\n"
+" 3. Right Click on any white area in the window and click on Paste.\n"
+" 4. Right click on the folder called Test Folder(copy) and click Rename.\n"
+" 5. Enter the name Test Data in the name box and hit Enter.\n"
+" 6. Close the File browser.\n"
+"VERIFICATION:\n"
+" Do you now have a folder called Test Data?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:54
+msgid ""
+"PURPOSE:\n"
+" This test will verify that the file browser can move a folder.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Click and drag the folder called Test Data onto the icon called Test "
+"Folder.\n"
+" 3. Release the button.\n"
+" 4. Double click the folder called Test Folder to open it up.\n"
+" 5. Close the File Browser.\n"
+"VERIFICATION:\n"
+" Was the folder called Test Data successfully moved into the folder called "
+"Test Folder?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:70
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can create a new file.\n"
+"STEPS:\n"
+" 1. Click Select Test to open the File Browser.\n"
+" 2. Right click in the white space and click Create Document -> Empty "
+"Document.\n"
+" 3. Enter the name Test File 1 in the name box and hit Enter.\n"
+" 4. Close the File browser.\n"
+"VERIFICATION:\n"
+" Do you now have a file called Test File 1?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:85
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can copy a file.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the file called Test File 1 and click Copy.\n"
+" 3. Right click in the white space and click Paste.\n"
+" 4. Right click on the file called Test File 1(copy) and click Rename.\n"
+" 5. Enter the name Test File 2 in the name box and hit Enter.\n"
+" 6. Close the File Browser.\n"
+"VERIFICATION:\n"
+" Do you now have a file called Test File 2?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:102
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can move a file.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Click and drag the file called Test File 2 onto the icon for the folder "
+"called Test Data.\n"
+" 3. Release the button.\n"
+" 4. Double click the icon for Test Data to open that folder up.\n"
+" 5. Close the File Browser.\n"
+"VERIFICATION:\n"
+" Was the file Test File 2 successfully moved into the Test Data folder?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:118
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can delete a file.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the file called Test File 1 and click on Move To Trash.\n"
+" 3. Verify that Test File 1 has been removed.\n"
+" 4. Close the File Browser.\n"
+"VERIFICATION:\n"
+"  Is Test File 1 now gone?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:133
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can delete a folder.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the folder called Test Folder and click on Move To "
+"Trash.\n"
+" 3. Verify that the folder was deleted.\n"
+" 4. Close the file browser.\n"
+"VERIFICATION:\n"
+" Has Test Folder been successfully deleted?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:207
+msgid "Common Document Types Test"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:228
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can render a basic web page.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox and view the test web page.\n"
+"VERIFICATION:\n"
+" Did the Ubuntu Test page load correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:241
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can run a java applet in a web page. "
+"Note:\n"
+" this may require installing additional software to complete successfully.\n"
+"STEPS:\n"
+" 1. Select Test to open Firefox with the Java test page, and follow the "
+"instructions there.\n"
+"VERIFICATION:\n"
+" Did the applet display?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:255
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can run flash applications. Note: this "
+"may\n"
+" require installing additional software to successfully complete.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox and view a sample Flash test.\n"
+"VERIFICATION:\n"
+" Did you see the text?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:269
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can play a Flash video. Note: this may\n"
+" require installing additional software to successfully complete.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox and view a short flash video.\n"
+"VERIFICATION:\n"
+" Did the video play correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:283
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can play a Quicktime (.mov) video file.\n"
+" Note: this may require installing additional software to successfully\n"
+" complete.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox with a sample video.\n"
+"VERIFICATION:\n"
+" Did the video play using a plugin?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:297
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Facebook Chat service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:311
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Google Talk (gtalk) service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:325
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Jabber service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:339
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the AOL Instant Messaging (AIM) service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:353
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Microsoft Network (MSN) service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:367
+msgid ""
+"PURPOSE:\n"
+" This test will check that Evolution works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to launch Evolution.\n"
+" 2. Configure it to connect to a POP3 account.\n"
+"VERIFICATION:\n"
+" Were you able to receive and read e-mail correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:380
+msgid ""
+"PURPOSE:\n"
+" This test will check that Evolution works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to launch Evolution.\n"
+" 2. Configure it to connect to a IMAP account.\n"
+"VERIFICATION:\n"
+" Were you able to receive and read e-mail correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:393
+msgid ""
+"PURPOSE:\n"
+" This test will check that Evolution works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to launch Evolution.\n"
+" 2. Configure it to connect to a SMTP account.\n"
+"VERIFICATION:\n"
+" Were you able to send e-mail without errors?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:406
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator.\n"
+"VERIFICATION:\n"
+" Did it launch correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:419
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator and perform:\n"
+" 1. Simple math functions (+,-,/,*)\n"
+" 2. Nested math functions ((,))\n"
+" 3. Fractional math\n"
+" 4. Decimal math\n"
+"VERIFICATION:\n"
+" Did the functions perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:436
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator and perform:\n"
+"  1. Memory set\n"
+"  2. Memory reset\n"
+"  3. Memory last clear\n"
+"  4. Memory clear\n"
+"VERIFICATION:\n"
+" Did the functions perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:453
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator and perform:\n"
+"  1. Cut\n"
+"  2. Copy\n"
+"  3. Paste\n"
+"VERIFICATION:\n"
+" Did the functions perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:468
+msgid ""
+"PURPOSE:\n"
+" This test checks that gedit works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to open gedit.\n"
+" 2. Enter some text and save the file (make a note of the file name you "
+"use), then close gedit.\n"
+"VERIFICATION:\n"
+" Did this perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:482
+msgid ""
+"PURPOSE:\n"
+" This test checks that gedit works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to open gedit, and re-open the file you "
+"created previously.\n"
+" 2. Edit then save the file, then close gedit.\n"
+"VERIFICATION:\n"
+" Did this perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:495
+msgid ""
+"PURPOSE:\n"
+" This test will check that Gnome Terminal works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to open Terminal.\n"
+" 2. Type 'ls' and press enter. You should see a list of files and folder in "
+"your home directory.\n"
+" 3. Close the terminal window.\n"
+"VERIFICATION:\n"
+" Did this perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:6
+msgid "Wireless scanning test. It scans and reports on discovered APs."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:12
+msgid ""
+"PURPOSE:\n"
+"    This test will check your wireless connection.\n"
+"STEPS:\n"
+"    1. Click on the Network icon in the panel.\n"
+"    2. Select a network below the 'Wireless networks' section.\n"
+"    3. Click \"Test\" to verify that it's possible to establish an HTTP "
+"connection.\n"
+"VERIFICATION:\n"
+"    Did a notification show and was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:28
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using WPA "
+"security and the 802.11b/g protocols."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:38
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using no "
+"security and the 802.11b/g protocols."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:48
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using WPA "
+"security and the 802.11n protocol."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:58
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using no "
+"security and the 802.11n protocol."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:70
+msgid ""
+"Tests the performance of a systems wireless connection through the iperf "
+"tool."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:81
+msgid ""
+"Tests the performance of a systems wireless connection through the iperf "
+"tool, using UDP packets."
+msgstr ""
+
+#: ../checkbox/application.py:66
+msgid "Usage: checkbox [OPTIONS]"
+msgstr ""
+
+#: ../checkbox/application.py:70
+msgid "Print version information and exit."
+msgstr ""
+
+#: ../checkbox/application.py:74
+msgid "The file to write the log to."
+msgstr ""
+
+#: ../checkbox/application.py:77
+msgid "One of debug, info, warning, error or critical."
+msgstr ""
+
+#: ../checkbox/application.py:82
+msgid "Configuration override parameters."
+msgstr ""
+
+#: ../checkbox/application.py:84
+msgid "Shorthand for --config=.*/jobs_info/blacklist."
+msgstr ""
+
+#: ../checkbox/application.py:86
+msgid "Shorthand for --config=.*/jobs_info/blacklist_file."
+msgstr ""
+
+#: ../checkbox/application.py:88
+msgid "Shorthand for --config=.*/jobs_info/whitelist."
+msgstr ""
+
+#: ../checkbox/application.py:90
+msgid "Shorthand for --config=.*/jobs_info/whitelist_file."
+msgstr ""
+
+#: ../checkbox/application.py:115
+msgid "Missing configuration file as argument.\n"
+msgstr ""
+
+#: ../checkbox/job.py:84
+msgid "Command not found."
+msgstr ""
+
+#: ../checkbox/job.py:92
+#, python-format
+msgid "Command received signal %s: %s"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:23
+msgid ""
+"Hangup detected on controlling terminal or death of controlling process"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:24
+msgid "Interrupt from keyboard"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:25
+msgid "Quit from keyboard"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:26
+msgid "Illegal Instruction"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:27
+msgid "Abort signal from abort(3)"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:28
+msgid "Floating point exception"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:29
+msgid "Kill signal"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:30
+msgid "Invalid memory reference"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:31
+msgid "Broken pipe: write to pipe with no readers"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:32
+msgid "Timer signal from alarm(2)"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:33
+msgid "Termination signal"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:34
+msgid "User-defined signal 1"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:35
+msgid "User-defined signal 2"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:36
+msgid "Child stopped or terminated"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:37
+msgid "Continue if stopped"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:38
+msgid "Stop process"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:39
+msgid "Stop typed at tty"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:40
+msgid "tty input for background process"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:41
+msgid "tty output for background process"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:77
+msgid "UNKNOWN"
+msgstr "ANHYSBYS"
+
+#: ../checkbox/lib/signal.py:89
+msgid "Unknown signal"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:31
+#: ../checkbox_urwid/urwid_interface.py:686
+msgid "yes"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:32
+#: ../checkbox_urwid/urwid_interface.py:687
+msgid "no"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:33
+#: ../checkbox_urwid/urwid_interface.py:688
+msgid "skip"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:126
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:135
+#, python-format
+msgid "Please choose (%s): "
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:250 ../checkbox_cli/cli_interface.py:281
+msgid "Space when finished"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:280
+msgid "Combine with character above to expand node"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:320
+msgid "test"
+msgstr "profi"
+
+#: ../checkbox_cli/cli_interface.py:344
+msgid "test again"
+msgstr "profi eto"
+
+#: ../checkbox_cli/cli_interface.py:350
+msgid "Please type here and press Ctrl-D when finished:\n"
+msgstr ""
+
+#: ../checkbox_urwid/urwid_interface.py:60
+msgid "Checkbox System Testing"
+msgstr ""
+
+#: ../checkbox_urwid/urwid_interface.py:99
+msgid "Continue"
+msgstr "Parhau"
+
+#: ../checkbox_urwid/urwid_interface.py:192
+#: ../checkbox_urwid/urwid_interface.py:268
+#: ../checkbox_urwid/urwid_interface.py:418
+msgid "Previous"
+msgstr "Cynt"
+
+#: ../checkbox_urwid/urwid_interface.py:193
+#: ../checkbox_urwid/urwid_interface.py:269
+#: ../checkbox_urwid/urwid_interface.py:419
+msgid "Next"
+msgstr "Nesaf"
+
+#. Show buttons
+#: ../checkbox_urwid/urwid_interface.py:416
+msgid "Select All"
+msgstr "Dewis Popeth"
+
+#: ../checkbox_urwid/urwid_interface.py:417
+msgid "Deselect All"
+msgstr ""
+
+#: ../checkbox_urwid/urwid_interface.py:774
+msgid "Test"
+msgstr "Profi"
+
+#: ../checkbox_urwid/urwid_interface.py:789
+msgid "Test Again"
+msgstr "Profi Eto"
+
+#: ../checkbox_gtk/gtk_interface.py:503
+msgid "_Test Again"
+msgstr ""
+
+#: ../checkbox_gtk/gtk_interface.py:551
+msgid "Info"
+msgstr "Gwybodaeth"
+
+#: ../checkbox_gtk/gtk_interface.py:575
+msgid "Error"
+msgstr "Gwall"
+
+#: ../checkbox/user_interface.py:137
+#, python-format
+msgid "Unable to start web browser to open %s."
+msgstr ""
+
+#: ../plugins/apport_prompt.py:83
+msgid ""
+"Collecting information about this test.\n"
+"This might take a few minutes."
+msgstr ""
+
+#: ../plugins/apport_prompt.py:118
+msgid ""
+"Collected information is being sent for bug tracking.\n"
+"This might take a few minutes."
+msgstr ""
+
+#: ../plugins/apport_prompt.py:227
+#, python-format
+msgid "Test %(name)s from suite %(suite)s failed."
+msgstr ""
+
+#: ../plugins/apport_prompt.py:231
+#, python-format
+msgid "Test %s failed."
+msgstr ""
+
+#: ../plugins/apport_prompt.py:232
+msgid "Do you want to report a bug?"
+msgstr ""
+
+#: ../plugins/apport_prompt.py:249
+#, python-format
+msgid "Is a package upgrade in process? Error: %s"
+msgstr ""
+
+#: ../plugins/final_prompt.py:33
+msgid "Successfully finished testing!"
+msgstr ""
+
+#: ../plugins/final_prompt.py:34
+msgid "_Finish"
+msgstr ""
+
+#: ../plugins/gather_prompt.py:35
+msgid "Gathering information from your system..."
+msgstr ""
+
+#: ../plugins/intro_prompt.py:28
+msgid ""
+"Welcome to System Testing!\n"
+"\n"
+"Checkbox provides tests to confirm that your system is working properly. "
+"Once you are finished running the tests, you can view a summary report for "
+"your system."
+msgstr ""
+
+#: ../plugins/intro_prompt.py:33
+msgid ""
+"\n"
+"\n"
+"Warning: Some tests could cause your system to freeze or become "
+"unresponsive. Please save all your work and close all other running "
+"applications before beginning the testing process."
+msgstr ""
+
+#: ../plugins/launchpad_exchange.py:136
+#, python-format
+msgid "Failed to process form: %s"
+msgstr ""
+
+#: ../plugins/launchpad_exchange.py:151
+#, python-format
+msgid ""
+"Failed to contact server. Please try\n"
+"again or upload the following file name:\n"
+"%s\n"
+"\n"
+"directly to the system database:\n"
+"https://launchpad.net/+hwdb/+submit"
+msgstr ""
+
+#: ../plugins/launchpad_exchange.py:160
+msgid ""
+"Failed to upload to server,\n"
+"please try again later."
+msgstr ""
+
+#: ../plugins/launchpad_exchange.py:172
+msgid "Information not posted to Launchpad."
+msgstr ""
+
+#: ../plugins/launchpad_prompt.py:74
+#, python-format
+msgid ""
+"The following report has been generated for submission to the Launchpad "
+"hardware database:\n"
+"\n"
+"  [[%s|View Report]]\n"
+"\n"
+"You can submit this information about your system by providing the email "
+"address you use to sign in to Launchpad. If you do not have a Launchpad "
+"account, please register here:\n"
+"\n"
+"  https://launchpad.net/+login"
+msgstr ""
+
+#: ../plugins/launchpad_prompt.py:93
+msgid "Email address must be in a proper format."
+msgstr ""
+
+#: ../plugins/launchpad_prompt.py:99
+msgid "Exchanging information with the server..."
+msgstr ""
+
+#: ../plugins/launchpad_report.py:164
+msgid ""
+"The generated report seems to have validation errors,\n"
+"so it might not be processed by Launchpad."
+msgstr ""
+
+#: ../plugins/lock_prompt.py:63
+msgid "There is another checkbox running. Please close it first."
+msgstr ""
+
+#: ../plugins/recover_prompt.py:53
+msgid "Recover"
+msgstr ""
+
+#: ../plugins/recover_prompt.py:54
+msgid "Restart"
+msgstr ""
+
+#: ../plugins/recover_prompt.py:56
+msgid ""
+"Checkbox did not finish completely.\n"
+"Do you want to recover from the previous run?"
+msgstr ""
+
+#: ../plugins/report_prompt.py:39
+msgid "Building report..."
+msgstr ""
+
+#: ../plugins/shell_test.py:52
+#, python-format
+msgid "Running %s..."
+msgstr ""
+
+#. Get results
+#: ../plugins/suites_prompt.py:110
+msgid "Select the suites to test"
+msgstr ""
+
+#: ../scripts/keyboard_test:21
+msgid "Enter text:\n"
+msgstr ""
+
+#: ../scripts/keyboard_test:41
+msgid "Type Text"
+msgstr ""
+
+#: ../scripts/internet_test:139
+msgid "No Internet connection"
+msgstr ""
+
+#: ../scripts/internet_test:142
+msgid "Connection established lost a packet"
+msgstr ""
+
+#: ../scripts/internet_test:145
+msgid "Internet connection fully established"
+msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/command-not-found.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/command-not-found.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/command-not-found.po	2012-01-02 18:14:14.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/command-not-found.po	2012-02-23 07:17:26.000000000 +0000
@@ -7,65 +7,31 @@
 msgstr ""
 "Project-Id-Version: command-not-found\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-22 18:05+0000\n"
+"POT-Creation-Date: 2007-03-20 18:10+0100\n"
 "PO-Revision-Date: 2009-10-11 15:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:38+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#: ../CommandNotFound/CommandNotFound.py:133
-#, python-format
-msgid "No command '%s' found, but there are %s similar ones"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-02-21 22:41+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../CommandNotFound/CommandNotFound.py:135
-#, python-format
-msgid "No command '%s' found, did you mean:"
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:137
-#, python-format
-msgid " Command '%s' from package '%s' (%s)"
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:210
-#, python-format
-msgid "Command '%(command)s' is available in '%(place)s'"
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:212
-#, python-format
-msgid "Command '%(command)s' is available in the following places"
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:217
-#, python-format
-msgid ""
-"The command could not be located because '%s' is not included in the PATH "
-"environment variable."
+msgid "Ubuntu has the following similar programs"
 msgstr ""
 
-#: ../CommandNotFound/CommandNotFound.py:219
-msgid ""
-"This is most likely caused by the lack of administrative privileges "
-"associated with your user account."
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:234
+#: ../CommandNotFound/CommandNotFound.py:139
 #, python-format
 msgid "The program '%s' is currently not installed. "
 msgstr "Nid yw'r rhaglen '%s' wedi ei sefydlu ar y foment. "
 
-#: ../CommandNotFound/CommandNotFound.py:236
-#: ../CommandNotFound/CommandNotFound.py:239
+#: ../CommandNotFound/CommandNotFound.py:141
+#: ../CommandNotFound/CommandNotFound.py:144
 msgid "You can install it by typing:"
 msgstr "Gallwch ei sefydlu drwy deipio:"
 
-#: ../CommandNotFound/CommandNotFound.py:242
+#: ../CommandNotFound/CommandNotFound.py:147
 #, python-format
 msgid ""
 "To run '%(command)s' please ask your administrator to install the package "
@@ -74,45 +40,32 @@
 "Er mwyn rhedeg '%(command)s' gofynnwch i'ch gweinyddwr i sefydlu'r pecyn "
 "'%(package)s' os gwelwch yn dda."
 
-#: ../CommandNotFound/CommandNotFound.py:244
+#: ../CommandNotFound/CommandNotFound.py:149
+#: ../CommandNotFound/CommandNotFound.py:161
 #, python-format
-msgid "You will have to enable the component called '%s'"
+msgid "Make sure you have the '%s' component enabled"
 msgstr ""
 
-#: ../CommandNotFound/CommandNotFound.py:247
+#: ../CommandNotFound/CommandNotFound.py:151
 #, python-format
 msgid "The program '%s' can be found in the following packages:"
 msgstr "Gall y rhaglen '%s' gael ei ddarganfod yn y pecynnau canlynol:"
 
-#: ../CommandNotFound/CommandNotFound.py:252
-#, python-format
-msgid "You will have to enable component called '%s'"
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:254
-#: ../CommandNotFound/CommandNotFound.py:256
+#: ../CommandNotFound/CommandNotFound.py:155
+#: ../CommandNotFound/CommandNotFound.py:157
 #, python-format
 msgid "Try: %s <selected package>"
 msgstr "Ceisiwch: %s <selected package>"
 
-#: ../CommandNotFound/CommandNotFound.py:258
+#: ../CommandNotFound/CommandNotFound.py:159
 msgid "Ask your administrator to install one of them"
 msgstr "Gofynnwch i'ch gweinyddwr i sefydlu un ohonynt"
 
-#: ../command-not-found:58
+#: ../command-not-found:18
 #, c-format
 msgid "%prog [options] <command-name>"
 msgstr "%prog [options] <command-name>"
 
-#: ../command-not-found:61
+#: ../command-not-found:20
 msgid "use this path to locate data fields"
 msgstr "defnyddiwch y llwybr hon i ganfod maesydd data"
-
-#: ../command-not-found:64
-msgid "ignore local binaries and display the available packages"
-msgstr ""
-
-#: ../command-not-found:71
-#, c-format
-msgid "%s: command not found"
-msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/compiz.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/compiz.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/compiz.po	2012-01-02 18:14:14.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/compiz.po	2012-02-23 07:17:26.000000000 +0000
@@ -7,54 +7,46 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-05 12:40+0000\n"
-"PO-Revision-Date: 2011-12-08 18:58+0000\n"
+"POT-Creation-Date: 2012-02-17 21:28+0000\n"
+"PO-Revision-Date: 2012-02-17 23:57+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Welsh <i18n@suse.de>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:31+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:34+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1
-msgid "Desktop"
-msgstr "Penbwrdd"
-
-#: ../gtk/gnome/50-compiz-key.xml.in.h:1
-msgid "Window Management"
-msgstr ""
-
-#: ../gtk/gnome/compiz.desktop.in.h:1 ../gtk/gnome/compiz-wm.desktop.in.h:1
+#: ../gtk/gnome/compiz.desktop.in.h:1
 msgid "Compiz"
 msgstr "Compiz"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:1
-msgid "Action to take when scrolling the mouse wheel on a window title bar."
+msgid "Blur type"
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:2
-msgid "Blur type"
+msgid "Type of blur used for window decorations"
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:3
-msgid "Metacity theme active window opacity"
+msgid "Use metacity theme"
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:4
-msgid "Metacity theme active window opacity shade"
+msgid "Use metacity theme when drawing window decorations"
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:5
-msgid "Metacity theme opacity"
+msgid "Title bar mouse wheel action"
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:6
-msgid "Metacity theme opacity shade"
+msgid "Action to take when scrolling the mouse wheel on a window title bar."
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:7
-msgid "Opacity to use for active windows with metacity theme decorations"
+msgid "Metacity theme opacity"
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:8
@@ -62,9 +54,7 @@
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:9
-msgid ""
-"Shade active windows with metacity theme decorations from opaque to "
-"translucent"
+msgid "Metacity theme opacity shade"
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:10
@@ -73,315 +63,325 @@
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:11
-msgid "Title bar mouse wheel action"
+msgid "Metacity theme active window opacity"
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:12
-msgid "Type of blur used for window decorations"
+msgid "Opacity to use for active windows with metacity theme decorations"
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:13
-msgid "Use metacity theme"
+msgid "Metacity theme active window opacity shade"
 msgstr ""
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:14
-msgid "Use metacity theme when drawing window decorations"
+msgid ""
+"Shade active windows with metacity theme decorations from opaque to "
+"translucent"
+msgstr ""
+
+#: ../gtk/window-decorator/gwd.schemas.in.h:15
+msgid "Use tooltips"
+msgstr ""
+
+#: ../gtk/window-decorator/gwd.schemas.in.h:16
+msgid "Show tooltip windows on decorator functions"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:1
-msgid "Active Plugins"
+msgid "General Options"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:2
-msgid "Audible Bell"
+msgid "General compiz options"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:3
-msgid "Audible system beep"
+msgid "Active Plugins"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:4
-msgid "Auto-Raise"
+msgid "List of currently active plugins"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:5
-msgid "Auto-Raise Delay"
+msgid "Audible Bell"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:6
-msgid "Automatic detection of output devices"
+msgid "Audible system beep"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:7
-msgid "Click To Focus"
+msgid "Ignore Hints When Maximized"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:8
-msgid "Click on window moves input focus to it"
+msgid "Ignore size increment and aspect hints when window is maximized"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:9
-msgid "Close Window"
-msgstr "Cau'r Ffenest"
+msgid "Hide Skip Taskbar Windows"
+msgstr ""
 
 #: ../metadata/core.xml.in.h:10
-msgid "Close active window"
+msgid "Hide windows not in taskbar when entering show desktop mode"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:11
-msgid "Default Icon"
+msgid "Edge Trigger Delay"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:12
-msgid "Default window icon image"
+msgid ""
+"Duration the pointer must rest in a screen edge before an edge action is "
+"taken."
 msgstr ""
 
 #: ../metadata/core.xml.in.h:13
-msgid "Desktop Size"
+msgid "Ping Delay"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:14
-msgid "Detect Outputs"
+msgid "Interval between ping messages"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:15
-msgid "Display Settings"
+msgid "Default Icon"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:16
-msgid ""
-"Duration the pointer must rest in a screen edge before an edge action is "
-"taken."
+msgid "Default window icon image"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:17
-msgid "Edge Trigger Delay"
+msgid "Save plugin states on unload"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:18
-msgid "Focus &amp; Raise Behaviour"
+msgid ""
+"Save the state of plugins when they are unloaded such they will resume their "
+"past internal state when reloaded"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:19
-msgid "Focus Prevention Level"
+msgid "Display Settings"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:20
-msgid "Focus Prevention Windows"
+msgid "Overlapping Output Handling"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:21
-msgid "Focus prevention windows"
+msgid "Which one of overlapping output devices should be preferred"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:22
-msgid "General Options"
+msgid "Smart mode"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:23
-msgid "General compiz options"
+msgid "Prefer larger output"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:24
-msgid "Hide Skip Taskbar Windows"
+msgid "Prefer smaller output"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:25
-msgid "Hide all windows and focus desktop"
+msgid "Detect Outputs"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:26
-msgid "Hide windows not in taskbar when entering show desktop mode"
+msgid "Automatic detection of output devices"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:27
-msgid "High"
+msgid "Outputs"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:28
-msgid "Horizontal Virtual Size"
+msgid "List of strings describing output devices"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:29
-msgid "Ignore Hints When Maximized"
+msgid "Focus &amp; Raise Behaviour"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:30
-msgid "Ignore size increment and aspect hints when window is maximized"
+msgid "Click To Focus"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:31
-msgid "Interval before raising selected windows"
+msgid "Click on window moves input focus to it"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:32
-msgid "Interval between ping messages"
+msgid "Raise On Click"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:33
-msgid "Key bindings"
+msgid "Raise windows when clicked"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:34
-msgid "Level of focus stealing prevention"
+msgid "Auto-Raise"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:35
-msgid "List of currently active plugins"
+msgid "Raise selected windows after interval"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:36
-msgid "List of strings describing output devices"
+msgid "Auto-Raise Delay"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:37
-msgid "Low"
+msgid "Interval before raising selected windows"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:38
-msgid "Lower Window"
+msgid "Focus Prevention Level"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:39
-msgid "Lower window beneath other windows"
+msgid "Level of focus stealing prevention"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:40
-msgid "Maximize Window"
+msgid "Off"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:41
-msgid "Maximize Window Horizontally"
+msgid "Low"
 msgstr ""
 
-#: ../metadata/core.xml.in.h:42
-msgid "Maximize Window Vertically"
+#: ../metadata/core.xml.in.h:42 ../plugins/resize/resize.xml.in.h:8
+msgid "Normal"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:43
-msgid "Maximize active window"
+msgid "High"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:44
-msgid "Maximize active window horizontally"
+msgid "Very High"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:45
-msgid "Maximize active window vertically"
+msgid "Focus Prevention Windows"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:46
-msgid "Minimize Window"
+msgid "Focus prevention windows"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:47
-msgid "Minimize active window"
+msgid "Key bindings"
 msgstr ""
 
-#: ../metadata/core.xml.in.h:48 ../plugins/resize/resize.xml.in.h:14
-msgid "Normal"
-msgstr ""
+#: ../metadata/core.xml.in.h:48
+msgid "Close Window"
+msgstr "Cau'r Ffenest"
 
 #: ../metadata/core.xml.in.h:49
-msgid "Number of Desktops"
+msgid "Close active window"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:50
-msgid "Number of virtual desktops"
+msgid "Raise Window"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:51
-msgid "Off"
+msgid "Raise window above other windows"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:52
-msgid "Outputs"
+msgid "Lower Window"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:53
-msgid "Overlapping Output Handling"
+msgid "Lower window beneath other windows"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:54
-msgid "Ping Delay"
+msgid "Minimize Window"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:55
-msgid "Prefer larger output"
+msgid "Minimize active window"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:56
-msgid "Prefer smaller output"
+msgid "Maximize Window"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:57
-msgid "Raise On Click"
+msgid "Maximize active window"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:58
-msgid "Raise Window"
+msgid "Unmaximize Window"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:59
-msgid "Raise selected windows after interval"
+msgid "Unmaximize active window"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:60
-msgid "Raise window above other windows"
+msgid "Maximize Window Horizontally"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:61
-msgid "Raise windows when clicked"
+msgid "Maximize active window horizontally"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:62
-msgid "Save plugin states on unload"
+msgid "Maximize Window Vertically"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:63
-msgid ""
-"Save the state of plugins when they are unloaded such they will resume their "
-"past internal state when reloaded"
+msgid "Maximize active window vertically"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:64
-msgid "Screen size multiplier for horizontal virtual size"
+msgid "Window Menu"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:65
-msgid "Screen size multiplier for vertical virtual size"
+msgid "Window menu key binding"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:66
-msgid "Show Desktop"
+msgid "Window menu button binding"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:67
-msgid "Smart mode"
+msgid "Show Desktop"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:68
-msgid "Toggle Window Maximized"
+msgid "Hide all windows and focus desktop"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:69
-msgid "Toggle Window Maximized Horizontally"
+msgid "Toggle Window Maximized"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:70
-msgid "Toggle Window Maximized Vertically"
+msgid "Toggle active window maximized"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:71
-msgid "Toggle Window Shaded"
+msgid "Toggle Window Maximized Horizontally"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:72
-msgid "Toggle active window maximized"
+msgid "Toggle active window maximized horizontally"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:73
-msgid "Toggle active window maximized horizontally"
+msgid "Toggle Window Maximized Vertically"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:74
@@ -389,132 +389,132 @@
 msgstr ""
 
 #: ../metadata/core.xml.in.h:75
-msgid "Toggle active window shaded"
+msgid "Toggle Window Shaded"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:76
-msgid "Unmaximize Window"
+msgid "Toggle active window shaded"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:77
-msgid "Unmaximize active window"
+msgid "Desktop Size"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:78
-msgid "Vertical Virtual Size"
+msgid "Horizontal Virtual Size"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:79
-msgid "Very High"
+msgid "Screen size multiplier for horizontal virtual size"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:80
-msgid "Which one of overlapping output devices should be preferred"
+msgid "Vertical Virtual Size"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:81
-msgid "Window Menu"
+msgid "Screen size multiplier for vertical virtual size"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:82
-msgid "Window menu button binding"
+msgid "Number of Desktops"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:83
-msgid "Window menu key binding"
+msgid "Number of virtual desktops"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:1
-msgid "4xBilinear"
+msgid "Blur Windows"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:2
-msgid "Alpha Blur"
+msgid "Blur windows"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:3
-msgid "Alpha blur windows"
+msgid "Pulse"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:4
-msgid "Blur Filter"
+msgid "Pulse effect"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:5
-msgid "Blur Occlusion"
+msgid "Blur Speed"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:6
-msgid "Blur Saturation"
+msgid "Window blur speed"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:7
-msgid "Blur Speed"
+msgid "Focus blur windows"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:8
-msgid "Blur Windows"
+msgid "Windows that should be affected by focus blur"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:9
-msgid "Blur behind translucent parts of windows"
+msgid "Focus Blur"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:10
-msgid "Blur saturation"
+msgid "Blur windows that doesn't have focus"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:11
-msgid "Blur windows"
+msgid "Alpha blur windows"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:12
-msgid "Blur windows that doesn't have focus"
+msgid "Windows that should be use alpha blur by default"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:13
-msgid "Disable blurring of screen regions obscured by other windows."
+msgid "Alpha Blur"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:14
-msgid "Filter method used for blurring"
+msgid "Blur behind translucent parts of windows"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:15
-msgid "Focus Blur"
+msgid "Blur Filter"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:16
-msgid "Focus blur windows"
+msgid "Filter method used for blurring"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:17
-msgid "Gaussian"
+msgid "4xBilinear"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:18
-msgid "Gaussian Radius"
+msgid "Gaussian"
 msgstr ""
 
-#: ../plugins/blur/blur.xml.in.h:19
-msgid "Gaussian Strength"
+#: ../plugins/blur/blur.xml.in.h:19 ../plugins/decor/decor.xml.in.h:17
+#: ../plugins/switcher/switcher.xml.in.h:25
+msgid "Mipmap"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:20
-msgid "Gaussian radius"
+msgid "Gaussian Radius"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:21
-msgid "Gaussian strength"
+msgid "Gaussian radius"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:22
-msgid "Independent texture fetch"
+msgid "Gaussian Strength"
 msgstr ""
 
-#: ../plugins/blur/blur.xml.in.h:23 ../plugins/decor/decor.xml.in.h:10
-#: ../plugins/switcher/switcher.xml.in.h:16
-msgid "Mipmap"
+#: ../plugins/blur/blur.xml.in.h:23
+msgid "Gaussian strength"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:24
@@ -526,697 +526,696 @@
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:26
-msgid "Pulse"
+msgid "Blur Saturation"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:27
-msgid "Pulse effect"
+msgid "Blur saturation"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:28
-msgid ""
-"Use the available texture units to do as many as possible independent "
-"texture fetches."
+msgid "Blur Occlusion"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:29
-msgid "Window blur speed"
+msgid "Disable blurring of screen regions obscured by other windows."
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:30
-msgid "Windows that should be affected by focus blur"
+msgid "Independent texture fetch"
 msgstr ""
 
 #: ../plugins/blur/blur.xml.in.h:31
-msgid "Windows that should be use alpha blur by default"
+msgid ""
+"Use the available texture units to do as many as possible independent "
+"texture fetches."
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:1
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command0"
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:7
+msgid "Commands"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:2
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command1"
+msgid "Assigns bundings to arbitrary commands"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:3
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command10"
+msgid "Command line 0"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:4
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command11"
+msgid "Command line to be executed in shell when run_command0 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:5
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command12"
+msgid "Command line 1"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:6
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command13"
+msgid "Command line to be executed in shell when run_command1 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:7
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command14"
+msgid "Command line 2"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:8
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command2"
+msgid "Command line to be executed in shell when run_command2 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:9
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command3"
+msgid "Command line 3"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:10
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command4"
+msgid "Command line to be executed in shell when run_command3 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:11
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command5"
+msgid "Command line 4"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:12
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command6"
+msgid "Command line to be executed in shell when run_command4 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:13
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command7"
+msgid "Command line 5"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:14
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command8"
+msgid "Command line to be executed in shell when run_command5 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:15
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command9"
+msgid "Command line 6"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:16
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command15"
+msgid "Command line to be executed in shell when run_command6 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:17
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command16"
+msgid "Command line 7"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:18
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command17"
+msgid "Command line to be executed in shell when run_command7 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:19
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command18"
+msgid "Command line 8"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:20
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command19"
+msgid "Command line to be executed in shell when run_command8 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:21
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command20"
+msgid "Command line 9"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:22
-msgid ""
-"A edge binding that when invoked, will run the shell command identified by "
-"command12"
+msgid "Command line to be executed in shell when run_command9 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:23
-msgid ""
-"A edge binding that when invoked, will run the shell command identified by "
-"command13"
+msgid "Command line 10"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:24
-msgid ""
-"A edge binding that when invoked, will run the shell command identified by "
-"command14"
+msgid "Command line to be executed in shell when run_command10 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:25
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command15"
+msgid "Command line 11"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:26
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command16"
+msgid "Command line to be executed in shell when run_command11 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:27
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command17"
+msgid "Command line 12"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:28
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command18"
+msgid "Command line to be executed in shell when run_command12 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:29
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command19"
+msgid "Command line 13"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:30
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command20"
+msgid "Command line to be executed in shell when run_command13 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:31
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command0"
+msgid "Command line 14"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:32
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command1"
+msgid "Command line to be executed in shell when run_command14 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:33
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command10"
+msgid "Command line 15"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:34
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command11"
+msgid "Command line to be executed in shell when run_command15 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:35
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command12"
+msgid "Command line 16"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:36
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command13"
+msgid "Command line to be executed in shell when run_command16 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:37
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command14"
+msgid "Command line 17"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:38
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command15"
+msgid "Command line to be executed in shell when run_command17 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:39
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command16"
+msgid "Command line 18"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:40
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command17"
+msgid "Command line to be executed in shell when run_command18 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:41
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command18"
+msgid "Command line 19"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:42
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command19"
+msgid "Command line to be executed in shell when run_command19 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:43
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command2"
+msgid "Command line 20"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:44
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command20"
+msgid "Command line to be executed in shell when run_command20 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:45
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command3"
+msgid "Key Bindings"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:46
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command4"
+msgid "Run command 0"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:47
 msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command5"
+"A keybunding that when invoked, will run the shell command identified by "
+"command0"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:48
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command6"
+msgid "Run command 1"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:49
 msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command7"
+"A keybunding that when invoked, will run the shell command identified by "
+"command1"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:50
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command8"
+msgid "Run command 2"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:51
 msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command9"
+"A keybunding that when invoked, will run the shell command identified by "
+"command2"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:52
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command0"
+msgid "Run command 3"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:53
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command1"
+"A keybunding that when invoked, will run the shell command identified by "
+"command3"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:54
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command10"
+msgid "Run command 4"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:55
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command11"
+"A keybunding that when invoked, will run the shell command identified by "
+"command4"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:56
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command2"
+msgid "Run command 5"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:57
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command3"
+"A keybunding that when invoked, will run the shell command identified by "
+"command5"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:58
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command4"
+msgid "Run command 6"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:59
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command5"
+"A keybunding that when invoked, will run the shell command identified by "
+"command6"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:60
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command6"
+msgid "Run command 7"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:61
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
+"A keybunding that when invoked, will run the shell command identified by "
 "command7"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:62
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command8"
+msgid "Run command 8"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:63
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command9"
+"A keybunding that when invoked, will run the shell command identified by "
+"command8"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:64
-msgid "Assigns bindings to arbitrary commands"
+msgid "Run command 9"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:65
-msgid "Button Bindings"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command9"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:66
-msgid "Command line 0"
+msgid "Run command 10"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:67
-msgid "Command line 1"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command10"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:68
-msgid "Command line 10"
+msgid "Run command 11"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:69
-msgid "Command line 11"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command11"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:70
-msgid "Command line 12"
+msgid "Run command 12"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:71
-msgid "Command line 13"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command12"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:72
-msgid "Command line 14"
+msgid "Run command 13"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:73
-msgid "Command line 15"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command13"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:74
-msgid "Command line 16"
+msgid "Run command 14"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:75
-msgid "Command line 17"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command14"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:76
-msgid "Command line 18"
+msgid "Run command 15"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:77
-msgid "Command line 19"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command15"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:78
-msgid "Command line 2"
+msgid "Run command 16"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:79
-msgid "Command line 20"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command16"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:80
-msgid "Command line 3"
+msgid "Run command 17"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:81
-msgid "Command line 4"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command17"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:82
-msgid "Command line 5"
+msgid "Run command 18"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:83
-msgid "Command line 6"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command18"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:84
-msgid "Command line 7"
+msgid "Run command 19"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:85
-msgid "Command line 8"
-msgstr ""
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command19"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:86
-msgid "Command line 9"
+msgid "Run command 20"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:87
-msgid "Command line to be executed in shell when run_command0 is invoked"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command20"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:88
-msgid "Command line to be executed in shell when run_command1 is invoked"
+msgid "Button Bindings"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:89
-msgid "Command line to be executed in shell when run_command10 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command0"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:90
-msgid "Command line to be executed in shell when run_command11 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command1"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:91
-msgid "Command line to be executed in shell when run_command12 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command2"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:92
-msgid "Command line to be executed in shell when run_command13 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command3"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:93
-msgid "Command line to be executed in shell when run_command14 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command4"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:94
-msgid "Command line to be executed in shell when run_command15 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command5"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:95
-msgid "Command line to be executed in shell when run_command16 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command6"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:96
-msgid "Command line to be executed in shell when run_command17 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command7"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:97
-msgid "Command line to be executed in shell when run_command18 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command8"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:98
-msgid "Command line to be executed in shell when run_command19 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command9"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:99
-msgid "Command line to be executed in shell when run_command2 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command10"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:100
-msgid "Command line to be executed in shell when run_command20 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command11"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:101
-msgid "Command line to be executed in shell when run_command3 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command12"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:102
-msgid "Command line to be executed in shell when run_command4 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command13"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:103
-msgid "Command line to be executed in shell when run_command5 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command14"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:104
-msgid "Command line to be executed in shell when run_command6 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command15"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:105
-msgid "Command line to be executed in shell when run_command7 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command16"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:106
-msgid "Command line to be executed in shell when run_command8 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command17"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:107
-msgid "Command line to be executed in shell when run_command9 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command18"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:108
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:1
-msgid "Commands"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command19"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:109
-msgid "Edge Bindings"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command20"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:110
-msgid "Key Bindings"
+msgid "Edge Bindings"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:111
-msgid "Run command 0"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command0"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:112
-msgid "Run command 1"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command1"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:113
-msgid "Run command 10"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command2"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:114
-msgid "Run command 11"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command3"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:115
-msgid "Run command 12"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command4"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:116
-msgid "Run command 13"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command5"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:117
-msgid "Run command 14"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command6"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:118
-msgid "Run command 15"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command7"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:119
-msgid "Run command 16"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command8"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:120
-msgid "Run command 17"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command9"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:121
-msgid "Run command 18"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command10"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:122
-msgid "Run command 19"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command11"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:123
-msgid "Run command 2"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command12"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:124
-msgid "Run command 20"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command13"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:125
-msgid "Run command 3"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command14"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:126
-msgid "Run command 4"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command15"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:127
-msgid "Run command 5"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command16"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:128
-msgid "Run command 6"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command17"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:129
-msgid "Run command 7"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command18"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:130
-msgid "Run command 8"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command19"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:131
-msgid "Run command 9"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command20"
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:1
-msgid ""
-"Allow drawing of fullscreen windows to not be redirected to offscreen pixmaps"
+msgid "Composite"
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:2
-msgid "Automatic detection of refresh rate"
+msgid "Composite plugin"
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:3
-msgid "Composite"
+msgid "Slow Animations"
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:4
-msgid "Composite plugin"
+msgid "Toggle use of slow animations"
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:5
@@ -1224,146 +1223,158 @@
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:6
-msgid "Force independent output painting."
+msgid "Automatic detection of refresh rate"
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:7
-msgid ""
-"Paint each output device independly, even if the output devices overlap"
+msgid "Refresh Rate"
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:8
-msgid "Refresh Rate"
+msgid "The rate at which the screen is redrawn (times/second)"
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:9
-msgid "Slow Animations"
+msgid "Unredirect Fullscreen Windows"
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:10
-msgid "The rate at which the screen is redrawn (times/second)"
+msgid ""
+"Allow drawing of fullscreen windows to not be redirected to offscreen pixmaps"
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:11
-msgid "Toggle use of slow animations"
+msgid "Force independent output painting."
 msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:12
-msgid "Unredirect Fullscreen Windows"
+msgid ""
+"Paint each output device independly, even if the output devices overlap"
 msgstr ""
 
 #: ../plugins/copytex/copytex.xml.in.h:1
-msgid "Copy pixmap content to texture"
+msgid "Copy to texture"
 msgstr ""
 
 #: ../plugins/copytex/copytex.xml.in.h:2
-msgid "Copy to texture"
+msgid "Copy pixmap content to texture"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:1
-msgid "Allow mipmaps to be generated for decoration textures"
+msgid "Window Decoration"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:2
-msgid "Command"
+msgid "Window decorations"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:3
-msgid "Decoration windows"
+msgid "Active Shadow"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:4
-msgid ""
-"Decorator command line that is executed if no decorator is already running"
+msgid "Shadow Radius"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:5
-msgid "Drop shadow X offset"
+msgid "Drop shadow radius"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:6
-msgid "Drop shadow Y offset"
+msgid "Shadow Opacity"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:7
-msgid "Drop shadow color"
+msgid "Drop shadow opacity"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:8
-msgid "Drop shadow opacity"
+msgid "Shadow Color"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:9
-msgid "Drop shadow radius"
+msgid "Drop shadow color"
+msgstr ""
+
+#: ../plugins/decor/decor.xml.in.h:10
+msgid "Shadow Offset X"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:11
-msgid "Shadow Color"
+msgid "Drop shadow X offset"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:12
-msgid "Shadow Offset X"
+msgid "Shadow Offset Y"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:13
-msgid "Shadow Offset Y"
+msgid "Drop shadow Y offset"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:14
-msgid "Shadow Opacity"
+msgid "Inactive Shadow"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:15
-msgid "Shadow Radius"
+msgid "Command"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:16
-msgid "Shadow windows"
-msgstr ""
-
-#: ../plugins/decor/decor.xml.in.h:17
-msgid "Window Decoration"
+msgid ""
+"Decorator command line that is executed if no decorator is already running"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:18
-msgid "Window decorations"
+msgid "Allow mipmaps to be generated for decoration textures"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:19
-msgid "Windows that should be decorated"
+msgid "Decoration windows"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:20
+msgid "Windows that should be decorated"
+msgstr ""
+
+#: ../plugins/decor/decor.xml.in.h:21
+msgid "Shadow windows"
+msgstr ""
+
+#: ../plugins/decor/decor.xml.in.h:22
 msgid "Windows that should have a shadow"
 msgstr ""
 
+#: ../plugins/fade/fade.xml.in.h:1
+msgid "Fading Windows"
+msgstr ""
+
 #: ../plugins/fade/fade.xml.in.h:2
-#, no-c-format
-msgid "Brightness (in %) of unresponsive windows"
+msgid "Fade in windows when mapped and fade out windows when unmapped"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:3
-msgid "Constant speed"
+msgid "Fade Mode"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:4
-msgid "Constant time"
+msgid "Window fade mode"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:5
-msgid "Dim Unresponsive Windows"
+msgid "Constant speed"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:6
-msgid "Dim windows that are not responding to window manager requests"
+msgid "Constant time"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:7
-msgid "Fade Mode"
+msgid "Fade Speed"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:8
-msgid "Fade Speed"
+msgid "Window fade speed"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:9
@@ -1371,72 +1382,73 @@
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:10
-msgid "Fade effect on system beep"
+msgid "Window fade time (in ms) in \"Constant time\" mode"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:11
-msgid "Fade in windows when mapped and fade out windows when unmapped"
+msgid "Fade windows"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:12
-msgid "Fade windows"
+msgid "Windows that should be fading"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:13
-msgid "Fading Windows"
+msgid "Visual Bell"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:14
-msgid "Fullscreen Visual Bell"
+msgid "Fade effect on system beep"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:15
+msgid "Fullscreen Visual Bell"
+msgstr ""
+
+#: ../plugins/fade/fade.xml.in.h:16
 msgid "Fullscreen fade effect on system beep"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:17
-#, no-c-format
-msgid "Saturation (in %) of unresponsive windows"
+msgid "Dim Unresponsive Windows"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:18
-msgid "Unresponsive Window Brightness"
+msgid "Dim windows that are not responding to window manager requests"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:19
-msgid "Unresponsive Window Saturation"
-msgstr ""
-
-#: ../plugins/fade/fade.xml.in.h:20
-msgid "Visual Bell"
+msgid "Unresponsive Window Brightness"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:21
-msgid "Window fade mode"
+#, no-c-format
+msgid "Brightness (in %) of unresponsive windows"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:22
-msgid "Window fade speed"
+msgid "Unresponsive Window Saturation"
 msgstr ""
 
-#: ../plugins/fade/fade.xml.in.h:23
-msgid "Window fade time (in ms) in \"Constant time\" mode"
+#: ../plugins/fade/fade.xml.in.h:24
+#, no-c-format
+msgid "Saturation (in %) of unresponsive windows"
 msgstr ""
 
-#: ../plugins/fade/fade.xml.in.h:24
-msgid "Windows that should be fading"
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:1
+msgid "Gnome Compatibility"
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:2
-msgid "Gnome Compatibility"
+msgid "Options that keep Compiz compatible to the Gnome desktop environment"
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:3
-msgid "Open a terminal"
+msgid "Show Main Menu"
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:4
-msgid "Options that keep Compiz compatible to the Gnome desktop environment"
+msgid "Show the main menu"
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:5
@@ -1444,31 +1456,27 @@
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:6
-msgid "Run terminal command"
-msgstr ""
-
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:7
-msgid "Screenshot command line"
+msgid "Show Run Application dialog"
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:8
-msgid "Show Main Menu"
+msgid "Screenshot command line"
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:9
-msgid "Show Run Application dialog"
+msgid "Take a screenshot"
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:10
-msgid "Show the main menu"
+msgid "Window screenshot command line"
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:11
-msgid "Take a screenshot"
+msgid "Take a screenshot of a window"
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:12
-msgid "Take a screenshot of a window"
+msgid "Run terminal command"
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:13
@@ -1476,7 +1484,7 @@
 msgstr ""
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:14
-msgid "Window screenshot command line"
+msgid "Open a terminal"
 msgstr ""
 
 #: ../plugins/imgpng/imgpng.xml.in.h:1
@@ -1488,27 +1496,19 @@
 msgstr ""
 
 #: ../plugins/imgsvg/imgsvg.xml.in.h:1
-msgid "Set overlay"
+msgid "Svg"
 msgstr ""
 
 #: ../plugins/imgsvg/imgsvg.xml.in.h:2
-msgid "Set window overlay"
+msgid "Svg image loader"
 msgstr ""
 
 #: ../plugins/imgsvg/imgsvg.xml.in.h:3
-msgid "Svg"
+msgid "Set overlay"
 msgstr ""
 
 #: ../plugins/imgsvg/imgsvg.xml.in.h:4
-msgid "Svg image loader"
-msgstr ""
-
-#: ../plugins/ini/ini.xml.in.h:1
-msgid "Ini"
-msgstr ""
-
-#: ../plugins/ini/ini.xml.in.h:2
-msgid "Ini Flat File Backend"
+msgid "Set window overlay"
 msgstr ""
 
 #: ../plugins/inotify/inotify.xml.in.h:1
@@ -1520,41 +1520,40 @@
 msgstr ""
 
 #: ../plugins/move/move.xml.in.h:1
-msgid "Constrain Y"
+msgid "Move Window"
 msgstr ""
 
 #: ../plugins/move/move.xml.in.h:2
-msgid "Constrain Y coordinate to workspace area"
+msgid "Move window"
 msgstr ""
 
 #: ../plugins/move/move.xml.in.h:3
-msgid ""
-"Do not update the server-side position of windows until finished moving"
+msgid "Initiate Window Move"
 msgstr ""
 
 #: ../plugins/move/move.xml.in.h:4
-msgid "Initiate Window Move"
+msgid "Start moving window"
 msgstr ""
 
-#: ../plugins/move/move.xml.in.h:5
-msgid "Lazy Positioning"
+#: ../plugins/move/move.xml.in.h:5 ../plugins/scale/scale.xml.in.h:12
+#: ../plugins/switcher/switcher.xml.in.h:31
+msgid "Opacity"
 msgstr ""
 
 #: ../plugins/move/move.xml.in.h:6
-msgid "Move Window"
+msgid "Opacity level of moving windows"
 msgstr ""
 
 #: ../plugins/move/move.xml.in.h:7
-msgid "Move window"
+msgid "Constrain Y"
 msgstr ""
 
-#: ../plugins/move/move.xml.in.h:8 ../plugins/scale/scale.xml.in.h:29
-#: ../plugins/switcher/switcher.xml.in.h:23
-msgid "Opacity"
+#: ../plugins/move/move.xml.in.h:8
+msgid "Constrain Y coordinate to workspace area"
 msgstr ""
 
 #: ../plugins/move/move.xml.in.h:9
-msgid "Opacity level of moving windows"
+msgid "Snapoff maximized windows"
 msgstr ""
 
 #: ../plugins/move/move.xml.in.h:10
@@ -1562,228 +1561,229 @@
 msgstr ""
 
 #: ../plugins/move/move.xml.in.h:11
-msgid "Snapoff maximized windows"
+msgid "Lazy Positioning"
 msgstr ""
 
 #: ../plugins/move/move.xml.in.h:12
-msgid "Start moving window"
+msgid ""
+"Do not update the server-side position of windows until finished moving"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:1
-msgid "Best"
+msgid "OpenGL"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:2
-msgid "Fast"
+msgid "OpenGL Plugin"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:3
-msgid "Good"
+msgid "Texture Filter"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:4
-msgid "If available use compression for textures converted from images"
+msgid "Texture filtering"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:5
-msgid "Lighting"
+msgid "Fast"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:6
-msgid "Only perform screen updates during vertical blanking period"
+msgid "Good"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:7
-msgid "OpenGL"
+msgid "Best"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:8
-msgid "OpenGL Plugin"
+msgid "Lighting"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:9
-msgid "Sync To VBlank"
+msgid "Use diffuse light when screen is transformed"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:10
-msgid "Texture Compression"
+msgid "Sync To VBlank"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:11
-msgid "Texture Filter"
+msgid "Only perform screen updates during vertical blanking period"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:12
-msgid "Texture filtering"
+msgid "Texture Compression"
 msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:13
-msgid "Use diffuse light when screen is transformed"
+msgid "If available use compression for textures converted from images"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:1
-msgid "Algorithm to use for window placement"
+msgid "Place Windows"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:2
-msgid "Cascade"
+msgid "Place windows at appropriate positions when mapped"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:3
-msgid "Centered"
+msgid "Workarounds"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:4
-msgid "Fixed Window Placement"
+msgid "Window placement workarounds"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:5
-msgid "Force Placement Windows"
+msgid "Placement Mode"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:6
-msgid "Horizontal viewport positions"
+msgid "Algorithm to use for window placement"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:7
-msgid "Keep In Workarea"
+msgid "Cascade"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:8
-msgid ""
-"Keep placed window in work area, even if that means that the position might "
-"differ from the specified position"
+msgid "Centered"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:9
-msgid "Maximize"
+msgid "Smart"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:10
-msgid "Mode"
+msgid "Maximize"
 msgstr ""
 
-#: ../plugins/place/place.xml.in.h:11 ../plugins/scale/scale.xml.in.h:25
-msgid "Multi Output Mode"
+#: ../plugins/place/place.xml.in.h:11
+msgid "Random"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:12
-msgid "Place Windows"
+msgid "Pointer"
 msgstr ""
 
-#: ../plugins/place/place.xml.in.h:13
-msgid "Place across all outputs"
+#: ../plugins/place/place.xml.in.h:13 ../plugins/scale/scale.xml.in.h:26
+msgid "Multi Output Mode"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:14
-msgid "Place windows at appropriate positions when mapped"
+msgid ""
+"Selects how window placement should behave if multiple outputs are selected"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:15
-msgid "Placement Mode"
+msgid "Use active output device"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:16
-msgid "Pointer"
+msgid "Use output device with pointer"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:17
-msgid "Positioned windows"
+msgid "Use output device of focussed window"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:18
-msgid "Positioning modes"
+msgid "Place across all outputs"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:19
-msgid "Random"
+msgid "Force Placement Windows"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:20
 msgid ""
-"Selects how window placement should behave if multiple outputs are selected"
+"Windows that should forcedly be placed, even if they indicate the window "
+"manager should avoid placing them."
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:21
-msgid "Smart"
+msgid "Fixed Window Placement"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:22
-msgid "Use active output device"
+msgid "Windows with fixed positions"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:23
-msgid "Use output device of focussed window"
+msgid "Positioned windows"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:24
-msgid "Use output device with pointer"
+msgid "Windows that should be positioned by default"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:25
-msgid "Vertical viewport positions"
+msgid "X Positions"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:26
-msgid "Viewport positioned windows"
+msgid "X position values"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:27
-msgid "Window placement workarounds"
+msgid "Y Positions"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:28
-msgid "Windows"
+msgid "Y position values"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:29
-msgid "Windows that should be positioned by default"
+msgid "Keep In Workarea"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:30
-msgid "Windows that should be positioned in specific viewports by default"
+msgid ""
+"Keep placed window in work area, even if that means that the position might "
+"differ from the specified position"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:31
-msgid ""
-"Windows that should forcedly be placed, even if they indicate the window "
-"manager should avoid placing them."
+msgid "Windows with fixed placement mode"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:32
-msgid "Windows that should have a certain positioning mo+de"
+msgid "Windows"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:33
-msgid "Windows with fixed placement mode"
+msgid "Windows that should have a certain positioning mo+de"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:34
-msgid "Windows with fixed positions"
+msgid "Mode"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:35
-msgid "Windows with fixed viewport"
+msgid "Positioning modes"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:36
-msgid "Workarounds"
+msgid "Windows with fixed viewport"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:37
-msgid "X Positions"
+msgid "Viewport positioned windows"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:38
-msgid "X Viewport Positions"
+msgid "Windows that should be positioned in specific viewports by default"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:39
-msgid "X position values"
+msgid "X Viewport Positions"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:40
-msgid "Y Positions"
+msgid "Horizontal viewport positions"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:41
@@ -1791,7 +1791,7 @@
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:42
-msgid "Y position values"
+msgid "Vertical viewport positions"
 msgstr ""
 
 #: ../plugins/regex/regex.xml.in.h:1
@@ -1803,80 +1803,80 @@
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:1
-msgid "Additional Modifier Keys"
+msgid "Resize Window"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:2
-msgid "Alt"
+msgid "Resize window"
 msgstr ""
 
-#: ../plugins/resize/resize.xml.in.h:3 ../plugins/scale/scale.xml.in.h:5
-#: ../plugins/switcher/switcher.xml.in.h:6
+#: ../plugins/resize/resize.xml.in.h:3 ../plugins/scale/scale.xml.in.h:30
+#: ../plugins/switcher/switcher.xml.in.h:2
 msgid "Bindings"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:4
-msgid "Border Color"
+msgid "Initiate Window Resize"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:5
-msgid "Border color used for outline and rectangle resize modes"
+msgid "Start resizing window"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:6
-msgid "Centered Modifier"
+msgid "Default Resize Mode"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:7
-msgid "Control"
-msgstr ""
-
-#: ../plugins/resize/resize.xml.in.h:8
-msgid "Default Resize Mode"
+msgid "Default mode used for window resizing"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:9
-msgid "Default mode used for window resizing"
+msgid "Outline"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:10
-msgid "Fill Color"
+msgid "Rectangle"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:11
-msgid "Fill color used for rectangle resize mode"
+msgid "Stretch"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:12
-msgid "Initiate Window Resize"
+msgid "Border Color"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:13
-msgid "Meta"
+msgid "Border color used for outline and rectangle resize modes"
+msgstr ""
+
+#: ../plugins/resize/resize.xml.in.h:14
+msgid "Fill Color"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:15
-msgid "Normal Resize Windows"
+msgid "Fill color used for rectangle resize mode"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:16
-msgid "Outline"
+msgid "Specific Window Matches"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:17
-msgid "Outline Modifier"
+msgid "Normal Resize Windows"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:18
-msgid "Outline Resize Windows"
+msgid "Windows that normal resize should be used for"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:19
-msgid "Rectangle"
+msgid "Outline Resize Windows"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:20
-msgid "Rectangle Modifier"
+msgid "Windows that outline resize should be used for"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:21
@@ -1884,47 +1884,47 @@
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:22
-msgid "Resize Window"
+msgid "Windows that rectangle resize should be used for"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:23
-msgid "Resize window"
+msgid "Stretch Resize Windows"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:24
-msgid "Shift"
+msgid "Windows that stretch resize should be used for"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:25
-msgid "Specific Window Matches"
+msgid "Additional Modifier Keys"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:26
-msgid "Start resizing window"
+msgid "Outline Modifier"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:27
-msgid "Stretch"
+msgid "Use these bindings to resize with an outline."
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:28
-msgid "Stretch Modifier"
+msgid "Shift"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:29
-msgid "Stretch Resize Windows"
+msgid "Alt"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:30
-msgid "Use these bindings to resize by stretching."
+msgid "Control"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:31
-msgid "Use these bindings to resize from the center."
+msgid "Meta"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:32
-msgid "Use these bindings to resize with an outline."
+msgid "Rectangle Modifier"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:33
@@ -1932,467 +1932,421 @@
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:34
-msgid "Windows that normal resize should be used for"
+msgid "Stretch Modifier"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:35
-msgid "Windows that outline resize should be used for"
+msgid "Use these bindings to resize by stretching."
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:36
-msgid "Windows that rectangle resize should be used for"
+msgid "Centered Modifier"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:37
-msgid "Windows that stretch resize should be used for"
+msgid "Use these bindings to resize from the center."
 msgstr ""
 
-#: ../plugins/scale/scale.xml.in.h:1 ../plugins/switcher/switcher.xml.in.h:2
-msgid "Amount of opacity in percent"
+#: ../plugins/scale/scale.xml.in.h:1
+msgid "Scale"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:2
-msgid "Appearance"
+msgid "Scale windows"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:3
-msgid "Behaviour"
+msgid "Appearance"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:4
-msgid "Big"
+msgid "Spacing"
 msgstr ""
 
-#: ../plugins/scale/scale.xml.in.h:6
-msgid "Button Bindings Toggle Scale Mode"
+#: ../plugins/scale/scale.xml.in.h:5
+msgid "Space between windows"
+msgstr ""
+
+#: ../plugins/scale/scale.xml.in.h:6 ../plugins/switcher/switcher.xml.in.h:19
+msgid "Speed"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:7
-msgid ""
-"Button bindings toggle scale mode instead of enabling it when pressed and "
-"disabling it when released."
+msgid "Scale speed"
 msgstr ""
 
-#: ../plugins/scale/scale.xml.in.h:8
-msgid "Click Desktop to Show Desktop"
+#: ../plugins/scale/scale.xml.in.h:8 ../plugins/switcher/switcher.xml.in.h:21
+msgid "Timestep"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:9
-msgid "Darken Background"
+msgid "Scale timestep"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:10
-msgid "Darken background when scaling windows"
+msgid "Darken Background"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:11
-msgid "Drag and Drop Distance"
-msgstr ""
-
-#: ../plugins/scale/scale.xml.in.h:12
-msgid "Drag and Drop Hover Timeout"
+msgid "Darken background when scaling windows"
 msgstr ""
 
-#: ../plugins/scale/scale.xml.in.h:13
-msgid "Emblem"
+#: ../plugins/scale/scale.xml.in.h:13 ../plugins/switcher/switcher.xml.in.h:32
+msgid "Amount of opacity in percent"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:14
-msgid "Enter Show Desktop mode when Desktop is clicked during Scale"
+msgid "Overlay Icon"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:15
-msgid "Initiate Window Picker"
+msgid "Overlay an icon on windows once they are scaled"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:16
-msgid "Initiate Window Picker For All Windows"
+msgid "None"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:17
-msgid "Initiate Window Picker For Window Group"
+msgid "Emblem"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:18
-msgid "Initiate Window Picker For Windows on Current Output"
+msgid "Big"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:19
-msgid "Key Bindings Toggle Scale Mode"
+msgid "Behaviour"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:20
-msgid ""
-"Key bindings toggle scale mode instead of enabling it when pressed and "
-"disabling it when released."
+msgid "Scale Windows"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:21
-msgid "Layout and start transforming all windows"
+msgid "Windows that should be scaled in scale mode"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:22
-msgid "Layout and start transforming window group"
+msgid "Drag and Drop Hover Timeout"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:23
-msgid "Layout and start transforming windows"
+msgid ""
+"Time (in ms) before scale mode is terminated when hovering over a window "
+"dragging and dropping an item"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:24
-msgid "Layout and start transforming windows on current output"
+msgid "Drag and Drop Distance"
 msgstr ""
 
-#: ../plugins/scale/scale.xml.in.h:26
-msgid "None"
+#: ../plugins/scale/scale.xml.in.h:25
+msgid "The minimum distance (in px) beyond which the timeout is reset."
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:27
-msgid "On all output devices"
+msgid "Selects where windows are scaled if multiple output devices are used."
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:28
 msgid "On current output device"
 msgstr ""
 
-#: ../plugins/scale/scale.xml.in.h:30
-msgid "Overlay Icon"
+#: ../plugins/scale/scale.xml.in.h:29
+msgid "On all output devices"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:31
-msgid "Overlay an icon on windows once they are scaled"
+msgid "Key Bindings Toggle Scale Mode"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:32
-msgid "Scale"
+msgid ""
+"Key bindings toggle scale mode instead of enabling it when pressed and "
+"disabling it when released."
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:33
-msgid "Scale Windows"
+msgid "Button Bindings Toggle Scale Mode"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:34
-msgid "Scale speed"
+msgid ""
+"Button bindings toggle scale mode instead of enabling it when pressed and "
+"disabling it when released."
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:35
-msgid "Scale timestep"
+msgid "Initiate Window Picker"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:36
-msgid "Scale windows"
+msgid "Layout and start transforming windows"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:37
-msgid "Selects where windows are scaled if multiple output devices are used."
+msgid "Initiate Window Picker For All Windows"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:38
-msgid "Space between windows"
+msgid "Layout and start transforming all windows"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:39
-msgid "Spacing"
+msgid "Initiate Window Picker For Window Group"
 msgstr ""
 
-#: ../plugins/scale/scale.xml.in.h:40 ../plugins/switcher/switcher.xml.in.h:40
-#: ../plugins/zoom/zoom.xml.in.h:3
-msgid "Speed"
+#: ../plugins/scale/scale.xml.in.h:40
+msgid "Layout and start transforming window group"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:41
-msgid "The minimum distance (in px) beyond which the timeout is reset."
+msgid "Initiate Window Picker For Windows on Current Output"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:42
-msgid ""
-"Time (in ms) before scale mode is terminated when hovering over a window "
-"dragging and dropping an item"
+msgid "Layout and start transforming windows on current output"
 msgstr ""
 
-#: ../plugins/scale/scale.xml.in.h:43 ../plugins/switcher/switcher.xml.in.h:44
-#: ../plugins/zoom/zoom.xml.in.h:4
-msgid "Timestep"
+#: ../plugins/scale/scale.xml.in.h:43
+msgid "Click Desktop to Show Desktop"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:44
-msgid "Windows that should be scaled in scale mode"
+msgid "Enter Show Desktop mode when Desktop is clicked during Scale"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:1
-msgid "Amount of brightness in percent"
+msgid "Application Switcher"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:3
-msgid "Amount of saturation in percent"
+msgid "Next window"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:4
-msgid "Application Switcher"
+msgid "Popup switcher if not visible and select next window"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:5
-msgid "Auto Rotate"
+msgid "Prev window"
+msgstr ""
+
+#: ../plugins/switcher/switcher.xml.in.h:6
+msgid "Popup switcher if not visible and select previous window"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:7
-msgid "Brightness"
+msgid "Next window (All windows)"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:8
-msgid "Bring To Front"
+msgid ""
+"Popup switcher if not visible and select next window out of all windows"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:9
-msgid "Bring selected window to front"
+msgid "Prev window (All windows)"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:10
-msgid "Distance desktop should be zoom out while switching windows"
+msgid ""
+"Popup switcher if not visible and select previous window out of all windows"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:11
-msgid "Focus on Switch"
+msgid "Next window (No popup)"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:12
-msgid "Focus windows when they are visible during the switch"
+msgid "Select next window without showing the popup window."
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:13
-msgid "Generate mipmaps when possible for higher quality scaling"
+msgid "Prev window (No popup)"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:14
-msgid "Icon"
+msgid "Select previous window without showing the popup window."
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:15
-msgid "Minimized"
-msgstr ""
-
-#: ../plugins/switcher/switcher.xml.in.h:17
 msgid "Next Panel"
 msgstr ""
 
-#: ../plugins/switcher/switcher.xml.in.h:18
-msgid "Next window"
+#: ../plugins/switcher/switcher.xml.in.h:16
+msgid "Select next panel type window."
 msgstr ""
 
-#: ../plugins/switcher/switcher.xml.in.h:19
-msgid "Next window (All windows)"
+#: ../plugins/switcher/switcher.xml.in.h:17
+msgid "Prev Panel"
 msgstr ""
 
-#: ../plugins/switcher/switcher.xml.in.h:20
-msgid "Next window (No popup)"
+#: ../plugins/switcher/switcher.xml.in.h:18
+msgid "Select previous panel type window."
 msgstr ""
 
-#: ../plugins/switcher/switcher.xml.in.h:21
-msgid "Only show icon"
+#: ../plugins/switcher/switcher.xml.in.h:20
+msgid "Switcher speed"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:22
-msgid "Only show the window icon and do not display a thumbnail at all"
+msgid "Switcher timestep"
 msgstr ""
 
-#: ../plugins/switcher/switcher.xml.in.h:24
-msgid "Popup switcher if not visible and select next window"
+#: ../plugins/switcher/switcher.xml.in.h:23
+msgid "Switcher windows"
 msgstr ""
 
-#: ../plugins/switcher/switcher.xml.in.h:25
-msgid ""
-"Popup switcher if not visible and select next window out of all windows"
+#: ../plugins/switcher/switcher.xml.in.h:24
+msgid "Windows that should be shown in switcher"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:26
-msgid "Popup switcher if not visible and select previous window"
+msgid "Generate mipmaps when possible for higher quality scaling"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:27
-msgid ""
-"Popup switcher if not visible and select previous window out of all windows"
+msgid "Saturation"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:28
-msgid "Prev Panel"
+msgid "Amount of saturation in percent"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:29
-msgid "Prev window"
+msgid "Brightness"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:30
-msgid "Prev window (All windows)"
-msgstr ""
-
-#: ../plugins/switcher/switcher.xml.in.h:31
-msgid "Prev window (No popup)"
-msgstr ""
-
-#: ../plugins/switcher/switcher.xml.in.h:32
-msgid "Rotate to the selected window while switching"
+msgid "Amount of brightness in percent"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:33
-msgid "Saturation"
+msgid "Focus on Switch"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:34
-msgid "Select next panel type window."
+msgid "Focus windows when they are visible during the switch"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:35
-msgid "Select next window without showing the popup window."
+msgid "Bring To Front"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:36
-msgid "Select previous panel type window."
+msgid "Bring selected window to front"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:37
-msgid "Select previous window without showing the popup window."
+msgid "Zoom"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:38
-msgid "Show icon next to thumbnail"
+msgid "Distance desktop should be zoom out while switching windows"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:39
-msgid "Show minimized windows"
+msgid "Icon"
+msgstr ""
+
+#: ../plugins/switcher/switcher.xml.in.h:40
+msgid "Show icon next to thumbnail"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:41
-msgid "Switcher speed"
+msgid "Only show icon"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:42
-msgid "Switcher timestep"
+msgid "Only show the window icon and do not display a thumbnail at all"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:43
-msgid "Switcher windows"
+msgid "Minimized"
+msgstr ""
+
+#: ../plugins/switcher/switcher.xml.in.h:44
+msgid "Show minimized windows"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:45
-msgid "Windows that should be shown in switcher"
+msgid "Auto Rotate"
 msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:46
-msgid "Zoom"
+msgid "Rotate to the selected window while switching"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:1
-msgid "Add line"
+msgid "Water Effect"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:2
-msgid "Add point"
+msgid "Adds water effects to different desktop actions"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:3
-msgid "Adds water effects to different desktop actions"
+msgid "Initiate"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:4
-msgid "Delay (in ms) between each rain-drop"
+msgid "Enable pointer water effects"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:5
-msgid "Enable pointer water effects"
+msgid "Toggle rain"
 msgstr ""
 
-#: ../plugins/water/water.xml.in.h:6 ../plugins/zoom/zoom.xml.in.h:2
-msgid "Initiate"
+#: ../plugins/water/water.xml.in.h:6
+msgid "Toggle rain effect"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:7
-msgid "Line"
+msgid "Toggle wiper"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:8
-msgid "Offset Scale"
+msgid "Toggle wiper effect"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:9
-msgid "Point"
+msgid "Offset Scale"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:10
-msgid "Rain Delay"
+msgid "Water offset scale"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:11
-msgid "Title wave"
+msgid "Rain Delay"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:12
-msgid "Toggle rain"
+msgid "Delay (in ms) between each rain-drop"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:13
-msgid "Toggle rain effect"
+msgid "Title wave"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:14
-msgid "Toggle wiper"
+msgid "Wave effect from window title"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:15
-msgid "Toggle wiper effect"
+msgid "Point"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:16
-msgid "Water Effect"
+msgid "Add point"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:17
-msgid "Water offset scale"
+msgid "Line"
 msgstr ""
 
 #: ../plugins/water/water.xml.in.h:18
-msgid "Wave effect from window title"
-msgstr ""
-
-#: ../plugins/zoom/zoom.xml.in.h:1
-msgid "Filter Linear"
-msgstr ""
-
-#: ../plugins/zoom/zoom.xml.in.h:5
-msgid "Use linear filter when zoomed in"
-msgstr ""
-
-#: ../plugins/zoom/zoom.xml.in.h:6
-msgid "Zoom Desktop"
-msgstr ""
-
-#: ../plugins/zoom/zoom.xml.in.h:7
-msgid "Zoom In"
-msgstr ""
-
-#: ../plugins/zoom/zoom.xml.in.h:8
-msgid "Zoom Out"
-msgstr ""
-
-#: ../plugins/zoom/zoom.xml.in.h:9
-msgid "Zoom Pan"
-msgstr ""
-
-#: ../plugins/zoom/zoom.xml.in.h:10
-msgid "Zoom Speed"
-msgstr ""
-
-#: ../plugins/zoom/zoom.xml.in.h:11
-msgid "Zoom Timestep"
-msgstr ""
-
-#: ../plugins/zoom/zoom.xml.in.h:12
-msgid "Zoom and pan desktop cube"
-msgstr ""
-
-#: ../plugins/zoom/zoom.xml.in.h:13
-msgid "Zoom factor"
-msgstr ""
-
-#: ../plugins/zoom/zoom.xml.in.h:14
-msgid "Zoom pan"
+msgid "Add line"
 msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/debian-tasks.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/debian-tasks.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/debian-tasks.po	2012-01-02 18:14:13.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/debian-tasks.po	2012-02-23 07:17:25.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: cy\n"
 
 #. Description
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/desktop_kcm-gtk.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/desktop_kcm-gtk.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/desktop_kcm-gtk.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/desktop_kcm-gtk.po	2012-02-23 07:17:29.000000000 +0000
@@ -0,0 +1,28 @@
+# Welsh translation for kcm-gtk
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the kcm-gtk package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kcm-gtk\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-08-18 16:55+0000\n"
+"PO-Revision-Date: 2012-02-03 01:38+0000\n"
+"Last-Translator: David Jones <Unknown>\n"
+"Language-Team: Welsh <cy@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:16+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#: kcmgtk.desktop:2
+msgctxt "Name"
+msgid "GTK+ Appearance"
+msgstr "Golwg GTK+"
+
+#: kcmgtk.desktop:3
+msgctxt "Comment"
+msgid "Control the style and fonts used by GTK+ applications in KDE"
+msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/example-content.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/example-content.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/example-content.po	2012-01-02 18:14:14.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/example-content.po	2012-02-23 07:17:26.000000000 +0000
@@ -7,20 +7,20 @@
 msgstr ""
 "Project-Id-Version: example-content\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-06-22 22:50+0000\n"
+"POT-Creation-Date: 2012-01-30 12:22+0000\n"
 "PO-Revision-Date: 2010-03-02 18:44+0000\n"
 "Last-Translator: danielt998 <daniel@fearnley.net>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:30+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:33+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../data/examples.desktop.in.h:1
-msgid "Example content for Ubuntu"
-msgstr "Cynnwys enghraifft ar gyfer  Ubuntu"
-
-#: ../data/examples.desktop.in.h:2
 msgid "Examples"
 msgstr "Enghreifftiau"
+
+#: ../data/examples.desktop.in.h:2
+msgid "Example content for Ubuntu"
+msgstr "Cynnwys enghraifft ar gyfer  Ubuntu"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/failsafexinit.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/failsafexinit.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/failsafexinit.po	2012-01-02 18:14:02.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/failsafexinit.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,168 +0,0 @@
-# Welsh translation for xorg
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the xorg package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xorg\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-05 21:41+0000\n"
-"PO-Revision-Date: 2010-12-01 10:31+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Welsh <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:38+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#: debian/local/Failsafe/failsafeXinit:36
-msgid "Ubuntu Failsafe-X"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:51
-msgid "What would you like to do?"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:52
-#: debian/local/Failsafe/failsafeXinit:71
-#: debian/local/Failsafe/failsafeXinit:84
-msgid "Choice"
-msgstr "Dewis"
-
-#: debian/local/Failsafe/failsafeXinit:53
-msgid "Run Ubuntu in low-graphics mode for just one session"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:54
-msgid "Reconfigure graphics"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:55
-msgid "Troubleshoot the error"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:56
-msgid "Exit to console login"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:57
-msgid "Restart X"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:68
-msgid "Reconfiguration"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:69
-msgid "How would you like to reconfigure your display?"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:72
-msgid "Use default (generic) configuration"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:73
-msgid "Create new configuration for this hardware"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:74
-msgid "Use your backed-up configuration"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:81
-msgid "Troubleshooting"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:82
-msgid "What information would you like to review?"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:85
-msgid "Review the xserver log file"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:86
-msgid "Review the startup errors"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:87
-msgid "Edit configuration file"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:88
-msgid "Archive configuration and logs"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:99
-msgid ""
-"A bug report has been written.\\nYou can send it next time you log in."
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:101
-msgid "Your bug could not be recorded successfully.\\n"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:104
-#, sh-format
-msgid "Cannot file bug:  \\$apport_hook is not present."
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:113
-msgid ""
-"Your config could not be backed up.\\nDo you want to continue anyway?\\n"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:122
-msgid ""
-"Your configuration has been restored to default,\\nand your old "
-"configuration backed up.\\nPlease restart.\\n"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:124
-msgid ""
-"Failure restoring configuration to default.\\nYour config has not been "
-"changed."
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:133
-msgid ""
-"A new configuration has been generated,\\nand your old configuration backed "
-"up.\\nPlease restart.\\n"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:135
-msgid "Could not generate a new configuration"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:149
-msgid "Sorry, this option is not implemented yet"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:177
-#, sh-format
-msgid "Relevant configuration and log files have been saved to:\\n"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:177
-msgid "Bug reports can be submitted at http://www.launchpad.net/ubuntu/.\\n"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:184
-msgid ""
-"<big><b>Ubuntu is running in low-graphics mode</b></big>\\n\\nYour screen, "
-"graphics card, and input device settings\\ncould not be detected correctly.  "
-"You will need to configure these yourself."
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:186
-msgid ""
-"<big><b>Ubuntu is running in low-graphics mode</b></big>\\n\\nThe following "
-"error was encountered.  You may need\\nto update your configuration to solve "
-"this.\\n\\n"
-msgstr ""
-
-#: debian/local/Failsafe/failsafeXinit:230
-msgid "Stand by one minute while the display restarts..."
-msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/friendly-recovery.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/friendly-recovery.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/friendly-recovery.po	2012-01-02 18:14:17.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/friendly-recovery.po	2012-02-23 07:17:28.000000000 +0000
@@ -7,67 +7,187 @@
 msgstr ""
 "Project-Id-Version: friendly-recovery\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 17:09-0400\n"
+"POT-Creation-Date: 2012-02-16 12:08-0500\n"
 "PO-Revision-Date: 2010-12-11 16:41+0000\n"
 "Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:57+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:56+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../lib/recovery-mode/recovery-menu:7
+#: ../lib/recovery-mode/options/apt-snapshots:20
 #, sh-format
-msgid "Recovery Menu"
-msgstr "Dewislen Adferiad"
+msgid "Revert to old snapshot and reboot"
+msgstr ""
 
-#: ../lib/recovery-mode/recovery-menu:13
+#: ../lib/recovery-mode/options/apt-snapshots:31
 #, sh-format
-msgid "   Resume normal boot"
-msgstr "   Ailgydio ailgychwyn normal"
+msgid "Snapshot"
+msgstr ""
 
-#: ../lib/recovery-mode/recovery-menu:26
+#: ../lib/recovery-mode/options/clean:6
 #, sh-format
-msgid "Couldn't find whiptail, starting root shell instead of recovery menu."
-msgstr ""
+msgid "Try to make free space"
+msgstr "Ceisio creu lle rhydd"
 
-#: ../lib/recovery-mode/options/dpkg:6
+#: ../lib/recovery-mode/options/clean:12
 #, sh-format
-msgid "Repair broken packages"
-msgstr "Trwsio pecynnau wedi torri"
+msgid ""
+"Trying to find packages you don't need (apt-get autoremove), please review "
+"carefully."
+msgstr ""
 
-#: ../lib/recovery-mode/options/dpkg:33
+#: ../lib/recovery-mode/options/clean:16 ../lib/recovery-mode/options/dpkg:41
+#: ../lib/recovery-mode/options/grub:16 ../lib/recovery-mode/recovery-menu:84
 #, sh-format
 msgid "Finished, please press ENTER"
 msgstr "Wedi gorffen, pwysa ENTER"
 
-#: ../lib/recovery-mode/options/fsck:8
-#, sh-format
-msgid "Reboot into file system check"
-msgstr "Ailgychwyn i wirio system ffeiliau"
-
-#: ../lib/recovery-mode/options/root:6
+#: ../lib/recovery-mode/options/dpkg:6
 #, sh-format
-msgid "Drop to root shell prompt"
-msgstr "Disgyn i awgrymeb plisgyn gwraidd"
+msgid "Repair broken packages"
+msgstr "Trwsio pecynnau wedi torri"
 
 #: ../lib/recovery-mode/options/failsafeX:11
 #, sh-format
 msgid "Run in failsafe graphic mode"
 msgstr "Rhedeg ym modd graffeg difethiant"
 
-#: ../lib/recovery-mode/options/netroot:6
+#: ../lib/recovery-mode/options/fsck:6
 #, sh-format
-msgid "Drop to root shell prompt with networking"
-msgstr "Disgyn i awgrymeb plisgyn gwraidd gyda rhydweithio"
+msgid "Check all file systems"
+msgstr ""
 
 #: ../lib/recovery-mode/options/grub:6
 #, sh-format
 msgid "Update grub bootloader"
 msgstr "Diweddaru llwythwr cychwyn grub"
 
-#: ../lib/recovery-mode/options/clean:6
+#: ../lib/recovery-mode/options/network:6
 #, sh-format
-msgid "Try to make free space"
-msgstr "Ceisio creu lle rhydd"
+msgid "Enable networking"
+msgstr ""
+
+#: ../lib/recovery-mode/options/root:9
+#, sh-format
+msgid "Drop to root shell prompt"
+msgstr "Disgyn i awgrymeb plisgyn gwraidd"
+
+#: ../lib/recovery-mode/options/system-summary:9
+#: ../lib/recovery-mode/options/system-summary:57
+#, sh-format
+msgid "System summary"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:15
+#, sh-format
+msgid "Read-only mode"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:17
+#, sh-format
+msgid "Read/Write mode"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:21
+#, sh-format
+msgid "none"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:23
+#, sh-format
+msgid "IP configured"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:25
+#, sh-format
+msgid "IP and DNS configured"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:36
+#, sh-format
+msgid "No software RAID detected (mdstat)"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:39
+#, sh-format
+msgid "=== General information ==="
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:40
+#, sh-format
+msgid "System mode:"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:41
+#, sh-format
+msgid "CPU information:"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:42
+#, sh-format
+msgid "Network connectivity:"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:44
+#, sh-format
+msgid "=== Detailed disk usage ==="
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:47
+#, sh-format
+msgid "=== Software RAID state ==="
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:50
+#, sh-format
+msgid "=== Detailed memory usage ==="
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:53
+#, sh-format
+msgid "=== Detailed network configuration ==="
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:20
+#, sh-format
+msgid "Recovery Menu (filesystem state: read-only)"
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:22
+#, sh-format
+msgid "Recovery Menu (filesystem state: read/write)"
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:26
+#, sh-format
+msgid "   Resume normal boot"
+msgstr "   Ailgydio ailgychwyn normal"
+
+#: ../lib/recovery-mode/recovery-menu:47
+#, sh-format
+msgid ""
+"You are now going to exit the recovery mode and continue the boot sequence. "
+"Please note that some graphic drivers require a full graphical boot and so "
+"will fail when resuming from recovery.\n"
+"If that's the case, simply reboot from the login screen and then perform a "
+"standard boot."
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:67
+#, sh-format
+msgid ""
+"Continuing will remount your / filesystem in read/write mode and mount any "
+"other filesystem defined in /etc/fstab.\n"
+"Do you wish to continue?"
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:95
+#, sh-format
+msgid ""
+"The option you selected requires your filesystem to be in read-only mode. "
+"Unfortunately another option you selected earlier, made you exit this mode.\n"
+"The easiest way of getting back in read-only mode is to reboot your system."
+msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/ggzcore.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/ggzcore.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/ggzcore.po	2012-01-02 18:14:05.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/ggzcore.po	2012-02-23 07:17:19.000000000 +0000
@@ -40,8 +40,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:16+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../../ggzcore/server.c:872
 msgid "Unknown negotation"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/gwibber-service-sina.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/gwibber-service-sina.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/gwibber-service-sina.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/gwibber-service-sina.po	2012-02-23 07:17:36.000000000 +0000
@@ -0,0 +1,80 @@
+# Welsh translation for gwibber-service-sina
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the gwibber-service-sina package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gwibber-service-sina\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-02 10:26+0000\n"
+"PO-Revision-Date: 2012-02-03 01:27+0000\n"
+"Last-Translator: David Jones <Unknown>\n"
+"Language-Team: Welsh <cy@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#: ../gtk/sina/__init__.py:45 ../gtk/sina/__init__.py:160
+#, python-format
+msgid "%s has been authorized by Sina"
+msgstr ""
+
+#: ../gtk/sina/__init__.py:62
+msgid "<p>Please wait...</p>"
+msgstr ""
+
+#: ../gtk/sina/__init__.py:101
+msgid "Verifying"
+msgstr ""
+
+#: ../gtk/sina/__init__.py:148 ../gtk/sina/__init__.py:152
+#: ../gtk/sina/__init__.py:172
+msgid "Authorization failed. Please try again."
+msgstr ""
+
+#: ../gtk/sina/__init__.py:155
+msgid "Successful"
+msgstr ""
+
+#: ../ui/gwibber-accounts-sina.ui.h:1
+msgid "_Authorize"
+msgstr ""
+
+#: ../ui/gwibber-accounts-sina.ui.h:2
+msgid "Authorize with sina"
+msgstr ""
+
+#: ../ui/gwibber-accounts-sina.ui.h:3
+msgid "Sina authorized"
+msgstr ""
+
+#: ../ui/gwibber-accounts-sina.ui.h:4
+msgid "Account Settings:"
+msgstr ""
+
+#: ../ui/gwibber-accounts-sina.ui.h:5
+msgid "_Send Messages"
+msgstr "_Anfon Negeseuon"
+
+#: ../ui/gwibber-accounts-sina.ui.h:6
+msgid "Allow sending posts to this account"
+msgstr ""
+
+#: ../ui/gwibber-accounts-sina.ui.h:7
+msgid "_Receive Messages"
+msgstr "_Derbyn negeseuon"
+
+#: ../ui/gwibber-accounts-sina.ui.h:8
+msgid "Include this account when downloading messages"
+msgstr ""
+
+#: ../ui/gwibber-accounts-sina.ui.h:9
+msgid "Color used to help distinguish accounts"
+msgstr ""
+
+#: ../ui/gwibber-accounts-sina.ui.h:10
+msgid "Account Color:"
+msgstr "Lliw Cyfrif:"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/human-theme.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/human-theme.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/human-theme.po	2012-01-02 18:14:14.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/human-theme.po	2012-02-23 07:17:26.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: 2011-12-29 15:37+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:40+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../index.theme.in.h:1
 msgid "Ubuntu default theme"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/jockey.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/jockey.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/jockey.po	2012-01-02 18:14:18.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/jockey.po	2012-02-23 07:17: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: 2011-12-29 17:14+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../text/jockey-text.py:72
 msgid "Please enter 'y' or 'n' and press Enter"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/kcm_gtk.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/kcm_gtk.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/kcm_gtk.po	2012-01-02 18:14:19.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/kcm_gtk.po	2012-02-23 07:17:29.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: kcm-gtk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-08-18 16:55+0000\n"
-"PO-Revision-Date: 2011-08-18 22:13+0000\n"
+"PO-Revision-Date: 2012-02-14 14:16+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:31+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:16+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: kcmgtk.cpp:67
 msgid "kcm_gtk"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/language-selector.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/language-selector.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/language-selector.po	2012-01-02 18:14:13.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/language-selector.po	2012-02-23 07:17:25.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: language-selector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-19 09:41+0000\n"
+"POT-Creation-Date: 2012-02-15 06:50+0000\n"
 "PO-Revision-Date: 2011-01-18 07:29+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
@@ -16,28 +16,28 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:55+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: cy\n"
 
 #. Hack for Chinese langpack split
 #. Translators: please translate 'Chinese (simplified)' and 'Chinese (traditional)' so that they appear next to each other when sorted alphabetically.
-#: ../LanguageSelector/LocaleInfo.py:51
+#: ../LanguageSelector/LocaleInfo.py:50
 msgid "Chinese (simplified)"
 msgstr "Tsieinërg (symleiddio)"
 
 #. Translators: please translate 'Chinese (simplified)' and 'Chinese (traditional)' so that they appear next to each other when sorted alphabetically.
-#: ../LanguageSelector/LocaleInfo.py:53
+#: ../LanguageSelector/LocaleInfo.py:52
 msgid "Chinese (traditional)"
 msgstr "Tsieinërg (traddodiadol)"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:229
-#: ../LanguageSelector/qt/QtLanguageSelector.py:84
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:225
+#: ../LanguageSelector/qt/QtLanguageSelector.py:85
 msgid "No language information available"
 msgstr "Dim gwybodaeth iaith ar gael"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:230
-#: ../LanguageSelector/qt/QtLanguageSelector.py:85
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:226
+#: ../LanguageSelector/qt/QtLanguageSelector.py:86
 msgid ""
 "The system does not have information about the available languages yet. Do "
 "you want to perform a network update to get them now? "
@@ -45,24 +45,24 @@
 "Does gan y system ddim gwybodaeth eto am ieithoedd sydd ar gael. Wyt ti "
 "eisiau cyflawni diweddariaid rhwydwaith nawr i'w llwytho? "
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:234
-#: ../LanguageSelector/qt/QtLanguageSelector.py:79
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:230
+#: ../LanguageSelector/qt/QtLanguageSelector.py:80
 msgid "_Update"
 msgstr "_Diweddaru"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:319
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:357
-#: ../data/LanguageSelector.ui.h:24
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:314
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:351
+#: ../data/LanguageSelector.ui.h:23
 msgid "Language"
 msgstr "Iaith"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:326
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:321
 msgid "Installed"
 msgstr "Wedi'i osod"
 
 #. print "%(INSTALL)d to install, %(REMOVE)d to remove" % (countInstall, countRemove)
 #. Translators: %(INSTALL)d is parsed; either keep it exactly as is or remove it entirely, but don't translate "INSTALL".
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:395
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:389
 #, python-format
 msgid "%(INSTALL)d to install"
 msgid_plural "%(INSTALL)d to install"
@@ -72,7 +72,7 @@
 msgstr[3] "%(INSTALL)d i'w gosod"
 
 #. Translators: %(REMOVE)d is parsed; either keep it exactly as is or remove it entirely, but don't translate "REMOVE".
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:397
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:391
 #, python-format
 msgid "%(REMOVE)d to remove"
 msgid_plural "%(REMOVE)d to remove"
@@ -82,26 +82,24 @@
 msgstr[3] "%(REMOVE)d i'w tynnu"
 
 #. Translators: this string will concatenate the "%n to install" and "%n to remove" strings, you can replace the comma if you need to.
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:406
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:400
 #, python-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:468
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:462
 msgid "none"
 msgstr ""
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:518
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:714
-#: ../LanguageSelector/qt/QtLanguageSelector.py:68
-#: ../LanguageSelector/qt/QtLanguageSelector.py:337
-#: ../check-language-support:52
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:512
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:716
+#: ../LanguageSelector/qt/QtLanguageSelector.py:69
+#: ../LanguageSelector/qt/QtLanguageSelector.py:328
 msgid "Software database is broken"
 msgstr "Cronfa ddata meddalwedd wei torri"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:519
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:715
-#: ../check-language-support:53
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:513
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:717
 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 "
@@ -111,11 +109,11 @@
 "\"Synaptic\" neu redeg \"sudo apt-get install -f\" mewn terfynell i drwsio'r "
 "broblem."
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:564
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:554
 msgid "Could not install the selected language support"
 msgstr "Methu gosod y gefnogaeth iaith ddewiswyd"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:565
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:555
 msgid ""
 "This is perhaps a bug of this application. Please file a bug report at "
 "https://bugs.launchpad.net/ubuntu/+source/language-selector/+filebug"
@@ -123,11 +121,13 @@
 "Efallai bod chwilen yn y rhaglen. Cyflwyna adroddiad chwilen drwy "
 "https://bugs.launchpad.net/ubuntu/+source/language-selector/+filebug"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:589
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:579
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:614
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:618
 msgid "Could not install the full language support"
 msgstr "Methu gosod cefnogaeth iaith gyflawn"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:590
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:580
 msgid ""
 "Usually this is related to an error in your software archive or software "
 "manager. Check your preferences in Software Sources (click the icon at the "
@@ -135,13 +135,17 @@
 "Sources\")."
 msgstr ""
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:671
-#: ../LanguageSelector/qt/QtLanguageSelector.py:161
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:615
+msgid "Failed to authorize to install packages."
+msgstr ""
+
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:673
+#: ../LanguageSelector/qt/QtLanguageSelector.py:162
 msgid "The language support is not installed completely"
 msgstr "Nid chafodd cefnogaeth iaith ei osod yn llwyr"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:672
-#: ../LanguageSelector/qt/QtLanguageSelector.py:162
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:674
+#: ../LanguageSelector/qt/QtLanguageSelector.py:163
 msgid ""
 "Some translations or writing aids available for your chosen languages are "
 "not installed yet. Do you want to install them now?"
@@ -149,29 +153,29 @@
 "Nid yw pob cyfieithiad  a chymorth ysgrifennu ar gyfer yr iaith wnes di ei "
 "dewis wedi eu gosod. Wyt ti eisiau eu gosod nawr?"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:675
-#: ../LanguageSelector/qt/QtLanguageSelector.py:80
-#: ../LanguageSelector/qt/QtLanguageSelector.py:157
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:677
+#: ../LanguageSelector/qt/QtLanguageSelector.py:81
+#: ../LanguageSelector/qt/QtLanguageSelector.py:158
 msgid "_Remind Me Later"
 msgstr "_Atgoffa Fi Wedyn"
 
 #. FIXME: add "details"
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:676
-#: ../LanguageSelector/qt/QtLanguageSelector.py:156
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:678
+#: ../LanguageSelector/qt/QtLanguageSelector.py:157
 msgid "_Install"
 msgstr "_Gosod"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:679
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:681
 msgid "Details"
 msgstr "Manylion"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:937
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:935
 #, python-format
 msgid "Failed to apply the '%s' format choice:"
 msgstr ""
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:69
-#: ../LanguageSelector/qt/QtLanguageSelector.py:338
+#: ../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 "
@@ -181,114 +185,114 @@
 "\"Adept\" neu redeg \"sudo apt-get install -f\" mewn terfynell i drwsio'r "
 "broblem."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:113
+#: ../LanguageSelector/qt/QtLanguageSelector.py:114
 msgid "Set System Language"
 msgstr "Gosod iaith y system"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:114
+#: ../LanguageSelector/qt/QtLanguageSelector.py:115
 msgid "Default system language:"
 msgstr "Iaith ddiofyn y system"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:115
+#: ../LanguageSelector/qt/QtLanguageSelector.py:116
 msgid "Keyboard input method:"
 msgstr "Dull mewnbwn bysellfwrdd"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:116
+#: ../LanguageSelector/qt/QtLanguageSelector.py:117
 msgid "Select language to install:"
 msgstr "Dewis iaith i'w gosod:"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:117
+#: ../LanguageSelector/qt/QtLanguageSelector.py:118
 msgid "Select language to uninstall:"
 msgstr "Dewis iaith i'w tynnu:"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:118
+#: ../LanguageSelector/qt/QtLanguageSelector.py:119
 msgid "Translations"
 msgstr "Cyfieithiadau"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:119
+#: ../LanguageSelector/qt/QtLanguageSelector.py:120
 msgid "Input methods"
 msgstr "Dulliau mewnbwn"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:120
+#: ../LanguageSelector/qt/QtLanguageSelector.py:121
 msgid "Spellchecking and writing aids"
 msgstr "Gwirio sillafu a chymorth ysgrifennu"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:121
+#: ../LanguageSelector/qt/QtLanguageSelector.py:122
 msgid "Extra fonts"
 msgstr "Ffontiau ychwanegol"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:122
+#: ../LanguageSelector/qt/QtLanguageSelector.py:123
 msgid "Components:"
 msgstr "Cydrannau:"
 
 #. not sure how to unset all flags, but this disables the item
-#: ../LanguageSelector/qt/QtLanguageSelector.py:201
+#: ../LanguageSelector/qt/QtLanguageSelector.py:202
 msgid "Already installed"
 msgstr "Wedi'i osod yn barod"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:204
+#: ../LanguageSelector/qt/QtLanguageSelector.py:205
 msgid "Partially Installed"
 msgstr "Wedi'i osod yn rhannol"
 
 #. not sure how to unset all flags, but this disables the item
-#: ../LanguageSelector/qt/QtLanguageSelector.py:207
+#: ../LanguageSelector/qt/QtLanguageSelector.py:208
 msgid "Not installed"
 msgstr "Heb ei osod"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:246
+#: ../LanguageSelector/qt/QtLanguageSelector.py:243
 msgid "Component already installed"
 msgstr ""
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:248
+#: ../LanguageSelector/qt/QtLanguageSelector.py:245
 msgid "Component not available"
 msgstr ""
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:250
+#: ../LanguageSelector/qt/QtLanguageSelector.py:247
 msgid "Component not installed"
 msgstr ""
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:292
+#: ../LanguageSelector/qt/QtLanguageSelector.py:288
 #, python-format
 msgid "Default system Language now set to %s."
 msgstr "Gosodwyd iaith ddiofyn y system i %s."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:292
+#: ../LanguageSelector/qt/QtLanguageSelector.py:288
 msgid "Language Set"
 msgstr "Iaith wedi ei gosod"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:363
+#: ../LanguageSelector/qt/QtLanguageSelector.py:354
 #, python-format
 msgid ""
 "All selected components have now been installed for %s.  Select them from "
 "Country/Region & Language."
 msgstr ""
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:363
+#: ../LanguageSelector/qt/QtLanguageSelector.py:354
 msgid "Language Installed"
 msgstr "Iaith wedi'i gosod"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:365
+#: ../LanguageSelector/qt/QtLanguageSelector.py:356
 #, python-format
 msgid "Translations and support have now been uninstalled for %s."
 msgstr "Mae cyfieithiadau a chefnogaeth nawr wedi cael eu tynnu ar gyfer %s."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:365
+#: ../LanguageSelector/qt/QtLanguageSelector.py:356
 msgid "Language Uninstalled"
 msgstr "Iaith wedi'i thynnu"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:373
+#: ../LanguageSelector/qt/QtLanguageSelector.py:364
 msgid "Failed to set system language."
 msgstr "Methwyd gosod iaith y system."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:373
+#: ../LanguageSelector/qt/QtLanguageSelector.py:364
 msgid "Language Not Set"
 msgstr "Iaith heb ei gosod"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:442
+#: ../LanguageSelector/qt/QtLanguageSelector.py:433
 msgid "Please run this software with administrative rights."
 msgstr "Rheda'r meddalwedd hwn gyda hawliau gweinyddwr."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:442
+#: ../LanguageSelector/qt/QtLanguageSelector.py:433
 msgid "Not Root User"
 msgstr "Ddim yn ddefnyddiwr gwraidd"
 
@@ -357,19 +361,19 @@
 
 #: ../data/LanguageSelector.ui.h:16
 msgid ""
-"<small>Use the same language choices for startup and the login screen.\n"
-"Changes take effect only after a restart of the system.</small>"
+"<small>Use the same language choices for startup and the login "
+"screen.</small>"
 msgstr ""
 
-#: ../data/LanguageSelector.ui.h:18
+#: ../data/LanguageSelector.ui.h:17
 msgid "Install / Remove Languages..."
 msgstr "Gosod / Tynnu Ieithoedd"
 
-#: ../data/LanguageSelector.ui.h:19
+#: ../data/LanguageSelector.ui.h:18
 msgid "Keyboard input method system:"
 msgstr ""
 
-#: ../data/LanguageSelector.ui.h:20
+#: ../data/LanguageSelector.ui.h:19
 msgid ""
 "If you need to type in languages, which require more complex input methods "
 "than just a simple key to letter mapping, you may want to enable this "
@@ -381,11 +385,11 @@
 "corresponding packages first and then choose the desired system here."
 msgstr ""
 
-#: ../data/LanguageSelector.ui.h:25
+#: ../data/LanguageSelector.ui.h:24
 msgid "Display numbers, dates and currency amounts in the usual format for:"
 msgstr ""
 
-#: ../data/LanguageSelector.ui.h:26
+#: ../data/LanguageSelector.ui.h:25
 msgid ""
 "This will set the system environment like shown below and will also affect "
 "the preferred paper format and other region specific settings.\n"
@@ -395,34 +399,33 @@
 "are located."
 msgstr ""
 
-#: ../data/LanguageSelector.ui.h:29
+#: ../data/LanguageSelector.ui.h:28
 msgid "<small>Changes take effect next time you log in.</small>"
 msgstr ""
 "<small>Bydd y newidiadau yn weithredol y tro nesaf i ti fewngofnodi.</small>"
 
-#: ../data/LanguageSelector.ui.h:30
+#: ../data/LanguageSelector.ui.h:29
 msgid ""
-"<small>Use the same format choice for startup and the login screen.\n"
-"Changes take effect only after a restart of the system.</small>"
+"<small>Use the same format choice for startup and the login screen.</small>"
 msgstr ""
 
-#: ../data/LanguageSelector.ui.h:32
+#: ../data/LanguageSelector.ui.h:30
 msgid "Number:"
 msgstr "Rhif:"
 
-#: ../data/LanguageSelector.ui.h:33
+#: ../data/LanguageSelector.ui.h:31
 msgid "Date:"
 msgstr "Dyddiad"
 
-#: ../data/LanguageSelector.ui.h:34
+#: ../data/LanguageSelector.ui.h:32
 msgid "Currency:"
 msgstr "Arian cyfred"
 
-#: ../data/LanguageSelector.ui.h:35
+#: ../data/LanguageSelector.ui.h:33
 msgid "<b>Example</b>"
 msgstr "<b>Enghraifft</b>"
 
-#: ../data/LanguageSelector.ui.h:36
+#: ../data/LanguageSelector.ui.h:34
 msgid "Regional Formats"
 msgstr ""
 
@@ -488,74 +491,74 @@
 msgid "System policy prevented setting default language"
 msgstr ""
 
-#: ../gnome-language-selector:20
+#: ../gnome-language-selector:17
 msgid "don't verify installed language support"
 msgstr ""
 
-#: ../gnome-language-selector:23 ../check-language-support:22
+#: ../gnome-language-selector:20 ../check-language-support:25
 msgid "alternative datadir"
 msgstr "datadir amgen"
 
-#: ../fontconfig-voodoo:18
+#: ../fontconfig-voodoo:17
 msgid "Aborting"
 msgstr "Yn terfynu"
 
-#: ../fontconfig-voodoo:26
+#: ../fontconfig-voodoo:25
 msgid "Force even when a configuration exists"
 msgstr "Gorfodi hyd yn oed pan fod ffurfweddiad yn bodoli"
 
-#: ../fontconfig-voodoo:28
+#: ../fontconfig-voodoo:27
 msgid "Set fontconfig voodoo for the selected language"
 msgstr ""
 
-#: ../fontconfig-voodoo:32
+#: ../fontconfig-voodoo:31
 msgid ""
 "Guess a configuration based on the LANGUAGE environment. Sets the config to "
 "'none' if nothing suitable was found"
 msgstr ""
 
-#: ../fontconfig-voodoo:37
+#: ../fontconfig-voodoo:36
 msgid "List the available fontconfig-voodoo configs"
 msgstr ""
 
-#: ../fontconfig-voodoo:40
+#: ../fontconfig-voodoo:39
 msgid "Show the current fontconfig-voodoo config"
 msgstr ""
 
-#: ../fontconfig-voodoo:43
+#: ../fontconfig-voodoo:42
 msgid "Remove the current fontconfig-voodoo config"
 msgstr "Tynnu ffurfweddiad fontconfig-voodoo cyfredol"
 
-#: ../fontconfig-voodoo:65
+#: ../fontconfig-voodoo:64
 msgid "Unconfigured"
 msgstr "Heb gael ei ffurfweddu"
 
-#: ../fontconfig-voodoo:81
+#: ../fontconfig-voodoo:80
 msgid "A configuration exists already. Use '--force' to overwrite it. "
 msgstr ""
 "Mae ffurfweddiad eisoes yn bodoli. Defnyddia '--force' i ysgrifennu dros "
 "hwn. "
 
-#: ../fontconfig-voodoo:90
+#: ../fontconfig-voodoo:89
 msgid "No fontconfig-voodoo configuration found for the current LANGUAGE"
 msgstr ""
 
-#: ../fontconfig-voodoo:97
+#: ../fontconfig-voodoo:96
 msgid "No fontconfig-voodoo configuration found for the selected locale"
 msgstr ""
 
-#: ../check-language-support:19
+#: ../check-language-support:22
 msgid "target language code"
 msgstr ""
 
-#: ../check-language-support:23
+#: ../check-language-support:26
 msgid "check for the given package(s) only -- separate packagenames by comma"
 msgstr ""
 
-#: ../check-language-support:25
-msgid "check all available languages"
+#: ../check-language-support:28
+msgid "output all available language support packages for all languages"
 msgstr ""
 
-#: ../check-language-support:28
+#: ../check-language-support:31
 msgid "show installed packages as well as missing ones"
 msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/launchpad-integration.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/launchpad-integration.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/launchpad-integration.po	2012-01-02 18:14:14.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/launchpad-integration.po	2012-02-23 07:17:25.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: 2011-12-29 15:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/launchpad-integration.c:71
 msgid "The Launchpad helper application failed"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/libapt-inst1.3.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/libapt-inst1.3.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/libapt-inst1.3.po	2012-01-02 18:13:59.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/libapt-inst1.3.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,301 +0,0 @@
-# APT yn Gymraeg: APT in Welsh.
-# This file is under the same licence as APT itself.
-# Dafydd Harries <daf@muse.19inch.net>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: APT\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-29 19:46+0000\n"
-"PO-Revision-Date: 2011-12-06 08:04+0000\n"
-"Last-Translator: Dafydd Harries <Unknown>\n"
-"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-"Language: cy\n"
-
-#: apt-inst/contrib/extracttar.cc:114
-msgid "Failed to create pipes"
-msgstr "Methwyd creu pibau"
-
-#: apt-inst/contrib/extracttar.cc:141
-msgid "Failed to exec gzip "
-msgstr "Methwyd gweithredu gzip "
-
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
-msgid "Corrupted archive"
-msgstr "Archif llygredig"
-
-#: apt-inst/contrib/extracttar.cc:193
-msgid "Tar checksum failed, archive corrupted"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:300
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Math pennawd TAR anhysbys %u, aelod %s"
-
-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
-msgstr "Llofnod archif annilys"
-
-#: apt-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
-msgstr "Gwall wrth ddarllen pennawd aelod archif"
-
-#: apt-inst/contrib/arfile.cc:90
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
-msgstr "Pennawd aelod archif annilys"
-
-#: apt-inst/contrib/arfile.cc:128
-msgid "Archive is too short"
-msgstr "Mae'r archif yn rhy fyr"
-
-#: apt-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
-msgstr "Methwyd darllen pennawdau'r archif"
-
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Methyd lleoli yr elfen <hash>!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Methwyd neilltuo dargyfeiriad"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr ""
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
-
-# FIXME: "the"
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
-
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Ffeil cyfluniad dyblyg %s/%s"
-
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed to write file %s"
-msgstr ""
-
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Methwyd cau ffeil %s"
-
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
-#, c-format
-msgid "The path %s is too long"
-msgstr "Mae'r llwybr %s yn rhy hir"
-
-#: apt-inst/extract.cc:124
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "Yn dadbacio %s mwy nag unwaith"
-
-#: apt-inst/extract.cc:134
-#, c-format
-msgid "The directory %s is diverted"
-msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
-
-#: apt-inst/extract.cc:144
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
-
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
-msgid "The diversion path is too long"
-msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
-
-#: apt-inst/extract.cc:178 apt-inst/extract.cc:190 apt-inst/extract.cc:207
-#: apt-inst/deb/dpkgdb.cc:117
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Methodd stat() o %s"
-
-#: apt-inst/extract.cc:185
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Methwyd ailenwi %s at %s"
-
-#: apt-inst/extract.cc:240
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
-"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
-
-#: apt-inst/extract.cc:280
-msgid "Failed to locate node in its hash bucket"
-msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
-
-#: apt-inst/extract.cc:284
-msgid "The path is too long"
-msgstr "Mae'r llwybr yn rhy hir"
-
-# FIXME: wtf?
-#: apt-inst/extract.cc:412
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
-
-#: apt-inst/extract.cc:429
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
-
-#: apt-inst/extract.cc:462
-#, c-format
-msgid "Unable to read %s"
-msgstr "Ni ellir darllen %s"
-
-#: apt-inst/extract.cc:489
-#, c-format
-msgid "Unable to stat %s"
-msgstr "Ni ellir gwneud stat() o %s"
-
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
-#, c-format
-msgid "Failed to remove %s"
-msgstr "Methwyd dileu %s"
-
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
-#, c-format
-msgid "Unable to create %s"
-msgstr "Ni ellir creu %s"
-
-#: apt-inst/deb/dpkgdb.cc:114
-#, c-format
-msgid "Failed to stat %sinfo"
-msgstr "Methwyd stat() ar %sinfo"
-
-#: apt-inst/deb/dpkgdb.cc:119
-msgid "The info and temp directories need to be on the same filesystem"
-msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
-
-#: apt-inst/deb/dpkgdb.cc:135
-msgid "Reading package lists"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:176
-#, c-format
-msgid "Failed to change to the admin dir %sinfo"
-msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
-
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
-msgid "Internal error getting a package name"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
-msgid "Reading file listing"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:212
-#, c-format
-msgid ""
-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
-msgstr ""
-"Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn yna "
-"gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
-
-# FIXME
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
-msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
-
-#: apt-inst/deb/dpkgdb.cc:262
-msgid "Internal error getting a node"
-msgstr ""
-
-# FIXME: literal
-#: apt-inst/deb/dpkgdb.cc:305
-#, c-format
-msgid "Failed to open the diversions file %sdiversions"
-msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
-
-#: apt-inst/deb/dpkgdb.cc:320
-msgid "The diversion file is corrupted"
-msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
-
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
-#, c-format
-msgid "Invalid line in the diversion file: %s"
-msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
-
-#: apt-inst/deb/dpkgdb.cc:358
-msgid "Internal error adding a diversion"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:379
-msgid "The pkg cache must be initialized first"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:439
-#, c-format
-msgid "Failed to find a Package: header, offset %lu"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:461
-#, c-format
-msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
-
-#: apt-inst/deb/dpkgdb.cc:466
-#, c-format
-msgid "Error parsing MD5. Offset %lu"
-msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
-
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
-
-#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:113
-#, c-format
-msgid "Couldn't change to %s"
-msgstr "Methwyd newid i %s"
-
-#: apt-inst/deb/debfile.cc:154
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:189
-msgid "Failed to locate a valid control file"
-msgstr "Methwyd lleoli ffeil rheoli dilys"
-
-#: apt-inst/deb/debfile.cc:274
-msgid "Unparsable control file"
-msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/libapt-inst1.4.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/libapt-inst1.4.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/libapt-inst1.4.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/libapt-inst1.4.po	2012-02-23 07:17:15.000000000 +0000
@@ -0,0 +1,301 @@
+# APT yn Gymraeg: APT in Welsh.
+# This file is under the same licence as APT itself.
+# Dafydd Harries <daf@muse.19inch.net>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: APT\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-14 10:00+0000\n"
+"PO-Revision-Date: 2012-02-14 13:24+0000\n"
+"Last-Translator: Dafydd Harries <Unknown>\n"
+"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\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:26+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+"Language: cy\n"
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "Methwyd creu pibau"
+
+#: apt-inst/contrib/extracttar.cc:144
+msgid "Failed to exec gzip "
+msgstr "Methwyd gweithredu gzip "
+
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+msgid "Corrupted archive"
+msgstr "Archif llygredig"
+
+#: apt-inst/contrib/extracttar.cc:196
+msgid "Tar checksum failed, archive corrupted"
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:303
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Math pennawd TAR anhysbys %u, aelod %s"
+
+#: apt-inst/contrib/arfile.cc:74
+msgid "Invalid archive signature"
+msgstr "Llofnod archif annilys"
+
+#: apt-inst/contrib/arfile.cc:82
+msgid "Error reading archive member header"
+msgstr "Gwall wrth ddarllen pennawd aelod archif"
+
+#: apt-inst/contrib/arfile.cc:94
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:106
+msgid "Invalid archive member header"
+msgstr "Pennawd aelod archif annilys"
+
+#: apt-inst/contrib/arfile.cc:132
+msgid "Archive is too short"
+msgstr "Mae'r archif yn rhy fyr"
+
+#: apt-inst/contrib/arfile.cc:136
+msgid "Failed to read the archive headers"
+msgstr "Methwyd darllen pennawdau'r archif"
+
+#: apt-inst/filelist.cc:382
+msgid "DropNode called on still linked node"
+msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
+
+#: apt-inst/filelist.cc:414
+msgid "Failed to locate the hash element!"
+msgstr "Methyd lleoli yr elfen <hash>!"
+
+#: apt-inst/filelist.cc:461
+msgid "Failed to allocate diversion"
+msgstr "Methwyd neilltuo dargyfeiriad"
+
+#: apt-inst/filelist.cc:466
+msgid "Internal error in AddDiversion"
+msgstr ""
+
+#: apt-inst/filelist.cc:479
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
+
+# FIXME: "the"
+#: apt-inst/filelist.cc:508
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
+
+#: apt-inst/filelist.cc:551
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Ffeil cyfluniad dyblyg %s/%s"
+
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
+
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Methwyd cau ffeil %s"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "Mae'r llwybr %s yn rhy hir"
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Yn dadbacio %s mwy nag unwaith"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
+
+#: apt-inst/extract.cc:181 apt-inst/extract.cc:193 apt-inst/extract.cc:210
+#: apt-inst/deb/dpkgdb.cc:121
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"
+
+#: apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Methwyd ailenwi %s at %s"
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr ""
+"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "Mae'r llwybr yn rhy hir"
+
+# FIXME: wtf?
+#: apt-inst/extract.cc:415
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
+
+#: apt-inst/extract.cc:432
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
+
+#: apt-inst/extract.cc:465
+#, c-format
+msgid "Unable to read %s"
+msgstr "Ni ellir darllen %s"
+
+#: apt-inst/extract.cc:492
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Ni ellir gwneud stat() o %s"
+
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#, c-format
+msgid "Failed to remove %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#, c-format
+msgid "Unable to create %s"
+msgstr "Ni ellir creu %s"
+
+#: apt-inst/deb/dpkgdb.cc:118
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "Methwyd stat() ar %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:123
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
+
+#: apt-inst/deb/dpkgdb.cc:139
+msgid "Reading package lists"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:180
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
+msgid "Internal error getting a package name"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+msgid "Reading file listing"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:216
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn yna "
+"gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
+
+# FIXME
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
+
+#: apt-inst/deb/dpkgdb.cc:266
+msgid "Internal error getting a node"
+msgstr ""
+
+# FIXME: literal
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
+
+#: apt-inst/deb/dpkgdb.cc:324
+msgid "The diversion file is corrupted"
+msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
+
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+
+#: apt-inst/deb/dpkgdb.cc:362
+msgid "Internal error adding a diversion"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:383
+msgid "The pkg cache must be initialized first"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:465
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
+
+#: apt-inst/deb/dpkgdb.cc:470
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
+
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
+
+#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
+#: apt-inst/deb/debfile.cc:56
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:116
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "Methwyd newid i %s"
+
+#: apt-inst/deb/debfile.cc:157
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:192
+msgid "Failed to locate a valid control file"
+msgstr "Methwyd lleoli ffeil rheoli dilys"
+
+#: apt-inst/deb/debfile.cc:277
+msgid "Unparsable control file"
+msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/libapt-pkg4.11.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/libapt-pkg4.11.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/libapt-pkg4.11.po	2012-01-02 18:13:59.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/libapt-pkg4.11.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1638 +0,0 @@
-# APT yn Gymraeg: APT in Welsh.
-# This file is under the same licence as APT itself.
-# Dafydd Harries <daf@muse.19inch.net>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: APT\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-29 19:46+0000\n"
-"PO-Revision-Date: 2011-12-06 07:32+0000\n"
-"Last-Translator: Dafydd Harries <Unknown>\n"
-"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:05+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-"Language: cy\n"
-
-#: methods/bzip2.cc:60 methods/gzip.cc:52
-msgid "Empty files can't be valid archives"
-msgstr ""
-
-#: methods/bzip2.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Methwyd agor pibell ar gyfer %s"
-
-#: methods/bzip2.cc:108
-#, c-format
-msgid "Read error from %s process"
-msgstr "Gwall darllen o broses %s"
-
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527
-#: methods/rred.cc:536
-msgid "Failed to stat"
-msgstr "Methwyd stat()"
-
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:533
-msgid "Failed to set modification time"
-msgstr "Methwyd gosod amser newid"
-
-#: methods/cdrom.cc:200
-#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
-
-#: methods/cdrom.cc:209
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
-msgstr ""
-
-#: methods/cdrom.cc:219
-msgid "Wrong CD-ROM"
-msgstr ""
-
-#: methods/cdrom.cc:246
-#, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
-"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
-
-#: methods/cdrom.cc:251
-msgid "Disk not found."
-msgstr ""
-
-#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265
-msgid "File not found"
-msgstr "Ffeil heb ei ganfod"
-
-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
-
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:169
-msgid "Logging in"
-msgstr "Yn mewngofnodi"
-
-#: methods/ftp.cc:175
-msgid "Unable to determine the peer name"
-msgstr "Ni ellir darganfod enw'r cymar"
-
-#: methods/ftp.cc:180
-msgid "Unable to determine the local name"
-msgstr "Ni ellir darganfod yr enw lleol"
-
-#: methods/ftp.cc:211 methods/ftp.cc:239
-#, c-format
-msgid "The server refused the connection and said: %s"
-msgstr ""
-
-#: methods/ftp.cc:217
-#, c-format
-msgid "USER failed, server said: %s"
-msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
-
-#: methods/ftp.cc:224
-#, c-format
-msgid "PASS failed, server said: %s"
-msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
-
-#: methods/ftp.cc:244
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae "
-"Acquire::ftp::ProxyLogin yn wag.)"
-
-# FIXME
-#: methods/ftp.cc:272
-#, c-format
-msgid "Login script command '%s' failed, server said: %s"
-msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
-
-#: methods/ftp.cc:298
-#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
-
-#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227
-msgid "Connection timeout"
-msgstr "Goramser cysylltu"
-
-#: methods/ftp.cc:342
-msgid "Server closed the connection"
-msgstr "Caeodd y gweinydd y cysylltiad"
-
-#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191
-msgid "Read error"
-msgstr "Gwall darllen"
-
-#: methods/ftp.cc:352 methods/rsh.cc:198
-msgid "A response overflowed the buffer."
-msgstr "Gorlifodd ateb y byffer."
-
-#: methods/ftp.cc:369 methods/ftp.cc:381
-msgid "Protocol corruption"
-msgstr "Llygr protocol"
-
-#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233
-msgid "Write error"
-msgstr "Gwall ysgrifennu"
-
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
-msgid "Could not create a socket"
-msgstr "Methwyd creu soced"
-
-#: methods/ftp.cc:704
-msgid "Could not connect data socket, connection timed out"
-msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
-
-#: methods/ftp.cc:708 methods/connect.cc:111
-msgid "Failed"
-msgstr "Methwyd"
-
-#: methods/ftp.cc:710
-msgid "Could not connect passive socket."
-msgstr ""
-
-# FIXME
-#: methods/ftp.cc:728
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "Methodd getaddrinfo gael soced gwrando"
-
-#: methods/ftp.cc:742
-msgid "Could not bind a socket"
-msgstr "Methwyd rhwymo soced"
-
-#: methods/ftp.cc:746
-msgid "Could not listen on the socket"
-msgstr "Methwyd gwrando ar y soced"
-
-#: methods/ftp.cc:753
-msgid "Could not determine the socket's name"
-msgstr "Methwyd canfod enw'r soced"
-
-#: methods/ftp.cc:785
-msgid "Unable to send PORT command"
-msgstr "Methwyd danfod gorchymyn PORT"
-
-#: methods/ftp.cc:795
-#, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
-
-#: methods/ftp.cc:804
-#, c-format
-msgid "EPRT failed, server said: %s"
-msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
-
-#: methods/ftp.cc:824
-msgid "Data socket connect timed out"
-msgstr "Goramserodd cysylltiad y soced data"
-
-#: methods/ftp.cc:831
-msgid "Unable to accept connection"
-msgstr "Methwyd derbyn cysylltiad"
-
-#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303
-msgid "Problem hashing file"
-msgstr "Problem wrth stwnshio ffeil"
-
-#: methods/ftp.cc:883
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
-
-#: methods/ftp.cc:898 methods/rsh.cc:322
-msgid "Data socket timed out"
-msgstr "Goramserodd soced data"
-
-#: methods/ftp.cc:928
-#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
-
-#. Get the files information
-#: methods/ftp.cc:1005
-msgid "Query"
-msgstr "Ymholiad"
-
-# FIXME
-#: methods/ftp.cc:1117
-msgid "Unable to invoke "
-msgstr "Methwyd gweithredu "
-
-#: methods/connect.cc:71
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
-
-#: methods/connect.cc:82
-#, c-format
-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
-
-#: methods/connect.cc:89
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
-
-#: methods/connect.cc:95
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
-
-#: methods/connect.cc:103
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
-
-#: methods/connect.cc:121
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "Methwyd cysylltu i %s:%s (%s)."
-
-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:149 methods/rsh.cc:425
-#, c-format
-msgid "Connecting to %s"
-msgstr "Yn cysylltu i %s"
-
-#: methods/connect.cc:168 methods/connect.cc:187
-#, c-format
-msgid "Could not resolve '%s'"
-msgstr "Methwyd datrys '%s'"
-
-#: methods/connect.cc:193
-#, c-format
-msgid "Temporary failure resolving '%s'"
-msgstr "Methiant dros dro yn datrys '%s'"
-
-#: methods/connect.cc:196
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
-
-#: methods/connect.cc:243
-#, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr ""
-
-#: methods/gpgv.cc:166
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-
-#: methods/gpgv.cc:171
-msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#: methods/gpgv.cc:175
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr ""
-
-#: methods/gpgv.cc:180
-msgid "Unknown error executing gpgv"
-msgstr ""
-
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
-msgid "The following signatures were invalid:\n"
-msgstr ""
-
-#: methods/gpgv.cc:228
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
-
-#: methods/http.cc:385
-msgid "Waiting for headers"
-msgstr "Yn aros am benawdau"
-
-#: methods/http.cc:531
-#, c-format
-msgid "Got a single header line over %u chars"
-msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-
-#: methods/http.cc:539
-msgid "Bad header line"
-msgstr "Llinell pennawd gwael"
-
-#: methods/http.cc:564 methods/http.cc:571
-msgid "The HTTP server sent an invalid reply header"
-msgstr ""
-
-#: methods/http.cc:600
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr ""
-
-#: methods/http.cc:615
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr ""
-
-#: methods/http.cc:617
-msgid "This HTTP server has broken range support"
-msgstr ""
-
-#: methods/http.cc:641
-msgid "Unknown date format"
-msgstr "Fformat dyddiad anhysbys"
-
-#: methods/http.cc:800
-msgid "Select failed"
-msgstr "Methwyd dewis"
-
-#: methods/http.cc:805
-msgid "Connection timed out"
-msgstr "Goramserodd y cysylltiad"
-
-#: methods/http.cc:828
-msgid "Error writing to output file"
-msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-
-#: methods/http.cc:859
-msgid "Error writing to file"
-msgstr "Gwall wrth ysgrifennu at ffeil"
-
-#: methods/http.cc:887
-msgid "Error writing to the file"
-msgstr "Gwall wrth ysgrifennu at y ffeil"
-
-#: methods/http.cc:901
-msgid "Error reading from server. Remote end closed connection"
-msgstr ""
-
-#: methods/http.cc:903
-msgid "Error reading from server"
-msgstr "Gwall wrth ddarllen o'r gweinydd"
-
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr ""
-
-#: methods/http.cc:1183
-msgid "Bad header data"
-msgstr ""
-
-#: methods/http.cc:1200 methods/http.cc:1255
-msgid "Connection failed"
-msgstr "Methodd y cysylltiad"
-
-#: methods/http.cc:1347
-msgid "Internal error"
-msgstr "Gwall mewnol"
-
-#: apt-pkg/contrib/mmap.cc:77
-msgid "Can't mmap an empty file"
-msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
-
-#: apt-pkg/contrib/mmap.cc:89
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Methwyd gwneud mmap() efo %lu beit"
-
-#: apt-pkg/contrib/mmap.cc:124
-msgid "Unable to close mmap"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-msgid "Unable to synchronize mmap"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:310
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:409
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:412
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:371
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:390
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1138
-#, c-format
-msgid "Selection %s not found"
-msgstr "Ni chanfuwyd y dewis %s"
-
-#: apt-pkg/contrib/configuration.cc:465
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Talgryniad math anhysbys: '%c'"
-
-#: apt-pkg/contrib/configuration.cc:523
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
-
-#: apt-pkg/contrib/configuration.cc:691
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
-
-#: apt-pkg/contrib/configuration.cc:710
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:727
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
-
-#: apt-pkg/contrib/configuration.cc:767
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
-
-#: apt-pkg/contrib/configuration.cc:774
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
-
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
-
-#: apt-pkg/contrib/configuration.cc:787
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-
-#: apt-pkg/contrib/configuration.cc:790
-#, c-format
-msgid ""
-"Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:840
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
-
-#: apt-pkg/contrib/progress.cc:144
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Gwall!"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Wedi Gorffen"
-
-# FIXME
-#: apt-pkg/contrib/cmndline.cc:77
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
-
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
-
-#: apt-pkg/contrib/cmndline.cc:124
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
-
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
-
-#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
-
-#: apt-pkg/contrib/cmndline.cc:236
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:267
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opsiwn '%s' yn rhy hir"
-
-# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:300
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
-
-#: apt-pkg/contrib/cmndline.cc:350
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Gweithred annilys %s"
-
-#: apt-pkg/contrib/cdromutl.cc:52
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
-
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:98
-#, c-format
-msgid "Unable to change to %s"
-msgstr "Ni ellir newid i %s"
-
-#. Only warn if there are no sources.list.d.
-#. Only warn if there is no sources.list file.
-#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/fileutl.cc:343
-#: apt-pkg/sourcelist.cc:204 apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450
-#: apt-pkg/init.cc:108 apt-pkg/init.cc:116 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:356 methods/mirror.cc:92
-#, c-format
-msgid "Unable to read %s"
-msgstr "Ni ellir darllen %s"
-
-#: apt-pkg/contrib/cdromutl.cc:220
-msgid "Failed to stat the cdrom"
-msgstr "Methwyd gwneud stat() o'r CD-ROM"
-
-#: apt-pkg/contrib/fileutl.cc:168
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
-
-#: apt-pkg/contrib/fileutl.cc:173
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Methwyd agor y ffeil clo %s"
-
-#: apt-pkg/contrib/fileutl.cc:191
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
-
-#: apt-pkg/contrib/fileutl.cc:195
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Methwyd cael y clo %s"
-
-#: apt-pkg/contrib/fileutl.cc:335
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:362
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:380
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:389
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:690
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:702
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Derbyniodd is-broses %s wall segmentu."
-
-#: apt-pkg/contrib/fileutl.cc:704
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:708
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:710
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Gorffenodd is-broses %s yn annisgwyl"
-
-#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673
-#, c-format
-msgid "Could not open file %s"
-msgstr "Methwyd agor ffeil %s"
-
-#: apt-pkg/contrib/fileutl.cc:792
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr ""
-
-# FIXME
-#: apt-pkg/contrib/fileutl.cc:852
-#, c-format
-msgid "read, still have %lu to read but none left"
-msgstr "o hyd %lu i ddarllen ond dim ar ôl"
-
-# FIXME
-#: apt-pkg/contrib/fileutl.cc:885
-#, c-format
-msgid "write, still have %lu to write but couldn't"
-msgstr "o hyd %lu i ysgrifennu ond methwyd"
-
-#: apt-pkg/contrib/fileutl.cc:1021
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1024
-#, c-format
-msgid "Problem closing the file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1029
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1040
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1053
-msgid "Problem syncing the file"
-msgstr "Gwall wrth gyfamseru'r ffeil"
-
-#: apt-pkg/pkgcache.cc:147
-msgid "Empty package cache"
-msgstr "Storfa pecyn gwag"
-
-#: apt-pkg/pkgcache.cc:153
-msgid "The package cache file is corrupted"
-msgstr "Mae'r ffeil storfa pecyn yn llygredig"
-
-#: apt-pkg/pkgcache.cc:158
-msgid "The package cache file is an incompatible version"
-msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted, it is too small"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:166
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:171
-msgid "The package cache was built for a different architecture"
-msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
-
-#: apt-pkg/pkgcache.cc:304
-msgid "Depends"
-msgstr "Dibynnu"
-
-#: apt-pkg/pkgcache.cc:304
-msgid "PreDepends"
-msgstr "CynDdibynnu"
-
-#: apt-pkg/pkgcache.cc:304
-msgid "Suggests"
-msgstr "Awgrymu"
-
-#: apt-pkg/pkgcache.cc:305
-msgid "Recommends"
-msgstr "Argymell"
-
-#: apt-pkg/pkgcache.cc:305
-msgid "Conflicts"
-msgstr "Gwrthdaro"
-
-#: apt-pkg/pkgcache.cc:305
-msgid "Replaces"
-msgstr "Amnewid"
-
-#: apt-pkg/pkgcache.cc:306
-msgid "Obsoletes"
-msgstr "Darfodi"
-
-#: apt-pkg/pkgcache.cc:306
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:306
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:317
-msgid "important"
-msgstr "pwysig"
-
-#: apt-pkg/pkgcache.cc:317
-msgid "required"
-msgstr "angenrheidiol"
-
-#: apt-pkg/pkgcache.cc:317
-msgid "standard"
-msgstr "safonnol"
-
-#: apt-pkg/pkgcache.cc:318
-msgid "optional"
-msgstr "opsiynnol"
-
-#: apt-pkg/pkgcache.cc:318
-msgid "extra"
-msgstr "ychwanegol"
-
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
-msgid "Building dependency tree"
-msgstr ""
-
-#: apt-pkg/depcache.cc:126
-msgid "Candidate versions"
-msgstr ""
-
-#: apt-pkg/depcache.cc:155
-msgid "Dependency generation"
-msgstr ""
-
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
-msgid "Reading state information"
-msgstr ""
-
-#: apt-pkg/depcache.cc:237
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr ""
-
-#: apt-pkg/depcache.cc:243
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr ""
-
-# FIXME: number?
-#: apt-pkg/tagfile.cc:123
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/tagfile.cc:210
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
-
-#: apt-pkg/sourcelist.cc:92
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:95
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:106
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:112
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:115
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:128
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-
-#: apt-pkg/sourcelist.cc:130
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-
-#: apt-pkg/sourcelist.cc:133
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-
-#: apt-pkg/sourcelist.cc:139
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:146
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-
-#: apt-pkg/sourcelist.cc:244
-#, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-
-#: apt-pkg/sourcelist.cc:281
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-
-#: apt-pkg/sourcelist.cc:285
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:456
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
-"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
-"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
-
-#: apt-pkg/packagemanager.cc:501
-#, c-format
-msgid ""
-"Could not perform immediate configuration on already unpacked '%s'. Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
-msgstr ""
-
-#: apt-pkg/pkgrecords.cc:32
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-
-#: apt-pkg/algorithms.cc:250
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
-"ei gyfer."
-
-#: apt-pkg/algorithms.cc:1186
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
-"ei achosi gan pecynnau wedi eu dal."
-
-#: apt-pkg/algorithms.cc:1188
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
-
-#: apt-pkg/algorithms.cc:1481
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Methwyd cyrchu %s  %s\n"
-
-#: apt-pkg/algorithms.cc:1507 apt-pkg/algorithms.cc:1509
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/acquire.cc:79
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr ""
-
-#: apt-pkg/acquire.cc:83
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr ""
-
-#: apt-pkg/acquire.cc:91
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr ""
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:858
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
-
-#: apt-pkg/acquire.cc:860
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:110
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
-
-#: apt-pkg/acquire-worker.cc:159
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
-
-#: apt-pkg/acquire-worker.cc:423
-#, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-
-#: apt-pkg/init.cc:151
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Ni chynhelir y system pecynnu '%s'"
-
-#: apt-pkg/init.cc:167
-msgid "Unable to determine a suitable packaging system type"
-msgstr ""
-
-#: apt-pkg/clean.cc:56
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
-
-# FIXME: ...file
-#: apt-pkg/srcrecords.cc:44
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
-
-#: apt-pkg/cachefile.cc:84
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
-
-#: apt-pkg/cachefile.cc:88
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
-
-#: apt-pkg/cachefile.cc:106
-msgid "The list of sources could not be read."
-msgstr "Methwyd darllen y rhestr ffynhonellau."
-
-#: apt-pkg/policy.cc:71
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:393
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-
-# FIXME: tense
-#: apt-pkg/policy.cc:415
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Methwyd daeall y math pin %s"
-
-#: apt-pkg/policy.cc:423
-msgid "No priority (or zero) specified for pin"
-msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
-
-#: apt-pkg/pkgcachegen.cc:83
-msgid "Cache has an incompatible versioning system"
-msgstr "Mae can y storfa system fersiwn anghyfaddas"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275
-#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353
-#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388
-#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:439
-#: apt-pkg/pkgcachegen.cc:470 apt-pkg/pkgcachegen.cc:484
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:232
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."
-
-#: apt-pkg/pkgcachegen.cc:235
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
-
-#: apt-pkg/pkgcachegen.cc:238
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:241
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
-
-#: apt-pkg/pkgcachegen.cc:491
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
-
-#: apt-pkg/pkgcachegen.cc:1057
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-
-#: apt-pkg/pkgcachegen.cc:1145 apt-pkg/pkgcachegen.cc:1249
-#: apt-pkg/pkgcachegen.cc:1255 apt-pkg/pkgcachegen.cc:1417
-msgid "Reading package lists"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1162
-msgid "Collecting File Provides"
-msgstr "Yn Casglu Darpariaethau Ffeil"
-
-#: apt-pkg/pkgcachegen.cc:1246
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni ellir ysgrifennu i %s"
-
-#: apt-pkg/pkgcachegen.cc:1356 apt-pkg/pkgcachegen.cc:1363
-msgid "IO Error saving source cache"
-msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
-
-#: apt-pkg/acquire-item.cc:135
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "methwyd ailenwi, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:636
-msgid "MD5Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
-
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1851
-#: apt-pkg/acquire-item.cc:1994
-msgid "Hash Sum mismatch"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1387
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1403
-#, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1438
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1476
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1498
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1531
-#, c-format
-msgid ""
-"A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-# FIXME: case
-#: apt-pkg/acquire-item.cc:1638
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
-"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-
-#: apt-pkg/acquire-item.cc:1697
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package."
-msgstr ""
-"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
-"drwsio'r pecyn hyn a law."
-
-#: apt-pkg/acquire-item.cc:1756
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
-
-#: apt-pkg/acquire-item.cc:1843
-msgid "Size mismatch"
-msgstr "Camgyfatebiaeth maint"
-
-#: apt-pkg/indexrecords.cc:53
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:63
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:97
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:110
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:129
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/vendorlist.cc:71
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-
-#: apt-pkg/cdrom.cc:525
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
-msgid "Identifying.. "
-msgstr ""
-
-#: apt-pkg/cdrom.cc:562
-#, c-format
-msgid "Stored label: %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
-msgid "Unmounting CD-ROM...\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:591
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:609
-msgid "Unmounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:614
-msgid "Waiting for disc...\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:623
-msgid "Mounting CD-ROM...\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:642
-msgid "Scanning disc for index files..\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:684
-#, c-format
-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:695
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:722
-#, c-format
-msgid "Found label '%s'\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:751
-msgid "That is not a valid name, try again.\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:768
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:770
-msgid "Copying package lists..."
-msgstr ""
-
-#: apt-pkg/cdrom.cc:797
-msgid "Writing new source list\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:805
-msgid "Source list entries for this disc are:\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:537
-#, c-format
-msgid "Skipping nonexistent file %s"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:543
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:549
-#, c-format
-msgid "Hash mismatch for: %s"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:677
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:708
-#, c-format
-msgid "No keyring installed in %s."
-msgstr ""
-
-#: apt-pkg/cachefilter.cc:29
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
-
-#: apt-pkg/cacheset.cc:337
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-
-#: apt-pkg/cacheset.cc:340
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y fersiwn '%s' o '%s'"
-
-#: apt-pkg/cacheset.cc:440
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Ni ellir lleoli'r pecyn %s"
-
-#: apt-pkg/cacheset.cc:447
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:454
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:467
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:491
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:499
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:507
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
-#: apt-pkg/edsp.cc:32 apt-pkg/edsp.cc:52
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:204
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:272
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:279
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:550 apt-pkg/edsp.cc:553 apt-pkg/edsp.cc:558
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:68
-#, c-format
-msgid "Installing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:69 apt-pkg/deb/dpkgpm.cc:863
-#, c-format
-msgid "Configuring %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:70 apt-pkg/deb/dpkgpm.cc:870
-#, c-format
-msgid "Removing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:71
-#, c-format
-msgid "Completely removing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:73
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:669
-#, c-format
-msgid "Directory '%s' missing"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:684 apt-pkg/deb/dpkgpm.cc:704
-#, c-format
-msgid "Could not open file '%s'"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:856
-#, c-format
-msgid "Preparing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:857
-#, c-format
-msgid "Unpacking %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:862
-#, c-format
-msgid "Preparing to configure %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:864
-#, c-format
-msgid "Installed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:869
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:871
-#, c-format
-msgid "Removed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:876
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:877
-#, c-format
-msgid "Completely removed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1097
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1128
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1353
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1358
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1360
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1366
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1373
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1380 apt-pkg/deb/dpkgpm.cc:1386
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1407
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:79
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:82
-#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:98
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:116
-msgid "Not locked"
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:276
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:283
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr ""
-
-#: methods/mirror.cc:438
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
-#: methods/rred.cc:506
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:511
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr "Methwyd creu pibell cyfathrebu at isbroses"
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Caewyd y cysylltiad yn gynnar"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/libapt-pkg4.12.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/libapt-pkg4.12.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/libapt-pkg4.12.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/libapt-pkg4.12.po	2012-02-23 07:17:15.000000000 +0000
@@ -0,0 +1,1653 @@
+# APT yn Gymraeg: APT in Welsh.
+# This file is under the same licence as APT itself.
+# Dafydd Harries <daf@muse.19inch.net>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: APT\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-14 10:00+0000\n"
+"PO-Revision-Date: 2012-02-14 13:54+0000\n"
+"Last-Translator: Dafydd Harries <Unknown>\n"
+"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\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:26+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+"Language: cy\n"
+
+#: methods/bzip2.cc:63 methods/gzip.cc:54
+msgid "Empty files can't be valid archives"
+msgstr ""
+
+#: methods/bzip2.cc:67
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "Methwyd agor pibell ar gyfer %s"
+
+#: methods/bzip2.cc:111
+#, c-format
+msgid "Read error from %s process"
+msgstr "Gwall darllen o broses %s"
+
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:498
+#: methods/rred.cc:507
+msgid "Failed to stat"
+msgstr "Methwyd stat()"
+
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:504
+msgid "Failed to set modification time"
+msgstr "Methwyd gosod amser newid"
+
+#: methods/cdrom.cc:203
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
+
+#: methods/cdrom.cc:212
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+
+#: methods/cdrom.cc:222
+msgid "Wrong CD-ROM"
+msgstr ""
+
+#: methods/cdrom.cc:249
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr ""
+"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
+
+#: methods/cdrom.cc:254
+msgid "Disk not found."
+msgstr ""
+
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
+msgid "File not found"
+msgstr "Ffeil heb ei ganfod"
+
+#: methods/file.cc:47
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:172
+msgid "Logging in"
+msgstr "Yn mewngofnodi"
+
+#: methods/ftp.cc:178
+msgid "Unable to determine the peer name"
+msgstr "Ni ellir darganfod enw'r cymar"
+
+#: methods/ftp.cc:183
+msgid "Unable to determine the local name"
+msgstr "Ni ellir darganfod yr enw lleol"
+
+#: methods/ftp.cc:214 methods/ftp.cc:242
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr ""
+
+#: methods/ftp.cc:220
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:227
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:247
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae "
+"Acquire::ftp::ProxyLogin yn wag.)"
+
+# FIXME
+#: methods/ftp.cc:275
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:301
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
+msgid "Connection timeout"
+msgstr "Goramser cysylltu"
+
+#: methods/ftp.cc:345
+msgid "Server closed the connection"
+msgstr "Caeodd y gweinydd y cysylltiad"
+
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1077
+#: apt-pkg/contrib/fileutl.cc:1080 methods/rsh.cc:197
+msgid "Read error"
+msgstr "Gwall darllen"
+
+#: methods/ftp.cc:355 methods/rsh.cc:204
+msgid "A response overflowed the buffer."
+msgstr "Gorlifodd ateb y byffer."
+
+#: methods/ftp.cc:372 methods/ftp.cc:384
+msgid "Protocol corruption"
+msgstr "Llygr protocol"
+
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1154 methods/rsh.cc:239
+msgid "Write error"
+msgstr "Gwall ysgrifennu"
+
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
+msgid "Could not create a socket"
+msgstr "Methwyd creu soced"
+
+#: methods/ftp.cc:707
+msgid "Could not connect data socket, connection timed out"
+msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+
+#: methods/ftp.cc:711 methods/connect.cc:115
+msgid "Failed"
+msgstr "Methwyd"
+
+#: methods/ftp.cc:713
+msgid "Could not connect passive socket."
+msgstr ""
+
+# FIXME
+#: methods/ftp.cc:731
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "Methodd getaddrinfo gael soced gwrando"
+
+#: methods/ftp.cc:745
+msgid "Could not bind a socket"
+msgstr "Methwyd rhwymo soced"
+
+#: methods/ftp.cc:749
+msgid "Could not listen on the socket"
+msgstr "Methwyd gwrando ar y soced"
+
+#: methods/ftp.cc:756
+msgid "Could not determine the socket's name"
+msgstr "Methwyd canfod enw'r soced"
+
+#: methods/ftp.cc:788
+msgid "Unable to send PORT command"
+msgstr "Methwyd danfod gorchymyn PORT"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
+
+#: methods/ftp.cc:807
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:827
+msgid "Data socket connect timed out"
+msgstr "Goramserodd cysylltiad y soced data"
+
+#: methods/ftp.cc:834
+msgid "Unable to accept connection"
+msgstr "Methwyd derbyn cysylltiad"
+
+#: methods/ftp.cc:873 methods/http.cc:1034 methods/rsh.cc:309
+msgid "Problem hashing file"
+msgstr "Problem wrth stwnshio ffeil"
+
+#: methods/ftp.cc:886
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
+
+#: methods/ftp.cc:901 methods/rsh.cc:328
+msgid "Data socket timed out"
+msgstr "Goramserodd soced data"
+
+#: methods/ftp.cc:931
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
+
+#. Get the files information
+#: methods/ftp.cc:1008
+msgid "Query"
+msgstr "Ymholiad"
+
+# FIXME
+#: methods/ftp.cc:1120
+msgid "Unable to invoke "
+msgstr "Methwyd gweithredu "
+
+#: methods/connect.cc:75
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
+
+#: methods/connect.cc:93
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc:99
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
+
+#: methods/connect.cc:107
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
+
+#: methods/connect.cc:125
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Methwyd cysylltu i %s:%s (%s)."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:153 methods/rsh.cc:431
+#, c-format
+msgid "Connecting to %s"
+msgstr "Yn cysylltu i %s"
+
+#: methods/connect.cc:172 methods/connect.cc:191
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Methwyd datrys '%s'"
+
+#: methods/connect.cc:197
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Methiant dros dro yn datrys '%s'"
+
+#: methods/connect.cc:200
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr ""
+
+#: methods/connect.cc:247
+#, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr ""
+
+#: methods/gpgv.cc:180
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+
+#: methods/gpgv.cc:185
+msgid "At least one invalid signature was encountered."
+msgstr ""
+
+#: methods/gpgv.cc:189
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+msgstr ""
+
+#: methods/gpgv.cc:194
+msgid "Unknown error executing gpgv"
+msgstr ""
+
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
+msgid "The following signatures were invalid:\n"
+msgstr ""
+
+#: methods/gpgv.cc:242
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+
+#: methods/http.cc:393
+msgid "Waiting for headers"
+msgstr "Yn aros am benawdau"
+
+#: methods/http.cc:539
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
+
+#: methods/http.cc:547
+msgid "Bad header line"
+msgstr "Llinell pennawd gwael"
+
+#: methods/http.cc:572 methods/http.cc:579
+msgid "The HTTP server sent an invalid reply header"
+msgstr ""
+
+#: methods/http.cc:608
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr ""
+
+#: methods/http.cc:623
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr ""
+
+#: methods/http.cc:625
+msgid "This HTTP server has broken range support"
+msgstr ""
+
+#: methods/http.cc:649
+msgid "Unknown date format"
+msgstr "Fformat dyddiad anhysbys"
+
+#: methods/http.cc:820
+msgid "Select failed"
+msgstr "Methwyd dewis"
+
+#: methods/http.cc:825
+msgid "Connection timed out"
+msgstr "Goramserodd y cysylltiad"
+
+#: methods/http.cc:848
+msgid "Error writing to output file"
+msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
+
+#: methods/http.cc:879
+msgid "Error writing to file"
+msgstr "Gwall wrth ysgrifennu at ffeil"
+
+#: methods/http.cc:907
+msgid "Error writing to the file"
+msgstr "Gwall wrth ysgrifennu at y ffeil"
+
+#: methods/http.cc:921
+msgid "Error reading from server. Remote end closed connection"
+msgstr ""
+
+#: methods/http.cc:923
+msgid "Error reading from server"
+msgstr "Gwall wrth ddarllen o'r gweinydd"
+
+#: methods/http.cc:1193
+msgid "Bad header data"
+msgstr ""
+
+#: methods/http.cc:1210 methods/http.cc:1265
+msgid "Connection failed"
+msgstr "Methodd y cysylltiad"
+
+#: methods/http.cc:1357
+msgid "Internal error"
+msgstr "Gwall mewnol"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
+
+#: apt-pkg/contrib/mmap.cc:109
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:117
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:144
+msgid "Unable to close mmap"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
+msgid "Unable to synchronize mmap"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:330
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:429
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:432
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:371
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:378
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:385
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:390
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1165
+#, c-format
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"
+
+#: apt-pkg/contrib/configuration.cc:474
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Talgryniad math anhysbys: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:532
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/contrib/configuration.cc:700
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
+
+#: apt-pkg/contrib/configuration.cc:719
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:736
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
+
+#: apt-pkg/contrib/configuration.cc:776
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
+
+#: apt-pkg/contrib/configuration.cc:783
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
+
+#: apt-pkg/contrib/configuration.cc:787 apt-pkg/contrib/configuration.cc:792
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
+
+#: apt-pkg/contrib/configuration.cc:796
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
+
+#: apt-pkg/contrib/configuration.cc:799
+#, c-format
+msgid ""
+"Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:849
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
+
+#: apt-pkg/contrib/progress.cc:146
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Gwall!"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Wedi Gorffen"
+
+# FIXME
+#: apt-pkg/contrib/cmndline.cc:80
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
+
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
+
+#: apt-pkg/contrib/cmndline.cc:125
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
+
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
+
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
+
+#: apt-pkg/contrib/cmndline.cc:235
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:266
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opsiwn '%s' yn rhy hir"
+
+# FIXME: 'Sense'?
+#: apt-pkg/contrib/cmndline.cc:298
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
+
+#: apt-pkg/contrib/cmndline.cc:348
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Gweithred annilys %s"
+
+#: apt-pkg/contrib/cdromutl.cc:56
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
+
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
+#, c-format
+msgid "Unable to change to %s"
+msgstr "Ni ellir newid i %s"
+
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:372
+#: apt-pkg/sourcelist.cc:208 apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456
+#: apt-pkg/init.cc:109 apt-pkg/init.cc:117 apt-pkg/clean.cc:36
+#: apt-pkg/policy.cc:359 methods/mirror.cc:95
+#, c-format
+msgid "Unable to read %s"
+msgstr "Ni ellir darllen %s"
+
+#: apt-pkg/contrib/cdromutl.cc:224
+msgid "Failed to stat the cdrom"
+msgstr "Methwyd gwneud stat() o'r CD-ROM"
+
+#: apt-pkg/contrib/fileutl.cc:197
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
+
+#: apt-pkg/contrib/fileutl.cc:202
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Methwyd agor y ffeil clo %s"
+
+#: apt-pkg/contrib/fileutl.cc:220
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
+
+#: apt-pkg/contrib/fileutl.cc:224
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Methwyd cael y clo %s"
+
+#: apt-pkg/contrib/fileutl.cc:364
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:391
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:409
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:418
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:996
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:731
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Derbyniodd is-broses %s wall segmentu."
+
+#: apt-pkg/contrib/fileutl.cc:733
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:737
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:739
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Gorffenodd is-broses %s yn annisgwyl"
+
+#: apt-pkg/contrib/fileutl.cc:878 apt-pkg/indexcopy.cc:655
+#, c-format
+msgid "Could not open file %s"
+msgstr "Methwyd agor ffeil %s"
+
+#: apt-pkg/contrib/fileutl.cc:929
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:975
+msgid "Failed to create subprocess IPC"
+msgstr "Methwyd creu isbroses IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1024
+msgid "Failed to exec compressor "
+msgstr "Methwyd gweithredu cywasgydd "
+
+#: apt-pkg/contrib/fileutl.cc:1102
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1167
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1427
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1431
+#, c-format
+msgid "Problem closing the file %s"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1436
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1447
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1467
+msgid "Problem syncing the file"
+msgstr "Gwall wrth gyfamseru'r ffeil"
+
+#: apt-pkg/pkgcache.cc:148
+msgid "Empty package cache"
+msgstr "Storfa pecyn gwag"
+
+#: apt-pkg/pkgcache.cc:154
+msgid "The package cache file is corrupted"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+
+#: apt-pkg/pkgcache.cc:159
+msgid "The package cache file is an incompatible version"
+msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
+
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:167
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:172
+msgid "The package cache was built for a different architecture"
+msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
+
+#: apt-pkg/pkgcache.cc:305
+msgid "Depends"
+msgstr "Dibynnu"
+
+#: apt-pkg/pkgcache.cc:305
+msgid "PreDepends"
+msgstr "CynDdibynnu"
+
+#: apt-pkg/pkgcache.cc:305
+msgid "Suggests"
+msgstr "Awgrymu"
+
+#: apt-pkg/pkgcache.cc:306
+msgid "Recommends"
+msgstr "Argymell"
+
+#: apt-pkg/pkgcache.cc:306
+msgid "Conflicts"
+msgstr "Gwrthdaro"
+
+#: apt-pkg/pkgcache.cc:306
+msgid "Replaces"
+msgstr "Amnewid"
+
+#: apt-pkg/pkgcache.cc:307
+msgid "Obsoletes"
+msgstr "Darfodi"
+
+#: apt-pkg/pkgcache.cc:307
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:307
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:318
+msgid "important"
+msgstr "pwysig"
+
+#: apt-pkg/pkgcache.cc:318
+msgid "required"
+msgstr "angenrheidiol"
+
+#: apt-pkg/pkgcache.cc:318
+msgid "standard"
+msgstr "safonnol"
+
+#: apt-pkg/pkgcache.cc:319
+msgid "optional"
+msgstr "opsiynnol"
+
+#: apt-pkg/pkgcache.cc:319
+msgid "extra"
+msgstr "ychwanegol"
+
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+msgid "Building dependency tree"
+msgstr ""
+
+#: apt-pkg/depcache.cc:133
+msgid "Candidate versions"
+msgstr ""
+
+#: apt-pkg/depcache.cc:162
+msgid "Dependency generation"
+msgstr ""
+
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+msgid "Reading state information"
+msgstr ""
+
+#: apt-pkg/depcache.cc:244
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr ""
+
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr ""
+
+# FIXME: number?
+#: apt-pkg/tagfile.cc:126
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: apt-pkg/tagfile.cc:213
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
+
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:110
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:116
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:119
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:132
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
+
+#: apt-pkg/sourcelist.cc:134
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+
+#: apt-pkg/sourcelist.cc:137
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+
+#: apt-pkg/sourcelist.cc:143
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:150
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#: apt-pkg/sourcelist.cc:248
+#, c-format
+msgid "Opening %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+
+#: apt-pkg/sourcelist.cc:285
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+
+#: apt-pkg/sourcelist.cc:289
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:780
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr ""
+
+# FIXME: %s may have an arbirrary length
+#: apt-pkg/packagemanager.cc:507
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
+"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
+"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
+
+#: apt-pkg/pkgrecords.cc:34
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+
+#: apt-pkg/algorithms.cc:255
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
+"ei gyfer."
+
+#: apt-pkg/algorithms.cc:1190
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
+"ei achosi gan pecynnau wedi eu dal."
+
+#: apt-pkg/algorithms.cc:1192
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
+
+#: apt-pkg/algorithms.cc:1491
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Methwyd cyrchu %s  %s\n"
+
+#: apt-pkg/algorithms.cc:1517 apt-pkg/algorithms.cc:1519
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+
+#: apt-pkg/acquire.cc:81
+#, c-format
+msgid "List directory %spartial is missing."
+msgstr ""
+
+#: apt-pkg/acquire.cc:85
+#, c-format
+msgid "Archives directory %spartial is missing."
+msgstr ""
+
+#: apt-pkg/acquire.cc:93
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr ""
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:864
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
+
+#: apt-pkg/acquire.cc:866
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:112
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
+
+#: apt-pkg/acquire-worker.cc:161
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
+
+#: apt-pkg/acquire-worker.cc:425
+#, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+
+#: apt-pkg/init.cc:152
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Ni chynhelir y system pecynnu '%s'"
+
+#: apt-pkg/init.cc:168
+msgid "Unable to determine a suitable packaging system type"
+msgstr ""
+
+#: apt-pkg/clean.cc:59
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."
+
+# FIXME: ...file
+#: apt-pkg/srcrecords.cc:47
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
+
+#: apt-pkg/cachefile.cc:87
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
+
+#: apt-pkg/cachefile.cc:91
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
+
+#: apt-pkg/cachefile.cc:109
+msgid "The list of sources could not be read."
+msgstr "Methwyd darllen y rhestr ffynhonellau."
+
+#: apt-pkg/policy.cc:74
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:396
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+
+# FIXME: tense
+#: apt-pkg/policy.cc:418
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Methwyd daeall y math pin %s"
+
+#: apt-pkg/policy.cc:426
+msgid "No priority (or zero) specified for pin"
+msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
+
+#: apt-pkg/pkgcachegen.cc:85
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:234
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."
+
+#: apt-pkg/pkgcachegen.cc:237
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:240
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:243
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:517
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
+
+#: apt-pkg/pkgcachegen.cc:1082
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#: apt-pkg/pkgcachegen.cc:1170 apt-pkg/pkgcachegen.cc:1274
+#: apt-pkg/pkgcachegen.cc:1280 apt-pkg/pkgcachegen.cc:1436
+msgid "Reading package lists"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1187
+msgid "Collecting File Provides"
+msgstr "Yn Casglu Darpariaethau Ffeil"
+
+#: apt-pkg/pkgcachegen.cc:1271
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %s"
+
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+
+#: apt-pkg/acquire-item.cc:139
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "methwyd ailenwi, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:640
+msgid "MD5Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"
+
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1399
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1415
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1450
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1488
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1510
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1543
+#, c-format
+msgid ""
+"A error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+# FIXME: case
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
+"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
+
+#: apt-pkg/acquire-item.cc:1709
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package."
+msgstr ""
+"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
+"drwsio'r pecyn hyn a law."
+
+#: apt-pkg/acquire-item.cc:1768
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
+
+#: apt-pkg/acquire-item.cc:1855
+msgid "Size mismatch"
+msgstr "Camgyfatebiaeth maint"
+
+#: apt-pkg/indexrecords.cc:61
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:71
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:105
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:118
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:137
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/vendorlist.cc:78
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
+
+#: apt-pkg/cdrom.cc:566
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:603
+#, c-format
+msgid "Stored label: %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
+msgid "Unmounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:632
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:650
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:655
+msgid "Waiting for disc...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:664
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:683
+msgid "Scanning disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:731
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:742
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:769
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:798
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:815
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:817
+msgid "Copying package lists..."
+msgstr ""
+
+#: apt-pkg/cdrom.cc:844
+msgid "Writing new source list\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:852
+msgid "Source list entries for this disc are:\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:503
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:509
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:659
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:690
+#, c-format
+msgid "No keyring installed in %s."
+msgstr ""
+
+#: apt-pkg/cachefilter.cc:31
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"
+
+#: apt-pkg/cacheset.cc:352
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
+
+#: apt-pkg/cacheset.cc:355
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y fersiwn '%s' o '%s'"
+
+#: apt-pkg/cacheset.cc:459
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ni ellir lleoli'r pecyn %s"
+
+#: apt-pkg/cacheset.cc:466
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:472
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:483
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:504
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:512
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:520
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:70
+#, c-format
+msgid "Installing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:946
+#, c-format
+msgid "Configuring %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:953
+#, c-format
+msgid "Removing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:73
+#, c-format
+msgid "Completely removing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:74
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:75
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:702
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:717 apt-pkg/deb/dpkgpm.cc:737
+#, c-format
+msgid "Could not open file '%s'"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:939
+#, c-format
+msgid "Preparing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:940
+#, c-format
+msgid "Unpacking %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:945
+#, c-format
+msgid "Preparing to configure %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:947
+#, c-format
+msgid "Installed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:952
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:954
+#, c-format
+msgid "Removed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:959
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:960
+#, c-format
+msgid "Completely removed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1202
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1232
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1404
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1461
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1466
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1468
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1474
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1481
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1488 apt-pkg/deb/dpkgpm.cc:1494
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1515
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:84
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:87
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:103
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:121
+msgid "Not locked"
+msgstr ""
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:279
+#, c-format
+msgid "No mirror file '%s' found "
+msgstr ""
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:286
+#, c-format
+msgid "Can not read mirror file '%s'"
+msgstr ""
+
+#: methods/mirror.cc:441
+#, c-format
+msgid "[Mirror: %s]"
+msgstr ""
+
+#: methods/rred.cc:477
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:482
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rsh.cc:97
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Methwyd creu pibell cyfathrebu at isbroses"
+
+#: methods/rsh.cc:336
+msgid "Connection closed prematurely"
+msgstr "Caewyd y cysylltiad yn gynnar"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/libvirt.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/libvirt.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/libvirt.po	2012-01-02 18:14:17.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/libvirt.po	2012-02-23 07:17:27.000000000 +0000
@@ -7,67 +7,67 @@
 msgstr ""
 "Project-Id-Version: libvirt\n"
 "Report-Msgid-Bugs-To: libvir-list@redhat.com\n"
-"POT-Creation-Date: 2011-11-08 14:40+0800\n"
-"PO-Revision-Date: 2011-12-09 01:30+0000\n"
+"POT-Creation-Date: 2011-12-08 14:59+0800\n"
+"PO-Revision-Date: 2012-02-15 23:42+0000\n"
 "Last-Translator: Serge Hallyn <Unknown>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:20+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:20+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
-#: daemon/libvirtd.c:252
+#: daemon/libvirtd.c:256
 #, c-format
 msgid ""
 "%s: error: %s. Check /var/log/messages or run without --daemon for more "
 "info.\n"
 msgstr ""
 
-#: daemon/libvirtd.c:2758 daemon/libvirtd.c:2767
+#: daemon/libvirtd.c:446 daemon/libvirtd.c:451
 #, c-format
 msgid "Failed to parse mode '%s'"
 msgstr ""
 
-#: daemon/libvirtd.c:2429 daemon/libvirtd.c:2448
+#: daemon/libvirtd.c:590 daemon/libvirtd.c:609
 #, c-format
 msgid "failed to allocate memory for %s config list"
 msgstr ""
 
-#: daemon/libvirtd.c:2435 daemon/libvirtd.c:2465
+#: daemon/libvirtd.c:596 daemon/libvirtd.c:626
 #, c-format
 msgid "failed to allocate memory for %s config list value"
 msgstr ""
 
-#: daemon/libvirtd.c:610 daemon/libvirtd.c:633
+#: daemon/libvirtd.c:614 daemon/libvirtd.c:637
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: must be a string or list of strings"
 msgstr ""
 
-#: daemon/libvirtd.c:649
+#: daemon/libvirtd.c:653
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: invalid type: got %s; expected %s"
 msgstr ""
 
-#: daemon/libvirtd.c:710
+#: daemon/libvirtd.c:714
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: unsupported auth %s"
 msgstr ""
 
-#: daemon/libvirtd.c:1088
+#: daemon/libvirtd.c:1100
 msgid "additional privileges are required"
 msgstr ""
 
-#: daemon/libvirtd.c:1094
+#: daemon/libvirtd.c:1106
 msgid "failed to set reduced privileges"
 msgstr ""
 
-#: daemon/libvirtd.c:1145
+#: daemon/libvirtd.c:1157
 msgid "Driver state initialization failed"
 msgstr ""
 
-#: daemon/libvirtd.c:1173
+#: daemon/libvirtd.c:1185
 #, c-format
 msgid ""
 "\n"
@@ -86,7 +86,7 @@
 "libvirt management daemon:\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1190
+#: daemon/libvirtd.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -109,7 +109,7 @@
 "\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1217
+#: daemon/libvirtd.c:1229
 msgid ""
 "\n"
 "  Default paths:\n"
@@ -130,287 +130,408 @@
 "\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1278 src/lxc/lxc_controller.c:1306
+#: daemon/libvirtd.c:1290 src/lxc/lxc_controller.c:1541
 #: src/security/virt-aa-helper.c:1164 src/storage/parthelper.c:75
 #: src/util/iohelper.c:227 src/util/iohelper.c:234
 #, c-format
 msgid "%s: initialization failed\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1315
+#: daemon/libvirtd.c:1327
 msgid "Invalid value for timeout"
 msgstr ""
 
-#: daemon/libvirtd.c:1323 daemon/libvirtd.c:1331
+#: daemon/libvirtd.c:1335 daemon/libvirtd.c:1343
 msgid "Can't allocate memory"
 msgstr ""
 
-#: daemon/libvirtd.c:1345
+#: daemon/libvirtd.c:1357
 #, c-format
 msgid "%s: internal error: unknown flag: %c"
 msgstr ""
 
-#: daemon/libvirtd.c:1352
+#: daemon/libvirtd.c:1364
 msgid "Can't create initial configuration"
 msgstr ""
 
-#: daemon/libvirtd.c:1361
+#: daemon/libvirtd.c:1373
 msgid "Can't determine config path"
 msgstr ""
 
-#: daemon/libvirtd.c:1369
+#: daemon/libvirtd.c:1381
 #, c-format
 msgid "Can't load config file '%s'"
 msgstr ""
 
-#: daemon/libvirtd.c:1375
+#: daemon/libvirtd.c:1387
 #, c-format
 msgid "invalid host UUID: %s"
 msgstr ""
 
-#: daemon/libvirtd.c:1380
+#: daemon/libvirtd.c:1392
 msgid "Can't initialize logging"
 msgstr ""
 
-#: daemon/libvirtd.c:1387
+#: daemon/libvirtd.c:1399
 msgid "Can't determine pid file path."
 msgstr ""
 
-#: daemon/libvirtd.c:1395
+#: daemon/libvirtd.c:1407
 msgid "Can't determine socket paths"
 msgstr ""
 
-#: src/util/util.c:526
+#: daemon/libvirtd.c:1415
 #, c-format
 msgid "cannot change to root directory: %s"
 msgstr ""
 
-#: daemon/libvirtd.c:3059
+#: daemon/libvirtd.c:1421
 #, c-format
 msgid "Failed to fork as daemon: %s"
 msgstr ""
 
-#: daemon/libvirtd.c:1422
+#: daemon/libvirtd.c:1434
 msgid "Can't determine user directory"
 msgstr ""
 
-#: daemon/libvirtd.c:3086
+#: daemon/libvirtd.c:1448
 #, c-format
 msgid "unable to create rundir %s: %s"
 msgstr ""
 
-#: daemon/remote.c:173
+#: daemon/qemu_dispatch.h:36 daemon/remote.c:663 daemon/remote.c:873
+#: daemon/remote.c:927 daemon/remote.c:982 daemon/remote.c:1046
+#: daemon/remote.c:1104 daemon/remote.c:1174 daemon/remote.c:1227
+#: daemon/remote.c:1274 daemon/remote.c:1320 daemon/remote.c:1391
+#: daemon/remote.c:1477 daemon/remote.c:1534 daemon/remote.c:1585
+#: daemon/remote.c:1649 daemon/remote.c:1715 daemon/remote.c:1793
+#: daemon/remote.c:1868 daemon/remote.c:1910 daemon/remote.c:2670
+#: daemon/remote.c:2723 daemon/remote.c:2764 daemon/remote.c:2842
+#: daemon/remote.c:2879 daemon/remote.c:2912 daemon/remote.c:2961
+#: daemon/remote.c:3007 daemon/remote.c:3048 daemon/remote.c:3099
+#: daemon/remote.c:3159 daemon/remote.c:3213 daemon/remote.c:3262
+#: daemon/remote.c:3310 daemon/remote.c:3350 daemon/remote_dispatch.h:163
+#: daemon/remote_dispatch.h:213 daemon/remote_dispatch.h:261
+#: daemon/remote_dispatch.h:313 daemon/remote_dispatch.h:365
+#: daemon/remote_dispatch.h:417 daemon/remote_dispatch.h:470
+#: daemon/remote_dispatch.h:547 daemon/remote_dispatch.h:601
+#: daemon/remote_dispatch.h:656 daemon/remote_dispatch.h:735
+#: daemon/remote_dispatch.h:787 daemon/remote_dispatch.h:841
+#: daemon/remote_dispatch.h:896 daemon/remote_dispatch.h:948
+#: daemon/remote_dispatch.h:998 daemon/remote_dispatch.h:1050
+#: daemon/remote_dispatch.h:1102 daemon/remote_dispatch.h:1154
+#: daemon/remote_dispatch.h:1293 daemon/remote_dispatch.h:1371
+#: daemon/remote_dispatch.h:1473 daemon/remote_dispatch.h:1531
+#: daemon/remote_dispatch.h:1591 daemon/remote_dispatch.h:1658
+#: daemon/remote_dispatch.h:1714 daemon/remote_dispatch.h:1792
+#: daemon/remote_dispatch.h:2002 daemon/remote_dispatch.h:2058
+#: daemon/remote_dispatch.h:2114 daemon/remote_dispatch.h:2170
+#: daemon/remote_dispatch.h:2223 daemon/remote_dispatch.h:2278
+#: daemon/remote_dispatch.h:2341 daemon/remote_dispatch.h:2397
+#: daemon/remote_dispatch.h:2453 daemon/remote_dispatch.h:2508
+#: daemon/remote_dispatch.h:2560 daemon/remote_dispatch.h:2612
+#: daemon/remote_dispatch.h:2662 daemon/remote_dispatch.h:2714
+#: daemon/remote_dispatch.h:2856 daemon/remote_dispatch.h:2911
+#: daemon/remote_dispatch.h:2988 daemon/remote_dispatch.h:3044
+#: daemon/remote_dispatch.h:3194 daemon/remote_dispatch.h:3271
+#: daemon/remote_dispatch.h:3343 daemon/remote_dispatch.h:3396
+#: daemon/remote_dispatch.h:3453 daemon/remote_dispatch.h:3544
+#: daemon/remote_dispatch.h:3596 daemon/remote_dispatch.h:3648
+#: daemon/remote_dispatch.h:3700 daemon/remote_dispatch.h:3751
+#: daemon/remote_dispatch.h:3798 daemon/remote_dispatch.h:3847
+#: daemon/remote_dispatch.h:3900 daemon/remote_dispatch.h:3957
+#: daemon/remote_dispatch.h:4010 daemon/remote_dispatch.h:4063
+#: daemon/remote_dispatch.h:4112 daemon/remote_dispatch.h:4166
+#: daemon/remote_dispatch.h:4248 daemon/remote_dispatch.h:4300
+#: daemon/remote_dispatch.h:4354 daemon/remote_dispatch.h:4416
+#: daemon/remote_dispatch.h:4477 daemon/remote_dispatch.h:4532
+#: daemon/remote_dispatch.h:4587 daemon/remote_dispatch.h:4643
+#: daemon/remote_dispatch.h:4705 daemon/remote_dispatch.h:4767
+#: daemon/remote_dispatch.h:4827 daemon/remote_dispatch.h:4879
+#: daemon/remote_dispatch.h:4931 daemon/remote_dispatch.h:4986
+#: daemon/remote_dispatch.h:5044 daemon/remote_dispatch.h:5100
+#: daemon/remote_dispatch.h:5161 daemon/remote_dispatch.h:5225
+#: daemon/remote_dispatch.h:5287 daemon/remote_dispatch.h:5362
+#: daemon/remote_dispatch.h:5432 daemon/remote_dispatch.h:5490
+#: daemon/remote_dispatch.h:5547 daemon/remote_dispatch.h:5605
+#: daemon/remote_dispatch.h:5657 daemon/remote_dispatch.h:5709
+#: daemon/remote_dispatch.h:5761 daemon/remote_dispatch.h:5815
+#: daemon/remote_dispatch.h:5865 daemon/remote_dispatch.h:5916
+#: daemon/remote_dispatch.h:5966 daemon/remote_dispatch.h:6014
+#: daemon/remote_dispatch.h:6062 daemon/remote_dispatch.h:6113
+#: daemon/remote_dispatch.h:6165 daemon/remote_dispatch.h:6213
+#: daemon/remote_dispatch.h:6266 daemon/remote_dispatch.h:6314
+#: daemon/remote_dispatch.h:6361 daemon/remote_dispatch.h:6407
+#: daemon/remote_dispatch.h:6453 daemon/remote_dispatch.h:6500
+#: daemon/remote_dispatch.h:6554 daemon/remote_dispatch.h:6604
+#: daemon/remote_dispatch.h:6659 daemon/remote_dispatch.h:6715
+#: daemon/remote_dispatch.h:6770 daemon/remote_dispatch.h:6822
+#: daemon/remote_dispatch.h:6872 daemon/remote_dispatch.h:6924
+#: daemon/remote_dispatch.h:6974 daemon/remote_dispatch.h:7038
+#: daemon/remote_dispatch.h:7102 daemon/remote_dispatch.h:7166
+#: daemon/remote_dispatch.h:7230 daemon/remote_dispatch.h:7294
+#: daemon/remote_dispatch.h:7358 daemon/remote_dispatch.h:7422
+#: daemon/remote_dispatch.h:7486 daemon/remote_dispatch.h:7550
+#: daemon/remote_dispatch.h:7612 daemon/remote_dispatch.h:7666
+#: daemon/remote_dispatch.h:7718 daemon/remote_dispatch.h:7768
+#: daemon/remote_dispatch.h:7823 daemon/remote_dispatch.h:7879
+#: daemon/remote_dispatch.h:7935 daemon/remote_dispatch.h:7991
+#: daemon/remote_dispatch.h:8047 daemon/remote_dispatch.h:8102
+#: daemon/remote_dispatch.h:8154 daemon/remote_dispatch.h:8204
+#: daemon/remote_dispatch.h:8256 daemon/remote_dispatch.h:8310
+#: daemon/remote_dispatch.h:8360 daemon/remote_dispatch.h:8412
+#: daemon/remote_dispatch.h:8489 daemon/remote_dispatch.h:8545
+#: daemon/remote_dispatch.h:8614 daemon/remote_dispatch.h:8667
+#: daemon/remote_dispatch.h:8720 daemon/remote_dispatch.h:8772
+#: daemon/remote_dispatch.h:8826 daemon/remote_dispatch.h:8910
+#: daemon/remote_dispatch.h:8958 daemon/remote_dispatch.h:9059
+#: daemon/remote_dispatch.h:9126 daemon/remote_dispatch.h:9175
+#: daemon/remote_dispatch.h:9222 daemon/remote_dispatch.h:9270
+#: daemon/remote_dispatch.h:9318 daemon/remote_dispatch.h:9366
+#: daemon/remote_dispatch.h:9414 daemon/remote_dispatch.h:9462
+#: daemon/remote_dispatch.h:9510 daemon/remote_dispatch.h:9558
+#: daemon/remote_dispatch.h:9606 daemon/remote_dispatch.h:9654
+#: daemon/remote_dispatch.h:9704 daemon/remote_dispatch.h:9757
+#: daemon/remote_dispatch.h:9812 daemon/remote_dispatch.h:9864
+#: daemon/remote_dispatch.h:9914 daemon/remote_dispatch.h:9989
+#: daemon/remote_dispatch.h:10064 daemon/remote_dispatch.h:10119
+#: daemon/remote_dispatch.h:10171 daemon/remote_dispatch.h:10221
+#: daemon/remote_dispatch.h:10273 daemon/remote_dispatch.h:10325
+#: daemon/remote_dispatch.h:10377 daemon/remote_dispatch.h:10431
+#: daemon/remote_dispatch.h:10483 daemon/remote_dispatch.h:10533
+#: daemon/remote_dispatch.h:10585 daemon/remote_dispatch.h:10640
+#: daemon/remote_dispatch.h:10696 daemon/remote_dispatch.h:10755
+#: daemon/remote_dispatch.h:10811 daemon/remote_dispatch.h:10867
+#: daemon/remote_dispatch.h:10923 daemon/remote_dispatch.h:10992
+#: daemon/remote_dispatch.h:11044 daemon/remote_dispatch.h:11097
+#: daemon/remote_dispatch.h:11155 daemon/remote_dispatch.h:11208
+#: daemon/remote_dispatch.h:11260 daemon/remote_dispatch.h:11312
+#: daemon/remote_dispatch.h:11367 daemon/remote_dispatch.h:11426
+#: daemon/remote_dispatch.h:11486 daemon/remote_dispatch.h:11540
+#: daemon/remote_dispatch.h:11611 daemon/remote_dispatch.h:11669
+#: daemon/remote_dispatch.h:11725 daemon/remote_dispatch.h:11780
+#: daemon/remote_dispatch.h:11833 daemon/remote_dispatch.h:11890
+#: daemon/remote_dispatch.h:11942 daemon/remote_dispatch.h:12010
 msgid "connection not open"
 msgstr ""
 
-#: daemon/remote.c:64 src/remote/remote_driver.c:57
+#: daemon/remote.c:63 src/remote/remote_driver.c:57
 #, c-format
 msgid "conversion from hyper to %s overflowed"
 msgstr ""
 
-#: daemon/remote.c:142
+#: daemon/remote.c:599
 msgid "connection already open"
 msgstr ""
 
-#: daemon/remote.c:730 daemon/remote.c:808 src/remote/remote_driver.c:1298
-#: src/remote/remote_driver.c:1369
+#: daemon/remote.c:605
+msgid "keepalive support is required to connect"
+msgstr ""
+
+#: daemon/remote.c:747 daemon/remote.c:837 src/remote/remote_driver.c:1336
+#: src/remote/remote_driver.c:1415
 #, c-format
 msgid "unknown parameter type: %d"
 msgstr ""
 
-#: daemon/remote.c:501 daemon/remote.c:585
+#: daemon/remote.c:783 daemon/remote.c:878 daemon/remote.c:932
+#: daemon/remote.c:1113 daemon/remote.c:1592 daemon/remote.c:1656
+#: daemon/remote.c:1722 daemon/remote.c:1800 daemon/remote.c:1915
 msgid "nparams too large"
 msgstr ""
 
-#: src/remote/remote_driver.c:3196
+#: daemon/remote.c:798 src/remote/remote_driver.c:1376
 #, c-format
 msgid "Parameter %s too big for destination"
 msgstr ""
 
-#: daemon/remote.c:725
+#: daemon/remote.c:988
 msgid "maxStats > REMOTE_DOMAIN_MEMORY_STATS_MAX"
 msgstr ""
 
-#: daemon/remote.c:794 daemon/remote.c:843
+#: daemon/remote.c:1059 daemon/remote.c:1186
 msgid "size > maximum buffer size"
 msgstr ""
 
-#: daemon/remote.c:1290
+#: daemon/remote.c:1328
 msgid "ncpumaps > REMOTE_VCPUINFO_MAX"
 msgstr ""
 
-#: daemon/remote.c:1331
+#: daemon/remote.c:1334 daemon/remote.c:1405
 msgid "maxinfo * maplen > REMOTE_CPUMAPS_MAX"
 msgstr ""
 
-#: daemon/remote.c:1325
+#: daemon/remote.c:1399
 msgid "maxinfo > REMOTE_VCPUINFO_MAX"
 msgstr ""
 
-#: daemon/remote.c:2864
+#: daemon/remote.c:2047
 msgid "client tried invalid SASL init request"
 msgstr ""
 
-#: src/util/virterror.c:989
+#: daemon/remote.c:2093 daemon/remote.c:2245 daemon/remote.c:2343
+#: daemon/remote.c:2359 daemon/remote.c:2373 daemon/remote.c:2387
+#: daemon/remote.c:2478 daemon/remote.c:2615 daemon/remote.c:2644
+#: src/util/virterror.c:1020
 msgid "authentication failed"
 msgstr ""
 
-#: daemon/remote.c:3022
+#: daemon/remote.c:2120
 #, c-format
 msgid "negotiated SSF %d was not strong enough"
 msgstr ""
 
-#: daemon/remote.c:3119 daemon/remote.c:3207
+#: daemon/remote.c:2176 daemon/remote.c:2274
 msgid "client tried invalid SASL start request"
 msgstr ""
 
-#: daemon/remote.c:3141
+#: daemon/remote.c:2194
 #, c-format
 msgid "sasl start reply data too long %d"
 msgstr ""
 
-#: daemon/remote.c:3229
+#: daemon/remote.c:2291
 #, c-format
 msgid "sasl step reply data too long %d"
 msgstr ""
 
-#: daemon/remote.c:3356 daemon/remote.c:3425
+#: daemon/remote.c:2430 daemon/remote.c:2527
 msgid "client tried invalid PolicyKit init request"
 msgstr ""
 
-#: daemon/remote.c:3369
+#: daemon/remote.c:2442
 #, c-format
 msgid "Caller PID was too large %d"
 msgstr ""
 
-#: daemon/remote.c:2343 daemon/remote.c:2433
+#: daemon/remote.c:2448 daemon/remote.c:2538
 #, c-format
 msgid "Caller identity was too large %d:%d"
 msgstr ""
 
-#: daemon/remote.c:3374
+#: daemon/remote.c:2453
 #, c-format
 msgid "Cannot invoke %s"
 msgstr ""
 
-#: daemon/remote.c:2353
+#: daemon/remote.c:2458
 #, c-format
 msgid "Policy kit denied action %s from pid %d, uid %d: %s"
 msgstr ""
 
-#: daemon/remote.c:3361 daemon/remote.c:3430
+#: daemon/remote.c:2532
 msgid "cannot get peer socket identity"
 msgstr ""
 
-#: daemon/remote.c:3438
+#: daemon/remote.c:2546
 #, c-format
 msgid "Failed to lookup policy kit caller: %s"
 msgstr ""
 
-#: daemon/remote.c:2448
+#: daemon/remote.c:2553
 #, c-format
 msgid "Failed to create polkit action %s"
 msgstr ""
 
-#: daemon/remote.c:2458
+#: daemon/remote.c:2563
 #, c-format
 msgid "Failed to create polkit context %s"
 msgstr ""
 
-#: daemon/remote.c:3473
+#: daemon/remote.c:2581
 #, c-format
 msgid "Policy kit failed to check authorization %d %s"
 msgstr ""
 
-#: daemon/remote.c:2490
+#: daemon/remote.c:2595
 #, c-format
 msgid "Policy kit denied action %s from pid %d, uid %d, result: %s"
 msgstr ""
 
-#: daemon/remote.c:3518
+#: daemon/remote.c:2642
 msgid "client tried unsupported PolicyKit init request"
 msgstr ""
 
-#: daemon/remote.c:2625 daemon/remote.c:2820
+#: daemon/remote.c:2730 daemon/remote.c:2925
 #, c-format
 msgid "domain event %d already registered"
 msgstr ""
 
-#: daemon/remote.c:2666 daemon/remote.c:2870
+#: daemon/remote.c:2771 daemon/remote.c:2975
 #, c-format
 msgid "domain event %d not registered"
 msgstr ""
 
-#: daemon/remote.c:2815 daemon/remote.c:2864
+#: daemon/remote.c:2920 daemon/remote.c:2969
 #, c-format
 msgid "unsupported event ID %d"
 msgstr ""
 
-#: daemon/remote_dispatch.h:5153 daemon/remote_dispatch.h:5228
+#: daemon/remote_dispatch.h:5293 daemon/remote_dispatch.h:5368
 msgid "maxnames > REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX"
 msgstr ""
 
-#: daemon/remote.c:1621
+#: daemon/remote_dispatch.h:6980
 msgid "maxnames > REMOTE_DOMAIN_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:2586
+#: daemon/remote_dispatch.h:7044
 msgid "maxnames > REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:2080 daemon/remote.c:2147 daemon/remote.c:3542
+#: daemon/remote_dispatch.h:7108 daemon/remote_dispatch.h:7364
 msgid "maxnames > REMOTE_NETWORK_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:3576
+#: daemon/remote_dispatch.h:7172 daemon/remote_dispatch.h:7556
 msgid "maxnames > REMOTE_STORAGE_POOL_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:2114
+#: daemon/remote_dispatch.h:7236
 msgid "maxids > REMOTE_DOMAIN_ID_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:2533
+#: daemon/remote_dispatch.h:7300
 msgid "maxnames > REMOTE_INTERFACE_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:7288
+#: daemon/remote_dispatch.h:7428
 msgid "maxnames > REMOTE_NWFILTER_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:4885
+#: daemon/remote_dispatch.h:7492
 msgid "maxuuids > REMOTE_SECRET_UUID_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:8411
+#: daemon/remote_dispatch.h:8551
 msgid "maxnames > REMOTE_NODE_DEVICE_CAPS_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:8692
+#: daemon/remote_dispatch.h:8832
 msgid "maxcells > REMOTE_NODE_MAX_CELLS"
 msgstr ""
 
-#: daemon/remote.c:4429 daemon/remote.c:4600
+#: daemon/remote_dispatch.h:9065
 msgid "maxnames > REMOTE_NODE_DEVICE_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:4062
+#: daemon/remote_dispatch.h:10929
 msgid "maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/stream.c:113
+#: daemon/stream.c:237
 msgid "stream had unexpected termination"
 msgstr ""
 
-#: daemon/stream.c:115
+#: daemon/stream.c:240
 msgid "stream had I/O failure"
 msgstr ""
 
-#: daemon/stream.c:468
+#: daemon/stream.c:622
 msgid "stream aborted at client request"
 msgstr ""
 
-#: daemon/stream.c:471
+#: daemon/stream.c:626
 #, c-format
 msgid "stream aborted with unexpected status %d"
 msgstr ""
@@ -493,1972 +614,2034 @@
 msgid "Unknown error"
 msgstr ""
 
-#: src/conf/cpu_conf.c:126
+#: src/conf/cpu_conf.c:132
 msgid "XML does not contain expected 'cpu' element"
 msgstr ""
 
-#: src/conf/cpu_conf.c:139
+#: src/conf/cpu_conf.c:145
 msgid ""
 "'arch' element element cannot be used inside 'cpu' element with 'match' "
 "attribute'"
 msgstr ""
 
-#: src/conf/cpu_conf.c:98
+#: src/conf/cpu_conf.c:169
 msgid "Invalid match attribute for CPU specification"
 msgstr ""
 
-#: src/conf/cpu_conf.c:107
+#: src/conf/cpu_conf.c:179
 msgid "Missing CPU architecture"
 msgstr ""
 
-#: src/conf/cpu_conf.c:114 src/cpu/cpu_x86.c:602
+#: src/conf/cpu_conf.c:187 src/cpu/cpu_x86.c:949
 msgid "Missing CPU model name"
 msgstr ""
 
-#: src/conf/cpu_conf.c:188
+#: src/conf/cpu_conf.c:194
 msgid "CPU vendor specified without CPU model"
 msgstr ""
 
-#: src/conf/cpu_conf.c:126
+#: src/conf/cpu_conf.c:206
 msgid "Missing 'sockets' attribute in CPU topology"
 msgstr ""
 
-#: src/conf/cpu_conf.c:135
+#: src/conf/cpu_conf.c:215
 msgid "Missing 'cores' attribute in CPU topology"
 msgstr ""
 
-#: src/conf/cpu_conf.c:144
+#: src/conf/cpu_conf.c:224
 msgid "Missing 'threads' attribute in CPU topology"
 msgstr ""
 
-#: src/conf/cpu_conf.c:151
+#: src/conf/cpu_conf.c:231
 msgid "Invalid CPU topology"
 msgstr ""
 
-#: src/conf/cpu_conf.c:237 src/conf/cpu_conf.c:372
+#: src/conf/cpu_conf.c:243 src/conf/cpu_conf.c:433
 msgid "Non-empty feature list specified without CPU model"
 msgstr ""
 
-#: src/conf/cpu_conf.c:180
+#: src/conf/cpu_conf.c:270
 msgid "Invalid CPU feature policy"
 msgstr ""
 
-#: src/conf/cpu_conf.c:190
+#: src/conf/cpu_conf.c:280
 msgid "Invalid CPU feature name"
 msgstr ""
 
-#: src/conf/cpu_conf.c:197 src/conf/cpu_conf.c:345
+#: src/conf/cpu_conf.c:287 src/conf/cpu_conf.c:502
 #, c-format
 msgid "CPU feature `%s' specified more than once"
 msgstr ""
 
-#: src/conf/cpu_conf.c:277
+#: src/conf/cpu_conf.c:303
+msgid "NUMA topology defined without NUMA cells"
+msgstr ""
+
+#: src/conf/cpu_conf.c:322
+msgid "Missing 'cpus' attribute in NUMA cell"
+msgstr ""
+
+#: src/conf/cpu_conf.c:339
+msgid "Missing 'memory' attribute in NUMA cell"
+msgstr ""
+
+#: src/conf/cpu_conf.c:346
+msgid "Invalid 'memory' attribute in NUMA cell"
+msgstr ""
+
+#: src/conf/cpu_conf.c:400
 #, c-format
 msgid "Unexpected CPU match policy %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:305 src/cpu/cpu_x86.c:289
+#: src/conf/cpu_conf.c:457 src/cpu/cpu_x86.c:669
 msgid "Missing CPU feature name"
 msgstr ""
 
-#: src/conf/cpu_conf.c:315
+#: src/conf/cpu_conf.c:467
 #, c-format
 msgid "Unexpected CPU feature policy %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:468
+#: src/conf/cpu_conf.c:539
 msgid "Target CPU does not match source"
 msgstr ""
 
-#: src/conf/cpu_conf.c:474
+#: src/conf/cpu_conf.c:545
 #, c-format
 msgid "Target CPU type %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:482
+#: src/conf/cpu_conf.c:553
 #, c-format
 msgid "Target CPU arch %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:489
+#: src/conf/cpu_conf.c:560
 #, c-format
 msgid "Target CPU model %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:496
+#: src/conf/cpu_conf.c:567
 #, c-format
 msgid "Target CPU vendor %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:503
+#: src/conf/cpu_conf.c:574
 #, c-format
 msgid "Target CPU sockets %d does not match source %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:510
+#: src/conf/cpu_conf.c:581
 #, c-format
 msgid "Target CPU cores %d does not match source %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:517
+#: src/conf/cpu_conf.c:588
 #, c-format
 msgid "Target CPU threads %d does not match source %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:524
+#: src/conf/cpu_conf.c:595
 #, c-format
 msgid "Target CPU feature count %zu does not match source %zu"
 msgstr ""
 
-#: src/conf/cpu_conf.c:532
+#: src/conf/cpu_conf.c:603
 #, c-format
 msgid "Target CPU feature %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:539
+#: src/conf/cpu_conf.c:610
 #, c-format
 msgid "Target CPU feature policy %s does not match source %s"
 msgstr ""
 
-#: daemon/libvirtd.c:831 daemon/libvirtd.c:1329 src/conf/domain_conf.c:667
-#: src/conf/interface_conf.c:1373 src/conf/network_conf.c:175
-#: src/conf/node_device_conf.c:196 src/conf/storage_conf.c:1460
-#: src/openvz/openvz_conf.c:465 src/qemu/qemu_driver.c:961
-#: src/remote/remote_driver.c:978 src/remote/remote_driver.c:7171
-#: src/remote/remote_driver.c:7350 src/remote/remote_driver.c:7562
-#: src/test/test_driver.c:509 src/test/test_driver.c:754
+#: src/conf/domain_conf.c:643
+#, c-format
+msgid "could not parse weight %s"
+msgstr ""
+
+#: src/conf/domain_conf.c:656
+msgid "missing per-device path"
+msgstr ""
+
+#: src/conf/domain_conf.c:1543 src/conf/interface_conf.c:1288
+#: src/conf/network_conf.c:227 src/conf/node_device_conf.c:195
+#: src/conf/nwfilter_conf.c:2844 src/conf/storage_conf.c:1409
+#: src/libxl/libxl_driver.c:880 src/openvz/openvz_conf.c:474
+#: src/qemu/qemu_driver.c:420 src/remote/remote_driver.c:778
+#: src/rpc/virnetclientstream.c:151 src/rpc/virnetserver.c:377
+#: src/test/test_driver.c:526 src/test/test_driver.c:766
+#: src/xen/xen_driver.c:321
 msgid "cannot initialize mutex"
 msgstr ""
 
-#: src/conf/domain_conf.c:1724
+#: src/conf/domain_conf.c:1914
 #, c-format
 msgid "unknown address type '%d'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1752
+#: src/conf/domain_conf.c:1942
 msgid "Cannot parse <address> 'domain' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1759 src/conf/domain_conf.c:1826
-#: src/conf/domain_conf.c:1878 src/conf/domain_conf.c:1968
+#: src/conf/domain_conf.c:1949 src/conf/domain_conf.c:2016
+#: src/conf/domain_conf.c:2068 src/conf/domain_conf.c:2158
 msgid "Cannot parse <address> 'bus' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1766 src/conf/domain_conf.c:1927
+#: src/conf/domain_conf.c:1956 src/conf/domain_conf.c:2117
 msgid "Cannot parse <address> 'slot' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1773
+#: src/conf/domain_conf.c:1963
 msgid "Cannot parse <address> 'function' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1780
+#: src/conf/domain_conf.c:1970
 #, c-format
 msgid "Unknown value '%s' for <address> 'multifunction' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1787
+#: src/conf/domain_conf.c:1977
 msgid "Insufficient specification for PCI address"
 msgstr ""
 
-#: src/conf/domain_conf.c:1819 src/conf/domain_conf.c:1871
-#: src/conf/domain_conf.c:1920
+#: src/conf/domain_conf.c:2009 src/conf/domain_conf.c:2061
+#: src/conf/domain_conf.c:2110
 msgid "Cannot parse <address> 'controller' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1833
+#: src/conf/domain_conf.c:2023
 msgid "Cannot parse <address> 'unit' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1839
+#: src/conf/domain_conf.c:2029
 msgid "Insufficient specification for drive address"
 msgstr ""
 
-#: src/conf/domain_conf.c:1885 src/conf/domain_conf.c:1958
+#: src/conf/domain_conf.c:2075 src/conf/domain_conf.c:2148
 msgid "Cannot parse <address> 'port' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1891
+#: src/conf/domain_conf.c:2081
 msgid "Insufficient specification for virtio serial address"
 msgstr ""
 
-#: src/conf/domain_conf.c:1994
+#: src/conf/domain_conf.c:2184
 msgid "Cannot parse <master> 'startport' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:2057
+#: src/conf/domain_conf.c:2247
 #, c-format
 msgid "unknown address type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2062
+#: src/conf/domain_conf.c:2252
 msgid "No type specified for device address"
 msgstr ""
 
-#: src/conf/domain_conf.c:2096
+#: src/conf/domain_conf.c:2286
 msgid "Unknown device address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2121
+#: src/conf/domain_conf.c:2311
 msgid "missing boot order attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:2126
+#: src/conf/domain_conf.c:2316
 #, c-format
 msgid "incorrect boot order '%s', expecting positive integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:2135
+#: src/conf/domain_conf.c:2325
 msgid "boot orders have to be contiguous and starting from 1"
 msgstr ""
 
-#: src/conf/domain_conf.c:2139
+#: src/conf/domain_conf.c:2329
 #, c-format
 msgid "boot order %d used for more than one device"
 msgstr ""
 
-#: src/conf/domain_conf.c:2278
+#: src/conf/domain_conf.c:2468
 msgid "Missing 'key' element for lease"
 msgstr ""
 
-#: src/conf/domain_conf.c:2283
+#: src/conf/domain_conf.c:2473
 msgid "Missing 'target' element for lease"
 msgstr ""
 
-#: src/conf/domain_conf.c:2290
+#: src/conf/domain_conf.c:2480
 #, c-format
 msgid "Malformed lease target offset %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:764
+#: src/conf/domain_conf.c:2554
 #, c-format
 msgid "unknown disk type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2390
+#: src/conf/domain_conf.c:2584
 msgid "missing protocol type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2396
+#: src/conf/domain_conf.c:2590
 #, c-format
 msgid "unknown protocol type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2403
+#: src/conf/domain_conf.c:2597
 msgid "missing name for disk source"
 msgstr ""
 
-#: src/conf/domain_conf.c:2421
+#: src/conf/domain_conf.c:2615
 msgid "missing name for host"
 msgstr ""
 
-#: src/conf/domain_conf.c:2427
+#: src/conf/domain_conf.c:2621
 msgid "missing port for host"
 msgstr ""
 
-#: src/conf/domain_conf.c:789 src/conf/domain_conf.c:3930
+#: src/conf/domain_conf.c:2630 src/conf/domain_conf.c:9800
 #, c-format
 msgid "unexpected disk type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2472
+#: src/conf/domain_conf.c:2666
 msgid "missing username for auth"
 msgstr ""
 
-#: src/conf/domain_conf.c:2484
+#: src/conf/domain_conf.c:2678
 msgid "missing type for secret"
 msgstr ""
 
-#: src/conf/domain_conf.c:2490
+#: src/conf/domain_conf.c:2684
 #, c-format
 msgid "invalid secret type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2500
+#: src/conf/domain_conf.c:2694
 msgid "only one of uuid and usage can be specfied"
 msgstr ""
 
-#: src/conf/domain_conf.c:2508
+#: src/conf/domain_conf.c:2702
 #, c-format
 msgid "malformed uuid %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:841
+#: src/conf/domain_conf.c:2756
+msgid "total and read/write bytes_sec cannot be set at the same time"
+msgstr ""
+
+#: src/conf/domain_conf.c:2766
+msgid "total and read/write iops_sec cannot be set at the same time"
+msgstr ""
+
+#: src/conf/domain_conf.c:2802
 #, c-format
 msgid "unknown disk device '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:867
+#: src/conf/domain_conf.c:2828
 #, c-format
 msgid "Invalid floppy device name: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:882
+#: src/conf/domain_conf.c:2843
 #, c-format
 msgid "Invalid harddisk device name: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2601 src/conf/domain_conf.c:11889
+#: src/conf/domain_conf.c:2851 src/conf/domain_conf.c:12255
 #, c-format
 msgid "unknown disk snapshot setting '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:889
+#: src/conf/domain_conf.c:2862
 #, c-format
 msgid "unknown disk bus type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:914
+#: src/conf/domain_conf.c:2887
 #, c-format
 msgid "Invalid bus type '%s' for floppy disk"
 msgstr ""
 
-#: src/conf/domain_conf.c:920
+#: src/conf/domain_conf.c:2893
 #, c-format
 msgid "Invalid bus type '%s' for disk"
 msgstr ""
 
-#: src/conf/domain_conf.c:927
+#: src/conf/domain_conf.c:2900
 #, c-format
 msgid "unknown disk cache mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2657
+#: src/conf/domain_conf.c:2907
 #, c-format
 msgid "unknown disk error policy '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2666
+#: src/conf/domain_conf.c:2916
 #, c-format
 msgid "unknown disk read error policy '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2675
+#: src/conf/domain_conf.c:2925
 #, c-format
 msgid "unknown disk io mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2683
+#: src/conf/domain_conf.c:2933
 msgid "disk ioeventfd mode supported only for virtio bus"
 msgstr ""
 
-#: src/conf/domain_conf.c:2691
+#: src/conf/domain_conf.c:2941
 #, c-format
 msgid "unknown disk ioeventfd mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2701
+#: src/conf/domain_conf.c:2951
 msgid "disk event_idx mode supported only for virtio bus"
 msgstr ""
 
-#: src/conf/domain_conf.c:2709
+#: src/conf/domain_conf.c:2959
 #, c-format
 msgid "unknown disk event_idx mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:937 src/conf/domain_conf.c:1182
-#: src/conf/domain_conf.c:2396
+#: src/conf/domain_conf.c:2970 src/conf/domain_conf.c:3553
+#: src/conf/domain_conf.c:5876
 #, c-format
 msgid "Unable to parse devaddr parameter '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2735
+#: src/conf/domain_conf.c:2985
 #, c-format
 msgid "unknown startupPolicy value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2743
+#: src/conf/domain_conf.c:2993
 #, c-format
 msgid "Setting disk %s is allowed only for cdrom or floppy"
 msgstr ""
 
-#: src/conf/domain_conf.c:2859
+#: src/conf/domain_conf.c:3110
 #, c-format
 msgid "Unknown controller type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2868
+#: src/conf/domain_conf.c:3119
 #, c-format
 msgid "Cannot parse controller index %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2877
+#: src/conf/domain_conf.c:3128
 #, c-format
 msgid "Unknown model type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2895
+#: src/conf/domain_conf.c:3146
 #, c-format
 msgid "Invalid ports: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2910
+#: src/conf/domain_conf.c:3161
 #, c-format
 msgid "Invalid vectors: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2928
+#: src/conf/domain_conf.c:3179
 msgid "Controllers must use the 'pci' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:999
+#: src/conf/domain_conf.c:3219
 #, c-format
 msgid "unknown filesystem type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2979
+#: src/conf/domain_conf.c:3230
 #, c-format
 msgid "unknown accessmode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3015
+#: src/conf/domain_conf.c:3266
 #, c-format
 msgid "unknown fs driver type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3077
+#: src/conf/domain_conf.c:3328
 msgid "missing type attribute in interface's <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:3082
+#: src/conf/domain_conf.c:3333
 #, c-format
 msgid "unknown type '%s' in interface's <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:3089
+#: src/conf/domain_conf.c:3340
 #, c-format
 msgid "unsupported type '%s' in interface's <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:3106
+#: src/conf/domain_conf.c:3357
 #, c-format
 msgid "Unkown mode '%s' in interface <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:1098
+#: src/conf/domain_conf.c:3438
 #, c-format
 msgid "unknown interface type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1168 src/qemu/qemu_conf.c:3426
+#: src/conf/domain_conf.c:3541 src/qemu/qemu_command.c:6158
 #, c-format
 msgid "unable to parse mac address '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3318
+#: src/conf/domain_conf.c:3568
 msgid "Network interfaces must use 'pci' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1202
+#: src/conf/domain_conf.c:3576
 msgid ""
 "No <source> 'network' attribute specified with <interface type='network'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:1228
+#: src/conf/domain_conf.c:3608
 msgid ""
 "No <source> 'bridge' attribute specified with <interface type='bridge'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:1248
+#: src/conf/domain_conf.c:3628
 msgid "No <source> 'port' attribute specified with socket interface"
 msgstr ""
 
-#: src/conf/domain_conf.c:1253
+#: src/conf/domain_conf.c:3633
 msgid "Cannot parse <source> 'port' attribute with socket interface"
 msgstr ""
 
-#: src/conf/domain_conf.c:1261
+#: src/conf/domain_conf.c:3641
 msgid "No <source> 'address' attribute specified with socket interface"
 msgstr ""
 
-#: src/conf/domain_conf.c:1273
+#: src/conf/domain_conf.c:3653
 msgid ""
 "No <source> 'name' attribute specified with <interface type='internal'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:3413
+#: src/conf/domain_conf.c:3663
 msgid "No <source> 'dev' attribute specified with <interface type='direct'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:3421
+#: src/conf/domain_conf.c:3671
 msgid "Unkown mode has been specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:1297
+#: src/conf/domain_conf.c:3709
 msgid "Model name contains invalid characters"
 msgstr ""
 
-#: src/conf/domain_conf.c:3473
+#: src/conf/domain_conf.c:3723
 #, c-format
 msgid "Unknown interface <driver name='%s'> has been specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:3485
+#: src/conf/domain_conf.c:3735
 #, c-format
 msgid "Unknown interface <driver txmode='%s'> has been specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:3496
+#: src/conf/domain_conf.c:3746
 #, c-format
 msgid "unknown interface ioeventfd mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3506
+#: src/conf/domain_conf.c:3756
 #, c-format
 msgid "unknown interface event_idx mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3518
+#: src/conf/domain_conf.c:3768
 #, c-format
 msgid "unknown interface link state '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3544
+#: src/conf/domain_conf.c:3794
 msgid "sndbuf must be a positive integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:3592
+#: src/conf/domain_conf.c:3842
 #, c-format
 msgid "target type must be specified for %s device"
 msgstr ""
 
-#: src/conf/domain_conf.c:3599
+#: src/conf/domain_conf.c:3849
 msgid "Driver does not have a default console type set"
 msgstr ""
 
-#: src/conf/domain_conf.c:1503
+#: src/conf/domain_conf.c:3928
 msgid "guestfwd channel does not define a target address"
 msgstr ""
 
-#: src/conf/domain_conf.c:1521
+#: src/conf/domain_conf.c:3943
 msgid "guestfwd channel only supports IPv4 addresses"
 msgstr ""
 
-#: src/conf/domain_conf.c:1528
+#: src/conf/domain_conf.c:3950
 msgid "guestfwd channel does not define a target port"
 msgstr ""
 
-#: src/conf/domain_conf.c:1491 src/conf/domain_conf.c:1534
+#: src/conf/domain_conf.c:3957 src/conf/domain_conf.c:3981
+#: src/conf/storage_conf.c:439
 #, c-format
 msgid "Invalid port number: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:1445
+#: src/conf/domain_conf.c:4053
 #, c-format
 msgid "Unknown source mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1567 src/conf/domain_conf.c:1651
+#: src/conf/domain_conf.c:4086 src/conf/domain_conf.c:4169
 msgid "Missing source path attribute for char device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1584 src/conf/domain_conf.c:1601
+#: src/conf/domain_conf.c:4104 src/conf/domain_conf.c:4121
 msgid "Missing source host attribute for char device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1589 src/conf/domain_conf.c:1606
-#: src/conf/domain_conf.c:1633
+#: src/conf/domain_conf.c:4109 src/conf/domain_conf.c:4126
+#: src/conf/domain_conf.c:4151
 msgid "Missing source service attribute for char device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1624
+#: src/conf/domain_conf.c:4142
 #, c-format
 msgid "Unknown protocol '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4022 src/conf/domain_conf.c:4166
+#: src/conf/domain_conf.c:4272 src/conf/domain_conf.c:4416
 #, c-format
 msgid "unknown type presented to host for character device: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4030
+#: src/conf/domain_conf.c:4280
 #, c-format
 msgid "unknown character device type: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4059
+#: src/conf/domain_conf.c:4309
 msgid "spicevmc device type only supports virtio"
 msgstr ""
 
-#: src/conf/domain_conf.c:4099
+#: src/conf/domain_conf.c:4349
 msgid "missing smartcard device mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:4104
+#: src/conf/domain_conf.c:4354
 #, c-format
 msgid "unknown smartcard device mode: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4121 src/conf/domain_conf.c:4150
+#: src/conf/domain_conf.c:4371 src/conf/domain_conf.c:4400
 msgid "host-certificates mode needs exactly three certificates"
 msgstr ""
 
-#: src/conf/domain_conf.c:4141
+#: src/conf/domain_conf.c:4391
 #, c-format
 msgid "expecting absolute path: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4160
+#: src/conf/domain_conf.c:4410
 msgid "passthrough mode requires a character device type attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:4184
+#: src/conf/domain_conf.c:4434
 msgid "unknown smartcard mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:4193
+#: src/conf/domain_conf.c:4443
 msgid "Controllers must use the 'ccid' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1707
+#: src/conf/domain_conf.c:4479
 msgid "missing input device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1713
+#: src/conf/domain_conf.c:4485
 #, c-format
 msgid "unknown input device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1720
+#: src/conf/domain_conf.c:4492
 #, c-format
 msgid "unknown input bus type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1728
+#: src/conf/domain_conf.c:4500
 #, c-format
 msgid "ps2 bus does not support %s input device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1734 src/conf/domain_conf.c:1741
+#: src/conf/domain_conf.c:4506 src/conf/domain_conf.c:4513
 #, c-format
 msgid "unsupported input bus %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:1746
+#: src/conf/domain_conf.c:4518
 #, c-format
 msgid "xen bus does not support %s input device"
 msgstr ""
 
-#: src/conf/domain_conf.c:4291 src/conf/domain_conf.c:5834
+#: src/conf/domain_conf.c:4541 src/conf/domain_conf.c:6084
 msgid "Invalid address for a USB device"
 msgstr ""
 
-#: src/conf/domain_conf.c:4324
+#: src/conf/domain_conf.c:4574
 msgid "missing hub device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:4330
+#: src/conf/domain_conf.c:4580
 #, c-format
 msgid "unknown hub device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4375
+#: src/conf/domain_conf.c:4625
 msgid "missing timer name"
 msgstr ""
 
-#: src/conf/domain_conf.c:4380
+#: src/conf/domain_conf.c:4630
 #, c-format
 msgid "unknown timer name '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4392
+#: src/conf/domain_conf.c:4642
 #, c-format
 msgid "unknown timer present value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4402
+#: src/conf/domain_conf.c:4652
 #, c-format
 msgid "unknown timer tickpolicy '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4412
+#: src/conf/domain_conf.c:4662
 #, c-format
 msgid "unknown timer track '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4422
+#: src/conf/domain_conf.c:4672
 msgid "invalid timer frequency"
 msgstr ""
 
-#: src/conf/domain_conf.c:4431
+#: src/conf/domain_conf.c:4681
 #, c-format
 msgid "unknown timer mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4444
+#: src/conf/domain_conf.c:4694
 msgid "invalid catchup threshold"
 msgstr ""
 
-#: src/conf/domain_conf.c:4453
+#: src/conf/domain_conf.c:4703
 msgid "invalid catchup slew"
 msgstr ""
 
-#: src/conf/domain_conf.c:4462
+#: src/conf/domain_conf.c:4712
 msgid "invalid catchup limit"
 msgstr ""
 
-#: src/conf/domain_conf.c:4515
+#: src/conf/domain_conf.c:4765
 #, c-format
 msgid "cannot parse password validity time '%s', expect YYYY-MM-DDTHH:MM:SS"
 msgstr ""
 
-#: src/conf/domain_conf.c:4534
+#: src/conf/domain_conf.c:4784
 #, c-format
 msgid "unknown connected value %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4545
+#: src/conf/domain_conf.c:4795
 msgid "VNC supports connected='keep' only"
 msgstr ""
 
-#: src/conf/domain_conf.c:4567
+#: src/conf/domain_conf.c:4817
 msgid "graphics listen type must be specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:4573
+#: src/conf/domain_conf.c:4823
 #, c-format
 msgid "unknown graphics listen type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4593
+#: src/conf/domain_conf.c:4843
 msgid "network attribute not allowed when listen type is not network"
 msgstr ""
 
-#: src/conf/domain_conf.c:1791
+#: src/conf/domain_conf.c:4885
 msgid "missing graphics device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1797
+#: src/conf/domain_conf.c:4891
 #, c-format
 msgid "unknown graphics device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4708
+#: src/conf/domain_conf.c:4958
 #, c-format
 msgid ""
 "graphics listen attribute %s must match address attribute of first listen "
 "element (found %s)"
 msgstr ""
 
-#: src/conf/domain_conf.c:1808
+#: src/conf/domain_conf.c:4974
 #, c-format
 msgid "cannot parse vnc port %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:1846 src/conf/domain_conf.c:1908
+#: src/conf/domain_conf.c:5015 src/conf/domain_conf.c:5076
 #, c-format
 msgid "unknown fullscreen value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1864
+#: src/conf/domain_conf.c:5033
 #, c-format
 msgid "cannot parse rdp port %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4844
+#: src/conf/domain_conf.c:5094
 #, c-format
 msgid "cannot parse spice port %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4857
+#: src/conf/domain_conf.c:5107
 #, c-format
 msgid "cannot parse spice tlsPort %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4894
+#: src/conf/domain_conf.c:5144
 msgid "spice channel missing name/mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:4902
+#: src/conf/domain_conf.c:5152
 #, c-format
 msgid "unknown spice channel name %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4910
+#: src/conf/domain_conf.c:5160
 #, c-format
 msgid "unknown spice channel mode %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4926
+#: src/conf/domain_conf.c:5176
 msgid "spice image missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4933
+#: src/conf/domain_conf.c:5183
 #, c-format
 msgid "unknown spice image compression %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4947
+#: src/conf/domain_conf.c:5197
 msgid "spice jpeg missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4954
+#: src/conf/domain_conf.c:5204
 #, c-format
 msgid "unknown spice jpeg compression %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4968
+#: src/conf/domain_conf.c:5218
 msgid "spice zlib missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4975
+#: src/conf/domain_conf.c:5225
 #, c-format
 msgid "unknown spice zlib compression %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4989
+#: src/conf/domain_conf.c:5239
 msgid "spice playback missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4996
+#: src/conf/domain_conf.c:5246
 msgid "unknown spice playback compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:5010
+#: src/conf/domain_conf.c:5260
 msgid "spice streaming missing mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:5016
+#: src/conf/domain_conf.c:5266
 msgid "unknown spice streaming mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:5030
+#: src/conf/domain_conf.c:5280
 msgid "spice clipboard missing copypaste"
 msgstr ""
 
-#: src/conf/domain_conf.c:5037
+#: src/conf/domain_conf.c:5287
 #, c-format
 msgid "unknown copypaste value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1947
+#: src/conf/domain_conf.c:5330
 #, c-format
 msgid "unknown sound model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1980
+#: src/conf/domain_conf.c:5366
 msgid "watchdog must contain model name"
 msgstr ""
 
-#: src/conf/domain_conf.c:1986
+#: src/conf/domain_conf.c:5372
 #, c-format
 msgid "unknown watchdog model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1997
+#: src/conf/domain_conf.c:5383
 #, c-format
 msgid "unknown watchdog action '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5169
+#: src/conf/domain_conf.c:5419
 msgid "balloon memory must contain model name"
 msgstr ""
 
-#: src/conf/domain_conf.c:5174
+#: src/conf/domain_conf.c:5424
 #, c-format
 msgid "unknown memory balloon model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5201
+#: src/conf/domain_conf.c:5451
 msgid "XML does not contain expected 'sysinfo' element"
 msgstr ""
 
-#: src/conf/domain_conf.c:5213
+#: src/conf/domain_conf.c:5463
 msgid "sysinfo must contain a type attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:5218
+#: src/conf/domain_conf.c:5468
 #, c-format
 msgid "unknown sysinfo type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2143
+#: src/conf/domain_conf.c:5646
 #, c-format
 msgid "unknown video model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2149
+#: src/conf/domain_conf.c:5652
 msgid "missing video model and cannot determine default"
 msgstr ""
 
-#: src/conf/domain_conf.c:2157
+#: src/conf/domain_conf.c:5660
 #, c-format
 msgid "cannot parse video ram '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2167
+#: src/conf/domain_conf.c:5670
 #, c-format
 msgid "cannot parse video heads '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2214
+#: src/conf/domain_conf.c:5719
 #, c-format
 msgid "cannot parse vendor id %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2221
+#: src/conf/domain_conf.c:5726
 msgid "usb vendor needs id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2232
+#: src/conf/domain_conf.c:5737
 #, c-format
 msgid "cannot parse product %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2240
+#: src/conf/domain_conf.c:5745
 msgid "usb product needs id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2251 src/conf/domain_conf.c:2343
+#: src/conf/domain_conf.c:5756
 #, c-format
 msgid "cannot parse bus %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2258
+#: src/conf/domain_conf.c:5763
 msgid "usb address needs bus id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2267
+#: src/conf/domain_conf.c:5772
 #, c-format
 msgid "cannot parse device %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2275
+#: src/conf/domain_conf.c:5780
 msgid "usb address needs device id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2280
+#: src/conf/domain_conf.c:5785
 #, c-format
 msgid "unknown usb source type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2290
+#: src/conf/domain_conf.c:5795
 msgid "vendor cannot be 0."
 msgstr ""
 
-#: src/conf/domain_conf.c:2296
+#: src/conf/domain_conf.c:5801
 msgid "missing vendor"
 msgstr ""
 
-#: src/conf/domain_conf.c:2301
+#: src/conf/domain_conf.c:5806
 msgid "missing product"
 msgstr ""
 
-#: src/conf/domain_conf.c:5590
+#: src/conf/domain_conf.c:5840
 #, c-format
 msgid "unsupported element '%s' of 'origstates'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2403
+#: src/conf/domain_conf.c:5889
 #, c-format
 msgid "unknown pci source type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2436
+#: src/conf/domain_conf.c:5921
 #, c-format
 msgid "unknown hostdev mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2447
+#: src/conf/domain_conf.c:5932
 #, c-format
 msgid "unknown host device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2452
+#: src/conf/domain_conf.c:5937
 msgid "missing type in hostdev"
 msgstr ""
 
-#: src/conf/domain_conf.c:5724
+#: src/conf/domain_conf.c:5974
 msgid "missing rom bar attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:5729
+#: src/conf/domain_conf.c:5979
 #, c-format
 msgid "unknown rom bar value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2480
+#: src/conf/domain_conf.c:5986
 #, c-format
 msgid "unknown node %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5753
+#: src/conf/domain_conf.c:6003
 msgid "PCI host devices must use 'pci' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:5789
+#: src/conf/domain_conf.c:6039
 #, c-format
 msgid "unknown redirdev bus '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5800
+#: src/conf/domain_conf.c:6050
 #, c-format
 msgid "unknown redirdev character device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5805
+#: src/conf/domain_conf.c:6055
 msgid "missing type in redirdev"
 msgstr ""
 
-#: src/conf/domain_conf.c:2511
+#: src/conf/domain_conf.c:6113
 #, c-format
 msgid "unknown lifecycle action %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2535
+#: src/conf/domain_conf.c:6136
 msgid "missing security type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2542
+#: src/conf/domain_conf.c:6143
 msgid "invalid security type"
 msgstr ""
 
-#: src/conf/domain_conf.c:5905
+#: src/conf/domain_conf.c:6155
 #, c-format
 msgid "invalid security relabel value %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5913
+#: src/conf/domain_conf.c:6163
 msgid "dynamic label type must use resource relabeling"
 msgstr ""
 
-#: src/conf/domain_conf.c:2564
+#: src/conf/domain_conf.c:6182
 msgid "security label is missing"
 msgstr ""
 
-#: src/conf/domain_conf.c:2578
+#: src/conf/domain_conf.c:6196
 msgid "security imagelabel is missing"
 msgstr ""
 
-#: src/conf/domain_conf.c:2555
+#: src/conf/domain_conf.c:6220
 msgid "missing security model"
 msgstr ""
 
-#: src/conf/domain_conf.c:5993
+#: src/conf/domain_conf.c:6243 tools/virsh.c:12067
 msgid "(device_definition)"
 msgstr ""
 
-#: src/conf/domain_conf.c:2656
+#: src/conf/domain_conf.c:6311
 msgid "unknown device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2737
+#: src/conf/domain_conf.c:6653
 msgid "unknown virt type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2748
+#: src/conf/domain_conf.c:6664
 #, c-format
 msgid "no emulator for domain %s os type %s on architecture %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6442
+#: src/conf/domain_conf.c:6692
 msgid "cannot count boot devices"
 msgstr ""
 
-#: src/conf/domain_conf.c:6453
+#: src/conf/domain_conf.c:6703
 msgid ""
 "per-device boot elements cannot be used together with os/boot elements"
 msgstr ""
 
-#: src/conf/domain_conf.c:2995
+#: src/conf/domain_conf.c:6713
 msgid "missing boot device"
 msgstr ""
 
-#: src/conf/domain_conf.c:3000
+#: src/conf/domain_conf.c:6718
 #, c-format
 msgid "unknown boot device '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:6496
+#: src/conf/domain_conf.c:6746
 msgid "need at least one serial port for useserial"
 msgstr ""
 
-#: src/conf/domain_conf.c:6537
+#: src/conf/domain_conf.c:6787
 msgid "vcpu id must be an unsigned integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:6541
+#: src/conf/domain_conf.c:6791
 msgid "can't parse vcpupin node"
 msgstr ""
 
-#: src/conf/domain_conf.c:6547
+#: src/conf/domain_conf.c:6797
 msgid "vcpu id must be less than maxvcpus"
 msgstr ""
 
-#: src/conf/domain_conf.c:6570
+#: src/conf/domain_conf.c:6819
 msgid "missing cpuset for vcpupin"
 msgstr ""
 
-#: src/conf/domain_conf.c:2783
+#: src/conf/domain_conf.c:6863
 msgid "missing domain type attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:2789
+#: src/conf/domain_conf.c:6869
 #, c-format
 msgid "invalid domain type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6628
+#: src/conf/domain_conf.c:6877
 #, c-format
 msgid "unexpected domain type %s, expecting %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6653
+#: src/conf/domain_conf.c:6902
 #, c-format
 msgid "unexpected domain type %s, expecting one of these: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2805 src/conf/network_conf.c:415
-#: src/conf/secret_conf.c:165
+#: src/conf/domain_conf.c:6926 src/conf/network_conf.c:848
+#: src/conf/secret_conf.c:180 src/openvz/openvz_conf.c:971
 msgid "Failed to generate UUID"
 msgstr ""
 
-#: src/conf/domain_conf.c:2811 src/conf/network_conf.c:422
-#: src/conf/secret_conf.c:171 src/conf/storage_conf.c:655
+#: src/conf/domain_conf.c:6933 src/conf/domain_conf.c:7882
+#: src/conf/network_conf.c:855 src/conf/nwfilter_conf.c:2448
+#: src/conf/secret_conf.c:186 src/conf/storage_conf.c:670
 msgid "malformed uuid element"
 msgstr ""
 
-#: src/conf/domain_conf.c:2823
+#: src/conf/domain_conf.c:6946
 msgid "missing memory element"
 msgstr ""
 
-#: src/conf/domain_conf.c:6734
+#: src/conf/domain_conf.c:6965
+msgid "cannot extract blkiotune nodes"
+msgstr ""
+
+#: src/conf/domain_conf.c:6981
+#, c-format
+msgid "duplicate device weight path '%s'"
+msgstr ""
+
+#: src/conf/domain_conf.c:7009
 msgid "maximum vcpus must be an integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:6742
+#: src/conf/domain_conf.c:7017
 #, c-format
 msgid "invalid maxvcpus %lu"
 msgstr ""
 
-#: src/conf/domain_conf.c:6750
+#: src/conf/domain_conf.c:7025
 msgid "current vcpus must be an integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:6758
+#: src/conf/domain_conf.c:7033
 #, c-format
 msgid "invalid current vcpus %lu"
 msgstr ""
 
-#: src/conf/domain_conf.c:6764
+#: src/conf/domain_conf.c:7039
 #, c-format
 msgid "maxvcpus must not be less than current vcpus (%d < %lu)"
 msgstr ""
 
-#: src/conf/domain_conf.c:6806
+#: src/conf/domain_conf.c:7080
 msgid "vcpupin nodes must be less than maxvcpus"
 msgstr ""
 
-#: src/conf/domain_conf.c:6821
+#: src/conf/domain_conf.c:7095
 msgid "duplicate vcpupin for same vcpu"
 msgstr ""
 
-#: src/conf/domain_conf.c:6833
+#: src/conf/domain_conf.c:7107
 msgid "cannot extract numatune nodes"
 msgstr ""
 
-#: src/conf/domain_conf.c:6855
+#: src/conf/domain_conf.c:7128
 msgid "nodeset for NUMA memory tuning must be set"
 msgstr ""
 
-#: src/conf/domain_conf.c:6864
+#: src/conf/domain_conf.c:7137
 #, c-format
 msgid "Unsupported NUMA memory tuning mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2860
+#: src/conf/domain_conf.c:7155
 #, c-format
 msgid "unexpected feature %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6911
+#: src/conf/domain_conf.c:7184
 #, c-format
 msgid "unknown clock offset '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:6929
+#: src/conf/domain_conf.c:7202
 msgid "missing 'timezone' attribute for clock with offset='timezone'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2900
+#: src/conf/domain_conf.c:7235
 msgid "no OS type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2928
+#: src/conf/domain_conf.c:7262
 #, c-format
 msgid "os type '%s' & arch '%s' combination is not supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:2936 src/xen/xm_internal.c:709
+#: src/conf/domain_conf.c:7270 src/xenxs/xen_xm.c:259
 #, c-format
 msgid "no supported architecture for os type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:7038
+#: src/conf/domain_conf.c:7311
 msgid "init binary must be specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:7106
+#: src/conf/domain_conf.c:7380
 msgid "cannot extract device leases"
 msgstr ""
 
-#: src/conf/domain_conf.c:7231
+#: src/conf/domain_conf.c:7505
 msgid "cannot extract console devices"
 msgstr ""
 
-#: src/conf/domain_conf.c:7265
+#: src/conf/domain_conf.c:7542
 msgid "Only the first console can be a serial port"
 msgstr ""
 
-#: src/conf/domain_conf.c:3307
+#: src/conf/domain_conf.c:7735
 msgid "cannot determine default video type"
 msgstr ""
 
-#: src/conf/domain_conf.c:3348
+#: src/conf/domain_conf.c:7772
 msgid "only a single watchdog device is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:7506
+#: src/conf/domain_conf.c:7792
 msgid "only a single memory balloon device is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:7596
+#: src/conf/domain_conf.c:7864
+msgid "Number of CPUs in <numa> exceeds the <vcpu> count"
+msgstr ""
+
+#: src/conf/domain_conf.c:7889
 msgid "UUID mismatch between <uuid> and <sysinfo>"
 msgstr ""
 
-#: src/conf/domain_conf.c:7608
+#: src/conf/domain_conf.c:7901
 #, c-format
 msgid "unknown smbios mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3404
+#: src/conf/domain_conf.c:7963
 msgid "no domain config"
 msgstr ""
 
-#: src/conf/domain_conf.c:3418
+#: src/conf/domain_conf.c:7977
 msgid "missing domain state"
 msgstr ""
 
-#: src/conf/domain_conf.c:3423
+#: src/conf/domain_conf.c:7982
 #, c-format
 msgid "invalid domain state '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:7698
+#: src/conf/domain_conf.c:7991
 #, c-format
 msgid "invalid domain state reason '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3431
+#: src/conf/domain_conf.c:8002
 msgid "invalid pid"
 msgstr ""
 
-#: src/conf/domain_conf.c:7723
+#: src/conf/domain_conf.c:8016
 #, c-format
 msgid "Unknown taint flag %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7757 src/security/virt-aa-helper.c:641
-#: tools/virsh.c:1357 tools/virsh.c:1504 tools/virsh.c:1713
-#: tools/virsh.c:10938 tools/virsh.c:11006 tools/virsh.c:11478
-#: tools/virsh.c:11945
+#: src/conf/domain_conf.c:8050 src/security/virt-aa-helper.c:641
+#: tools/virsh.c:1369 tools/virsh.c:1516 tools/virsh.c:1725
+#: tools/virsh.c:11753 tools/virsh.c:11821 tools/virsh.c:12061
+#: tools/virsh.c:12551 tools/virsh.c:13024
 msgid "(domain_definition)"
 msgstr ""
 
-#: src/conf/domain_conf.c:3563 src/conf/domain_conf.c:3634
-#: src/conf/interface_conf.c:870 src/conf/network_conf.c:622
-#: src/conf/node_device_conf.c:1223 src/conf/secret_conf.c:117
-msgid "incorrect root element"
+#: src/conf/domain_conf.c:8087
+#, c-format
+msgid "unexpected root element <%s>, expecting <domain>"
+msgstr ""
+
+#: src/conf/domain_conf.c:8120
+#, c-format
+msgid "unexpected root element <%s>, expecting <domstatus>"
 msgstr ""
 
-#: src/conf/domain_conf.c:7871
+#: src/conf/domain_conf.c:8168
 #, c-format
 msgid "Target timer %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7879
+#: src/conf/domain_conf.c:8176
 #, c-format
 msgid "Target timer presence %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7887
+#: src/conf/domain_conf.c:8184
 #, c-format
 msgid "Target TSC frequency %lu does not match source %lu"
 msgstr ""
 
-#: src/conf/domain_conf.c:7894
+#: src/conf/domain_conf.c:8191
 #, c-format
 msgid "Target TSC mode %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7915
+#: src/conf/domain_conf.c:8212
 #, c-format
 msgid "Target device address type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7928
+#: src/conf/domain_conf.c:8225
 #, c-format
 msgid ""
 "Target device PCI address %04x:%02x:%02x.%02x does not match source "
 "%04x:%02x:%02x.%02x"
 msgstr ""
 
-#: src/conf/domain_conf.c:7942
+#: src/conf/domain_conf.c:8239
 #, c-format
 msgid "Target device drive address %d:%d:%d does not match source %d:%d:%d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7956
+#: src/conf/domain_conf.c:8253
 #, c-format
 msgid ""
 "Target device virtio serial address %d:%d:%d does not match source %d:%d:%d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7969
+#: src/conf/domain_conf.c:8266
 #, c-format
 msgid "Target device ccid address %d:%d does not match source %d:%d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7993
+#: src/conf/domain_conf.c:8290
 #, c-format
 msgid "Target disk device %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8001
+#: src/conf/domain_conf.c:8298
 #, c-format
 msgid "Target disk bus %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8009
+#: src/conf/domain_conf.c:8306
 #, c-format
 msgid "Target disk %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8016
+#: src/conf/domain_conf.c:8313
 #, c-format
 msgid "Target disk serial %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8023
+#: src/conf/domain_conf.c:8320
 msgid "Target disk access mode does not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8044
+#: src/conf/domain_conf.c:8341
 #, c-format
 msgid "Target controller type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8052
+#: src/conf/domain_conf.c:8349
 #, c-format
 msgid "Target controller index %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8059
+#: src/conf/domain_conf.c:8356
 #, c-format
 msgid "Target controller model %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8067
+#: src/conf/domain_conf.c:8364
 #, c-format
 msgid "Target controller ports %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8074
+#: src/conf/domain_conf.c:8371
 #, c-format
 msgid "Target controller vectors %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8097
+#: src/conf/domain_conf.c:8394
 #, c-format
 msgid "Target filesystem guest target %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8104
+#: src/conf/domain_conf.c:8401
 msgid "Target filesystem access mode does not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8125
+#: src/conf/domain_conf.c:8422
 #, c-format
 msgid ""
 "Target network card mac %02x:%02x:%02x:%02x:%02x:%02xdoes not match source "
 "%02x:%02x:%02x:%02x:%02x:%02x"
 msgstr ""
 
-#: src/conf/domain_conf.c:8136
+#: src/conf/domain_conf.c:8433
 #, c-format
 msgid "Target network card model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8158
+#: src/conf/domain_conf.c:8455
 #, c-format
 msgid "Target input device type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8166
+#: src/conf/domain_conf.c:8463
 #, c-format
 msgid "Target input device bus %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8189
+#: src/conf/domain_conf.c:8486
 #, c-format
 msgid "Target sound card model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8212
+#: src/conf/domain_conf.c:8509
 #, c-format
 msgid "Target video card model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8220
+#: src/conf/domain_conf.c:8517
 #, c-format
 msgid "Target video card vram %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8227
+#: src/conf/domain_conf.c:8524
 #, c-format
 msgid "Target video card heads %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8235
+#: src/conf/domain_conf.c:8532
 msgid "Target video card acceleration does not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8242
+#: src/conf/domain_conf.c:8539
 #, c-format
 msgid "Target video card 2d accel %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8249
+#: src/conf/domain_conf.c:8546
 #, c-format
 msgid "Target video card 3d accel %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8272
+#: src/conf/domain_conf.c:8569
 #, c-format
 msgid "Target host device mode %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8281
+#: src/conf/domain_conf.c:8578
 #, c-format
 msgid "Target host device subsystem %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8320 src/conf/domain_conf.c:8342
+#: src/conf/domain_conf.c:8617 src/conf/domain_conf.c:8639
 #, c-format
 msgid "Target serial port %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8364
+#: src/conf/domain_conf.c:8661
 #, c-format
 msgid "Target channel type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8374
+#: src/conf/domain_conf.c:8671
 #, c-format
 msgid "Target channel name %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8385
+#: src/conf/domain_conf.c:8682
 #, c-format
 msgid "Target channel addr %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8411
+#: src/conf/domain_conf.c:8708
 #, c-format
 msgid "Target console type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8434
+#: src/conf/domain_conf.c:8731
 #, c-format
 msgid "Target watchdog model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8457
+#: src/conf/domain_conf.c:8754
 #, c-format
 msgid "Target balloon model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8480
+#: src/conf/domain_conf.c:8777
 #, c-format
 msgid "Target hub device type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8508
+#: src/conf/domain_conf.c:8805
 #, c-format
 msgid "Target domain virt type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8520
+#: src/conf/domain_conf.c:8817
 #, c-format
 msgid "Target domain uuid %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8527
+#: src/conf/domain_conf.c:8824
 #, c-format
 msgid "Target domain max memory %ld does not match source %ld"
 msgstr ""
 
-#: src/conf/domain_conf.c:8533
+#: src/conf/domain_conf.c:8830
 #, c-format
 msgid "Target domain current memory %ld does not match source %ld"
 msgstr ""
 
-#: src/conf/domain_conf.c:8539
+#: src/conf/domain_conf.c:8836
 #, c-format
 msgid "Target domain huge page backing %ld does not match source %ld"
 msgstr ""
 
-#: src/conf/domain_conf.c:8547
+#: src/conf/domain_conf.c:8844
 #, c-format
 msgid "Target domain vpu count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8553
+#: src/conf/domain_conf.c:8850
 #, c-format
 msgid "Target domain vpu max %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8560 src/conf/domain_conf.c:8572
+#: src/conf/domain_conf.c:8857 src/conf/domain_conf.c:8869
 #, c-format
 msgid "Target domain OS type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8566
+#: src/conf/domain_conf.c:8863
 #, c-format
 msgid "Target domain architecture %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8579
+#: src/conf/domain_conf.c:8876
 #, c-format
 msgid "Target domain SMBIOS mode %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8587
+#: src/conf/domain_conf.c:8884
 #, c-format
 msgid "Target domain features %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8594
+#: src/conf/domain_conf.c:8891
 msgid "Target domain timers do not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8611
+#: src/conf/domain_conf.c:8908
 #, c-format
 msgid "Target domain disk count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8622
+#: src/conf/domain_conf.c:8919
 #, c-format
 msgid "Target domain disk controller count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8633
+#: src/conf/domain_conf.c:8930
 #, c-format
 msgid "Target domain filesystem count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8644
+#: src/conf/domain_conf.c:8941
 #, c-format
 msgid "Target domain net card count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8655
+#: src/conf/domain_conf.c:8952
 #, c-format
 msgid "Target domain input device count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8666
+#: src/conf/domain_conf.c:8963
 #, c-format
 msgid "Target domain sound card count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8677
+#: src/conf/domain_conf.c:8974
 #, c-format
 msgid "Target domain video card count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8688
+#: src/conf/domain_conf.c:8985
 #, c-format
 msgid "Target domain host device count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8699
+#: src/conf/domain_conf.c:8996
 #, c-format
 msgid "Target domain smartcard count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8710
+#: src/conf/domain_conf.c:9007
 #, c-format
 msgid "Target domain serial port count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8721
+#: src/conf/domain_conf.c:9018
 #, c-format
 msgid "Target domain parallel port count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8732
+#: src/conf/domain_conf.c:9029
 #, c-format
 msgid "Target domain channel count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8743
+#: src/conf/domain_conf.c:9040
 #, c-format
 msgid "Target domain console count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8754
+#: src/conf/domain_conf.c:9051
 #, c-format
 msgid "Target domain hub device count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8767
+#: src/conf/domain_conf.c:9064
 #, c-format
 msgid "Target domain watchdog count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8779
+#: src/conf/domain_conf.c:9076
 #, c-format
 msgid "Target domain memory balloon count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3845
+#: src/conf/domain_conf.c:9466
 msgid "topology cpuset syntax error"
 msgstr ""
 
-#: src/conf/domain_conf.c:3859
+#: src/conf/domain_conf.c:9639
 #, c-format
 msgid "unexpected lifecycle type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3882
+#: src/conf/domain_conf.c:9685
 #, c-format
 msgid "unexpected disk type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3887
+#: src/conf/domain_conf.c:9690
 #, c-format
 msgid "unexpected disk device %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3892
+#: src/conf/domain_conf.c:9695
 #, c-format
 msgid "unexpected disk bus %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3897
+#: src/conf/domain_conf.c:9700
 #, c-format
 msgid "unexpected disk cache mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9410
+#: src/conf/domain_conf.c:9705
 #, c-format
 msgid "unexpected disk io mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9560
+#: src/conf/domain_conf.c:9897
 #, c-format
 msgid "unexpected controller type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9569
+#: src/conf/domain_conf.c:9906
 #, c-format
 msgid "unexpected model type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3974
+#: src/conf/domain_conf.c:9958
 #, c-format
 msgid "unexpected filesystem type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9627
+#: src/conf/domain_conf.c:9964
 #, c-format
 msgid "unexpected accessmode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4026 src/conf/domain_conf.c:4392
+#: src/conf/domain_conf.c:10028 src/conf/domain_conf.c:10091
+#: src/conf/domain_conf.c:10822
 #, c-format
 msgid "unexpected net type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9699
+#: src/conf/domain_conf.c:10036
 #, c-format
 msgid "unexpected net type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:9719
+#: src/conf/domain_conf.c:10056
 #, c-format
 msgid "unexpected source mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4138
+#: src/conf/domain_conf.c:10251
 #, c-format
 msgid "unexpected char type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10012
+#: src/conf/domain_conf.c:10352
 #, c-format
 msgid "unexpected char device type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10031
+#: src/conf/domain_conf.c:10371
 msgid "Could not format channel target type"
 msgstr ""
 
-#: src/conf/domain_conf.c:4233
+#: src/conf/domain_conf.c:10381
 msgid "Unable to format guestfwd port"
 msgstr ""
 
-#: src/conf/domain_conf.c:10101 src/conf/domain_conf.c:10132
-#: src/qemu/qemu_command.c:4369
+#: src/conf/domain_conf.c:10441 src/conf/domain_conf.c:10472
+#: src/qemu/qemu_command.c:4553
 #, c-format
 msgid "unexpected smartcard type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4273 src/xen/xend_internal.c:5672
+#: src/conf/domain_conf.c:10490 src/xenxs/xen_sxpr.c:1978
 #, c-format
 msgid "unexpected sound model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10178
+#: src/conf/domain_conf.c:10518
 #, c-format
 msgid "unexpected memballoon model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4294
+#: src/conf/domain_conf.c:10558
 #, c-format
 msgid "unexpected watchdog model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4300
+#: src/conf/domain_conf.c:10564
 #, c-format
 msgid "unexpected watchdog action %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4332
+#: src/conf/domain_conf.c:10605
 #, c-format
 msgid "unexpected video model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4366 src/xen/xend_internal.c:5699
+#: src/conf/domain_conf.c:10642 src/xenxs/xen_sxpr.c:2006
 #, c-format
 msgid "unexpected input type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4371
+#: src/conf/domain_conf.c:10647
 #, c-format
 msgid "unexpected input bus type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10335
+#: src/conf/domain_conf.c:10675
 #, c-format
 msgid "unexpected timer name %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10351
+#: src/conf/domain_conf.c:10691
 #, c-format
 msgid "unexpected timer tickpolicy %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10365
+#: src/conf/domain_conf.c:10705
 #, c-format
 msgid "unexpected timer track %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10383
+#: src/conf/domain_conf.c:10723
 #, c-format
 msgid "unexpected timer mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4488
+#: src/conf/domain_conf.c:11007
 #, c-format
 msgid "unexpected hostdev mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4495
+#: src/conf/domain_conf.c:11016
 #, c-format
 msgid "unexpected hostdev type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10733
+#: src/conf/domain_conf.c:11073
 #, c-format
 msgid "unexpected rom bar value %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10773
+#: src/conf/domain_conf.c:11113
 #, c-format
 msgid "unexpected hub type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4552
+#: src/conf/domain_conf.c:11165
 #, c-format
 msgid "unexpected domain type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10932
+#: src/conf/domain_conf.c:11298
 msgid "failed to format cpuset for vcpupin"
 msgstr ""
 
-#: src/conf/domain_conf.c:10954
+#: src/conf/domain_conf.c:11320
 msgid "failed to format nodeset for NUMA memory tuning"
 msgstr ""
 
-#: src/conf/domain_conf.c:4648
+#: src/conf/domain_conf.c:11378
 #, c-format
 msgid "unexpected boot device type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:11040
+#: src/conf/domain_conf.c:11406
 #, c-format
 msgid "unexpected smbios mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4666
+#: src/conf/domain_conf.c:11422
 #, c-format
 msgid "unexpected feature %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4864 src/conf/network_conf.c:752
+#: src/conf/domain_conf.c:11705 src/conf/network_conf.c:1408
+#: src/conf/nwfilter_conf.c:2601 src/util/dnsmasq.c:529
 #, c-format
 msgid "cannot create config directory '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5018
+#: src/conf/domain_conf.c:11850
 #, c-format
 msgid "unexpected domain %s already exists"
 msgstr ""
 
-#: src/conf/domain_conf.c:5059 src/conf/network_conf.c:878
-#: src/conf/storage_conf.c:1537
+#: src/conf/domain_conf.c:11890 src/conf/network_conf.c:1508
+#: src/conf/nwfilter_conf.c:2915 src/conf/storage_conf.c:1486
 #, c-format
 msgid "Failed to open dir '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5124
+#: src/conf/domain_conf.c:11954
 #, c-format
 msgid "cannot remove config %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5231 src/xen/xm_internal.c:2671
+#: src/conf/domain_conf.c:12060 src/xen/xm_internal.c:1116
 #, c-format
 msgid "domain '%s' is already defined with uuid %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5240
+#: src/conf/domain_conf.c:12069
 #, c-format
 msgid "domain is already active as '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5254
+#: src/conf/domain_conf.c:12083
 #, c-format
 msgid "domain '%s' already exists with uuid %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:11880
+#: src/conf/domain_conf.c:12246
 msgid "missing name from disk snapshot element"
 msgstr ""
 
-#: src/conf/domain_conf.c:11941 tools/virsh.c:13246 tools/virsh.c:13573
+#: src/conf/domain_conf.c:12307 tools/virsh.c:14325 tools/virsh.c:14652
 msgid "(domain_snapshot)"
 msgstr ""
 
-#: src/conf/domain_conf.c:11952
+#: src/conf/domain_conf.c:12318
 msgid "domainsnapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:11962
+#: src/conf/domain_conf.c:12328
 msgid "a redefined snapshot must have a name"
 msgstr ""
 
-#: src/conf/domain_conf.c:11981
+#: src/conf/domain_conf.c:12347
 msgid "missing creationTime from existing snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:11993
+#: src/conf/domain_conf.c:12359
 msgid "missing state from existing snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:11999
+#: src/conf/domain_conf.c:12365
 #, c-format
 msgid "Invalid state '%s' in domain snapshot XML"
 msgstr ""
 
-#: src/conf/domain_conf.c:12014 src/conf/domain_conf.c:12105
+#: src/conf/domain_conf.c:12380 src/conf/domain_conf.c:12471
 msgid "missing domain in snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:12047
+#: src/conf/domain_conf.c:12413
 msgid "unable to handle disk requests in snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:12054
+#: src/conf/domain_conf.c:12420
 msgid "Could not find 'active' element"
 msgstr ""
 
-#: src/conf/domain_conf.c:12111
+#: src/conf/domain_conf.c:12477
 msgid "too many disk snapshot requests for domain"
 msgstr ""
 
-#: src/conf/domain_conf.c:12134
+#: src/conf/domain_conf.c:12500
 #, c-format
 msgid "no disk named '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:12141
+#: src/conf/domain_conf.c:12507
 #, c-format
 msgid "disk '%s' specified twice"
 msgstr ""
 
-#: src/conf/domain_conf.c:12155
+#: src/conf/domain_conf.c:12521
 #, c-format
 msgid "disk '%s' must use snapshot mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:12162
+#: src/conf/domain_conf.c:12528
 #, c-format
 msgid "file '%s' for disk '%s' requires use of external snapshot mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:12214
+#: src/conf/domain_conf.c:12582
+#, c-format
+msgid "cannot generate external snapshot name for disk '%s' without source"
+msgstr ""
+
+#: src/conf/domain_conf.c:12589
 #, c-format
-msgid "cannot generate external backup name for disk '%s' without source"
+msgid ""
+"source for disk '%s' is not a regular file; refusing to generate external "
+"snapshot name"
 msgstr ""
 
-#: src/conf/domain_conf.c:12226
+#: src/conf/domain_conf.c:12603
 msgid "integer overflow"
 msgstr ""
 
-#: src/conf/domain_conf.c:12359
+#: src/conf/domain_conf.c:12736
 #, c-format
 msgid "unexpected domain snapshot %s already exists"
 msgstr ""
 
-#: src/conf/domain_conf.c:12832
+#: src/conf/domain_conf.c:13209
 #, c-format
 msgid "unknown disk format '%s' for %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:12841 src/qemu/qemu_driver.c:7695
+#: src/conf/domain_conf.c:13218 src/qemu/qemu_driver.c:8042
 #, c-format
 msgid "no disk format for %s and probing is disabled"
 msgstr ""
 
-#: src/conf/domain_conf.c:12858
+#: src/conf/domain_conf.c:13235
 #, c-format
 msgid "backing store for %s is self-referential"
 msgstr ""
 
-#: src/conf/domain_conf.c:12871
+#: src/conf/domain_conf.c:13248
 #, c-format
 msgid "unable to open disk path %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:12884
+#: src/conf/domain_conf.c:13261
 #, c-format
 msgid "could not close file %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:12970
+#: src/conf/domain_conf.c:13347
 #, c-format
 msgid "invalid domain state: %d"
 msgstr ""
@@ -2487,726 +2670,873 @@
 msgid "event queue is empty, nothing to pop"
 msgstr ""
 
-#: src/conf/interface_conf.c:133 src/conf/interface_conf.c:515
+#: src/conf/interface_conf.c:126
 msgid "interface has no name"
 msgstr ""
 
-#: src/conf/interface_conf.c:141
+#: src/conf/interface_conf.c:142
 msgid "interface mtu value is improper"
 msgstr ""
 
-#: src/conf/interface_conf.c:165
+#: src/conf/interface_conf.c:166
 #, c-format
 msgid "unknown interface startmode %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:197
+#: src/conf/interface_conf.c:198
 #, c-format
 msgid "unknown bonding mode %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:218
+#: src/conf/interface_conf.c:219
 #, c-format
 msgid "unknown mii bonding carrier %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:241
+#: src/conf/interface_conf.c:242
 #, c-format
 msgid "unknown arp bonding validate %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:267
+#: src/conf/interface_conf.c:268
 #, c-format
 msgid "unknown dhcp peerdns value %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:293
+#: src/conf/interface_conf.c:294
 msgid "Invalid ip address prefix value"
 msgstr ""
 
-#: src/conf/interface_conf.c:446
+#: src/conf/interface_conf.c:454
 msgid "protocol misses the family attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:465
+#: src/conf/interface_conf.c:473
 #, c-format
 msgid "unsupported protocol family '%s'"
 msgstr ""
 
-#: src/conf/interface_conf.c:602
+#: src/conf/interface_conf.c:547
 msgid "bond has no interfaces"
 msgstr ""
 
-#: src/conf/interface_conf.c:652
+#: src/conf/interface_conf.c:596
 msgid "bond interface miimon freq missing or invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:660
+#: src/conf/interface_conf.c:604
 msgid "bond interface miimon downdelay invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:669
+#: src/conf/interface_conf.c:613
 msgid "bond interface miimon updelay invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:688
+#: src/conf/interface_conf.c:632
 msgid "bond interface arpmon interval missing or invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:697
+#: src/conf/interface_conf.c:641
 msgid "bond interface arpmon target missing"
 msgstr ""
 
-#: src/conf/interface_conf.c:718
+#: src/conf/interface_conf.c:662
 msgid "vlan interface misses the tag attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:726
+#: src/conf/interface_conf.c:670
 msgid "vlan interface misses name attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:743
+#: src/conf/interface_conf.c:687
 msgid "interface misses the type attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:749
+#: src/conf/interface_conf.c:693
 #, c-format
 msgid "unknown interface type %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:508
+#: src/conf/interface_conf.c:714
 #, c-format
 msgid "interface has unsupported type '%s'"
 msgstr ""
 
-#: src/conf/interface_conf.c:785
+#: src/conf/interface_conf.c:751
 msgid "bridge interface misses the bridge element"
 msgstr ""
 
-#: src/conf/interface_conf.c:797
+#: src/conf/interface_conf.c:763
 #, c-format
 msgid "bridge interface stp should be on or off got %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:820
+#: src/conf/interface_conf.c:793
 msgid "bond interface misses the bond element"
 msgstr ""
 
-#: src/conf/interface_conf.c:841
+#: src/conf/interface_conf.c:814
 msgid "vlan interface misses the vlan element"
 msgstr ""
 
-#: src/conf/interface_conf.c:867
+#: src/conf/interface_conf.c:842
+#, c-format
+msgid "unexpected root element <%s>, expecting <interface>"
+msgstr ""
+
+#: src/conf/interface_conf.c:869
 msgid "(interface_definition)"
 msgstr ""
 
-#: src/conf/interface_conf.c:1096
+#: src/conf/interface_conf.c:950
 msgid "bond arp monitoring has no target"
 msgstr ""
 
-#: src/conf/interface_conf.c:1123
+#: src/conf/interface_conf.c:978
 msgid "vlan misses the tag name"
 msgstr ""
 
-#: src/conf/interface_conf.c:1200
+#: src/conf/interface_conf.c:1060
 msgid "virInterfaceDefFormat unknown startmode"
 msgstr ""
 
-#: src/conf/interface_conf.c:1072
+#: src/conf/interface_conf.c:1074
 msgid "virInterfaceDefFormat NULL def"
 msgstr ""
 
-#: src/conf/interface_conf.c:1078
+#: src/conf/interface_conf.c:1080
 msgid "virInterfaceDefFormat missing interface name"
 msgstr ""
 
-#: src/conf/interface_conf.c:1222
+#: src/conf/interface_conf.c:1086
 #, c-format
 msgid "unexpected interface type %d"
 msgstr ""
 
-#: src/conf/network_conf.c:389
+#: src/conf/netdev_bandwidth_conf.c:46 src/conf/netdev_bandwidth_conf.c:113
+msgid "invalid argument supplied"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:57 src/conf/netdev_bandwidth_conf.c:69
+#: src/conf/netdev_bandwidth_conf.c:76
+#, c-format
+msgid "could not convert %s"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:63
+msgid "Missing mandatory average attribute"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:122
+msgid "Only one child <inbound> element allowed"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:130
+msgid "Only one child <outbound> element allowed"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:61
+msgid "missing virtualportprofile type"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:67
+#, c-format
+msgid "unknown virtualportprofile type %s"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:94
+msgid "cannot parse value of managerid parameter"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:100
+msgid "value of managerid out of range"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:108
+msgid "cannot parse value of typeid parameter"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:114
+msgid "value for typeid out of range"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:122
+msgid "cannot parse value of typeidversion parameter"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:128
+msgid "value of typeidversion out of range"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:138
+msgid "cannot parse instanceid parameter as a uuid"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:144
+msgid "cannot generate a random uuid for instanceid"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:153
+msgid "a parameter is missing for 802.1Qbg description"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:165
+msgid "profileid parameter too long"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:170
+msgid "profileid parameter is missing for 802.1Qbh description"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:177
+#: src/conf/netdev_vport_profile_conf.c:230
+#, c-format
+msgid "unexpected virtualport type %d"
+msgstr ""
+
+#: src/conf/network_conf.c:390
 #, c-format
 msgid "Invalid dhcp range '%s' to '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:415
+#: src/conf/network_conf.c:416
 #, c-format
 msgid "Cannot parse MAC address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:422
+#: src/conf/network_conf.c:423
 #, c-format
 msgid "Cannot use name address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:431
+#: src/conf/network_conf.c:432
 #, c-format
 msgid ""
 "Static host definition in network '%s' must have mac or name attribute"
 msgstr ""
 
-#: src/conf/network_conf.c:439
+#: src/conf/network_conf.c:440
 #, c-format
 msgid "Missing IP address in static host definition for network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:509
+#: src/conf/network_conf.c:510
 msgid "Missing IP address in DNS host definition"
 msgstr ""
 
-#: src/conf/network_conf.c:575
+#: src/conf/network_conf.c:576
 msgid "Missing required name attribute in dns txt record"
 msgstr ""
 
-#: src/conf/network_conf.c:580
+#: src/conf/network_conf.c:581
 #, c-format
 msgid "Missing required value attribute in dns txt record '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:586
+#: src/conf/network_conf.c:587
 #, c-format
 msgid "spaces are not allowed in DNS TXT record names (name is '%s')"
 msgstr ""
 
-#: src/conf/network_conf.c:654
+#: src/conf/network_conf.c:655
 #, c-format
 msgid "Bad address '%s' in definition of network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:666
+#: src/conf/network_conf.c:667
 #, c-format
 msgid "no family specified for non-IPv4 address address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:673
+#: src/conf/network_conf.c:674
 #, c-format
 msgid "family 'ipv4' specified for non-IPv4 address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:680
+#: src/conf/network_conf.c:681
 #, c-format
 msgid "family 'ipv6' specified for non-IPv6 address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:686
+#: src/conf/network_conf.c:687
 #, c-format
 msgid "Unrecognized family '%s' in definition of network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:696
+#: src/conf/network_conf.c:697
 #, c-format
 msgid "netmask specified without address in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:703
+#: src/conf/network_conf.c:704
 #, c-format
 msgid "netmask not supported for address '%s' in network '%s' (IPv4 only)"
 msgstr ""
 
-#: src/conf/network_conf.c:711
+#: src/conf/network_conf.c:712
 #, c-format
 msgid "network '%s' cannot have both prefix='%u' and a netmask"
 msgstr ""
 
-#: src/conf/network_conf.c:721
+#: src/conf/network_conf.c:722
 #, c-format
 msgid ""
 "network '%s' has invalid netmask '%s' for address '%s' (both must be IPv4)"
 msgstr ""
 
-#: src/conf/network_conf.c:880
+#: src/conf/network_conf.c:879
 #, c-format
 msgid "Invalid bridge mac address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:489
+#: src/conf/network_conf.c:955
 #, c-format
 msgid "unknown forwarding type '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:995
+#: src/conf/network_conf.c:992
 #, c-format
 msgid ""
 "Missing required dev attribute in network '%s' forward interface element"
 msgstr ""
 
-#: src/conf/network_conf.c:1005
+#: src/conf/network_conf.c:1002
 #, c-format
 msgid ""
 "forward dev '%s' must match first interface element dev '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1030
+#: src/conf/network_conf.c:1027
 #, c-format
 msgid "%s forwarding requested, but no IP address provided for network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1037
+#: src/conf/network_conf.c:1034
 #, c-format
 msgid ""
 "multiple forwarding interfaces specified for network '%s', only one is "
 "supported"
 msgstr ""
 
-#: src/conf/network_conf.c:1048
+#: src/conf/network_conf.c:1045
 #, c-format
 msgid "bridge name not allowed in %s mode (network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1057
+#: src/conf/network_conf.c:1054
 #, c-format
 msgid ""
 "bridge delay/stp options only allowed in route, nat, and isolated mode, not "
 "in %s (network '%s')"
 msgstr ""
 
-#: src/conf/network_conf.c:1087
+#: src/conf/network_conf.c:1084
 msgid "(network_definition)"
 msgstr ""
 
-#: src/conf/network_conf.c:1297
+#: src/conf/network_conf.c:1111
+#, c-format
+msgid "unexpected root element <%s>, expecting <network>"
+msgstr ""
+
+#: src/conf/network_conf.c:1298
 #, c-format
 msgid "Unknown forward type %d in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:836
+#: src/conf/network_conf.c:1462
 #, c-format
 msgid "Network config filename '%s' does not match network name '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:927
+#: src/conf/network_conf.c:1555 src/util/dnsmasq.c:266
 #, c-format
 msgid "cannot remove config file '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1001
+#: src/conf/network_conf.c:1624
 #, c-format
 msgid "Bridge generation exceeded max id %d"
 msgstr ""
 
-#: src/conf/network_conf.c:1020
+#: src/conf/network_conf.c:1642
 #, c-format
 msgid "bridge name '%s' already in use."
 msgstr ""
 
-#: src/conf/network_conf.c:1694
+#: src/conf/network_conf.c:1697
 #, c-format
 msgid "network '%s' is already defined with uuid %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1703
+#: src/conf/network_conf.c:1706
 #, c-format
 msgid "network is already active as '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1717
+#: src/conf/network_conf.c:1720
 #, c-format
 msgid "network '%s' already exists with uuid %s"
 msgstr ""
 
-#: src/conf/node_device_conf.c:565
+#: src/conf/node_device_conf.c:564
 #, c-format
 msgid "no block device path supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:588
+#: src/conf/node_device_conf.c:584
 #, c-format
 msgid "missing storage capability type for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:610
+#: src/conf/node_device_conf.c:606
 #, c-format
 msgid "no removable media size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:611
+#: src/conf/node_device_conf.c:607
 #, c-format
 msgid "invalid removable media size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:621
+#: src/conf/node_device_conf.c:617
 #, c-format
 msgid "unknown storage capability type '%s' for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:633
+#: src/conf/node_device_conf.c:629
 #, c-format
 msgid "no size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:634
+#: src/conf/node_device_conf.c:630
 #, c-format
 msgid "invalid size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:661 src/conf/node_device_conf.c:739
+#: src/conf/node_device_conf.c:656 src/conf/node_device_conf.c:732
 #, c-format
 msgid "no SCSI host ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:662 src/conf/node_device_conf.c:740
+#: src/conf/node_device_conf.c:657 src/conf/node_device_conf.c:733
 #, c-format
 msgid "invalid SCSI host ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:667
+#: src/conf/node_device_conf.c:662
 #, c-format
 msgid "no SCSI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:668
+#: src/conf/node_device_conf.c:663
 #, c-format
 msgid "invalid SCSI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:673
+#: src/conf/node_device_conf.c:668
 #, c-format
 msgid "no SCSI target ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:674
+#: src/conf/node_device_conf.c:669
 #, c-format
 msgid "invalid SCSI target ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:679
+#: src/conf/node_device_conf.c:674
 #, c-format
 msgid "no SCSI LUN ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:680
+#: src/conf/node_device_conf.c:675
 #, c-format
 msgid "invalid SCSI LUN ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:708
+#: src/conf/node_device_conf.c:702
 #, c-format
 msgid "no target name supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:756
+#: src/conf/node_device_conf.c:746
 #, c-format
 msgid "missing SCSI host capability type for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:778
+#: src/conf/node_device_conf.c:768
 #, c-format
 msgid "no WWNN supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:786
+#: src/conf/node_device_conf.c:776
 #, c-format
 msgid "no WWPN supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:794
+#: src/conf/node_device_conf.c:784
 #, c-format
 msgid "unknown SCSI host capability type '%s' for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:828
+#: src/conf/node_device_conf.c:818
 #, c-format
 msgid "no network interface supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:843
+#: src/conf/node_device_conf.c:833
 #, c-format
 msgid "invalid network type supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:871
+#: src/conf/node_device_conf.c:860
 #, c-format
 msgid "no USB interface number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:872
+#: src/conf/node_device_conf.c:861
 #, c-format
 msgid "invalid USB interface number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:877
+#: src/conf/node_device_conf.c:866
 #, c-format
 msgid "no USB interface class supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:878
+#: src/conf/node_device_conf.c:867
 #, c-format
 msgid "invalid USB interface class supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:883
+#: src/conf/node_device_conf.c:872
 #, c-format
 msgid "no USB interface subclass supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:884
+#: src/conf/node_device_conf.c:873
 #, c-format
 msgid "invalid USB interface subclass supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:889
+#: src/conf/node_device_conf.c:878
 #, c-format
 msgid "no USB interface protocol supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:890
+#: src/conf/node_device_conf.c:879
 #, c-format
 msgid "invalid USB interface protocol supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:940
+#: src/conf/node_device_conf.c:927
 #, c-format
 msgid "no USB bus number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:941
+#: src/conf/node_device_conf.c:928
 #, c-format
 msgid "invalid USB bus number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:946
+#: src/conf/node_device_conf.c:933
 #, c-format
 msgid "no USB device number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:947
+#: src/conf/node_device_conf.c:934
 #, c-format
 msgid "invalid USB device number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:952
+#: src/conf/node_device_conf.c:939
 #, c-format
 msgid "no USB vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:953
+#: src/conf/node_device_conf.c:940
 #, c-format
 msgid "invalid USB vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:958
+#: src/conf/node_device_conf.c:945
 #, c-format
 msgid "no USB product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:959
+#: src/conf/node_device_conf.c:946
 #, c-format
 msgid "invalid USB product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:986
+#: src/conf/node_device_conf.c:972
 #, c-format
 msgid "no PCI domain ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:987
+#: src/conf/node_device_conf.c:973
 #, c-format
 msgid "invalid PCI domain ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:992
+#: src/conf/node_device_conf.c:978
 #, c-format
 msgid "no PCI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:993
+#: src/conf/node_device_conf.c:979
 #, c-format
 msgid "invalid PCI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:998
+#: src/conf/node_device_conf.c:984
 #, c-format
 msgid "no PCI slot ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:999
+#: src/conf/node_device_conf.c:985
 #, c-format
 msgid "invalid PCI slot ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1004
+#: src/conf/node_device_conf.c:990
 #, c-format
 msgid "no PCI function ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1005
+#: src/conf/node_device_conf.c:991
 #, c-format
 msgid "invalid PCI function ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1010
+#: src/conf/node_device_conf.c:996
 #, c-format
 msgid "no PCI vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1011
+#: src/conf/node_device_conf.c:997
 #, c-format
 msgid "invalid PCI vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1016
+#: src/conf/node_device_conf.c:1002
 #, c-format
 msgid "no PCI product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1017
+#: src/conf/node_device_conf.c:1003
 #, c-format
 msgid "invalid PCI product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1052
+#: src/conf/node_device_conf.c:1037
 #, c-format
 msgid "no system UUID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1058
+#: src/conf/node_device_conf.c:1043
 #, c-format
 msgid "malformed uuid element for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1093
+#: src/conf/node_device_conf.c:1077
 msgid "missing capability type"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1099
+#: src/conf/node_device_conf.c:1083
 #, c-format
 msgid "unknown capability type '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1136
+#: src/conf/node_device_conf.c:1120
 #, c-format
 msgid "unknown capability type '%d' for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1188
+#: src/conf/node_device_conf.c:1176
 #, c-format
 msgid "no device capabilities for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1234
+#: src/conf/node_device_conf.c:1210
+#, c-format
+msgid "unexpected root element <%s> expecting <device>"
+msgstr ""
+
+#: src/conf/node_device_conf.c:1238
 msgid "(node_device_definition)"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1356
+#: src/conf/node_device_conf.c:1285
 msgid "Device is not a fibre channel HBA"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1310
+#: src/conf/node_device_conf.c:1314
 #, c-format
 msgid "Could not find parent device for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1330
+#: src/conf/node_device_conf.c:1334
 #, c-format
 msgid "Parent device %s is not capable of vport operations"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1663
+#: src/conf/nwfilter_conf.c:1914
 #, c-format
 msgid "%s has illegal value %s"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1698 src/conf/nwfilter_conf.c:1911
+#: src/conf/nwfilter_conf.c:1949 src/conf/nwfilter_conf.c:2194
 msgid "rule node requires action attribute"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1918
+#: src/conf/nwfilter_conf.c:2201
 msgid "unknown rule action attribute value"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1925
+#: src/conf/nwfilter_conf.c:2208
 msgid "rule node requires direction attribute"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1932
+#: src/conf/nwfilter_conf.c:2215
 msgid "unknown rule direction attribute value"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2020
+#: src/conf/nwfilter_conf.c:2292
+#, c-format
+msgid "Name of chain is longer than %u characters"
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2300
+msgid "Chain name contains invalid characters"
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2337
+#, c-format
+msgid ""
+"Invalid chain name '%s'. Please use a chain name called '%s' or any of the "
+"following prefixes: "
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2385
 msgid "filter has no name"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2030
+#: src/conf/nwfilter_conf.c:2393
+#, c-format
+msgid "Could not parse chain priority '%s'"
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2400
 #, c-format
-msgid "unknown chain suffix '%s'"
+msgid "Priority '%d' is outside valid range of [%d,%d]"
 msgstr ""
 
-#: src/conf/storage_conf.c:649 src/storage/storage_backend.c:353
+#: src/conf/nwfilter_conf.c:2442 src/conf/storage_conf.c:664
+#: src/storage/storage_backend.c:431
 msgid "unable to generate uuid"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2100
+#: src/conf/nwfilter_conf.c:2505
 msgid "unknown root element for nw filter"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2126
+#: src/conf/nwfilter_conf.c:2531
 msgid "(nwfilter_definition"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2396
+#: src/conf/nwfilter_conf.c:2801
 #, c-format
 msgid "filter with same UUID but different name ('%s') already exists"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2407
+#: src/conf/nwfilter_conf.c:2812
 msgid "filter would introduce a loop"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2475
+#: src/conf/nwfilter_conf.c:2880
 #, c-format
 msgid "network filter config filename '%s' does not match name '%s'"
 msgstr ""
 
-#: src/conf/storage_conf.c:1595
+#: src/conf/nwfilter_conf.c:2957 src/conf/storage_conf.c:1536
 #, c-format
 msgid "cannot create config directory %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:1628
+#: src/conf/nwfilter_conf.c:2970 src/conf/storage_conf.c:1555
 msgid "failed to generate XML"
 msgstr ""
 
-#: src/conf/storage_conf.c:1672
+#: src/conf/nwfilter_conf.c:2986 src/conf/storage_conf.c:1569
 #, c-format
 msgid "no config file for %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:1678
+#: src/conf/nwfilter_conf.c:2992 src/conf/storage_conf.c:1575
 #, c-format
 msgid "cannot remove config for %s"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2660
+#: src/conf/nwfilter_conf.c:3065
 #, c-format
 msgid "formatter for %s %s reported error"
 msgstr ""
 
-#: src/conf/nwfilter_params.c:177
+#: src/conf/nwfilter_params.c:114
+msgid "Variable value contains invalid character"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:321 src/conf/nwfilter_params.c:462
+#, c-format
+msgid "Could not find value for variable '%s'"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:333
+msgid ""
+"Cardinality of list items must be the same for processing them in parallel"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:394
+#, c-format
+msgid "Could not find iterator with id %u"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:454
+#, c-format
+msgid "Could not find variable '%s' in iterator"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:470
+#, c-format
+msgid "Could not get nth (%u) value of variable '%s'"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:619
 #, c-format
 msgid "Could not put variable '%s' into hashmap"
 msgstr ""
 
-#: src/conf/nwfilter_params.c:281
+#: src/conf/nwfilter_params.c:746
 msgid "missing filter parameter table"
 msgstr ""
 
-#: src/conf/secret_conf.c:56 src/conf/secret_conf.c:100
-#: src/conf/secret_conf.c:274 src/conf/secret_conf.c:291
+#: src/conf/secret_conf.c:61 src/conf/secret_conf.c:113
+#: src/conf/secret_conf.c:243 src/conf/secret_conf.c:267
 #, c-format
 msgid "unexpected secret usage type %d"
 msgstr ""
 
-#: src/conf/secret_conf.c:72
+#: src/conf/secret_conf.c:77
 msgid "unknown secret usage type"
 msgstr ""
 
-#: src/conf/secret_conf.c:78
+#: src/conf/secret_conf.c:83
 #, c-format
 msgid "unknown secret usage type %s"
 msgstr ""
 
-#: src/conf/secret_conf.c:93
+#: src/conf/secret_conf.c:97
 msgid "volume usage specified, but volume path is missing"
 msgstr ""
 
@@ -3214,41 +3544,46 @@
 msgid "Ceph usage specified, but name is missing"
 msgstr ""
 
-#: src/conf/secret_conf.c:141
+#: src/conf/secret_conf.c:130
+#, c-format
+msgid "unexpected root element <%s>, expecting <secret>"
+msgstr ""
+
+#: src/conf/secret_conf.c:156
 msgid "invalid value of 'ephemeral'"
 msgstr ""
 
-#: src/conf/secret_conf.c:155
+#: src/conf/secret_conf.c:170
 msgid "invalid value of 'private'"
 msgstr ""
 
-#: src/conf/secret_conf.c:212
+#: src/conf/secret_conf.c:214
 msgid "(definition_of_secret)"
 msgstr ""
 
-#: src/conf/storage_conf.c:225 src/storage/storage_backend.c:768
+#: src/conf/storage_conf.c:226 src/storage/storage_backend.c:998
 #, c-format
 msgid "missing backend for pool type %d"
 msgstr ""
 
-#: src/conf/storage_conf.c:372
+#: src/conf/storage_conf.c:383
 msgid "missing auth host attribute"
 msgstr ""
 
-#: src/conf/storage_conf.c:379
+#: src/conf/storage_conf.c:390
 msgid "missing auth passwd attribute"
 msgstr ""
 
-#: src/conf/storage_conf.c:416
+#: src/conf/storage_conf.c:427
 #, c-format
 msgid "unknown pool format type %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:438
+#: src/conf/storage_conf.c:464
 msgid "missing storage pool source device path"
 msgstr ""
 
-#: src/conf/storage_conf.c:457
+#: src/conf/storage_conf.c:483
 #, c-format
 msgid "unknown auth type '%s'"
 msgstr ""
@@ -3257,41 +3592,41 @@
 msgid "(storage_source_specification)"
 msgstr ""
 
-#: src/conf/storage_conf.c:511
+#: src/conf/storage_conf.c:528
 msgid "root element was not source"
 msgstr ""
 
-#: src/conf/storage_conf.c:563
+#: src/conf/storage_conf.c:578
 msgid "malformed octal mode"
 msgstr ""
 
-#: src/conf/storage_conf.c:574
+#: src/conf/storage_conf.c:589
 msgid "malformed owner element"
 msgstr ""
 
-#: src/conf/storage_conf.c:585
+#: src/conf/storage_conf.c:600
 msgid "malformed group element"
 msgstr ""
 
-#: src/conf/storage_conf.c:617 src/storage/storage_driver.c:446
-#: src/test/test_driver.c:3729
+#: src/conf/storage_conf.c:632 src/storage/storage_driver.c:454
+#: src/test/test_driver.c:4060
 #, c-format
 msgid "unknown storage pool type %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:641
+#: src/conf/storage_conf.c:656
 msgid "missing pool source name element"
 msgstr ""
 
-#: src/conf/storage_conf.c:665
+#: src/conf/storage_conf.c:680
 msgid "missing storage pool source host name"
 msgstr ""
 
-#: src/conf/storage_conf.c:673
+#: src/conf/storage_conf.c:688
 msgid "missing storage pool source path"
 msgstr ""
 
-#: src/conf/storage_conf.c:691
+#: src/conf/storage_conf.c:706
 msgid "missing storage pool source adapter name"
 msgstr ""
 
@@ -3299,11 +3634,11 @@
 msgid "missing storage pool source device name"
 msgstr ""
 
-#: src/conf/storage_conf.c:698
+#: src/conf/storage_conf.c:722
 msgid "missing storage pool target path"
 msgstr ""
 
-#: src/conf/storage_conf.c:745
+#: src/conf/storage_conf.c:752
 msgid "unknown root element for storage pool"
 msgstr ""
 
@@ -3311,42 +3646,42 @@
 msgid "(storage_pool_definition)"
 msgstr ""
 
-#: src/conf/storage_conf.c:876
+#: src/conf/storage_conf.c:850
 #, c-format
 msgid "unknown pool format number %d"
 msgstr ""
 
-#: src/conf/storage_conf.c:909 src/conf/storage_conf.c:1723
+#: src/conf/storage_conf.c:891 src/conf/storage_conf.c:1613
 msgid "unexpected pool type"
 msgstr ""
 
-#: src/conf/storage_conf.c:1007
+#: src/conf/storage_conf.c:988
 #, c-format
 msgid "unknown size units '%s'"
 msgstr ""
 
-#: src/conf/storage_conf.c:1014
+#: src/conf/storage_conf.c:995
 msgid "malformed capacity element"
 msgstr ""
 
-#: src/conf/storage_conf.c:1019
+#: src/conf/storage_conf.c:1000
 msgid "capacity element value too large"
 msgstr ""
 
-#: src/conf/storage_conf.c:1051
+#: src/conf/storage_conf.c:1031
 msgid "missing volume name element"
 msgstr ""
 
-#: src/conf/storage_conf.c:1062
+#: src/conf/storage_conf.c:1042
 msgid "missing capacity element"
 msgstr ""
 
-#: src/conf/storage_conf.c:1091 src/conf/storage_conf.c:1122
+#: src/conf/storage_conf.c:1071 src/conf/storage_conf.c:1102
 #, c-format
 msgid "unknown volume format type %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:1153
+#: src/conf/storage_conf.c:1132
 msgid "unknown root element for storage vol"
 msgstr ""
 
@@ -3354,7 +3689,7 @@
 msgid "(storage_volume_definition)"
 msgstr ""
 
-#: src/conf/storage_conf.c:1258
+#: src/conf/storage_conf.c:1192
 #, c-format
 msgid "unknown volume format number %d"
 msgstr ""
@@ -3384,126 +3719,126 @@
 msgid "Storage source conflict with pool: '%s'"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:93
+#: src/conf/storage_encryption_conf.c:92
 msgid "unknown volume encryption secret type"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:99
+#: src/conf/storage_encryption_conf.c:98
 #, c-format
 msgid "unknown volume encryption secret type %s"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:111
+#: src/conf/storage_encryption_conf.c:110
 #, c-format
 msgid "malformed volume encryption uuid '%s'"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:118
+#: src/conf/storage_encryption_conf.c:117
 msgid "missing volume encryption uuid"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:147
+#: src/conf/storage_encryption_conf.c:146
 msgid "unknown volume encryption format"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:153
+#: src/conf/storage_encryption_conf.c:152
 #, c-format
 msgid "unknown volume encryption format type %s"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:196
+#: src/conf/storage_encryption_conf.c:192
 msgid "unknown root element for volume encryption information"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:228
+#: src/conf/storage_encryption_conf.c:222
 msgid "unexpected volume encryption secret type"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:248
+#: src/conf/storage_encryption_conf.c:242
 msgid "unexpected encryption format"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:275
+#: src/conf/storage_encryption_conf.c:269
 msgid "Cannot open /dev/urandom"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:286
+#: src/conf/storage_encryption_conf.c:280
 msgid "Cannot read from /dev/urandom"
 msgstr ""
 
-#: src/cpu/cpu.c:51 src/cpu/cpu_map.c:82
+#: src/cpu/cpu.c:54 src/cpu/cpu_map.c:90
 msgid "undefined hardware architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:79 src/cpu/cpu.c:307
+#: src/cpu/cpu.c:81 src/cpu/cpu.c:309
 msgid "(CPU_definition)"
 msgstr ""
 
-#: src/cpu/cpu.c:88
+#: src/cpu/cpu.c:90
 msgid "no CPU model specified"
 msgstr ""
 
-#: src/cpu/cpu.c:113
+#: src/cpu/cpu.c:118
 #, c-format
 msgid "cannot compare CPUs of %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:144 src/cpu/cpu.c:377
+#: src/cpu/cpu.c:146 src/cpu/cpu.c:379
 msgid "nonzero nmodels doesn't match with NULL models"
 msgstr ""
 
-#: src/cpu/cpu.c:133
+#: src/cpu/cpu.c:152
 msgid "invalid CPU definition"
 msgstr ""
 
-#: src/cpu/cpu.c:142
+#: src/cpu/cpu.c:161
 #, c-format
 msgid "cannot decode CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:168
+#: src/cpu/cpu.c:192
 #, c-format
 msgid "cannot encode CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:193
+#: src/cpu/cpu.c:218
 #, c-format
 msgid "cannot free CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:213
+#: src/cpu/cpu.c:239
 #, c-format
 msgid "cannot get node CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:235
+#: src/cpu/cpu.c:262
 #, c-format
 msgid "cannot compute guest CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:294
+#: src/cpu/cpu.c:296
 msgid "nonzero ncpus doesn't match with NULL xmlCPUs"
 msgstr ""
 
-#: src/cpu/cpu.c:299 src/cpu/cpu.c:371
+#: src/cpu/cpu.c:301 src/cpu/cpu.c:373
 msgid "No CPUs given"
 msgstr ""
 
-#: src/cpu/cpu.c:366
+#: src/cpu/cpu.c:368
 msgid "nonzero ncpus doesn't match with NULL cpus"
 msgstr ""
 
-#: src/cpu/cpu.c:386
+#: src/cpu/cpu.c:388
 #, c-format
 msgid "cannot compute baseline CPU of %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:408
+#: src/cpu/cpu.c:410
 #, c-format
 msgid "cannot update guest CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:431
+#: src/cpu/cpu.c:433
 #, c-format
 msgid "cannot check guest CPU data for %s architecture"
 msgstr ""
@@ -3527,17 +3862,17 @@
 msgid "no callback provided"
 msgstr ""
 
-#: src/cpu/cpu_map.c:88
+#: src/cpu/cpu_map.c:102
 #, c-format
 msgid "cannot parse CPU map file: %s"
 msgstr ""
 
-#: src/cpu/cpu_map.c:106
+#: src/cpu/cpu_map.c:120
 #, c-format
 msgid "cannot find CPU map for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu_map.c:113
+#: src/cpu/cpu_map.c:127
 #, c-format
 msgid "cannot parse CPU map for %s architecture"
 msgstr ""
@@ -3561,32 +3896,32 @@
 msgid "Invalid CPU vendor string '%s'"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:295
+#: src/cpu/cpu_x86.c:675
 #, c-format
 msgid "CPU feature %s already defined"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:325
+#: src/cpu/cpu_x86.c:699
 #, c-format
 msgid "Invalid cpuid[%d] in %s feature"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:494
+#: src/cpu/cpu_x86.c:812 src/cpu/cpu_x86.c:862
 #, c-format
 msgid "Unknown CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:513
+#: src/cpu/cpu_x86.c:833 src/cpu/cpu_x86.c:874 src/cpu/cpu_x86.c:1693
 #, c-format
 msgid "Unknown CPU feature %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:613
+#: src/cpu/cpu_x86.c:960
 #, c-format
 msgid "Missing ancestor's name in CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:620
+#: src/cpu/cpu_x86.c:967
 #, c-format
 msgid "Ancestor model %s not found for CPU model %s"
 msgstr ""
@@ -3601,17 +3936,17 @@
 msgid "Unknown vendor %s referenced by CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:646
+#: src/cpu/cpu_x86.c:1008
 #, c-format
 msgid "Missing feature name for CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:652
+#: src/cpu/cpu_x86.c:1014
 #, c-format
 msgid "Feature %s required by CPU model %s not found"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:933
+#: src/cpu/cpu_x86.c:1346
 msgid "Cannot find suitable CPU model for given data"
 msgstr ""
 
@@ -3754,8 +4089,8 @@
 "value '%s' has unexpected value '%c', expecting '0' or '1'"
 msgstr ""
 
-#: src/esx/esx_driver.c:685 src/esx/esx_driver.c:4422
-#: src/esx/esx_driver.c:4515 src/esx/esx_storage_driver.c:669
+#: src/esx/esx_driver.c:685 src/esx/esx_driver.c:4439
+#: src/esx/esx_driver.c:4532 src/esx/esx_storage_driver.c:669
 #: src/esx/esx_util.c:56 src/esx/esx_util.c:275 src/esx/esx_vi.c:355
 #: src/esx/esx_vi.c:401 src/esx/esx_vi.c:640 src/esx/esx_vi.c:1112
 #: src/esx/esx_vi.c:1317 src/esx/esx_vi.c:1353 src/esx/esx_vi.c:1369
@@ -3928,9 +4263,9 @@
 msgstr ""
 
 #: src/esx/esx_driver.c:2590 src/esx/esx_driver.c:2674
-#: src/phyp/phyp_driver.c:1430 src/phyp/phyp_driver.c:3703
-#: src/vbox/vbox_tmpl.c:2076 src/vbox/vbox_tmpl.c:2134
-#: src/xenapi/xenapi_driver.c:1118 src/xenapi/xenapi_driver.c:1290
+#: src/phyp/phyp_driver.c:1447 src/phyp/phyp_driver.c:3720
+#: src/vbox/vbox_tmpl.c:2081 src/vbox/vbox_tmpl.c:2139
+#: src/xenapi/xenapi_driver.c:1118 src/xenapi/xenapi_driver.c:1288
 #, c-format
 msgid "unsupported flags: (0x%x)"
 msgstr ""
@@ -4025,7 +4360,7 @@
 "(normal) or -3 (high)"
 msgstr ""
 
-#: src/esx/esx_driver.c:3855 src/esx/esx_driver.c:4837
+#: src/esx/esx_driver.c:3855 src/esx/esx_driver.c:4854
 #, c-format
 msgid "Unknown field '%s'"
 msgstr ""
@@ -4073,42 +4408,42 @@
 msgid "Could not retrieve memory usage of resource pool"
 msgstr ""
 
-#: src/esx/esx_driver.c:4261 src/vbox/vbox_tmpl.c:5883
+#: src/esx/esx_driver.c:4278 src/vbox/vbox_tmpl.c:5888
 msgid "disk snapshots not supported yet"
 msgstr ""
 
-#: src/esx/esx_driver.c:4278
+#: src/esx/esx_driver.c:4295
 #, c-format
 msgid "Snapshot '%s' already exists"
 msgstr ""
 
-#: src/esx/esx_driver.c:4294
+#: src/esx/esx_driver.c:4311
 #, c-format
 msgid "Could not create snapshot: %s"
 msgstr ""
 
-#: src/esx/esx_driver.c:4638 src/qemu/qemu_driver.c:9751
-#: src/vbox/vbox_tmpl.c:6328
+#: src/esx/esx_driver.c:4655 src/qemu/qemu_driver.c:10098
+#: src/vbox/vbox_tmpl.c:6333
 #, c-format
 msgid "snapshot '%s' does not have a parent"
 msgstr ""
 
-#: src/esx/esx_driver.c:4717
+#: src/esx/esx_driver.c:4734
 #, c-format
 msgid "Could not revert to snapshot '%s': %s"
 msgstr ""
 
-#: src/esx/esx_driver.c:4783
+#: src/esx/esx_driver.c:4800
 #, c-format
 msgid "Could not delete snapshot '%s': %s"
 msgstr ""
 
-#: src/esx/esx_driver.c:4854
+#: src/esx/esx_driver.c:4871
 #, c-format
 msgid "Could not change memory parameters: %s"
 msgstr ""
 
-#: daemon/remote.c:596
+#: src/esx/esx_driver.c:4923
 #, c-format
 msgid "Field %s too big for destination"
 msgstr ""
@@ -4237,7 +4572,7 @@
 
 #: src/esx/esx_util.c:387
 #, c-format
-msgid "Formating IP address for host '%s' failed: %s"
+msgid "Formatting IP address for host '%s' failed: %s"
 msgstr ""
 
 #: src/esx/esx_util.c:407 src/esx/esx_vi.c:2369 src/hyperv/hyperv_driver.c:909
@@ -4661,7 +4996,7 @@
 
 #: src/esx/esx_vi.c:3957
 msgid ""
-"Cancelable task is blocked by an unanswered question but cancelation failed"
+"Cancelable task is blocked by an unanswered question but cancellation failed"
 msgstr ""
 
 #: src/esx/esx_vi.c:3962
@@ -4774,20 +5109,20 @@
 msgid "ManagedObjectReference is missing 'type' property"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6554 src/qemu/qemu_driver.c:6591
-#: src/qemu/qemu_driver.c:6657 src/qemu/qemu_driver.c:6773
+#: src/fdstream.c:75 src/fdstream.c:111 src/fdstream.c:192 src/fdstream.c:302
+#: src/fdstream.c:354
 msgid "stream is not open"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6561 src/qemu/qemu_driver.c:6598
+#: src/fdstream.c:82 src/fdstream.c:118
 msgid "stream does not have a callback registered"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6664
+#: src/fdstream.c:199
 msgid "stream already has a callback registered"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6674
+#: src/fdstream.c:209
 msgid "cannot register file watch on stream"
 msgstr ""
 
@@ -4804,7 +5139,7 @@
 msgid "Too many bytes to write to stream"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6789
+#: src/fdstream.c:311 src/fdstream.c:330
 msgid "cannot write to stream"
 msgstr ""
 
@@ -4816,7 +5151,7 @@
 msgid "cannot read from stream"
 msgstr ""
 
-#: src/fdstream.c:428 src/rpc/virnetsocket.c:138 src/util/event_poll.c:670
+#: src/fdstream.c:428 src/rpc/virnetsocket.c:139 src/util/event_poll.c:671
 msgid "Unable to initialize mutex"
 msgstr ""
 
@@ -4848,7 +5183,7 @@
 msgid "%s: Cannot request read and write flags together"
 msgstr ""
 
-#: src/fdstream.c:568 src/lxc/lxc_driver.c:1739
+#: src/fdstream.c:568 src/lxc/lxc_driver.c:1837
 msgid "Unable to create pipe"
 msgstr ""
 
@@ -4899,7 +5234,7 @@
 msgid "Domain is not paused"
 msgstr ""
 
-#: src/hyperv/hyperv_driver.c:632 src/hyperv/hyperv_driver.c:1176
+#: src/hyperv/hyperv_driver.c:632 src/hyperv/hyperv_driver.c:1193
 msgid "Domain is not active or is in state transition"
 msgstr ""
 
@@ -4914,11 +5249,11 @@
 msgid "Domain is already active or is in state transition"
 msgstr ""
 
-#: src/hyperv/hyperv_driver.c:1231
+#: src/hyperv/hyperv_driver.c:1248
 msgid "Domain has no managed save image"
 msgstr ""
 
-#: src/hyperv/hyperv_driver.c:1290
+#: src/hyperv/hyperv_driver.c:1308
 #, c-format
 msgid "openwsman error: %s"
 msgstr ""
@@ -5040,7 +5375,10 @@
 msgid "System is not available"
 msgstr ""
 
-#: tools/virsh.c:4378
+#: src/hyperv/hyperv_wmi.c:382 tools/virsh.c:3006 tools/virsh.c:9228
+#: tools/virsh.c:9315 tools/virsh.c:10697 tools/virsh.c:13296
+#: tools/virsh.c:13835 tools/virsh.c:13978 tools/virsh.c:16897
+#: tools/virsh.c:17006 tools/virsh.c:17421 tools/virsh.c:17427
 msgid "Out of memory"
 msgstr ""
 
@@ -5114,7 +5452,7 @@
 msgid "couldn't find interface with MAC address '%s'"
 msgstr ""
 
-#: src/interface/netcf_driver.c:316
+#: src/interface/netcf_driver.c:326
 msgid "multiple interfaces with matching MAC address"
 msgstr ""
 
@@ -5163,36 +5501,36 @@
 msgid "%s: unsupported flags (0x%lx)"
 msgstr ""
 
-#: src/libvirt.c:584 src/libvirt.c:617 src/libvirt.c:650 src/libvirt.c:683
-#: src/libvirt.c:716 src/libvirt.c:749 src/libvirt.c:785 src/libvirt.c:825
+#: src/libvirt.c:586 src/libvirt.c:619 src/libvirt.c:652 src/libvirt.c:685
+#: src/libvirt.c:718 src/libvirt.c:751 src/libvirt.c:787 src/libvirt.c:827
 #, c-format
 msgid "Too many drivers, cannot register %s"
 msgstr ""
 
-#: src/libvirt.c:792
+#: src/libvirt.c:794
 msgid "Tried to register an internal Xen driver"
 msgstr ""
 
-#: src/libvirt.c:851
+#: src/libvirt.c:853
 #, c-format
 msgid "Initialization of %s state driver failed"
 msgstr ""
 
-#: src/libvirt.c:997
+#: src/libvirt.c:1002
 msgid "Expected a list for 'uri_aliases' config parameter"
 msgstr ""
 
-#: src/libvirt.c:1009
+#: src/libvirt.c:1014
 msgid "Expected a string for 'uri_aliases' config parameter list entry"
 msgstr ""
 
-#: src/libvirt.c:1015
+#: src/libvirt.c:1020
 #, c-format
 msgid ""
 "Malformed 'uri_aliases' config entry '%s', expected 'alias=uri://host/path'"
 msgstr ""
 
-#: src/libvirt.c:1023
+#: src/libvirt.c:1028
 #, c-format
 msgid ""
 "Malformed 'uri_aliases' config entry '%s', aliases may only container 'a-Z, "
@@ -5219,7 +5557,7 @@
 msgstr ""
 
 #: src/libvirt.c:2565 src/libvirt.c:2709 src/libvirt.c:2863
-#: src/libvirt.c:15778 src/libvirt.c:16607
+#: src/libvirt.c:16017 src/libvirt.c:16846
 msgid "running and paused flags are mutually exclusive"
 msgstr ""
 
@@ -5247,97 +5585,117 @@
 msgid "could not build absolute core file path"
 msgstr ""
 
-#: src/libvirt.c:2886
+#: src/libvirt.c:3603
+#, c-format
+msgid "string parameter name '%.*s' too long"
+msgstr ""
+
+#: src/libvirt.c:3613
+#, c-format
+msgid "NULL string parameter '%s'"
+msgstr ""
+
+#: src/libvirt.c:3620
+#, c-format
+msgid "string parameter '%s' unsupported"
+msgstr ""
+
+#: src/libvirt.c:4092
 msgid "virDomainGetXMLDesc with secure flag"
 msgstr ""
 
-#: src/libvirt.c:3050
+#: src/libvirt.c:4278
 msgid "domainMigratePrepare did not set uri"
 msgstr ""
 
-#: src/libvirt.c:3136 src/qemu/qemu_driver.c:7475
+#: src/libvirt.c:4390 src/qemu/qemu_migration.c:1944
 msgid "domainMigratePrepare2 did not set uri"
 msgstr ""
 
-#: src/libvirt.c:4466 src/qemu/qemu_migration.c:2070
+#: src/libvirt.c:4536 src/qemu/qemu_migration.c:2082
 msgid "domainMigratePrepare3 did not set uri"
 msgstr ""
 
-#: src/libvirt.c:4642 src/libvirt.c:4714 src/libvirt.c:5094 src/libvirt.c:5106
+#: src/libvirt.c:4712 src/libvirt.c:4784 src/libvirt.c:5164 src/libvirt.c:5176
 msgid "Unable to change target guest XML during migration"
 msgstr ""
 
-#: src/libvirt.c:4647
+#: src/libvirt.c:4717
 msgid "Unable to override peer2peer migration URI"
 msgstr ""
 
-#: src/libvirt.c:4868 src/libvirt.c:5069
+#: src/libvirt.c:4938 src/libvirt.c:5139
 msgid "cannot enforce change protection"
 msgstr ""
 
-#: src/libvirt.c:3357
+#: src/libvirt.c:4944 src/libvirt.c:5145
 msgid "cannot perform tunnelled migration without using peer2peer flag"
 msgstr ""
 
-#: src/libvirt.c:4306
-msgid "path is NULL"
+#: src/libvirt.c:7090 src/libvirt.c:7166 src/libvirt.c:17055
+#: src/libvirt.c:17111 src/libvirt.c:17179 src/libvirt.c:17250
+msgid "disk is NULL"
 msgstr ""
 
-#: src/libvirt.c:4319
+#: src/libvirt.c:7097
 msgid "buffer is NULL"
 msgstr ""
 
-#: src/libvirt.c:7044
+#: src/libvirt.c:7268
 msgid ""
 "flags parameter must include VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL"
 msgstr ""
 
-#: src/libvirt.c:4427
+#: src/libvirt.c:7275
 msgid "buffer is NULL but size is non-zero"
 msgstr ""
 
-#: src/libvirt.c:10151
+#: src/libvirt.c:14269
 msgid "data sources cannot be used for non-blocking streams"
 msgstr ""
 
-#: src/libvirt.c:10248
+#: src/libvirt.c:14371
 msgid "data sinks cannot be used for non-blocking streams"
 msgstr ""
 
-#: src/libvirt.c:16050
+#: src/libvirt.c:16289
 msgid "use of current flag requires redefine flag"
 msgstr ""
 
-#: src/libvirt.c:16056
+#: src/libvirt.c:16295
 msgid "redefine and no metadata flags are mutually exclusive"
 msgstr ""
 
-#: src/libvirt.c:16062
+#: src/libvirt.c:16301
 msgid "redefine and halt flags are mutually exclusive"
 msgstr ""
 
-#: src/libvirt.c:16115
+#: src/libvirt.c:16354
 msgid "virDomainSnapshotGetXMLDesc with secure flag"
 msgstr ""
 
-#: src/libvirt.c:16674
+#: src/libvirt.c:16913
 msgid "children and children_only flags are mutually exclusive"
 msgstr ""
 
-#: src/libvirt.c:16864
+#: src/libvirt.c:17117
 msgid "info is NULL"
 msgstr ""
 
-#: src/libvirt.c:17051
+#: src/libvirt.c:17318
 #, c-format
 msgid "Unable to access file descriptor %d"
 msgstr ""
 
-#: src/libvirt.c:17057
+#: src/libvirt.c:17324
 #, c-format
 msgid "File descriptor %d must be a socket"
 msgstr ""
 
+#: src/libvirt.c:17394
+msgid "negative or zero interval make no sense"
+msgstr ""
+
 #: src/locking/lock_driver_sanlock.c:95
 #, c-format
 msgid "Unable to access config file %s"
@@ -5554,42 +5912,42 @@
 msgid "this platform is missing dlopen"
 msgstr ""
 
-#: src/lxc/lxc_container.c:128
+#: src/lxc/lxc_container.c:147
 msgid "setsid failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:134
+#: src/lxc/lxc_container.c:153
 msgid "ioctl(TIOCSTTY) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:147
+#: src/lxc/lxc_container.c:168
 msgid "dup2(stdin) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:153
+#: src/lxc/lxc_container.c:174
 msgid "dup2(stdout) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:159
+#: src/lxc/lxc_container.c:180
 msgid "dup2(stderr) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:311
+#: src/lxc/lxc_container.c:333
 msgid "Failed to make root private"
 msgstr ""
 
-#: src/lxc/lxc_container.c:322 src/lxc/lxc_container.c:344
-#: src/lxc/lxc_container.c:515
+#: src/lxc/lxc_container.c:344 src/lxc/lxc_container.c:366
+#: src/lxc/lxc_container.c:613 src/lxc/lxc_container.c:874
 #, c-format
 msgid "Failed to create %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:331
+#: src/lxc/lxc_container.c:353
 #, c-format
 msgid "Failed to mount empty tmpfs at %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:352
+#: src/lxc/lxc_container.c:374
 #, c-format
 msgid "Failed to bind new root %s into tmpfs"
 msgstr ""
@@ -5599,16 +5957,16 @@
 msgid "Failed to make new root %s readonly"
 msgstr ""
 
-#: src/lxc/lxc_container.c:361
+#: src/lxc/lxc_container.c:392
 #, c-format
 msgid "Failed to chroot into %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:369
+#: src/lxc/lxc_container.c:400
 msgid "Failed to pivot root"
 msgstr ""
 
-#: src/lxc/lxc_container.c:412
+#: src/lxc/lxc_container.c:459
 #, c-format
 msgid "Failed to mkdir %s"
 msgstr ""
@@ -5618,20 +5976,20 @@
 msgid "Failed to mount %s on %s type %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:426
+#: src/lxc/lxc_container.c:511
 msgid "Cannot create /dev/pts"
 msgstr ""
 
-#: src/lxc/lxc_container.c:433
+#: src/lxc/lxc_container.c:518
 msgid "Failed to mount /dev/pts in container"
 msgstr ""
 
-#: src/lxc/lxc_container.c:468
+#: src/lxc/lxc_container.c:552
 #, c-format
 msgid "Failed to make device %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:485
+#: src/lxc/lxc_container.c:562
 msgid "Failed to make device /dev/ptmx"
 msgstr ""
 
@@ -5723,7 +6081,7 @@
 msgid "Cannot mount filesystem type %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:545
+#: src/lxc/lxc_container.c:984
 msgid "Failed to read /proc/mounts"
 msgstr ""
 
@@ -5737,25 +6095,25 @@
 msgid "Failed to unmount '%s' and could not unmount old root '%s'"
 msgstr ""
 
-#: src/lxc/lxc_container.c:624
+#: src/lxc/lxc_container.c:1098
 msgid "Failed to make / slave"
 msgstr ""
 
-#: src/lxc/lxc_container.c:687
+#: src/lxc/lxc_container.c:1148
 #, c-format
 msgid "Failed to remove capabilities: %d"
 msgstr ""
 
-#: src/lxc/lxc_container.c:693
+#: src/lxc/lxc_container.c:1154
 #, c-format
 msgid "Failed to apply capabilities: %d"
 msgstr ""
 
-#: src/lxc/lxc_container.c:732
+#: src/lxc/lxc_container.c:1195
 msgid "lxcChild() passed invalid vm definition"
 msgstr ""
 
-#: src/lxc/lxc_container.c:753
+#: src/lxc/lxc_container.c:1228
 #, c-format
 msgid "Failed to open tty %s"
 msgstr ""
@@ -5765,7 +6123,7 @@
 msgid "cannot find init path '%s' relative to container root"
 msgstr ""
 
-#: src/lxc/lxc_container.c:216
+#: src/lxc/lxc_container.c:1246
 msgid "Failed to read the container continue message"
 msgstr ""
 
@@ -5773,628 +6131,852 @@
 msgid "failed to send continue signal to controller"
 msgstr ""
 
-#: src/lxc/lxc_container.c:836
+#: src/lxc/lxc_container.c:1372
 msgid "Failed to run clone container"
 msgstr ""
 
-#: src/lxc/lxc_conf.c:76 src/qemu/qemu_driver.c:260 src/uml/uml_conf.c:87
+#: src/lxc/lxc_conf.c:81 src/qemu/qemu_driver.c:263 src/uml/uml_conf.c:91
 msgid "cannot get the host uuid"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:85
+#: src/lxc/lxc_controller.c:93
 msgid "Unable to read /dev"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2819
+#: src/lxc/lxc_controller.c:109 src/lxc/lxc_controller.c:162
+#: src/qemu/qemu_driver.c:960 src/util/iohelper.c:57
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:112
+#: src/lxc/lxc_controller.c:120
 #, c-format
 msgid "Unable to get loop status on %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:123
+#: src/lxc/lxc_controller.c:131
 msgid "Unable to find a free loop device in /dev"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:160
+#: src/lxc/lxc_controller.c:168
 #, c-format
 msgid "Unable to attach %s to loop device"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:167
+#: src/lxc/lxc_controller.c:175
 msgid "Unable to mark loop device as autoclear"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:92
-msgid "Unable to get cgroup for driver"
+#: src/lxc/lxc_controller.c:252 src/qemu/qemu_process.c:1386
+msgid "Host kernel is not aware of NUMA."
 msgstr ""
 
-#: src/lxc/lxc_controller.c:99
+#: src/lxc/lxc_controller.c:264 src/qemu/qemu_process.c:1398
 #, c-format
-msgid "Unable to create cgroup for domain %s"
+msgid "Host cannot support NUMA node %d"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:274
+#: src/lxc/lxc_controller.c:293 src/qemu/qemu_process.c:1427
+msgid "NUMA memory tuning in 'preferred' mode only supports single node"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:304
 #, c-format
-msgid "Unable to set Blkio weight for domain %s"
+msgid "Unable to set NUMA policy %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:319
+msgid "NUMA policy is not available on this platform"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:392 src/qemu/qemu_cgroup.c:382
+#, c-format
+msgid "Unable to set io cpu shares for domain %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:401
+#, c-format
+msgid "Unable to set io cpu quota for domain %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:410
+#, c-format
+msgid "Unable to set io cpu period for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:284
+#: src/lxc/lxc_controller.c:429
 #, c-format
-msgid "Unable to set cpu shares for domain %s"
+msgid "Unable to set Blkio weight for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:107
+#: src/lxc/lxc_controller.c:449
 #, c-format
 msgid "Unable to set memory limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:302 src/qemu/qemu_cgroup.c:323
+#: src/lxc/lxc_controller.c:458 src/qemu/qemu_cgroup.c:347
 #, c-format
 msgid "Unable to set memory hard limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:312 src/qemu/qemu_cgroup.c:332
+#: src/lxc/lxc_controller.c:468 src/qemu/qemu_cgroup.c:356
 #, c-format
 msgid "Unable to set memory soft limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:322 src/qemu/qemu_cgroup.c:342
+#: src/lxc/lxc_controller.c:478 src/qemu/qemu_cgroup.c:366
 #, c-format
 msgid "Unable to set swap hard limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:115
+#: src/lxc/lxc_controller.c:508
 #, c-format
 msgid "Unable to deny devices for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:128
+#: src/lxc/lxc_controller.c:522
 #, c-format
 msgid "Unable to allow device %c:%d:%d for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:362
+#: src/lxc/lxc_controller.c:539
 #, c-format
 msgid "Unable to allow device %s for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:372
+#: src/lxc/lxc_controller.c:549
 #, c-format
 msgid "Unable to allow PTY devices for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:145
+#: src/lxc/lxc_controller.c:588
+msgid "Unable to get cgroup for driver"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:595
+#, c-format
+msgid "Unable to create cgroup for domain %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:615
 #, c-format
 msgid "Unable to add task %d to cgroup for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:173
+#: src/lxc/lxc_controller.c:643
 #, c-format
 msgid "failed to create server socket '%s'"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:183
+#: src/lxc/lxc_controller.c:653
 #, c-format
 msgid "Socket path %s too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:189
+#: src/lxc/lxc_controller.c:659
 #, c-format
 msgid "failed to bind server socket '%s'"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:195
+#: src/lxc/lxc_controller.c:665
 #, c-format
 msgid "failed to listen server socket %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:257
+#: src/lxc/lxc_controller.c:687
 #, c-format
 msgid "failed to apply capabilities: %d"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:543
+#: src/lxc/lxc_controller.c:778
 msgid "Unable to read from monitor client"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:572
+#: src/lxc/lxc_controller.c:807
 msgid "Unable to accept monitor client"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:589 src/lxc/lxc_controller.c:861
+#: src/lxc/lxc_controller.c:824 src/lxc/lxc_controller.c:1096
 msgid "Unable to watch client socket"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:635
+#: src/lxc/lxc_controller.c:870
 msgid "Unable to create epoll fd"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:643
+#: src/lxc/lxc_controller.c:878
 msgid "Unable to add epoll fd"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:653
+#: src/lxc/lxc_controller.c:888
 msgid "Unable to wait on epoll"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:725
+#: src/lxc/lxc_controller.c:960
 msgid "Unable to read container pty"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:753
+#: src/lxc/lxc_controller.c:988
 msgid "Unable to write to container pty"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:820
+#: src/lxc/lxc_controller.c:1055
 msgid "Cannot create signal pipe"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:830
+#: src/lxc/lxc_controller.c:1065
 msgid "Unable to watch signal pipe"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:836
+#: src/lxc/lxc_controller.c:1071
 msgid "Cannot install signal handler"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:850
+#: src/lxc/lxc_controller.c:1085
 msgid "Unable to watch monitor socket"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:880 src/lxc/lxc_controller.c:890
+#: src/lxc/lxc_controller.c:1115 src/lxc/lxc_controller.c:1125
 msgid "Unable to watch host console PTY"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:973
+#: src/lxc/lxc_controller.c:1208
 #, c-format
 msgid "Unable to request personality for %s on %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:513
+#: src/lxc/lxc_controller.c:1302
 msgid "sockpair failed"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1073
+#: src/lxc/lxc_controller.c:1308
 msgid "socketpair failed"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1110
+#: src/lxc/lxc_controller.c:1345
 #, c-format
 msgid "root source %s does not exist"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:543
+#: src/lxc/lxc_controller.c:1352
 msgid "Cannot unshare mount namespace"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:549
+#: src/lxc/lxc_controller.c:1358
 msgid "Failed to switch root mount into slave mode"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:561
+#: src/lxc/lxc_controller.c:1370
 #, c-format
 msgid "Failed to make path %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:569
+#: src/lxc/lxc_controller.c:1381
 #, c-format
 msgid "Failed to mount devpts on %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1158
+#: src/lxc/lxc_controller.c:1393
 msgid "Expected exactly one TTY fd"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:587 src/lxc/lxc_controller.c:596
-#: src/lxc/lxc_driver.c:1212
+#: src/lxc/lxc_controller.c:1405 src/lxc/lxc_controller.c:1414
+#: src/lxc/lxc_driver.c:1806
 msgid "Failed to allocate tty"
 msgstr ""
 
-#: src/lxc/lxc_container.c:187
+#: src/lxc/lxc_controller.c:1439
 msgid "Unable to send container continue message"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1210
+#: src/lxc/lxc_controller.c:1445
 msgid "error receiving signal from container"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1227
+#: src/lxc/lxc_controller.c:1462
 msgid "error sending continue signal to parent"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1235 src/lxc/lxc_controller.c:1242
+#: src/lxc/lxc_controller.c:1470 src/lxc/lxc_controller.c:1477
 msgid "Unable to set file descriptor non blocking"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:773
+#: src/lxc/lxc_controller.c:1664
 #, c-format
 msgid "Unable to write pid file '%s/%s.pid'"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:787
+#: src/lxc/lxc_controller.c:1678
 msgid "Unable to change to root dir"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:793
+#: src/lxc/lxc_controller.c:1684
 msgid "Unable to become session leader"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:804
+#: src/lxc/lxc_controller.c:1695
 msgid "Failed to accept a connection from driver"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:131
+#: src/lxc/lxc_driver.c:159
 #, c-format
 msgid "Unexpected LXC URI path '%s', try lxc:///"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:139
+#: src/lxc/lxc_driver.c:167
 msgid "lxc state driver is not active"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:229
+#: src/lxc/lxc_driver.c:238
 #, c-format
 msgid "No domain with matching id %d"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:561 src/lxc/lxc_driver.c:586 src/lxc/lxc_driver.c:618
-#: src/lxc/lxc_driver.c:2030 src/lxc/lxc_driver.c:2084
-#: src/lxc/lxc_driver.c:2111 src/lxc/lxc_driver.c:2280
-#: src/lxc/lxc_driver.c:2345
+#: src/lxc/lxc_driver.c:267 src/lxc/lxc_driver.c:321 src/lxc/lxc_driver.c:346
+#: src/lxc/lxc_driver.c:370 src/lxc/lxc_driver.c:502 src/lxc/lxc_driver.c:559
+#: src/lxc/lxc_driver.c:625 src/lxc/lxc_driver.c:652 src/lxc/lxc_driver.c:681
+#: src/lxc/lxc_driver.c:706 src/lxc/lxc_driver.c:738 src/lxc/lxc_driver.c:802
+#: src/lxc/lxc_driver.c:903 src/lxc/lxc_driver.c:1008
+#: src/lxc/lxc_driver.c:1993 src/lxc/lxc_driver.c:2251
+#: src/lxc/lxc_driver.c:3409 src/lxc/lxc_driver.c:3464
+#: src/lxc/lxc_driver.c:3491 src/lxc/lxc_driver.c:3659
+#: src/lxc/lxc_driver.c:3724 src/libxl/libxl_driver.c:1342
+#: src/libxl/libxl_driver.c:1400 src/libxl/libxl_driver.c:1456
+#: src/libxl/libxl_driver.c:1502 src/libxl/libxl_driver.c:1545
+#: src/libxl/libxl_driver.c:1600 src/libxl/libxl_driver.c:1939
+#: src/libxl/libxl_driver.c:2037 src/libxl/libxl_driver.c:2127
+#: src/libxl/libxl_driver.c:2173 src/libxl/libxl_driver.c:2207
+#: src/libxl/libxl_driver.c:2705 src/libxl/libxl_driver.c:3447
+#: src/libxl/libxl_driver.c:3475 src/vmware/vmware_driver.c:595
 #, c-format
 msgid "No domain with matching uuid '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:284
+#: src/lxc/lxc_driver.c:293
 #, c-format
 msgid "No domain with matching name '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:378 src/lxc/lxc_driver.c:1315
-#: src/lxc/lxc_driver.c:1365
+#: src/lxc/lxc_driver.c:449 src/lxc/lxc_driver.c:1999
+#: src/lxc/lxc_driver.c:2077
 msgid "System lacks NETNS support"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:439
+#: src/lxc/lxc_driver.c:508
 msgid "Cannot undefine transient domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:491
+#: src/lxc/lxc_driver.c:571 src/lxc/lxc_driver.c:762 src/lxc/lxc_driver.c:916
 #, c-format
 msgid "Unable to get cgroup for %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:497
+#: src/lxc/lxc_driver.c:577
 msgid "Cannot read cputime for domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:502
+#: src/lxc/lxc_driver.c:582
 msgid "Cannot read memory usage for domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:592
+#: src/lxc/lxc_driver.c:712
 msgid "Cannot set max memory lower than current memory"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:624
+#: src/lxc/lxc_driver.c:744
 msgid "Cannot set memory higher than max memory"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2036 src/lxc/lxc_driver.c:2286
-#: src/lxc/lxc_driver.c:2351
+#: src/lxc/lxc_driver.c:750 src/lxc/lxc_driver.c:2257
+#: src/lxc/lxc_driver.c:3415 src/lxc/lxc_driver.c:3665
+#: src/lxc/lxc_driver.c:3730 src/libxl/libxl_driver.c:1346
+#: src/libxl/libxl_driver.c:1405 src/libxl/libxl_driver.c:1462
+#: src/libxl/libxl_driver.c:1508 src/libxl/libxl_driver.c:1551
+#: src/libxl/libxl_driver.c:1944 src/libxl/libxl_driver.c:2042
+#: src/libxl/libxl_driver.c:2132 src/libxl/libxl_driver.c:2404
+#: src/libxl/libxl_driver.c:2501 src/libxl/libxl_driver.c:3253
+#: src/libxl/libxl_driver.c:3548 src/libxl/libxl_driver.c:3615
+#: src/libxl/libxl_driver.c:3706 src/openvz/openvz_driver.c:523
+#: src/openvz/openvz_driver.c:561
 msgid "Domain is not running"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:747
+#: src/lxc/lxc_driver.c:756
 msgid "cgroups must be configured on the host"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:637
+#: src/lxc/lxc_driver.c:768
 msgid "Failed to set memory for domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6009 src/qemu/qemu_driver.c:6080
+#: src/lxc/lxc_driver.c:808 src/lxc/lxc_driver.c:2831
+#: src/lxc/lxc_driver.c:3032 src/lxc/lxc_driver.c:3158
+#: src/lxc/lxc_driver.c:3307 src/qemu/qemu_driver.c:6054
+#: src/qemu/qemu_driver.c:6273 src/qemu/qemu_driver.c:6482
+#: src/qemu/qemu_driver.c:6644 src/qemu/qemu_driver.c:6960
+#: src/qemu/qemu_driver.c:7232
 #, c-format
 msgid "cannot find cgroup for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:811 src/qemu/qemu_driver.c:6240
+#: src/lxc/lxc_driver.c:820 src/qemu/qemu_driver.c:6505
 msgid "invalid type for memory hard_limit tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:819 src/qemu/qemu_driver.c:6249
+#: src/lxc/lxc_driver.c:828 src/qemu/qemu_driver.c:6514
 msgid "unable to set memory hard_limit tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:826 src/qemu/qemu_driver.c:6261
+#: src/lxc/lxc_driver.c:835 src/qemu/qemu_driver.c:6526
 msgid "invalid type for memory soft_limit tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:834 src/qemu/qemu_driver.c:6270
+#: src/lxc/lxc_driver.c:843 src/qemu/qemu_driver.c:6535
 msgid "unable to set memory soft_limit tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:841 src/qemu/qemu_driver.c:6282
+#: src/lxc/lxc_driver.c:850 src/qemu/qemu_driver.c:6547
 msgid "invalid type for swap_hard_limit tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:849 src/qemu/qemu_driver.c:6291
+#: src/lxc/lxc_driver.c:858 src/qemu/qemu_driver.c:6556
 msgid "unable to set swap_hard_limit tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:854 src/qemu/qemu_driver.c:6300
+#: src/lxc/lxc_driver.c:863 src/qemu/qemu_driver.c:6565
 #, c-format
 msgid "Memory tunable `%s' not implemented"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:858 src/qemu/qemu_driver.c:5982
-#: src/qemu/qemu_driver.c:6011 src/qemu/qemu_driver.c:6305
+#: src/lxc/lxc_driver.c:867 src/lxc/lxc_driver.c:3202
+#: src/lxc/lxc_driver.c:3231 src/qemu/qemu_driver.c:6137
+#: src/qemu/qemu_driver.c:6192 src/qemu/qemu_driver.c:6570
 #, c-format
 msgid "Parameter `%s' not supported"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:922 src/qemu/qemu_driver.c:6457
+#: src/lxc/lxc_driver.c:931 src/qemu/qemu_driver.c:6726
 msgid "unable to get memory hard limit"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:927
+#: src/lxc/lxc_driver.c:936
 msgid "Field memory hard limit too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:937 src/qemu/qemu_driver.c:6473
+#: src/lxc/lxc_driver.c:946 src/qemu/qemu_driver.c:6742
 msgid "unable to get memory soft limit"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:942
+#: src/lxc/lxc_driver.c:951
 msgid "Field memory soft limit too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:952 src/qemu/qemu_driver.c:6489
+#: src/lxc/lxc_driver.c:961 src/qemu/qemu_driver.c:6758
 msgid "unable to get swap hard limit"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:957
+#: src/lxc/lxc_driver.c:966
 msgid "Field swap hard limit too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1202
-msgid "Unable to initialize bridging"
+#: src/lxc/lxc_driver.c:1226 src/network/bridge_driver.c:1780
+#: src/qemu/qemu_command.c:270 src/util/virnetdevmacvlan.c:583
+#, c-format
+msgid "cannot set bandwidth limits on %s"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:1262
+msgid "Unable to set network bandwidth on direct interfaces"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:805
-msgid "Failed to get bridge for interface"
+#: src/lxc/lxc_driver.c:1276
+msgid "Unable to set port profile on direct interfaces"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:850
-#, c-format
-msgid "Failed to add %s device to %s"
+#: src/lxc/lxc_driver.c:1366
+msgid "No bridge name specified"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1293 src/network/bridge_driver.c:1815
-#: src/qemu/qemu_command.c:330 src/util/macvtap.c:369
+#: src/lxc/lxc_driver.c:1394
 #, c-format
-msgid "cannot set bandwidth limits on %s"
+msgid "Unsupported network type %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:888
+#: src/lxc/lxc_driver.c:1428
 msgid "Failed to create client socket"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:896
+#: src/lxc/lxc_driver.c:1436
 #, c-format
 msgid "Socket path %s too big for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:902
+#: src/lxc/lxc_driver.c:1442
 msgid "Failed to connect to client socket"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:927
+#: src/lxc/lxc_driver.c:1465
 #, c-format
 msgid "Invalid PID %d for container"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1375
+#: src/lxc/lxc_driver.c:1473
 msgid "Failed to kill container PIDs"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1381
+#: src/lxc/lxc_driver.c:1479
 msgid "Some container PIDs refused to die"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1547
+#: src/lxc/lxc_driver.c:1645
 #, c-format
 msgid "failed to open logfile %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1563 src/qemu/qemu_domain.c:1268
+#: src/lxc/lxc_driver.c:1661 src/qemu/qemu_domain.c:1273
 #, c-format
 msgid "unable to seek to end of log for %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1567 src/qemu/qemu_domain.c:1272
+#: src/lxc/lxc_driver.c:1665 src/qemu/qemu_domain.c:1277
 #, c-format
 msgid "unable to seek to %lld from start for %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1584
+#: src/lxc/lxc_driver.c:1682
 msgid "Failure while reading guest log output"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1642
+#: src/lxc/lxc_driver.c:1740
 msgid ""
 "The 'cpuacct', 'devices' & 'memory' cgroups controllers must be mounted"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1649
+#: src/lxc/lxc_driver.c:1747
 msgid "Unable to find 'cpuacct' cgroups controller mount"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1655
+#: src/lxc/lxc_driver.c:1753
 msgid "Unable to find 'devices' cgroups controller mount"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1661
+#: src/lxc/lxc_driver.c:1759
 msgid "Unable to find 'memory' cgroups controller mount"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1198
+#: src/lxc/lxc_driver.c:1765
 #, c-format
 msgid "Cannot create log directory '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1702
+#: src/lxc/lxc_driver.c:1800
 msgid "Only PTY console types are supported"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1233
+#: src/lxc/lxc_driver.c:1830
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1774
+#: src/lxc/lxc_driver.c:1872
 msgid "could not close handshake fd"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1253
+#: src/lxc/lxc_driver.c:1885
 #, c-format
 msgid "Failed to read pid file %s/%s.pid"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1800
+#: src/lxc/lxc_driver.c:1898
 #, c-format
 msgid "guest failed to start: %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1839
+#: src/lxc/lxc_driver.c:1937
 msgid "could not close logfile"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1906 src/libxl/libxl_driver.c:2711
+#: src/lxc/lxc_driver.c:2005 src/libxl/libxl_driver.c:2711
 #: src/vmware/vmware_driver.c:601
 msgid "Domain is already running"
 msgstr ""
 
-#: src/uml/uml_driver.c:163
+#: src/lxc/lxc_driver.c:2329 src/libxl/libxl_driver.c:171
+#: src/qemu/qemu_driver.c:166 src/uml/uml_driver.c:168
 #, c-format
 msgid "Failed to autostart VM '%s': %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1884
+#: src/lxc/lxc_driver.c:2600
 #, c-format
 msgid "Unknown release: %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1946 src/qemu/qemu_driver.c:6032
-#, c-format
-msgid "Invalid parameter `%s'"
+#: src/lxc/lxc_driver.c:2669 src/lxc/lxc_driver.c:2826
+#: src/lxc/lxc_driver.c:3026 src/qemu/qemu_driver.c:5866
+#: src/qemu/qemu_driver.c:6955 src/qemu/qemu_driver.c:7226
+msgid "cgroup CPU controller is not mounted"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1937
-msgid "Invalid type for cpu_shares tunable, expected a 'ullong'"
+#: src/lxc/lxc_driver.c:2702 src/qemu/qemu_driver.c:6828
+#: src/qemu/qemu_driver.c:7080
+msgid "unable to get cpu bandwidth period tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2572
-#, c-format
-msgid "failed to set cpu_shares=%llu"
+#: src/lxc/lxc_driver.c:2709 src/qemu/qemu_driver.c:6821
+#: src/qemu/qemu_driver.c:7087
+msgid "unable to get cpu bandwidth tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1996
-msgid "Field cpu_shares too big for destination"
+#: src/lxc/lxc_driver.c:2731 src/qemu/qemu_cgroup.c:418
+msgid "Unable to get cpu bandwidth period"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2053
-#, c-format
-msgid "Invalid path, '%s' is not a known interface"
+#: src/lxc/lxc_driver.c:2738 src/qemu/qemu_cgroup.c:425
+msgid "Unable to set cpu bandwidth period"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2117
-msgid "Cannot set autostart for transient domain"
+#: src/lxc/lxc_driver.c:2747 src/qemu/qemu_cgroup.c:434
+msgid "Unable to set cpu bandwidth quota"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2142
+#: src/lxc/lxc_driver.c:2759 src/qemu/qemu_cgroup.c:446
+#: src/qemu/qemu_cgroup.c:481 src/qemu/qemu_driver.c:6808
+#: src/xenapi/xenapi_utils.c:391 src/xenapi/xenapi_utils.c:395
 #, c-format
-msgid "Cannot create autostart directory %s"
+msgid "%s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2149 src/qemu/qemu_driver.c:5930
-#: src/uml/uml_driver.c:1752
+#: src/lxc/lxc_driver.c:2791 src/lxc/lxc_driver.c:2974
+#: src/lxc/lxc_driver.c:3131 src/lxc/lxc_driver.c:3273
+#: src/qemu/qemu_driver.c:6027 src/qemu/qemu_driver.c:6239
+#: src/qemu/qemu_driver.c:6454 src/qemu/qemu_driver.c:6616
+#: src/qemu/qemu_driver.c:6920 src/qemu/qemu_driver.c:7174
 #, c-format
-msgid "Failed to create symlink '%s to '%s'"
+msgid "No such domain %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2156 src/network/bridge_driver.c:1538
-#: src/qemu/qemu_driver.c:5937 src/storage/storage_driver.c:1036
-#: src/uml/uml_driver.c:1759
-#, c-format
-msgid "Failed to delete symlink '%s'"
+#: src/lxc/lxc_driver.c:2807 src/lxc/lxc_driver.c:3166
+#: src/lxc/lxc_driver.c:3315 src/libxl/libxl_driver.c:1684
+#: src/libxl/libxl_driver.c:2276 src/qemu/qemu_driver.c:1847
+#: src/qemu/qemu_driver.c:3328 src/qemu/qemu_driver.c:3464
+#: src/qemu/qemu_driver.c:6062 src/qemu/qemu_driver.c:6281
+#: src/qemu/qemu_driver.c:6490 src/qemu/qemu_driver.c:6652
+#: src/qemu/qemu_driver.c:6936 src/qemu/qemu_driver.c:11172
+msgid "cannot change persistent config of a transient domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2293
-msgid "Suspend operation failed"
+#: src/lxc/lxc_driver.c:2820 src/lxc/lxc_driver.c:3020
+#: src/lxc/lxc_driver.c:3147 src/lxc/lxc_driver.c:3296
+#: src/lxc/lxc_driver.c:3787 src/qemu/qemu_driver.c:1401
+#: src/qemu/qemu_driver.c:1420 src/qemu/qemu_driver.c:1472
+#: src/qemu/qemu_driver.c:1529 src/qemu/qemu_driver.c:1585
+#: src/qemu/qemu_driver.c:1638 src/qemu/qemu_driver.c:1708
+#: src/qemu/qemu_driver.c:1840 src/qemu/qemu_driver.c:1951
+#: src/qemu/qemu_driver.c:1962 src/qemu/qemu_driver.c:2033
+#: src/qemu/qemu_driver.c:2194 src/qemu/qemu_driver.c:2696
+#: src/qemu/qemu_driver.c:2755 src/qemu/qemu_driver.c:2968
+#: src/qemu/qemu_driver.c:3079 src/qemu/qemu_driver.c:3170
+#: src/qemu/qemu_driver.c:3322 src/qemu/qemu_driver.c:3603
+#: src/qemu/qemu_driver.c:4438 src/qemu/qemu_driver.c:6043
+#: src/qemu/qemu_driver.c:6262 src/qemu/qemu_driver.c:6470
+#: src/qemu/qemu_driver.c:6632 src/qemu/qemu_driver.c:6949
+#: src/qemu/qemu_driver.c:7220 src/qemu/qemu_driver.c:7363
+#: src/qemu/qemu_driver.c:7428 src/qemu/qemu_driver.c:7451
+#: src/qemu/qemu_driver.c:7513 src/qemu/qemu_driver.c:7541
+#: src/qemu/qemu_driver.c:7726 src/qemu/qemu_driver.c:7796
+#: src/qemu/qemu_driver.c:7913 src/qemu/qemu_driver.c:8460
+#: src/qemu/qemu_driver.c:8940 src/qemu/qemu_driver.c:8975
+#: src/qemu/qemu_driver.c:9037 src/qemu/qemu_driver.c:9095
+#: src/qemu/qemu_driver.c:9204 src/qemu/qemu_driver.c:9482
+#: src/qemu/qemu_driver.c:10716 src/qemu/qemu_driver.c:10725
+#: src/qemu/qemu_driver.c:10864 src/qemu/qemu_driver.c:10970
+#: src/qemu/qemu_driver.c:10984 src/qemu/qemu_driver.c:11070
+#: src/qemu/qemu_driver.c:11165 src/qemu/qemu_driver.c:11324
+#: src/qemu/qemu_migration.c:2323 src/uml/uml_driver.c:2395
+#: src/xen/xen_driver.c:2132 src/xen/xen_hypervisor.c:1159
+#: src/xen/xen_hypervisor.c:1240 src/xen/xen_hypervisor.c:1359
+#: src/xen/xm_internal.c:715
+msgid "domain is not running"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2358
-msgid "Resume operation failed"
+#: src/lxc/lxc_driver.c:2843 src/qemu/qemu_driver.c:6972
+msgid "invalid type for cpu_shares tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2986 src/qemu/qemu_driver.c:3180
-#: src/qemu/qemu_driver.c:3236 src/qemu/qemu_driver.c:3295
-#: src/qemu/qemu_driver.c:3336 src/qemu/qemu_driver.c:3388
-#: src/qemu/qemu_driver.c:3415 src/qemu/qemu_driver.c:3440
-#: src/qemu/qemu_driver.c:3472 src/qemu/qemu_driver.c:3529
-#: src/qemu/qemu_driver.c:3661 src/qemu/qemu_driver.c:3826
-#: src/qemu/qemu_driver.c:3956 src/qemu/qemu_driver.c:4023
-#: src/qemu/qemu_driver.c:4088 src/qemu/qemu_driver.c:4172
-#: src/qemu/qemu_driver.c:4207 src/qemu/qemu_driver.c:4466
-#: src/qemu/qemu_driver.c:4701 src/qemu/qemu_driver.c:4907
-#: src/qemu/qemu_driver.c:5414 src/qemu/qemu_driver.c:5808
-#: src/qemu/qemu_driver.c:5873 src/qemu/qemu_driver.c:5900
-#: src/qemu/qemu_driver.c:6131 src/qemu/qemu_driver.c:6202
-#: src/qemu/qemu_driver.c:6260 src/qemu/qemu_driver.c:6299
-#: src/qemu/qemu_driver.c:6372 src/qemu/qemu_driver.c:7569
-#: src/uml/uml_driver.c:1402 src/uml/uml_driver.c:1427
-#: src/uml/uml_driver.c:1460
-#, c-format
-msgid "no domain with matching uuid '%s'"
+#: src/lxc/lxc_driver.c:2851 src/qemu/qemu_driver.c:6980
+msgid "unable to set cpu shares tunable"
 msgstr ""
 
-#: src/opennebula/one_driver.c:577 src/qemu/qemu_driver.c:3188
-#: src/qemu/qemu_driver.c:3245 src/qemu/qemu_driver.c:3304
-#: src/qemu/qemu_driver.c:3345 src/qemu/qemu_driver.c:3670
-#: src/qemu/qemu_driver.c:3835 src/qemu/qemu_driver.c:6140
-#: src/qemu/qemu_driver.c:6208 src/qemu/qemu_driver.c:6271
-#: src/qemu/qemu_driver.c:6387 src/qemu/qemu_driver.c:7578
-#: src/xen/xen_hypervisor.c:1097 src/xen/xen_hypervisor.c:1181
-#: src/xen/xen_hypervisor.c:1290
-msgid "domain is not running"
+#: src/lxc/lxc_driver.c:2864 src/qemu/qemu_driver.c:6993
+msgid "invalid type for vcpu_period tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3076 src/uml/uml_driver.c:2430
+#: src/lxc/lxc_driver.c:2884 src/qemu/qemu_driver.c:7013
+msgid "invalid type for vcpu_quota tunable, expected a 'llong'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:2903 src/qemu/qemu_driver.c:7032
 #, c-format
-msgid "cannot find console device '%s'"
+msgid "Invalid parameter `%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3077 src/uml/uml_driver.c:2431
-msgid "default"
+#: src/lxc/lxc_driver.c:2990 src/qemu/qemu_driver.c:7190
+msgid "cannot query persistent config of a transient domain"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3000 src/qemu/qemu_driver.c:7200
+msgid "can't get persistentDef"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3039 src/qemu/qemu_driver.c:7239
+msgid "unable to get cpu shares tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3083 src/qemu/qemu_driver.c:10551
-#: src/uml/uml_driver.c:2437 src/xen/xen_driver.c:2152
+#: src/lxc/lxc_driver.c:3054 src/lxc/lxc_driver.c:3068
+#: src/lxc/lxc_driver.c:3081 src/lxc/lxc_driver.c:3339
+#: src/lxc/lxc_driver.c:3362 src/libxl/libxl_driver.c:3646
+#: src/libxl/libxl_driver.c:3657 src/qemu/qemu_driver.c:6305
+#: src/qemu/qemu_driver.c:6344 src/qemu/qemu_driver.c:6366
+#: src/qemu/qemu_driver.c:6406 src/qemu/qemu_driver.c:6677
+#: src/qemu/qemu_driver.c:6687 src/qemu/qemu_driver.c:6697
+#: src/qemu/qemu_driver.c:6731 src/qemu/qemu_driver.c:6747
+#: src/qemu/qemu_driver.c:6763 src/qemu/qemu_driver.c:7254
+#: src/qemu/qemu_driver.c:7268 src/qemu/qemu_driver.c:7281
+#: src/qemu/qemu_driver.c:7579 src/qemu/qemu_driver.c:7593
+#: src/qemu/qemu_driver.c:7607 src/qemu/qemu_driver.c:7621
+#: src/qemu/qemu_driver.c:7635 src/qemu/qemu_driver.c:7649
+#: src/qemu/qemu_driver.c:7663 src/qemu/qemu_driver.c:7677
+#: src/qemu/qemu_driver.c:11362 src/qemu/qemu_driver.c:11373
+#: src/qemu/qemu_driver.c:11384 src/qemu/qemu_driver.c:11395
+#: src/qemu/qemu_driver.c:11406 src/qemu/qemu_driver.c:11417
+#: src/test/test_driver.c:2726
 #, c-format
-msgid "character device %s is not using a PTY"
+msgid "Field name '%s' too long"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3152 src/lxc/lxc_driver.c:3301
+#: src/qemu/qemu_driver.c:6048 src/qemu/qemu_driver.c:6267
+msgid "blkio cgroup isn't mounted"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3182 src/lxc/lxc_driver.c:3216
+#: src/qemu/qemu_driver.c:6078 src/qemu/qemu_driver.c:6155
+msgid "invalid type for blkio weight tunable, expected a 'unsigned int'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3189 src/lxc/lxc_driver.c:3223
+#: src/qemu/qemu_driver.c:6085 src/qemu/qemu_driver.c:6162
+msgid "out of blkio weight range."
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3197 src/qemu/qemu_driver.c:6093
+msgid "unable to set blkio weight tunable"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3334 src/qemu/qemu_driver.c:6300
+msgid "unable to get blkio weight"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3432
+#, c-format
+msgid "Invalid path, '%s' is not a known interface"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3497
+msgid "Cannot set autostart for transient domain"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3520
+#, c-format
+msgid "Cannot create autostart directory %s"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3527 src/libxl/libxl_driver.c:3503
+#: src/qemu/qemu_driver.c:5796 src/uml/uml_driver.c:2275
+#, c-format
+msgid "Failed to create symlink '%s to '%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3534 src/libxl/libxl_driver.c:3510
+#: src/network/bridge_driver.c:2608 src/qemu/qemu_driver.c:5803
+#: src/storage/storage_driver.c:1063 src/uml/uml_driver.c:2282
+#, c-format
+msgid "Failed to delete symlink '%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3672
+msgid "Suspend operation failed"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3737
+msgid "Resume operation failed"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3781 src/libxl/libxl_driver.c:2801
+#: src/qemu/qemu_driver.c:1144 src/qemu/qemu_driver.c:1196
+#: src/qemu/qemu_driver.c:1220 src/qemu/qemu_driver.c:1244
+#: src/qemu/qemu_driver.c:1396 src/qemu/qemu_driver.c:1463
+#: src/qemu/qemu_driver.c:1520 src/qemu/qemu_driver.c:1567
+#: src/qemu/qemu_driver.c:1629 src/qemu/qemu_driver.c:1690
+#: src/qemu/qemu_driver.c:1757 src/qemu/qemu_driver.c:1784
+#: src/qemu/qemu_driver.c:1816 src/qemu/qemu_driver.c:1945
+#: src/qemu/qemu_driver.c:2022 src/qemu/qemu_driver.c:2068
+#: src/qemu/qemu_driver.c:2155 src/qemu/qemu_driver.c:2188
+#: src/qemu/qemu_driver.c:2690 src/qemu/qemu_driver.c:2749
+#: src/qemu/qemu_driver.c:2800 src/qemu/qemu_driver.c:2834
+#: src/qemu/qemu_driver.c:2958 src/qemu/qemu_driver.c:3295
+#: src/qemu/qemu_driver.c:3433 src/qemu/qemu_driver.c:3588
+#: src/qemu/qemu_driver.c:3686 src/qemu/qemu_driver.c:3777
+#: src/qemu/qemu_driver.c:3841 src/qemu/qemu_driver.c:4421
+#: src/qemu/qemu_driver.c:4748 src/qemu/qemu_driver.c:4966
+#: src/qemu/qemu_driver.c:5574 src/qemu/qemu_driver.c:5741
+#: src/qemu/qemu_driver.c:5768 src/qemu/qemu_driver.c:7422
+#: src/qemu/qemu_driver.c:7507 src/qemu/qemu_driver.c:7720
+#: src/qemu/qemu_driver.c:7782 src/qemu/qemu_driver.c:7830
+#: src/qemu/qemu_driver.c:7898 src/qemu/qemu_driver.c:7995
+#: src/qemu/qemu_driver.c:8357 src/qemu/qemu_driver.c:8446
+#: src/qemu/qemu_driver.c:8627 src/qemu/qemu_driver.c:8698
+#: src/qemu/qemu_driver.c:8916 src/qemu/qemu_driver.c:8966
+#: src/qemu/qemu_driver.c:9028 src/qemu/qemu_driver.c:9084
+#: src/qemu/qemu_driver.c:9141 src/qemu/qemu_driver.c:9618
+#: src/qemu/qemu_driver.c:9868 src/qemu/qemu_driver.c:9899
+#: src/qemu/qemu_driver.c:9937 src/qemu/qemu_driver.c:9977
+#: src/qemu/qemu_driver.c:10019 src/qemu/qemu_driver.c:10054
+#: src/qemu/qemu_driver.c:10084 src/qemu/qemu_driver.c:10127
+#: src/qemu/qemu_driver.c:10162 src/qemu/qemu_driver.c:10232
+#: src/qemu/qemu_driver.c:10593 src/qemu/qemu_driver.c:10710
+#: src/qemu/qemu_driver.c:10858 src/qemu/qemu_driver.c:10964
+#: src/qemu/qemu_driver.c:11064 src/qemu/qemu_driver.c:11142
+#: src/qemu/qemu_driver.c:11293 src/test/test_driver.c:2119
+#: src/uml/uml_driver.c:1637 src/uml/uml_driver.c:1662
+#: src/uml/uml_driver.c:1695 src/uml/uml_driver.c:2038
+#: src/uml/uml_driver.c:2156 src/uml/uml_driver.c:2389
+#: src/vmware/vmware_driver.c:638
+#, c-format
+msgid "no domain with matching uuid '%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3808 src/uml/uml_driver.c:2416
+#, c-format
+msgid "cannot find console device '%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3809 src/uml/uml_driver.c:2417
+msgid "default"
 msgstr ""
 
-#: src/lxc/veth.c:231
+#: src/lxc/lxc_driver.c:3815 src/qemu/qemu_driver.c:10898
+#: src/uml/uml_driver.c:2423 src/xen/xen_driver.c:2160
 #, c-format
-msgid "Failed to enable '%s'"
+msgid "character device %s is not using a PTY"
 msgstr ""
 
-#: tools/virsh.c:354
+#: src/libxl/libxl_driver.c:173 src/qemu/qemu_driver.c:160
+#: src/qemu/qemu_driver.c:168 src/qemu/qemu_hostdev.c:382
+#: src/qemu/qemu_hostdev.c:401 src/qemu/qemu_hostdev.c:429
+#: src/secret/secret_driver.c:505 src/uml/uml_driver.c:169
+#: src/xenapi/xenapi_utils.c:282 tools/virsh.c:530
 msgid "unknown error"
 msgstr ""
 
@@ -6411,7 +6993,7 @@
 msgid "machine type %s too big for destination"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4308
+#: src/libxl/libxl_driver.c:245
 msgid "cannot read domain image"
 msgstr ""
 
@@ -6419,21 +7001,21 @@
 msgid "failed to read libxl header"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4320
+#: src/libxl/libxl_driver.c:256 src/qemu/qemu_driver.c:3965
 msgid "image magic is incorrect"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4326
+#: src/libxl/libxl_driver.c:262 src/qemu/qemu_driver.c:3991
 #, c-format
 msgid "image version is not supported (%d > %d)"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:269 src/qemu/qemu_driver.c:3999
+#: src/libxl/libxl_driver.c:269 src/qemu/qemu_driver.c:3998
 #, c-format
 msgid "invalid XML length: %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4338
+#: src/libxl/libxl_driver.c:279 src/qemu/qemu_driver.c:4009
 msgid "failed to read XML"
 msgstr ""
 
@@ -6447,7 +7029,7 @@
 msgid "Failed to pin vcpu '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:660 src/qemu/qemu_driver.c:4381
+#: src/libxl/libxl_driver.c:660 src/qemu/qemu_driver.c:4380
 #, c-format
 msgid ""
 "cannot restore domain '%s' uuid %s from a file which belongs to domain '%s' "
@@ -6478,24 +7060,24 @@
 msgid "Failed to create log dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:926 src/qemu/qemu_driver.c:509
+#: src/libxl/libxl_driver.c:926 src/qemu/qemu_driver.c:512
 #, c-format
 msgid "Failed to create state dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:932 src/qemu/qemu_driver.c:515
+#: src/libxl/libxl_driver.c:932 src/qemu/qemu_driver.c:518
 #, c-format
 msgid "Failed to create lib dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:938 src/qemu/qemu_driver.c:527
-#: src/qemu/qemu_driver.c:533
+#: src/libxl/libxl_driver.c:938 src/qemu/qemu_driver.c:530
+#: src/qemu/qemu_driver.c:536
 #, c-format
 msgid "Failed to create save dir '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:511 src/qemu/qemu_driver.c:543
-#: src/uml/uml_driver.c:859
+#: src/libxl/libxl_driver.c:949 src/qemu/qemu_domain.c:1218
+#: src/uml/uml_driver.c:1019
 #, c-format
 msgid "failed to create logfile %s"
 msgstr ""
@@ -6508,7 +7090,7 @@
 msgid "libxenlight state driver is not active"
 msgstr ""
 
-#: src/xen/xen_driver.c:265
+#: src/libxl/libxl_driver.c:1101 src/xen/xen_driver.c:289
 #, c-format
 msgid "unexpected Xen URI path '%s', try xen:///"
 msgstr ""
@@ -6539,16 +7121,30 @@
 msgid "Failed to destroy domain '%d'"
 msgstr ""
 
-#: src/opennebula/one_driver.c:283 src/opennebula/one_driver.c:314
-#: src/opennebula/one_driver.c:389 src/openvz/openvz_driver.c:395
-#: src/openvz/openvz_driver.c:478 src/openvz/openvz_driver.c:522
-#: src/openvz/openvz_driver.c:559 src/openvz/openvz_driver.c:1015
-#: src/openvz/openvz_driver.c:1057 src/openvz/openvz_driver.c:1088
-#: src/openvz/openvz_driver.c:1161 src/uml/uml_driver.c:1374
-#: src/uml/uml_driver.c:1497 src/uml/uml_driver.c:1537
-#: src/uml/uml_driver.c:1587 src/uml/uml_driver.c:1652
-#: src/uml/uml_driver.c:1696 src/uml/uml_driver.c:1722
-#: src/uml/uml_driver.c:1796
+#: src/libxl/libxl_driver.c:1625 src/libxl/libxl_driver.c:1656
+#: src/libxl/libxl_driver.c:1776 src/libxl/libxl_driver.c:1823
+#: src/libxl/libxl_driver.c:2264 src/libxl/libxl_driver.c:2383
+#: src/libxl/libxl_driver.c:2440 src/libxl/libxl_driver.c:2496
+#: src/libxl/libxl_driver.c:2560 src/libxl/libxl_driver.c:3240
+#: src/libxl/libxl_driver.c:3543 src/libxl/libxl_driver.c:3610
+#: src/libxl/libxl_driver.c:3701 src/openvz/openvz_driver.c:351
+#: src/openvz/openvz_driver.c:399 src/openvz/openvz_driver.c:473
+#: src/openvz/openvz_driver.c:517 src/openvz/openvz_driver.c:555
+#: src/openvz/openvz_driver.c:598 src/openvz/openvz_driver.c:649
+#: src/openvz/openvz_driver.c:1126 src/openvz/openvz_driver.c:1175
+#: src/openvz/openvz_driver.c:1205 src/openvz/openvz_driver.c:1298
+#: src/uml/uml_driver.c:1609 src/uml/uml_driver.c:1732
+#: src/uml/uml_driver.c:1778 src/uml/uml_driver.c:1807
+#: src/uml/uml_driver.c:1859 src/uml/uml_driver.c:1938
+#: src/uml/uml_driver.c:2221 src/uml/uml_driver.c:2247
+#: src/uml/uml_driver.c:2322 src/vbox/vbox_tmpl.c:2031
+#: src/vbox/vbox_tmpl.c:2091 src/vbox/vbox_tmpl.c:5261
+#: src/vbox/vbox_tmpl.c:5355 src/vbox/vbox_tmpl.c:5592
+#: src/vbox/vbox_tmpl.c:8657 src/vbox/vbox_tmpl.c:9022
+#: src/vmware/vmware_driver.c:330 src/vmware/vmware_driver.c:387
+#: src/vmware/vmware_driver.c:436 src/vmware/vmware_driver.c:480
+#: src/vmware/vmware_driver.c:835 src/vmware/vmware_driver.c:913
+#: src/vmware/vmware_driver.c:948
 msgid "no domain with matching uuid"
 msgstr ""
 
@@ -6556,20 +7152,13 @@
 msgid "cannot set memory on an inactive domain"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:1684 src/libxl/libxl_driver.c:2276
-#: src/qemu/qemu_driver.c:1841 src/qemu/qemu_driver.c:3322
-#: src/qemu/qemu_driver.c:3458 src/qemu/qemu_driver.c:5946
-#: src/qemu/qemu_driver.c:6093 src/qemu/qemu_driver.c:6225
-#: src/qemu/qemu_driver.c:6383 src/qemu/qemu_driver.c:6667
-msgid "cannot change persistent config of a transient domain"
-msgstr ""
-
 #: src/libxl/libxl_driver.c:1698
 #, c-format
 msgid "Failed to set maximum memory for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3478 src/uml/uml_driver.c:1472
+#: src/libxl/libxl_driver.c:1719 src/qemu/qemu_driver.c:1879
+#: src/uml/uml_driver.c:1707
 msgid "cannot set memory higher than max memory"
 msgstr ""
 
@@ -6611,8 +7200,8 @@
 msgstr ""
 
 #: src/libxl/libxl_driver.c:1928 src/libxl/libxl_driver.c:1977
-#: src/test/test_driver.c:1742 src/test/test_driver.c:1855
-#: src/xen/xen_driver.c:1043 src/xen/xen_driver.c:1067
+#: src/test/test_driver.c:1747 src/test/test_driver.c:1860
+#: src/xen/xen_driver.c:1051 src/xen/xen_driver.c:1075
 msgid "xml modification unsupported"
 msgstr ""
 
@@ -6631,13 +7220,13 @@
 msgid "After dumping core, failed to resume domain '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2137 src/qemu/qemu_driver.c:2754
+#: src/libxl/libxl_driver.c:2137 src/qemu/qemu_driver.c:2760
 msgid "cannot do managed save for transient domain"
 msgstr ""
 
 #: src/libxl/libxl_driver.c:2250 src/libxl/libxl_driver.c:2397
-#: src/qemu/qemu_driver.c:3792 src/test/test_driver.c:2128
-#: src/test/test_driver.c:2184 src/xen/xen_driver.c:1109
+#: src/qemu/qemu_driver.c:3791 src/test/test_driver.c:2133
+#: src/test/test_driver.c:2189 src/xen/xen_driver.c:1117
 #, c-format
 msgid "invalid flag combination: (0x%x)"
 msgstr ""
@@ -6650,11 +7239,13 @@
 msgid "cannot set vcpus on an inactive domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3978
+#: src/libxl/libxl_driver.c:2282 src/qemu/qemu_driver.c:3341
+#: src/xen/xend_internal.c:2220 src/xen/xm_internal.c:731
 msgid "could not determine max vcpus for the domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3984
+#: src/libxl/libxl_driver.c:2292 src/qemu/qemu_driver.c:3351
+#: src/xen/xend_internal.c:2225 src/xen/xm_internal.c:740
 #, c-format
 msgid ""
 "requested vcpus is greater than max allowable vcpus for the domain: %d > %d"
@@ -6665,12 +7256,12 @@
 msgid "Failed to set vcpus for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2411 src/qemu/qemu_driver.c:3806
-#: src/test/test_driver.c:2144
+#: src/libxl/libxl_driver.c:2411 src/qemu/qemu_driver.c:3805
+#: src/qemu/qemu_driver.c:11340 src/test/test_driver.c:2149
 msgid "domain is transient"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4029 src/test/test_driver.c:2191
+#: src/libxl/libxl_driver.c:2446 src/test/test_driver.c:2378
 msgid "cannot pin vcpus on an inactive domain"
 msgstr ""
 
@@ -6683,8 +7274,9 @@
 msgid "Failed to list vcpus for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4516 src/qemu/qemu_driver.c:4554
-#: src/xen/xen_driver.c:1182 src/xen/xen_driver.c:1221
+#: src/libxl/libxl_driver.c:2587 src/libxl/libxl_driver.c:2630
+#: src/qemu/qemu_driver.c:4482 src/qemu/qemu_driver.c:4526
+#: src/xen/xen_driver.c:1274 src/xen/xen_driver.c:1323
 #, c-format
 msgid "unsupported config type %s"
 msgstr ""
@@ -6697,21 +7289,21 @@
 msgid "parsing xm config failed"
 msgstr ""
 
-#: src/opennebula/one_driver.c:289 src/qemu/qemu_driver.c:4919
-#: src/uml/uml_driver.c:1664
+#: src/libxl/libxl_driver.c:2807 src/qemu/qemu_driver.c:4972
+#: src/uml/uml_driver.c:1944 src/vmware/vmware_driver.c:644
 msgid "cannot undefine transient domain"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2819 src/qemu/qemu_driver.c:4998
+#: src/libxl/libxl_driver.c:2819 src/qemu/qemu_driver.c:4997
 msgid "Failed to remove domain managed save image"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2824 src/qemu/qemu_driver.c:5004
-#: tools/virsh.c:2033
+#: src/libxl/libxl_driver.c:2824 src/qemu/qemu_driver.c:5003
+#: tools/virsh.c:2045
 msgid "Refusing to undefine while domain managed save image exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5016
+#: src/libxl/libxl_driver.c:2882 src/qemu/qemu_hotplug.c:67
 #, c-format
 msgid "No device with bus '%s' and target '%s'"
 msgstr ""
@@ -6726,12 +7318,15 @@
 msgid "libxenlight failed to change media for disk '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5087 src/qemu/qemu_driver.c:5123
+#: src/libxl/libxl_driver.c:2934 src/qemu/qemu_hotplug.c:203
+#: src/qemu/qemu_hotplug.c:433 src/qemu/qemu_hotplug.c:556
+#: src/uml/uml_driver.c:1984
 #, c-format
 msgid "target %s already exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5130
+#: src/libxl/libxl_driver.c:2940 src/qemu/qemu_hotplug.c:574
+#: src/uml/uml_driver.c:1991
 msgid "disk source path is missing"
 msgstr ""
 
@@ -6740,17 +7335,19 @@
 msgid "libxenlight failed to attach disk '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5482
+#: src/libxl/libxl_driver.c:2964 src/qemu/qemu_driver.c:5089
+#: src/uml/uml_driver.c:2061
 #, c-format
 msgid "disk bus '%s' cannot be hotplugged."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5490
+#: src/libxl/libxl_driver.c:2970 src/qemu/qemu_driver.c:5094
 #, c-format
 msgid "disk device type '%s' cannot be hotplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5549
+#: src/libxl/libxl_driver.c:2997 src/qemu/qemu_hotplug.c:1505
+#: src/qemu/qemu_hotplug.c:1608 src/uml/uml_driver.c:2115
 #, c-format
 msgid "disk %s not found"
 msgstr ""
@@ -6770,74 +7367,75 @@
 msgid "device type '%s' cannot hot unplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5504
+#: src/libxl/libxl_driver.c:3049 src/qemu/qemu_driver.c:5184
+#: src/uml/uml_driver.c:2066
 #, c-format
 msgid "device type '%s' cannot be attached"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3067 src/qemu/qemu_driver.c:5364
+#: src/libxl/libxl_driver.c:3067 src/qemu/qemu_driver.c:5363
 #, c-format
 msgid "target %s already exists."
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3080 src/qemu/qemu_driver.c:5415
+#: src/libxl/libxl_driver.c:3080 src/qemu/qemu_driver.c:5414
 msgid "persistent attach of device is not supported"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3099 src/qemu/qemu_driver.c:5215
-#: src/xen/xm_internal.c:1548
+#: src/libxl/libxl_driver.c:3099 src/xen/xm_internal.c:1547
 #, c-format
 msgid "device type '%s' cannot be detached"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3118 src/qemu/qemu_driver.c:5435
+#: src/libxl/libxl_driver.c:3118 src/qemu/qemu_driver.c:5434
 #, c-format
 msgid "no target device %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3125 src/qemu/qemu_driver.c:5464
+#: src/libxl/libxl_driver.c:3125 src/qemu/qemu_driver.c:5463
 msgid "persistent detach of device is not supported"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3150 src/qemu/qemu_driver.c:5306
+#: src/libxl/libxl_driver.c:3150 src/qemu/qemu_driver.c:5305
 #, c-format
 msgid "disk bus '%s' cannot be updated."
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3157 src/qemu/qemu_driver.c:5343
+#: src/libxl/libxl_driver.c:3157 src/qemu/qemu_driver.c:5342
 #, c-format
 msgid "device type '%s' cannot be updated"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3178 src/qemu/qemu_driver.c:5484
+#: src/libxl/libxl_driver.c:3178 src/qemu/qemu_driver.c:5483
 #, c-format
 msgid "target %s doesn't exist."
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3184 src/qemu/qemu_driver.c:5491
+#: src/libxl/libxl_driver.c:3184 src/qemu/qemu_driver.c:5490
 msgid "this disk doesn't support update"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3205 src/qemu/qemu_driver.c:5536
+#: src/libxl/libxl_driver.c:3205 src/qemu/qemu_driver.c:5535
 msgid "persistent update of device is not supported"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3260 src/qemu/qemu_driver.c:5600
+#: src/libxl/libxl_driver.c:3260 src/qemu/qemu_driver.c:5599
 msgid "cannot modify device on transient domain"
 msgstr ""
 
 #: src/libxl/libxl_driver.c:3290 src/libxl/libxl_driver.c:3314
-#: src/qemu/qemu_driver.c:5626 src/qemu/qemu_driver.c:5656
+#: src/qemu/qemu_driver.c:5625 src/qemu/qemu_driver.c:5655
 #, c-format
 msgid "unknown domain modify action %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5906 src/uml/uml_driver.c:1728
+#: src/libxl/libxl_driver.c:3481 src/qemu/qemu_driver.c:5774
+#: src/uml/uml_driver.c:2253
 msgid "cannot set autostart for transient domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5923 src/storage/storage_driver.c:1021
-#: src/uml/uml_driver.c:1745
+#: src/libxl/libxl_driver.c:3496 src/qemu/qemu_driver.c:5789
+#: src/storage/storage_driver.c:1048 src/uml/uml_driver.c:2268
 #, c-format
 msgid "cannot create autostart directory %s"
 msgstr ""
@@ -6857,21 +7455,6 @@
 msgid "Failed to get scheduler parameters for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3646 src/libxl/libxl_driver.c:3657
-#: src/qemu/qemu_driver.c:6117 src/qemu/qemu_driver.c:6140
-#: src/qemu/qemu_driver.c:6408 src/qemu/qemu_driver.c:6418
-#: src/qemu/qemu_driver.c:6428 src/qemu/qemu_driver.c:6462
-#: src/qemu/qemu_driver.c:6478 src/qemu/qemu_driver.c:6494
-#: src/qemu/qemu_driver.c:6988 src/qemu/qemu_driver.c:7002
-#: src/qemu/qemu_driver.c:7015 src/qemu/qemu_driver.c:7232
-#: src/qemu/qemu_driver.c:7246 src/qemu/qemu_driver.c:7260
-#: src/qemu/qemu_driver.c:7274 src/qemu/qemu_driver.c:7288
-#: src/qemu/qemu_driver.c:7302 src/qemu/qemu_driver.c:7316
-#: src/qemu/qemu_driver.c:7330 src/test/test_driver.c:2721
-#, c-format
-msgid "Field name '%s' too long"
-msgstr ""
-
 #: src/libxl/libxl_driver.c:3738
 msgid "invalid type for weight tunable, expected a 'uint'"
 msgstr ""
@@ -6908,11 +7491,11 @@
 msgid "libxenlight does not support transient disks"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2395
+#: src/libxl/libxl_conf.c:693 src/qemu/qemu_process.c:2974
 msgid "Unable to find an unused VNC port"
 msgstr ""
 
-#: src/xen/xend_internal.c:5287
+#: src/libxl/libxl_conf.c:775 src/xenxs/xen_sxpr.c:1564
 msgid "unexpected chr device type"
 msgstr ""
 
@@ -6924,302 +7507,266 @@
 msgid "Failed to get version info from libxenlight"
 msgstr ""
 
-#: src/network/bridge_driver.c:246 src/qemu/qemu_conf.c:1404
-#: src/uml/uml_conf.c:114
-msgid "cannot initialize bridge support"
-msgstr ""
-
-#: src/network/bridge_driver.c:544 src/network/bridge_driver.c:550
+#: src/network/bridge_driver.c:688 src/network/bridge_driver.c:694
+#: src/network/bridge_driver.c:706 src/network/bridge_driver.c:773
+#: src/network/bridge_driver.c:779
 #, c-format
 msgid "cannot create directory %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:775
+#: src/network/bridge_driver.c:765
 #, c-format
 msgid "Cannot find %s - Possibly the package isn't installed"
 msgstr ""
 
-#: src/network/bridge_driver.c:821
+#: src/network/bridge_driver.c:811
 #, c-format
 msgid "bridge  '%s' has an invalid prefix"
 msgstr ""
 
-#: src/network/bridge_driver.c:857
+#: src/network/bridge_driver.c:847
 #, c-format
 msgid "couldn't write radvd config file '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:907 src/network/bridge_driver.c:1081
+#: src/network/bridge_driver.c:897 src/network/bridge_driver.c:1071
 #, c-format
 msgid "Invalid prefix or netmask for '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:603
+#: src/network/bridge_driver.c:909
 #, c-format
 msgid "failed to add iptables rule to allow forwarding from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:614
+#: src/network/bridge_driver.c:923
 #, c-format
 msgid "failed to add iptables rule to allow forwarding to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:969
+#: src/network/bridge_driver.c:959
 #, c-format
 msgid "failed to add iptables rule to enable masquerading to %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:970
+#: src/network/bridge_driver.c:960
 msgid "failed to add iptables rule to enable masquerading"
 msgstr ""
 
-#: src/network/bridge_driver.c:983
+#: src/network/bridge_driver.c:973
 #, c-format
 msgid "failed to add iptables rule to enable UDP masquerading to %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:984
+#: src/network/bridge_driver.c:974
 msgid "failed to add iptables rule to enable UDP masquerading"
 msgstr ""
 
-#: src/network/bridge_driver.c:997
+#: src/network/bridge_driver.c:987
 #, c-format
 msgid "failed to add iptables rule to enable TCP masquerading to %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:998
+#: src/network/bridge_driver.c:988
 msgid "failed to add iptables rule to enable TCP masquerading"
 msgstr ""
 
-#: src/network/bridge_driver.c:656
+#: src/network/bridge_driver.c:1083
 #, c-format
 msgid "failed to add iptables rule to allow routing from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:667
+#: src/network/bridge_driver.c:1095
 #, c-format
 msgid "failed to add iptables rule to allow routing to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1159
+#: src/network/bridge_driver.c:1149
 #, c-format
 msgid "failed to add ip6tables rule to block outbound traffic from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1167
+#: src/network/bridge_driver.c:1157
 #, c-format
 msgid "failed to add ip6tables rule to block inbound traffic to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1176
+#: src/network/bridge_driver.c:1166
 #, c-format
 msgid "failed to add ip6tables rule to allow cross bridge traffic on '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1185 src/network/bridge_driver.c:1193
+#: src/network/bridge_driver.c:1175 src/network/bridge_driver.c:1183
 #, c-format
 msgid "failed to add ip6tables rule to allow DNS requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:693 src/network/bridge_driver.c:700
+#: src/network/bridge_driver.c:1236 src/network/bridge_driver.c:1244
 #, c-format
 msgid "failed to add iptables rule to allow DHCP requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:708 src/network/bridge_driver.c:715
+#: src/network/bridge_driver.c:1267 src/network/bridge_driver.c:1275
 #, c-format
 msgid "failed to add iptables rule to allow DNS requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1295
+#: src/network/bridge_driver.c:1285
 #, c-format
 msgid "failed to add iptables rule to allow TFTP requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:725
+#: src/network/bridge_driver.c:1295
 #, c-format
 msgid "failed to add iptables rule to block outbound traffic from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:732
+#: src/network/bridge_driver.c:1303
 #, c-format
 msgid "failed to add iptables rule to block inbound traffic to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:740
+#: src/network/bridge_driver.c:1312
 #, c-format
 msgid "failed to add iptables rule to allow cross bridge traffic on '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1533
+#: src/network/bridge_driver.c:1523
 #, c-format
 msgid "cannot write to %s to disable IPv6 on bridge %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:871
+#: src/network/bridge_driver.c:1545 src/network/bridge_driver.c:1561
 #, c-format
 msgid "cannot disable %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:1664
+#: src/network/bridge_driver.c:1654
 #, c-format
 msgid "Network is already in use by interface %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:1686
+#: src/network/bridge_driver.c:1675
 #, c-format
 msgid "bridge '%s' has an invalid netmask or IP address"
 msgstr ""
 
-#: src/network/bridge_driver.c:1694
-#, c-format
-msgid "cannot set IP address on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:906
-#, c-format
-msgid "cannot create bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:1739
-#, c-format
-msgid "cannot create dummy tap device '%s' to set mac address on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:1751
-#, c-format
-msgid "cannot set forward delay on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:1759
-#, c-format
-msgid "cannot set STP '%s' on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:938
-#, c-format
-msgid "failed to bring the bridge '%s' up"
-msgstr ""
-
-#: src/network/bridge_driver.c:949
+#: src/network/bridge_driver.c:1765
 msgid "failed to enable IP forwarding"
 msgstr ""
 
-#: src/network/bridge_driver.c:900
+#: src/network/bridge_driver.c:1914
 msgid "network is already active"
 msgstr ""
 
-#: src/network/bridge_driver.c:1058 src/network/bridge_driver.c:1327
-#: src/network/bridge_driver.c:1365 src/network/bridge_driver.c:1388
-#: src/network/bridge_driver.c:1423 src/network/bridge_driver.c:1478
-#: src/network/bridge_driver.c:1503
+#: src/network/bridge_driver.c:2016 src/network/bridge_driver.c:2344
+#: src/network/bridge_driver.c:2431 src/network/bridge_driver.c:2454
+#: src/network/bridge_driver.c:2493 src/network/bridge_driver.c:2548
+#: src/network/bridge_driver.c:2573
 msgid "no network with matching uuid"
 msgstr ""
 
-#: src/network/bridge_driver.c:1081
+#: src/network/bridge_driver.c:2039 src/network/bridge_driver.c:2706
+#: src/network/bridge_driver.c:2920 src/network/bridge_driver.c:3021
+#: src/network/bridge_driver.c:3108
 #, c-format
 msgid "no network with matching name '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:2367
+#: src/network/bridge_driver.c:2289
 msgid ""
 "Multiple dhcp sections found. dhcp is supported only for a single IPv4 "
 "address on each network"
 msgstr ""
 
-#: src/network/bridge_driver.c:1333
+#: src/network/bridge_driver.c:2350
 msgid "network is still active"
 msgstr ""
 
-#: src/network/bridge_driver.c:1394
+#: src/network/bridge_driver.c:2460
 msgid "network is not active"
 msgstr ""
 
-#: src/network/bridge_driver.c:1446
+#: src/network/bridge_driver.c:2516
 msgid "no network with matching id"
 msgstr ""
 
-#: src/network/bridge_driver.c:1452 src/test/test_driver.c:3061
+#: src/network/bridge_driver.c:2522 src/test/test_driver.c:3291
 #, c-format
 msgid "network '%s' does not have a bridge name."
 msgstr ""
 
-#: src/network/bridge_driver.c:1509
+#: src/network/bridge_driver.c:2579
 msgid "cannot set autostart for transient network"
 msgstr ""
 
-#: src/network/bridge_driver.c:1524
+#: src/network/bridge_driver.c:2594
 #, c-format
 msgid "cannot create autostart directory '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1531 src/storage/storage_driver.c:1028
+#: src/network/bridge_driver.c:2601 src/storage/storage_driver.c:1055
 #, c-format
 msgid "Failed to create symlink '%s' to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:2887 src/network/bridge_driver.c:3000
-#: src/network/bridge_driver.c:3101
+#: src/network/bridge_driver.c:2822 src/network/bridge_driver.c:2935
+#: src/network/bridge_driver.c:3036
 #, c-format
 msgid ""
 "network '%s' uses a direct mode, but has no forward dev and no interface pool"
 msgstr ""
 
-#: src/network/bridge_driver.c:2925
+#: src/network/bridge_driver.c:2860
 #, c-format
 msgid ""
 "network '%s' requires exclusive access to interfaces, but none are available"
 msgstr ""
 
-#: src/network/bridge_driver.c:2993 src/network/bridge_driver.c:3094
+#: src/network/bridge_driver.c:2928 src/network/bridge_driver.c:3029
 msgid "the interface uses a direct mode, but has no source dev"
 msgstr ""
 
-#: src/network/bridge_driver.c:3018 src/network/bridge_driver.c:3117
+#: src/network/bridge_driver.c:2953 src/network/bridge_driver.c:3052
 #, c-format
 msgid "network '%s' doesn't have dev='%s' in use by domain"
 msgstr ""
 
-#: src/network/bridge_driver.c:3034
+#: src/network/bridge_driver.c:2969
 #, c-format
 msgid "network '%s' claims dev='%s' is already in use by a different domain"
 msgstr ""
 
-#: src/network/bridge_driver.c:3187
+#: src/network/bridge_driver.c:3122
 #, c-format
 msgid "network '%s' doesn't have an IPv4 address"
 msgstr ""
 
-#: src/network/bridge_driver.c:3209
+#: src/network/bridge_driver.c:3144
 #, c-format
 msgid "network '%s' has no associated interface or bridge"
 msgstr ""
 
-#: src/network/bridge_driver.c:3218
-#, c-format
-msgid "Failed to get IP address for '%s' (network '%s')"
-msgstr ""
-
-#: src/node_device/node_device_driver.c:101
+#: src/node_device/node_device_driver.c:88
 #, c-format
 msgid "cannot resolve driver link %s"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:280
-#: src/node_device/node_device_driver.c:309
-#: src/node_device/node_device_driver.c:344
-#: src/node_device/node_device_driver.c:375 src/test/test_driver.c:4811
-#: src/test/test_driver.c:4837 src/test/test_driver.c:4873
-#: src/test/test_driver.c:4904
+#: src/node_device/node_device_driver.c:275
+#: src/node_device/node_device_driver.c:305
+#: src/node_device/node_device_driver.c:341
+#: src/node_device/node_device_driver.c:372 src/test/test_driver.c:5181
+#: src/test/test_driver.c:5207 src/test/test_driver.c:5243
+#: src/test/test_driver.c:5274
 #, c-format
 msgid "no node device with matching name '%s'"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:320 src/test/test_driver.c:4848
+#: src/node_device/node_device_driver.c:316 src/test/test_driver.c:5218
 msgid "no parent for this device"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:421
+#: src/node_device/node_device_driver.c:418
 #, c-format
 msgid "Invalid vport operation (%d)"
 msgstr ""
@@ -7229,16 +7776,16 @@
 msgid "No vport operation path found for host%d"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:452
+#: src/node_device/node_device_driver.c:469
 #, c-format
 msgid "Write of '%s' to '%s' during vport create/delete failed"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:461
+#: src/node_device/node_device_driver.c:478
 msgid "Vport operation complete"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:474
+#: src/node_device/node_device_driver.c:491
 msgid "Could not get current time"
 msgstr ""
 
@@ -7270,13 +7817,13 @@
 msgid "libhal_get_all_devices failed"
 msgstr ""
 
-#: src/node_device/node_device_hal.c:801 src/qemu/qemu_migration.c:879
-#: src/qemu/qemu_migration.c:902 src/qemu/qemu_migration.c:908
+#: src/node_device/node_device_hal.c:801 src/qemu/qemu_migration.c:880
+#: src/qemu/qemu_migration.c:903 src/qemu/qemu_migration.c:909
 #, c-format
 msgid "%s: %s"
 msgstr ""
 
-#: src/node_device/node_device_linux_sysfs.c:57
+#: src/node_device/node_device_linux_sysfs.c:59
 #, c-format
 msgid "Failed to open WWN path '%s' for reading"
 msgstr ""
@@ -7291,6 +7838,11 @@
 msgid "Failed to read WWNN for host%d"
 msgstr ""
 
+#: src/node_device/node_device_linux_sysfs.c:155
+#, c-format
+msgid "Failed to read fabric WWN for host%d"
+msgstr ""
+
 #: src/node_device/node_device_udev.c:64
 #, c-format
 msgid "Failed to convert '%s' to unsigned long long"
@@ -7385,8 +7937,9 @@
 msgid "udev_monitor_new_from_netlink returned NULL"
 msgstr ""
 
-#: src/nodeinfo.c:159 src/uml/uml_driver.c:1821 src/util/pci.c:1082
-#: src/util/util.c:353
+#: src/nodeinfo.c:106 src/nodeinfo.c:152 src/nodeinfo.c:617 src/nodeinfo.c:652
+#: src/nodeinfo.c:716 src/uml/uml_driver.c:2344 src/util/command.c:265
+#: src/util/pci.c:1594
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -7401,11 +7954,11 @@
 msgid "could not convert '%s' to an integer"
 msgstr ""
 
-#: src/nodeinfo.c:82
+#: src/nodeinfo.c:230
 msgid "parsing cpuinfo processor"
 msgstr ""
 
-#: src/nodeinfo.c:94
+#: src/nodeinfo.c:245 src/nodeinfo.c:277
 msgid "parsing cpuinfo cpu MHz"
 msgstr ""
 
@@ -7419,7 +7972,7 @@
 msgid "parsing number of processors %c"
 msgstr ""
 
-#: src/nodeinfo.c:121
+#: src/nodeinfo.c:314
 msgid "no cpus found"
 msgstr ""
 
@@ -7441,7 +7994,8 @@
 msgid "no threads found"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1975 src/qemu/qemu_driver.c:6066
+#: src/nodeinfo.c:417 src/xen/xen_hypervisor.c:1270
+#: src/xen/xend_internal.c:3609
 msgid "Invalid parameter count"
 msgstr ""
 
@@ -7469,7 +8023,7 @@
 msgid "no available memory line found"
 msgstr ""
 
-#: src/nodeinfo.c:175
+#: src/nodeinfo.c:633
 msgid "node info not implemented on this platform"
 msgstr ""
 
@@ -7477,7 +8031,7 @@
 msgid "node CPU stats not implemented on this platform"
 msgstr ""
 
-#: src/nodeinfo.c:257 src/nodeinfo.c:294
+#: src/nodeinfo.c:692 src/nodeinfo.c:822 src/nodeinfo.c:860
 msgid "NUMA not supported on this host"
 msgstr ""
 
@@ -7489,7 +8043,7 @@
 msgid "node memory stats not implemented on this platform"
 msgstr ""
 
-#: src/nodeinfo.c:263
+#: src/nodeinfo.c:828
 #, c-format
 msgid "start cell %d out of range (0-%d)"
 msgstr ""
@@ -7499,11 +8053,11 @@
 msgid "Failed to query NUMA free memory for node: %d"
 msgstr ""
 
-#: src/nodeinfo.c:275 src/nodeinfo.c:302
+#: src/nodeinfo.c:868
 msgid "Failed to query NUMA free memory"
 msgstr ""
 
-#: src/nodeinfo.c:323 src/nodeinfo.c:330
+#: src/nodeinfo.c:889 src/nodeinfo.c:896
 msgid "NUMA memory information not available on this platform"
 msgstr ""
 
@@ -7521,137 +8075,129 @@
 msgid "nwfilter is in use"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:163
-#, c-format
-msgid "cannot find value for '%s'"
-msgstr ""
-
-#: src/nwfilter/nwfilter_ebiptables_driver.c:170
+#: src/nwfilter/nwfilter_ebiptables_driver.c:241
 #, c-format
 msgid "Buffer to small to print MAC address '%s' into"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:204
+#: src/nwfilter/nwfilter_ebiptables_driver.c:275
 msgid "buffer too small for IP address"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:218
+#: src/nwfilter/nwfilter_ebiptables_driver.c:289
 msgid "buffer too small for IPv6 address"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:229
+#: src/nwfilter/nwfilter_ebiptables_driver.c:300
 msgid "Buffer too small for MAC address"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:241
-#: src/nwfilter/nwfilter_ebiptables_driver.c:261
+#: src/nwfilter/nwfilter_ebiptables_driver.c:312
+#: src/nwfilter/nwfilter_ebiptables_driver.c:342
 msgid "Buffer too small for uint8 type"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:251
+#: src/nwfilter/nwfilter_ebiptables_driver.c:322
+msgid "Buffer too small for uint32 type"
+msgstr ""
+
+#: src/nwfilter/nwfilter_ebiptables_driver.c:332
 msgid "Buffer too small for uint16 type"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:268
+#: src/nwfilter/nwfilter_ebiptables_driver.c:349
 #, c-format
 msgid "Unhandled datatype %x"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:1172
+#: src/nwfilter/nwfilter_ebiptables_driver.c:1224
 #, c-format
 msgid "cannot create rule since %s tool is missing."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:1897
+#: src/nwfilter/nwfilter_ebiptables_driver.c:1942
 msgid "cannot create rule since ebtables tool is missing."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2448
-msgid "illegal protocol type"
-msgstr ""
-
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2513
-msgid "cannot create temporary file"
-msgstr ""
-
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2520
-msgid "cannot change permissions on temp. file"
+#: src/nwfilter/nwfilter_ebiptables_driver.c:2043
+#, c-format
+msgid ""
+"STP filtering in %s direction with source MAC address set is not supported"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2529
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2538
-msgid "cannot write string to file"
+#: src/nwfilter/nwfilter_ebiptables_driver.c:2598
+msgid "illegal protocol type"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2994
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3086
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3197
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3112
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3208
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3323
 msgid "cannot create rules since ebtables tool is missing."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3052
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3170
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3241
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3171
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3297
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3369
 msgid "Some rules could not be created."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3310
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3474
 #, c-format
 msgid "To enable ip%stables filtering for the VM do 'echo 1 > %s'"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3514
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3796
 #, c-format
-msgid "Some rules could not be created for interface %s."
+msgid "Some rules could not be created for interface %s%s%s"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3634
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3936
 msgid "error while executing CLI commands"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3769
+#: src/nwfilter/nwfilter_ebiptables_driver.c:4077
 msgid "essential tools to support ip(6)tables firewalls could not be located"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3778
+#: src/nwfilter/nwfilter_ebiptables_driver.c:4086
 msgid "firewall tools were not found or cannot be used"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:155
+#: src/nwfilter/nwfilter_gentech_driver.c:160
 msgid "Could not add variable 'MAC' to hashmap"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:165
+#: src/nwfilter/nwfilter_gentech_driver.c:174
 msgid "Could not add variable 'IP' to hashmap"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:422
-#: src/nwfilter/nwfilter_gentech_driver.c:513
-#: src/nwfilter/nwfilter_gentech_driver.c:805
+#: src/nwfilter/nwfilter_gentech_driver.c:426
+#: src/nwfilter/nwfilter_gentech_driver.c:523
+#: src/nwfilter/nwfilter_gentech_driver.c:810
 #, c-format
 msgid "Filter '%s' is in use."
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:471
-#: src/nwfilter/nwfilter_gentech_driver.c:557
+#: src/nwfilter/nwfilter_gentech_driver.c:474
+#: src/nwfilter/nwfilter_gentech_driver.c:566
 #, c-format
 msgid "referenced filter '%s' is missing"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:744
+#: src/nwfilter/nwfilter_gentech_driver.c:750
 #, c-format
 msgid "Cannot instantiate filter due to unresolvable variables: %s"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:787
-#: src/nwfilter/nwfilter_gentech_driver.c:1017
-#: src/nwfilter/nwfilter_gentech_driver.c:1043
-#: src/nwfilter/nwfilter_gentech_driver.c:1067
+#: src/nwfilter/nwfilter_gentech_driver.c:792
+#: src/nwfilter/nwfilter_gentech_driver.c:1012
+#: src/nwfilter/nwfilter_gentech_driver.c:1038
+#: src/nwfilter/nwfilter_gentech_driver.c:1063
 #, c-format
 msgid "Could not get access to ACL tech driver '%s'"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:798
+#: src/nwfilter/nwfilter_gentech_driver.c:803
 #, c-format
 msgid "Could not find filter '%s'"
 msgstr ""
@@ -7665,34 +8211,39 @@
 msgid "interface name %s does not fit into buffer "
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:651
+#: src/nwfilter/nwfilter_learnipaddr.c:706
+#, c-format
+msgid "Failed to add IP address %s to IP address cache for interface %s"
+msgstr ""
+
+#: src/nwfilter/nwfilter_learnipaddr.c:724
 #, c-format
 msgid "encountered an error on interface %s index %d"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:715
+#: src/nwfilter/nwfilter_learnipaddr.c:788
 msgid ""
 "IP parameter must be provided since snooping the IP address does not work "
 "possibly due to missing tools"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:743
+#: src/nwfilter/nwfilter_learnipaddr.c:816
 #, c-format
 msgid "Destination buffer for ifname ('%s') not large enough"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:751
+#: src/nwfilter/nwfilter_learnipaddr.c:824
 #, c-format
 msgid "Destination buffer for linkdev ('%s') not large enough"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:803
+#: src/nwfilter/nwfilter_learnipaddr.c:876
 msgid ""
 "IP parameter must be given since libvirt was not compiled with IP address "
 "learning support"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:131
+#: src/openvz/openvz_conf.c:124
 msgid "Could not extract vzctl version"
 msgstr ""
 
@@ -7737,25 +8288,26 @@
 msgid "Wrong MAC address"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:371
+#: src/openvz/openvz_conf.c:373
 #, c-format
 msgid "Could not read 'OSTEMPLATE' from config for container %d"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:385
+#: src/openvz/openvz_conf.c:387
 #, c-format
 msgid "Could not read 'VE_PRIVATE' from config for container %d"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:456 src/openvz/openvz_driver.c:154
+#: src/openvz/openvz_conf.c:464 src/openvz/openvz_conf.c:1054
+#: src/openvz/openvz_driver.c:1651
 msgid "Failed to parse vzlist output"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:494
+#: src/openvz/openvz_conf.c:511
 msgid "UUID in config file malformed"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:506
+#: src/openvz/openvz_conf.c:523
 #, c-format
 msgid "Could not read config for container %d"
 msgstr ""
@@ -7769,143 +8321,145 @@
 msgid "Failed to scan configuration directory"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:119
+#: src/openvz/openvz_driver.c:110
 msgid "Container is not defined"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:192 src/openvz/openvz_driver.c:745
+#: src/openvz/openvz_driver.c:155 src/openvz/openvz_driver.c:849
 #, c-format
 msgid "Could not put argument to %s"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:215
+#: src/openvz/openvz_driver.c:173
 msgid "only one filesystem supported"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:224
+#: src/openvz/openvz_driver.c:182
 msgid "filesystem is not of type 'template' or 'mount'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:235
+#: src/openvz/openvz_driver.c:193
 msgid "Could not convert domain name to VEID"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:241
+#: src/openvz/openvz_driver.c:199
 msgid "Could not copy default config"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:247
+#: src/openvz/openvz_driver.c:205
 msgid "Could not set the source dir for the filesystem"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:255
+#: src/openvz/openvz_driver.c:212
 msgid "Error creating command for container"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:406
+#: src/openvz/openvz_driver.c:364
 #, c-format
 msgid "cannot read cputime for domain %d"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:529 src/openvz/openvz_driver.c:566
+#: src/openvz/openvz_driver.c:608 src/openvz/openvz_driver.c:659
+#: src/vmware/vmware_driver.c:336 src/vmware/vmware_driver.c:395
+#: src/vmware/vmware_driver.c:491
 msgid "domain is not in running state"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:646
+#: src/openvz/openvz_driver.c:749
 msgid "Container ID is not specified"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:679
+#: src/openvz/openvz_driver.c:785
 msgid "Could not generate eth name for container"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:690
+#: src/openvz/openvz_driver.c:797
 msgid "Could not generate veth name"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:774
+#: src/openvz/openvz_driver.c:878
 msgid "Could not configure network"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:785
+#: src/openvz/openvz_driver.c:889
 msgid "cannot replace NETIF config"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:823
+#: src/openvz/openvz_driver.c:921
 #, c-format
 msgid "Already an OPENVZ VM active with the id '%s'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:835 src/openvz/openvz_driver.c:917
+#: src/openvz/openvz_driver.c:932 src/openvz/openvz_driver.c:1014
 msgid "Error creating initial configuration"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:843 src/openvz/openvz_driver.c:923
+#: src/openvz/openvz_driver.c:940 src/openvz/openvz_driver.c:1020
 msgid "Could not set UUID"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:951 src/vbox/vbox_tmpl.c:5049
+#: src/openvz/openvz_driver.c:949 src/vbox/vbox_tmpl.c:5054
 msgid "current vcpu count must equal maximum"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:853 src/openvz/openvz_driver.c:945
+#: src/openvz/openvz_driver.c:955 src/openvz/openvz_driver.c:1040
 msgid "Could not set number of virtual cpu"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:861
+#: src/openvz/openvz_driver.c:963
 msgid "Could not set memory size"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:903
+#: src/openvz/openvz_driver.c:1001
 #, c-format
 msgid "Already an OPENVZ VM defined with the id '%s'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:976
+#: src/openvz/openvz_driver.c:1074
 msgid "no domain with matching id"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:982
+#: src/openvz/openvz_driver.c:1083 src/vmware/vmware_driver.c:217
 msgid "domain is not in shutoff state"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1094
+#: src/openvz/openvz_driver.c:1211
 msgid "Could not read container config"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1115 src/qemu/qemu_driver.c:2846
+#: src/openvz/openvz_driver.c:1235 src/qemu/qemu_driver.c:1010
 #, c-format
 msgid "unknown type '%s'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1246 src/openvz/openvz_driver.c:1290
+#: src/openvz/openvz_driver.c:1244 src/openvz/openvz_driver.c:1288
 #, c-format
 msgid "unsupported flags (0x%x)"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1167
+#: src/openvz/openvz_driver.c:1304
 msgid "VCPUs should be >= 1"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1212
+#: src/openvz/openvz_driver.c:1357
 #, c-format
 msgid "unexpected OpenVZ URI path '%s', try openvz:///system"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1219
+#: src/openvz/openvz_driver.c:1364
 msgid "OpenVZ control file /proc/vz does not exist"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1225
+#: src/openvz/openvz_driver.c:1370
 msgid "OpenVZ control file /proc/vz is not accessible"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1317 src/openvz/openvz_driver.c:1363
+#: src/openvz/openvz_driver.c:1465 src/openvz/openvz_driver.c:1520
 #, c-format
 msgid "Could not parse VPS ID %s"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1472 src/openvz/openvz_driver.c:1531
+#: src/openvz/openvz_driver.c:1476 src/openvz/openvz_driver.c:1535
 msgid "failed to close file"
 msgstr ""
 
@@ -7932,179 +8486,179 @@
 msgid "Unable to determine number of domains."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:347
+#: src/phyp/phyp_driver.c:1005 src/phyp/phyp_driver.c:1086
 msgid "No authentication callback provided."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:280
+#: src/phyp/phyp_driver.c:1026
 #, c-format
 msgid "Error while getting %s address info"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:297
+#: src/phyp/phyp_driver.c:1043
 #, c-format
 msgid "Failed to connect to %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:317
+#: src/phyp/phyp_driver.c:1063
 msgid "Failure establishing SSH session."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:386
+#: src/phyp/phyp_driver.c:1105
 msgid "Authentication failed"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:94
+#: src/phyp/phyp_driver.c:1160
 msgid "Missing server name in phyp:// URI"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:153
+#: src/phyp/phyp_driver.c:1202
 msgid "Error parsing 'path'. Invalid characters."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:159
+#: src/phyp/phyp_driver.c:1209
 msgid "Error while opening SSH session."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1573 src/phyp/phyp_driver.c:1618
-#: src/phyp/phyp_driver.c:1796
+#: src/phyp/phyp_driver.c:1590 src/phyp/phyp_driver.c:1635
+#: src/phyp/phyp_driver.c:1813
 msgid "Unable to get VIOS profile name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1613 src/phyp/phyp_driver.c:1761
+#: src/phyp/phyp_driver.c:1630 src/phyp/phyp_driver.c:1778
 msgid "Unable to get VIOS name"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1623
+#: src/phyp/phyp_driver.c:1640
 msgid "Unable to get free slot number"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1771 src/phyp/phyp_driver.c:1775
+#: src/phyp/phyp_driver.c:1788 src/phyp/phyp_driver.c:1792
 msgid "Unable to create new virtual adapter"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1855
+#: src/phyp/phyp_driver.c:1872
 msgid ""
 "Possibly you don't have IBM Tools installed in your LPAR.Contact your "
 "support to enable this feature."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1986
+#: src/phyp/phyp_driver.c:2003
 #, c-format
 msgid "Unable to create Volume: %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2037 src/phyp/phyp_driver.c:2290
-#: src/phyp/phyp_driver.c:2739
+#: src/phyp/phyp_driver.c:2054 src/phyp/phyp_driver.c:2307
+#: src/phyp/phyp_driver.c:2756
 msgid "Unable to determine storage pool's name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2042 src/phyp/phyp_driver.c:2744
+#: src/phyp/phyp_driver.c:2059 src/phyp/phyp_driver.c:2761
 msgid "Unable to determine storage pool's uuid."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2048 src/phyp/phyp_driver.c:2750
+#: src/phyp/phyp_driver.c:2065 src/phyp/phyp_driver.c:2767
 msgid "Unable to determine storage pools's size."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2061 src/phyp/phyp_driver.c:2763
+#: src/phyp/phyp_driver.c:2078 src/phyp/phyp_driver.c:2780
 msgid "Unable to determine storage pools's source adapter."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2066
+#: src/phyp/phyp_driver.c:2083
 msgid "Error parsing volume XML."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2072
+#: src/phyp/phyp_driver.c:2089
 msgid "StoragePool name already exists."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2080
+#: src/phyp/phyp_driver.c:2097
 msgid "Key must be empty, Power Hypervisor will create one for you."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2085
+#: src/phyp/phyp_driver.c:2102
 msgid "Capacity cannot be empty."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2261
+#: src/phyp/phyp_driver.c:2278
 msgid "Unable to determine storage sp's name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2266
+#: src/phyp/phyp_driver.c:2283
 msgid "Unable to determine storage sp's uuid."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2271
+#: src/phyp/phyp_driver.c:2288
 msgid "Unable to determine storage sps's size."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2283
+#: src/phyp/phyp_driver.c:2300
 msgid "Unable to determine storage sps's source adapter."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2490
+#: src/phyp/phyp_driver.c:2507
 #, c-format
 msgid "Unable to destroy Storage Pool: %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2529
+#: src/phyp/phyp_driver.c:2546
 #, c-format
 msgid "Unable to create Storage Pool: %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3340
+#: src/phyp/phyp_driver.c:3357
 msgid "Unable to determine domain's name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3345
+#: src/phyp/phyp_driver.c:3362
 msgid "Unable to generate random uuid."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3351
+#: src/phyp/phyp_driver.c:3368
 msgid "Unable to determine domain's max memory."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3357
+#: src/phyp/phyp_driver.c:3374
 msgid "Unable to determine domain's memory."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3363
+#: src/phyp/phyp_driver.c:3380
 msgid "Unable to determine domain's CPU."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3566
+#: src/phyp/phyp_driver.c:3583
 msgid ""
 "Field <memory> on the domain XML file is missing or has invalid value."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3573
+#: src/phyp/phyp_driver.c:3590
 msgid ""
 "Field <currentMemory> on the domain XML file is missing or has invalid value."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3580
+#: src/phyp/phyp_driver.c:3597
 msgid "Domain XML must contain at least one <disk> element."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3586
+#: src/phyp/phyp_driver.c:3603
 msgid "Field <src> under <disk> on the domain XML file is missing."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3602
+#: src/phyp/phyp_driver.c:3619
 #, c-format
 msgid "Unable to create LPAR. Reason: '%s'"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3607
+#: src/phyp/phyp_driver.c:3624
 msgid "Unable to add LPAR to the table"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3711
+#: src/phyp/phyp_driver.c:3728
 msgid "You are trying to set a number of CPUs bigger than the max possible."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3735
+#: src/phyp/phyp_driver.c:3752
 msgid ""
 "Possibly you don't have IBM Tools installed in your LPAR. Contact your "
 "support to enable this feature."
@@ -8120,23 +8674,23 @@
 msgid "cannot filter mac addresses on bridge '%s'"
 msgstr ""
 
-#: src/qemu/qemu_bridge_filter.c:80 src/qemu/qemu_bridge_filter.c:102
+#: src/qemu/qemu_bridge_filter.c:79 src/qemu/qemu_bridge_filter.c:100
 #, c-format
 msgid "failed to add ebtables rule to allow routing to '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1355 src/qemu/qemu_driver.c:2419
-#: src/qemu/qemu_driver.c:4604
+#: src/qemu/qemu_capabilities.c:285 src/qemu/qemu_capabilities.c:1330
+#: src/qemu/qemu_capabilities.c:1413
 #, c-format
 msgid "Cannot find QEMU binary %s"
 msgstr ""
 
-#: src/qemu/qemu_capabilities.c:1193
+#: src/qemu/qemu_capabilities.c:1202
 #, c-format
 msgid "cannot parse %s version number in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_capabilities.c:1398
+#: src/qemu/qemu_capabilities.c:1407
 #, c-format
 msgid "Cannot find suitable emulator for %s"
 msgstr ""
@@ -8151,7 +8705,7 @@
 msgid "Unable to deny access for disk path %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1956
+#: src/qemu/qemu_cgroup.c:164 src/qemu/qemu_migration.c:2873
 #, c-format
 msgid "Unable to allow device %s for %s"
 msgstr ""
@@ -8161,25 +8715,25 @@
 msgid "Unable to allow device %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1929
+#: src/qemu/qemu_cgroup.c:211
 #, c-format
 msgid "Unable to create cgroup for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1943
+#: src/qemu/qemu_cgroup.c:227
 #, c-format
 msgid "Unable to deny all devices for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1965
+#: src/qemu/qemu_cgroup.c:242
 msgid "unable to allow /dev/pts/ devices"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1973
+#: src/qemu/qemu_cgroup.c:257
 msgid "unable to allow /dev/snd/ devices"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1984 src/qemu/qemu_driver.c:5450
+#: src/qemu/qemu_cgroup.c:269
 #, c-format
 msgid "unable to allow device %s"
 msgstr ""
@@ -8189,860 +8743,827 @@
 msgid "Unable to set io weight for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:311
+#: src/qemu/qemu_cgroup.c:311 src/qemu/qemu_cgroup.c:334
 msgid "Block I/O tuning is not available on this host"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:349
-msgid "Memory cgroup is not available on this host"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:358
+#: src/qemu/qemu_cgroup.c:326
 #, c-format
-msgid "Unable to set io cpu shares for domain %s"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:364
-msgid "CPU tuning is not available on this host"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:394
-msgid "Unable to get cpu bandwidth period"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:401
-msgid "Unable to set cpu bandwidth period"
+msgid "Unable to set io device weight for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:410
-msgid "Unable to set cpu bandwidth quota"
+#: src/qemu/qemu_cgroup.c:373
+msgid "Memory cgroup is not available on this host"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:422 src/qemu/qemu_cgroup.c:457
-#: src/qemu/qemu_driver.c:6539 src/xenapi/xenapi_utils.c:391
-#: src/xenapi/xenapi_utils.c:395
-#, c-format
-msgid "%s"
+#: src/qemu/qemu_cgroup.c:388
+msgid "CPU tuning is not available on this host"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:446 src/qemu/qemu_cgroup.c:537
-#: src/qemu/qemu_driver.c:5068 src/qemu/qemu_driver.c:5289
+#: src/qemu/qemu_cgroup.c:470 src/qemu/qemu_cgroup.c:561
+#: src/qemu/qemu_driver.c:5067 src/qemu/qemu_driver.c:5288
 #: src/qemu/qemu_hotplug.c:1047 src/qemu/qemu_hotplug.c:1521
-#: src/qemu/qemu_hotplug.c:1624 src/qemu/qemu_migration.c:2860
+#: src/qemu/qemu_hotplug.c:1624 src/qemu/qemu_migration.c:2861
 #, c-format
 msgid "Unable to find cgroup for %s"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:483
+#: src/qemu/qemu_cgroup.c:507
 #, c-format
 msgid "Unable to create vcpu cgroup for %s(vcpu: %d)"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:493
+#: src/qemu/qemu_cgroup.c:517
 #, c-format
 msgid "unable to add vcpu %d task %d to cgroup"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2042
+#: src/qemu/qemu_cgroup.c:584
 #, c-format
 msgid "unable to find cgroup for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2050
+#: src/qemu/qemu_cgroup.c:592
 #, c-format
 msgid "unable to add domain %s task %d to cgroup"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1448
-#, c-format
-msgid "failed to add ebtables rule to allow MAC address on  '%s'"
-msgstr ""
-
-#: src/qemu/qemu_command.c:197
-msgid "No support for macvtap device"
-msgstr ""
-
-#: src/qemu/qemu_command.c:233
+#: src/qemu/qemu_command.c:200
 #, c-format
 msgid "Network '%s' is not active."
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1398
+#: src/qemu/qemu_command.c:226
 #, c-format
 msgid "Network type %d is not supported"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1429 src/uml/uml_conf.c:133
-#, c-format
-msgid "Failed to add tap interface to bridge. %s is not a bridge device"
-msgstr ""
-
-#: src/qemu/qemu_command.c:300 src/uml/uml_conf.c:161
-msgid ""
-"Failed to add tap interface to bridge. Your kernel is missing the 'tun' "
-"module or CONFIG_TUN, or you need to add the /dev/net/tun device node."
-msgstr ""
-
-#: src/qemu/qemu_conf.c:1433 src/uml/uml_conf.c:137
-#, c-format
-msgid "Failed to add tap interface to bridge '%s'"
-msgstr ""
-
-#: src/qemu/qemu_conf.c:1437 src/uml/uml_conf.c:141
+#: src/qemu/qemu_command.c:261
 #, c-format
-msgid "Failed to add tap interface '%s' to bridge '%s'"
+msgid "failed to add ebtables rule to allow MAC address on  '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:372
+#: src/qemu/qemu_command.c:312
 msgid "vhost-net is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:383
+#: src/qemu/qemu_command.c:323
 msgid "vhost-net is only supported for virtio network interfaces"
 msgstr ""
 
-#: src/qemu/qemu_command.c:399
+#: src/qemu/qemu_command.c:339
 msgid "vhost-net was requested for an interface, but is unavailable"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4954
+#: src/qemu/qemu_command.c:420
 #, c-format
 msgid "cannot convert disk '%s' to bus/device index"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4980
+#: src/qemu/qemu_command.c:449
 #, c-format
 msgid "Unsupported disk name mapping for bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:573
+#: src/qemu/qemu_command.c:513
 msgid "Unable to determine device index for network device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:600
+#: src/qemu/qemu_command.c:540
 msgid "Unable to determine device index for hostdev device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:627
+#: src/qemu/qemu_command.c:567
 msgid "Unable to determine device index for redirected device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:763
+#: src/qemu/qemu_command.c:703
 msgid "Only PCI domain 0 and bus 0 are available"
 msgstr ""
 
-#: src/qemu/qemu_command.c:797
+#: src/qemu/qemu_command.c:737
 #, c-format
 msgid ""
 "Attempted double use of PCI Address '%s' (may need \"multifunction='on'\" "
 "for device on function 0"
 msgstr ""
 
-#: src/qemu/qemu_command.c:802
+#: src/qemu/qemu_command.c:742
 #, c-format
 msgid "Attempted double use of PCI Address '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:826
+#: src/qemu/qemu_command.c:766
 #, c-format
 msgid ""
 "Attempted double use of PCI Address '%s'(need \"multifunction='off'\" for "
 "device on function 0)"
 msgstr ""
 
-#: src/qemu/qemu_command.c:946
+#: src/qemu/qemu_command.c:886
 #, c-format
 msgid "unable to reserve PCI address %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1007
+#: src/qemu/qemu_command.c:947
 msgid "Only PCI device addresses with function=0 are supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1135
+#: src/qemu/qemu_command.c:1075
 msgid "No more available PCI addresses"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1195
+#: src/qemu/qemu_command.c:1135
 msgid "Primary IDE controller must have PCI address 0:0:1.1"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1218
+#: src/qemu/qemu_command.c:1158
 msgid "PIIX3 USB controller must have PCI address 0:0:1.2"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1253
+#: src/qemu/qemu_command.c:1193
 msgid "Primary video card must have PCI address 0:0:2.0"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1333
+#: src/qemu/qemu_command.c:1273
 msgid "virtio only support device address type 'PCI'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1415
+#: src/qemu/qemu_command.c:1355
 msgid "Only PCI device addresses with domain=0 are supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1420
+#: src/qemu/qemu_command.c:1360
 msgid "Only PCI device addresses with bus=0 are supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1426
+#: src/qemu/qemu_command.c:1366
 msgid "The function of PCI device addresses must less than 8"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1433
+#: src/qemu/qemu_command.c:1373
 msgid ""
 "Only PCI device addresses with function=0 are supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1439
+#: src/qemu/qemu_command.c:1379
 msgid "'multifunction=on' is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1876
+#: src/qemu/qemu_command.c:1430
 #, c-format
 msgid "driver serial '%s' contains unsafe characters"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2296 src/qemu/qemu_conf.c:2410 src/uml/uml_conf.c:475
+#: src/qemu/qemu_command.c:1471
+#, c-format
+msgid "could not get the value of the secret for username %s"
+msgstr ""
+
+#: src/qemu/qemu_command.c:1486
+#, c-format
+msgid "rbd username '%s' specified but secret not found"
+msgstr ""
+
+#: src/qemu/qemu_command.c:1635 src/qemu/qemu_command.c:1924
+#: src/qemu/qemu_command.c:4222 src/uml/uml_conf.c:429
 #, c-format
 msgid "unsupported disk type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1520
+#: src/qemu/qemu_command.c:1643
 msgid "unexpected address type for scsi disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1529
+#: src/qemu/qemu_command.c:1652
 msgid "SCSI controller only supports 1 bus"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1539
+#: src/qemu/qemu_command.c:1662
 msgid "unexpected address type for ide disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1545 src/qemu/qemu_command.c:1561
+#: src/qemu/qemu_command.c:1668 src/qemu/qemu_command.c:1684
 #, c-format
 msgid "Only 1 %s controller is supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1555
+#: src/qemu/qemu_command.c:1678
 msgid "unexpected address type for fdc disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1567
+#: src/qemu/qemu_command.c:1690
 #, c-format
 msgid "Only 1 %s bus is supported"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2321 src/qemu/qemu_conf.c:2420
+#: src/qemu/qemu_command.c:1715 src/qemu/qemu_command.c:4232
 #, c-format
 msgid "unsupported disk driver type for '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2327 src/qemu/qemu_conf.c:2426
+#: src/qemu/qemu_command.c:1721 src/qemu/qemu_command.c:4238
 msgid "cannot create virtual FAT disks in read-write mode"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1610 src/qemu/qemu_command.c:4058
+#: src/qemu/qemu_command.c:1733 src/qemu/qemu_command.c:4254
 msgid "NBD accepts only one host"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1665 src/xenxs/xen_sxpr.c:1748
+#: src/qemu/qemu_command.c:1790 src/xenxs/xen_sxpr.c:1747
 #: src/xenxs/xen_xm.c:1189
 msgid "transient disks not supported yet"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1688
+#: src/qemu/qemu_command.c:1813
 msgid "disk cache mode 'directsync' is not supported by this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1694
+#: src/qemu/qemu_command.c:1819
 msgid "disk cache mode 'unsafe' is not supported by this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1738
+#: src/qemu/qemu_command.c:1863
 msgid "disk aio mode not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1808
+#: src/qemu/qemu_command.c:1964
 #, c-format
 msgid "unsupported disk bus '%s' with device setup"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1837
+#: src/qemu/qemu_command.c:1993
 msgid "only supports mount filesystem type"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1843
+#: src/qemu/qemu_command.c:1999
 msgid "Filesystem driver type not supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1879
+#: src/qemu/qemu_command.c:2035
 msgid "can only passthrough directories"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1946
+#: src/qemu/qemu_command.c:2102
 #, c-format
 msgid "%s not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2016
+#: src/qemu/qemu_command.c:2172
 #, c-format
 msgid "Unknown controller type: %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2098
+#: src/qemu/qemu_command.c:2254
 msgid "unrecognized virtio-net-pci 'tx' option"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2103
+#: src/qemu/qemu_command.c:2259
 msgid "virtio-net-pci 'tx' option not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2253 src/qemu/qemu_command.c:5047
+#: src/qemu/qemu_command.c:2409 src/qemu/qemu_command.c:5231
 msgid "missing watchdog model"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2802
+#: src/qemu/qemu_command.c:2489 src/qemu/qemu_command.c:5193
 msgid "invalid sound model"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2392
+#: src/qemu/qemu_command.c:2548
 msgid "invalid video model"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2401 src/qemu/qemu_command.c:4883
+#: src/qemu/qemu_command.c:2557 src/qemu/qemu_command.c:5067
 #, c-format
 msgid "value for 'vram' must be less than '%u'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2444
+#: src/qemu/qemu_command.c:2600
 #, c-format
 msgid "Failed opening %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2473
+#: src/qemu/qemu_command.c:2629
 msgid "rombar not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2525
+#: src/qemu/qemu_command.c:2681
 #, c-format
 msgid "Redirection bus %s is not supported by QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2532
+#: src/qemu/qemu_command.c:2688
 msgid "USB redirection is not supported by this version of QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2565 src/qemu/qemu_command.c:2635
+#: src/qemu/qemu_command.c:2721 src/qemu/qemu_command.c:2791
 msgid "USB host device is missing bus/device information"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2598
+#: src/qemu/qemu_command.c:2754
 #, c-format
 msgid "hub type %s not supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2605
+#: src/qemu/qemu_command.c:2761
 msgid "usb-hub not supported by QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2733
+#: src/qemu/qemu_command.c:2889
 msgid "spicevmc not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2742
+#: src/qemu/qemu_command.c:2898
 #, c-format
 msgid "unsupported chardev '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2870
+#: src/qemu/qemu_command.c:3026
 msgid "Cannot use virtio serial for parallel/serial devices"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2880
+#: src/qemu/qemu_command.c:3036
 msgid "virtio serial device has invalid address type"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2898
+#: src/qemu/qemu_command.c:3054
 #, c-format
 msgid "Unsupported spicevmc target name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3042 src/qemu/qemu_command.c:3597
-#: src/xenxs/xen_sxpr.c:2114 src/xenxs/xen_xm.c:1577
+#: src/qemu/qemu_command.c:3198 src/qemu/qemu_command.c:3815
+#: src/xenxs/xen_sxpr.c:2113 src/xenxs/xen_xm.c:1577
 #, c-format
 msgid "unsupported clock offset '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3056
+#: src/qemu/qemu_command.c:3212
 #, c-format
 msgid "unsupported rtc timer track '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3080
+#: src/qemu/qemu_command.c:3236
 #, c-format
 msgid "unsupported rtc timer tickpolicy '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3129
+#: src/qemu/qemu_command.c:3285
 msgid "CPU specification not supported by hypervisor"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1803
+#: src/qemu/qemu_command.c:3299
 msgid "guest CPU is not compatible with host CPU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3255
+#: src/qemu/qemu_command.c:3411
 msgid ""
 "setting current vcpu count less than maximum is not supported with this QEMU "
 "binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3337
+#: src/qemu/qemu_command.c:3551
 #, c-format
 msgid "the QEMU binary %s does not support kqemu"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3350
+#: src/qemu/qemu_command.c:3564
 #, c-format
 msgid "the QEMU binary %s does not support kvm"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3361
+#: src/qemu/qemu_command.c:3575
 #, c-format
 msgid "the QEMU binary %s does not support %s"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2095
+#: src/qemu/qemu_command.c:3622
 msgid "hugetlbfs filesystem is not mounted"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2100
+#: src/qemu/qemu_command.c:3627
 msgid "hugepages are disabled by administrator config"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2105
+#: src/qemu/qemu_command.c:3632
 #, c-format
 msgid "hugepage backing not supported by '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2135
+#: src/qemu/qemu_command.c:3674
 #, c-format
 msgid "qemu emulator '%s' does not support xen"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3469
+#: src/qemu/qemu_command.c:3687
 #, c-format
 msgid "the QEMU binary %s does not support smbios settings"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3478 src/qemu/qemu_driver.c:977
+#: src/qemu/qemu_command.c:3696 src/qemu/qemu_driver.c:983
 msgid "Host SMBIOS information is not available"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3487
+#: src/qemu/qemu_command.c:3705
 #, c-format
 msgid "Domain '%s' sysinfo are not available"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3532
+#: src/qemu/qemu_command.c:3750
 msgid "qemu does not support -device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3537
+#: src/qemu/qemu_command.c:3755
 msgid "qemu does not support SGA"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3542
+#: src/qemu/qemu_command.c:3760
 msgid "need at least one serial port to use SGA"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3613
+#: src/qemu/qemu_command.c:3831
 #, c-format
 msgid "unsupported timer type (name) '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3633 src/qemu/qemu_command.c:3644
+#: src/qemu/qemu_command.c:3851 src/qemu/qemu_command.c:3862
 #, c-format
 msgid "unsupported rtc tickpolicy '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3668 src/qemu/qemu_command.c:3677
+#: src/qemu/qemu_command.c:3886 src/qemu/qemu_command.c:3895
 #, c-format
 msgid "unsupported pit tickpolicy '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3699
+#: src/qemu/qemu_command.c:3917
 msgid "pit timer is not supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3732
+#: src/qemu/qemu_command.c:3950
 msgid "hypervisor lacks deviceboot feature"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2246
+#: src/qemu/qemu_command.c:4016 src/qemu/qemu_driver.c:5059
 #, c-format
 msgid "unsupported driver name '%s' for disk '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3819
+#: src/qemu/qemu_command.c:4037
 msgid "SATA is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3836
+#: src/qemu/qemu_command.c:4054
 msgid "Multiple legacy USB controller not supported"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2286 src/qemu/qemu_conf.c:2391
+#: src/qemu/qemu_command.c:4111 src/qemu/qemu_command.c:4202
 #, c-format
 msgid "unsupported usb disk type for '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4136
+#: src/qemu/qemu_command.c:4320
 msgid "filesystem passthrough not supported by this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4289
+#: src/qemu/qemu_command.c:4473
 msgid "this QEMU binary lacks multiple smartcard support"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4300 src/qemu/qemu_command.c:4312
+#: src/qemu/qemu_command.c:4484 src/qemu/qemu_command.c:4496
 msgid "this QEMU binary lacks smartcard host mode support"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4322
+#: src/qemu/qemu_command.c:4506
 #, c-format
 msgid "invalid certificate name: %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4333
+#: src/qemu/qemu_command.c:4517
 #, c-format
 msgid "invalid database name: %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4348
+#: src/qemu/qemu_command.c:4532
 msgid "this QEMU binary lacks smartcard passthrough mode support"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4457
+#: src/qemu/qemu_command.c:4641
 msgid "guestfwd requires QEMU to support -chardev & -device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4485 src/qemu/qemu_command.c:4524
+#: src/qemu/qemu_command.c:4669 src/qemu/qemu_command.c:4708
 msgid "virtio channel requires QEMU to support -device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4549
+#: src/qemu/qemu_command.c:4733
 #, c-format
 msgid "unsupported console target type %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4590
+#: src/qemu/qemu_command.c:4774
 msgid "only 1 graphics device is supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4629 src/qemu/qemu_command.c:4771
+#: src/qemu/qemu_command.c:4813 src/qemu/qemu_command.c:4955
 msgid "network-based listen not possible, network driver not present"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4635 src/qemu/qemu_command.c:4777
+#: src/qemu/qemu_command.c:4819 src/qemu/qemu_command.c:4961
 #, c-format
 msgid "listen network '%s' had no usable address"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4713
+#: src/qemu/qemu_command.c:4897
 #, c-format
 msgid "sdl not supported by '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4750
+#: src/qemu/qemu_command.c:4934
 msgid "spice graphics are not supported with this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4851
+#: src/qemu/qemu_command.c:5035
 #, c-format
 msgid "unsupported graphics type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4864
+#: src/qemu/qemu_command.c:5048
 msgid "This QEMU does not support QXL graphics adapters"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2756 src/qemu/qemu_conf.c:2782
+#: src/qemu/qemu_command.c:5055
 #, c-format
 msgid "video type %s is not supported with QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4917
+#: src/qemu/qemu_command.c:5101
 #, c-format
 msgid "video type %s is not supported with this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4929
+#: src/qemu/qemu_command.c:5113
 #, c-format
 msgid "video type %s is only valid as primary video card"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2745
+#: src/qemu/qemu_command.c:5128
 msgid "only one video card is currently supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4980 src/qemu/qemu_command.c:5016
+#: src/qemu/qemu_command.c:5164 src/qemu/qemu_command.c:5200
 msgid "this QEMU binary lacks hda support"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2829
+#: src/qemu/qemu_command.c:5247
 msgid "invalid watchdog action"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5104
+#: src/qemu/qemu_command.c:5288
 msgid "booting from assigned devices is only supported for PCI devices"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5109
+#: src/qemu/qemu_command.c:5293
 msgid ""
 "booting from assigned PCI devices is not supported with this version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2869 src/qemu/qemu_monitor_text.c:1377
+#: src/qemu/qemu_command.c:5350 src/qemu/qemu_monitor_text.c:1961
 msgid "PCI device assignment is not supported by this version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1927
+#: src/qemu/qemu_command.c:5364
 msgid "TCP migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1935 src/qemu/qemu_conf.c:1941
+#: src/qemu/qemu_command.c:5381
 msgid "STDIO migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5204
+#: src/qemu/qemu_command.c:5388
 msgid "EXEC migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5212
+#: src/qemu/qemu_command.c:5396
 msgid "FD migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5221
+#: src/qemu/qemu_command.c:5405
 msgid "UNIX migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5228
+#: src/qemu/qemu_command.c:5412
 msgid "unknown migration protocol"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5243
+#: src/qemu/qemu_command.c:5427
 #, c-format
 msgid ""
 "Memory balloon device type '%s' is not supported by this version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3084
+#: src/qemu/qemu_command.c:5645
 #, c-format
 msgid "malformed keyword arguments in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5566 src/qemu/qemu_command.c:6704
+#: src/qemu/qemu_command.c:5748 src/qemu/qemu_command.c:6890
 #, c-format
 msgid "cannot parse nbd filename '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5622 src/qemu/qemu_command.c:6731
+#: src/qemu/qemu_command.c:5807 src/qemu/qemu_command.c:6919
 #, c-format
 msgid "cannot parse sheepdog filename '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3218
+#: src/qemu/qemu_command.c:5894
 #, c-format
 msgid "cannot parse drive index '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5717
+#: src/qemu/qemu_command.c:5902
 #, c-format
 msgid "cannot parse drive bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5725
+#: src/qemu/qemu_command.c:5910
 #, c-format
 msgid "cannot parse drive unit '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5734
+#: src/qemu/qemu_command.c:5919
 #, c-format
 msgid "cannot parse io mode '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3227
+#: src/qemu/qemu_command.c:5931
 #, c-format
 msgid "missing file parameter in drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5759
+#: src/qemu/qemu_command.c:5944
 #, c-format
 msgid "missing index/unit/bus parameter in drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5808
+#: src/qemu/qemu_command.c:5993
 #, c-format
 msgid "invalid device name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3294
+#: src/qemu/qemu_command.c:6029
 #, c-format
 msgid "cannot parse NIC vlan in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3306
+#: src/qemu/qemu_command.c:6041
 #, c-format
 msgid "cannot find NIC definition for vlan %d"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3365
+#: src/qemu/qemu_command.c:6098
 #, c-format
 msgid "cannot parse vlan in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3395
+#: src/qemu/qemu_command.c:6128
 #, c-format
 msgid "cannot parse NIC definition '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5991
+#: src/qemu/qemu_command.c:6176
 #, c-format
 msgid "cannot parse sndbuf size in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3466 src/qemu/qemu_conf.c:3524
+#: src/qemu/qemu_command.c:6212
 #, c-format
 msgid "unknown PCI device syntax '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3474 src/qemu/qemu_conf.c:3547
+#: src/qemu/qemu_command.c:6220
 #, c-format
 msgid "cannot extract PCI device bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3481
+#: src/qemu/qemu_command.c:6227
 #, c-format
 msgid "cannot extract PCI device slot '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3488
+#: src/qemu/qemu_command.c:6234
 #, c-format
 msgid "cannot extract PCI device function '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6084
+#: src/qemu/qemu_command.c:6269
 #, c-format
 msgid "unknown USB device syntax '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3533
+#: src/qemu/qemu_command.c:6278
 #, c-format
 msgid "cannot extract USB device vendor '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6100
+#: src/qemu/qemu_command.c:6285
 #, c-format
 msgid "cannot extract USB device product '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6107
+#: src/qemu/qemu_command.c:6292
 #, c-format
 msgid "cannot extract USB device bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6114
+#: src/qemu/qemu_command.c:6299
 #, c-format
 msgid "cannot extract USB device address '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3667
+#: src/qemu/qemu_command.c:6408
 #, c-format
 msgid "cannot find port number in character device %s"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3707
+#: src/qemu/qemu_command.c:6448
 #, c-format
 msgid "unknown character device syntax %s"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3782
+#: src/qemu/qemu_command.c:6541
 #, c-format
 msgid "unknown CPU syntax '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6435
+#: src/qemu/qemu_command.c:6620
 #, c-format
 msgid "cannot parse CPU topology '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3814
+#: src/qemu/qemu_command.c:6661
 msgid "no emulator path found"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6488
+#: src/qemu/qemu_command.c:6674
 msgid "failed to generate uuid"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3866
+#: src/qemu/qemu_command.c:6723
 #, c-format
 msgid "missing value for %s argument"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6597
+#: src/qemu/qemu_command.c:6783
 #, c-format
 msgid "missing VNC port number in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3911
+#: src/qemu/qemu_command.c:6790
 #, c-format
 msgid "cannot parse VNC port '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3935
+#: src/qemu/qemu_command.c:6817
 #, c-format
 msgid "cannot parse memory level '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3952
+#: src/qemu/qemu_command.c:6829
 #, c-format
 msgid "cannot parse UUID '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:4217
+#: src/qemu/qemu_command.c:7193
 #, c-format
 msgid "unknown video adapter type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7073
+#: src/qemu/qemu_command.c:7260
 msgid "CEPH_ARGS was set without an rbd disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7080
+#: src/qemu/qemu_command.c:7267
 #, c-format
 msgid "could not parse CEPH_ARGS '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7115
+#: src/qemu/qemu_command.c:7302
 #, c-format
 msgid "found no rbd hosts in CEPH_ARGS '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7325
+#: src/qemu/qemu_command.c:7511
 #, c-format
 msgid "Unable to resolve %s for pid %u"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:123
+#: src/qemu/qemu_conf.c:108
 msgid "unable to find hugetlbfs mountpoint"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:250
+#: src/qemu/qemu_conf.c:292
 msgid "cgroup_controllers must be a list of strings"
 msgstr ""
 
@@ -9051,965 +9572,949 @@
 msgid "Unknown cgroup controller '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:288
+#: src/qemu/qemu_conf.c:333
 msgid "cgroup_device_acl must be a list of strings"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:406
+#: src/qemu/qemu_conf.c:407
 #, c-format
 msgid "failed to enable mac filter in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:338
+#: src/qemu/qemu_conf.c:415
 #, c-format
 msgid "failed to add rule to drop all frames in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:457
+#: src/qemu/qemu_conf.c:458
 #, c-format
 msgid "Failed to load lock manager %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:239
+#: src/qemu/qemu_domain.c:244
 msgid "Unexpected QEMU monitor still active during domain deletion"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:213
+#: src/qemu/qemu_domain.c:335
 msgid "no monitor path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:240
+#: src/qemu/qemu_domain.c:362
 #, c-format
 msgid "unsupported monitor type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:388
+#: src/qemu/qemu_domain.c:393
 msgid "failed to parse qemu capabilities flags"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:401
+#: src/qemu/qemu_domain.c:406
 #, c-format
 msgid "Unknown qemu capabilities flag %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:421
+#: src/qemu/qemu_domain.c:426
 #, c-format
 msgid "Unknown job type %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:434
+#: src/qemu/qemu_domain.c:439
 #, c-format
 msgid "Unknown async job type %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:445
+#: src/qemu/qemu_domain.c:450
 #, c-format
 msgid "Unknown job phase %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:500
+#: src/qemu/qemu_domain.c:505
 #, c-format
 msgid "Failed to register xml namespace '%s'"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:523
+#: src/qemu/qemu_domain.c:528
 msgid "No qemu command-line argument specified"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:549
+#: src/qemu/qemu_domain.c:554
 msgid "No qemu environment name specified"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:554
+#: src/qemu/qemu_domain.c:559
 msgid "Empty qemu environment name specified"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:559
+#: src/qemu/qemu_domain.c:564
 msgid "Invalid environment name, it must begin with a letter or underscore"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:564
+#: src/qemu/qemu_domain.c:569
 msgid ""
 "Invalid environment name, it must contain only alphanumerics and underscore"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:313 src/qemu/qemu_driver.c:356
+#: src/qemu/qemu_domain.c:789
 msgid "cannot acquire state change lock"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:788
+#: src/qemu/qemu_domain.c:793
 msgid "cannot acquire state change lock due to max_queued limit"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:316 src/qemu/qemu_driver.c:359
+#: src/qemu/qemu_domain.c:797
 msgid "cannot acquire job mutex"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:845
+#: src/qemu/qemu_domain.c:850
 msgid "Attempt to start invalid job"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:915
+#: src/qemu/qemu_domain.c:920
 #, c-format
 msgid "unepxected async job %d"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:924
+#: src/qemu/qemu_domain.c:929
 msgid "domain is no longer running"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7907
+#: src/qemu/qemu_domain.c:1086 src/qemu/qemu_driver.c:8875
 msgid "cannot get host CPU capabilities"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1218
+#: src/qemu/qemu_domain.c:1223
 #, c-format
 msgid "failed to set close-on-exec flag on %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1302
+#: src/qemu/qemu_domain.c:1307
 #, c-format
 msgid "Unable to write to domain logfile %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:589
+#: src/qemu/qemu_domain.c:1334 src/storage/storage_backend.c:783
 msgid "unable to find kvm-img or qemu-img"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1360
+#: src/qemu/qemu_domain.c:1365
 #, c-format
 msgid "cannot create snapshot directory '%s'"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1433
+#: src/qemu/qemu_domain.c:1438
 #, c-format
 msgid "Disk device '%s' does not support snapshotting"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1630 src/qemu/qemu_domain.c:1638
+#: src/qemu/qemu_domain.c:1635 src/qemu/qemu_domain.c:1643
 #, c-format
 msgid "cannot access file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:155
+#: src/qemu/qemu_driver.c:158
 #, c-format
 msgid "Failed to start job on VM '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:229
+#: src/qemu/qemu_driver.c:232
 msgid "Failed to initialize security drivers"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:310
+#: src/qemu/qemu_driver.c:313
 #, c-format
 msgid "Failed to allocate memory for snapshot directory for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:320
+#: src/qemu/qemu_driver.c:323
 #, c-format
 msgid "Failed to open snapshot directory %s for domain %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:335
+#: src/qemu/qemu_driver.c:338
 msgid "Failed to allocate memory for path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:342
+#: src/qemu/qemu_driver.c:345
 #, c-format
 msgid "Failed to read snapshot file %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:353
+#: src/qemu/qemu_driver.c:356
 #, c-format
 msgid "Failed to parse snapshot XML from file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:374
+#: src/qemu/qemu_driver.c:377
 #, c-format
 msgid "Too many snapshots claiming to be current for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:380
+#: src/qemu/qemu_driver.c:383
 #, c-format
 msgid "Snapshots have inconsistent relations for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:521
+#: src/qemu/qemu_driver.c:524
 #, c-format
 msgid "Failed to create cache dir '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:539
+#: src/qemu/qemu_driver.c:542
 #, c-format
 msgid "Failed to create dump dir '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:570
+#: src/qemu/qemu_driver.c:573
 msgid "Missing lock manager implementation"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1088 src/qemu/qemu_driver.c:3726
-#: src/qemu/qemu_driver.c:3761 src/qemu/qemu_driver.c:3856
-#: src/qemu/qemu_driver.c:3891
+#: src/qemu/qemu_driver.c:590
 #, c-format
 msgid "unable to set ownership of '%s' to user %d:%d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1094
+#: src/qemu/qemu_driver.c:596 src/qemu/qemu_driver.c:602
+#: src/qemu/qemu_driver.c:608
 #, c-format
 msgid "unable to set ownership of '%s' to %d:%d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1119
+#: src/qemu/qemu_driver.c:629
 #, c-format
 msgid "unable to create hugepage path %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1126
+#: src/qemu/qemu_driver.c:636
 #, c-format
 msgid "unable to set ownership on %s to %d:%d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2733
+#: src/qemu/qemu_driver.c:863
 msgid "qemu state driver is not active"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2739
+#: src/qemu/qemu_driver.c:869
 #, c-format
 msgid "no QEMU URI path given, try %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2750
+#: src/qemu/qemu_driver.c:880
 #, c-format
 msgid "unexpected QEMU URI path '%s', try qemu:///system"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2757
+#: src/qemu/qemu_driver.c:887
 #, c-format
 msgid "unexpected QEMU URI path '%s', try qemu:///session"
 msgstr ""
 
-#: src/opennebula/one_driver.c:580 src/opennebula/one_driver.c:613
-#: src/qemu/qemu_driver.c:2959 src/uml/uml_driver.c:1314
-#: src/uml/uml_driver.c:1344 src/vbox/vbox_tmpl.c:1032
+#: src/qemu/qemu_driver.c:1117 src/uml/uml_driver.c:1531
+#: src/uml/uml_driver.c:1567 src/vbox/vbox_tmpl.c:1233
+#: src/vbox/vbox_tmpl.c:1520 src/vbox/vbox_tmpl.c:1572
+#: src/vbox/vbox_tmpl.c:1623 src/vbox/vbox_tmpl.c:1676
+#: src/vbox/vbox_tmpl.c:1727 src/vbox/vbox_tmpl.c:1803
+#: src/vbox/vbox_tmpl.c:2113
 #, c-format
 msgid "no domain with matching id %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3011 src/qemu/qemu_driver.c:7679
+#: src/qemu/qemu_driver.c:1169 src/qemu/qemu_driver.c:8403
+#: src/qemu/qemu_driver.c:8664
 #, c-format
 msgid "no domain with matching name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2569 src/qemu/qemu_driver.c:3255
-#: src/qemu/qemu_driver.c:7731
+#: src/qemu/qemu_driver.c:1481 src/qemu/qemu_migration.c:2674
+#: src/qemu/qemu_migration.c:2801 src/qemu/qemu_process.c:406
+#: src/qemu/qemu_process.c:3287
 msgid "resume operation failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1570
+#: src/qemu/qemu_driver.c:1576
 msgid "Reboot is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1595
+#: src/qemu/qemu_driver.c:1601
 msgid "Reboot is not supported without the JSON monitor"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1853
+#: src/qemu/qemu_driver.c:1859
 msgid "cannot resize the maximum memory on an active domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3496 src/uml/uml_driver.c:1466
+#: src/qemu/qemu_driver.c:1896 src/uml/uml_driver.c:1701
 msgid "cannot set memory of an active domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2001
+#: src/qemu/qemu_driver.c:2007
 #, c-format
 msgid "cannot translate keycode %u of %s codeset to rfb keycode"
 msgstr ""
 
-#: src/uml/uml_driver.c:1508
+#: src/qemu/qemu_driver.c:2079 src/uml/uml_driver.c:1743
 msgid "cannot read cputime for domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2282
+#: src/qemu/qemu_driver.c:2288
 #, c-format
 msgid "failed to write header to domain save file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2290 src/qemu/qemu_driver.c:4335
+#: src/qemu/qemu_driver.c:2296 src/qemu/qemu_driver.c:4334
 #, c-format
 msgid "failed to write xml to '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2341
+#: src/qemu/qemu_driver.c:2347
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2356 src/qemu/qemu_driver.c:2380
+#: src/qemu/qemu_driver.c:2362 src/qemu/qemu_driver.c:2386
 #, c-format
 msgid "Failed to create file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2371
+#: src/qemu/qemu_driver.c:2377
 #, c-format
 msgid "Failed to create file '%s': couldn't determine fs type"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2392
+#: src/qemu/qemu_driver.c:2398
 #, c-format
 msgid "Error from child process creating '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2442 src/qemu/qemu_driver.c:9277
-#: src/qemu/qemu_migration.c:798
+#: src/qemu/qemu_driver.c:2448 src/qemu/qemu_driver.c:9624
+#: src/qemu/qemu_migration.c:799
 msgid "domain is marked for auto destroy"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2470 src/qemu/qemu_driver.c:2980
-#: src/qemu/qemu_driver.c:8873 src/qemu/qemu_driver.c:9155
-#: src/qemu/qemu_driver.c:10019 src/qemu/qemu_driver.c:10070
+#: src/qemu/qemu_driver.c:2476 src/qemu/qemu_driver.c:2986
+#: src/qemu/qemu_driver.c:9220 src/qemu/qemu_driver.c:9502
+#: src/qemu/qemu_driver.c:10366 src/qemu/qemu_driver.c:10417
 #: src/qemu/qemu_hotplug.c:408 src/qemu/qemu_hotplug.c:761
-#: src/qemu/qemu_migration.c:1613 src/qemu/qemu_migration.c:1925
-#: src/qemu/qemu_migration.c:2245 src/qemu/qemu_migration.c:2601
-#: src/qemu/qemu_process.c:383 src/qemu/qemu_process.c:396
+#: src/qemu/qemu_migration.c:1622 src/qemu/qemu_migration.c:1937
+#: src/qemu/qemu_migration.c:2261 src/qemu/qemu_migration.c:2612
+#: src/qemu/qemu_process.c:384 src/qemu/qemu_process.c:397
 msgid "guest unexpectedly quit"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3691 src/qemu/qemu_driver.c:7529
+#: src/qemu/qemu_driver.c:2510
 msgid "failed to get domain xml"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2533 src/qemu/qemu_driver.c:2863
-#: src/qemu/qemu_driver.c:3948
+#: src/qemu/qemu_driver.c:2539 src/qemu/qemu_driver.c:2869
+#: src/qemu/qemu_driver.c:3947
 msgid "bypass cache unsupported by this system"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2564 src/qemu/qemu_driver.c:2584
-#: src/qemu/qemu_driver.c:3107 src/vbox/vbox_tmpl.c:9091
+#: src/qemu/qemu_driver.c:2570 src/qemu/qemu_driver.c:2590
+#: src/qemu/qemu_driver.c:3113 src/vbox/vbox_tmpl.c:9096
 #, c-format
 msgid "unable to close %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2574
+#: src/qemu/qemu_driver.c:2580
 #, c-format
 msgid "unable to seek %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2580
+#: src/qemu/qemu_driver.c:2586
 #, c-format
 msgid "unable to write %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3649
+#: src/qemu/qemu_driver.c:2673
 msgid "Invalid save image format specified in configuration file"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2673
+#: src/qemu/qemu_driver.c:2679
 msgid ""
 "Compression program for image format in configuration file isn't available"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3717 src/qemu/qemu_driver.c:3848
+#: src/qemu/qemu_driver.c:2891
 #, c-format
 msgid "unable to save file %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2917
+#: src/qemu/qemu_driver.c:2923
 msgid "Invalid dump image format specified in configuration file, using raw"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2922
+#: src/qemu/qemu_driver.c:2928
 msgid ""
 "Compression program for dump image format in configuration file isn't "
 "available, using raw"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3917
+#: src/qemu/qemu_driver.c:3024
 msgid "resuming after dump failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3062
+#: src/qemu/qemu_driver.c:3068 src/qemu/qemu_driver.c:7352
 #, c-format
 msgid "no domain matching uuid '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3081
+#: src/qemu/qemu_driver.c:3087
 msgid "currently is supported only taking screenshots of screen ID 0"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6399
+#: src/qemu/qemu_driver.c:3098 src/qemu/qemu_driver.c:7925
+#: src/vbox/vbox_tmpl.c:9048
 #, c-format
 msgid "mkstemp(\"%s\") failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3113 src/vbox/vbox_tmpl.c:9097
+#: src/qemu/qemu_driver.c:3119 src/vbox/vbox_tmpl.c:9102
 msgid "unable to open stream"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3174
+#: src/qemu/qemu_driver.c:3180
 msgid "Dump failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3182
+#: src/qemu/qemu_driver.c:3188
 msgid "Resuming after dump failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3253
+#: src/qemu/qemu_driver.c:3259
 msgid "cannot change vcpu count of this domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3277 src/test/test_driver.c:2189
-#: src/xen/xen_driver.c:1114
+#: src/qemu/qemu_driver.c:3283 src/test/test_driver.c:2194
+#: src/xen/xen_driver.c:1122
 #, c-format
 msgid "argument out of range: %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3310
+#: src/qemu/qemu_driver.c:3316
 msgid "cannot adjust maximum on running domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3971 src/qemu/qemu_driver.c:4178
-#: src/qemu/qemu_driver.c:4213
+#: src/qemu/qemu_driver.c:3334 src/qemu/qemu_driver.c:3847
 #, c-format
 msgid "unknown virt type in domain definition '%d'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3441
+#: src/qemu/qemu_driver.c:3447
 msgid "a domain is inactive; can change only persistent config"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4037
+#: src/qemu/qemu_driver.c:3456
 #, c-format
 msgid "vcpu number out of range %d > %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4056
+#: src/qemu/qemu_driver.c:3495 src/qemu/qemu_process.c:1578
 msgid "cpu affinity is not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3496
+#: src/qemu/qemu_driver.c:3502
 msgid "failed to delete vcpupin xml of a running domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3503
+#: src/qemu/qemu_driver.c:3509
 msgid "failed to update or add vcpupin xml of a running domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3518
+#: src/qemu/qemu_driver.c:3524
 msgid "failed to delete vcpupin xml of a persistent domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3525
+#: src/qemu/qemu_driver.c:3531
 msgid "failed to update or add vcpupin xml of a persistent domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3577
-msgid "cannot get live and persistent info concurrently"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:3613
+#: src/qemu/qemu_driver.c:3612
 msgid "cannot get persistent config of a transient domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4095
+#: src/qemu/qemu_driver.c:3693
 msgid "cannot list vcpu pinning for an inactive domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4126
+#: src/qemu/qemu_driver.c:3724
 msgid "cannot get vCPU placement & pCPU time"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4144
+#: src/qemu/qemu_driver.c:3742
 msgid "cpu affinity is not available"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3799 src/test/test_driver.c:2137
+#: src/qemu/qemu_driver.c:3798 src/test/test_driver.c:2142
 #: src/xen/xend_internal.c:2347 src/xen/xm_internal.c:795
 msgid "domain not active"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4236
+#: src/qemu/qemu_driver.c:3870
 msgid "Failed to get security label"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4267
+#: src/qemu/qemu_driver.c:3902
 #, c-format
 msgid "security model string exceeds max %d bytes"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4277
+#: src/qemu/qemu_driver.c:3912
 #, c-format
 msgid "security DOI string exceeds max %d bytes"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4314
+#: src/qemu/qemu_driver.c:3960
 msgid "failed to read qemu header"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3970
+#: src/qemu/qemu_driver.c:3969
 msgid "save image is incomplete"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3974
+#: src/qemu/qemu_driver.c:3973
 #, c-format
 msgid "cannot remove corrupt file: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4018 src/qemu/qemu_driver.c:4122
+#: src/qemu/qemu_driver.c:4017 src/qemu/qemu_driver.c:4121
 #, c-format
 msgid "cannot close file: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4371
+#: src/qemu/qemu_driver.c:4078
 #, c-format
 msgid "Invalid compressed save format %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4383
+#: src/qemu/qemu_driver.c:4093
 #, c-format
 msgid "Failed to start decompression binary %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4421
+#: src/qemu/qemu_driver.c:4145
 msgid "failed to resume domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4320
+#: src/qemu/qemu_driver.c:4319
 msgid "new xml too large to fit in file"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4329
+#: src/qemu/qemu_driver.c:4328
 #, c-format
 msgid "cannot seek in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4688
+#: src/qemu/qemu_driver.c:4687
 #, c-format
 msgid "cannot remove managed save file %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4710
+#: src/qemu/qemu_driver.c:4757
 msgid "domain is already running"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4981
+#: src/qemu/qemu_driver.c:4980
 #, c-format
 msgid "cannot delete inactive domain with %d snapshots"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5125
+#: src/qemu/qemu_driver.c:5124
 #, c-format
 msgid "disk controller bus '%s' cannot be hotplugged."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5211 src/uml/uml_driver.c:2191
+#: src/qemu/qemu_driver.c:5210 src/uml/uml_driver.c:2177
 msgid "This type of disk cannot be hot unplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5236
+#: src/qemu/qemu_driver.c:5214
+#, c-format
+msgid "disk device type '%s' cannot be detached"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:5235
 #, c-format
 msgid "disk controller bus '%s' cannot be hotunplugged."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5268 src/uml/uml_driver.c:2195
+#: src/qemu/qemu_driver.c:5267 src/uml/uml_driver.c:2181
 msgid "This type of device cannot be hot unplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5386
+#: src/qemu/qemu_driver.c:5385
 #, c-format
 msgid "mac %s already exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5402
+#: src/qemu/qemu_driver.c:5401
 #, c-format
 msgid "Lease %s in lockspace %s already exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5447
+#: src/qemu/qemu_driver.c:5446
 #, c-format
 msgid "no nic of mac %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5456 src/qemu/qemu_hotplug.c:2263
+#: src/qemu/qemu_driver.c:5455 src/qemu/qemu_hotplug.c:2262
 #, c-format
 msgid "Lease %s in lockspace %s does not exist"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5521
+#: src/qemu/qemu_driver.c:5520
 #, c-format
 msgid "mac %s doesn't exist"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5592
+#: src/qemu/qemu_driver.c:5591
 msgid "cannot do live update a device on inactive domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5867 src/qemu/qemu_driver.c:6686
-#: src/qemu/qemu_driver.c:6960
-msgid "cgroup CPU controller is not mounted"
-msgstr ""
-
-#: src/lxc/lxc_driver.c:1926 src/lxc/lxc_driver.c:1984
-#: src/qemu/qemu_driver.c:6003 src/qemu/qemu_driver.c:6074
+#: src/qemu/qemu_driver.c:5964
 #, c-format
-msgid "No such domain %s"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:5932 src/qemu/qemu_driver.c:6079
-msgid "blkio cgroup isn't mounted"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:5962 src/qemu/qemu_driver.c:5996
-msgid "invalid type for blkio weight tunable, expected a 'unsigned int'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:5969 src/qemu/qemu_driver.c:6003
-msgid "out of blkio weight range."
+msgid "unable to parse %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5977
-msgid "unable to set blkio weight tunable"
+#: src/qemu/qemu_driver.c:6101 src/qemu/qemu_driver.c:6173
+msgid "invalid type for device_weight tunable, expected a 'char *'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6112
-msgid "unable to get blkio weight"
+#: src/qemu/qemu_driver.c:6119
+#, c-format
+msgid "Unable to set io device weight for path %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6211 src/qemu/qemu_driver.c:6369
+#: src/qemu/qemu_driver.c:6476 src/qemu/qemu_driver.c:6638
 msgid "cgroup memory controller is not mounted"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6552 src/qemu/qemu_driver.c:6818
-msgid "unable to get cpu bandwidth tunable"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6559 src/qemu/qemu_driver.c:6811
-msgid "unable to get cpu bandwidth period tunable"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6602
+#: src/qemu/qemu_driver.c:6871
 #, c-format
 msgid "Unable to find vcpu cgroup for %s(vcpu: %d)"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6020
-msgid "invalid type for cpu_shares tunable, expected a 'ullong'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6027
-msgid "unable to set cpu shares tunable"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6724
-msgid "invalid type for vcpu_period tunable, expected a 'ullong'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6744
-msgid "invalid type for vcpu_quota tunable, expected a 'llong'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6850
+#: src/qemu/qemu_driver.c:7119
 #, c-format
 msgid "Unable to find vcpu cgroup for %s(vcpu: 0)"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6893
-msgid "cannot query live and config together"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6924
-msgid "cannot query persistent config of a transient domain"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6934
-msgid "can't get persistentDef"
+#: src/qemu/qemu_driver.c:7333
+msgid "empty path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6087
-msgid "unable to get cpu shares tunable"
+#: src/qemu/qemu_driver.c:7339
+#, c-format
+msgid "size must be less than %llu"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6153 src/test/test_driver.c:2602
+#: src/qemu/qemu_driver.c:7369 src/qemu/qemu_driver.c:7434
+#: src/qemu/qemu_driver.c:7520 src/test/test_driver.c:2825
 #, c-format
 msgid "invalid path: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7091 src/qemu/qemu_driver.c:7180
+#: src/qemu/qemu_driver.c:7441 src/qemu/qemu_driver.c:7527
 #: src/qemu/qemu_hotplug.c:75
 #, c-format
 msgid "missing disk device alias name for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6225 src/test/test_driver.c:2657
+#: src/qemu/qemu_driver.c:7743 src/test/test_driver.c:2880
 #, c-format
 msgid "invalid path, '%s' is not a known interface"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7410
+#: src/qemu/qemu_driver.c:7757
 msgid "interface stats not implemented on this platform"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6305 src/uml/uml_driver.c:1802
+#: src/qemu/qemu_driver.c:7836 src/qemu/qemu_driver.c:8001
+#: src/uml/uml_driver.c:2328
 msgid "NULL or empty path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7496 src/uml/uml_driver.c:2349
+#: src/qemu/qemu_driver.c:7843 src/uml/uml_driver.c:2335
 #, c-format
 msgid "invalid path '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6324
+#: src/qemu/qemu_driver.c:7852
 #, c-format
 msgid "%s: failed to open"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6335
+#: src/qemu/qemu_driver.c:7863
 #, c-format
 msgid "%s: failed to seek or read"
 msgstr ""
 
-#: src/libvirt.c:4420 src/qemu/qemu_driver.c:6378
+#: src/qemu/qemu_driver.c:7904
 msgid "flags parameter must be VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6421
+#: src/qemu/qemu_driver.c:7949
 #, c-format
 msgid "failed to read temporary file created with template %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7661
+#: src/qemu/qemu_driver.c:8008
 #, c-format
 msgid "invalid path %s not assigned to domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7667
+#: src/qemu/qemu_driver.c:8014
 #, c-format
 msgid "disk %s does not currently have a source assigned"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7677
+#: src/qemu/qemu_driver.c:8024
 #, c-format
 msgid "failed to open path '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7685
+#: src/qemu/qemu_driver.c:8032
 #, c-format
 msgid "unknown disk format %s for %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:846
+#: src/qemu/qemu_driver.c:8061 src/storage/storage_backend.c:1018
+#: src/storage/storage_backend.c:1046 src/storage/storage_backend.c:1166
+#: src/util/storage_file.c:744 src/util/storage_file.c:840
 #, c-format
 msgid "cannot stat file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7736
+#: src/qemu/qemu_driver.c:8083
 #, c-format
 msgid "failed to seek to end of %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6833 src/qemu/qemu_driver.c:7001
+#: src/qemu/qemu_driver.c:8236 src/qemu/qemu_driver.c:8308
+#: src/qemu/qemu_driver.c:8541 src/qemu/qemu_driver.c:8576
 msgid "no domain XML passed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6838
+#: src/qemu/qemu_driver.c:8241 src/qemu/qemu_driver.c:8581
 msgid "PrepareTunnel called but no TUNNELLED flag set"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6843
+#: src/qemu/qemu_driver.c:8246 src/qemu/qemu_driver.c:8586
 msgid "tunnelled migration requested but NULL stream passed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7905 src/qemu/qemu_driver.c:7945
-#: src/qemu/qemu_driver.c:8000
+#: src/qemu/qemu_driver.c:8252 src/qemu/qemu_driver.c:8292
+#: src/qemu/qemu_driver.c:8347
 #, c-format
 msgid "Cannot use migrate v2 protocol with lock manager %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6995
+#: src/qemu/qemu_driver.c:8302 src/qemu/qemu_driver.c:8535
 msgid "Tunnelled migration requested but invalid RPC method called"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8136 src/qemu/qemu_migration.c:1199
+#: src/qemu/qemu_driver.c:8483 src/qemu/qemu_migration.c:1207
 msgid "domain disappeared"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7811 src/xen/xen_driver.c:1705
+#: src/qemu/qemu_driver.c:8769 src/xen/xen_driver.c:1970
 #, c-format
 msgid "device %s is not a PCI device"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8636
+#: src/qemu/qemu_driver.c:8983
 msgid "no job is active on the domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8640
+#: src/qemu/qemu_driver.c:8987
 msgid "cannot abort incoming migration; use virDomainDestroy instead"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8698
+#: src/qemu/qemu_driver.c:9045
 msgid "domain is not being migrated"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8821
+#: src/qemu/qemu_driver.c:9168
 #, c-format
 msgid "Disk '%s' does not support snapshotting"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8907 src/qemu/qemu_driver.c:9214
+#: src/qemu/qemu_driver.c:9254 src/qemu/qemu_driver.c:9561
 msgid "resuming after snapshot failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8937
+#: src/qemu/qemu_driver.c:9284
 #, c-format
 msgid ""
 "active qemu domains require external disk snapshots; disk %s requested "
 "internal"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8945
+#: src/qemu/qemu_driver.c:9292
 #, c-format
 msgid "internal snapshot for disk %s unsupported for storage type %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8963
+#: src/qemu/qemu_driver.c:9310
 #, c-format
 msgid "external snapshot format for disk %s is unsupported: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8971
+#: src/qemu/qemu_driver.c:9318
 #, c-format
 msgid "unable to stat for disk %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8977
+#: src/qemu/qemu_driver.c:9324
 #, c-format
 msgid ""
 "external snapshot file for disk %s already exists and is not a block device: "
 "%s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8991 src/qemu/qemu_driver.c:9031
+#: src/qemu/qemu_driver.c:9338 src/qemu/qemu_driver.c:9378
 msgid "unexpected code path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8998
+#: src/qemu/qemu_driver.c:9345
 msgid "disk snapshots require at least one disk to be selected for snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9282
+#: src/qemu/qemu_driver.c:9629
 msgid "cannot halt after transient domain snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9296
+#: src/qemu/qemu_driver.c:9643
 #, c-format
 msgid "cannot set snapshot %s as its own parent"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9303
+#: src/qemu/qemu_driver.c:9650
 #, c-format
 msgid "parent %s for snapshot %s not found"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9310
+#: src/qemu/qemu_driver.c:9657
 #, c-format
 msgid "parent %s would create cycle to %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9328
+#: src/qemu/qemu_driver.c:9675
 #, c-format
 msgid "definition for snapshot %s must use uuid %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9339
+#: src/qemu/qemu_driver.c:9686
 #, c-format
 msgid ""
 "cannot change between online and offline snapshot state in snapshot %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9347
+#: src/qemu/qemu_driver.c:9694
 #, c-format
 msgid ""
 "cannot change between disk snapshot and system checkpoint in snapshot %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9447
+#: src/qemu/qemu_driver.c:9794
 msgid "disk snapshots of inactive domains not implemented yet"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9597 src/qemu/qemu_driver.c:9637
-#: src/qemu/qemu_driver.c:9744 src/qemu/qemu_driver.c:9822
-#: src/qemu/qemu_driver.c:9892 src/qemu/qemu_driver.c:10253
+#: src/qemu/qemu_driver.c:9944 src/qemu/qemu_driver.c:9984
+#: src/qemu/qemu_driver.c:10091 src/qemu/qemu_driver.c:10169
+#: src/qemu/qemu_driver.c:10239 src/qemu/qemu_driver.c:10600
 #, c-format
 msgid "no domain snapshot with matching name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9679
+#: src/qemu/qemu_driver.c:10026
 #, c-format
 msgid "no snapshot with matching name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9786
+#: src/qemu/qemu_driver.c:10133
 msgid "the domain does not have a current snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9903
+#: src/qemu/qemu_driver.c:10250
 msgid ""
 "transient domain needs to request run or pause to revert to inactive snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9909
+#: src/qemu/qemu_driver.c:10256
 msgid "revert to external disk snapshot not supported yet"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9916
+#: src/qemu/qemu_driver.c:10263
 #, c-format
 msgid "snapshot '%s' lacks domain '%s' rollback info"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9926
+#: src/qemu/qemu_driver.c:10273
 msgid "must respawn qemu to start inactive snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10268
+#: src/qemu/qemu_driver.c:10615
 #, c-format
 msgid "deletion of %d external disk snapshots not supported yet"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10295
+#: src/qemu/qemu_driver.c:10642
 #, c-format
 msgid "failed to set snapshot '%s' as current"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10427
+#: src/qemu/qemu_driver.c:10774
 #, c-format
 msgid "No monitor connection for pid %u"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10433
+#: src/qemu/qemu_driver.c:10780
 #, c-format
 msgid "Cannot connect to monitor connection of type '%s' for pid %u"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10544
+#: src/qemu/qemu_driver.c:10891
 #, c-format
 msgid "cannot find character device %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10594
+#: src/qemu/qemu_driver.c:10942
 msgid "No device found for specified path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10730
+#: src/qemu/qemu_driver.c:11078
 #, c-format
 msgid "No graphics backend with index %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10742
+#: src/qemu/qemu_driver.c:11090
 #, c-format
 msgid "Can only open VNC or SPICE graphics backends, not %s"
 msgstr ""
 
+#: src/qemu/qemu_driver.c:11187
+#, c-format
+msgid "expected unsigned long long for parameter %s"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11211
+#, c-format
+msgid "Unrecognized parameter %s"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11220
+msgid "total and read/write of bytes_sec cannot be set at the same time"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11227
+msgid "total and read/write of iops_sec cannot be set at the same time"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11246
+msgid "Write to config file failed"
+msgstr ""
+
 #: src/qemu/qemu_hostdev.c:189
 #, c-format
 msgid "PCI device %s is not assignable"
@@ -10059,7 +10564,7 @@
 msgid "SCSI controller %d was missing its PCI address"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5165
+#: src/qemu/qemu_hotplug.c:658
 msgid "installed qemu version does not support host_net_add"
 msgstr ""
 
@@ -10079,12 +10584,12 @@
 msgid "guest unexpectedly quit during hotplug"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5375 src/qemu/qemu_driver.c:5769
+#: src/qemu/qemu_hotplug.c:1092 src/qemu/qemu_hotplug.c:2145
 #, c-format
 msgid "hostdev mode '%s' not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5393 src/qemu/qemu_driver.c:5780
+#: src/qemu/qemu_hotplug.c:1133 src/qemu/qemu_hotplug.c:2159
 #, c-format
 msgid "hostdev subsys type '%s' not supported"
 msgstr ""
@@ -10169,13 +10674,13 @@
 msgstr ""
 
 #: src/qemu/qemu_hotplug.c:1513 src/qemu/qemu_hotplug.c:1760
-#: src/qemu/qemu_hotplug.c:1996
+#: src/qemu/qemu_hotplug.c:1995
 #, c-format
 msgid "cannot hot unplug multifunction PCI device: %s"
 msgstr ""
 
 #: src/qemu/qemu_hotplug.c:1530 src/qemu/qemu_hotplug.c:1754
-#: src/qemu/qemu_hotplug.c:1849 src/qemu/qemu_hotplug.c:2004
+#: src/qemu/qemu_hotplug.c:1849 src/qemu/qemu_hotplug.c:2003
 msgid "device cannot be detached without a PCI address"
 msgstr ""
 
@@ -10193,7 +10698,7 @@
 msgid "device cannot be detached: device is busy"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5612
+#: src/qemu/qemu_hotplug.c:1839
 #, c-format
 msgid "network device %02x:%02x:%02x:%02x:%02x:%02x not found"
 msgstr ""
@@ -10207,316 +10712,320 @@
 msgid "unable to determine original VLAN"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5646
+#: src/qemu/qemu_hotplug.c:1927
 #, c-format
 msgid "failed to remove ebtables rule on  '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5699
+#: src/qemu/qemu_hotplug.c:1985
 #, c-format
 msgid "host pci device %.4x:%.2x:%.2x.%.1x not found"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2094
+#: src/qemu/qemu_hotplug.c:2093
 #, c-format
 msgid "host usb device %03d.%03d not found"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2102
+#: src/qemu/qemu_hotplug.c:2101
 msgid "device cannot be detached without a device alias"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2108
+#: src/qemu/qemu_hotplug.c:2107
 msgid "device cannot be detached with this QEMU version"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2200
+#: src/qemu/qemu_hotplug.c:2199
 msgid "Graphics password only supported for VNC"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2226
+#: src/qemu/qemu_hotplug.c:2225
 msgid "Expiry of passwords is not supported"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:163
+#: src/qemu/qemu_migration.c:164
 #, c-format
 msgid "unable to read server cert %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:170
+#: src/qemu/qemu_migration.c:171
 #, c-format
 msgid "cannot initialize cert object: %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:181
+#: src/qemu/qemu_migration.c:182
 #, c-format
 msgid "cannot load cert data from %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:276
+#: src/qemu/qemu_migration.c:277
 msgid "Unable to obtain host UUID"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:297
+#: src/qemu/qemu_migration.c:298
 msgid "Migration graphics data already present"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:323
+#: src/qemu/qemu_migration.c:324
 msgid "Migration lockstate data already present"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:354
+#: src/qemu/qemu_migration.c:355
 msgid "Migration persistent data already present"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:469
+#: src/qemu/qemu_migration.c:470
 msgid "missing type attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:474
+#: src/qemu/qemu_migration.c:475
 #, c-format
 msgid "unknown graphics type %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:481
+#: src/qemu/qemu_migration.c:482
 msgid "missing port attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:487
+#: src/qemu/qemu_migration.c:488
 msgid "missing tlsPort attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:493
+#: src/qemu/qemu_migration.c:494
 msgid "missing listen attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:530
+#: src/qemu/qemu_migration.c:531
 msgid "missing name element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:535
+#: src/qemu/qemu_migration.c:536
 #, c-format
 msgid "Incoming cookie data had unexpected name %s vs %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:545
+#: src/qemu/qemu_migration.c:546
 msgid "missing uuid element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:551
+#: src/qemu/qemu_migration.c:552
 #, c-format
 msgid "Incoming cookie data had unexpected UUID %s vs %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:559
+#: src/qemu/qemu_migration.c:560
 msgid "missing hostname element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:564 src/qemu/qemu_migration.c:581
+#: src/qemu/qemu_migration.c:565 src/qemu/qemu_migration.c:582
 #, c-format
 msgid "Attempt to migrate guest to the same host %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:571
+#: src/qemu/qemu_migration.c:572
 msgid "missing hostuuid element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:576
+#: src/qemu/qemu_migration.c:577
 msgid "malformed hostuuid element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:597
+#: src/qemu/qemu_migration.c:598
 msgid "missing feature name"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:603
+#: src/qemu/qemu_migration.c:604
 #, c-format
 msgid "Unknown migration cookie feature %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:611
+#: src/qemu/qemu_migration.c:612
 #, c-format
 msgid "Unsupported migration cookie feature %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:629
+#: src/qemu/qemu_migration.c:630
 msgid "Missing lock driver name in migration cookie"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:641
+#: src/qemu/qemu_migration.c:642
 #, c-format
 msgid "Too many domain elements in migration cookie: %d"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:677
+#: src/qemu/qemu_migration.c:678
 msgid "(qemu_migration_cookie)"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:739
+#: src/qemu/qemu_migration.c:740
 msgid "Migration cookie was not NULL terminated"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:759
+#: src/qemu/qemu_migration.c:760
 #, c-format
 msgid "Missing %s lock state for migration cookie"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:766
+#: src/qemu/qemu_migration.c:767
 #, c-format
 msgid "Source host lock driver %s different from target %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:803
+#: src/qemu/qemu_migration.c:804
 #, c-format
 msgid "cannot migrate domain with %d snapshots"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:812
+#: src/qemu/qemu_migration.c:813
 msgid "Domain with assigned host devices cannot be migrated"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:879
+#: src/qemu/qemu_migration.c:880
 msgid "is not active"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:902
+#: src/qemu/qemu_migration.c:903
 msgid "unexpectedly failed"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:908
+#: src/qemu/qemu_migration.c:909
 msgid "canceled by client"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:925 src/qemu/qemu_migration.c:1625
+#: src/qemu/qemu_migration.c:927 src/qemu/qemu_migration.c:1634
 msgid "migration job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:928
+#: src/qemu/qemu_migration.c:930
 msgid "domain save job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:931
+#: src/qemu/qemu_migration.c:933
 msgid "domain core dump job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:934
+#: src/qemu/qemu_migration.c:936
 msgid "job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1044
+#: src/qemu/qemu_migration.c:950
+msgid "Lost connection to destination host"
+msgstr ""
+
+#: src/qemu/qemu_migration.c:1052
 msgid "target domain name doesn't match source name nor destination name"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1141 src/qemu/qemu_migration.c:1817
+#: src/qemu/qemu_migration.c:1149 src/qemu/qemu_migration.c:1829
 msgid "cannot create pipe for tunnelled migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1161
+#: src/qemu/qemu_migration.c:1169
 msgid "cannot pass pipe for tunnelled migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1307
+#: src/qemu/qemu_migration.c:1315
 msgid ""
 "hostname on destination resolved to localhost, but migration requires an FQDN"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7042
+#: src/qemu/qemu_migration.c:1337
 msgid "only tcp URIs are supported for KVM/QEMU migrations"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7065
+#: src/qemu/qemu_migration.c:1361
 msgid "URI ended with incorrect ':port'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7233
+#: src/qemu/qemu_migration.c:1449
 msgid "tunnelled migration failed to read from qemu"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1487
+#: src/qemu/qemu_migration.c:1495
 msgid "Unable to create migration thread"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1544
+#: src/qemu/qemu_migration.c:1553
 #, c-format
 msgid "Migration with lock driver %s requires cookie support"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1633
+#: src/qemu/qemu_migration.c:1642
 msgid "failed to accept connection from qemu"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7177
+#: src/qemu/qemu_migration.c:1737
 #, c-format
 msgid "cannot parse URI %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7337
+#: src/qemu/qemu_migration.c:1807
 msgid "Source qemu is too old to support tunnelled migration"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7516
+#: src/qemu/qemu_migration.c:2233
 #, c-format
 msgid "Failed to connect to remote libvirt URI %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7522
+#: src/qemu/qemu_migration.c:2254
 msgid "Destination libvirt does not support peer-to-peer migration protocol"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2352 src/qemu/qemu_migration.c:2425
+#: src/qemu/qemu_migration.c:2368 src/qemu/qemu_migration.c:2441
 #, c-format
 msgid "Failed to resume guest %s after failure"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2486
+#: src/qemu/qemu_migration.c:2502
 msgid "received unexpected cookie with P2P migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2497
+#: src/qemu/qemu_migration.c:2513
 msgid "Unexpected dconnuri parameter with non-peer2peer migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2639
+#: src/qemu/qemu_migration.c:2650
 msgid "can't get vmdef"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2913
+#: src/qemu/qemu_migration.c:2914
 msgid "Unable to set cloexec flag"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:3007
+#: src/qemu/qemu_migration.c:3001
 #, c-format
 msgid "migration protocol going backwards %s => %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:3041
+#: src/qemu/qemu_migration.c:3035
 #, c-format
 msgid "domain '%s' is not processing incoming migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:3043
+#: src/qemu/qemu_migration.c:3037
 #, c-format
 msgid "domain '%s' is not being migrated"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:236
+#: src/qemu/qemu_monitor.c:226
 msgid "failed to create socket"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:244
+#: src/qemu/qemu_monitor.c:234
 #, c-format
 msgid "Monitor path %s too big for destination"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:261
+#: src/qemu/qemu_monitor.c:252
 msgid "failed to connect to monitor socket"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:268
+#: src/qemu/qemu_monitor.c:259
 msgid "monitor socket did not show up."
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:286
+#: src/qemu/qemu_monitor.c:277
 #, c-format
 msgid "Unable to open monitor path %s"
 msgstr ""
@@ -10560,32 +11069,32 @@
 msgid "Error while processing monitor IO"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:573
+#: src/qemu/qemu_monitor.c:646
 msgid "EOF notify callback must be supplied"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:584
+#: src/qemu/qemu_monitor.c:657
 msgid "cannot initialize monitor mutex"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:590
+#: src/qemu/qemu_monitor.c:663
 msgid "cannot initialize monitor condition"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:614
+#: src/qemu/qemu_monitor.c:687
 #, c-format
 msgid "unable to handle monitor type: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:623
+#: src/qemu/qemu_monitor.c:696
 msgid "Unable to set monitor close-on-exec flag"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:628
+#: src/qemu/qemu_monitor.c:701
 msgid "Unable to put monitor into non-blocking mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:640
+#: src/qemu/qemu_monitor.c:713
 msgid "unable to register monitor events"
 msgstr ""
 
@@ -10599,29 +11108,29 @@
 #: src/qemu/qemu_monitor.c:1157 src/qemu/qemu_monitor.c:1177
 #: src/qemu/qemu_monitor.c:1198 src/qemu/qemu_monitor.c:1218
 #: src/qemu/qemu_monitor.c:1246 src/qemu/qemu_monitor.c:1282
-#: src/qemu/qemu_monitor.c:1320 src/qemu/qemu_monitor.c:1366
-#: src/qemu/qemu_monitor.c:1398 src/qemu/qemu_monitor.c:1420
-#: src/qemu/qemu_monitor.c:1439 src/qemu/qemu_monitor.c:1460
-#: src/qemu/qemu_monitor.c:1483 src/qemu/qemu_monitor.c:1506
-#: src/qemu/qemu_monitor.c:1528 src/qemu/qemu_monitor.c:1548
-#: src/qemu/qemu_monitor.c:1568 src/qemu/qemu_monitor.c:1591
-#: src/qemu/qemu_monitor.c:1619 src/qemu/qemu_monitor.c:1652
-#: src/qemu/qemu_monitor.c:1684 src/qemu/qemu_monitor.c:1726
-#: src/qemu/qemu_monitor.c:1791 src/qemu/qemu_monitor.c:1816
-#: src/qemu/qemu_monitor.c:1866 src/qemu/qemu_monitor.c:1887
-#: src/qemu/qemu_monitor.c:1908 src/qemu/qemu_monitor.c:1931
-#: src/qemu/qemu_monitor.c:1954 src/qemu/qemu_monitor.c:1975
-#: src/qemu/qemu_monitor.c:1997 src/qemu/qemu_monitor.c:2019
-#: src/qemu/qemu_monitor.c:2057 src/qemu/qemu_monitor.c:2088
-#: src/qemu/qemu_monitor.c:2127 src/qemu/qemu_monitor.c:2152
-#: src/qemu/qemu_monitor.c:2189 src/qemu/qemu_monitor.c:2210
-#: src/qemu/qemu_monitor.c:2231 src/qemu/qemu_monitor.c:2257
-#: src/qemu/qemu_monitor.c:2277 src/qemu/qemu_monitor.c:2296
-#: src/qemu/qemu_monitor.c:2315 src/qemu/qemu_monitor.c:2338
-#: src/qemu/qemu_monitor.c:2372 src/qemu/qemu_monitor.c:2393
-#: src/qemu/qemu_monitor.c:2412 src/qemu/qemu_monitor.c:2431
-#: src/qemu/qemu_monitor.c:2450 src/qemu/qemu_monitor.c:2474
-#: src/qemu/qemu_monitor.c:2541 src/qemu/qemu_monitor.c:2633
+#: src/qemu/qemu_monitor.c:1335 src/qemu/qemu_monitor.c:1381
+#: src/qemu/qemu_monitor.c:1413 src/qemu/qemu_monitor.c:1435
+#: src/qemu/qemu_monitor.c:1454 src/qemu/qemu_monitor.c:1475
+#: src/qemu/qemu_monitor.c:1498 src/qemu/qemu_monitor.c:1521
+#: src/qemu/qemu_monitor.c:1543 src/qemu/qemu_monitor.c:1563
+#: src/qemu/qemu_monitor.c:1583 src/qemu/qemu_monitor.c:1606
+#: src/qemu/qemu_monitor.c:1634 src/qemu/qemu_monitor.c:1667
+#: src/qemu/qemu_monitor.c:1699 src/qemu/qemu_monitor.c:1741
+#: src/qemu/qemu_monitor.c:1806 src/qemu/qemu_monitor.c:1831
+#: src/qemu/qemu_monitor.c:1881 src/qemu/qemu_monitor.c:1902
+#: src/qemu/qemu_monitor.c:1923 src/qemu/qemu_monitor.c:1946
+#: src/qemu/qemu_monitor.c:1969 src/qemu/qemu_monitor.c:1990
+#: src/qemu/qemu_monitor.c:2012 src/qemu/qemu_monitor.c:2034
+#: src/qemu/qemu_monitor.c:2072 src/qemu/qemu_monitor.c:2103
+#: src/qemu/qemu_monitor.c:2142 src/qemu/qemu_monitor.c:2167
+#: src/qemu/qemu_monitor.c:2204 src/qemu/qemu_monitor.c:2225
+#: src/qemu/qemu_monitor.c:2246 src/qemu/qemu_monitor.c:2272
+#: src/qemu/qemu_monitor.c:2292 src/qemu/qemu_monitor.c:2311
+#: src/qemu/qemu_monitor.c:2330 src/qemu/qemu_monitor.c:2353
+#: src/qemu/qemu_monitor.c:2387 src/qemu/qemu_monitor.c:2408
+#: src/qemu/qemu_monitor.c:2427 src/qemu/qemu_monitor.c:2446
+#: src/qemu/qemu_monitor.c:2465 src/qemu/qemu_monitor.c:2489
+#: src/qemu/qemu_monitor.c:2556 src/qemu/qemu_monitor.c:2681
 msgid "monitor must not be NULL"
 msgstr ""
 
@@ -10633,21 +11142,21 @@
 msgid "monitor || name must not be NULL"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:1343
+#: src/qemu/qemu_monitor.c:1358
 #, c-format
 msgid "unsupported protocol type %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:1732
+#: src/qemu/qemu_monitor.c:1747
 #, c-format
 msgid "file offset must be a multiple of %llu"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:2025
+#: src/qemu/qemu_monitor.c:2040
 msgid "fd must be valid"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:2031
+#: src/qemu/qemu_monitor.c:2046
 #, c-format
 msgid "qemu is not using a unix socket monitor, cannot send fd %s"
 msgstr ""
@@ -10685,12 +11194,12 @@
 msgid "unable to execute QEMU command '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:384
+#: src/qemu/qemu_monitor_json.c:388
 #, c-format
 msgid "argument key '%s' is too short, missing type prefix"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:433
+#: src/qemu/qemu_monitor_json.c:442
 #, c-format
 msgid "unsupported data type '%c' for arg '%s'"
 msgstr ""
@@ -10724,7 +11233,7 @@
 msgid "cpu information was empty"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:1062 src/qemu/qemu_monitor_json.c:2557
+#: src/qemu/qemu_monitor_json.c:1062 src/qemu/qemu_monitor_json.c:2589
 msgid "character device information was missing array element"
 msgstr ""
 
@@ -10799,25 +11308,32 @@
 msgid "cannot find info for device '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:649
+#: src/qemu/qemu_monitor_json.c:1497 src/qemu/qemu_monitor_json.c:1636
+#: src/qemu/qemu_monitor_json.c:1711
 msgid "blockstats reply was missing device list"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:659 src/qemu/qemu_monitor_json.c:665
+#: src/qemu/qemu_monitor_json.c:1507 src/qemu/qemu_monitor_json.c:1513
+#: src/qemu/qemu_monitor_json.c:1644 src/qemu/qemu_monitor_json.c:1722
+#: src/qemu/qemu_monitor_json.c:1728
 msgid "blockstats device entry was not in expected format"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:676
+#: src/qemu/qemu_monitor_json.c:1531 src/qemu/qemu_monitor_json.c:1651
+#: src/qemu/qemu_monitor_json.c:1753
 msgid "blockstats stats entry was not in expected format"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:682 src/qemu/qemu_monitor_json.c:688
-#: src/qemu/qemu_monitor_json.c:694 src/qemu/qemu_monitor_json.c:700
+#: src/qemu/qemu_monitor_json.c:1537 src/qemu/qemu_monitor_json.c:1543
+#: src/qemu/qemu_monitor_json.c:1552 src/qemu/qemu_monitor_json.c:1558
+#: src/qemu/qemu_monitor_json.c:1564 src/qemu/qemu_monitor_json.c:1573
+#: src/qemu/qemu_monitor_json.c:1582 src/qemu/qemu_monitor_json.c:1591
+#: src/qemu/qemu_monitor_json.c:1759
 #, c-format
 msgid "cannot read %s statistic"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:708
+#: src/qemu/qemu_monitor_json.c:1599 src/qemu/qemu_monitor_json.c:1767
 #, c-format
 msgid "cannot find statistics for device '%s'"
 msgstr ""
@@ -10826,167 +11342,213 @@
 msgid "blockstats parent entry was not in expected format"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:923
+#: src/qemu/qemu_monitor_json.c:2147
 msgid "info migration reply was missing return data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:929
+#: src/qemu/qemu_monitor_json.c:2153
 msgid "info migration reply was missing return status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:935 src/qemu/qemu_monitor_text.c:969
+#: src/qemu/qemu_monitor_json.c:2159 src/qemu/qemu_monitor_text.c:1541
+#: src/qemu/qemu_monitor_text.c:1548
 #, c-format
 msgid "unexpected migration status in %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:943
+#: src/qemu/qemu_monitor_json.c:2167
 msgid "migration was active, but no RAM info was set"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:949
+#: src/qemu/qemu_monitor_json.c:2174
 msgid "migration was active, but RAM 'transferred' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:954
+#: src/qemu/qemu_monitor_json.c:2180
 msgid "migration was active, but RAM 'remaining' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:959
+#: src/qemu/qemu_monitor_json.c:2186
 msgid "migration was active, but RAM 'total' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2166
+#: src/qemu/qemu_monitor_json.c:2198
 msgid "disk migration was active, but 'transferred' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2173
+#: src/qemu/qemu_monitor_json.c:2205
 msgid "disk migration was active, but 'remaining' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2180
+#: src/qemu/qemu_monitor_json.c:2212
 msgid "disk migration was active, but 'total' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2309 src/qemu/qemu_monitor_json.c:2319
-#: src/qemu/qemu_monitor_json.c:2329
+#: src/qemu/qemu_monitor_json.c:2341 src/qemu/qemu_monitor_json.c:2351
+#: src/qemu/qemu_monitor_json.c:2361
 msgid "usb_add not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2339 src/qemu/qemu_monitor_json.c:2350
-#: src/qemu/qemu_monitor_json.c:2360 src/qemu/qemu_monitor_json.c:2626
+#: src/qemu/qemu_monitor_json.c:2371 src/qemu/qemu_monitor_json.c:2382
+#: src/qemu/qemu_monitor_json.c:2392 src/qemu/qemu_monitor_json.c:2658
 msgid "pci_add not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2369
+#: src/qemu/qemu_monitor_json.c:2401
 msgid "pci_del not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2541
+#: src/qemu/qemu_monitor_json.c:2573
 msgid "character device reply was missing return data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2547
+#: src/qemu/qemu_monitor_json.c:2579
 msgid "character device information was not an array"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2563 src/qemu/qemu_monitor_json.c:2569
+#: src/qemu/qemu_monitor_json.c:2595 src/qemu/qemu_monitor_json.c:2601
 msgid "character device information was missing filename"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1744
+#: src/qemu/qemu_monitor_json.c:2614 src/qemu/qemu_monitor_text.c:2398
 #, c-format
 msgid "failed to save chardev path '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2640
+#: src/qemu/qemu_monitor_json.c:2672
 msgid "drive_add reply was missing device address"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2646
+#: src/qemu/qemu_monitor_json.c:2678
 msgid "drive_add reply was missing device bus number"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2652
+#: src/qemu/qemu_monitor_json.c:2684
 msgid "drive_add reply was missing device unit number"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2703
+#: src/qemu/qemu_monitor_json.c:2735
 msgid "query-pci not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2822
+#: src/qemu/qemu_monitor_json.c:2854
 msgid ""
 "deleting disk is not supported.  This may leak data if disk is reassigned"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3007
+#: src/qemu/qemu_monitor_json.c:3039
 msgid ""
 "HMP passthrough is not supported by qemu process; only QMP commands can be "
 "used"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3107
+#: src/qemu/qemu_monitor_json.c:3139
 msgid "entry was missing 'device'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3116
+#: src/qemu/qemu_monitor_json.c:3148
 msgid "entry was missing 'type'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3126
+#: src/qemu/qemu_monitor_json.c:3158
 msgid "entry was missing 'speed'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3133
+#: src/qemu/qemu_monitor_json.c:3165
 msgid "entry was missing 'offset'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3139
+#: src/qemu/qemu_monitor_json.c:3171
 msgid "entry was missing 'len'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3161
+#: src/qemu/qemu_monitor_json.c:3193
 msgid "reply was missing return data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3167
+#: src/qemu/qemu_monitor_json.c:3199
 msgid "urecognized format of block job information"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3173
+#: src/qemu/qemu_monitor_json.c:3205
 msgid "unable to determine array size"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3181
+#: src/qemu/qemu_monitor_json.c:3213
 msgid "missing array element"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3229 src/qemu/qemu_monitor_text.c:3316
+#: src/qemu/qemu_monitor_json.c:3261 src/qemu/qemu_monitor_json.c:3437
+#: src/qemu/qemu_monitor_json.c:3470 src/qemu/qemu_monitor_text.c:3349
 #, c-format
 msgid "No active operation on device: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3232 src/qemu/qemu_monitor_text.c:3308
+#: src/qemu/qemu_monitor_json.c:3264 src/qemu/qemu_monitor_text.c:3341
 #, c-format
 msgid "Device %s in use"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3235 src/qemu/qemu_monitor_text.c:3328
+#: src/qemu/qemu_monitor_json.c:3267 src/qemu/qemu_monitor_json.c:3440
+#: src/qemu/qemu_monitor_json.c:3473 src/qemu/qemu_monitor_text.c:3361
 #, c-format
 msgid "Operation is not supported for device: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3238 src/qemu/qemu_monitor_text.c:3388
+#: src/qemu/qemu_monitor_json.c:3270 src/qemu/qemu_monitor_text.c:3421
+#: src/qemu/qemu_monitor_text.c:3497 src/qemu/qemu_monitor_text.c:3603
 #, c-format
 msgid "Command '%s' is not found"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3241
+#: src/qemu/qemu_monitor_json.c:3273 src/qemu/qemu_monitor_json.c:3443
+#: src/qemu/qemu_monitor_json.c:3476
 msgid "Unexpected error"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:173
-msgid "Password request seen, but no handler available"
+#: src/qemu/qemu_monitor_json.c:3327
+msgid " block_io_throttle reply was missing device list"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3338 src/qemu/qemu_monitor_json.c:3344
+msgid "block io throttle device entry was not in expected format"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3358
+msgid "block io throttle inserted entry was not in expected format"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3364
+msgid "cannot read total_bytes_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3370
+msgid "cannot read read_bytes_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3376
+msgid "cannot read write_bytes_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3382
+msgid "cannot read total_iops_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3388
+msgid "cannot read read_iops_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3394
+msgid "cannot read write_iops_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3402
+#, c-format
+msgid "cannot find throttling info for device '%s'"
+msgstr ""
+
+#: src/qemu/qemu_monitor_text.c:173
+msgid "Password request seen, but no handler available"
 msgstr ""
 
 #: src/qemu/qemu_monitor_text.c:321
@@ -10994,7 +11556,7 @@
 msgid "Unable to extract disk path from %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:354
+#: src/qemu/qemu_monitor_text.c:389
 msgid "cannot stop CPU execution"
 msgstr ""
 
@@ -11007,7 +11569,7 @@
 msgid "unexpected reply from info status: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:367
+#: src/qemu/qemu_monitor_text.c:450
 msgid "system shutdown operation failed"
 msgstr ""
 
@@ -11027,7 +11589,7 @@
 msgid "system reset operation failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:386
+#: src/qemu/qemu_monitor_text.c:528
 msgid "cannot run monitor command to fetch CPU thread info"
 msgstr ""
 
@@ -11035,7 +11597,7 @@
 msgid "could not query kvm status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:534
+#: src/qemu/qemu_monitor_text.c:716
 msgid "could not query memory balloon allocation"
 msgstr ""
 
@@ -11044,7 +11606,7 @@
 msgid "unexpected balloon information '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:571
+#: src/qemu/qemu_monitor_text.c:760
 msgid "could not query memory balloon statistics"
 msgstr ""
 
@@ -11061,15 +11623,15 @@
 msgid "no info for device '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:602
+#: src/qemu/qemu_monitor_text.c:884 src/qemu/qemu_monitor_text.c:1011
 msgid "'info blockstats' command failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:614
+#: src/qemu/qemu_monitor_text.c:896 src/qemu/qemu_monitor_text.c:1023
 msgid "'info blockstats' not supported by this qemu"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:678
+#: src/qemu/qemu_monitor_text.c:994
 #, c-format
 msgid "no stats found for device %s"
 msgstr ""
@@ -11078,855 +11640,876 @@
 msgid "unable to query block extent with this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:725
+#: src/qemu/qemu_monitor_text.c:1095
+msgid "failed to resize block"
+msgstr ""
+
+#: src/qemu/qemu_monitor_text.c:1151
 msgid "setting VNC password failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1143
+#: src/qemu/qemu_monitor_text.c:1176
 msgid "setting password failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1177
+#: src/qemu/qemu_monitor_text.c:1210
 msgid "expiring password failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:754
+#: src/qemu/qemu_monitor_text.c:1249
 msgid "could not balloon memory allocation"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1253
+#: src/qemu/qemu_monitor_text.c:1286
 msgid "could not change CPU online status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:787 src/qemu/qemu_monitor_text.c:831
+#: src/qemu/qemu_monitor_text.c:1321
 #, c-format
 msgid "could not eject media on %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:796 src/qemu/qemu_monitor_text.c:840
+#: src/qemu/qemu_monitor_text.c:1330
 #, c-format
 msgid "could not eject media on %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1332
+#: src/qemu/qemu_monitor_text.c:1365
 #, c-format
 msgid "could not change media on %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1341 src/qemu/qemu_monitor_text.c:1348
+#: src/qemu/qemu_monitor_text.c:1374 src/qemu/qemu_monitor_text.c:1381
 #, c-format
 msgid "could not change media on %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1384
+#: src/qemu/qemu_monitor_text.c:1417
 #, c-format
 msgid "could not save memory region to '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1431
+#: src/qemu/qemu_monitor_text.c:1464
 msgid "could not restrict migration speed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1458
+#: src/qemu/qemu_monitor_text.c:1491
 msgid "could not set maximum migration downtime"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:958
+#: src/qemu/qemu_monitor_text.c:1532
 msgid "cannot query migration status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:982
+#: src/qemu/qemu_monitor_text.c:1561
 #, c-format
 msgid "cannot parse migration data transferred statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:993
+#: src/qemu/qemu_monitor_text.c:1574
 #, c-format
 msgid "cannot parse migration data remaining statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1004
+#: src/qemu/qemu_monitor_text.c:1587
 #, c-format
 msgid "cannot parse migration data total statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1570
+#: src/qemu/qemu_monitor_text.c:1603
 #, c-format
 msgid "cannot parse disk migration data transferred statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1583
+#: src/qemu/qemu_monitor_text.c:1616
 #, c-format
 msgid "cannot parse disk migration data remaining statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1596
+#: src/qemu/qemu_monitor_text.c:1629
 #, c-format
 msgid "cannot parse disk migration data total statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1048
+#: src/qemu/qemu_monitor_text.c:1683
 #, c-format
 msgid "unable to start migration to %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1055
+#: src/qemu/qemu_monitor_text.c:1690
 #, c-format
 msgid "migration to '%s' failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1062
+#: src/qemu/qemu_monitor_text.c:1697
 #, c-format
 msgid "migration to '%s' not supported by this qemu: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1159
+#: src/qemu/qemu_monitor_text.c:1718
 msgid "cannot run monitor command to cancel migration"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1714
+#: src/qemu/qemu_monitor_text.c:1747
 msgid "cannot run monitor command to relocate graphics client"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1188
+#: src/qemu/qemu_monitor_text.c:1778
 msgid "cannot run monitor command to add usb disk"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1196
+#: src/qemu/qemu_monitor_text.c:1786
 #, c-format
 msgid "unable to add USB disk %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1223
+#: src/qemu/qemu_monitor_text.c:1814
 msgid "cannot attach usb device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1231
+#: src/qemu/qemu_monitor_text.c:1822
 msgid "adding usb device failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1371
+#: src/qemu/qemu_monitor_text.c:1955
 msgid "cannot attach host pci device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1386 src/qemu/qemu_monitor_text.c:1478
+#: src/qemu/qemu_monitor_text.c:1967 src/qemu/qemu_monitor_text.c:2054
 #, c-format
 msgid "parsing pci_add reply failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1426
+#: src/qemu/qemu_monitor_text.c:2006
 #, c-format
 msgid "cannot attach %s disk %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1440
+#: src/qemu/qemu_monitor_text.c:2019
 #, c-format
 msgid "adding %s disk failed %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1471
+#: src/qemu/qemu_monitor_text.c:2048
 #, c-format
 msgid "failed to add NIC with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1517
+#: src/qemu/qemu_monitor_text.c:2092
 msgid "failed to remove PCI device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1536
+#: src/qemu/qemu_monitor_text.c:2111
 #, c-format
 msgid "failed to detach PCI device, invalid address %.4x:%.2x:%.2x: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1565
+#: src/qemu/qemu_monitor_text.c:2140
 #, c-format
 msgid "failed to pass fd to qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1573
+#: src/qemu/qemu_monitor_text.c:2148
 #, c-format
 msgid "qemu does not support sending of file handles: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2122
+#: src/qemu/qemu_monitor_text.c:2155
 #, c-format
 msgid "unable to send file handle '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1601 src/qemu/qemu_monitor_text.c:1637
+#: src/qemu/qemu_monitor_text.c:2183
 #, c-format
 msgid "failed to close fd in qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1609
+#: src/qemu/qemu_monitor_text.c:2191
 #, c-format
 msgid "qemu does not support closing of file handles: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2186
+#: src/qemu/qemu_monitor_text.c:2219
 #, c-format
 msgid "failed to add host net with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2192
+#: src/qemu/qemu_monitor_text.c:2225
 #, c-format
 msgid "unable to add host net: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1667
+#: src/qemu/qemu_monitor_text.c:2254
 #, c-format
 msgid "failed to remove host network in qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2250
+#: src/qemu/qemu_monitor_text.c:2283
 #, c-format
 msgid "failed to add netdev with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2279
+#: src/qemu/qemu_monitor_text.c:2312
 #, c-format
 msgid "failed to remove netdev in qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2314
+#: src/qemu/qemu_monitor_text.c:2347
 msgid "failed to retrieve chardev info in qemu with 'info chardev'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2399
+#: src/qemu/qemu_monitor_text.c:2432
 #, c-format
 msgid "cannot attach %s disk controller"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2412
+#: src/qemu/qemu_monitor_text.c:2445
 #, c-format
 msgid "adding %s disk controller failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2498
+#: src/qemu/qemu_monitor_text.c:2531
 #, c-format
 msgid "failed to attach drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2504 src/qemu/qemu_monitor_text.c:2781
+#: src/qemu/qemu_monitor_text.c:2537 src/qemu/qemu_monitor_text.c:2814
 msgid "drive hotplug is not supported"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2516
+#: src/qemu/qemu_monitor_text.c:2549
 #, c-format
 msgid "adding %s disk failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2571
+#: src/qemu/qemu_monitor_text.c:2604
 #, c-format
 msgid "cannot parse value for %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2589
+#: src/qemu/qemu_monitor_text.c:2622
 msgid "cannot query PCI addresses"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2682
+#: src/qemu/qemu_monitor_text.c:2715
 #, c-format
 msgid "cannot detach %s device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2688
+#: src/qemu/qemu_monitor_text.c:2721
 #, c-format
 msgid "detaching %s device failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2722
+#: src/qemu/qemu_monitor_text.c:2755
 #, c-format
 msgid "cannot attach %s device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2738
+#: src/qemu/qemu_monitor_text.c:2771
 #, c-format
 msgid "adding %s device failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2775
+#: src/qemu/qemu_monitor_text.c:2808
 #, c-format
 msgid "failed to add drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2787
+#: src/qemu/qemu_monitor_text.c:2820
 msgid "open disk image file failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2823
+#: src/qemu/qemu_monitor_text.c:2856
 #, c-format
 msgid "cannot delete %s drive"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2828
+#: src/qemu/qemu_monitor_text.c:2861
 msgid ""
 "deleting drive is not supported.  This may leak data if disk is reassigned"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2840
+#: src/qemu/qemu_monitor_text.c:2873
 #, c-format
 msgid "deleting %s drive failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2876
+#: src/qemu/qemu_monitor_text.c:2909
 msgid "failed to set disk password"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2882
+#: src/qemu/qemu_monitor_text.c:2915
 msgid "setting disk password is not supported"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2886
+#: src/qemu/qemu_monitor_text.c:2919
 msgid "the disk password is incorrect"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2914 src/qemu/qemu_monitor_text.c:3066
+#: src/qemu/qemu_monitor_text.c:2947 src/qemu/qemu_monitor_text.c:3099
 #, c-format
 msgid "failed to take snapshot using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2920 src/qemu/qemu_monitor_text.c:3073
+#: src/qemu/qemu_monitor_text.c:2953 src/qemu/qemu_monitor_text.c:3106
 #, c-format
 msgid "Failed to take snapshot: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2925
+#: src/qemu/qemu_monitor_text.c:2958
 msgid "this domain does not have a device to take snapshots"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2962
+#: src/qemu/qemu_monitor_text.c:2995
 #, c-format
 msgid "failed to restore snapshot using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2969
+#: src/qemu/qemu_monitor_text.c:3002
 msgid "this domain does not have a device to load snapshots"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2974
+#: src/qemu/qemu_monitor_text.c:3007
 #, c-format
 msgid "the snapshot '%s' does not exist, and was not loaded"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3020
+#: src/qemu/qemu_monitor_text.c:3053
 #, c-format
 msgid "failed to delete snapshot using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3027
+#: src/qemu/qemu_monitor_text.c:3060
 msgid "this domain does not have a device to delete snapshots"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3104
+#: src/qemu/qemu_monitor_text.c:3137
 #, c-format
 msgid "failed to run cmd '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3134
+#: src/qemu/qemu_monitor_text.c:3167
 #, c-format
 msgid "failed to inject NMI using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3156
+#: src/qemu/qemu_monitor_text.c:3189
 #, c-format
 msgid "keycode %d is invalid: 0x%X"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3178
+#: src/qemu/qemu_monitor_text.c:3211
 #, c-format
 msgid "failed to send key using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3185
+#: src/qemu/qemu_monitor_text.c:3218
 #, c-format
 msgid "failed to send key '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3211
+#: src/qemu/qemu_monitor_text.c:3244
 msgid "taking screenshot failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3302
+#: src/qemu/qemu_monitor_text.c:3335
 msgid "Device not found"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3381
+#: src/qemu/qemu_monitor_text.c:3414 src/qemu/qemu_monitor_text.c:3490
+#: src/qemu/qemu_monitor_text.c:3596
 msgid "cannot run monitor command"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3418
+#: src/qemu/qemu_monitor_text.c:3451
 msgid "adding graphics client failed"
 msgstr ""
 
-#: src/qemu/qemu_process.c:201
+#: src/qemu/qemu_monitor_text.c:3580
+#, c-format
+msgid "No info for device '%s'"
+msgstr ""
+
+#: src/qemu/qemu_process.c:202
 #, c-format
 msgid "no disk found with path %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:224
+#: src/qemu/qemu_process.c:225
 #, c-format
 msgid "no disk found with alias %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:244
+#: src/qemu/qemu_process.c:245
 #, c-format
 msgid "disk %s does not have any encryption information"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:737
+#: src/qemu/qemu_process.c:253
 msgid "cannot find secrets without a connection"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:745 src/storage/storage_backend.c:387
+#: src/qemu/qemu_process.c:261 src/storage/storage_backend.c:465
 msgid "secret storage not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:758
+#: src/qemu/qemu_process.c:270
 #, c-format
 msgid "invalid <encryption> for volume %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:776
+#: src/qemu/qemu_process.c:288
 #, c-format
 msgid "format='qcow' passphrase for %s must not contain a '\\0'"
 msgstr ""
 
-#: src/qemu/qemu_process.c:452
+#: src/qemu/qemu_process.c:447
 msgid "Failed to create reboot thread, killing domain"
 msgstr ""
 
-#: src/qemu/qemu_process.c:843
+#: src/qemu/qemu_process.c:877
 #, c-format
 msgid "Failed to set security context for monitor for %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:876
+#: src/qemu/qemu_process.c:910
 #, c-format
 msgid "Failed to clear security context for monitor for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1326
+#: src/qemu/qemu_process.c:976
 #, c-format
 msgid "Failure while reading %s log output"
 msgstr ""
 
-#: src/qemu/qemu_process.c:964
+#: src/qemu/qemu_process.c:998
 #, c-format
 msgid "Out of space while reading %s log output: %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:971
+#: src/qemu/qemu_process.c:1005
 #, c-format
 msgid "Process exited while reading %s log output: %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:986
+#: src/qemu/qemu_process.c:1020
 #, c-format
 msgid "Timed out while reading %s log output: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1432
+#: src/qemu/qemu_process.c:1107
 #, c-format
 msgid "no assigned pty for device %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1255
+#: src/qemu/qemu_process.c:1300
 #, c-format
 msgid "process exited while connecting to monitor: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1593
+#: src/qemu/qemu_process.c:1350
 #, c-format
 msgid "got wrong number of vCPU pids from QEMU monitor. got %d, wanted %d"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1341
-msgid "Host kernel is not aware of NUMA."
-msgstr ""
-
-#: src/qemu/qemu_process.c:1353
-#, c-format
-msgid "Host cannot support NUMA node %d"
-msgstr ""
-
-#: src/qemu/qemu_process.c:1382
-msgid "NUMA memory tuning in 'preferred' mode only supports single node"
-msgstr ""
-
-#: src/qemu/qemu_process.c:1396
+#: src/qemu/qemu_process.c:1441
 msgid "Invalid mode for memory NUMA tuning."
 msgstr ""
 
-#: src/qemu/qemu_process.c:1411
+#: src/qemu/qemu_process.c:1456
 msgid "libvirt is compiled without NUMA tuning support"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1492
+#: src/qemu/qemu_process.c:1537
 msgid "Setting of link state is not supported by this qemu"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1501
+#: src/qemu/qemu_process.c:1546
 #, c-format
 msgid "Couldn't set link state on interface: %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1902
+#: src/qemu/qemu_process.c:1947
 #, c-format
 msgid "cannot find PCI address for VirtIO disk %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1916
+#: src/qemu/qemu_process.c:1961
 #, c-format
 msgid "cannot find PCI address for %s NIC"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1930
+#: src/qemu/qemu_process.c:1975
 #, c-format
 msgid "cannot find PCI address for controller %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1944
+#: src/qemu/qemu_process.c:1989
 #, c-format
 msgid "cannot find PCI address for video adapter %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1958
+#: src/qemu/qemu_process.c:2003
 #, c-format
 msgid "cannot find PCI address for sound adapter %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1971
+#: src/qemu/qemu_process.c:2016
 #, c-format
 msgid "cannot find PCI address for watchdog %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1983
+#: src/qemu/qemu_process.c:2028
 #, c-format
 msgid "cannot find PCI address for balloon %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2102
+#: src/qemu/qemu_process.c:2147
 #, c-format
 msgid "Unable to pre-create chardev file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2122
+#: src/qemu/qemu_process.c:2167
 #, c-format
 msgid "cannot limit number of processes to %d"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2773
+#: src/qemu/qemu_process.c:2843
 msgid "Could not create thread. QEMU initialization might be incomplete"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2374 src/uml/uml_driver.c:823
+#: src/qemu/qemu_process.c:2909 src/qemu/qemu_process.c:3579
+#: src/uml/uml_driver.c:983
 msgid "VM is already active"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2914
+#: src/qemu/qemu_process.c:2984
 msgid "Unable to find an unused SPICE port"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2922
+#: src/qemu/qemu_process.c:2992
 msgid "Unable to find an unused SPICE TLS port"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2403 src/uml/uml_driver.c:845
+#: src/qemu/qemu_process.c:3005 src/qemu/qemu_process.c:3595
+#: src/uml/uml_driver.c:1005
 #, c-format
 msgid "cannot create log directory %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2459
+#: src/qemu/qemu_process.c:3054
 msgid "Failed to build pidfile path."
 msgstr ""
 
-#: src/qemu/qemu_process.c:2991
+#: src/qemu/qemu_process.c:3061
 #, c-format
 msgid "Cannot remove stale PID file %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:3086
+#: src/qemu/qemu_process.c:3156
 #, c-format
 msgid "Domain %s didn't show up"
 msgstr ""
 
-#: src/qemu/qemu_process.c:3133
+#: src/qemu/qemu_process.c:3203
 #, c-format
 msgid "cannot stat fd %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2635
+#: src/qemu/qemu_process.c:3426
 #, c-format
 msgid "failed to remove ebtables rule to allow MAC address on  '%s'"
 msgstr ""
 
-#: src/remote/remote_client_bodies.h:17 src/remote/remote_client_bodies.h:1192
-#: src/remote/remote_client_bodies.h:1231
-#: src/remote/remote_client_bodies.h:1299
-#: src/remote/remote_client_bodies.h:1471
-#: src/remote/remote_client_bodies.h:1505
-#: src/remote/remote_client_bodies.h:1841
-#: src/remote/remote_client_bodies.h:4882
+#: src/remote/remote_client_bodies.h:17 src/remote/remote_client_bodies.h:1219
+#: src/remote/remote_client_bodies.h:1258
+#: src/remote/remote_client_bodies.h:1326
+#: src/remote/remote_client_bodies.h:1498
+#: src/remote/remote_client_bodies.h:1532
+#: src/remote/remote_client_bodies.h:1868
+#: src/remote/remote_client_bodies.h:4967
 #, c-format
 msgid "%s length greater than maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_client_bodies.h:2319
-#: src/remote/remote_client_bodies.h:2338
-#: src/remote/remote_client_bodies.h:2382
-#: src/remote/remote_client_bodies.h:2401
-#: src/remote/remote_client_bodies.h:3126
-#: src/remote/remote_client_bodies.h:3143
-#: src/remote/remote_client_bodies.h:3187
-#: src/remote/remote_client_bodies.h:3204
-#: src/remote/remote_client_bodies.h:3248
-#: src/remote/remote_client_bodies.h:3265
-#: src/remote/remote_client_bodies.h:3309
-#: src/remote/remote_client_bodies.h:3326
-#: src/remote/remote_client_bodies.h:3370
-#: src/remote/remote_client_bodies.h:3387
-#: src/remote/remote_client_bodies.h:3431
-#: src/remote/remote_client_bodies.h:3448
-#: src/remote/remote_client_bodies.h:3492
-#: src/remote/remote_client_bodies.h:3509
-#: src/remote/remote_client_bodies.h:3553
-#: src/remote/remote_client_bodies.h:3570
-#: src/remote/remote_client_bodies.h:3614
-#: src/remote/remote_client_bodies.h:3631
-#: src/remote/remote_client_bodies.h:4130
-#: src/remote/remote_client_bodies.h:4148
-#: src/remote/remote_client_bodies.h:4303
-#: src/remote/remote_client_bodies.h:4322
-#: src/remote/remote_client_bodies.h:5240
-#: src/remote/remote_client_bodies.h:5258
+#: src/remote/remote_client_bodies.h:2378
+#: src/remote/remote_client_bodies.h:2397
+#: src/remote/remote_client_bodies.h:2441
+#: src/remote/remote_client_bodies.h:2460
+#: src/remote/remote_client_bodies.h:3185
+#: src/remote/remote_client_bodies.h:3202
+#: src/remote/remote_client_bodies.h:3246
+#: src/remote/remote_client_bodies.h:3263
+#: src/remote/remote_client_bodies.h:3307
+#: src/remote/remote_client_bodies.h:3324
+#: src/remote/remote_client_bodies.h:3368
+#: src/remote/remote_client_bodies.h:3385
+#: src/remote/remote_client_bodies.h:3429
+#: src/remote/remote_client_bodies.h:3446
+#: src/remote/remote_client_bodies.h:3490
+#: src/remote/remote_client_bodies.h:3507
+#: src/remote/remote_client_bodies.h:3551
+#: src/remote/remote_client_bodies.h:3568
+#: src/remote/remote_client_bodies.h:3612
+#: src/remote/remote_client_bodies.h:3629
+#: src/remote/remote_client_bodies.h:3673
+#: src/remote/remote_client_bodies.h:3690
+#: src/remote/remote_client_bodies.h:4189
+#: src/remote/remote_client_bodies.h:4207
+#: src/remote/remote_client_bodies.h:4362
+#: src/remote/remote_client_bodies.h:4381
+#: src/remote/remote_client_bodies.h:5325
+#: src/remote/remote_client_bodies.h:5343
 #, c-format
 msgid "too many remote undefineds: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:349
+#: src/remote/remote_driver.c:354
 #, c-format
 msgid "using unix socket and remote server '%s' is not supported."
 msgstr ""
 
-#: src/remote/remote_driver.c:411
+#: src/remote/remote_driver.c:369
 msgid ""
 "remote_open: transport in URL not recognised (should be tls|unix|ssh|ext|tcp)"
 msgstr ""
 
-#: src/remote/remote_driver.c:569
+#: src/remote/remote_driver.c:539
 msgid "remote_open: for 'ext' transport, command is required"
 msgstr ""
 
-#: src/remote/remote_driver.c:816
+#: src/remote/remote_driver.c:596
+msgid "Unable to locate libvirtd daemon in $PATH"
+msgstr ""
+
+#: src/remote/remote_driver.c:651
 msgid "transport methods unix, ssh and ext are not supported under Windows"
 msgstr ""
 
-#: src/remote/remote_driver.c:1050
+#: src/remote/remote_driver.c:1078
 msgid "remoteNodeGetCPUStats: returned number of stats exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:1069 src/remote/remote_driver.c:1133
+#: src/remote/remote_driver.c:1097 src/remote/remote_driver.c:1161
 #, c-format
 msgid "Stats %s too big for destination"
 msgstr ""
 
-#: src/remote/remote_driver.c:1114
+#: src/remote/remote_driver.c:1142
 msgid "remoteNodeGetMemoryStats: returned number of stats exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:1760
+#: src/remote/remote_driver.c:1194
 #, c-format
 msgid "too many NUMA cells: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:1823 src/remote/remote_driver.c:1837
+#: src/remote/remote_driver.c:1233 src/remote/remote_driver.c:1247
 #, c-format
 msgid "too many remote domain IDs: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:1327
+#: src/remote/remote_driver.c:1365
 msgid "returned number of parameters exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:1410
+#: src/remote/remote_driver.c:1462
 msgid "remoteDomainBlockStatsFlags: returned number of stats exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:2428
+#: src/remote/remote_driver.c:1609 src/remote/remote_driver.c:1682
 #, c-format
 msgid "vCPU count exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2434
+#: src/remote/remote_driver.c:1617 src/remote/remote_driver.c:1689
 #, c-format
 msgid "vCPU map buffer length exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2451
+#: src/remote/remote_driver.c:1638 src/remote/remote_driver.c:1706
 #, c-format
 msgid "host reports too many vCPUs: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2457
+#: src/remote/remote_driver.c:1645 src/remote/remote_driver.c:1712
 #, c-format
 msgid "host reports map buffer length exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2532
+#: src/remote/remote_driver.c:1762
 #, c-format
 msgid "security label exceeds maximum: %zd"
 msgstr ""
 
-#: src/remote/remote_driver.c:2567
+#: src/remote/remote_driver.c:1833
 #, c-format
 msgid "security model exceeds maximum: %zd"
 msgstr ""
 
-#: src/remote/remote_driver.c:2576
+#: src/remote/remote_driver.c:1842
 #, c-format
 msgid "security doi exceeds maximum: %zd"
 msgstr ""
 
-#: src/remote/remote_driver.c:1876
+#: src/remote/remote_driver.c:1928
 msgid "caller ignores cookie or cookielen"
 msgstr ""
 
-#: src/remote/remote_driver.c:1885 src/remote/remote_driver.c:3881
+#: src/remote/remote_driver.c:1937 src/remote/remote_driver.c:3988
 msgid "caller ignores uri_out"
 msgstr ""
 
-#: src/remote/remote_driver.c:3384
+#: src/remote/remote_driver.c:2040
 #, c-format
 msgid "too many memory stats requested: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:3428
+#: src/remote/remote_driver.c:2084
 #, c-format
 msgid "block peek request too large for remote protocol, %zi > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:3449 src/remote/remote_driver.c:3500
+#: src/remote/remote_driver.c:2105 src/remote/remote_driver.c:2156
 msgid "returned buffer is not same size as requested"
 msgstr ""
 
-#: src/remote/remote_driver.c:3480
+#: src/remote/remote_driver.c:2136
 #, c-format
 msgid "memory peek request too large for remote protocol, %zi > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:6027
+#: src/remote/remote_driver.c:2556
 #, c-format
 msgid "unknown authentication type %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:6037
+#: src/remote/remote_driver.c:2565
 #, c-format
 msgid "requested authentication type %s rejected"
 msgstr ""
 
-#: src/remote/remote_driver.c:6078
+#: src/remote/remote_driver.c:2604
 #, c-format
 msgid "unsupported authentication type %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:6425
+#: src/remote/remote_driver.c:2859
 #, c-format
 msgid "SASL mechanism %s not supported by server"
 msgstr ""
 
-#: src/remote/remote_driver.c:6462 src/remote/remote_driver.c:6540
+#: src/remote/remote_driver.c:2886 src/remote/remote_driver.c:2956
 msgid "Failed to make auth credentials"
 msgstr ""
 
-#: src/remote/remote_driver.c:2800
+#: src/remote/remote_driver.c:2907
 #, c-format
 msgid "SASL negotiation data too long: %zu bytes"
 msgstr ""
 
-#: src/remote/remote_driver.c:6686
+#: src/remote/remote_driver.c:2965 src/remote/remote_driver.c:3092
 msgid "Failed to collect auth credentials"
 msgstr ""
 
-#: src/remote/remote_driver.c:2860
+#: src/remote/remote_driver.c:2967
 msgid "No authentication callback available"
 msgstr ""
 
-#: src/remote/remote_driver.c:6610
+#: src/remote/remote_driver.c:3019
 #, c-format
 msgid "negotiation SSF %d was not strong enough"
 msgstr ""
 
-#: src/remote/remote_driver.c:6721
+#: src/remote/remote_driver.c:3127 src/remote/remote_driver.c:3767
 msgid "no event support"
 msgstr ""
 
-#: src/remote/remote_driver.c:6726
+#: src/remote/remote_driver.c:3133 src/remote/remote_driver.c:3775
 msgid "adding cb to list"
 msgstr ""
 
-#: src/remote/remote_driver.c:3396
+#: src/remote/remote_driver.c:3503
 msgid "no internalFlags support"
 msgstr ""
 
-#: src/remote/remote_driver.c:3710
+#: src/remote/remote_driver.c:3817
 #, c-format
 msgid "unable to find callback ID %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:3813 src/remote/remote_driver.c:3872
-#: src/remote/remote_driver.c:3954 src/remote/remote_driver.c:4015
-#: src/remote/remote_driver.c:4074
+#: src/remote/remote_driver.c:3920 src/remote/remote_driver.c:3979
+#: src/remote/remote_driver.c:4061 src/remote/remote_driver.c:4122
+#: src/remote/remote_driver.c:4181
 msgid "caller ignores cookieout or cookieoutlen"
 msgstr ""
 
-#: src/remote/remote_driver.c:831
+#: src/remote/remote_driver.c:4275
+msgid ""
+"the caller doesn't support keepalive protocol; perhaps it's missing event "
+"loop implementation"
+msgstr ""
+
+#: src/rpc/virkeepalive.c:337
+msgid "keepalive interval already set"
+msgstr ""
+
+#: src/rpc/virnetclient.c:280
 msgid "unable to make pipe"
 msgstr ""
 
-#: src/rpc/virnetclient.c:426
+#: src/rpc/virnetclient.c:540 src/rpc/virnetclient.c:1556
+msgid "failed to wake up polling thread"
+msgstr ""
+
+#: src/rpc/virnetclient.c:645
 msgid "Unable to read TLS confirmation"
 msgstr ""
 
-#: src/rpc/virnetclient.c:431
+#: src/rpc/virnetclient.c:650
 msgid "server verification (of our certificate or IP address) failed"
 msgstr ""
 
-#: src/rpc/virnetclient.c:568
+#: src/rpc/virnetclient.c:801
 #, c-format
 msgid "no call waiting for reply with prog %d vers %d serial %d"
 msgstr ""
 
-#: src/rpc/virnetclient.c:716
+#: src/rpc/virnetclient.c:954
 #, c-format
 msgid "got unexpected RPC call prog %d vers %d proc %d type %d"
 msgstr ""
 
-#: src/rpc/virnetclient.c:985
+#: src/rpc/virnetclient.c:1382
 msgid "read on wakeup fd failed"
 msgstr ""
 
-#: src/remote/remote_driver.c:8307
+#: src/rpc/virnetclient.c:1402
 msgid "poll on socket failed"
 msgstr ""
 
-#: src/remote/remote_driver.c:8368
+#: src/rpc/virnetclient.c:1450
 msgid "received hangup / error event on socket"
 msgstr ""
 
-#: src/rpc/virnetclient.c:1139
-msgid "failed to wake up polling thread"
-msgstr ""
-
-#: src/remote/remote_driver.c:8462
+#: src/rpc/virnetclient.c:1565
 msgid "failed to wait on condition"
 msgstr ""
 
-#: src/rpc/virnetclient.c:1269
+#: src/rpc/virnetclient.c:1691
 msgid "Attempt to send an asynchronous message with a synchronous reply"
 msgstr ""
 
-#: daemon/libvirtd.c:836
+#: src/rpc/virnetclient.c:1697
+msgid "Attempt to send a non-blocking message with a synchronous reply"
+msgstr ""
+
+#: src/rpc/virnetclient.c:1710
+msgid "client socket is closed"
+msgstr ""
+
+#: src/rpc/virnetclient.c:1716
 msgid "cannot initialize condition variable"
 msgstr ""
 
@@ -11986,11 +12569,11 @@
 msgid "Unexpected message status %d"
 msgstr ""
 
-#: src/rpc/virnetclientstream.c:455
+#: src/rpc/virnetclientstream.c:456
 msgid "multiple stream callbacks not supported"
 msgstr ""
 
-#: src/rpc/virnetclientstream.c:491 src/rpc/virnetclientstream.c:513
+#: src/rpc/virnetclientstream.c:492 src/rpc/virnetclientstream.c:514
 msgid "no stream callback registered"
 msgstr ""
 
@@ -12070,7 +12653,7 @@
 msgid "Unable to duplicate FD %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:6320
+#: src/rpc/virnetsaslcontext.c:61 src/rpc/virnetsaslcontext.c:91
 #, c-format
 msgid "failed to initialize SASL library: %d (%s)"
 msgstr ""
@@ -12086,7 +12669,7 @@
 msgid "Malformed TLS whitelist regular expression '%s'"
 msgstr ""
 
-#: daemon/remote.c:3088
+#: src/rpc/virnetsaslcontext.c:146
 #, c-format
 msgid "SASL client %s not allowed in whitelist"
 msgstr ""
@@ -12095,31 +12678,31 @@
 msgid "Client's username is not on the list of allowed clients"
 msgstr ""
 
-#: src/remote/remote_driver.c:6364
+#: src/rpc/virnetsaslcontext.c:218 src/rpc/virnetsaslcontext.c:264
 #, c-format
 msgid "Failed to create SASL client context: %d (%s)"
 msgstr ""
 
-#: src/remote/remote_driver.c:6387
+#: src/rpc/virnetsaslcontext.c:293
 #, c-format
 msgid "cannot set external SSF %d (%s)"
 msgstr ""
 
-#: daemon/remote.c:3051
+#: src/rpc/virnetsaslcontext.c:314
 #, c-format
 msgid "cannot query SASL username on connection %d (%s)"
 msgstr ""
 
-#: daemon/remote.c:3059
+#: src/rpc/virnetsaslcontext.c:321
 msgid "no client username was found"
 msgstr ""
 
-#: daemon/remote.c:3012 src/remote/remote_driver.c:6601
+#: src/rpc/virnetsaslcontext.c:342
 #, c-format
 msgid "cannot query SASL ssf on connection %d (%s)"
 msgstr ""
 
-#: src/remote/remote_driver.c:6406
+#: src/rpc/virnetsaslcontext.c:378
 #, c-format
 msgid "cannot set security props %d (%s)"
 msgstr ""
@@ -12129,12 +12712,13 @@
 msgid "cannot get security props %d (%s)"
 msgstr ""
 
-#: daemon/remote.c:2972
+#: src/rpc/virnetsaslcontext.c:430
 #, c-format
 msgid "cannot list SASL mechanisms %d (%s)"
 msgstr ""
 
-#: src/remote/remote_driver.c:6444
+#: src/rpc/virnetsaslcontext.c:483 src/rpc/virnetsaslcontext.c:578
+#: src/rpc/virnetsaslcontext.c:623
 #, c-format
 msgid "Failed to start SASL negotiation: %d (%s)"
 msgstr ""
@@ -12159,184 +12743,188 @@
 msgid "failed to decode SASL data: %d (%s)"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:122
+#: src/rpc/virnetsocket.c:123
 msgid "Unable to set close-on-exec flag"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:127
+#: src/rpc/virnetsocket.c:128
 msgid "Unable to enable non-blocking flag"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:159
+#: src/rpc/virnetsocket.c:160
 msgid "Unable to disable nagle algorithm"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:212 src/rpc/virnetsocket.c:409
+#: src/rpc/virnetsocket.c:213 src/rpc/virnetsocket.c:410
 #, c-format
 msgid "Unable to resolve address '%s' service '%s': %s"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:225 src/rpc/virnetsocket.c:420
+#: src/rpc/virnetsocket.c:226 src/rpc/virnetsocket.c:421
 msgid "Unable to create socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:231
+#: src/rpc/virnetsocket.c:232
 msgid "Unable to enable port reuse"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:248
+#: src/rpc/virnetsocket.c:249
 msgid "Unable to force bind to IPv6 only"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:256 src/rpc/virnetsocket.c:286
+#: src/rpc/virnetsocket.c:257 src/rpc/virnetsocket.c:287
 msgid "Unable to bind to port"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:267 src/rpc/virnetsocket.c:443
-#: src/rpc/virnetsocket.c:516 src/rpc/virnetsocket.c:1251
+#: src/rpc/virnetsocket.c:268 src/rpc/virnetsocket.c:444
+#: src/rpc/virnetsocket.c:523 src/rpc/virnetsocket.c:1272
 msgid "Unable to get local socket name"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:324 src/rpc/virnetsocket.c:484
+#: src/rpc/virnetsocket.c:325 src/rpc/virnetsocket.c:491
 msgid "Failed to create socket"
 msgstr ""
 
-#: daemon/libvirtd.c:552
+#: src/rpc/virnetsocket.c:332 src/rpc/virnetsocket.c:497
 #, c-format
 msgid "Path %s too long for unix socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:344
+#: src/rpc/virnetsocket.c:345
 #, c-format
 msgid "Failed to bind socket to '%s'"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:355
+#: src/rpc/virnetsocket.c:356
 #, c-format
 msgid "Failed to change ownership of '%s' to %d:%d"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:379 src/rpc/virnetsocket.c:536
+#: src/rpc/virnetsocket.c:380 src/rpc/virnetsocket.c:543
 msgid "UNIX sockets are not supported on this platform"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:436
+#: src/rpc/virnetsocket.c:437
 #, c-format
 msgid "unable to connect to server at '%s:%s'"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:449
+#: src/rpc/virnetsocket.c:450
 msgid "Unable to get remote socket name"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:509
+#: src/rpc/virnetsocket.c:486
+msgid "Auto-spawn of daemon requested, but no binary specified"
+msgstr ""
+
+#: src/rpc/virnetsocket.c:516
 #, c-format
 msgid "Failed to connect socket to '%s'"
 msgstr ""
 
-#: src/remote/remote_driver.c:792
+#: src/rpc/virnetsocket.c:565 src/rpc/virnetsocket.c:571
 msgid "unable to create socket pair"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:602
+#: src/rpc/virnetsocket.c:609
 msgid "Tunnelling sockets not supported on this platform"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:779
+#: src/rpc/virnetsocket.c:787
 msgid "Unable to copy socket file handle"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:829
+#: src/rpc/virnetsocket.c:837
 msgid "Failed to get client socket identity"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:847
+#: src/rpc/virnetsocket.c:855
 msgid "Client socket identity not available"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:964
+#: src/rpc/virnetsocket.c:985
 #, c-format
 msgid "Cannot recv data: %s"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:967
+#: src/rpc/virnetsocket.c:988
 msgid "Cannot recv data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:972
+#: src/rpc/virnetsocket.c:993
 #, c-format
 msgid "End of file while reading data: %s"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:975
+#: src/rpc/virnetsocket.c:996
 msgid "End of file while reading data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1002
+#: src/rpc/virnetsocket.c:1023
 msgid "Cannot write data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1007
+#: src/rpc/virnetsocket.c:1028
 msgid "End of file while writing data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1153
+#: src/rpc/virnetsocket.c:1174
 msgid "Sending file descriptors is not supported on this socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1164
+#: src/rpc/virnetsocket.c:1185
 #, c-format
 msgid "Failed to send file descriptor %d"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1187
+#: src/rpc/virnetsocket.c:1208
 msgid "Receiving file descriptors is not supported on this socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1197
+#: src/rpc/virnetsocket.c:1218
 msgid "Failed to recv file descriptor"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1214
+#: src/rpc/virnetsocket.c:1235
 msgid "Unable to listen on socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1245
+#: src/rpc/virnetsocket.c:1266
 msgid "Unable to accept client"
 msgstr ""
 
-#: src/rpc/virnetserver.c:241
+#: src/rpc/virnetserver.c:245
 #, c-format
 msgid "Too many active clients (%zu), dropping connection from %s"
 msgstr ""
 
-#: daemon/libvirtd.c:954
+#: src/rpc/virnetserver.c:366
 #, c-format
 msgid "Failed to connect to system bus for PolicyKit auth: %s"
 msgstr ""
 
-#: src/rpc/virnetserver.c:476
+#: src/rpc/virnetserver.c:489
 msgid "Failed to read from signal pipe"
 msgstr ""
 
-#: src/rpc/virnetserver.c:493
+#: src/rpc/virnetserver.c:506
 #, c-format
 msgid "Unexpected signal received: %d"
 msgstr ""
 
-#: src/rpc/virnetserver.c:508
+#: src/rpc/virnetserver.c:521
 msgid "Unable to create signal pipe"
 msgstr ""
 
-#: src/rpc/virnetserver.c:517
+#: src/rpc/virnetserver.c:530
 msgid "Failed to add signal handle watch"
 msgstr ""
 
-#: daemon/libvirtd.c:2236
+#: src/rpc/virnetserver.c:708
 msgid "Failed to register shutdown timeout"
 msgstr ""
 
-#: src/rpc/virnetserverclient.c:750 src/rpc/virnetserverclient.c:909
+#: src/rpc/virnetserverclient.c:788 src/rpc/virnetserverclient.c:947
 #, c-format
 msgid "unexpected zero/negative length request %lld"
 msgstr ""
@@ -12346,7 +12934,7 @@
 msgid "Failed to add watch for fd %d events %d"
 msgstr ""
 
-#: src/rpc/virnetservermdns.c:344
+#: src/rpc/virnetservermdns.c:344 src/util/virtime.c:247
 msgid "Unable to get current time"
 msgstr ""
 
@@ -12365,12 +12953,12 @@
 msgid "Cannot find program %d version %d"
 msgstr ""
 
-#: daemon/dispatch.c:375
+#: src/rpc/virnetserverprogram.c:274
 #, c-format
 msgid "program mismatch (actual %x, expected %x)"
 msgstr ""
 
-#: daemon/dispatch.c:381
+#: src/rpc/virnetserverprogram.c:281
 #, c-format
 msgid "version mismatch (actual %x, expected %x)"
 msgstr ""
@@ -12385,12 +12973,12 @@
 msgid "Unexpected message status %u"
 msgstr ""
 
-#: daemon/dispatch.c:475
+#: src/rpc/virnetserverprogram.c:376
 #, c-format
 msgid "unknown procedure: %d"
 msgstr ""
 
-#: daemon/dispatch.c:467
+#: src/rpc/virnetserverprogram.c:390
 msgid "authentication required"
 msgstr ""
 
@@ -12399,7 +12987,7 @@
 msgid "Cannot read %s '%s'"
 msgstr ""
 
-#: src/remote/remote_driver.c:1296
+#: src/rpc/virnettlscontext.c:114
 msgid "cannot get current time"
 msgstr ""
 
@@ -12518,23 +13106,23 @@
 msgid "Unable to verify client certificate %s against CA certificate %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:1301
+#: src/rpc/virnettlscontext.c:453 src/rpc/virnettlscontext.c:964
 msgid "Invalid certificate"
 msgstr ""
 
-#: src/remote/remote_driver.c:1304
+#: src/rpc/virnettlscontext.c:456 src/rpc/virnettlscontext.c:967
 msgid "The certificate is not trusted."
 msgstr ""
 
-#: src/remote/remote_driver.c:1307
+#: src/rpc/virnettlscontext.c:459 src/rpc/virnettlscontext.c:970
 msgid "The certificate hasn't got a known issuer."
 msgstr ""
 
-#: src/remote/remote_driver.c:1310
+#: src/rpc/virnettlscontext.c:462 src/rpc/virnettlscontext.c:973
 msgid "The certificate has been revoked."
 msgstr ""
 
-#: src/remote/remote_driver.c:1314
+#: src/rpc/virnettlscontext.c:466 src/rpc/virnettlscontext.c:977
 msgid "The certificate uses an insecure algorithm"
 msgstr ""
 
@@ -12638,66 +13226,66 @@
 msgid "TLS handshake failed %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:6377
+#: src/rpc/virnettlscontext.c:1388
 msgid "invalid cipher size for TLS session"
 msgstr ""
 
-#: src/secret/secret_driver.c:170
+#: src/secret/secret_driver.c:176
 #, c-format
 msgid "mkstemp('%s') failed"
 msgstr ""
 
-#: src/secret/secret_driver.c:174
+#: src/secret/secret_driver.c:180
 #, c-format
 msgid "fchmod('%s') failed"
 msgstr ""
 
-#: src/secret/secret_driver.c:180
+#: src/secret/secret_driver.c:186
 #, c-format
 msgid "error writing to '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:185
+#: src/secret/secret_driver.c:191
 #, c-format
 msgid "error closing '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:191
+#: src/secret/secret_driver.c:197
 #, c-format
 msgid "rename(%s, %s) failed"
 msgstr ""
 
-#: src/secret/secret_driver.c:242
+#: src/secret/secret_driver.c:247
 #, c-format
 msgid "cannot create '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:349
+#: src/secret/secret_driver.c:354
 #, c-format
 msgid "<uuid> does not match secret file name '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:376 src/secret/secret_driver.c:485
+#: src/secret/secret_driver.c:381 src/secret/secret_driver.c:488
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:380
+#: src/secret/secret_driver.c:385
 #, c-format
 msgid "cannot stat '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:385
+#: src/secret/secret_driver.c:390
 #, c-format
 msgid "'%s' file does not fit in memory"
 msgstr ""
 
-#: src/secret/secret_driver.c:394
+#: src/secret/secret_driver.c:399
 #, c-format
 msgid "cannot read '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:402
+#: src/secret/secret_driver.c:406
 #, c-format
 msgid "invalid base64 in '%s'"
 msgstr ""
@@ -12707,130 +13295,129 @@
 msgid "Error reading secret: %s"
 msgstr ""
 
-#: src/secret/secret_driver.c:634 src/secret/secret_driver.c:802
-#: src/secret/secret_driver.c:836 src/secret/secret_driver.c:888
-#: src/secret/secret_driver.c:934
+#: src/secret/secret_driver.c:637 src/secret/secret_driver.c:809
+#: src/secret/secret_driver.c:845 src/secret/secret_driver.c:900
+#: src/secret/secret_driver.c:946
 #, c-format
 msgid "no secret with matching uuid '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:661
+#: src/secret/secret_driver.c:664
 #, c-format
 msgid "no secret with matching usage '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:701
+#: src/secret/secret_driver.c:706
 #, c-format
 msgid "a secret with UUID %s already defined for use with %s"
 msgstr ""
 
-#: src/secret/secret_driver.c:721
+#: src/secret/secret_driver.c:726
 #, c-format
 msgid "a secret with UUID %s is already defined for use with %s"
 msgstr ""
 
-#: src/secret/secret_driver.c:728
+#: src/secret/secret_driver.c:733
 msgid "cannot change private flag on existing secret"
 msgstr ""
 
-#: src/secret/secret_driver.c:776
+#: src/secret/secret_driver.c:781
 msgid "list of secrets is inconsistent"
 msgstr ""
 
-#: src/secret/secret_driver.c:896
+#: src/secret/secret_driver.c:908
 #, c-format
 msgid "secret '%s' does not have a value"
 msgstr ""
 
-#: src/secret/secret_driver.c:903
+#: src/secret/secret_driver.c:915
 msgid "secret is private"
 msgstr ""
 
-#: src/secret/secret_driver.c:1026
+#: src/secret/secret_driver.c:1038
 msgid "Out of memory initializing secrets"
 msgstr ""
 
-#: src/security/security_apparmor.c:75
+#: src/security/security_apparmor.c:85
 #, c-format
 msgid "Failed to read AppArmor profiles list '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:124
+#: src/security/security_apparmor.c:134
 #, c-format
 msgid "Failed to read '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:268
+#: src/security/security_apparmor.c:242
 msgid "could not find libvirtd"
 msgstr ""
 
-#: src/security/security_apparmor.c:497 src/security/security_apparmor.c:538
+#: src/security/security_apparmor.c:279 src/security/security_apparmor.c:303
+#: src/security/security_apparmor.c:321 src/security/security_apparmor.c:643
 #, c-format
 msgid "cannot update AppArmor profile '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:298
+#: src/security/security_apparmor.c:348
 #, c-format
 msgid "template '%s' does not exist"
 msgstr ""
 
-#: src/security/security_apparmor.c:403
+#: src/security/security_apparmor.c:404
 msgid "Cannot set a base label with AppArmour"
 msgstr ""
 
-#: src/security/security_apparmor.c:334 src/security/security_selinux.c:172
+#: src/security/security_apparmor.c:412 src/security/security_selinux.c:185
 msgid "security label already defined for VM"
 msgstr ""
 
-#: src/security/security_apparmor.c:441
+#: src/security/security_apparmor.c:442
 #, c-format
 msgid "cannot load AppArmor profile '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:402
+#: src/security/security_apparmor.c:493
 msgid "error copying profile name"
 msgstr ""
 
-#: src/security/security_apparmor.c:408
+#: src/security/security_apparmor.c:499
 msgid "error calling profile_status()"
 msgstr ""
 
-#: src/security/security_apparmor.c:431
+#: src/security/security_apparmor.c:538
 #, c-format
 msgid "could not remove profile for '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:457 src/security/security_selinux.c:672
+#: src/security/security_apparmor.c:560 src/security/security_selinux.c:1042
+#: src/security/security_selinux.c:1071 src/security/security_selinux.c:1106
+#: src/security/security_selinux.c:1173 src/security/security_selinux.c:1210
 #, c-format
 msgid ""
 "security label driver mismatch: '%s' model configured for domain, but "
 "hypervisor driver is '%s'."
 msgstr ""
 
-#: src/security/security_apparmor.c:467
+#: src/security/security_apparmor.c:570
 msgid "error calling aa_change_profile()"
 msgstr ""
 
-#: src/security/security_apparmor.c:527
+#: src/security/security_apparmor.c:631
 #, c-format
 msgid "'%s' does not exist"
 msgstr ""
 
-#: src/security/security_apparmor.c:561
+#: src/security/security_apparmor.c:667
 #, c-format
 msgid "Invalid security label '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:795
-msgid "could not find path for descriptor"
-msgstr ""
-
 #: src/security/security_dac.c:124
 #, c-format
 msgid "unable to set user and group to '%d:%d' on '%s'"
 msgstr ""
 
-#: src/security/security_selinux.c:361
+#: src/security/security_dac.c:143
 #, c-format
 msgid "cannot resolve symlink %s"
 msgstr ""
@@ -12840,22 +13427,22 @@
 msgid "Security driver %s not found"
 msgstr ""
 
-#: src/security/security_selinux.c:114
+#: src/security/security_selinux.c:119
 #, c-format
 msgid "cannot open SELinux virtual domain context file '%s'"
 msgstr ""
 
-#: src/security/security_selinux.c:121
+#: src/security/security_selinux.c:126
 #, c-format
 msgid "cannot read SELinux virtual domain context file %s"
 msgstr ""
 
-#: src/security/security_selinux.c:133
+#: src/security/security_selinux.c:138
 #, c-format
 msgid "cannot open SELinux virtual image context file %s"
 msgstr ""
 
-#: src/security/security_selinux.c:140
+#: src/security/security_selinux.c:145
 #, c-format
 msgid "cannot read SELinux virtual image context file %s"
 msgstr ""
@@ -12878,26 +13465,26 @@
 msgid "unable to allocate socket security context '%s'"
 msgstr ""
 
-#: src/security/security_selinux.c:193 src/security/security_selinux.c:199
+#: src/security/security_selinux.c:246 src/security/security_selinux.c:253
 #, c-format
 msgid "cannot generate selinux context for %s"
 msgstr ""
 
-#: src/security/security_selinux.c:230 src/security/security_selinux.c:282
+#: src/security/security_selinux.c:302 src/security/security_selinux.c:370
 #, c-format
 msgid "unable to get PID %d security context"
 msgstr ""
 
-#: src/security/security_selinux.c:289
+#: src/security/security_selinux.c:377
 #, c-format
 msgid "security label exceeds maximum length: %d"
 msgstr ""
 
-#: src/security/security_selinux.c:301
+#: src/security/security_selinux.c:390
 msgid "error calling security_getenforce()"
 msgstr ""
 
-#: src/security/security_selinux.c:335
+#: src/security/security_selinux.c:424
 #, c-format
 msgid "unable to set security context '%s' on '%s'"
 msgstr ""
@@ -12919,12 +13506,12 @@
 msgid "unknown smartcard type %d"
 msgstr ""
 
-#: src/security/security_selinux.c:654
+#: src/security/security_selinux.c:1052
 #, c-format
 msgid "Invalid security label %s"
 msgstr ""
 
-#: src/security/security_selinux.c:682
+#: src/security/security_selinux.c:1081
 #, c-format
 msgid "unable to set security context '%s'"
 msgstr ""
@@ -13104,6 +13691,10 @@
 msgid "Could not find <uuid>"
 msgstr ""
 
+#: src/security/virt-aa-helper.c:647
+msgid "unexpected root element, expecting <domain>"
+msgstr ""
+
 #: src/security/virt-aa-helper.c:657
 msgid "os.type is not 'hvm'"
 msgstr ""
@@ -13112,7 +13703,7 @@
 #: src/security/virt-aa-helper.c:721 src/security/virt-aa-helper.c:815
 #: src/security/virt-aa-helper.c:824 src/security/virt-aa-helper.c:899
 #: src/security/virt-aa-helper.c:1190 src/security/virt-aa-helper.c:1194
-#: src/security/virt-aa-helper.c:1250
+#: src/security/virt-aa-helper.c:1254
 msgid "could not allocate memory"
 msgstr ""
 
@@ -13192,11 +13783,11 @@
 msgid "could not parse arguments"
 msgstr ""
 
-#: src/security/virt-aa-helper.c:1229
+#: src/security/virt-aa-helper.c:1233
 msgid "failed to allocate buffer"
 msgstr ""
 
-#: src/security/virt-aa-helper.c:1260
+#: src/security/virt-aa-helper.c:1264
 msgid "could not create profile"
 msgstr ""
 
@@ -13215,22 +13806,22 @@
 msgid "unable to access disk %s\n"
 msgstr ""
 
-#: src/storage/storage_backend.c:134
+#: src/storage/storage_backend.c:141
 #, c-format
 msgid "could not open input path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:156
+#: src/storage/storage_backend.c:179
 #, c-format
 msgid "failed reading from file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:172 src/storage/storage_backend.c:278
+#: src/storage/storage_backend.c:196 src/storage/storage_backend.c:318
 #, c-format
 msgid "cannot extend file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:178
+#: src/storage/storage_backend.c:203
 #, c-format
 msgid "failed writing to file '%s'"
 msgstr ""
@@ -13240,51 +13831,51 @@
 msgid "cannot sync data to file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:188 src/storage/storage_backend.c:234
-#: src/storage/storage_backend.c:328 src/storage/storage_backend_fs.c:835
-#: src/storage/storage_backend_logical.c:638
+#: src/storage/storage_backend.c:222 src/storage/storage_backend.c:293
+#: src/storage/storage_backend_logical.c:734
 #, c-format
 msgid "cannot close file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:218 src/storage/storage_backend.c:269
-#: src/storage/storage_backend_fs.c:511 src/storage/storage_backend_fs.c:752
+#: src/storage/storage_backend.c:257 src/storage/storage_backend.c:407
+#: src/storage/storage_backend_fs.c:761 src/storage/storage_backend_fs.c:788
+#: src/storage/storage_backend_fs.c:1042
 #, c-format
 msgid "cannot create path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:272 src/util/util.c:759 src/util/util.c:803
-#: src/util/util.c:1036
+#: src/storage/storage_backend.c:272 src/util/util.c:757 src/util/util.c:801
+#: src/util/util.c:1034
 #, c-format
 msgid "stat of '%s' failed"
 msgstr ""
 
-#: src/storage/storage_backend.c:281 src/util/util.c:766 src/util/util.c:809
+#: src/storage/storage_backend.c:281 src/util/util.c:764 src/util/util.c:807
 #, c-format
 msgid "cannot chown '%s' to (%u, %u)"
 msgstr ""
 
 #: src/storage/storage_backend.c:287 src/storage/storage_backend.c:601
-#: src/util/util.c:776 src/util/util.c:817 src/util/util.c:1049
+#: src/util/util.c:774 src/util/util.c:815 src/util/util.c:1047
 #, c-format
 msgid "cannot set mode of '%s' to %04o"
 msgstr ""
 
-#: src/storage/storage_backend.c:308 src/storage/storage_backend.c:319
+#: src/storage/storage_backend.c:346 src/storage/storage_backend.c:355
 #, c-format
 msgid "cannot fill file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:261 src/storage/storage_backend_disk.c:560
-#: src/storage/storage_backend_logical.c:584
+#: src/storage/storage_backend.c:391 src/storage/storage_backend_disk.c:648
+#: src/storage/storage_backend_logical.c:683
 msgid "storage pool does not support encrypted volumes"
 msgstr ""
 
-#: src/storage/storage_backend.c:364
+#: src/storage/storage_backend.c:442
 msgid "too many conflicts when generating an uuid"
 msgstr ""
 
-#: src/storage/storage_backend.c:394
+#: src/storage/storage_backend.c:472
 msgid "secrets already defined"
 msgstr ""
 
@@ -13303,7 +13894,7 @@
 msgid "unable to parse qemu-img output '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:513 src/storage/storage_backend.c:519
+#: src/storage/storage_backend.c:688 src/storage/storage_backend.c:694
 #, c-format
 msgid "unknown storage vol type %d"
 msgstr ""
@@ -13312,121 +13903,120 @@
 msgid "a different backing store cannot be specified."
 msgstr ""
 
-#: src/storage/storage_backend.c:541
+#: src/storage/storage_backend.c:718
 #, c-format
 msgid "unknown storage vol backing store type %d"
 msgstr ""
 
-#: src/storage/storage_backend.c:547
+#: src/storage/storage_backend.c:737
 #, c-format
 msgid "inaccessible backing store volume %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:559
+#: src/storage/storage_backend.c:749
 #, c-format
 msgid "qcow volume encryption unsupported with volume format %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:567
+#: src/storage/storage_backend.c:757
 #, c-format
 msgid "unsupported volume encryption format %d"
 msgstr ""
 
-#: src/storage/storage_backend.c:573
+#: src/storage/storage_backend.c:763
 msgid "too many secrets for qcow encryption"
 msgstr ""
 
-#: src/storage/storage_backend.c:644
+#: src/storage/storage_backend.c:877
 msgid "cannot copy from volume with qcow-create"
 msgstr ""
 
-#: src/storage/storage_backend.c:650
+#: src/storage/storage_backend.c:883
 #, c-format
 msgid "unsupported storage vol type %d"
 msgstr ""
 
-#: src/storage/storage_backend.c:656
+#: src/storage/storage_backend.c:889
 msgid "copy-on-write image not supported with qcow-create"
 msgstr ""
 
-#: src/storage/storage_backend.c:662
+#: src/storage/storage_backend.c:895
 msgid "encrypted volumes not supported with qcow-create"
 msgstr ""
 
-#: src/storage/storage_backend.c:696
+#: src/storage/storage_backend.c:927
 #, c-format
 msgid "Unknown file create tool type '%d'."
 msgstr ""
 
-#: src/storage/storage_backend.c:745
+#: src/storage/storage_backend.c:975
 msgid "creation of non-raw file images is not supported without qemu-img."
 msgstr ""
 
-#: src/storage/storage_backend.c:783 src/storage/storage_backend_fs.c:67
-#: src/storage/storage_backend_mpath.c:52
-#: src/storage/storage_backend_scsi.c:147
+#: src/storage/storage_backend.c:1039
 #, c-format
 msgid "cannot open volume '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1060
+#: src/storage/storage_backend.c:1075
 #, c-format
 msgid "unexpected storage mode for '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:879
+#: src/storage/storage_backend.c:1199
 #, c-format
 msgid "cannot seek to end of file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:900
+#: src/storage/storage_backend.c:1220
 #, c-format
 msgid "cannot get file context of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:971 src/storage/storage_backend_scsi.c:165
+#: src/storage/storage_backend.c:1290
 #, c-format
 msgid "cannot seek to beginning of file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:978 src/storage/storage_backend_scsi.c:172
+#: src/storage/storage_backend.c:1297
 #, c-format
 msgid "cannot read beginning of file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1044
+#: src/storage/storage_backend.c:1362
 #, c-format
 msgid "cannot read dir '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1131
+#: src/storage/storage_backend.c:1447
+#: src/storage/storage_backend_logical.c:209
 #, c-format
 msgid "Failed to compile regex %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:1163 src/storage/storage_backend.c:1297
+#: src/storage/storage_backend.c:1478
 msgid "cannot read fd"
 msgstr ""
 
-#: src/storage/storage_backend.c:1578
+#: src/storage/storage_backend.c:1593
 msgid "cannot open file using fd"
 msgstr ""
 
-#: src/storage/storage_backend.c:1330
+#: src/storage/storage_backend.c:1624
 #, c-format
 msgid "read error on pipe to '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1385 src/storage/storage_backend.c:1397
+#: src/storage/storage_backend.c:1654 src/storage/storage_backend.c:1666
 #, c-format
 msgid "%s not implemented on Win32"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:109
+#: src/storage/storage_backend_disk.c:110
 msgid "cannot parse device start location"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:116
+#: src/storage/storage_backend_disk.c:117
 msgid "cannot parse device end location"
 msgstr ""
 
@@ -13435,37 +14025,49 @@
 msgid "device path '%s' doesn't exist"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:398
+#: src/storage/storage_backend_disk.c:398 src/storage/storage_backend_fs.c:740
+msgid "Overwrite and no overwrite flags are mutually exclusive"
+msgstr ""
+
+#: src/storage/storage_backend_disk.c:414
+msgid "Error checking for disk label"
+msgstr ""
+
+#: src/storage/storage_backend_disk.c:417
+msgid "Disk label already present"
+msgstr ""
+
+#: src/storage/storage_backend_disk.c:466
 msgid "Invalid partition type"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:406
+#: src/storage/storage_backend_disk.c:475
 msgid "extended partition already exists"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:430
+#: src/storage/storage_backend_disk.c:510
 msgid "no extended partition found and no primary partition available"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:452
+#: src/storage/storage_backend_disk.c:516
 msgid "unknown partition type"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:515
+#: src/storage/storage_backend_disk.c:600
 msgid "no large enough free extent"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:629
+#: src/storage/storage_backend_disk.c:731
 #, c-format
 msgid "Couldn't read volume target path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:640
+#: src/storage/storage_backend_disk.c:744
 #, c-format
 msgid "Volume path '%s' did not start with parent pool source device name."
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:649
+#: src/storage/storage_backend_disk.c:754
 #, c-format
 msgid "cannot parse partition number from target '%s'"
 msgstr ""
@@ -13475,36 +14077,38 @@
 msgid "cannot probe backing volume format: %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:154
+#: src/storage/storage_backend_fs.c:196
 #, c-format
 msgid "invalid netfs path (no /): %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:160
+#: src/storage/storage_backend_fs.c:202
 #, c-format
 msgid "invalid netfs path (ends in /): %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:265
+#: src/storage/storage_backend_fs.c:304
 #, c-format
 msgid "cannot read mount list '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:357 src/storage/storage_backend_fs.c:433
-#: src/storage/storage_backend_iscsi.c:276
+#: src/storage/storage_backend_fs.c:392 src/storage/storage_backend_fs.c:457
+#: src/storage/storage_backend_iscsi.c:628
+#: src/storage/storage_backend_iscsi.c:660
 msgid "missing source host"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:362
+#: src/storage/storage_backend_fs.c:397
 msgid "missing source path"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:368 src/storage/storage_backend_fs.c:444
-#: src/storage/storage_backend_iscsi.c:283
+#: src/storage/storage_backend_fs.c:403 src/storage/storage_backend_fs.c:468
+#: src/storage/storage_backend_iscsi.c:635
+#: src/storage/storage_backend_iscsi.c:667
 msgid "missing source device"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:438
+#: src/storage/storage_backend_fs.c:462
 msgid "missing source dir"
 msgstr ""
 
@@ -13553,16 +14157,12 @@
 msgid "Source device does not exist when formatting pool '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:740
-msgid "Overwrite and no overwrite flags are mutually exclusive"
-msgstr ""
-
 #: src/storage/storage_backend_fs.c:751
 #, c-format
 msgid "path '%s' is not absolute"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:535
+#: src/storage/storage_backend_fs.c:821
 #, c-format
 msgid "cannot open path '%s'"
 msgstr ""
@@ -13572,213 +14172,210 @@
 msgid "cannot probe backing volume info: %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:631
+#: src/storage/storage_backend_fs.c:905
 #, c-format
 msgid "cannot statvfs path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:698
+#: src/storage/storage_backend_fs.c:974
 #, c-format
 msgid "failed to remove pool '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:746
+#: src/storage/storage_backend_fs.c:1028
 msgid "cannot copy from volume to a directory volume"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:772
+#: src/storage/storage_backend_fs.c:1062
 msgid ""
 "storage pool does not support building encrypted volumes from other volumes"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:792
+#: src/storage/storage_backend_fs.c:1082
 msgid "creation of non-raw images is not supported without qemu-img"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:878
+#: src/storage/storage_backend_fs.c:1134
 #, c-format
 msgid "cannot unlink file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:65
+#: src/storage/storage_backend_iscsi.c:66
 #, c-format
 msgid "host lookup failed %s"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:72
+#: src/storage/storage_backend_iscsi.c:73
 #, c-format
 msgid "no IP address for target %s"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:81
+#: src/storage/storage_backend_iscsi.c:82
 #, c-format
 msgid "cannot format ip addr for %s"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:149
+#: src/storage/storage_backend_iscsi.c:168
 msgid "cannot find session"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:193
+#: src/storage/storage_backend_iscsi.c:192
 #, c-format
 msgid "Could not allocate memory for output of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:208
+#: src/storage/storage_backend_iscsi.c:207
 #, c-format
 msgid ""
 "Failed to open stream for file descriptor when reading output from '%s': '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:220
+#: src/storage/storage_backend_iscsi.c:219
 #, c-format
 msgid "Unexpected line > %d characters when parsing output of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:238
+#: src/storage/storage_backend_iscsi.c:237
 #, c-format
 msgid "Missing space when parsing output of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:289
+#: src/storage/storage_backend_iscsi.c:288
 msgid "Failed to initialize random generator when creating iscsi interface"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:306
+#: src/storage/storage_backend_iscsi.c:305
 #, c-format
 msgid "Failed to run command '%s' to create new iscsi interface"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:316
+#: src/storage/storage_backend_iscsi.c:315
 #, c-format
 msgid "Failed to run command '%s' to update iscsi interface with IQN '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:188
+#: src/storage/storage_backend_iscsi.c:408
 #, c-format
 msgid "Failed to get host number for iSCSI session with path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:196
+#: src/storage/storage_backend_iscsi.c:416
 #, c-format
 msgid "Failed to find LUs on host %u"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:147
+#: src/storage/storage_backend_logical.c:154
 msgid "malformed volume extent stripes value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:159
+#: src/storage/storage_backend_logical.c:168
 msgid "malformed volume extent length value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:164
+#: src/storage/storage_backend_logical.c:173
 msgid "malformed volume extent size value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:209
+#: src/storage/storage_backend_logical.c:216
 msgid "malformed volume extent devices value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:154
+#: src/storage/storage_backend_logical.c:245
 msgid "malformed volume extent offset value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:355
+#: src/storage/storage_backend_logical.c:434
 msgid "failed to get source from sourceList"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:410
+#: src/storage/storage_backend_logical.c:511
 #, c-format
 msgid "cannot open device '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:416
+#: src/storage/storage_backend_logical.c:517
 #, c-format
 msgid "cannot clear device header of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:517
+#: src/storage/storage_backend_logical.c:524
 #, c-format
 msgid "cannot flush header of device'%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:423
+#: src/storage/storage_backend_logical.c:531
 #, c-format
 msgid "cannot close device '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:811
-#: src/storage/storage_backend_logical.c:624
+#: src/storage/storage_backend_logical.c:720
 #, c-format
 msgid "cannot set file owner '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:819
-#: src/storage/storage_backend_logical.c:631
+#: src/storage/storage_backend_logical.c:727
 #, c-format
 msgid "cannot set file mode '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:647
+#: src/storage/storage_backend_logical.c:743
 #, c-format
 msgid "cannot find newly created volume '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_mpath.c:233
+#: src/storage/storage_backend_mpath.c:232
 #, c-format
 msgid "Failed to get %s minor number"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:65
+#: src/storage/storage_backend_scsi.c:66
 #, c-format
 msgid "Could not find typefile '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:77
+#: src/storage/storage_backend_scsi.c:78
 #, c-format
 msgid "Could not read typefile '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:89
+#: src/storage/storage_backend_scsi.c:90
 #, c-format
 msgid "Device type '%s' is not an integer"
 msgstr ""
 
-#: src/storage/storage_backend_mpath.c:123
-#: src/storage/storage_backend_scsi.c:260
+#: src/storage/storage_backend_scsi.c:270
 #, c-format
 msgid "Failed to update volume for '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:316
-#: src/storage/storage_backend_scsi.c:407
+#: src/storage/storage_backend_scsi.c:322
+#: src/storage/storage_backend_scsi.c:411
 #, c-format
 msgid "Failed to opendir sysfs path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:364
+#: src/storage/storage_backend_scsi.c:369
 #, c-format
 msgid "Failed to parse block name %s"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:456
+#: src/storage/storage_backend_scsi.c:457
 #, c-format
 msgid "Failed to determine if %u:%u:%u:%u is a Direct-Access LUN"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:523
+#: src/storage/storage_backend_scsi.c:524
 #: src/storage/storage_backend_scsi.c:566
 #, c-format
 msgid "Failed to opendir path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:610
+#: src/storage/storage_backend_scsi.c:609
 #, c-format
 msgid "Could not open '%s' to trigger host scan"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:621
+#: src/storage/storage_backend_scsi.c:620
 #, c-format
 msgid "Write to '%s' to trigger host scan failed"
 msgstr ""
@@ -13803,39 +14400,40 @@
 msgid "Failed to autostart storage pool '%s': %s"
 msgstr ""
 
-#: src/storage/storage_driver.c:275 src/storage/storage_driver.c:974
-#: src/storage/storage_driver.c:1003
+#: src/storage/storage_driver.c:280 src/storage/storage_driver.c:1003
+#: src/storage/storage_driver.c:1032
 msgid "no pool with matching uuid"
 msgstr ""
 
-#: src/storage/storage_driver.c:300
+#: src/storage/storage_driver.c:305
 #, c-format
 msgid "no pool with matching name '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:456 src/test/test_driver.c:3761
+#: src/storage/storage_driver.c:464 src/test/test_driver.c:4092
 #, c-format
 msgid "pool type '%s' does not support source discovery"
 msgstr ""
 
-#: src/storage/storage_driver.c:616 src/storage/storage_driver.c:670
-#: src/storage/storage_driver.c:715 src/storage/storage_driver.c:752
-#: src/storage/storage_driver.c:808 src/storage/storage_driver.c:857
-#: src/storage/storage_driver.c:913 src/storage/storage_driver.c:949
-#: src/storage/storage_driver.c:1065 src/storage/storage_driver.c:1098
-#: src/storage/storage_driver.c:1143 src/storage/storage_driver.c:1269
-#: src/storage/storage_driver.c:1390 src/storage/storage_driver.c:1543
-#: src/storage/storage_driver.c:1622 src/storage/storage_driver.c:1675
-#: src/storage/storage_driver.c:1722
+#: src/storage/storage_driver.c:632 src/storage/storage_driver.c:690
+#: src/storage/storage_driver.c:736 src/storage/storage_driver.c:773
+#: src/storage/storage_driver.c:830 src/storage/storage_driver.c:883
+#: src/storage/storage_driver.c:939 src/storage/storage_driver.c:978
+#: src/storage/storage_driver.c:1092 src/storage/storage_driver.c:1125
+#: src/storage/storage_driver.c:1170 src/storage/storage_driver.c:1303
+#: src/storage/storage_driver.c:1433 src/storage/storage_driver.c:1593
+#: src/storage/storage_driver.c:1655 src/storage/storage_driver.c:1872
+#: src/storage/storage_driver.c:1929 src/storage/storage_driver.c:2010
+#: src/storage/storage_driver.c:2066 src/storage/storage_driver.c:2113
 msgid "no storage pool with matching uuid"
 msgstr ""
 
-#: src/storage/storage_driver.c:622
+#: src/storage/storage_driver.c:638
 msgid "pool is still active"
 msgstr ""
 
-#: src/storage/storage_driver.c:628 src/storage/storage_driver.c:767
-#: src/storage/storage_driver.c:823 src/storage/storage_driver.c:872
+#: src/storage/storage_driver.c:644 src/storage/storage_driver.c:788
+#: src/storage/storage_driver.c:845 src/storage/storage_driver.c:898
 #, c-format
 msgid "pool '%s' has asynchronous jobs running."
 msgstr ""
@@ -13845,24 +14443,26 @@
 msgid "Failed to delete autostart link '%s': %s"
 msgstr ""
 
-#: src/storage/storage_driver.c:679
+#: src/storage/storage_driver.c:699
 msgid "pool already active"
 msgstr ""
 
-#: src/storage/storage_driver.c:724
+#: src/storage/storage_driver.c:745
 msgid "storage pool is already active"
 msgstr ""
 
-#: src/storage/storage_driver.c:761 src/storage/storage_driver.c:866
-#: src/storage/storage_driver.c:1071 src/storage/storage_driver.c:1104
-#: src/storage/storage_driver.c:1149 src/storage/storage_driver.c:1275
-#: src/storage/storage_driver.c:1403 src/storage/storage_driver.c:1409
-#: src/storage/storage_driver.c:1549 src/storage/storage_driver.c:1628
-#: src/storage/storage_driver.c:1681 src/storage/storage_driver.c:1728
+#: src/storage/storage_driver.c:782 src/storage/storage_driver.c:892
+#: src/storage/storage_driver.c:1098 src/storage/storage_driver.c:1131
+#: src/storage/storage_driver.c:1176 src/storage/storage_driver.c:1309
+#: src/storage/storage_driver.c:1446 src/storage/storage_driver.c:1452
+#: src/storage/storage_driver.c:1599 src/storage/storage_driver.c:1661
+#: src/storage/storage_driver.c:1878 src/storage/storage_driver.c:1935
+#: src/storage/storage_driver.c:2016 src/storage/storage_driver.c:2072
+#: src/storage/storage_driver.c:2119
 msgid "storage pool is not active"
 msgstr ""
 
-#: src/storage/storage_driver.c:817
+#: src/storage/storage_driver.c:839
 msgid "storage pool is still active"
 msgstr ""
 
@@ -13870,52 +14470,56 @@
 msgid "pool does not support pool deletion"
 msgstr ""
 
-#: src/storage/storage_driver.c:1009 src/test/test_driver.c:4119
+#: src/storage/storage_driver.c:1038 src/test/test_driver.c:4468
 msgid "pool has no config file"
 msgstr ""
 
-#: src/storage/storage_driver.c:1157 src/storage/storage_driver.c:1419
-#: src/storage/storage_driver.c:1560 src/storage/storage_driver.c:1636
-#: src/storage/storage_driver.c:1689 src/storage/storage_driver.c:1736
-#: src/test/test_driver.c:4241 src/test/test_driver.c:4442
-#: src/test/test_driver.c:4518 src/test/test_driver.c:4596
-#: src/test/test_driver.c:4641 src/test/test_driver.c:4681
+#: src/storage/storage_driver.c:1184 src/storage/storage_driver.c:1462
+#: src/storage/storage_driver.c:1607 src/storage/storage_driver.c:1669
+#: src/storage/storage_driver.c:1886 src/storage/storage_driver.c:1946
+#: src/storage/storage_driver.c:2024 src/storage/storage_driver.c:2080
+#: src/storage/storage_driver.c:2127 src/test/test_driver.c:4590
+#: src/test/test_driver.c:4797 src/test/test_driver.c:4876
+#: src/test/test_driver.c:4954 src/test/test_driver.c:5002
+#: src/test/test_driver.c:5042
 #, c-format
 msgid "no storage vol with matching name '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:1197
+#: src/storage/storage_driver.c:1224
 msgid "no storage vol with matching key"
 msgstr ""
 
-#: src/storage/storage_driver.c:1244
+#: src/storage/storage_driver.c:1275
 msgid "no storage vol with matching path"
 msgstr ""
 
-#: src/storage/storage_driver.c:1288 src/test/test_driver.c:4354
-#: src/test/test_driver.c:4435
+#: src/storage/storage_driver.c:1322 src/test/test_driver.c:4706
+#: src/test/test_driver.c:4790
 msgid "storage vol already exists"
 msgstr ""
 
-#: src/storage/storage_driver.c:1300
+#: src/storage/storage_driver.c:1334
 msgid "storage pool does not support volume creation"
 msgstr ""
 
-#: src/storage/storage_driver.c:1396
+#: src/storage/storage_driver.c:1439
 #, c-format
 msgid "no storage pool with matching name '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:1430
+#: src/storage/storage_driver.c:1473
 #, c-format
 msgid "storage volume name '%s' already in use."
 msgstr ""
 
-#: src/storage/storage_driver.c:1446
+#: src/storage/storage_driver.c:1489
 msgid "storage pool does not support volume creation from an existing volume"
 msgstr ""
 
-#: src/storage/storage_driver.c:1452 src/storage/storage_driver.c:1567
+#: src/storage/storage_driver.c:1495 src/storage/storage_driver.c:1614
+#: src/storage/storage_driver.c:1676 src/storage/storage_driver.c:1893
+#: src/storage/storage_driver.c:1953
 #, c-format
 msgid "volume '%s' is still being allocated."
 msgstr ""
@@ -13955,20 +14559,20 @@
 msgid "Failed to stat storage volume with path '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:1574
+#: src/storage/storage_driver.c:1960
 msgid "storage pool does not support vol deletion"
 msgstr ""
 
-#: src/test/test_driver.c:337
+#: src/test/test_driver.c:347
 #, c-format
 msgid "Exceeded max iface limit %d"
 msgstr ""
 
-#: src/test/test_driver.c:684
+#: src/test/test_driver.c:693
 msgid "resolving volume filename"
 msgstr ""
 
-#: src/test/test_driver.c:788
+#: src/test/test_driver.c:786
 msgid "Root element is not 'node'"
 msgstr ""
 
@@ -13996,7 +14600,7 @@
 msgid "invalid node cpu mhz value"
 msgstr ""
 
-#: src/test/test_driver.c:863 src/xen/xm_internal.c:1072
+#: src/test/test_driver.c:859 src/xenxs/xen_xm.c:655
 #, c-format
 msgid "Model %s too big for destination"
 msgstr ""
@@ -14005,356 +14609,336 @@
 msgid "invalid node memory value"
 msgstr ""
 
-#: src/test/test_driver.c:891
+#: src/test/test_driver.c:887
 msgid "resolving domain filename"
 msgstr "resolving domain filename"
 
-#: src/test/test_driver.c:934
+#: src/test/test_driver.c:931
 msgid "resolving network filename"
 msgstr ""
 
-#: src/test/test_driver.c:970
+#: src/test/test_driver.c:966
 msgid "resolving interface filename"
 msgstr ""
 
-#: src/test/test_driver.c:1008
+#: src/test/test_driver.c:1003
 msgid "resolving pool filename"
 msgstr ""
 
-#: src/test/test_driver.c:1061
+#: src/test/test_driver.c:1055
 msgid "resolving device filename"
 msgstr ""
 
-#: src/test/test_driver.c:1129
+#: src/test/test_driver.c:1125
 msgid "testOpen: supply a path or use test:///default"
 msgstr ""
 
-#: src/test/test_driver.c:1480
+#: src/test/test_driver.c:1482
 #, c-format
 msgid "domain '%s' not paused"
 msgstr ""
 
-#: src/test/test_driver.c:1522 src/test/test_driver.c:1563
+#: src/test/test_driver.c:1525 src/test/test_driver.c:1566
 #, c-format
 msgid "domain '%s' not running"
 msgstr ""
 
-#: src/opennebula/one_driver.c:320 src/test/test_driver.c:519
-#: src/test/test_driver.c:1672 src/test/test_driver.c:2113
-#: src/test/test_driver.c:2608 src/test/test_driver.c:2663
+#: src/test/test_driver.c:1682 src/test/test_driver.c:2300
+#: src/test/test_driver.c:2831 src/test/test_driver.c:2886
 msgid "getting time of day"
 msgstr "getting time of day"
 
-#: src/test/test_driver.c:1717
+#: src/test/test_driver.c:1765
 #, c-format
 msgid "saving domain '%s' failed to allocate space for metadata"
 msgstr ""
 
-#: src/test/test_driver.c:1724
+#: src/test/test_driver.c:1772
 #, c-format
 msgid "saving domain '%s' to '%s': open failed"
 msgstr ""
 
-#: src/test/test_driver.c:1731 src/test/test_driver.c:1737
-#: src/test/test_driver.c:1743 src/test/test_driver.c:1750
+#: src/test/test_driver.c:1779 src/test/test_driver.c:1785
+#: src/test/test_driver.c:1791 src/test/test_driver.c:1798
 #, c-format
 msgid "saving domain '%s' to '%s': write failed"
 msgstr ""
 
-#: src/test/test_driver.c:1802
+#: src/test/test_driver.c:1866
 #, c-format
 msgid "cannot read domain image '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1808
+#: src/test/test_driver.c:1872
 #, c-format
 msgid "incomplete save header in '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1814
+#: src/test/test_driver.c:1878
 msgid "mismatched header magic"
 msgstr ""
 
-#: src/test/test_driver.c:1819
+#: src/test/test_driver.c:1883
 #, c-format
 msgid "failed to read metadata length in '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1825
+#: src/test/test_driver.c:1889
 msgid "length of metadata out of range"
 msgstr ""
 
-#: src/test/test_driver.c:1834
+#: src/test/test_driver.c:1898
 #, c-format
 msgid "incomplete metdata in '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1897
+#: src/test/test_driver.c:1970
 #, c-format
 msgid "domain '%s' coredump: failed to open %s"
 msgstr ""
 
-#: src/test/test_driver.c:1903
+#: src/test/test_driver.c:1976
 #, c-format
 msgid "domain '%s' coredump: failed to write header to %s"
 msgstr ""
 
-#: src/test/test_driver.c:1909
+#: src/test/test_driver.c:1982
 #, c-format
 msgid "domain '%s' coredump: write failed: %s"
 msgstr ""
 
-#: src/test/test_driver.c:2055
+#: src/test/test_driver.c:2209
 msgid "cannot hotplug vcpus for an inactive domain"
 msgstr ""
 
-#: src/test/test_driver.c:2105
+#: src/test/test_driver.c:2292
 msgid "cannot list vcpus for an inactive domain"
 msgstr ""
 
-#: src/test/test_driver.c:2197
+#: src/test/test_driver.c:2384
 msgid "requested vcpu is higher than allocated vcpus"
 msgstr ""
 
-#: src/test/test_driver.c:2336
+#: src/test/test_driver.c:2525
 msgid "Range exceeds available cells"
 msgstr ""
 
-#: src/test/test_driver.c:2370
+#: src/test/test_driver.c:2561
 #, c-format
 msgid "Domain '%s' is already running"
 msgstr ""
 
-#: src/test/test_driver.c:2946
+#: src/test/test_driver.c:3172
 #, c-format
 msgid "Network '%s' is still running"
 msgstr ""
 
-#: src/test/test_driver.c:2979
+#: src/test/test_driver.c:3205
 #, c-format
 msgid "Network '%s' is already running"
 msgstr ""
 
-#: src/test/test_driver.c:3562
+#: src/test/test_driver.c:3560
 msgid "there is another transaction running."
 msgstr ""
 
-#: src/test/test_driver.c:3589
+#: src/test/test_driver.c:3587
 msgid "no transaction running, nothing to be commited."
 msgstr ""
 
-#: src/test/test_driver.c:3616
+#: src/test/test_driver.c:3614
 msgid "no transaction running, nothing to rollback."
 msgstr ""
 
-#: src/test/test_driver.c:3703 src/test/test_driver.c:3867
-#: src/test/test_driver.c:3900 src/test/test_driver.c:3968
+#: src/test/test_driver.c:4032 src/test/test_driver.c:4204
+#: src/test/test_driver.c:4240 src/test/test_driver.c:4311
 #, c-format
 msgid "storage pool '%s' is already active"
 msgstr ""
 
-#: src/storage/storage_driver.c:531 src/test/test_driver.c:3788
+#: src/test/test_driver.c:4122
 msgid "storage pool already exists"
 msgstr ""
 
-#: src/test/test_driver.c:3929 src/test/test_driver.c:4000
-#: src/test/test_driver.c:4152 src/test/test_driver.c:4187
-#: src/test/test_driver.c:4233 src/test/test_driver.c:4344
-#: src/test/test_driver.c:4425 src/test/test_driver.c:4525
-#: src/test/test_driver.c:4603 src/test/test_driver.c:4648
-#: src/test/test_driver.c:4688
+#: src/test/test_driver.c:4269 src/test/test_driver.c:4346
+#: src/test/test_driver.c:4501 src/test/test_driver.c:4536
+#: src/test/test_driver.c:4582 src/test/test_driver.c:4696
+#: src/test/test_driver.c:4780 src/test/test_driver.c:4883
+#: src/test/test_driver.c:4961 src/test/test_driver.c:5009
+#: src/test/test_driver.c:5049
 #, c-format
 msgid "storage pool '%s' is not active"
 msgstr ""
 
-#: src/test/test_driver.c:4284
+#: src/test/test_driver.c:4633
 #, c-format
 msgid "no storage vol with matching key '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:4318
+#: src/test/test_driver.c:4667
 #, c-format
 msgid "no storage vol with matching path '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:4362 src/test/test_driver.c:4451
+#: src/test/test_driver.c:4714 src/test/test_driver.c:4806
 #, c-format
 msgid "Not enough free space in pool for volume '%s'"
 msgstr ""
 
-#: src/uml/uml_conf.c:183
-msgid "IP address not supported for ethernet inteface"
+#: src/uml/uml_conf.c:191
+msgid "IP address not supported for ethernet interface"
 msgstr ""
 
-#: src/uml/uml_conf.c:188
-msgid "script execution not supported for ethernet inteface"
+#: src/uml/uml_conf.c:196
+msgid "script execution not supported for ethernet interface"
 msgstr ""
 
-#: src/uml/uml_conf.c:195
+#: src/uml/uml_conf.c:203
 msgid "TCP server networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:200
+#: src/uml/uml_conf.c:208
 msgid "TCP client networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:215
+#: src/uml/uml_conf.c:223
 #, c-format
 msgid "Network '%s' not found"
 msgstr ""
 
-#: src/uml/uml_conf.c:245
+#: src/uml/uml_conf.c:253
 msgid "internal networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:289
+#: src/uml/uml_conf.c:258
 msgid "direct networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:311
+#: src/uml/uml_conf.c:327
 msgid "only TCP listen is supported for chr device"
 msgstr ""
 
-#: src/uml/uml_conf.c:376
+#: src/uml/uml_conf.c:345
 #, c-format
 msgid "failed to open chardev file: %s"
 msgstr ""
 
-#: src/uml/uml_conf.c:331
+#: src/uml/uml_conf.c:366
 #, c-format
 msgid "unsupported chr device type %d"
 msgstr ""
 
-#: src/uml/uml_driver.c:418
+#: src/uml/uml_driver.c:471
 msgid "cannot initialize inotify"
 msgstr ""
 
-#: src/uml/uml_driver.c:424
+#: src/uml/uml_driver.c:477
 #, c-format
 msgid "Failed to create monitor directory %s: %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:457
+#: src/uml/uml_driver.c:514
 msgid "umlStartup: out of memory"
 msgstr ""
 
-#: src/uml/uml_driver.c:604
+#: src/uml/uml_driver.c:776
 #, c-format
 msgid "failed to read pid: %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:627
+#: src/uml/uml_driver.c:798
 #, c-format
 msgid "Unix path %s too long for destination"
 msgstr ""
 
-#: src/uml/uml_driver.c:658
+#: src/uml/uml_driver.c:828
 msgid "cannot open socket"
 msgstr ""
 
-#: src/uml/uml_driver.c:667
+#: src/uml/uml_driver.c:838
 msgid "cannot bind socket"
 msgstr ""
 
-#: src/uml/uml_driver.c:723
+#: src/uml/uml_driver.c:892
 #, c-format
 msgid "cannot send too long command %s (%d bytes)"
 msgstr ""
 
-#: src/uml/uml_driver.c:729
+#: src/uml/uml_driver.c:898
 #, c-format
 msgid "Command %s too long for destination"
 msgstr ""
 
-#: src/uml/uml_driver.c:736
+#: src/uml/uml_driver.c:905
 #, c-format
 msgid "cannot send command %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:746
+#: src/uml/uml_driver.c:918
 #, c-format
 msgid "cannot read reply %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:926
+#: src/uml/uml_driver.c:924
 #, c-format
 msgid "incomplete reply %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:963
-msgid "Cleanup tap"
-msgstr ""
-
-#: src/uml/uml_driver.c:974
-#, c-format
-msgid "Cleanup '%s'"
-msgstr ""
-
-#: src/uml/uml_driver.c:977
-#, c-format
-msgid "Cleanup failed %d"
-msgstr ""
-
-#: src/uml/uml_driver.c:981
-msgid "Cleanup tap done"
-msgstr ""
-
-#: src/uml/uml_driver.c:829
+#: src/uml/uml_driver.c:989
 msgid "no kernel specified"
 msgstr ""
 
-#: src/uml/uml_driver.c:838
+#: src/uml/uml_driver.c:998
 #, c-format
 msgid "Cannot find UML kernel %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:517 src/qemu/qemu_driver.c:549
-#: src/uml/uml_driver.c:868
+#: src/uml/uml_driver.c:1028
 msgid "Unable to set VM logfile close-on-exec flag"
 msgstr ""
 
-#: src/uml/uml_driver.c:997
+#: src/uml/uml_driver.c:1167
 #, c-format
 msgid "unexpected UML URI path '%s', try uml:///system"
 msgstr ""
 
-#: src/uml/uml_driver.c:1004
+#: src/uml/uml_driver.c:1174
 #, c-format
 msgid "unexpected UML URI path '%s', try uml:///session"
 msgstr ""
 
-#: src/uml/uml_driver.c:1013
+#: src/uml/uml_driver.c:1183
 msgid "uml state driver is not active"
 msgstr ""
 
-#: src/uml/uml_driver.c:1230
+#: src/uml/uml_driver.c:1435
 #, c-format
 msgid "cannot parse version %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:1321
+#: src/uml/uml_driver.c:1538
 msgid "shutdown operation failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3446 src/uml/uml_driver.c:1433
+#: src/uml/uml_driver.c:1668
 msgid "cannot set max memory lower than current memory"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5423
+#: src/uml/uml_driver.c:2044
 msgid "cannot attach device on inactive domain"
 msgstr ""
 
-#: src/uml/uml_driver.c:2104 src/uml/uml_driver.c:2216
-#: src/vbox/vbox_tmpl.c:5533 src/vbox/vbox_tmpl.c:5548
-#: src/vbox/vbox_tmpl.c:5704
+#: src/uml/uml_driver.c:2090 src/uml/uml_driver.c:2202
+#: src/vbox/vbox_tmpl.c:5538 src/vbox/vbox_tmpl.c:5553
+#: src/vbox/vbox_tmpl.c:5709
 msgid "cannot modify the persistent configuration of a domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5817
+#: src/uml/uml_driver.c:2162
 msgid "cannot detach device on inactive domain"
 msgstr ""
 
-#: src/uml/uml_driver.c:1832
+#: src/uml/uml_driver.c:2355 tools/virsh.c:10107
 #, c-format
 msgid "cannot read %s"
 msgstr ""
@@ -14437,15 +15021,15 @@
 msgid "cannot clear process capabilities %d"
 msgstr ""
 
-#: src/util/util.c:347
+#: src/util/command.c:167
 msgid "cannot block signals"
 msgstr ""
 
-#: src/util/util.c:418 src/util/util.c:533
+#: src/util/command.c:186 src/util/command.c:492
 msgid "cannot fork child process"
 msgstr ""
 
-#: src/util/util.c:437 src/util/util.c:474
+#: src/util/command.c:198 src/util/command.c:243
 msgid "cannot unblock signals"
 msgstr ""
 
@@ -14454,15 +15038,15 @@
 msgid "Cannot find '%s' in path"
 msgstr ""
 
-#: src/util/util.c:362
+#: src/util/command.c:345
 msgid "cannot create pipe"
 msgstr ""
 
-#: src/util/util.c:369 src/util/util.c:398
+#: src/util/command.c:352 src/util/command.c:377
 msgid "Failed to set non-blocking file descriptor flag"
 msgstr ""
 
-#: src/util/util.c:391
+#: src/util/command.c:370
 msgid "Failed to create pipe"
 msgstr ""
 
@@ -14471,19 +15055,19 @@
 msgid "failed to preserve fd %d"
 msgstr ""
 
-#: src/util/util.c:490
+#: src/util/command.c:444
 msgid "failed to setup stdin file handle"
 msgstr ""
 
-#: src/util/util.c:496
+#: src/util/command.c:449
 msgid "failed to setup stdout file handle"
 msgstr ""
 
-#: src/util/util.c:502
+#: src/util/command.c:454
 msgid "failed to setup stderr file handle"
 msgstr ""
 
-#: src/util/util.c:520
+#: src/util/command.c:479
 msgid "cannot become session leader"
 msgstr ""
 
@@ -14491,7 +15075,7 @@
 msgid "cannot change to root directory"
 msgstr ""
 
-#: src/util/util.c:543
+#: src/util/command.c:502
 #, c-format
 msgid "could not write pidfile %s for %d"
 msgstr ""
@@ -14504,7 +15088,7 @@
 msgid "Could not re-enable SIGPIPE"
 msgstr ""
 
-#: src/util/util.c:567
+#: src/util/command.c:554
 #, c-format
 msgid "cannot execute binary %s"
 msgstr ""
@@ -14517,199 +15101,199 @@
 msgid "virExec is not implemented for WIN32"
 msgstr ""
 
-#: src/util/command.c:1515 src/util/command.c:1734 src/util/command.c:1782
-#: src/util/command.c:2010 src/util/command.c:2156 src/util/command.c:2345
-#: src/util/command.c:2404
+#: src/util/command.c:1526 src/util/command.c:1745 src/util/command.c:1793
+#: src/util/command.c:2021 src/util/command.c:2167 src/util/command.c:2356
+#: src/util/command.c:2415
 msgid "invalid use of command API"
 msgstr ""
 
-#: src/util/command.c:1552
+#: src/util/command.c:1563
 #, c-format
 msgid "exit status %d"
 msgstr ""
 
-#: src/util/command.c:1555
+#: src/util/command.c:1566
 #, c-format
 msgid "fatal signal %d"
 msgstr ""
 
-#: src/util/command.c:1558
+#: src/util/command.c:1569
 #, c-format
 msgid "invalid value %d"
 msgstr ""
 
-#: src/util/command.c:1632
+#: src/util/command.c:1643
 msgid "unable to poll on child"
 msgstr ""
 
-#: src/util/command.c:1659
+#: src/util/command.c:1670
 msgid "unable to read child stdout"
 msgstr ""
 
-#: src/util/command.c:1660
+#: src/util/command.c:1671
 msgid "unable to read child stderr"
 msgstr ""
 
-#: src/util/command.c:1688
+#: src/util/command.c:1699
 msgid "unable to write to child input"
 msgstr ""
 
-#: src/util/command.c:1748
+#: src/util/command.c:1759
 msgid "Executing new processes is not supported on Win32 platform"
 msgstr ""
 
-#: src/util/command.c:1804
+#: src/util/command.c:1815
 msgid "cannot mix caller fds with blocking execution"
 msgstr ""
 
-#: src/util/command.c:1810
+#: src/util/command.c:1821
 msgid "cannot mix string I/O with daemon"
 msgstr ""
 
-#: src/util/command.c:1820
+#: src/util/command.c:1831
 msgid "unable to open pipe"
 msgstr ""
 
-#: src/util/command.c:1927
+#: src/util/command.c:1938
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
-#: src/util/command.c:1935
+#: src/util/command.c:1946
 msgid "Unable to notify parent process"
 msgstr ""
 
-#: src/util/command.c:1945
+#: src/util/command.c:1956
 msgid "Unknown failure during hook execution"
 msgstr ""
 
-#: src/util/command.c:1948
+#: src/util/command.c:1959
 msgid "Unable to send error to parent process"
 msgstr ""
 
-#: src/util/command.c:1957
+#: src/util/command.c:1968
 msgid "Unable to wait on parent process"
 msgstr ""
 
-#: src/util/command.c:1959
+#: src/util/command.c:1970
 msgid "libvirtd quit during handshake"
 msgstr ""
 
-#: src/util/command.c:1963
+#: src/util/command.c:1974
 #, c-format
 msgid "Unexpected confirm code '%c' from parent process"
 msgstr ""
 
-#: src/util/command.c:2022
+#: src/util/command.c:2033
 msgid "cannot mix string I/O with asynchronous command"
 msgstr ""
 
-#: src/util/command.c:2028
+#: src/util/command.c:2039
 #, c-format
 msgid "command is already running as pid %d"
 msgstr ""
 
-#: src/util/command.c:2035
+#: src/util/command.c:2046
 msgid "daemonized command cannot use virCommandRunAsync"
 msgstr ""
 
-#: src/util/command.c:2040
+#: src/util/command.c:2051
 #, c-format
 msgid "daemonized command cannot set working directory %s"
 msgstr ""
 
-#: src/util/command.c:2046
+#: src/util/command.c:2057
 msgid "creation of pid file requires daemonized command"
 msgstr ""
 
-#: src/util/command.c:2104 src/util/command.c:2113
+#: src/util/command.c:2115 src/util/command.c:2124
 #, c-format
 msgid "unable to wait for process %d"
 msgstr ""
 
-#: src/util/command.c:2121
+#: src/util/command.c:2132
 #, c-format
 msgid "Child process (%d) status unexpected: %s"
 msgstr ""
 
-#: src/util/command.c:2162
+#: src/util/command.c:2173
 msgid "command is not yet running"
 msgstr ""
 
-#: src/util/command.c:2180
+#: src/util/command.c:2191
 #, c-format
 msgid "Child process (%s) status unexpected: %s"
 msgstr ""
 
-#: src/util/command.c:2351 src/util/command.c:2410
+#: src/util/command.c:2362 src/util/command.c:2421
 msgid "Handshake is already complete"
 msgstr ""
 
-#: src/util/command.c:2358
+#: src/util/command.c:2369
 msgid "Unable to wait for child process"
 msgstr ""
 
-#: src/util/command.c:2360
+#: src/util/command.c:2371
 msgid "Child process quit during startup handshake"
 msgstr ""
 
-#: src/util/command.c:2375
+#: src/util/command.c:2386
 msgid "No error message from child failure"
 msgstr ""
 
-#: src/util/command.c:2416
+#: src/util/command.c:2427
 msgid "Unable to notify child process"
 msgstr ""
 
-#: src/util/conf.c:354
+#: src/util/conf.c:355
 msgid "unterminated number"
 msgstr "unterminated number"
 
-#: src/util/conf.c:387 src/util/conf.c:407 src/util/conf.c:422
+#: src/util/conf.c:388 src/util/conf.c:412 src/util/conf.c:427
 msgid "unterminated string"
 msgstr "unterminated string"
 
-#: src/util/conf.c:453 src/util/conf.c:516
+#: src/util/conf.c:458 src/util/conf.c:528
 msgid "expecting a value"
 msgstr "expecting a value"
 
-#: src/util/conf.c:464
+#: src/util/conf.c:469
 msgid "lists not allowed in VMX format"
 msgstr ""
 
-#: src/util/conf.c:478
+#: src/util/conf.c:490
 msgid "expecting a separator in list"
 msgstr "expecting a separator in list"
 
-#: src/util/conf.c:501
+#: src/util/conf.c:513
 msgid "list is not closed with ]"
 msgstr ""
 
-#: src/util/conf.c:508
+#: src/util/conf.c:520
 msgid "numbers not allowed in VMX format"
 msgstr ""
 
-#: src/util/conf.c:551
+#: src/util/conf.c:563
 msgid "expecting a name"
 msgstr "expecting a name"
 
-#: src/util/conf.c:615
+#: src/util/conf.c:627
 msgid "expecting a separator"
 msgstr "expecting a separator"
 
-#: src/util/conf.c:646
+#: src/util/conf.c:658
 msgid "expecting an assignment"
 msgstr "expecting an assignment"
 
-#: src/util/conf.c:941
+#: src/util/conf.c:953
 msgid "failed to open file"
 msgstr "failed to open file"
 
-#: src/util/conf.c:951
+#: src/util/conf.c:963
 msgid "failed to save content"
 msgstr "failed to save content"
 
-#: src/conf/domain_conf.c:4881 src/conf/network_conf.c:769
+#: src/util/dnsmasq.c:251 src/util/dnsmasq.c:417
 #, c-format
 msgid "cannot write config file '%s'"
 msgstr ""
@@ -14719,15 +15303,15 @@
 msgid "Failed to make dnsmasq (PID: %d) reload config files."
 msgstr ""
 
-#: src/util/event_poll.c:626
+#: src/util/event_poll.c:627
 msgid "Unable to poll on file handles"
 msgstr ""
 
-#: src/util/event_poll.c:676
+#: src/util/event_poll.c:677
 msgid "Unable to setup wakeup pipe"
 msgstr ""
 
-#: src/util/event_poll.c:684
+#: src/util/event_poll.c:685
 #, c-format
 msgid "Unable to add handle %d to event loop"
 msgstr ""
@@ -14870,842 +15454,889 @@
 msgid "%s: unknown failure with %s\n"
 msgstr ""
 
-#: src/util/interface.c:122
-msgid "ifaceGetFlags is not supported on non-linux platforms"
+#: src/util/iptables.c:297
+msgid "Only IPv4 or IPv6 addresses can be used with iptables"
 msgstr ""
 
-#: src/util/interface.c:131
-msgid "ifaceIsUp is not supported on non-linux platforms"
+#: src/util/iptables.c:303
+msgid "Failure to mask address"
 msgstr ""
 
-#: src/util/interface.c:245 src/util/interface.c:322
+#: src/util/iptables.c:767
 #, c-format
-msgid "invalid interface name %s"
+msgid "Attempted to NAT '%s'. NAT is only supported for IPv4."
 msgstr ""
 
-#: src/util/interface.c:254
-#, c-format
-msgid "coud not get MAC address of interface %s"
+#: src/util/json.c:927
+msgid "Unable to create JSON parser"
 msgstr ""
 
-#: src/util/interface.c:333
+#: src/util/json.c:939
 #, c-format
-msgid "interface %s does not exist"
+msgid "cannot parse json %s: %s"
 msgstr ""
 
-#: src/util/interface.c:353
-msgid "ifaceGetIndex is not supported on non-linux platforms"
+#: src/util/json.c:1051
+msgid "Unable to create JSON formatter"
 msgstr ""
 
-#: src/util/interface.c:398
-msgid "ifaceGetVlanID is not supported on non-linux platforms"
+#: src/util/json.c:1081 src/util/json.c:1087
+msgid "No JSON parser implementation is available"
 msgstr ""
 
-#: src/util/interface.c:684
-#, c-format
-msgid "error creating %s type of interface"
+#: src/util/netlink.c:81
+msgid "cannot allocate nlhandle for netlink"
 msgstr ""
 
-#: src/util/interface.c:708 src/util/interface.c:822 src/util/interface.c:966
-#: src/util/macvtap.c:741
-msgid "malformed netlink response message"
+#: src/util/netlink.c:87
+msgid "cannot connect to netlink socket"
 msgstr ""
 
-#: src/util/interface.c:716 src/util/interface.c:830 src/util/interface.c:974
-#: src/util/macvtap.c:749
-msgid "allocated netlink buffer is too small"
+#: src/util/netlink.c:99
+msgid "cannot send to netlink socket"
 msgstr ""
 
-#: src/util/interface.c:733
-msgid ""
-"ifaceMacvtapLinkAdd is not supported since the include files were too old"
+#: src/util/netlink.c:113
+msgid "error in select call"
 msgstr ""
 
-#: src/util/interface.c:736
-msgid "ifaceMacvtapLinkAdd is not supported on non-linux platforms"
+#: src/util/netlink.c:116
+msgid "no valid netlink response was received"
 msgstr ""
 
-#: src/util/interface.c:798
-#, c-format
-msgid "error destroying %s interface"
+#: src/util/netlink.c:124
+msgid "nl_recv failed"
 msgstr ""
 
-#: src/util/interface.c:841
-msgid "ifaceLinkDel is not supported since the include files were too old"
+#: src/util/netlink.c:147
+msgid "nlComm is not supported since libnl was not available"
 msgstr ""
 
-#: src/util/interface.c:844
-msgid "ifaceLinkDel is not supported on non-linux platforms"
+#: src/util/netlink.c:149
+msgid "nlComm is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/interface.c:936
+#: src/util/pci.c:624
 #, c-format
-msgid "error dumping %s (%d) interface"
-msgstr ""
-
-#: src/util/interface.c:990
-msgid ""
-"ifaceMacvtapLinkDump is not supported since the include files were too old"
-msgstr ""
-
-#: src/util/interface.c:993
-msgid "ifaceMacvtapLinkDump is not supported on non-linux platforms"
-msgstr ""
-
-#: src/util/interface.c:1047
-msgid "buffer for root interface name is too small"
+msgid "Active %s devices on bus with %s, not doing bus reset"
 msgstr ""
 
-#: src/util/interface.c:1082
-msgid ""
-"ifaceGetNthParent is not supported since the include files were too old"
+#: src/util/pci.c:634 src/util/pci.c:1678
+#, c-format
+msgid "Failed to find parent device for %s"
 msgstr ""
 
-#: src/util/interface.c:1085
-msgid "ifaceGetNthParent is not supported on non-linux platforms"
+#: src/util/pci.c:647 src/util/pci.c:693
+#, c-format
+msgid "Failed to read PCI config space for %s"
 msgstr ""
 
-#: src/util/interface.c:1113
+#: src/util/pci.c:667 src/util/pci.c:713
 #, c-format
-msgid ""
-"Getting MAC address from '%s' to '%02x:%02x:%02x:%02x:%02x:%02x' failed."
+msgid "Failed to restore PCI config space for %s"
 msgstr ""
 
-#: src/util/interface.c:1130
+#: src/util/pci.c:728
 #, c-format
-msgid "Unable to preserve mac for %s"
+msgid "Failed to open config space file '%s'"
 msgstr ""
 
-#: src/util/interface.c:1139 src/util/interface.c:1190
+#: src/util/pci.c:753
 #, c-format
-msgid ""
-"Setting MAC address on  '%s' to '%02x:%02x:%02x:%02x:%02x:%02x' failed."
+msgid "Not resetting active device %s"
 msgstr ""
 
-#: src/util/interface.c:1180
+#: src/util/pci.c:780
 #, c-format
-msgid "Cannot parse MAC address from '%s'"
+msgid "Unable to reset PCI device %s: %s"
 msgstr ""
 
-#: src/util/interface.c:1323
-msgid "ifaceIsVirtualFunction is not supported on non-linux platforms"
+#: src/util/pci.c:782
+msgid "no FLR, PM reset or bus reset available"
 msgstr ""
 
-#: src/util/interface.c:1334
-msgid "ifaceGetVirtualFunctionIndex is not supported on non-linux platforms"
+#: src/util/pci.c:906
+#, c-format
+msgid "Failed to unbind PCI device '%s' from %s"
 msgstr ""
 
-#: src/util/interface.c:1344
-msgid "ifaceGetPhysicalFunction is not supported on non-linux platforms"
+#: src/util/pci.c:924
+#, c-format
+msgid "Failed to remove slot for PCI device '%s' from %s"
 msgstr ""
 
-#: src/util/iptables.c:297
-msgid "Only IPv4 or IPv6 addresses can be used with iptables"
+#: src/util/pci.c:948
+#, c-format
+msgid "Failed to trigger a re-probe for PCI device '%s'"
 msgstr ""
 
-#: src/util/iptables.c:303
-msgid "Failure to mask address"
+#: src/util/pci.c:1006
+#, c-format
+msgid "Failed to add PCI device ID '%s' to %s"
 msgstr ""
 
-#: src/util/iptables.c:767
+#: src/util/pci.c:1037
 #, c-format
-msgid "Attempted to NAT '%s'. NAT is only supported for IPv4."
+msgid "Failed to unbind PCI device '%s'"
 msgstr ""
 
-#: src/util/json.c:927
-msgid "Unable to create JSON parser"
+#: src/util/pci.c:1059
+#, c-format
+msgid "Failed to add slot for PCI device '%s' to %s"
 msgstr ""
 
-#: src/util/json.c:912
+#: src/util/pci.c:1071
 #, c-format
-msgid "cannot parse json %s: %s"
+msgid "Failed to bind PCI device '%s' to %s"
 msgstr ""
 
-#: src/util/json.c:1051
-msgid "Unable to create JSON formatter"
+#: src/util/pci.c:1094
+#, c-format
+msgid "Failed to remove PCI ID '%s' from %s"
 msgstr ""
 
-#: src/util/json.c:1037 src/util/json.c:1043
-msgid "No JSON parser implementation is available"
+#: src/util/pci.c:1125 src/util/pci.c:1144
+msgid "cannot find any PCI stub module"
 msgstr ""
 
-#: src/util/macvtap.c:124
-msgid "buffer for ifindex path is too small"
+#: src/util/pci.c:1131
+#, c-format
+msgid "Not detaching active device %s"
 msgstr ""
 
-#: src/util/macvtap.c:132
+#: src/util/pci.c:1150
 #, c-format
-msgid "cannot open macvtap file %s to determine interface index"
+msgid "Not reattaching active device %s"
 msgstr ""
 
-#: src/util/macvtap.c:139
-msgid "cannot determine macvtap's tap device interface index"
+#: src/util/pci.c:1321
+#, c-format
+msgid "dev->name buffer overflow: %.4x:%.2x:%.2x.%.1x"
 msgstr ""
 
-#: src/util/macvtap.c:151
-msgid "internal buffer for tap device is too small"
+#: src/util/pci.c:1333
+#, c-format
+msgid "Device %s not found: could not access %s"
 msgstr ""
 
-#: src/util/macvtap.c:168
+#: src/util/pci.c:1343
 #, c-format
-msgid "cannot open macvtap tap device %s"
+msgid "Failed to read product/vendor ID for %s"
 msgstr ""
 
-#: src/util/macvtap.c:202
-msgid "cannot get interface flags on macvtap tap"
+#: src/util/pci.c:1352
+#, c-format
+msgid "dev->id buffer overflow: %s %s"
 msgstr ""
 
-#: src/util/macvtap.c:211
-msgid "cannot clean IFF_VNET_HDR flag on macvtap tap"
+#: src/util/pci.c:1490
+#, c-format
+msgid "Device %s is already in use"
 msgstr ""
 
-#: src/util/macvtap.c:215
-msgid "cannot get feature flags on macvtap tap"
+#: src/util/pci.c:1733
+#, c-format
+msgid "Device %s is behind a switch lacking ACS and cannot be assigned"
 msgstr ""
 
-#: src/util/macvtap.c:220
-msgid "cannot set IFF_VNET_HDR flag on macvtap tap"
+#: src/util/pci.c:1830
+#, c-format
+msgid "Failed to resolve device link '%s': '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:310
+#: src/util/pci.c:1844
 #, c-format
-msgid "Interface %s already exists"
+msgid "Failed to parse PCI config address '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:349
+#: src/util/pci.c:1911
 #, c-format
-msgid ""
-"cannot 'up' interface %s -- another macvtap device may be 'up' and have the "
-"same MAC address"
+msgid "Failed to open dir '%s': '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:452
-msgid "error parsing pid of lldpad"
+#: src/util/pci.c:1942
+#, c-format
+msgid "Failed to get SR IOV function from device link '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:457
+#: src/util/pci.c:2004
 #, c-format
-msgid "Error opening file %s"
+msgid "Error getting physical function's '%s' virtual_functions"
 msgstr ""
 
-#: src/util/macvtap.c:493
-msgid "error parsing IFLA_PORT_SELF part"
+#: src/util/pci.c:2076
+msgid "pciGetPhysicalFunction is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:497
-msgid "IFLA_PORT_SELF is missing"
+#: src/util/pci.c:2086
+msgid "pciGetVirtualFunctions is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:509
-msgid "error while iterating over IFLA_VF_PORTS part"
+#: src/util/pci.c:2094
+msgid "pciDeviceIsVirtualFunction is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:515
-msgid "error parsing IFLA_VF_PORT part"
+#: src/util/pci.c:2104
+msgid "pciGetVirtualFunctionIndex is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:533
-msgid "Could not find netlink response with expected parameters"
+#: src/util/pci.c:2114
+msgid "pciDeviceNetName is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:538
-msgid "IFLA_VF_PORTS is missing"
+#: src/util/processinfo.c:75 src/util/processinfo.c:91
+#, c-format
+msgid "cannot set CPU affinity on process %d"
 msgstr ""
 
-#: src/util/macvtap.c:552
-msgid "no IFLA_PORT_RESPONSE found in netlink message"
-msgstr ""
-
-#: src/util/macvtap.c:715
+#: src/util/processinfo.c:136 src/util/processinfo.c:150
 #, c-format
-msgid "error during virtual port configuration of ifindex %d"
+msgid "cannot get CPU affinity of process %d"
 msgstr ""
 
-#: src/util/macvtap.c:786
-msgid "sending of PortProfileRequest failed."
+#: src/util/processinfo.c:170 src/util/processinfo.c:180
+msgid "Process CPU affinity is not supported on this platform"
 msgstr ""
 
-#: src/util/macvtap.c:807
+#: src/util/sexpr.c:245
 #, c-format
-msgid "error %d during port-profile setlink on interface %s (%d)"
+msgid "unknown s-expression kind %d"
 msgstr ""
 
-#: src/util/macvtap.c:821
-msgid "port-profile setlink timed out"
+#: src/util/stats_linux.c:54
+msgid "Could not open /proc/net/dev"
 msgstr ""
 
-#: src/util/macvtap.c:881 src/util/macvtap.c:1000
-msgid "Kernel VF Port support was missing at compile time."
+#: src/util/stats_linux.c:110
+msgid "/proc/net/dev: Interface not found"
 msgstr ""
 
-#: src/util/macvtap.c:922 src/util/macvtap.c:1067
+#: src/util/storage_file.c:760
 #, c-format
-msgid "operation type %d not supported"
+msgid "cannot set to start of '%s'"
 msgstr ""
 
-#: src/util/netlink.c:81
-msgid "cannot allocate nlhandle for netlink"
+#: src/util/storage_file.c:765 src/util/storage_file.c:861
+#, c-format
+msgid "cannot read header '%s'"
 msgstr ""
 
-#: src/util/netlink.c:87
-msgid "cannot connect to netlink socket"
+#: src/util/storage_file.c:796 src/util/storage_file.c:908
+#, c-format
+msgid "cannot open file '%s'"
 msgstr ""
 
-#: src/util/netlink.c:99
-msgid "cannot send to netlink socket"
+#: src/util/storage_file.c:851
+#, c-format
+msgid "cannot seek to start of '%s'"
 msgstr ""
 
-#: src/util/netlink.c:113
-msgid "error in select call"
+#: src/util/storage_file.c:870
+#, c-format
+msgid "unknown storage file format %d"
 msgstr ""
 
-#: src/util/netlink.c:116
-msgid "no valid netlink response was received"
+#: src/util/storage_file.c:974
+#, c-format
+msgid "Invalid relative path '%s'"
 msgstr ""
 
-#: src/util/netlink.c:124
-msgid "nl_recv failed"
+#: src/util/storage_file.c:992
+#, c-format
+msgid "cannot determine filesystem for '%s'"
 msgstr ""
 
-#: src/util/netlink.c:147
-msgid "nlComm is not supported since libnl was not available"
+#: src/util/sysinfo.c:127
+msgid "Host sysinfo extraction not supported on this platform"
 msgstr ""
 
-#: src/util/netlink.c:149
-msgid "nlComm is not supported on non-linux platforms"
+#: src/util/sysinfo.c:464
+#, c-format
+msgid "Failed to find path for %s binary"
 msgstr ""
 
-#: src/util/network.c:85 src/util/network.c:178
-msgid "Missing address"
+#: src/util/sysinfo.c:474
+#, c-format
+msgid "Failed to execute command %s"
 msgstr ""
 
-#: src/util/network.c:94
+#: src/util/sysinfo.c:680
 #, c-format
-msgid "Cannot parse socket address '%s': %s"
+msgid "unexpected sysinfo type model %d"
+msgstr ""
+
+#: src/util/sysinfo.c:713
+msgid "Target sysinfo does not match source"
 msgstr ""
 
-#: src/util/network.c:101
+#: src/util/sysinfo.c:719
 #, c-format
-msgid "No socket addresses found for '%s'"
+msgid "Target sysinfo %s does not match source %s"
 msgstr ""
 
-#: src/util/network.c:202
+#: src/util/sysinfo.c:729
 #, c-format
-msgid "Cannot convert socket address to string: %s"
+msgid "Target sysinfo %s %s does not match source %s"
 msgstr ""
 
-#: src/util/network.c:709
-msgid "missing virtualportprofile type"
+#: src/util/util.c:328
+msgid "Unknown poll response."
 msgstr ""
 
-#: src/util/network.c:739
-msgid "cannot parse value of managerid parameter"
+#: src/util/util.c:362
+msgid "poll error"
 msgstr ""
 
-#: src/util/network.c:745
-msgid "value of managerid out of range"
+#: src/util/util.c:451
+#, c-format
+msgid "Failed to open file '%s'"
 msgstr ""
 
-#: src/util/network.c:753
-msgid "cannot parse value of typeid parameter"
+#: src/util/util.c:458
+#, c-format
+msgid "Failed to read file '%s'"
 msgstr ""
 
-#: src/util/network.c:759
-msgid "value for typeid out of range"
+#: src/util/util.c:745
+#, c-format
+msgid "failed to create file '%s'"
 msgstr ""
 
-#: src/util/network.c:767
-msgid "cannot parse value of typeidversion parameter"
+#: src/util/util.c:794
+#, c-format
+msgid "failed to create directory '%s'"
 msgstr ""
 
-#: src/util/network.c:773
-msgid "value of typeidversion out of range"
+#: src/util/util.c:866
+#, c-format
+msgid "failed to create socket needed for '%s'"
 msgstr ""
 
-#: src/util/network.c:783
-msgid "cannot parse instanceid parameter as a uuid"
+#: src/util/util.c:901 src/util/util.c:994
+#, c-format
+msgid "failed to wait for child creating '%s'"
 msgstr ""
 
-#: src/util/network.c:789
-msgid "cannot generate a random uuid for instanceid"
+#: src/util/util.c:1024
+#, c-format
+msgid "child failed to create directory '%s'"
 msgstr ""
 
-#: src/util/network.c:798
-msgid "a parameter is missing for 802.1Qbg description"
+#: src/util/util.c:1040
+#, c-format
+msgid "cannot chown '%s' to group %u"
 msgstr ""
 
-#: src/util/network.c:810
-msgid "profileid parameter too long"
+#: src/util/util.c:1078
+msgid "virFileOpenAs is not implemented for WIN32"
 msgstr ""
 
-#: src/util/network.c:815
-msgid "profileid parameter is missing for 802.1Qbh descripion"
+#: src/util/util.c:1090
+msgid "virDirCreate is not implemented for WIN32"
 msgstr ""
 
-#: src/util/network.c:825
-msgid "unknown virtualport type"
+#: src/util/util.c:1913
+#, c-format
+msgid "Disk index %d is negative"
 msgstr ""
 
-#: src/util/network.c:931 src/util/network.c:998 src/util/network.c:1305
-msgid "invalid argument supplied"
+#: src/util/util.c:1969
+msgid "failed to determine host name"
 msgstr ""
 
-#: src/util/network.c:942 src/util/network.c:954 src/util/network.c:961
+#: src/util/util.c:2151
 #, c-format
-msgid "could not convert %s"
+msgid "Failed to find user record for uid '%u'"
 msgstr ""
 
-#: src/util/network.c:948
-msgid "Missing mandatory average attribute"
+#: src/util/util.c:2215
+#, c-format
+msgid "Failed to find user record for name '%s'"
 msgstr ""
 
-#: src/util/network.c:1007
-msgid "Only one child <inbound> element allowed"
+#: src/util/util.c:2264
+#, c-format
+msgid "Failed to find group record for name '%s'"
 msgstr ""
 
-#: src/util/network.c:1015
-msgid "Only one child <outbound> element allowed"
+#: src/util/util.c:2291
+#, c-format
+msgid "cannot change to '%d' group"
 msgstr ""
 
-#: src/util/pci.c:477
+#: src/util/util.c:2323
 #, c-format
-msgid "Active %s devices on bus with %s, not doing bus reset"
+msgid "cannot getpwuid_r(%d)"
 msgstr ""
 
-#: src/util/pci.c:486
+#: src/util/util.c:2330
 #, c-format
-msgid "Failed to find parent device for %s"
+msgid "cannot initgroups(\"%s\", %d)"
 msgstr ""
 
-#: src/util/pci.c:647 src/util/pci.c:693
+#: src/util/util.c:2339
 #, c-format
-msgid "Failed to read PCI config space for %s"
+msgid "cannot change to uid to '%d'"
 msgstr ""
 
-#: src/util/pci.c:519 src/util/pci.c:565
-#, c-format
-msgid "Failed to restore PCI config space for %s"
+#: src/util/util.c:2357
+msgid "virGetUserDirectory is not available"
+msgstr ""
+
+#: src/util/util.c:2366
+msgid "virGetUserName is not available"
+msgstr ""
+
+#: src/util/util.c:2375
+msgid "virGetUserID is not available"
 msgstr ""
 
-#: src/util/pci.c:578
+#: src/util/util.c:2385
+msgid "virGetGroupID is not available"
+msgstr ""
+
+#: src/util/util.c:2395
+msgid "virSetUIDGID is not available"
+msgstr ""
+
+#: src/util/viraudit.c:60
+msgid "Unable to initialize audit layer"
+msgstr ""
+
+#: src/util/virfile.c:150
+msgid "O_DIRECT unsupported on this platform"
+msgstr ""
+
+#: src/util/virfile.c:167
 #, c-format
-msgid "Failed to open config space file '%s'"
+msgid "invalid fd %d for %s"
 msgstr ""
 
-#: src/util/pci.c:600
+#: src/util/virfile.c:173
 #, c-format
-msgid "Not resetting active device %s"
+msgid "unexpected mode %x for %s"
 msgstr ""
 
-#: src/util/pci.c:627
+#: src/util/virfile.c:180
 #, c-format
-msgid "Unable to reset PCI device %s: %s"
+msgid "unable to create pipe for %s"
 msgstr ""
 
-#: src/util/pci.c:629
-msgid "no FLR, PM reset or bus reset available"
+#: src/util/virfile.c:200
+msgid "unable to close pipe"
 msgstr ""
 
-#: src/util/pci.c:906
+#: src/util/virfile.c:354
 #, c-format
-msgid "Failed to unbind PCI device '%s' from %s"
+msgid "cannot create file '%s'"
 msgstr ""
 
-#: src/util/pci.c:924
+#: src/util/virfile.c:360
 #, c-format
-msgid "Failed to remove slot for PCI device '%s' from %s"
+msgid "cannot write data to file '%s'"
 msgstr ""
 
-#: src/util/pci.c:818
+#: src/util/virfile.c:366
 #, c-format
-msgid "Failed to trigger a re-probe for PCI device '%s'"
+msgid "cannot sync file '%s'"
 msgstr ""
 
-#: src/util/pci.c:712
+#: src/util/virfile.c:372
 #, c-format
-msgid "Failed to add PCI device ID '%s' to %s"
+msgid "cannot save file '%s'"
 msgstr ""
 
-#: src/util/pci.c:725
+#: src/util/virfile.c:378
 #, c-format
-msgid "Failed to unbind PCI device '%s'"
+msgid "cannot rename file '%s' as '%s'"
 msgstr ""
 
-#: src/util/pci.c:738
+#: src/util/virnetdev.c:62 src/util/virnetdev.c:486
+#: src/util/virnetdevbridge.c:61 src/util/virnetdevtap.c:146
+#: src/util/virnetdevtap.c:204
 #, c-format
-msgid "Failed to add slot for PCI device '%s' to %s"
+msgid "Network interface name '%s' is too long"
 msgstr ""
 
-#: src/util/pci.c:746 src/util/pci.c:793
-#, c-format
-msgid "Failed to bind PCI device '%s' to %s"
+#: src/util/virnetdev.c:69 src/util/virnetdevbridge.c:69
+msgid "Cannot open network interface control socket"
 msgstr ""
 
-#: src/util/pci.c:758
-#, c-format
-msgid "Failed to remove PCI ID '%s' from %s"
+#: src/util/virnetdev.c:75 src/util/virnetdevbridge.c:75
+msgid "Cannot set close-on-exec flag for socket"
 msgstr ""
 
-#: src/util/pci.c:772 src/util/pci.c:833
-msgid "cannot find any PCI stub module"
+#: src/util/virnetdev.c:115
+#, c-format
+msgid "Unable to check interface flags for %s"
 msgstr ""
 
-#: src/util/pci.c:1131
+#: src/util/virnetdev.c:129
 #, c-format
-msgid "Not detaching active device %s"
+msgid "Unable to check interface %s"
 msgstr ""
 
-#: src/util/pci.c:1150
+#: src/util/virnetdev.c:159 src/util/virnetdev.c:213 src/util/virnetdev.c:231
 #, c-format
-msgid "Not reattaching active device %s"
+msgid "Cannot get interface MAC on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1321
+#: src/util/virnetdev.c:168 src/util/virnetdev.c:184
 #, c-format
-msgid "dev->name buffer overflow: %.4x:%.2x:%.2x.%.1x"
+msgid "Cannot set interface MAC on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1333
+#: src/util/virnetdev.c:269
 #, c-format
-msgid "Device %s not found: could not access %s"
+msgid "Unable to preserve mac for %s"
 msgstr ""
 
-#: src/util/pci.c:896
+#: src/util/virnetdev.c:310
 #, c-format
-msgid "Failed to read product/vendor ID for %s"
+msgid "Cannot parse MAC address from '%s'"
 msgstr ""
 
-#: src/util/pci.c:1352
+#: src/util/virnetdev.c:345 src/util/virnetdev.c:360
 #, c-format
-msgid "dev->id buffer overflow: %s %s"
+msgid "Cannot get interface MTU on '%s'"
 msgstr ""
 
-#: src/util/pci.c:975
+#: src/util/virnetdev.c:391 src/util/virnetdev.c:406
 #, c-format
-msgid "Device %s is already in use"
+msgid "Cannot set interface MTU on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1733
+#: src/util/virnetdev.c:493
 #, c-format
-msgid "Device %s is behind a switch lacking ACS and cannot be assigned"
+msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
-#: src/util/pci.c:1830
+#: src/util/virnetdev.c:508
 #, c-format
-msgid "Failed to resolve device link '%s': '%s'"
+msgid "Cannot rename interface '%s' to '%s' on this platform"
 msgstr ""
 
-#: src/util/pci.c:1844
+#: src/util/virnetdev.c:538 src/util/virnetdev.c:598 src/util/virnetdev.c:615
 #, c-format
-msgid "Failed to parse PCI config address '%s'"
+msgid "Cannot get interface flags on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1911
+#: src/util/virnetdev.c:552 src/util/virnetdev.c:569
 #, c-format
-msgid "Failed to open dir '%s': '%s'"
+msgid "Cannot set interface flags on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1942
+#: src/util/virnetdev.c:640 src/util/virnetdev.c:689
+msgid "Unable to open control socket"
+msgstr ""
+
+#: src/util/virnetdev.c:649 src/util/virnetdev.c:695
 #, c-format
-msgid "Failed to get SR IOV function from device link '%s'"
+msgid "invalid interface name %s"
 msgstr ""
 
-#: src/util/pci.c:2004
+#: src/util/virnetdev.c:656
 #, c-format
-msgid "Error getting physical function's '%s' virtual_functions"
+msgid "Unable to get index for interface %s"
 msgstr ""
 
-#: src/util/pci.c:2076
-msgid "pciGetPhysicalFunction is not supported on non-linux platforms"
+#: src/util/virnetdev.c:672
+msgid "Unable to get interface index on this platform"
 msgstr ""
 
-#: src/util/pci.c:2086
-msgid "pciGetVirtualFunctions is not supported on non-linux platforms"
+#: src/util/virnetdev.c:702
+#, c-format
+msgid "Unable to get VLAN for interface %s"
 msgstr ""
 
-#: src/util/pci.c:2094
-msgid "pciDeviceIsVirtualFunction is not supported on non-linux platforms"
+#: src/util/virnetdev.c:719
+msgid "Unable to get VLAN on this platform"
 msgstr ""
 
-#: src/util/pci.c:2104
-msgid "pciGetVirtualFunctionIndex is not supported on non-linux platforms"
+#: src/util/virnetdev.c:837
+#, c-format
+msgid "Unable to get IPv4 address for interface %s"
 msgstr ""
 
-#: src/util/pci.c:2114
-msgid "pciDeviceNetName is not supported on non-linux platforms"
+#: src/util/virnetdev.c:857
+msgid "Unable to get IPv4 address on this platform"
 msgstr ""
 
-#: src/util/processinfo.c:77 src/util/processinfo.c:93
-#: src/util/processinfo.c:138 src/util/processinfo.c:152
+#: src/util/virnetdev.c:903
 #, c-format
-msgid "cannot set CPU affinity on process %d"
+msgid "coud not get MAC address of interface %s"
 msgstr ""
 
-#: src/util/processinfo.c:136 src/util/processinfo.c:150
-#, c-format
-msgid "cannot get CPU affinity of process %d"
+#: src/util/virnetdev.c:935
+msgid "Unable to check interface config on this platform"
 msgstr ""
 
-#: src/util/processinfo.c:172 src/util/processinfo.c:182
-msgid "Process CPU affinity is not supported on this platform"
+#: src/util/virnetdev.c:1063
+msgid "Unable to check virtual function status on this platfornm"
 msgstr ""
 
-#: src/util/sexpr.c:245
-#, c-format
-msgid "unknown s-expression kind %d"
+#: src/util/virnetdev.c:1073
+msgid "Unable to get virtual function index on this platfornm"
 msgstr ""
 
-#: src/util/stats_linux.c:54
-msgid "Could not open /proc/net/dev"
+#: src/util/virnetdev.c:1082
+msgid "Unable to get physical function status on this platfornm"
 msgstr ""
 
-#: src/util/stats_linux.c:110
-msgid "/proc/net/dev: Interface not found"
+#: src/util/virnetdevbridge.c:118 src/util/virnetdevbridge.c:129
+#: src/util/virnetdevbridge.c:136
+#, c-format
+msgid "Unable to set bridge %s %s"
 msgstr ""
 
-#: src/util/storage_file.c:760
+#: src/util/virnetdevbridge.c:170 src/util/virnetdevbridge.c:182
+#: src/util/virnetdevbridge.c:192
 #, c-format
-msgid "cannot set to start of '%s'"
+msgid "Unable to get bridge %s %s"
 msgstr ""
 
-#: src/util/storage_file.c:289
+#: src/util/virnetdevbridge.c:224 src/util/virnetdevbridge.c:238
 #, c-format
-msgid "cannot read header '%s'"
+msgid "Unable to create bridge %s"
 msgstr ""
 
-#: src/util/storage_file.c:415
+#: src/util/virnetdevbridge.c:262 src/util/virnetdevbridge.c:276
 #, c-format
-msgid "cannot open file '%s'"
+msgid "Unable to delete bridge %s"
 msgstr ""
 
-#: src/util/storage_file.c:851
+#: src/util/virnetdevbridge.c:303 src/util/virnetdevbridge.c:350
 #, c-format
-msgid "cannot seek to start of '%s'"
+msgid "Unable to get interface index for %s"
 msgstr ""
 
-#: src/util/storage_file.c:870
+#: src/util/virnetdevbridge.c:309 src/util/virnetdevbridge.c:323
 #, c-format
-msgid "unknown storage file format %d"
+msgid "Unable to add bridge %s port %s"
 msgstr ""
 
-#: src/util/storage_file.c:974
+#: src/util/virnetdevbridge.c:357 src/util/virnetdevbridge.c:371
 #, c-format
-msgid "Invalid relative path '%s'"
+msgid "Unable to remove bridge %s port %s"
 msgstr ""
 
-#: src/util/storage_file.c:992
+#: src/util/virnetdevbridge.c:502
 #, c-format
-msgid "cannot determine filesystem for '%s'"
+msgid "Unable to set STP delay on %s on this platform"
 msgstr ""
 
-#: src/util/sysinfo.c:127
-msgid "Host sysinfo extraction not supported on this platform"
+#: src/util/virnetdevbridge.c:510
+#, c-format
+msgid "Unable to get STP delay on %s on this platform"
 msgstr ""
 
-#: src/util/sysinfo.c:464
+#: src/util/virnetdevbridge.c:520
 #, c-format
-msgid "Failed to find path for %s binary"
+msgid "Unable to set STP on %s on this platform"
 msgstr ""
 
-#: src/util/sysinfo.c:474
+#: src/util/virnetdevbridge.c:528
 #, c-format
-msgid "Failed to execute command %s"
+msgid "Unable to get STP on %s on this platform"
+msgstr ""
+
+#: src/util/virnetdevmacvlan.c:184
+#, c-format
+msgid "error creating %s type of interface"
+msgstr ""
+
+#: src/util/virnetdevmacvlan.c:208 src/util/virnetdevmacvlan.c:294
+#: src/util/virnetdevvportprofile.c:275 src/util/virnetdevvportprofile.c:562
+msgid "malformed netlink response message"
+msgstr ""
+
+#: src/util/virnetdevmacvlan.c:216 src/util/virnetdevmacvlan.c:302
+#: src/util/virnetdevvportprofile.c:283 src/util/virnetdevvportprofile.c:570
+msgid "allocated netlink buffer is too small"
 msgstr ""
 
-#: src/util/sysinfo.c:680
+#: src/util/virnetdevmacvlan.c:270
 #, c-format
-msgid "unexpected sysinfo type model %d"
+msgid "error destroying %s interface"
 msgstr ""
 
-#: src/util/sysinfo.c:713
-msgid "Target sysinfo does not match source"
+#: src/util/virnetdevmacvlan.c:329
+msgid "buffer for ifindex path is too small"
 msgstr ""
 
-#: src/util/sysinfo.c:719
+#: src/util/virnetdevmacvlan.c:337
 #, c-format
-msgid "Target sysinfo %s does not match source %s"
+msgid "cannot open macvtap file %s to determine interface index"
 msgstr ""
 
-#: src/util/sysinfo.c:729
-#, c-format
-msgid "Target sysinfo %s %s does not match source %s"
+#: src/util/virnetdevmacvlan.c:344
+msgid "cannot determine macvtap's tap device interface index"
 msgstr ""
 
-#: src/util/util.c:736
-msgid "Unknown poll response."
+#: src/util/virnetdevmacvlan.c:356
+msgid "internal buffer for tap device is too small"
 msgstr ""
 
-#: src/util/util.c:767
-msgid "poll error"
+#: src/util/virnetdevmacvlan.c:373
+#, c-format
+msgid "cannot open macvtap tap device %s"
 msgstr ""
 
-#: src/util/util.c:968
-#, c-format
-msgid "Failed to open file '%s'"
+#: src/util/virnetdevmacvlan.c:407
+msgid "cannot get interface flags on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:975
-#, c-format
-msgid "Failed to read file '%s'"
+#: src/util/virnetdevmacvlan.c:416
+msgid "cannot clean IFF_VNET_HDR flag on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:747
-#, c-format
-msgid "failed to create file '%s'"
+#: src/util/virnetdevmacvlan.c:420
+msgid "cannot get feature flags on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:796
-#, c-format
-msgid "failed to create directory '%s'"
+#: src/util/virnetdevmacvlan.c:425
+msgid "cannot set IFF_VNET_HDR flag on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:868
+#: src/util/virnetdevmacvlan.c:517
 #, c-format
-msgid "failed to create socket needed for '%s'"
+msgid "Unable to create macvlan device %s"
 msgstr ""
 
-#: src/util/util.c:903 src/util/util.c:996
-#, c-format
-msgid "failed to wait for child creating '%s'"
+#: src/util/virnetdevmacvlan.c:653 src/util/virnetdevmacvlan.c:660
+#: src/util/virnetdevmacvlan.c:678 src/util/virnetdevmacvlan.c:690
+msgid "Cannot create macvlan devices on this platform"
+msgstr ""
+
+#: src/util/virnetdevtap.c:131 src/util/virnetdevtap.c:195
+msgid "Unable to open /dev/net/tun, is tun module loaded?"
 msgstr ""
 
-#: src/util/util.c:1026
+#: src/util/virnetdevtap.c:154
 #, c-format
-msgid "child failed to create directory '%s'"
+msgid "Unable to create tap device %s"
 msgstr ""
 
-#: src/util/util.c:1042
+#: src/util/virnetdevtap.c:162
 #, c-format
-msgid "cannot chown '%s' to group %u"
+msgid "Unable to set tap device %s to persistent"
 msgstr ""
 
-#: src/util/util.c:1080
-msgid "virFileOpenAs is not implemented for WIN32"
+#: src/util/virnetdevtap.c:211
+msgid "Unable to associate TAP device"
 msgstr ""
 
-#: src/util/util.c:1092
-msgid "virDirCreate is not implemented for WIN32"
+#: src/util/virnetdevtap.c:217
+msgid "Unable to make TAP device non-persistent"
 msgstr ""
 
-#: src/util/util.c:1790
-#, c-format
-msgid "Disk index %d is negative"
+#: src/util/virnetdevtap.c:233
+msgid "Unable to create TAP devices on this platform"
 msgstr ""
 
-#: src/util/util.c:1826
-msgid "failed to determine host name"
+#: src/util/virnetdevtap.c:239
+msgid "Unable to delete TAP devices on this platform"
 msgstr ""
 
-#: src/util/util.c:2153
-#, c-format
-msgid "Failed to find user record for uid '%u'"
+#: src/util/virnetdevvportprofile.c:154
+msgid "error parsing pid of lldpad"
 msgstr ""
 
-#: src/util/util.c:2028
+#: src/util/virnetdevvportprofile.c:159
 #, c-format
-msgid "Failed to find user record for name '%s'"
+msgid "Error opening file %s"
 msgstr ""
 
-#: src/util/util.c:2065
+#: src/util/virnetdevvportprofile.c:245
 #, c-format
-msgid "Failed to find group record for name '%s'"
+msgid "error dumping %s (%d) interface"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2306
-#, c-format
-msgid "cannot change to '%d' group"
+#: src/util/virnetdevvportprofile.c:314
+msgid "error parsing IFLA_PORT_SELF part"
 msgstr ""
 
-#: src/util/util.c:2325
-#, c-format
-msgid "cannot getpwuid_r(%d)"
+#: src/util/virnetdevvportprofile.c:318
+msgid "IFLA_PORT_SELF is missing"
 msgstr ""
 
-#: src/util/util.c:2332
-#, c-format
-msgid "cannot initgroups(\"%s\", %d)"
+#: src/util/virnetdevvportprofile.c:330
+msgid "error while iterating over IFLA_VF_PORTS part"
 msgstr ""
 
-#: src/util/util.c:2341
-#, c-format
-msgid "cannot change to uid to '%d'"
+#: src/util/virnetdevvportprofile.c:336
+msgid "error parsing IFLA_VF_PORT part"
 msgstr ""
 
-#: src/util/util.c:2359
-msgid "virGetUserDirectory is not available"
+#: src/util/virnetdevvportprofile.c:354
+msgid "Could not find netlink response with expected parameters"
 msgstr ""
 
-#: src/util/util.c:2368
-msgid "virGetUserName is not available"
+#: src/util/virnetdevvportprofile.c:359
+msgid "IFLA_VF_PORTS is missing"
 msgstr ""
 
-#: src/util/util.c:2377
-msgid "virGetUserID is not available"
+#: src/util/virnetdevvportprofile.c:373
+msgid "no IFLA_PORT_RESPONSE found in netlink message"
 msgstr ""
 
-#: src/util/util.c:2387
-msgid "virGetGroupID is not available"
+#: src/util/virnetdevvportprofile.c:536
+#, c-format
+msgid "error during virtual port configuration of ifindex %d"
 msgstr ""
 
-#: src/util/util.c:2397
-msgid "virSetUIDGID is not available"
+#: src/util/virnetdevvportprofile.c:618
+msgid "buffer for root interface name is too small"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:300 src/qemu/qemu_driver.c:342
-#: src/xen/xm_internal.c:496
-msgid "cannot get time of day"
+#: src/util/virnetdevvportprofile.c:674
+msgid "sending of PortProfileRequest failed."
 msgstr ""
 
-#: src/util/viraudit.c:60
-msgid "Unable to initialize audit layer"
+#: src/util/virnetdevvportprofile.c:695
+#, c-format
+msgid "error %d during port-profile setlink on interface %s (%d)"
 msgstr ""
 
-#: src/util/virfile.c:150
-msgid "O_DIRECT unsupported on this platform"
+#: src/util/virnetdevvportprofile.c:709
+msgid "port-profile setlink timed out"
 msgstr ""
 
-#: src/util/virfile.c:167
+#: src/util/virnetdevvportprofile.c:793 src/util/virnetdevvportprofile.c:925
 #, c-format
-msgid "invalid fd %d for %s"
+msgid "operation type %d not supported"
 msgstr ""
 
-#: src/util/virfile.c:173
-#, c-format
-msgid "unexpected mode %x for %s"
+#: src/util/virnetdevvportprofile.c:1062 src/util/virnetdevvportprofile.c:1073
+msgid "Virtual port profile association not supported on this platform"
 msgstr ""
 
-#: src/util/virfile.c:180
-#, c-format
-msgid "unable to create pipe for %s"
+#: src/util/virnodesuspend.c:99
+msgid "Suspend duration is too short"
 msgstr ""
 
-#: src/util/virfile.c:200
-msgid "unable to close pipe"
+#: src/util/virnodesuspend.c:202
+msgid "Suspend operation already in progress"
 msgstr ""
 
-#: src/util/virfile.c:354
-#, c-format
-msgid "cannot create file '%s'"
+#: src/util/virnodesuspend.c:210
+msgid "Suspend-to-RAM"
 msgstr ""
 
-#: src/util/virfile.c:360
-#, c-format
-msgid "cannot write data to file '%s'"
+#: src/util/virnodesuspend.c:218
+msgid "Suspend-to-Disk"
 msgstr ""
 
-#: src/util/virfile.c:366
-#, c-format
-msgid "cannot sync file '%s'"
+#: src/util/virnodesuspend.c:226
+msgid "Hybrid-Suspend"
 msgstr ""
 
-#: src/util/virfile.c:372
-#, c-format
-msgid "cannot save file '%s'"
+#: src/util/virnodesuspend.c:233
+msgid "Invalid suspend target"
 msgstr ""
 
-#: src/util/virfile.c:378
-#, c-format
-msgid "cannot rename file '%s' as '%s'"
+#: src/util/virnodesuspend.c:243
+msgid "Failed to create thread to suspend the host\n"
 msgstr ""
 
 #: src/util/virpidfile.c:321
@@ -15733,674 +16364,701 @@
 msgid "Failed to write to pid file '%s'"
 msgstr ""
 
-#: src/util/virterror.c:223
+#: src/util/virsocketaddr.c:95 src/util/virsocketaddr.c:188
+msgid "Missing address"
+msgstr ""
+
+#: src/util/virsocketaddr.c:104
+#, c-format
+msgid "Cannot parse socket address '%s': %s"
+msgstr ""
+
+#: src/util/virsocketaddr.c:111
+#, c-format
+msgid "No socket addresses found for '%s'"
+msgstr ""
+
+#: src/util/virsocketaddr.c:212
+#, c-format
+msgid "Cannot convert socket address to string: %s"
+msgstr ""
+
+#: src/util/virterror.c:226
 msgid "An error occurred, but the cause is unknown"
 msgstr ""
 
-#: src/util/virterror.c:537
+#: src/util/virterror.c:572
 msgid "warning"
 msgstr "warning"
 
-#: src/util/virterror.c:540
+#: src/util/virterror.c:575 tools/virsh.c:16932
 msgid "error"
 msgstr "error"
 
-#: src/util/virterror.c:674
+#: src/util/virterror.c:705
 msgid "No error message provided"
 msgstr "No error message provided"
 
-#: src/util/virterror.c:737
+#: src/util/virterror.c:768
 #, c-format
 msgid "internal error %s"
 msgstr "internal error %s"
 
-#: src/util/virterror.c:739
+#: src/util/virterror.c:770
 msgid "internal error"
 msgstr "internal error"
 
-#: src/util/virterror.c:742
+#: src/util/virterror.c:773 tools/virsh.c:12077
 msgid "out of memory"
 msgstr "out of memory"
 
-#: src/util/virterror.c:774
+#: src/util/virterror.c:777
 msgid "this function is not supported by the connection driver"
 msgstr ""
 
-#: src/util/virterror.c:776
+#: src/util/virterror.c:779
 #, c-format
 msgid "this function is not supported by the connection driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:780
+#: src/util/virterror.c:783
 msgid "no connection driver available"
 msgstr ""
 
-#: src/util/virterror.c:782
+#: src/util/virterror.c:785
 #, c-format
 msgid "no connection driver available for %s"
 msgstr ""
 
-#: src/util/virterror.c:758
+#: src/util/virterror.c:789
 msgid "invalid connection pointer in"
 msgstr "invalid connection pointer in"
 
-#: src/util/virterror.c:760
+#: src/util/virterror.c:791
 #, c-format
 msgid "invalid connection pointer in %s"
 msgstr "invalid connection pointer in %s"
 
-#: src/util/virterror.c:764
+#: src/util/virterror.c:795
 msgid "invalid domain pointer in"
 msgstr "invalid domain pointer in"
 
-#: src/util/virterror.c:766
+#: src/util/virterror.c:797
 #, c-format
 msgid "invalid domain pointer in %s"
 msgstr "invalid domain pointer in %s"
 
-#: src/util/virterror.c:798
+#: src/util/virterror.c:801
 msgid "invalid argument"
 msgstr ""
 
-#: src/util/virterror.c:800
+#: src/util/virterror.c:803
 #, c-format
 msgid "invalid argument: %s"
 msgstr ""
 
-#: src/util/virterror.c:776
+#: src/util/virterror.c:807
 #, c-format
 msgid "operation failed: %s"
 msgstr "operation failed: %s"
 
-#: src/util/virterror.c:778
+#: src/util/virterror.c:809
 msgid "operation failed"
 msgstr "operation failed"
 
-#: src/util/virterror.c:782
+#: src/util/virterror.c:813
 #, c-format
 msgid "GET operation failed: %s"
 msgstr "GET operation failed: %s"
 
-#: src/util/virterror.c:784
+#: src/util/virterror.c:815
 msgid "GET operation failed"
 msgstr "GET operation failed"
 
-#: src/util/virterror.c:788
+#: src/util/virterror.c:819
 #, c-format
 msgid "POST operation failed: %s"
 msgstr "POST operation failed: %s"
 
-#: src/util/virterror.c:790
+#: src/util/virterror.c:821
 msgid "POST operation failed"
 msgstr "POST operation failed"
 
-#: src/util/virterror.c:793
+#: src/util/virterror.c:824
 #, c-format
 msgid "got unknown HTTP error code %d"
 msgstr "got unknown HTTP error code %d"
 
-#: src/util/virterror.c:797
+#: src/util/virterror.c:828
 #, c-format
 msgid "unknown host %s"
 msgstr "unknown host %s"
 
-#: src/util/virterror.c:799
+#: src/util/virterror.c:830
 msgid "unknown host"
 msgstr "unknown host"
 
-#: src/util/virterror.c:803
+#: src/util/virterror.c:834
 #, c-format
 msgid "failed to serialize S-Expr: %s"
 msgstr "failed to serialize S-Expr: %s"
 
-#: src/util/virterror.c:805
+#: src/util/virterror.c:836
 msgid "failed to serialize S-Expr"
 msgstr "failed to serialize S-Expr"
 
-#: src/util/virterror.c:809
+#: src/util/virterror.c:840
 msgid "could not use Xen hypervisor entry"
 msgstr "could not use Xen hypervisor entry"
 
-#: src/util/virterror.c:811
+#: src/util/virterror.c:842
 #, c-format
 msgid "could not use Xen hypervisor entry %s"
 msgstr "could not use Xen hypervisor entry %s"
 
-#: src/util/virterror.c:815
+#: src/util/virterror.c:846
 msgid "could not connect to Xen Store"
 msgstr "could not connect to Xen Store"
 
-#: src/util/virterror.c:817
+#: src/util/virterror.c:848
 #, c-format
 msgid "could not connect to Xen Store %s"
 msgstr "could not connect to Xen Store %s"
 
-#: src/util/virterror.c:820
+#: src/util/virterror.c:851
 #, c-format
 msgid "failed Xen syscall %s"
 msgstr ""
 
-#: src/util/virterror.c:824
+#: src/util/virterror.c:855
 msgid "unknown OS type"
 msgstr "unknown OS type"
 
-#: src/util/virterror.c:826
+#: src/util/virterror.c:857
 #, c-format
 msgid "unknown OS type %s"
 msgstr "unknown OS type %s"
 
-#: src/util/virterror.c:829
+#: src/util/virterror.c:860
 msgid "missing kernel information"
 msgstr "missing kernel information"
 
-#: src/util/virterror.c:833
+#: src/util/virterror.c:864
 msgid "missing root device information"
 msgstr "missing root device information"
 
-#: src/util/virterror.c:835
+#: src/util/virterror.c:866
 #, c-format
 msgid "missing root device information in %s"
 msgstr "missing root device information in %s"
 
-#: src/util/virterror.c:839
+#: src/util/virterror.c:870
 msgid "missing source information for device"
 msgstr "missing source information for device"
 
-#: src/util/virterror.c:841
+#: src/util/virterror.c:872
 #, c-format
 msgid "missing source information for device %s"
 msgstr "missing source information for device %s"
 
-#: src/util/virterror.c:845
+#: src/util/virterror.c:876
 msgid "missing target information for device"
 msgstr "missing target information for device"
 
-#: src/util/virterror.c:847
+#: src/util/virterror.c:878
 #, c-format
 msgid "missing target information for device %s"
 msgstr "missing target information for device %s"
 
-#: src/util/virterror.c:851
+#: src/util/virterror.c:882
 msgid "missing domain name information"
 msgstr "missing domain name information"
 
-#: src/util/virterror.c:853
+#: src/util/virterror.c:884
 #, c-format
 msgid "missing domain name information in %s"
 msgstr "missing domain name information in %s"
 
-#: src/util/virterror.c:857
+#: src/util/virterror.c:888
 msgid "missing operating system information"
 msgstr "missing operating system information"
 
-#: src/util/virterror.c:859
+#: src/util/virterror.c:890
 #, c-format
 msgid "missing operating system information for %s"
 msgstr "missing operating system information for %s"
 
-#: src/util/virterror.c:863
+#: src/util/virterror.c:894
 msgid "missing devices information"
 msgstr "missing devices information"
 
-#: src/util/virterror.c:865
+#: src/util/virterror.c:896
 #, c-format
 msgid "missing devices information for %s"
 msgstr "missing devices information for %s"
 
-#: src/util/virterror.c:869
+#: src/util/virterror.c:900
 msgid "too many drivers registered"
 msgstr "too many drivers registered"
 
-#: src/util/virterror.c:871
+#: src/util/virterror.c:902
 #, c-format
 msgid "too many drivers registered in %s"
 msgstr "too many drivers registered in %s"
 
-#: src/util/virterror.c:875
+#: src/util/virterror.c:906
 msgid "library call failed, possibly not supported"
 msgstr "library call failed, possibly not supported"
 
-#: src/util/virterror.c:877
+#: src/util/virterror.c:908
 #, c-format
 msgid "library call %s failed, possibly not supported"
 msgstr "library call %s failed, possibly not supported"
 
-#: src/util/virterror.c:909
+#: src/util/virterror.c:912
 msgid "XML description is invalid or not well formed"
 msgstr ""
 
-#: src/util/virterror.c:911
+#: src/util/virterror.c:914
 #, c-format
 msgid "XML error: %s"
 msgstr ""
 
-#: src/util/virterror.c:887
+#: src/util/virterror.c:918
 msgid "this domain exists already"
 msgstr "this domain exists already"
 
-#: src/util/virterror.c:889
+#: src/util/virterror.c:920
 #, c-format
 msgid "domain %s exists already"
 msgstr "domain %s exists already"
 
-#: src/util/virterror.c:893
+#: src/util/virterror.c:924
 msgid "operation forbidden for read only access"
 msgstr "operation forbidden for read only access"
 
-#: src/util/virterror.c:895
+#: src/util/virterror.c:926
 #, c-format
 msgid "operation %s forbidden for read only access"
 msgstr "operation %s forbidden for read only access"
 
-#: src/util/virterror.c:899
+#: src/util/virterror.c:930
 msgid "failed to open configuration file for reading"
 msgstr "failed to open configuration file for reading"
 
-#: src/util/virterror.c:901
+#: src/util/virterror.c:932
 #, c-format
 msgid "failed to open %s for reading"
 msgstr "failed to open %s for reading"
 
-#: src/util/virterror.c:905
+#: src/util/virterror.c:936
 msgid "failed to read configuration file"
 msgstr "failed to read configuration file"
 
-#: src/util/virterror.c:907
+#: src/util/virterror.c:938
 #, c-format
 msgid "failed to read configuration file %s"
 msgstr "failed to read configuration file %s"
 
-#: src/util/virterror.c:911
+#: src/util/virterror.c:942
 msgid "failed to parse configuration file"
 msgstr "failed to parse configuration file"
 
-#: src/util/virterror.c:913
+#: src/util/virterror.c:944
 #, c-format
 msgid "failed to parse configuration file %s"
 msgstr "failed to parse configuration file %s"
 
-#: src/util/virterror.c:917
+#: src/util/virterror.c:948
 msgid "configuration file syntax error"
 msgstr "configuration file syntax error"
 
-#: src/util/virterror.c:919
+#: src/util/virterror.c:950
 #, c-format
 msgid "configuration file syntax error: %s"
 msgstr "configuration file syntax error: %s"
 
-#: src/util/virterror.c:923
+#: src/util/virterror.c:954
 msgid "failed to write configuration file"
 msgstr "failed to write configuration file"
 
-#: src/util/virterror.c:925
+#: src/util/virterror.c:956
 #, c-format
 msgid "failed to write configuration file: %s"
 msgstr "failed to write configuration file: %s"
 
-#: src/util/virterror.c:929
+#: src/util/virterror.c:960
 msgid "parser error"
 msgstr "parser error"
 
-#: src/util/virterror.c:935
+#: src/util/virterror.c:966
 msgid "invalid network pointer in"
 msgstr ""
 
-#: src/util/virterror.c:937
+#: src/util/virterror.c:968
 #, c-format
 msgid "invalid network pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:941
+#: src/util/virterror.c:972
 msgid "this network exists already"
 msgstr ""
 
-#: src/util/virterror.c:943
+#: src/util/virterror.c:974
 #, c-format
 msgid "network %s exists already"
 msgstr ""
 
-#: src/util/virterror.c:947
+#: src/util/virterror.c:978
 msgid "system call error"
 msgstr ""
 
-#: src/util/virterror.c:953
+#: src/util/virterror.c:984
 msgid "RPC error"
 msgstr ""
 
-#: src/util/virterror.c:959
+#: src/util/virterror.c:990
 msgid "GNUTLS call error"
 msgstr ""
 
-#: src/util/virterror.c:965
+#: src/util/virterror.c:996
 msgid "Failed to find the network"
 msgstr ""
 
-#: src/util/virterror.c:967
+#: src/util/virterror.c:998
 #, c-format
 msgid "Failed to find the network: %s"
 msgstr ""
 
-#: src/util/virterror.c:971
+#: src/util/virterror.c:1002
 msgid "Domain not found"
 msgstr ""
 
-#: src/util/virterror.c:973
+#: src/util/virterror.c:1004
 #, c-format
 msgid "Domain not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:977
+#: src/util/virterror.c:1008
 msgid "Network not found"
 msgstr ""
 
-#: src/util/virterror.c:979
+#: src/util/virterror.c:1010
 #, c-format
 msgid "Network not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:983
+#: src/util/virterror.c:1014
 msgid "invalid MAC address"
 msgstr ""
 
-#: src/util/virterror.c:985
+#: src/util/virterror.c:1016
 #, c-format
 msgid "invalid MAC address: %s"
 msgstr ""
 
-#: src/util/virterror.c:991
+#: src/util/virterror.c:1022
 #, c-format
 msgid "authentication failed: %s"
 msgstr ""
 
-#: src/util/virterror.c:995
+#: src/util/virterror.c:1026
 msgid "Storage pool not found"
 msgstr ""
 
-#: src/util/virterror.c:997
+#: src/util/virterror.c:1028
 #, c-format
 msgid "Storage pool not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1001
+#: src/util/virterror.c:1032
 msgid "Storage volume not found"
 msgstr ""
 
-#: src/util/virterror.c:1003
+#: src/util/virterror.c:1034
 #, c-format
 msgid "Storage volume not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1035
+#: src/util/virterror.c:1038
 msgid "Storage pool probe failed"
 msgstr ""
 
-#: src/util/virterror.c:1037
+#: src/util/virterror.c:1040
 #, c-format
 msgid "Storage pool probe failed: %s"
 msgstr ""
 
-#: src/util/virterror.c:1041
+#: src/util/virterror.c:1044
 msgid "Storage pool already built"
 msgstr ""
 
-#: src/util/virterror.c:1043
+#: src/util/virterror.c:1046
 #, c-format
 msgid "Storage pool already built: %s"
 msgstr ""
 
-#: src/util/virterror.c:1007
+#: src/util/virterror.c:1050
 msgid "invalid storage pool pointer in"
 msgstr ""
 
-#: src/util/virterror.c:1009
+#: src/util/virterror.c:1052
 #, c-format
 msgid "invalid storage pool pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1013
+#: src/util/virterror.c:1056
 msgid "invalid storage volume pointer in"
 msgstr ""
 
-#: src/util/virterror.c:1015
+#: src/util/virterror.c:1058
 #, c-format
 msgid "invalid storage volume pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1019
+#: src/util/virterror.c:1062
 msgid "Failed to find a storage driver"
 msgstr ""
 
-#: src/util/virterror.c:1021
+#: src/util/virterror.c:1064
 #, c-format
 msgid "Failed to find a storage driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:1025
+#: src/util/virterror.c:1068
 msgid "Failed to find a node driver"
 msgstr ""
 
-#: src/util/virterror.c:1027
+#: src/util/virterror.c:1070
 #, c-format
 msgid "Failed to find a node driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:1031
+#: src/util/virterror.c:1074
 msgid "invalid node device pointer"
 msgstr ""
 
-#: src/util/virterror.c:1033
+#: src/util/virterror.c:1076
 #, c-format
 msgid "invalid node device pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1037
+#: src/util/virterror.c:1080
 msgid "Node device not found"
 msgstr ""
 
-#: src/util/virterror.c:1039
+#: src/util/virterror.c:1082
 #, c-format
 msgid "Node device not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1043
+#: src/util/virterror.c:1086
 msgid "Security model not found"
 msgstr ""
 
-#: src/util/virterror.c:1045
+#: src/util/virterror.c:1088
 #, c-format
 msgid "Security model not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1049
+#: src/util/virterror.c:1092
 msgid "Requested operation is not valid"
 msgstr ""
 
-#: src/util/virterror.c:1051
+#: src/util/virterror.c:1094
 #, c-format
 msgid "Requested operation is not valid: %s"
 msgstr ""
 
-#: src/util/virterror.c:1055
+#: src/util/virterror.c:1098
 msgid "Failed to find the interface"
 msgstr ""
 
-#: src/util/virterror.c:1057
+#: src/util/virterror.c:1100
 #, c-format
 msgid "Failed to find the interface: %s"
 msgstr ""
 
-#: src/util/virterror.c:1061
+#: src/util/virterror.c:1104
 msgid "Interface not found"
 msgstr ""
 
-#: src/util/virterror.c:1063
+#: src/util/virterror.c:1106
 #, c-format
 msgid "Interface not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1067
+#: src/util/virterror.c:1110
 msgid "invalid interface pointer in"
 msgstr ""
 
-#: src/util/virterror.c:1069
+#: src/util/virterror.c:1112
 #, c-format
 msgid "invalid interface pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1073
+#: src/util/virterror.c:1116
 msgid "multiple matching interfaces found"
 msgstr ""
 
-#: src/util/virterror.c:1075
+#: src/util/virterror.c:1118
 #, c-format
 msgid "multiple matching interfaces found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1079
+#: src/util/virterror.c:1122
 msgid "Failed to find a secret storage driver"
 msgstr ""
 
-#: src/util/virterror.c:1081
+#: src/util/virterror.c:1124
 #, c-format
 msgid "Failed to find a secret storage driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:1085
+#: src/util/virterror.c:1128
 msgid "Invalid secret"
 msgstr ""
 
-#: src/util/virterror.c:1087
+#: src/util/virterror.c:1130
 #, c-format
 msgid "Invalid secret: %s"
 msgstr ""
 
-#: src/util/virterror.c:1091
+#: src/util/virterror.c:1134
 msgid "Secret not found"
 msgstr ""
 
-#: src/util/virterror.c:1093
+#: src/util/virterror.c:1136
 #, c-format
 msgid "Secret not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1137
+#: src/util/virterror.c:1140
 msgid "Failed to start the nwfilter driver"
 msgstr ""
 
-#: src/util/virterror.c:1139
+#: src/util/virterror.c:1142
 #, c-format
 msgid "Failed to start the nwfilter driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:1143
+#: src/util/virterror.c:1146
 msgid "Invalid network filter"
 msgstr ""
 
-#: src/util/virterror.c:1145
+#: src/util/virterror.c:1148
 #, c-format
 msgid "Invalid network filter: %s"
 msgstr ""
 
-#: src/util/virterror.c:1149
+#: src/util/virterror.c:1152
 msgid "Network filter not found"
 msgstr ""
 
-#: src/util/virterror.c:1151
+#: src/util/virterror.c:1154
 #, c-format
 msgid "Network filter not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1155
+#: src/util/virterror.c:1158
 msgid "Error while building firewall"
 msgstr ""
 
-#: src/util/virterror.c:1157
+#: src/util/virterror.c:1160
 #, c-format
 msgid "Error while building firewall: %s"
 msgstr ""
 
-#: src/util/virterror.c:1097
+#: src/util/virterror.c:1164
 msgid "unsupported configuration"
 msgstr ""
 
-#: src/util/virterror.c:1099
+#: src/util/virterror.c:1166
 #, c-format
 msgid "unsupported configuration: %s"
 msgstr ""
 
-#: src/util/virterror.c:1103
+#: src/util/virterror.c:1170
 msgid "Timed out during operation"
 msgstr ""
 
-#: src/util/virterror.c:1105
+#: src/util/virterror.c:1172
 #, c-format
 msgid "Timed out during operation: %s"
 msgstr ""
 
-#: src/util/virterror.c:1109
+#: src/util/virterror.c:1176
 msgid "Failed to make domain persistent after migration"
 msgstr ""
 
-#: src/util/virterror.c:1111
+#: src/util/virterror.c:1178
 #, c-format
 msgid "Failed to make domain persistent after migration: %s"
 msgstr ""
 
-#: src/util/virterror.c:1179
+#: src/util/virterror.c:1182
 msgid "Hook script execution failed"
 msgstr ""
 
-#: src/util/virterror.c:1181
+#: src/util/virterror.c:1184
 #, c-format
 msgid "Hook script execution failed: %s"
 msgstr ""
 
-#: src/util/virterror.c:1185
+#: src/util/virterror.c:1188
 msgid "Invalid snapshot"
 msgstr ""
 
-#: src/util/virterror.c:1187
+#: src/util/virterror.c:1190
 #, c-format
 msgid "Invalid snapshot: %s"
 msgstr ""
 
-#: src/util/virterror.c:1191
+#: src/util/virterror.c:1194
 msgid "Domain snapshot not found"
 msgstr ""
 
-#: src/util/virterror.c:1193
+#: src/util/virterror.c:1196
 #, c-format
 msgid "Domain snapshot not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1197
+#: src/util/virterror.c:1200
 msgid "invalid stream pointer"
 msgstr ""
 
-#: src/util/virterror.c:1199
+#: src/util/virterror.c:1202
 #, c-format
 msgid "invalid stream pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1203
+#: src/util/virterror.c:1206
 msgid "argument unsupported"
 msgstr ""
 
-#: src/util/virterror.c:1205
+#: src/util/virterror.c:1208
 #, c-format
 msgid "argument unsupported: %s"
 msgstr ""
 
-#: src/util/virterror.c:1209
+#: src/util/virterror.c:1212
 msgid "revert requires force"
 msgstr ""
 
-#: src/util/virterror.c:1211
+#: src/util/virterror.c:1214
 #, c-format
 msgid "revert requires force: %s"
 msgstr ""
 
-#: src/util/xml.c:60
+#: src/util/virtime.c:288
+msgid "Unable to break out time format"
+msgstr ""
+
+#: src/util/virtime.c:316 src/util/virtime.c:347
+msgid "Unable to format time"
+msgstr ""
+
+#: src/util/xml.c:70
 msgid "Invalid parameter to virXPathString()"
 msgstr ""
 
@@ -16409,15 +17067,15 @@
 msgid "'%s' value longer than %zd bytes"
 msgstr ""
 
-#: src/util/xml.c:131
+#: src/util/xml.c:140
 msgid "Invalid parameter to virXPathNumber()"
 msgstr ""
 
-#: src/util/xml.c:161
+#: src/util/xml.c:169
 msgid "Invalid parameter to virXPathLong()"
 msgstr ""
 
-#: src/util/xml.c:248 src/util/xml.c:346
+#: src/util/xml.c:282 src/util/xml.c:406
 msgid "Invalid parameter to virXPathULong()"
 msgstr ""
 
@@ -16425,15 +17083,15 @@
 msgid "Invalid parameter to virXPathLongLong()"
 msgstr ""
 
-#: src/util/xml.c:404
+#: src/util/xml.c:517
 msgid "Invalid parameter to virXPathBoolean()"
 msgstr ""
 
-#: src/util/xml.c:442
+#: src/util/xml.c:554
 msgid "Invalid parameter to virXPathNode()"
 msgstr ""
 
-#: src/util/xml.c:483
+#: src/util/xml.c:594
 msgid "Invalid parameter to virXPathNodeSet()"
 msgstr ""
 
@@ -16456,21 +17114,11 @@
 "%s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2611 src/conf/domain_conf.c:3498
-#: src/conf/domain_conf.c:3539 src/conf/domain_conf.c:3611
-#: src/conf/interface_conf.c:937 src/conf/interface_conf.c:977
-#: src/conf/network_conf.c:560 src/conf/network_conf.c:600
-#: src/conf/node_device_conf.c:1302 src/conf/secret_conf.c:241
-#: src/conf/storage_conf.c:800 src/conf/storage_conf.c:1210
+#: src/util/xml.c:774
 msgid "missing root element"
 msgstr ""
 
-#: src/conf/domain_conf.c:3492 src/conf/domain_conf.c:3533
-#: src/conf/domain_conf.c:3605 src/conf/interface_conf.c:931
-#: src/conf/interface_conf.c:971 src/conf/network_conf.c:554
-#: src/conf/network_conf.c:594 src/conf/node_device_conf.c:1296
-#: src/conf/secret_conf.c:234 src/conf/storage_conf.c:793
-#: src/conf/storage_conf.c:1203
+#: src/util/xml.c:798
 msgid "failed to parse xml document"
 msgstr ""
 
@@ -16519,21 +17167,21 @@
 msgid "Calling %s from '%s' failed"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:135 src/vbox/vbox_tmpl.c:788
+#: src/vbox/vbox_driver.c:166 src/vbox/vbox_tmpl.c:1001
 msgid "no VirtualBox driver path specified (try vbox:///session)"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:142 src/vbox/vbox_tmpl.c:795
+#: src/vbox/vbox_driver.c:173 src/vbox/vbox_tmpl.c:1008
 #, c-format
 msgid "unknown driver path '%s' specified (try vbox:///session)"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:149 src/vbox/vbox_tmpl.c:802
+#: src/vbox/vbox_driver.c:180 src/vbox/vbox_tmpl.c:1015
 #, c-format
 msgid "unknown driver path '%s' specified (try vbox:///system)"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:155
+#: src/vbox/vbox_driver.c:186
 msgid "unable to initialize VirtualBox driver API"
 msgstr ""
 
@@ -16553,390 +17201,390 @@
 msgid "Cound not extract VirtualBox version"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1127
+#: src/vbox/vbox_tmpl.c:1132
 #, c-format
 msgid "Could not get list of Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1164
+#: src/vbox/vbox_tmpl.c:1169
 #, c-format
 msgid "Could not get number of Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1236 src/vbox/vbox_tmpl.c:1296
-#: src/vbox/vbox_tmpl.c:1366 src/vbox/vbox_tmpl.c:1440
-#: src/vbox/vbox_tmpl.c:1853 src/vbox/vbox_tmpl.c:3679
+#: src/vbox/vbox_tmpl.c:1241 src/vbox/vbox_tmpl.c:1301
+#: src/vbox/vbox_tmpl.c:1371 src/vbox/vbox_tmpl.c:1445
+#: src/vbox/vbox_tmpl.c:1858 src/vbox/vbox_tmpl.c:3684
 #, c-format
 msgid "Could not get list of machines, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1536
+#: src/vbox/vbox_tmpl.c:1541
 msgid "error while suspending the domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1542
+#: src/vbox/vbox_tmpl.c:1547
 msgid "machine not in running state to suspend it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1588
+#: src/vbox/vbox_tmpl.c:1593
 msgid "error while resuming the domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1594
+#: src/vbox/vbox_tmpl.c:1599
 msgid "machine not paused, so can't resume it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1631
+#: src/vbox/vbox_tmpl.c:1636
 msgid "machine paused, so can't power it down"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1635 src/vbox/vbox_tmpl.c:1735
+#: src/vbox/vbox_tmpl.c:1640 src/vbox/vbox_tmpl.c:1740
 msgid "machine already powered down"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1693
+#: src/vbox/vbox_tmpl.c:1698
 msgid "machine not running, so can't reboot it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1811
+#: src/vbox/vbox_tmpl.c:1816
 msgid "memory size can't be changed unless domain is powered down"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1827 src/vbox/vbox_tmpl.c:5042
+#: src/vbox/vbox_tmpl.c:1832 src/vbox/vbox_tmpl.c:5047
 #, c-format
 msgid "could not set the memory size of the domain to: %lu Kb, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1964 src/vbox/vbox_tmpl.c:5891
-#: src/vbox/vbox_tmpl.c:5993 src/vbox/vbox_tmpl.c:6098
-#: src/vbox/vbox_tmpl.c:6149 src/vbox/vbox_tmpl.c:6238
-#: src/vbox/vbox_tmpl.c:6270 src/vbox/vbox_tmpl.c:6312
-#: src/vbox/vbox_tmpl.c:6376 src/vbox/vbox_tmpl.c:6544
-#: src/vbox/vbox_tmpl.c:6702
+#: src/vbox/vbox_tmpl.c:1969 src/vbox/vbox_tmpl.c:5896
+#: src/vbox/vbox_tmpl.c:5998 src/vbox/vbox_tmpl.c:6103
+#: src/vbox/vbox_tmpl.c:6154 src/vbox/vbox_tmpl.c:6243
+#: src/vbox/vbox_tmpl.c:6275 src/vbox/vbox_tmpl.c:6317
+#: src/vbox/vbox_tmpl.c:6381 src/vbox/vbox_tmpl.c:6549
+#: src/vbox/vbox_tmpl.c:6707
 msgid "no domain with matching UUID"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:2101
+#: src/vbox/vbox_tmpl.c:2106
 #, c-format
 msgid "could not set the number of cpus of the domain to: %u, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:2112
+#: src/vbox/vbox_tmpl.c:2117
 #, c-format
 msgid "can't open session to the domain with id %d"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:2765
+#: src/vbox/vbox_tmpl.c:2770
 #, c-format
 msgid ""
 "Could not generate medium name for the disk at: controller instance:%u, "
 "port:%d, slot:%d"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3405
+#: src/vbox/vbox_tmpl.c:3410
 #, c-format
 msgid "Could not get list of Defined Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3455
+#: src/vbox/vbox_tmpl.c:3460
 #, c-format
 msgid "Could not get number of Defined Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3625
+#: src/vbox/vbox_tmpl.c:3630
 msgid "OpenRemoteSession/LaunchVMProcess failed, domain can't be started"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3672
+#: src/vbox/vbox_tmpl.c:3677
 msgid "Error while reading the domain name"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3709
+#: src/vbox/vbox_tmpl.c:3714
 msgid "machine is not in poweroff|saved|aborted state, so couldn't start it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3842 src/vbox/vbox_tmpl.c:5393
+#: src/vbox/vbox_tmpl.c:3847 src/vbox/vbox_tmpl.c:5398
 #, c-format
 msgid "can't get the uuid of the file to be attached to cdrom: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3849 src/vbox/vbox_tmpl.c:5402
+#: src/vbox/vbox_tmpl.c:3854 src/vbox/vbox_tmpl.c:5407
 #, c-format
 msgid "could not attach the file to cdrom: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3906
+#: src/vbox/vbox_tmpl.c:3911
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached as harddisk: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3952
+#: src/vbox/vbox_tmpl.c:3957
 #, c-format
 msgid "could not attach the file as harddisk: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3998 src/vbox/vbox_tmpl.c:5446
+#: src/vbox/vbox_tmpl.c:4003 src/vbox/vbox_tmpl.c:5451
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached to floppy drive: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4006 src/vbox/vbox_tmpl.c:5453
+#: src/vbox/vbox_tmpl.c:4011 src/vbox/vbox_tmpl.c:5458
 #, c-format
 msgid "could not attach the file to floppy drive: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4186
+#: src/vbox/vbox_tmpl.c:4191
 #, c-format
 msgid ""
 "Failed to attach the following disk/dvd/floppy to the machine: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4196
+#: src/vbox/vbox_tmpl.c:4201
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached as harddisk/dvd/floppy: %s, "
 "rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4237
+#: src/vbox/vbox_tmpl.c:4242
 #, c-format
 msgid ""
 "can't get the port/slot number of harddisk/dvd/floppy to be attached: %s, "
 "rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4260
+#: src/vbox/vbox_tmpl.c:4265
 #, c-format
 msgid "could not attach the file as harddisk/dvd/floppy: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5034 src/vbox/vbox_tmpl.c:5102
+#: src/vbox/vbox_tmpl.c:5039 src/vbox/vbox_tmpl.c:5107
 #, c-format
 msgid "could not define a domain, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5054
+#: src/vbox/vbox_tmpl.c:5059
 #, c-format
 msgid "could not set the number of virtual CPUs to: %u, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5072
+#: src/vbox/vbox_tmpl.c:5077
 #, c-format
 msgid "could not change PAE status to: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5074 src/vbox/vbox_tmpl.c:5085
-#: src/vbox/vbox_tmpl.c:5093
+#: src/vbox/vbox_tmpl.c:5079 src/vbox/vbox_tmpl.c:5090
+#: src/vbox/vbox_tmpl.c:5098
 msgid "Enabled"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5074 src/vbox/vbox_tmpl.c:5085
-#: src/vbox/vbox_tmpl.c:5093
+#: src/vbox/vbox_tmpl.c:5079 src/vbox/vbox_tmpl.c:5090
+#: src/vbox/vbox_tmpl.c:5098
 msgid "Disabled"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5083
+#: src/vbox/vbox_tmpl.c:5088
 #, c-format
 msgid "could not change ACPI status to: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5091
+#: src/vbox/vbox_tmpl.c:5096
 #, c-format
 msgid "could not change APIC status to: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5298
+#: src/vbox/vbox_tmpl.c:5303
 #, c-format
 msgid "could not delete the domain, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5498
+#: src/vbox/vbox_tmpl.c:5503
 #, c-format
 msgid "could not attach shared folder '%s', rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5618
+#: src/vbox/vbox_tmpl.c:5623
 #, c-format
 msgid "could not de-attach the mounted ISO, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5639
+#: src/vbox/vbox_tmpl.c:5644
 #, c-format
 msgid "could not attach the file to floppy drive, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5674
+#: src/vbox/vbox_tmpl.c:5679
 #, c-format
 msgid "could not detach shared folder '%s', rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5726 src/vbox/vbox_tmpl.c:6111
+#: src/vbox/vbox_tmpl.c:5731 src/vbox/vbox_tmpl.c:6116
 #, c-format
 msgid "could not get snapshot count for domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5746 src/vbox/vbox_tmpl.c:6172
+#: src/vbox/vbox_tmpl.c:5751 src/vbox/vbox_tmpl.c:6177
 #, c-format
 msgid "could not get root snapshot for domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5759
+#: src/vbox/vbox_tmpl.c:5764
 #, c-format
 msgid "unexpected number of snapshots < %u"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5767 src/vbox/vbox_tmpl.c:6666
+#: src/vbox/vbox_tmpl.c:5772 src/vbox/vbox_tmpl.c:6671
 msgid "could not get children snapshots"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5776
+#: src/vbox/vbox_tmpl.c:5781
 #, c-format
 msgid "unexpected number of snapshots > %u"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5822 src/vbox/vbox_tmpl.c:6192
+#: src/vbox/vbox_tmpl.c:5827 src/vbox/vbox_tmpl.c:6197
 msgid "could not get snapshot name"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5837
+#: src/vbox/vbox_tmpl.c:5842
 #, c-format
 msgid "domain %s has no snapshots with name %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5898 src/vbox/vbox_tmpl.c:6471
-#: src/vbox/vbox_tmpl.c:6571 src/vbox/vbox_tmpl.c:6713
+#: src/vbox/vbox_tmpl.c:5903 src/vbox/vbox_tmpl.c:6476
+#: src/vbox/vbox_tmpl.c:6576 src/vbox/vbox_tmpl.c:6718
 msgid "could not get domain state"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5913 src/vbox/vbox_tmpl.c:6487
-#: src/vbox/vbox_tmpl.c:6736
+#: src/vbox/vbox_tmpl.c:5918 src/vbox/vbox_tmpl.c:6492
+#: src/vbox/vbox_tmpl.c:6741
 #, c-format
 msgid "could not open VirtualBox session with domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5935 src/vbox/vbox_tmpl.c:5943
+#: src/vbox/vbox_tmpl.c:5940 src/vbox/vbox_tmpl.c:5948
 #, c-format
 msgid "could not take snapshot of domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5950 src/vbox/vbox_tmpl.c:6563
+#: src/vbox/vbox_tmpl.c:5955 src/vbox/vbox_tmpl.c:6568
 #, c-format
 msgid "could not get current snapshot of domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6007
+#: src/vbox/vbox_tmpl.c:6012
 #, c-format
 msgid "could not get description of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6023
+#: src/vbox/vbox_tmpl.c:6028
 #, c-format
 msgid "could not get creation time of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6033 src/vbox/vbox_tmpl.c:6322
+#: src/vbox/vbox_tmpl.c:6038 src/vbox/vbox_tmpl.c:6327
 #, c-format
 msgid "could not get parent of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6041 src/vbox/vbox_tmpl.c:6336
+#: src/vbox/vbox_tmpl.c:6046 src/vbox/vbox_tmpl.c:6341
 #, c-format
 msgid "could not get name of parent of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6056 src/vbox/vbox_tmpl.c:6555
+#: src/vbox/vbox_tmpl.c:6061 src/vbox/vbox_tmpl.c:6560
 #, c-format
 msgid "could not get online state of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6277 src/vbox/vbox_tmpl.c:6383
+#: src/vbox/vbox_tmpl.c:6282 src/vbox/vbox_tmpl.c:6388
 msgid "could not get current snapshot"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6389
+#: src/vbox/vbox_tmpl.c:6394
 msgid "domain has no snapshots"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6396
+#: src/vbox/vbox_tmpl.c:6401
 msgid "could not get current snapshot name"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6430 src/vbox/vbox_tmpl.c:6617
+#: src/vbox/vbox_tmpl.c:6435 src/vbox/vbox_tmpl.c:6622
 msgid "could not get snapshot UUID"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6437 src/vbox/vbox_tmpl.c:6499
-#: src/vbox/vbox_tmpl.c:6509
+#: src/vbox/vbox_tmpl.c:6442 src/vbox/vbox_tmpl.c:6504
+#: src/vbox/vbox_tmpl.c:6514
 #, c-format
 msgid "could not restore snapshot for domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6464
+#: src/vbox/vbox_tmpl.c:6469
 msgid "could not get domain UUID"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6478
+#: src/vbox/vbox_tmpl.c:6483
 #, c-format
 msgid "domain %s is already running"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6496
+#: src/vbox/vbox_tmpl.c:6501
 msgid "cannot restore domain snapshot for running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6578
+#: src/vbox/vbox_tmpl.c:6583
 msgid "cannot revert snapshot of running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6629
+#: src/vbox/vbox_tmpl.c:6634
 msgid "cannot delete domain snapshot for running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6632 src/vbox/vbox_tmpl.c:6641
+#: src/vbox/vbox_tmpl.c:6637 src/vbox/vbox_tmpl.c:6646
 msgid "could not delete snapshot"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6727
+#: src/vbox/vbox_tmpl.c:6732
 msgid "cannot delete snapshots of running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:8238
+#: src/vbox/vbox_tmpl.c:8243
 #, c-format
 msgid "could not get number of volumes in the pool: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:8290
+#: src/vbox/vbox_tmpl.c:8295
 #, c-format
 msgid "could not get the volume list in the pool: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:8372 src/vbox/vbox_tmpl.c:8603
-#: src/vbox/vbox_tmpl.c:8772 src/vbox/vbox_tmpl.c:8842
-#: src/vbox/vbox_tmpl.c:8949
+#: src/vbox/vbox_tmpl.c:8377 src/vbox/vbox_tmpl.c:8608
+#: src/vbox/vbox_tmpl.c:8777 src/vbox/vbox_tmpl.c:8847
+#: src/vbox/vbox_tmpl.c:8954
 #, c-format
 msgid "Could not parse UUID from '%s'"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9024
+#: src/vbox/vbox_tmpl.c:9029
 msgid "unable to get monitor count"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9030
+#: src/vbox/vbox_tmpl.c:9035
 #, c-format
 msgid "screen ID higher than monitor count (%d)"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9069
+#: src/vbox/vbox_tmpl.c:9074
 msgid "unable to get screen resolution"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9079
+#: src/vbox/vbox_tmpl.c:9084
 msgid "failed to take screenshot"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9085
+#: src/vbox/vbox_tmpl.c:9090
 #, c-format
 msgid "unable to write data to '%s'"
 msgstr ""
@@ -17463,7 +18111,7 @@
 #: src/vmx/vmx.c:3516
 #, c-format
 msgid ""
-"Expecting domain XML entry 'devices/interfase/model' to be 'vlance' or "
+"Expecting domain XML entry 'devices/interface/model' to be 'vlance' or "
 "'vmxnet' or 'vmxnet2' or 'vmxnet3' or 'e1000' but found '%s'"
 msgstr ""
 
@@ -17537,116 +18185,116 @@
 msgid "unsupported path, use xvdN, hdN, or sdN for domain %d"
 msgstr ""
 
-#: src/xen/xen_driver.c:1319
+#: src/xen/xen_driver.c:1425
 msgid "failed to get XML representation of migrated domain"
 msgstr ""
 
-#: src/xen/xen_driver.c:1326
+#: src/xen/xen_driver.c:1432
 msgid "failed to define domain on destination host"
 msgstr ""
 
-#: src/xen/xen_driver.c:2072
+#: src/xen/xen_driver.c:2080
 #, c-format
 msgid "Device %s has been assigned to guest %d"
 msgstr ""
 
-#: src/xen/xen_driver.c:2131
+#: src/xen/xen_driver.c:2139
 msgid "Named device aliases are not supported"
 msgstr ""
 
-#: src/xen/xen_driver.c:2146
+#: src/xen/xen_driver.c:2154
 msgid "cannot find default console device"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:1340
+#: src/xen/xen_hypervisor.c:1409
 #, c-format
 msgid "Credit scheduler weight parameter (%d) is out of range (1-65535)"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:1417
+#: src/xen/xen_hypervisor.c:1418
 #, c-format
 msgid "Credit scheduler cap parameter (%d) is out of range (0-65534)"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2313
+#: src/xen/xen_hypervisor.c:2444
 msgid "could not read CPU flags"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2595 src/xen/xen_hypervisor.c:2606
+#: src/xen/xen_hypervisor.c:2725 src/xen/xen_hypervisor.c:2736
 #, c-format
 msgid "cannot read file %s"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2775 src/xen/xen_hypervisor.c:3433
+#: src/xen/xen_hypervisor.c:2905 src/xen/xen_hypervisor.c:3598
 msgid "domain shut off or invalid"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2783
+#: src/xen/xen_hypervisor.c:2913
 msgid "unsupported in dom interface < 4"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2791 src/xen/xen_hypervisor.c:2797
-#: src/xen/xen_hypervisor.c:3448
+#: src/xen/xen_hypervisor.c:2921 src/xen/xen_hypervisor.c:2927
+#: src/xen/xen_hypervisor.c:3613
 msgid "cannot get domain details"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:3465 src/xen/xen_hypervisor.c:3473
+#: src/xen/xen_hypervisor.c:3630 src/xen/xen_hypervisor.c:3638
 msgid "cannot get VCPUs info"
 msgstr ""
 
-#: src/xen/xen_inotify.c:131 src/xen/xen_inotify.c:207
+#: src/xen/xen_inotify.c:95 src/xen/xen_inotify.c:171
 #, c-format
 msgid "parsing uuid %s"
 msgstr ""
 
-#: src/xen/xen_inotify.c:156
+#: src/xen/xen_inotify.c:120
 msgid "finding dom on config list"
 msgstr ""
 
-#: src/xen/xen_inotify.c:243
+#: src/xen/xen_inotify.c:207
 msgid "Error looking up domain"
 msgstr ""
 
-#: src/xen/xen_inotify.c:250 src/xen/xen_inotify.c:343
-#: src/xen/xen_inotify.c:350
+#: src/xen/xen_inotify.c:214 src/xen/xen_inotify.c:307
+#: src/xen/xen_inotify.c:314
 msgid "Error adding file to config cache"
 msgstr ""
 
-#: src/xen/xen_inotify.c:296
+#: src/xen/xen_inotify.c:260
 msgid "conn, or private data is NULL"
 msgstr ""
 
-#: src/xen/xen_inotify.c:339 src/xen/xen_inotify.c:362
+#: src/xen/xen_inotify.c:303 src/xen/xen_inotify.c:326
 msgid "looking up dom"
 msgstr ""
 
-#: src/xen/xen_inotify.c:407
+#: src/xen/xen_inotify.c:373
 #, c-format
 msgid "cannot open directory: %s"
 msgstr ""
 
-#: src/xen/xen_inotify.c:425
+#: src/xen/xen_inotify.c:389
 msgid "Error adding file to config list"
 msgstr ""
 
-#: src/xen/xen_inotify.c:435
+#: src/xen/xen_inotify.c:402
 msgid "initializing inotify"
 msgstr ""
 
-#: src/xen/xen_inotify.c:446
+#: src/xen/xen_inotify.c:413
 #, c-format
 msgid "adding watch on %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:128
+#: src/xen/xend_internal.c:93
 msgid "failed to create a socket"
 msgstr ""
 
-#: src/xen/xend_internal.c:151
+#: src/xen/xend_internal.c:113
 msgid "failed to connect to xend"
 msgstr ""
 
-#: src/xen/xend_internal.c:198 src/xen/xend_internal.c:201
+#: src/xen/xend_internal.c:160
 msgid "failed to read from Xen Daemon"
 msgstr "failed to read from Xen Daemon"
 
@@ -17659,56 +18307,56 @@
 msgid "Xend returned HTTP Content-Length of %d, which exceeds maximum of %d"
 msgstr ""
 
-#: src/xen/xend_internal.c:389
+#: src/xen/xend_internal.c:367
 #, c-format
 msgid "%d status from xen daemon: %s:%s"
 msgstr ""
 
-#: src/xen/xend_internal.c:440 src/xen/xend_internal.c:443
-#: src/xen/xend_internal.c:451
+#: src/xen/xend_internal.c:415 src/xen/xend_internal.c:418
+#: src/xen/xend_internal.c:427
 #, c-format
 msgid "xend_post: error from xen daemon: %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:592 src/xen/xend_internal.c:811
+#: src/xen/xend_internal.c:681
 #, c-format
 msgid "unable to resolve hostname '%s': %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:848
+#: src/xen/xend_internal.c:718
 #, c-format
 msgid "unable to connect to '%s:%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:1007
+#: src/xen/xend_internal.c:855
 msgid "domain information incomplete, missing domid"
 msgstr "domain information incomplete, missing domid"
 
-#: src/xen/xend_internal.c:1013
+#: src/xen/xend_internal.c:861
 msgid "domain information incorrect domid not numeric"
 msgstr "domain information incorrect domid not numeric"
 
-#: src/xen/xend_internal.c:1018 src/xen/xend_internal.c:1070
+#: src/xen/xend_internal.c:866 src/xen/xend_internal.c:918
 msgid "domain information incomplete, missing uuid"
 msgstr "domain information incomplete, missing uuid"
 
-#: src/xen/xend_internal.c:1057 src/xen/xend_internal.c:2359
-#: src/xen/xend_internal.c:2366
+#: src/xen/xend_internal.c:905 src/xenxs/xen_sxpr.c:1086
+#: src/xenxs/xen_sxpr.c:1093
 msgid "domain information incomplete, missing name"
 msgstr "domain information incomplete, missing name"
 
-#: src/xen/xend_internal.c:2833
+#: src/xen/xend_internal.c:1176
 msgid "topology syntax error"
 msgstr ""
 
-#: src/xen/xend_internal.c:2897
+#: src/xen/xend_internal.c:1239
 msgid "failed to parse Xend domain information"
 msgstr "failed to parse Xend domain information"
 
-#: src/xen/xend_internal.c:3023 src/xen/xend_internal.c:3050
-#: src/xen/xend_internal.c:3078 src/xen/xend_internal.c:3107
-#: src/xen/xend_internal.c:3138 src/xen/xend_internal.c:3216
-#: src/xen/xend_internal.c:3253
+#: src/xen/xend_internal.c:1365 src/xen/xend_internal.c:1391
+#: src/xen/xend_internal.c:1418 src/xen/xend_internal.c:1448
+#: src/xen/xend_internal.c:1485 src/xen/xend_internal.c:1561
+#: src/xen/xend_internal.c:1599
 #, c-format
 msgid "Domain %s isn't running."
 msgstr ""
@@ -17729,10 +18377,6 @@
 msgid "Xend only supports modifying both live and persistent config"
 msgstr ""
 
-#: src/xen/xend_internal.c:2220 src/xen/xm_internal.c:731
-msgid "could not determin max vcpus for the domain"
-msgstr ""
-
 #: src/xen/xend_internal.c:2299
 msgid "failed to add vcpupin xml entry"
 msgstr ""
@@ -17742,8 +18386,8 @@
 msgid "Cannot modify live config if domain is inactive"
 msgstr ""
 
-#: src/xen/xend_internal.c:4173 src/xen/xend_internal.c:4180
-#: src/xen/xend_internal.c:4262
+#: src/xen/xend_internal.c:2739 src/xen/xend_internal.c:2746
+#: src/xen/xend_internal.c:2867 src/xen/xend_internal.c:2978
 msgid "unsupported device type"
 msgstr ""
 
@@ -17756,72 +18400,72 @@
 msgid "requested device does not exist"
 msgstr ""
 
-#: src/xen/xend_internal.c:4307
+#: src/xen/xend_internal.c:3022
 msgid "xenDaemonGetAutostart failed to find this domain"
 msgstr ""
 
-#: src/xen/xend_internal.c:4348
+#: src/xen/xend_internal.c:3062
 msgid "xenDaemonSetAutostart failed to find this domain"
 msgstr ""
 
-#: src/xen/xend_internal.c:4356
+#: src/xen/xend_internal.c:3072
 msgid "unexpected value from on_xend_start"
 msgstr ""
 
-#: src/xen/xend_internal.c:4372
+#: src/xen/xend_internal.c:3087
 msgid "sexpr2string failed"
 msgstr ""
 
-#: src/xen/xend_internal.c:4377
+#: src/xen/xend_internal.c:3100
 msgid "Failed to redefine sexpr"
 msgstr ""
 
-#: src/xen/xend_internal.c:4382
+#: src/xen/xend_internal.c:3105
 msgid "on_xend_start not present in sexpr"
 msgstr ""
 
-#: src/xen/xend_internal.c:4440
+#: src/xen/xend_internal.c:3168
 msgid ""
 "xenDaemonDomainMigrate: Xen does not support renaming domains during "
 "migration"
 msgstr ""
 
-#: src/xen/xend_internal.c:4450
+#: src/xen/xend_internal.c:3178
 msgid ""
 "xenDaemonDomainMigrate: Xen does not support bandwidth limits during "
 "migration"
 msgstr ""
 
-#: src/xen/xend_internal.c:4478
+#: src/xen/xend_internal.c:3206
 msgid "xenDaemonDomainMigrate: xend cannot migrate paused domains"
 msgstr ""
 
-#: src/xen/xend_internal.c:4486
+#: src/xen/xend_internal.c:3214
 msgid "xenDaemonDomainMigrate: unsupported flag"
 msgstr ""
 
-#: src/xen/xend_internal.c:4499
+#: src/xen/xend_internal.c:3227
 msgid "xenDaemonDomainMigrate: invalid URI"
 msgstr ""
 
-#: src/xen/xend_internal.c:4504
+#: src/xen/xend_internal.c:3232
 msgid ""
 "xenDaemonDomainMigrate: only xenmigr:// migrations are supported by Xen"
 msgstr ""
 
-#: src/xen/xend_internal.c:4511
+#: src/xen/xend_internal.c:3239
 msgid "xenDaemonDomainMigrate: a hostname must be specified in the URI"
 msgstr ""
 
-#: src/xen/xend_internal.c:4531
+#: src/xen/xend_internal.c:3259
 msgid "xenDaemonDomainMigrate: invalid port number"
 msgstr ""
 
-#: src/xen/xend_internal.c:4590
+#: src/xen/xend_internal.c:3325
 msgid "failed to parse domain description"
 msgstr ""
 
-#: src/xen/xend_internal.c:4596
+#: src/xen/xend_internal.c:3331
 msgid "failed to build sexpr"
 msgstr ""
 
@@ -17830,155 +18474,159 @@
 msgid "Failed to create inactive domain %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:4786 src/xen/xend_internal.c:4862
-#: src/xen/xend_internal.c:4959
+#: src/xen/xend_internal.c:3515 src/xen/xend_internal.c:3588
+#: src/xen/xend_internal.c:3696
 msgid "unsupported in xendConfigVersion < 4"
 msgstr ""
 
-#: src/xen/xend_internal.c:4798
+#: src/xen/xend_internal.c:3527
 msgid "node information incomplete, missing scheduler name"
 msgstr ""
 
-#: src/xen/xend_internal.c:4816 src/xen/xend_internal.c:4917
-#: src/xen/xend_internal.c:5029
+#: src/xen/xend_internal.c:3547 src/xen/xend_internal.c:3656
+#: src/xen/xend_internal.c:3766
 msgid "Unknown scheduler"
 msgstr ""
 
-#: src/xen/xend_internal.c:4875 src/xen/xend_internal.c:4972
+#: src/xen/xend_internal.c:3601 src/xen/xend_internal.c:3709
 msgid "Failed to get a scheduler name"
 msgstr ""
 
-#: src/xen/xend_internal.c:4888 src/xen/xend_internal.c:5008
+#: src/xen/xend_internal.c:3620 src/xen/xend_internal.c:3745
 msgid "domain information incomplete, missing cpu_weight"
 msgstr ""
 
-#: src/xen/xend_internal.c:4893 src/xen/xend_internal.c:5017
+#: src/xen/xend_internal.c:3625 src/xen/xend_internal.c:3754
 msgid "domain information incomplete, missing cpu_cap"
 msgstr ""
 
-#: src/xen/xend_internal.c:4899
+#: src/xen/xend_internal.c:3632
 #, c-format
 msgid "Weight %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:4908
+#: src/xen/xend_internal.c:3643
 #, c-format
 msgid "Cap %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:5075
+#: src/xen/xend_internal.c:3815
 msgid "domainBlockPeek is not supported for dom0"
 msgstr ""
 
-#: src/xen/xend_internal.c:5096
+#: src/xen/xend_internal.c:3836
 #, c-format
 msgid "%s: invalid path"
 msgstr ""
 
-#: src/xen/xend_internal.c:5104
+#: src/xen/xend_internal.c:3845
 #, c-format
 msgid "failed to open for reading: %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5116
+#: src/xen/xend_internal.c:3857
 #, c-format
 msgid "failed to lseek or read from file: %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:6065
+#: src/xen/xend_internal.c:3998
 msgid "hotplug of device type not supported"
 msgstr ""
 
-#: src/xen/xm_internal.c:399
+#: src/xen/xm_internal.c:221
 #, c-format
 msgid "cannot stat: %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:457
+#: src/xen/xm_internal.c:285
 msgid "xenXMConfigCacheRefresh: virHashAddEntry"
 msgstr ""
 
-#: src/xen/xm_internal.c:509
+#: src/xen/xm_internal.c:326
+msgid "cannot get time of day"
+msgstr ""
+
+#: src/xen/xm_internal.c:339
 #, c-format
 msgid "cannot read directory %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:1711
+#: src/xen/xm_internal.c:848
 msgid "read only connection"
 msgstr ""
 
-#: src/xen/xm_internal.c:1716
+#: src/xen/xm_internal.c:853
 msgid "not inactive domain"
 msgstr ""
 
-#: src/xen/xm_internal.c:1724
+#: src/xen/xm_internal.c:861
 msgid "virHashLookup"
 msgstr ""
 
-#: src/xen/xm_internal.c:1729
+#: src/xen/xm_internal.c:866
 msgid "can't retrieve config file for domain"
 msgstr ""
 
-#: src/xen/xm_internal.c:2684
+#: src/xen/xm_internal.c:1129
 msgid "can't retrieve config filename for domain to overwrite"
 msgstr ""
 
-#: src/xen/xm_internal.c:2690
+#: src/xen/xm_internal.c:1135
 msgid "can't retrieve config entry for domain to overwrite"
 msgstr ""
 
-#: src/xen/xm_internal.c:2701 src/xen/xm_internal.c:2708
+#: src/xen/xm_internal.c:1142 src/xen/xm_internal.c:1149
 msgid "failed to remove old domain from config map"
 msgstr ""
 
-#: src/xen/xm_internal.c:2735
+#: src/xen/xm_internal.c:1169
 msgid "unable to get current time"
 msgstr ""
 
-#: src/xen/xm_internal.c:2744 src/xen/xm_internal.c:2751
+#: src/xen/xm_internal.c:1181 src/xen/xm_internal.c:1188
 msgid "unable to store config file handle"
 msgstr ""
 
-#: src/xen/xm_internal.c:1393 src/xen/xm_internal.c:1490
+#: src/xen/xm_internal.c:1392 src/xen/xm_internal.c:1489
 msgid "Xm driver only supports modifying persistent config"
 msgstr ""
 
-#: src/xen/xm_internal.c:1435
+#: src/xen/xm_internal.c:1434
 msgid "Xm driver only supports adding disk or network devices"
 msgstr ""
 
-#: src/xen/xm_internal.c:1575
+#: src/xen/xm_internal.c:1574
 msgid "block peeking not implemented"
 msgstr ""
 
-#: src/xen/xm_internal.c:3148
+#: src/xen/xm_internal.c:1609
 #, c-format
 msgid "cannot check link %s points to config %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:3177
+#: src/xen/xm_internal.c:1638
 #, c-format
 msgid "failed to create link %s to %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:3185
+#: src/xen/xm_internal.c:1646
 #, c-format
 msgid "failed to remove link %s"
 msgstr ""
 
-#: src/xen/xs_internal.c:300
+#: src/xen/xs_internal.c:258
 msgid "failed to connect to Xen Store"
 msgstr "failed to connect to Xen Store"
 
-#: src/xen/xs_internal.c:325
+#: src/xen/xs_internal.c:282
 msgid "adding watch @releaseDomain"
 msgstr ""
 
-#: src/xen/xs_internal.c:334
+#: src/xen/xs_internal.c:291
 msgid "adding watch @introduceDomain"
 msgstr ""
 
-#: src/xen/xs_internal.c:1203
+#: src/xen/xs_internal.c:1141
 msgid "watch already tracked"
 msgstr ""
 
@@ -18036,10 +18684,10 @@
 #: src/xenapi/xenapi_driver.c:924 src/xenapi/xenapi_driver.c:959
 #: src/xenapi/xenapi_driver.c:990 src/xenapi/xenapi_driver.c:1027
 #: src/xenapi/xenapi_driver.c:1082 src/xenapi/xenapi_driver.c:1126
-#: src/xenapi/xenapi_driver.c:1170 src/xenapi/xenapi_driver.c:1239
-#: src/xenapi/xenapi_driver.c:1298 src/xenapi/xenapi_driver.c:1356
-#: src/xenapi/xenapi_driver.c:1629 src/xenapi/xenapi_driver.c:1725
-#: src/xenapi/xenapi_driver.c:1767 src/xenapi/xenapi_driver.c:1813
+#: src/xenapi/xenapi_driver.c:1170 src/xenapi/xenapi_driver.c:1237
+#: src/xenapi/xenapi_driver.c:1296 src/xenapi/xenapi_driver.c:1354
+#: src/xenapi/xenapi_driver.c:1627 src/xenapi/xenapi_driver.c:1723
+#: src/xenapi/xenapi_driver.c:1765 src/xenapi/xenapi_driver.c:1811
 msgid "Domain name is not unique"
 msgstr ""
 
@@ -18051,27 +18699,27 @@
 msgid "Couldn't fetch Domain Information"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1228
+#: src/xenapi/xenapi_driver.c:1226
 msgid "Couldn't fetch Node Information"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1511
+#: src/xenapi/xenapi_driver.c:1509
 msgid "Unable to parse given mac address"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1563
+#: src/xenapi/xenapi_driver.c:1561
 msgid "Couldn't get VM record"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1690
+#: src/xenapi/xenapi_driver.c:1688
 msgid "Couldn't get VM information from XML"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1864
+#: src/xenapi/xenapi_driver.c:1862
 msgid "Couldn't get host metrics - memory information"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1870
+#: src/xenapi/xenapi_driver.c:1868
 msgid "Couldn't get host metrics"
 msgstr ""
 
@@ -18079,182 +18727,180 @@
 msgid "Query parameter 'no_verify' has unexpected value (should be 0 or 1)"
 msgstr ""
 
-#: src/xen/xend_internal.c:2346
+#: src/xenxs/xen_sxpr.c:60 src/xenxs/xen_sxpr.c:1073
 msgid "domain information incomplete, missing id"
 msgstr ""
 
-#: src/xen/xend_internal.c:1151
+#: src/xenxs/xen_sxpr.c:98
 msgid "domain information incomplete, missing HVM loader"
 msgstr ""
 
-#: src/xen/xend_internal.c:1205
+#: src/xenxs/xen_sxpr.c:158
 msgid "domain information incomplete, missing kernel & bootloader"
 msgstr ""
 
-#: src/xen/xend_internal.c:1467
+#: src/xenxs/xen_sxpr.c:199
 #, c-format
 msgid "unknown chr device type '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:1303 src/xen/xend_internal.c:1343
-#: src/xen/xend_internal.c:1359 src/xen/xend_internal.c:1494
-#: src/xen/xend_internal.c:1522 src/xen/xend_internal.c:1538
+#: src/xenxs/xen_sxpr.c:225 src/xenxs/xen_sxpr.c:255 src/xenxs/xen_sxpr.c:273
 msgid "malformed char device string"
 msgstr ""
 
-#: src/xen/xend_internal.c:1629
+#: src/xenxs/xen_sxpr.c:375
 msgid "domain information incomplete, vbd has no dev"
 msgstr "domain information incomplete, vbd has no dev"
 
-#: src/xen/xend_internal.c:1640
+#: src/xenxs/xen_sxpr.c:386
 msgid "domain information incomplete, vbd has no src"
 msgstr "domain information incomplete, vbd has no src"
 
-#: src/xen/xend_internal.c:1649
+#: src/xenxs/xen_sxpr.c:395
 msgid "cannot parse vbd filename, missing driver name"
 msgstr "cannot parse vbd filename, missing driver name"
 
-#: src/xen/xend_internal.c:1658 src/xen/xm_internal.c:909
+#: src/xenxs/xen_sxpr.c:409 src/xenxs/xen_xm.c:496
 #, c-format
 msgid "Driver name %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:1669
+#: src/xenxs/xen_sxpr.c:422
 msgid "cannot parse vbd filename, missing driver type"
 msgstr "cannot parse vbd filename, missing driver type"
 
-#: src/xen/xend_internal.c:1678 src/xen/xm_internal.c:930
+#: src/xenxs/xen_sxpr.c:431 src/xenxs/xen_xm.c:517
 #, c-format
 msgid "Driver type %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:1831
+#: src/xenxs/xen_sxpr.c:585 src/xenxs/xen_xm.c:695
 #, c-format
 msgid "malformed mac address '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:1917
+#: src/xenxs/xen_sxpr.c:663
 #, c-format
 msgid "Sound model %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:2117
+#: src/xenxs/xen_sxpr.c:853
 #, c-format
 msgid "unknown graphics type '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2244
+#: src/xenxs/xen_sxpr.c:976
 msgid "missing PCI domain"
 msgstr ""
 
-#: src/xen/xend_internal.c:2249
+#: src/xenxs/xen_sxpr.c:981
 msgid "missing PCI bus"
 msgstr ""
 
-#: src/xen/xend_internal.c:2254
+#: src/xenxs/xen_sxpr.c:986
 msgid "missing PCI slot"
 msgstr ""
 
-#: src/xen/xend_internal.c:2259
+#: src/xenxs/xen_sxpr.c:991
 msgid "missing PCI func"
 msgstr ""
 
-#: src/xen/xend_internal.c:2265
+#: src/xenxs/xen_sxpr.c:997
 #, c-format
 msgid "cannot parse PCI domain '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2270
+#: src/xenxs/xen_sxpr.c:1002
 #, c-format
 msgid "cannot parse PCI bus '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2275
+#: src/xenxs/xen_sxpr.c:1007
 #, c-format
 msgid "cannot parse PCI slot '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2280
+#: src/xenxs/xen_sxpr.c:1012
 #, c-format
 msgid "cannot parse PCI func '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2417
+#: src/xenxs/xen_sxpr.c:1146
 #, c-format
 msgid "invalid CPU mask %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:2428 src/xen/xend_internal.c:2438
-#: src/xen/xend_internal.c:2448
+#: src/xenxs/xen_sxpr.c:1160 src/xenxs/xen_sxpr.c:1170
+#: src/xenxs/xen_sxpr.c:1180
 #, c-format
 msgid "unknown lifecycle type %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5198 src/xen/xend_internal.c:5244
+#: src/xenxs/xen_sxpr.c:1473 src/xenxs/xen_sxpr.c:1521
 #, c-format
 msgid "unexpected graphics type %d"
 msgstr ""
 
-#: src/xenxs/xen_sxpr.c:1621
+#: src/xenxs/xen_sxpr.c:1620
 #, c-format
 msgid "unsupported chr device type '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:5370
+#: src/xenxs/xen_sxpr.c:1660
 #, c-format
 msgid "Cannot directly attach floppy %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5382
+#: src/xenxs/xen_sxpr.c:1672
 #, c-format
 msgid "Cannot directly attach CDROM %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5437 src/xen/xm_internal.c:1994
+#: src/xenxs/xen_sxpr.c:1732 src/xenxs/xen_xm.c:1166
 #, c-format
 msgid "unsupported disk type %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5487 src/xen/xm_internal.c:2097
+#: src/xenxs/xen_sxpr.c:1786 src/xenxs/xen_xm.c:1316
 #, c-format
 msgid "unsupported network type %d"
 msgstr ""
 
-#: src/xen/xend_internal.c:5528 src/xen/xm_internal.c:2085
+#: src/xenxs/xen_sxpr.c:1827 src/xenxs/xen_xm.c:1304
 #, c-format
 msgid "network %s is not active"
 msgstr ""
 
-#: src/xen/xend_internal.c:5598 src/xen/xend_internal.c:5649
+#: src/xenxs/xen_sxpr.c:1906 src/xenxs/xen_sxpr.c:1956
 msgid "managed PCI devices not supported with XenD"
 msgstr ""
 
-#: src/xen/xend_internal.c:5764 src/xen/xend_internal.c:5771
-#: src/xen/xend_internal.c:5778
+#: src/xenxs/xen_sxpr.c:2083 src/xenxs/xen_sxpr.c:2090
+#: src/xenxs/xen_sxpr.c:2097
 #, c-format
 msgid "unexpected lifecycle value %d"
 msgstr ""
 
-#: src/xenxs/xen_sxpr.c:2107 src/xenxs/xen_xm.c:1565
+#: src/xenxs/xen_sxpr.c:2106 src/xenxs/xen_xm.c:1565
 msgid "configurable timezones are not supported"
 msgstr ""
 
-#: src/xen/xend_internal.c:5799
+#: src/xenxs/xen_sxpr.c:2130
 msgid "no HVM domain loader"
 msgstr ""
 
-#: src/xen/xm_internal.c:158 src/xen/xm_internal.c:186
-#: src/xen/xm_internal.c:191 src/xen/xm_internal.c:214
+#: src/xenxs/xen_xm.c:60 src/xenxs/xen_xm.c:87 src/xenxs/xen_xm.c:92
+#: src/xenxs/xen_xm.c:114
 #, c-format
 msgid "config value %s was malformed"
 msgstr ""
 
-#: src/xen/xm_internal.c:236 src/xen/xm_internal.c:249
+#: src/xenxs/xen_xm.c:135 src/xenxs/xen_xm.c:148 src/xenxs/xen_xm.c:186
 #, c-format
 msgid "config value %s was missing"
 msgstr ""
 
-#: src/xen/xm_internal.c:242
+#: src/xenxs/xen_xm.c:141
 #, c-format
 msgid "config value %s was not a string"
 msgstr ""
@@ -18278,97 +18924,100 @@
 msgid "%s not parseable"
 msgstr ""
 
-#: src/xen/xm_internal.c:795
+#: src/xenxs/xen_xm.c:351
 #, c-format
 msgid "unexpected value %s for on_poweroff"
 msgstr ""
 
-#: src/xen/xm_internal.c:803
+#: src/xenxs/xen_xm.c:359
 #, c-format
 msgid "unexpected value %s for on_reboot"
 msgstr ""
 
-#: src/xen/xm_internal.c:811
+#: src/xenxs/xen_xm.c:367
 #, c-format
 msgid "unexpected value %s for on_crash"
 msgstr ""
 
-#: src/xen/xm_internal.c:874
+#: src/xenxs/xen_xm.c:461
 #, c-format
 msgid "Source file %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:893
+#: src/xenxs/xen_xm.c:480
 #, c-format
 msgid "Dest file %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1048
+#: src/xenxs/xen_xm.c:633
 #, c-format
 msgid "MAC address %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1056
+#: src/xenxs/xen_xm.c:641
 #, c-format
 msgid "Bridge %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1079
+#: src/xenxs/xen_xm.c:662
 #, c-format
 msgid "Type %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1086
+#: src/xenxs/xen_xm.c:669
 #, c-format
 msgid "Vifname %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1094
+#: src/xenxs/xen_xm.c:677
 #, c-format
 msgid "IP %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1203
+#: src/xenxs/xen_xm.c:777
 #, c-format
 msgid "Domain %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1213
+#: src/xenxs/xen_xm.c:787
 #, c-format
 msgid "Bus %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1223
+#: src/xenxs/xen_xm.c:797
 #, c-format
 msgid "Slot %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1233
+#: src/xenxs/xen_xm.c:807
 #, c-format
 msgid "Function %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1349
+#: src/xenxs/xen_xm.c:931
 #, c-format
 msgid "VFB %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:2365 src/xen/xm_internal.c:2374
-#: src/xen/xm_internal.c:2383
+#: src/xenxs/xen_xm.c:1625 src/xenxs/xen_xm.c:1634 src/xenxs/xen_xm.c:1643
 #, c-format
 msgid "unexpected lifecycle action %d"
 msgstr ""
 
-#: tools/console.c:298
+#: tools/console.c:317
 #, c-format
 msgid "unable to get tty attributes: %s"
 msgstr ""
 
-#: tools/console.c:307
+#: tools/console.c:326
 #, c-format
 msgid "unable to set tty attributes: %s"
 msgstr ""
 
+#: tools/console.c:379
+msgid "unable to wait on console condition"
+msgstr ""
+
 #: tools/libvirt-guests.init.sh:139
 msgid "libvirt-guests is configured not to start any guests on boot"
 msgstr ""
@@ -18457,703 +19106,720 @@
 "restart|reload|force-reload|gueststatus|shutdown}"
 msgstr ""
 
-#: tools/virsh.c:8374 tools/virsh.c:8386 tools/virsh.c:8399
+#: tools/virsh.c:412 tools/virsh.c:424
 #, c-format
 msgid "%s: %d: failed to allocate %d bytes"
 msgstr "%s: %d: failed to allocate %d bytes"
 
-#: tools/virsh.c:8413
+#: tools/virsh.c:438
 #, c-format
 msgid "%s: %d: failed to allocate %lu bytes"
 msgstr ""
 
-#: tools/virsh.c:598
+#: tools/virsh.c:610
 msgid "Failed to reconnect to the hypervisor"
 msgstr ""
 
-#: tools/virsh.c:600
+#: tools/virsh.c:612
 msgid "Reconnected to the hypervisor"
 msgstr ""
 
-#: tools/virsh.c:375
+#: tools/virsh.c:627
 msgid "print help"
 msgstr "print help"
 
-#: tools/virsh.c:616
+#: tools/virsh.c:628
 msgid ""
 "Prints global help, command specific help, or help for a\n"
 "    group of related commands"
 msgstr ""
 
-#: tools/virsh.c:623
+#: tools/virsh.c:635
 msgid ""
 "Prints global help, command specific help, or help for a group of related "
 "commands"
 msgstr ""
 
-#: tools/virsh.c:636
+#: tools/virsh.c:648
 msgid ""
 "Grouped commands:\n"
 "\n"
 msgstr ""
 
-#: tools/virsh.c:639 tools/virsh.c:14488
+#: tools/virsh.c:651 tools/virsh.c:15574
 #, c-format
 msgid " %s (help keyword '%s'):\n"
 msgstr ""
 
-#: tools/virsh.c:657
+#: tools/virsh.c:669
 #, c-format
 msgid "command or command group '%s' doesn't exist"
 msgstr ""
 
-#: tools/virsh.c:407
+#: tools/virsh.c:678
 msgid "autostart a domain"
 msgstr ""
 
-#: tools/virsh.c:409
+#: tools/virsh.c:680
 msgid "Configure a domain to be automatically started at boot."
 msgstr ""
 
-#: tools/virsh.c:414 tools/virsh.c:512 tools/virsh.c:737 tools/virsh.c:773
-#: tools/virsh.c:830 tools/virsh.c:897 tools/virsh.c:951 tools/virsh.c:1202
-#: tools/virsh.c:1245 tools/virsh.c:1490 tools/virsh.c:1539 tools/virsh.c:1577
-#: tools/virsh.c:1615 tools/virsh.c:1653 tools/virsh.c:1691 tools/virsh.c:1842
-#: tools/virsh.c:1928 tools/virsh.c:2065 tools/virsh.c:2121 tools/virsh.c:2177
-#: tools/virsh.c:2296 tools/virsh.c:2544 tools/virsh.c:6146 tools/virsh.c:6221
-#: tools/virsh.c:6282 tools/virsh.c:6340 tools/virsh.c:6398 tools/virsh.c:6514
-#: tools/virsh.c:6634 tools/virsh.c:6791 tools/virsh.c:7168
+#: tools/virsh.c:685 tools/virsh.c:788 tools/virsh.c:973 tools/virsh.c:1021
+#: tools/virsh.c:1068 tools/virsh.c:1243 tools/virsh.c:1309 tools/virsh.c:1474
+#: tools/virsh.c:1590 tools/virsh.c:1646 tools/virsh.c:1693 tools/virsh.c:1773
+#: tools/virsh.c:2199 tools/virsh.c:2473 tools/virsh.c:2523 tools/virsh.c:2577
+#: tools/virsh.c:2905 tools/virsh.c:2958 tools/virsh.c:3108 tools/virsh.c:3146
+#: tools/virsh.c:3184 tools/virsh.c:3222 tools/virsh.c:3261 tools/virsh.c:3299
+#: tools/virsh.c:3437 tools/virsh.c:3520 tools/virsh.c:3717 tools/virsh.c:3925
+#: tools/virsh.c:4031 tools/virsh.c:4275 tools/virsh.c:4369 tools/virsh.c:4403
+#: tools/virsh.c:4490 tools/virsh.c:4580 tools/virsh.c:4660 tools/virsh.c:4837
+#: tools/virsh.c:5338 tools/virsh.c:5595 tools/virsh.c:5886 tools/virsh.c:5931
+#: tools/virsh.c:5974 tools/virsh.c:6058 tools/virsh.c:6082 tools/virsh.c:6138
+#: tools/virsh.c:6245 tools/virsh.c:11728 tools/virsh.c:11797
+#: tools/virsh.c:11852 tools/virsh.c:12161 tools/virsh.c:12240
+#: tools/virsh.c:12310 tools/virsh.c:12509 tools/virsh.c:12644
+#: tools/virsh.c:12989 tools/virsh.c:13566 tools/virsh.c:13785
+#: tools/virsh.c:13915 tools/virsh.c:14047 tools/virsh.c:14185
+#: tools/virsh.c:14358 tools/virsh.c:14722 tools/virsh.c:14784
+#: tools/virsh.c:14841 tools/virsh.c:14915 tools/virsh.c:14986
 msgid "domain name, id or uuid"
 msgstr "domain name, id or uuid"
 
-#: tools/virsh.c:415 tools/virsh.c:2636 tools/virsh.c:3613
+#: tools/virsh.c:686 tools/virsh.c:6198 tools/virsh.c:8255
 msgid "disable autostarting"
 msgstr ""
 
-#: tools/virsh.c:436
+#: tools/virsh.c:707
 #, c-format
 msgid "Failed to mark domain %s as autostarted"
 msgstr ""
 
-#: tools/virsh.c:438
+#: tools/virsh.c:709
 #, c-format
 msgid "Failed to unmark domain %s as autostarted"
 msgstr ""
 
-#: tools/virsh.c:444
+#: tools/virsh.c:715
 #, c-format
 msgid "Domain %s marked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:446
+#: tools/virsh.c:717
 #, c-format
 msgid "Domain %s unmarked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:456
+#: tools/virsh.c:727
 msgid "(re)connect to hypervisor"
 msgstr "(re)connect to hypervisor"
 
-#: tools/virsh.c:458
+#: tools/virsh.c:729
 msgid ""
 "Connect to local hypervisor. This is built-in command after shell start up."
 msgstr ""
 "Connect to local hypervisor. This is built-in command after shell start up."
 
-#: tools/virsh.c:463
+#: tools/virsh.c:735
 msgid "hypervisor connection URI"
 msgstr "hypervisor connection URI"
 
-#: tools/virsh.c:464
+#: tools/virsh.c:736
 msgid "read-only connection"
 msgstr "read-only connection"
 
-#: tools/virsh.c:737 tools/virsh.c:16396
+#: tools/virsh.c:749 tools/virsh.c:17515
 #, c-format
 msgid "Failed to disconnect from the hypervisor, %d leaked reference(s)"
 msgstr ""
 
-#: tools/virsh.c:745
+#: tools/virsh.c:757
 msgid "Please specify valid connection URI"
 msgstr ""
 
-#: tools/virsh.c:494
+#: tools/virsh.c:770
 msgid "Failed to connect to the hypervisor"
 msgstr "Failed to connect to the hypervisor"
 
-#: tools/virsh.c:505
+#: tools/virsh.c:781
 msgid "connect to the guest console"
 msgstr ""
 
-#: tools/virsh.c:507
+#: tools/virsh.c:783
 msgid "Connect the virtual serial console for the guest"
 msgstr ""
 
-#: tools/virsh.c:777
+#: tools/virsh.c:789
 msgid "character device name"
 msgstr ""
 
-#: tools/virsh.c:544
+#: tools/virsh.c:800
 msgid "Unable to get domain status"
 msgstr ""
 
-#: tools/virsh.c:549
+#: tools/virsh.c:805
 msgid "The domain is not running"
 msgstr ""
 
-#: tools/virsh.c:570
+#: tools/virsh.c:809
 #, c-format
 msgid "Connected to domain %s\n"
 msgstr ""
 
-#: tools/virsh.c:571
-msgid "Escape character is ^]\n"
+#: tools/virsh.c:810
+#, c-format
+msgid "Escape character is %s\n"
 msgstr ""
 
-#: tools/virsh.c:821
+#: tools/virsh.c:833
 msgid "Invalid devname"
 msgstr ""
 
-#: tools/virsh.c:614
+#: tools/virsh.c:851
 msgid "list domains"
 msgstr "list domains"
 
-#: tools/virsh.c:615
+#: tools/virsh.c:852
 msgid "Returns list of domains."
 msgstr "Returns list of domains."
 
-#: tools/virsh.c:620
+#: tools/virsh.c:857
 msgid "list inactive domains"
 msgstr "list inactive domains"
 
-#: tools/virsh.c:621
+#: tools/virsh.c:858
 msgid "list inactive & active domains"
 msgstr "list inactive & active domains"
 
-#: tools/virsh.c:848
+#: tools/virsh.c:860
 msgid "mark domains with managed save state"
 msgstr ""
 
-#: tools/virsh.c:643 tools/virsh.c:650
+#: tools/virsh.c:885 tools/virsh.c:892
 msgid "Failed to list active domains"
 msgstr "Failed to list active domains"
 
-#: tools/virsh.c:661 tools/virsh.c:669
+#: tools/virsh.c:903 tools/virsh.c:911
 msgid "Failed to list inactive domains"
 msgstr "Failed to list inactive domains"
 
-#: tools/virsh.c:678
+#: tools/virsh.c:920
 msgid "Id"
 msgstr "Id"
 
-#: tools/virsh.c:678 tools/virsh.c:3017 tools/virsh.c:3290 tools/virsh.c:4265
-#: tools/virsh.c:5226
+#: tools/virsh.c:920 tools/virsh.c:6679 tools/virsh.c:6874 tools/virsh.c:7147
+#: tools/virsh.c:8118 tools/virsh.c:9108 tools/virsh.c:9128 tools/virsh.c:9197
+#: tools/virsh.c:10604 tools/virsh.c:10619 tools/virsh.c:10669
+#: tools/virsh.c:14496 tools/virsh.c:14500
 msgid "Name"
 msgstr "Name"
 
-#: tools/virsh.c:678 tools/virsh.c:3017 tools/virsh.c:3290 tools/virsh.c:4265
+#: tools/virsh.c:920 tools/virsh.c:6874 tools/virsh.c:7147 tools/virsh.c:9108
+#: tools/virsh.c:9133 tools/virsh.c:9197 tools/virsh.c:14496
+#: tools/virsh.c:14500
 msgid "State"
 msgstr "State"
 
-#: tools/virsh.c:941 tools/virsh.c:15745
+#: tools/virsh.c:953 tools/virsh.c:16834
 msgid "saved"
 msgstr ""
 
-#: tools/virsh.c:731
+#: tools/virsh.c:967
 msgid "domain state"
 msgstr "domain state"
 
-#: tools/virsh.c:732
+#: tools/virsh.c:968
 msgid "Returns state about a domain."
 msgstr ""
 
-#: tools/virsh.c:962
+#: tools/virsh.c:974
 msgid "also print reason for the state"
 msgstr ""
 
-#: tools/virsh.c:1003
+#: tools/virsh.c:1015
 msgid "domain control interface state"
 msgstr ""
 
-#: tools/virsh.c:1004
+#: tools/virsh.c:1016
 msgid "Returns state of a control interface to the domain."
 msgstr ""
 
-#: tools/virsh.c:767
+#: tools/virsh.c:1061
 msgid "get device block stats for a domain"
 msgstr ""
 
-#: tools/virsh.c:1050
+#: tools/virsh.c:1062
 msgid ""
 "Get device block stats for a running domain. See man page or use --human for "
 "explanation of fields"
 msgstr ""
 
-#: tools/virsh.c:774
+#: tools/virsh.c:1069 tools/virsh.c:1647 tools/virsh.c:6246
 msgid "block device"
 msgstr ""
 
-#: tools/virsh.c:1058
+#: tools/virsh.c:1070
 msgid "print a more human readable output"
 msgstr ""
 
-#: tools/virsh.c:1072
+#: tools/virsh.c:1084
 msgid "number of read operations:"
 msgstr ""
 
-#: tools/virsh.c:1074
+#: tools/virsh.c:1086
 msgid "number of bytes read:"
 msgstr ""
 
-#: tools/virsh.c:1076
+#: tools/virsh.c:1088
 msgid "number of write operations:"
 msgstr ""
 
-#: tools/virsh.c:1078
+#: tools/virsh.c:1090
 msgid "number of bytes written:"
 msgstr ""
 
-#: tools/virsh.c:1080
+#: tools/virsh.c:1092
 msgid "error count:"
 msgstr ""
 
-#: tools/virsh.c:1082
+#: tools/virsh.c:1094
 msgid "number of flush operations:"
 msgstr ""
 
-#: tools/virsh.c:1084
+#: tools/virsh.c:1096
 msgid "total duration of reads (ns):"
 msgstr ""
 
-#: tools/virsh.c:1086
+#: tools/virsh.c:1098
 msgid "total duration of writes (ns):"
 msgstr ""
 
-#: tools/virsh.c:1088
+#: tools/virsh.c:1100
 msgid "total duration of flushes (ns):"
 msgstr ""
 
-#: tools/virsh.c:797
+#: tools/virsh.c:1152 tools/virsh.c:1172
 #, c-format
 msgid "Failed to get block stats %s %s"
 msgstr ""
 
-#: tools/virsh.c:1147 tools/virsh.c:1166
+#: tools/virsh.c:1159 tools/virsh.c:1178
 #, c-format
 msgid "Device: %s\n"
 msgstr ""
 
-#: tools/virsh.c:824
+#: tools/virsh.c:1237
 msgid "get network interface stats for a domain"
 msgstr ""
 
-#: tools/virsh.c:825
+#: tools/virsh.c:1238
 msgid "Get network interface stats for a running domain."
 msgstr ""
 
-#: tools/virsh.c:831
+#: tools/virsh.c:1244
 msgid "interface device"
 msgstr ""
 
-#: tools/virsh.c:854
+#: tools/virsh.c:1267
 #, c-format
 msgid "Failed to get interface stats %s %s"
 msgstr ""
 
-#: tools/virsh.c:1291
+#: tools/virsh.c:1303
 msgid "set link state of a virtual interface"
 msgstr ""
 
-#: tools/virsh.c:1292
+#: tools/virsh.c:1304
 msgid ""
 "Set link state of a domain's virtual interface. This command wraps usage of "
 "update-device command."
 msgstr ""
 
-#: tools/virsh.c:1298 tools/virsh.c:1463
+#: tools/virsh.c:1310 tools/virsh.c:1475
 msgid "interface device (MAC Address)"
 msgstr ""
 
-#: tools/virsh.c:1299
+#: tools/virsh.c:1311
 msgid "new state of the device"
 msgstr ""
 
-#: tools/virsh.c:1300
+#: tools/virsh.c:1312
 msgid "persist interface state"
 msgstr ""
 
-#: tools/virsh.c:1337
+#: tools/virsh.c:1349
 #, c-format
 msgid "invalid link state '%s'"
 msgstr ""
 
-#: tools/virsh.c:1344 tools/virsh.c:1500
+#: tools/virsh.c:1356 tools/virsh.c:1512
 msgid "Failed to get domain description xml"
 msgstr ""
 
-#: tools/virsh.c:1360 tools/virsh.c:1507
+#: tools/virsh.c:1372 tools/virsh.c:1519
 msgid "Failed to parse domain description xml"
 msgstr ""
 
-#: tools/virsh.c:1367 tools/virsh.c:1514
+#: tools/virsh.c:1379 tools/virsh.c:1526
 msgid "Failed to extract interface information or no interfaces found"
 msgstr ""
 
-#: tools/virsh.c:1390
+#: tools/virsh.c:1402
 #, c-format
 msgid "interface with address '%s' not found"
 msgstr ""
 
-#: tools/virsh.c:5485 tools/virsh.c:5544 tools/virsh.c:6595 tools/virsh.c:6864
+#: tools/virsh.c:1436 tools/virsh.c:11018 tools/virsh.c:11077
+#: tools/virsh.c:12597 tools/virsh.c:13060
 msgid "Failed to allocate memory"
 msgstr ""
 
-#: tools/virsh.c:6600 tools/virsh.c:6869
+#: tools/virsh.c:1441 tools/virsh.c:12602 tools/virsh.c:13065
 msgid "Failed to create XML"
 msgstr ""
 
-#: tools/virsh.c:1434
+#: tools/virsh.c:1446
 msgid "Failed to update interface link state"
 msgstr ""
 
-#: tools/virsh.c:1437 tools/virsh.c:11219
+#: tools/virsh.c:1449 tools/virsh.c:12292
 msgid "Device updated successfully\n"
 msgstr ""
 
-#: tools/virsh.c:1456
+#: tools/virsh.c:1468
 msgid "get link state of a virtual interface"
 msgstr ""
 
-#: tools/virsh.c:1457
+#: tools/virsh.c:1469
 msgid "Get link state of a domain's virtual interface."
 msgstr ""
 
-#: tools/virsh.c:1464
+#: tools/virsh.c:1476
 msgid "Get persistent interface state"
 msgstr ""
 
-#: tools/virsh.c:1537
+#: tools/virsh.c:1549
 #, c-format
 msgid "Interface with address '%s' not found."
 msgstr ""
 
-#: tools/virsh.c:891
+#: tools/virsh.c:1584
 msgid "get memory statistics for a domain"
 msgstr ""
 
-#: tools/virsh.c:892
+#: tools/virsh.c:1585
 msgid "Get memory statistics for a runnng domain."
 msgstr ""
 
-#: tools/virsh.c:917
+#: tools/virsh.c:1610
 #, c-format
 msgid "Failed to get memory statistics for domain %s"
 msgstr ""
 
-#: tools/virsh.c:1628
+#: tools/virsh.c:1640
 msgid "domain block device size information"
 msgstr ""
 
-#: tools/virsh.c:1629
+#: tools/virsh.c:1641
 msgid "Get block device size info for a domain."
 msgstr ""
 
-#: tools/virsh.c:4530 tools/virsh.c:5126
+#: tools/virsh.c:1675 tools/virsh.c:9466 tools/virsh.c:10376
 msgid "Capacity:"
 msgstr ""
 
-#: tools/virsh.c:4533 tools/virsh.c:5129
+#: tools/virsh.c:1676 tools/virsh.c:9469 tools/virsh.c:10379
 msgid "Allocation:"
 msgstr ""
 
-#: tools/virsh.c:1665
+#: tools/virsh.c:1677
 msgid "Physical:"
 msgstr ""
 
-#: tools/virsh.c:1675
+#: tools/virsh.c:1687
 msgid "list all domain blocks"
 msgstr ""
 
-#: tools/virsh.c:1676
+#: tools/virsh.c:1688
 msgid "Get the names of block devices for a domain."
 msgstr ""
 
-#: tools/virsh.c:1683
+#: tools/virsh.c:1695
 msgid "get inactive rather than running configuration"
 msgstr ""
 
-#: tools/virsh.c:1721
+#: tools/virsh.c:1733
 msgid "Target"
 msgstr ""
 
-#: tools/virsh.c:1721
+#: tools/virsh.c:1733
 msgid "Source"
 msgstr ""
 
-#: tools/virsh.c:945
+#: tools/virsh.c:1767
 msgid "suspend a domain"
 msgstr "suspend a domain"
 
-#: tools/virsh.c:946
+#: tools/virsh.c:1768
 msgid "Suspend a running domain."
 msgstr "Suspend a running domain."
 
-#: tools/virsh.c:969
+#: tools/virsh.c:1791
 #, c-format
 msgid "Domain %s suspended\n"
 msgstr "Domain %s suspended\n"
 
-#: tools/virsh.c:971
+#: tools/virsh.c:1793
 #, c-format
 msgid "Failed to suspend domain %s"
 msgstr "Failed to suspend domain %s"
 
-#: tools/virsh.c:983
+#: tools/virsh.c:1805
 msgid "create a domain from an XML file"
 msgstr "create a domain from an XML file"
 
-#: tools/virsh.c:984
+#: tools/virsh.c:1806
 msgid "Create a domain."
 msgstr "Create a domain."
 
-#: tools/virsh.c:989 tools/virsh.c:1046
+#: tools/virsh.c:1811 tools/virsh.c:1874
 msgid "file containing an XML domain description"
 msgstr ""
 
-#: tools/virsh.c:991 tools/virsh.c:1151
+#: tools/virsh.c:1813 tools/virsh.c:2096
 msgid "attach to console after creation"
 msgstr ""
 
-#: tools/virsh.c:1803 tools/virsh.c:2086
+#: tools/virsh.c:1815 tools/virsh.c:2098
 msgid "leave the guest paused after creation"
 msgstr ""
 
-#: tools/virsh.c:1804 tools/virsh.c:2088
+#: tools/virsh.c:1816 tools/virsh.c:2100
 msgid "automatically destroy the guest when virsh disconnects"
 msgstr ""
 
-#: tools/virsh.c:1022
+#: tools/virsh.c:1850
 #, c-format
 msgid "Domain %s created from %s\n"
 msgstr "Domain %s created from %s\n"
 
-#: tools/virsh.c:1030
+#: tools/virsh.c:1858
 #, c-format
 msgid "Failed to create domain from %s"
 msgstr "Failed to create domain from %s"
 
-#: tools/virsh.c:1040
+#: tools/virsh.c:1868
 msgid "define (but don't start) a domain from an XML file"
 msgstr "define (but don't start) a domain from an XML file"
 
-#: tools/virsh.c:1041
+#: tools/virsh.c:1869
 msgid "Define a domain."
 msgstr "Define a domain."
 
-#: tools/virsh.c:1073
+#: tools/virsh.c:1899
 #, c-format
 msgid "Domain %s defined from %s\n"
 msgstr "Domain %s defined from %s\n"
 
-#: tools/virsh.c:1077
+#: tools/virsh.c:1903
 #, c-format
 msgid "Failed to define domain from %s"
 msgstr "Failed to define domain from %s"
 
-#: tools/virsh.c:1901
+#: tools/virsh.c:1913
 msgid "undefine a domain"
 msgstr ""
 
-#: tools/virsh.c:1903
+#: tools/virsh.c:1915
 msgid "Undefine an inactive domain, or convert persistent to transient."
 msgstr ""
 
-#: tools/virsh.c:1093 tools/virsh.c:2467
+#: tools/virsh.c:1920 tools/virsh.c:5513
 msgid "domain name or uuid"
 msgstr "domain name or uuid"
 
-#: tools/virsh.c:1909
+#: tools/virsh.c:1921
 msgid "remove domain managed state file"
 msgstr ""
 
-#: tools/virsh.c:1911
+#: tools/virsh.c:1923
 msgid "remove all domain snapshot metadata, if inactive"
 msgstr ""
 
-#: tools/virsh.c:2048
+#: tools/virsh.c:2060
 #, c-format
 msgid "Unable to remove metadata of %d snapshots"
 msgstr ""
 
-#: tools/virsh.c:2049
+#: tools/virsh.c:2061
 #, c-format
 msgid "Refusing to undefine while %d snapshots exist"
 msgstr ""
 
-#: tools/virsh.c:1128
+#: tools/virsh.c:2070
 #, c-format
 msgid "Domain %s has been undefined\n"
 msgstr "Domain %s has been undefined\n"
 
-#: tools/virsh.c:1130
+#: tools/virsh.c:2073
 #, c-format
 msgid "Failed to undefine domain %s"
 msgstr "Failed to undefine domain %s"
 
-#: tools/virsh.c:1143
+#: tools/virsh.c:2086
 msgid "start a (previously defined) inactive domain"
 msgstr "start a (previously defined) inactive domain"
 
-#: tools/virsh.c:2075
+#: tools/virsh.c:2087
 msgid ""
 "Start a domain, either from the last managedsave\n"
 "    state, or via a fresh boot if no managedsave state\n"
 "    is present."
 msgstr ""
 
-#: tools/virsh.c:1149
+#: tools/virsh.c:2094
 msgid "name of the inactive domain"
 msgstr "name of the inactive domain"
 
-#: tools/virsh.c:2090
+#: tools/virsh.c:2102
 msgid "avoid file system cache when loading"
 msgstr ""
 
-#: tools/virsh.c:2092
+#: tools/virsh.c:2104
 msgid "force fresh boot by discarding any managed save"
 msgstr ""
 
-#: tools/virsh.c:1172
+#: tools/virsh.c:2127
 msgid "Domain is already active"
 msgstr "Domain is already active"
 
-#: tools/virsh.c:1185
+#: tools/virsh.c:2169
 #, c-format
 msgid "Failed to start domain %s"
 msgstr "Failed to start domain %s"
 
-#: tools/virsh.c:1178
+#: tools/virsh.c:2174
 #, c-format
 msgid "Domain %s started\n"
 msgstr "Domain %s started\n"
 
-#: tools/virsh.c:1196
+#: tools/virsh.c:2192
 msgid "save a domain state to a file"
 msgstr "save a domain state to a file"
 
-#: tools/virsh.c:2181
+#: tools/virsh.c:2193
 msgid "Save the RAM state of a running domain."
 msgstr ""
 
-#: tools/virsh.c:2186 tools/virsh.c:2460 tools/virsh.c:2891
+#: tools/virsh.c:2198 tools/virsh.c:2472 tools/virsh.c:2903
 msgid "avoid file system cache when saving"
 msgstr ""
 
-#: tools/virsh.c:1203
+#: tools/virsh.c:2200
 msgid "where to save the data"
 msgstr "where to save the data"
 
-#: tools/virsh.c:2190 tools/virsh.c:2305 tools/virsh.c:2826 tools/virsh.c:5498
+#: tools/virsh.c:2202 tools/virsh.c:2317 tools/virsh.c:2838 tools/virsh.c:5600
 msgid "filename containing updated XML for the target"
 msgstr ""
 
-#: tools/virsh.c:2191 tools/virsh.c:2306 tools/virsh.c:2363
+#: tools/virsh.c:2203 tools/virsh.c:2318 tools/virsh.c:2375
 msgid "set domain to be running on restore"
 msgstr ""
 
-#: tools/virsh.c:2192 tools/virsh.c:2307 tools/virsh.c:2364
+#: tools/virsh.c:2204 tools/virsh.c:2319 tools/virsh.c:2376
 msgid "set domain to be paused on restore"
 msgstr ""
 
-#: tools/virsh.c:2221 tools/virsh.c:2855 tools/virsh.c:5543
+#: tools/virsh.c:2233 tools/virsh.c:2867 tools/virsh.c:5645
 msgid "malformed xml argument"
 msgstr ""
 
-#: tools/virsh.c:1227
+#: tools/virsh.c:2247
 #, c-format
 msgid "Failed to save domain %s to %s"
 msgstr "Failed to save domain %s to %s"
 
-#: tools/virsh.c:1225
+#: tools/virsh.c:2251
 #, c-format
 msgid "Domain %s saved to %s\n"
 msgstr "Domain %s saved to %s\n"
 
-#: tools/virsh.c:2252
+#: tools/virsh.c:2264
 msgid "saved state domain information in XML"
 msgstr ""
 
-#: tools/virsh.c:2253
+#: tools/virsh.c:2265
 msgid ""
 "Output the domain information for a saved state file,\n"
 "as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:2259
+#: tools/virsh.c:2271
 msgid "saved state file to read"
 msgstr ""
 
-#: tools/virsh.c:2298
+#: tools/virsh.c:2272 tools/virsh.c:5340 tools/virsh.c:14188
+#: tools/virsh.c:14725
 msgid "include security sensitive information in XML dump"
 msgstr ""
 
-#: tools/virsh.c:2297
+#: tools/virsh.c:2309
 msgid "redefine the XML for a domain's saved state file"
 msgstr ""
 
-#: tools/virsh.c:2298
+#: tools/virsh.c:2310
 msgid "Replace the domain XML associated with a saved state file"
 msgstr ""
 
-#: tools/virsh.c:2303
+#: tools/virsh.c:2315
 msgid "saved state file to modify"
 msgstr ""
 
-#: tools/virsh.c:2332
+#: tools/virsh.c:2344
 msgid "malformed or missing xml argument"
 msgstr ""
 
-#: tools/virsh.c:2340 tools/virsh.c:2430 tools/virsh.c:13050
+#: tools/virsh.c:2352 tools/virsh.c:2442 tools/virsh.c:14129
 #, c-format
 msgid "Failed to update %s"
 msgstr ""
 
-#: tools/virsh.c:2344
+#: tools/virsh.c:2356
 #, c-format
 msgid "State file %s updated.\n"
 msgstr ""
 
-#: tools/virsh.c:2356
+#: tools/virsh.c:2368
 msgid "edit XML for a domain's saved state file"
 msgstr ""
 
-#: tools/virsh.c:2357
+#: tools/virsh.c:2369
 msgid "Edit the domain XML associated with a saved state file"
 msgstr ""
 
-#: tools/virsh.c:2362
+#: tools/virsh.c:2374
 msgid "saved state file to edit"
 msgstr ""
 
-#: tools/virsh.c:2389
+#: tools/virsh.c:2401
 msgid "--running and --saved are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:2421
+#: tools/virsh.c:2433
 #, c-format
 msgid "Saved image %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:2434
+#: tools/virsh.c:2446
 #, c-format
 msgid "State file %s edited.\n"
 msgstr ""
 
-#: tools/virsh.c:2451
+#: tools/virsh.c:2463
 msgid "managed save of a domain state"
 msgstr ""
 
-#: tools/virsh.c:2452
+#: tools/virsh.c:2464
 msgid ""
 "Save and destroy a running domain, so it can be restarted from\n"
 "    the same state at a later time.  When the virsh 'start'\n"
@@ -19161,872 +19827,873 @@
 "    be started from this saved state."
 msgstr ""
 
-#: tools/virsh.c:2462
+#: tools/virsh.c:2474
 msgid "set domain to be running on next start"
 msgstr ""
 
-#: tools/virsh.c:2463
+#: tools/virsh.c:2475
 msgid "set domain to be paused on next start"
 msgstr ""
 
-#: tools/virsh.c:2489
+#: tools/virsh.c:2501
 #, c-format
 msgid "Failed to save domain %s state"
 msgstr ""
 
-#: tools/virsh.c:2493
+#: tools/virsh.c:2505
 #, c-format
 msgid "Domain %s state saved by libvirt\n"
 msgstr ""
 
-#: tools/virsh.c:2505
+#: tools/virsh.c:2517
 msgid "Remove managed save of a domain"
 msgstr ""
 
-#: tools/virsh.c:2506
+#: tools/virsh.c:2518
 msgid "Remove an existing managed save state file from a domain"
 msgstr ""
 
-#: tools/virsh.c:2531
+#: tools/virsh.c:2543
 msgid "Failed to check for domain managed save image"
 msgstr ""
 
-#: tools/virsh.c:2537
+#: tools/virsh.c:2549
 #, c-format
 msgid "Failed to remove managed save image for domain %s"
 msgstr ""
 
-#: tools/virsh.c:2542
+#: tools/virsh.c:2554
 #, c-format
 msgid "Removed managedsave image for domain %s"
 msgstr ""
 
-#: tools/virsh.c:2545
+#: tools/virsh.c:2557
 #, c-format
 msgid "Domain %s has no manage save image; removal skipped"
 msgstr ""
 
-#: tools/virsh.c:1239
+#: tools/virsh.c:2571
 msgid "show/set scheduler parameters"
 msgstr ""
 
-#: tools/virsh.c:1240
+#: tools/virsh.c:2572
 msgid "Show/Set scheduler parameters."
 msgstr ""
 
-#: tools/virsh.c:1246
+#: tools/virsh.c:2578
 msgid "parameter=value"
 msgstr ""
 
-#: tools/virsh.c:1247
+#: tools/virsh.c:2579
 msgid "weight for XEN_CREDIT"
 msgstr ""
 
-#: tools/virsh.c:1248
+#: tools/virsh.c:2580
 msgid "cap for XEN_CREDIT"
 msgstr ""
 
-#: tools/virsh.c:2569
+#: tools/virsh.c:2581
 msgid "get/set current scheduler info"
 msgstr ""
 
-#: tools/virsh.c:2570
+#: tools/virsh.c:2582
 msgid "get/set value to be used on next boot"
 msgstr ""
 
-#: tools/virsh.c:2571
+#: tools/virsh.c:2583
 msgid "get/set value from running domain"
 msgstr ""
 
-#: tools/virsh.c:1266
+#: tools/virsh.c:2599
 msgid "Invalid value of weight"
 msgstr ""
 
-#: tools/virsh.c:1281
+#: tools/virsh.c:2613
 msgid "Invalid value of cap"
 msgstr ""
 
-#: tools/virsh.c:1293
+#: tools/virsh.c:2625
 msgid "Invalid syntax for --set, expecting name=value"
 msgstr ""
 
-#: tools/virsh.c:1308
+#: tools/virsh.c:2640
 msgid "Invalid value for parameter, expecting an int"
 msgstr ""
 
-#: tools/virsh.c:1315
+#: tools/virsh.c:2647
 msgid "Invalid value for parameter, expecting an unsigned int"
 msgstr ""
 
-#: tools/virsh.c:2642
+#: tools/virsh.c:2654
 msgid "Invalid value for parameter, expecting a long long"
 msgstr ""
 
-#: tools/virsh.c:1329
+#: tools/virsh.c:2661
 msgid "Invalid value for parameter, expecting an unsigned long long"
 msgstr ""
 
-#: tools/virsh.c:1335
+#: tools/virsh.c:2667
 msgid "Invalid value for parameter, expecting a double"
 msgstr ""
 
-#: tools/virsh.c:2686 tools/virsh.c:4053 tools/virsh.c:4286 tools/virsh.c:4500
-#: tools/virsh.c:4589 tools/virsh.c:4674 tools/virsh.c:4830
+#: tools/virsh.c:2698 tools/virsh.c:4065 tools/virsh.c:4298 tools/virsh.c:4512
+#: tools/virsh.c:4601 tools/virsh.c:4689 tools/virsh.c:4869 tools/virsh.c:6283
 msgid "--current must be specified exclusively"
 msgstr ""
 
-#: tools/virsh.c:1369 tools/virsh.c:1373
+#: tools/virsh.c:2718 tools/virsh.c:2722
 msgid "Scheduler"
 msgstr ""
 
-#: tools/virsh.c:1373
+#: tools/virsh.c:2722
 msgid "Unknown"
 msgstr ""
 
-#: tools/virsh.c:2767
+#: tools/virsh.c:2779
 #, c-format
 msgid "invalid scheduler option: %s"
 msgstr ""
 
-#: tools/virsh.c:2774
+#: tools/virsh.c:2786
 msgid "cannot query both live and config at once"
 msgstr ""
 
-#: tools/virsh.c:1445
+#: tools/virsh.c:2828
 msgid "restore a domain from a saved state in a file"
 msgstr "restore a domain from a saved state in a file"
 
-#: tools/virsh.c:1446
+#: tools/virsh.c:2829
 msgid "Restore a domain."
 msgstr "Restore a domain."
 
-#: tools/virsh.c:1451
+#: tools/virsh.c:2834
 msgid "the state to restore"
 msgstr "the state to restore"
 
-#: tools/virsh.c:2824
+#: tools/virsh.c:2836
 msgid "avoid file system cache when restoring"
 msgstr ""
 
-#: tools/virsh.c:2827
+#: tools/virsh.c:2839
 msgid "restore domain into running state"
 msgstr ""
 
-#: tools/virsh.c:2828
+#: tools/virsh.c:2840
 msgid "restore domain into paused state"
 msgstr ""
 
-#: tools/virsh.c:1472
+#: tools/virsh.c:2878
 #, c-format
 msgid "Failed to restore domain from %s"
 msgstr "Failed to restore domain from %s"
 
-#: tools/virsh.c:1470
+#: tools/virsh.c:2882
 #, c-format
 msgid "Domain restored from %s\n"
 msgstr "Domain restored from %s\n"
 
-#: tools/virsh.c:1482
+#: tools/virsh.c:2894
 msgid "dump the core of a domain to a file for analysis"
 msgstr "dump the core of a domain to a file for analysis"
 
-#: tools/virsh.c:1483
+#: tools/virsh.c:2895
 msgid "Core dump a domain."
 msgstr "Core dump a domain."
 
-#: tools/virsh.c:1488
+#: tools/virsh.c:2900
 msgid "perform a live core dump if supported"
 msgstr ""
 
-#: tools/virsh.c:1489
+#: tools/virsh.c:2901
 msgid "crash the domain after core dump"
 msgstr ""
 
-#: tools/virsh.c:2892
+#: tools/virsh.c:2904
 msgid "reset the domain after core dump"
 msgstr ""
 
-#: tools/virsh.c:1491
+#: tools/virsh.c:2906
 msgid "where to dump the core"
 msgstr "where to dump the core"
 
-#: tools/virsh.c:1521
+#: tools/virsh.c:2938
 #, c-format
 msgid "Failed to core dump domain %s to %s"
 msgstr "Failed to core dump domain %s to %s"
 
-#: tools/virsh.c:1519
+#: tools/virsh.c:2942
 #, c-format
 msgid "Domain %s dumped to %s\n"
 msgstr ""
 
-#: tools/virsh.c:2939
+#: tools/virsh.c:2951
 msgid ""
 "take a screenshot of a current domain console and store it into a file"
 msgstr ""
 
-#: tools/virsh.c:2941
+#: tools/virsh.c:2953
 msgid "screenshot of a current domain console"
 msgstr ""
 
-#: tools/virsh.c:2947
+#: tools/virsh.c:2959
 msgid "where to store the screenshot"
 msgstr ""
 
-#: tools/virsh.c:2948
+#: tools/virsh.c:2960
 msgid "ID of a screen to take screenshot of"
 msgstr ""
 
-#: tools/virsh.c:2978
+#: tools/virsh.c:2990
 msgid "Invalid domain supplied"
 msgstr ""
 
-#: tools/virsh.c:3020 tools/virsh.c:9287 tools/virsh.c:9378
+#: tools/virsh.c:3032 tools/virsh.c:10102 tools/virsh.c:10193
 msgid "file must not be empty"
 msgstr ""
 
-#: tools/virsh.c:3025
+#: tools/virsh.c:3037
 msgid "invalid screen ID"
 msgstr ""
 
-#: tools/virsh.c:3036
+#: tools/virsh.c:3048
 #, c-format
 msgid "could not take a screenshot of %s"
 msgstr ""
 
-#: tools/virsh.c:3049
+#: tools/virsh.c:3061
 #, c-format
 msgid "cannot create file %s"
 msgstr ""
 
-#: tools/virsh.c:3057
+#: tools/virsh.c:3069
 #, c-format
 msgid "could not receive data from domain %s"
 msgstr ""
 
-#: tools/virsh.c:3062 tools/virsh.c:9308 tools/virsh.c:9404
+#: tools/virsh.c:3074 tools/virsh.c:10123 tools/virsh.c:10219
 #, c-format
 msgid "cannot close file %s"
 msgstr ""
 
-#: tools/virsh.c:3067
+#: tools/virsh.c:3079
 #, c-format
 msgid "cannot close stream on domain %s"
 msgstr ""
 
-#: tools/virsh.c:3071
+#: tools/virsh.c:3083
 #, c-format
 msgid "Screenshot saved to %s, with type of %s"
 msgstr ""
 
-#: tools/virsh.c:1533
+#: tools/virsh.c:3102
 msgid "resume a domain"
 msgstr "resume a domain"
 
-#: tools/virsh.c:1534
+#: tools/virsh.c:3103
 msgid "Resume a previously suspended domain."
 msgstr "Resume a previously suspended domain."
 
-#: tools/virsh.c:1557
+#: tools/virsh.c:3126
 #, c-format
 msgid "Domain %s resumed\n"
 msgstr "Domain %s resumed\n"
 
-#: tools/virsh.c:1559
+#: tools/virsh.c:3128
 #, c-format
 msgid "Failed to resume domain %s"
 msgstr "Failed to resume domain %s"
 
-#: tools/virsh.c:1571
+#: tools/virsh.c:3140
 msgid "gracefully shutdown a domain"
 msgstr "gracefully shutdown a domain"
 
-#: tools/virsh.c:1572
+#: tools/virsh.c:3141
 msgid "Run shutdown in the target domain."
 msgstr "Run shutdown in the target domain."
 
-#: tools/virsh.c:1595
+#: tools/virsh.c:3164
 #, c-format
 msgid "Domain %s is being shutdown\n"
 msgstr "Domain %s is being shutdown\n"
 
-#: tools/virsh.c:1597
+#: tools/virsh.c:3166
 #, c-format
 msgid "Failed to shutdown domain %s"
 msgstr "Failed to shutdown domain %s"
 
-#: tools/virsh.c:1609
+#: tools/virsh.c:3178
 msgid "reboot a domain"
 msgstr "reboot a domain"
 
-#: tools/virsh.c:1610
+#: tools/virsh.c:3179
 msgid "Run a reboot command in the target domain."
 msgstr "Run a reboot command in the target domain."
 
-#: tools/virsh.c:1633
+#: tools/virsh.c:3202
 #, c-format
 msgid "Domain %s is being rebooted\n"
 msgstr "Domain %s is being rebooted\n"
 
-#: tools/virsh.c:1635
+#: tools/virsh.c:3204
 #, c-format
 msgid "Failed to reboot domain %s"
 msgstr "Failed to reboot domain %s"
 
-#: tools/virsh.c:3204
+#: tools/virsh.c:3216
 msgid "reset a domain"
 msgstr ""
 
-#: tools/virsh.c:3205
+#: tools/virsh.c:3217
 msgid "Reset the target domain as if by power button"
 msgstr ""
 
-#: tools/virsh.c:3228
+#: tools/virsh.c:3240
 #, c-format
 msgid "Domain %s was reset\n"
 msgstr ""
 
-#: tools/virsh.c:3230
+#: tools/virsh.c:3242
 #, c-format
 msgid "Failed to reset domain %s"
 msgstr ""
 
-#: tools/virsh.c:3242
+#: tools/virsh.c:3254
 msgid "destroy (stop) a domain"
 msgstr ""
 
-#: tools/virsh.c:3244
+#: tools/virsh.c:3256
 msgid "Forcefully stop a given domain, but leave its resources intact."
 msgstr ""
 
-#: tools/virsh.c:1671
+#: tools/virsh.c:3279
 #, c-format
 msgid "Domain %s destroyed\n"
 msgstr "Domain %s destroyed\n"
 
-#: tools/virsh.c:1673
+#: tools/virsh.c:3281
 #, c-format
 msgid "Failed to destroy domain %s"
 msgstr "Failed to destroy domain %s"
 
-#: tools/virsh.c:1685
+#: tools/virsh.c:3293
 msgid "domain information"
 msgstr "domain information"
 
-#: tools/virsh.c:1686
+#: tools/virsh.c:3294
 msgid "Returns basic information about the domain."
 msgstr "Returns basic information about the domain."
 
-#: tools/virsh.c:1714 tools/virsh.c:1716
+#: tools/virsh.c:3325 tools/virsh.c:3327
 msgid "Id:"
 msgstr "Id:"
 
-#: tools/virsh.c:1717 tools/virsh.c:4500 tools/virsh.c:5116
+#: tools/virsh.c:3328 tools/virsh.c:9414 tools/virsh.c:10353
 msgid "Name:"
 msgstr "Name:"
 
-#: tools/virsh.c:1720 tools/virsh.c:4503
+#: tools/virsh.c:3331 tools/virsh.c:9417
 msgid "UUID:"
 msgstr "UUID:"
 
-#: tools/virsh.c:1723
+#: tools/virsh.c:3334
 msgid "OS Type:"
 msgstr "OS Type:"
 
-#: tools/virsh.c:1728 tools/virsh.c:1886 tools/virsh.c:4510 tools/virsh.c:4514
-#: tools/virsh.c:4518 tools/virsh.c:4522
+#: tools/virsh.c:3339 tools/virsh.c:3969 tools/virsh.c:3998 tools/virsh.c:9424
+#: tools/virsh.c:9428 tools/virsh.c:9432 tools/virsh.c:9436 tools/virsh.c:9440
 msgid "State:"
 msgstr "State:"
 
-#: tools/virsh.c:1731 tools/virsh.c:2248
+#: tools/virsh.c:3342 tools/virsh.c:5037
 msgid "CPU(s):"
 msgstr "CPU(s):"
 
-#: tools/virsh.c:1738 tools/virsh.c:1893
+#: tools/virsh.c:3349 tools/virsh.c:3976
 msgid "CPU time:"
 msgstr "CPU time:"
 
-#: tools/virsh.c:1742 tools/virsh.c:1745
+#: tools/virsh.c:3353 tools/virsh.c:3356
 msgid "Max memory:"
 msgstr "Max memory:"
 
-#: tools/virsh.c:1746
+#: tools/virsh.c:3357
 msgid "no limit"
 msgstr ""
 
-#: tools/virsh.c:1748
+#: tools/virsh.c:3359
 msgid "Used memory:"
 msgstr "Used memory:"
 
-#: tools/virsh.c:3359 tools/virsh.c:3361 tools/virsh.c:6288 tools/virsh.c:6290
-#: tools/virsh.c:8635 tools/virsh.c:8637
+#: tools/virsh.c:3371 tools/virsh.c:3373 tools/virsh.c:6690 tools/virsh.c:6692
+#: tools/virsh.c:9450 tools/virsh.c:9452
 msgid "Persistent:"
 msgstr ""
 
-#: tools/virsh.c:3359 tools/virsh.c:3371 tools/virsh.c:6288 tools/virsh.c:8159
-#: tools/virsh.c:8174 tools/virsh.c:8176 tools/virsh.c:8177 tools/virsh.c:8178
-#: tools/virsh.c:8635 tools/virsh.c:9557 tools/virsh.c:9699 tools/virsh.c:9706
-#: tools/virsh.c:9707 tools/virsh.c:9708 tools/virsh.c:9724
-#: tools/virsh.c:15766 tools/virsh.c:15846
+#: tools/virsh.c:3371 tools/virsh.c:3383 tools/virsh.c:6690 tools/virsh.c:8974
+#: tools/virsh.c:8989 tools/virsh.c:8991 tools/virsh.c:8992 tools/virsh.c:8993
+#: tools/virsh.c:9450 tools/virsh.c:10372 tools/virsh.c:10514
+#: tools/virsh.c:10521 tools/virsh.c:10522 tools/virsh.c:10523
+#: tools/virsh.c:10539 tools/virsh.c:16855 tools/virsh.c:16935
 msgid "unknown"
 msgstr ""
 
-#: tools/virsh.c:3361 tools/virsh.c:3374 tools/virsh.c:6284 tools/virsh.c:6290
-#: tools/virsh.c:6295 tools/virsh.c:6491 tools/virsh.c:6514 tools/virsh.c:8151
-#: tools/virsh.c:8162 tools/virsh.c:8637 tools/virsh.c:8646
-#: tools/virsh.c:15800
+#: tools/virsh.c:3373 tools/virsh.c:3386 tools/virsh.c:6686 tools/virsh.c:6692
+#: tools/virsh.c:6697 tools/virsh.c:6893 tools/virsh.c:6916 tools/virsh.c:8966
+#: tools/virsh.c:8977 tools/virsh.c:9452 tools/virsh.c:9461
+#: tools/virsh.c:16889
 msgid "yes"
 msgstr ""
 
-#: tools/virsh.c:3361 tools/virsh.c:3374 tools/virsh.c:6284 tools/virsh.c:6290
-#: tools/virsh.c:6295 tools/virsh.c:6491 tools/virsh.c:6514 tools/virsh.c:8151
-#: tools/virsh.c:8162 tools/virsh.c:8637 tools/virsh.c:8646
-#: tools/virsh.c:15800
+#: tools/virsh.c:3373 tools/virsh.c:3386 tools/virsh.c:6686 tools/virsh.c:6692
+#: tools/virsh.c:6697 tools/virsh.c:6893 tools/virsh.c:6916 tools/virsh.c:8966
+#: tools/virsh.c:8977 tools/virsh.c:9452 tools/virsh.c:9461
+#: tools/virsh.c:16889
 msgid "no"
 msgstr ""
 
-#: tools/virsh.c:1756
+#: tools/virsh.c:3377 tools/virsh.c:6695 tools/virsh.c:6697 tools/virsh.c:9459
+#: tools/virsh.c:9461
 msgid "Autostart:"
 msgstr ""
 
-#: tools/virsh.c:1757
+#: tools/virsh.c:3378
 msgid "enable"
 msgstr ""
 
-#: tools/virsh.c:1757
+#: tools/virsh.c:3378
 msgid "disable"
 msgstr ""
 
-#: tools/virsh.c:3371 tools/virsh.c:3373
+#: tools/virsh.c:3383 tools/virsh.c:3385
 msgid "Managed save:"
 msgstr ""
 
-#: tools/virsh.c:1770
+#: tools/virsh.c:3401
 msgid "Security model:"
 msgstr ""
 
-#: tools/virsh.c:1771
+#: tools/virsh.c:3402
 msgid "Security DOI:"
 msgstr ""
 
-#: tools/virsh.c:1780
+#: tools/virsh.c:3416
 msgid "Security label:"
 msgstr ""
 
-#: tools/virsh.c:3419
+#: tools/virsh.c:3431
 msgid "domain job information"
 msgstr ""
 
-#: tools/virsh.c:3420
+#: tools/virsh.c:3432
 msgid "Returns information about jobs running on a domain."
 msgstr ""
 
-#: tools/virsh.c:3447
+#: tools/virsh.c:3459
 msgid "Job type:"
 msgstr ""
 
-#: tools/virsh.c:3450
+#: tools/virsh.c:3462
 msgid "Bounded"
 msgstr ""
 
-#: tools/virsh.c:3454
+#: tools/virsh.c:3466
 msgid "Unbounded"
 msgstr ""
 
-#: tools/virsh.c:3459
+#: tools/virsh.c:3471
 msgid "None"
 msgstr ""
 
-#: tools/virsh.c:3463
+#: tools/virsh.c:3475
 msgid "Time elapsed:"
 msgstr ""
 
-#: tools/virsh.c:3465
+#: tools/virsh.c:3477
 msgid "Time remaining:"
 msgstr ""
 
-#: tools/virsh.c:3468
+#: tools/virsh.c:3480
 msgid "Data processed:"
 msgstr ""
 
-#: tools/virsh.c:3470
+#: tools/virsh.c:3482
 msgid "Data remaining:"
 msgstr ""
 
-#: tools/virsh.c:3472
+#: tools/virsh.c:3484
 msgid "Data total:"
 msgstr ""
 
-#: tools/virsh.c:3476
+#: tools/virsh.c:3488
 msgid "Memory processed:"
 msgstr ""
 
-#: tools/virsh.c:3478
+#: tools/virsh.c:3490
 msgid "Memory remaining:"
 msgstr ""
 
-#: tools/virsh.c:3480
+#: tools/virsh.c:3492
 msgid "Memory total:"
 msgstr ""
 
-#: tools/virsh.c:3484
+#: tools/virsh.c:3496
 msgid "File processed:"
 msgstr ""
 
-#: tools/virsh.c:3486
+#: tools/virsh.c:3498
 msgid "File remaining:"
 msgstr ""
 
-#: tools/virsh.c:3488
+#: tools/virsh.c:3500
 msgid "File total:"
 msgstr ""
 
-#: tools/virsh.c:3502
+#: tools/virsh.c:3514
 msgid "abort active domain job"
 msgstr ""
 
-#: tools/virsh.c:3503
+#: tools/virsh.c:3515
 msgid "Aborts the currently running domain job"
 msgstr ""
 
-#: tools/virsh.c:1793
+#: tools/virsh.c:3547
 msgid "NUMA free memory"
 msgstr ""
 
-#: tools/virsh.c:1794
+#: tools/virsh.c:3548
 msgid "display available free memory for the NUMA cell."
 msgstr ""
 
-#: tools/virsh.c:1799
+#: tools/virsh.c:3553
 msgid "NUMA cell number"
 msgstr ""
 
-#: tools/virsh.c:3542
+#: tools/virsh.c:3554
 msgid "show free memory for all NUMA cells"
 msgstr ""
 
-#: tools/virsh.c:3568
+#: tools/virsh.c:3580
 msgid "cell number has to be a number"
 msgstr ""
 
-#: tools/virsh.c:3574
+#: tools/virsh.c:3586
 msgid "--cellno and --all are mutually exclusive. Please choose only one."
 msgstr ""
 
-#: tools/virsh.c:3582 tools/virsh.c:3588
+#: tools/virsh.c:3594 tools/virsh.c:3600
 msgid "unable to get node capabilities"
 msgstr ""
 
-#: tools/virsh.c:3586
+#: tools/virsh.c:3598
 msgid "(capabilities)"
 msgstr ""
 
-#: tools/virsh.c:3595
+#: tools/virsh.c:3607
 msgid "could not get information about NUMA topology"
 msgstr ""
 
-#: tools/virsh.c:3607
+#: tools/virsh.c:3619
 msgid "conversion from string failed"
 msgstr ""
 
-#: tools/virsh.c:3615
+#: tools/virsh.c:3627
 #, c-format
 msgid "failed to get free memory for NUMA node number: %lu"
 msgstr ""
 
-#: tools/virsh.c:1825
+#: tools/virsh.c:3641 tools/virsh.c:3654
 msgid "Total"
 msgstr ""
 
-#: tools/virsh.c:3663
+#: tools/virsh.c:3675
 msgid "connection vcpu maximum"
 msgstr ""
 
-#: tools/virsh.c:3664
+#: tools/virsh.c:3676
 msgid "Show maximum number of virtual CPUs for guests on this connection."
 msgstr ""
 
-#: tools/virsh.c:3669
+#: tools/virsh.c:3681
 msgid "domain type"
 msgstr ""
 
-#: tools/virsh.c:3680
+#: tools/virsh.c:3692
 msgid "Invalid type"
 msgstr ""
 
-#: tools/virsh.c:3699
+#: tools/virsh.c:3711
 msgid "domain vcpu counts"
 msgstr ""
 
-#: tools/virsh.c:3700
+#: tools/virsh.c:3712
 msgid "Returns the number of virtual CPUs used by the domain."
 msgstr ""
 
-#: tools/virsh.c:3706
+#: tools/virsh.c:3718
 msgid "get maximum cap on vcpus"
 msgstr ""
 
-#: tools/virsh.c:3707
+#: tools/virsh.c:3719
 msgid "get number of currently active vcpus"
 msgstr ""
 
-#: tools/virsh.c:3708
+#: tools/virsh.c:3720
 msgid "get value from running domain"
 msgstr ""
 
-#: tools/virsh.c:3709
+#: tools/virsh.c:3721
 msgid "get value to be used on next boot"
 msgstr ""
 
-#: tools/virsh.c:3711
+#: tools/virsh.c:3723
 msgid "get value according to current domain state"
 msgstr ""
 
-#: tools/virsh.c:3734
+#: tools/virsh.c:3746
 #, c-format
 msgid ""
 "when using --%s, one of --config, --live, or --current must be specified"
 msgstr ""
 
-#: tools/virsh.c:3739
+#: tools/virsh.c:3751
 #, c-format
 msgid "when using --%s, either --maximum or --active must be specified"
 msgstr ""
 
-#: tools/virsh.c:3759
+#: tools/virsh.c:3771
 msgid "--maximum and --active cannot both be specified"
 msgstr ""
 
-#: tools/virsh.c:3764
+#: tools/virsh.c:3776
 msgid "--config, --live, and --current are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:3810 tools/virsh.c:3831
+#: tools/virsh.c:3822 tools/virsh.c:3843
 msgid "maximum"
 msgstr ""
 
-#: tools/virsh.c:3810 tools/virsh.c:3868
+#: tools/virsh.c:3822 tools/virsh.c:3880
 msgid "config"
 msgstr ""
 
-#: tools/virsh.c:3831 tools/virsh.c:3890
+#: tools/virsh.c:3843 tools/virsh.c:3902
 msgid "live"
 msgstr ""
 
-#: tools/virsh.c:3868 tools/virsh.c:3890
+#: tools/virsh.c:3880 tools/virsh.c:3902
 msgid "current"
 msgstr ""
 
-#: tools/virsh.c:3907
+#: tools/virsh.c:3919
 msgid "detailed domain vcpu information"
 msgstr ""
 
-#: tools/virsh.c:1837
+#: tools/virsh.c:3920
 msgid "Returns basic information about the domain virtual CPUs."
 msgstr "Returns basic information about the domain virtual CPUs."
 
-#: tools/virsh.c:1884
+#: tools/virsh.c:3967 tools/virsh.c:3996 tools/virsh.c:4131
 msgid "VCPU:"
 msgstr "VCPU:"
 
-#: tools/virsh.c:1885
+#: tools/virsh.c:3968 tools/virsh.c:3997
 msgid "CPU:"
 msgstr "CPU:"
 
-#: tools/virsh.c:1895
+#: tools/virsh.c:3978 tools/virsh.c:4000
 msgid "CPU Affinity:"
 msgstr "CPU Affinity:"
 
-#: tools/virsh.c:3985 tools/virsh.c:3986 tools/virsh.c:3987
+#: tools/virsh.c:3997 tools/virsh.c:3998 tools/virsh.c:3999
 msgid "N/A"
 msgstr ""
 
-#: tools/virsh.c:3987
+#: tools/virsh.c:3999
 msgid "CPU time"
 msgstr ""
 
-#: tools/virsh.c:4013
+#: tools/virsh.c:4025
 msgid "control or query domain vcpu affinity"
 msgstr ""
 
-#: tools/virsh.c:1923
+#: tools/virsh.c:4026
 msgid "Pin domain VCPUs to host physical CPUs."
 msgstr "Pin domain VCPUs to host physical CPUs."
 
-#: tools/virsh.c:1929
+#: tools/virsh.c:4032
 msgid "vcpu number"
 msgstr "vcpu number"
 
-#: tools/virsh.c:4022
+#: tools/virsh.c:4034
 msgid "host cpu number(s) to set, or omit option to query"
 msgstr ""
 
-#: tools/virsh.c:4023 tools/virsh.c:4266 tools/virsh.c:4480 tools/virsh.c:4570
-#: tools/virsh.c:4651 tools/virsh.c:4807
+#: tools/virsh.c:4035 tools/virsh.c:4278 tools/virsh.c:4492 tools/virsh.c:4582
+#: tools/virsh.c:4665 tools/virsh.c:4846 tools/virsh.c:6259
 msgid "affect next boot"
 msgstr ""
 
-#: tools/virsh.c:4024 tools/virsh.c:4267 tools/virsh.c:4481 tools/virsh.c:4571
-#: tools/virsh.c:4652 tools/virsh.c:4808
+#: tools/virsh.c:4036 tools/virsh.c:4279 tools/virsh.c:4493 tools/virsh.c:4583
+#: tools/virsh.c:4666 tools/virsh.c:4847 tools/virsh.c:6260
 msgid "affect running domain"
 msgstr ""
 
-#: tools/virsh.c:4025 tools/virsh.c:4268 tools/virsh.c:4482 tools/virsh.c:4572
-#: tools/virsh.c:4653 tools/virsh.c:4809
+#: tools/virsh.c:4037 tools/virsh.c:4280 tools/virsh.c:4494 tools/virsh.c:4584
+#: tools/virsh.c:4667 tools/virsh.c:4848 tools/virsh.c:6261
 msgid "affect current domain"
 msgstr ""
 
-#: tools/virsh.c:4074
+#: tools/virsh.c:4086
 msgid "vcpupin: Missing cpulist."
 msgstr ""
 
-#: tools/virsh.c:1957
+#: tools/virsh.c:4095
 msgid "vcpupin: Invalid or missing vCPU number."
 msgstr ""
 
-#: tools/virsh.c:4094
+#: tools/virsh.c:4106
 msgid "vcpupin: failed to get domain information."
 msgstr ""
 
-#: tools/virsh.c:1980
+#: tools/virsh.c:4112
 msgid "vcpupin: Invalid vCPU number."
 msgstr ""
 
-#: tools/virsh.c:4119
+#: tools/virsh.c:4131
 msgid "CPU Affinity"
 msgstr ""
 
-#: tools/virsh.c:2036
+#: tools/virsh.c:4200 tools/virsh.c:4224
 #, c-format
 msgid "Physical CPU %d doesn't exist."
 msgstr ""
 
-#: tools/virsh.c:4248
+#: tools/virsh.c:4260
 msgid "cpulist: Invalid format."
 msgstr ""
 
-#: tools/virsh.c:2059
+#: tools/virsh.c:4269
 msgid "change number of virtual CPUs"
 msgstr "change number of virtual CPUs"
 
-#: tools/virsh.c:2060
+#: tools/virsh.c:4270
 msgid "Change the number of virtual CPUs in the guest domain."
 msgstr ""
 
-#: tools/virsh.c:2066
+#: tools/virsh.c:4276
 msgid "number of virtual CPUs"
 msgstr "number of virtual CPUs"
 
-#: tools/virsh.c:4265
+#: tools/virsh.c:4277
 msgid "set maximum limit on next boot"
 msgstr ""
 
-#: tools/virsh.c:4307
+#: tools/virsh.c:4319
 msgid "Invalid number of virtual CPUs"
 msgstr ""
 
-#: tools/virsh.c:4330
+#: tools/virsh.c:4342
 msgid "--maximum must be used with --config only"
 msgstr ""
 
-#: tools/virsh.c:4351
+#: tools/virsh.c:4363
 msgid "Inject NMI to the guest"
 msgstr ""
 
-#: tools/virsh.c:4352
+#: tools/virsh.c:4364
 msgid "Inject NMI to the guest domain."
 msgstr ""
 
-#: tools/virsh.c:4385
+#: tools/virsh.c:4397
 msgid "Send keycodes to the guest"
 msgstr ""
 
-#: tools/virsh.c:4386
+#: tools/virsh.c:4398
 msgid "Send keycodes (integers or symbolic names) to the guest"
 msgstr ""
 
-#: tools/virsh.c:4393
+#: tools/virsh.c:4405
 msgid "the codeset of keycodes, default:linux"
 msgstr ""
 
-#: tools/virsh.c:4395
+#: tools/virsh.c:4407
 msgid "the time (in milliseconds) how long the keys will be held"
 msgstr ""
 
-#: tools/virsh.c:4396
+#: tools/virsh.c:4408
 msgid "the key code"
 msgstr ""
 
-#: tools/virsh.c:4439
+#: tools/virsh.c:4451
 #, c-format
 msgid "unknown codeset: '%s'"
 msgstr ""
 
-#: tools/virsh.c:4445
+#: tools/virsh.c:4457
 msgid "too many keycodes"
 msgstr ""
 
-#: tools/virsh.c:4451
+#: tools/virsh.c:4463
 #, c-format
 msgid "invalid keycode: '%s'"
 msgstr ""
 
-#: tools/virsh.c:2115
+#: tools/virsh.c:4484
 msgid "change memory allocation"
 msgstr "change memory allocation"
 
-#: tools/virsh.c:2116
+#: tools/virsh.c:4485
 msgid "Change the current memory allocation in the guest domain."
 msgstr "Change the current memory allocation in the guest domain."
 
-#: tools/virsh.c:2122
+#: tools/virsh.c:4491
 msgid "number of kilobytes of memory"
 msgstr ""
 
-#: tools/virsh.c:4521 tools/virsh.c:4609
+#: tools/virsh.c:4533 tools/virsh.c:4621
 msgid "memory size has to be a number"
 msgstr ""
 
-#: tools/virsh.c:4527
+#: tools/virsh.c:4539
 #, c-format
 msgid "Invalid value of %lu for memory size"
 msgstr ""
 
-#: tools/virsh.c:2149
+#: tools/virsh.c:4545
 msgid "Unable to verify MaxMemorySize"
 msgstr ""
 
-#: tools/virsh.c:4539
+#: tools/virsh.c:4551
 #, c-format
 msgid "Requested memory size %lu kb is larger than maximum of %lu kb"
 msgstr ""
 
-#: tools/virsh.c:2171
+#: tools/virsh.c:4574
 msgid "change maximum memory limit"
 msgstr "change maximum memory limit"
 
-#: tools/virsh.c:2172
+#: tools/virsh.c:4575
 msgid "Change the maximum memory allocation limit in the guest domain."
 msgstr "Change the maximum memory allocation limit in the guest domain."
 
-#: tools/virsh.c:2178
+#: tools/virsh.c:4581
 msgid "maximum memory limit in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:2143 tools/virsh.c:2155 tools/virsh.c:2199
+#: tools/virsh.c:4627
 #, c-format
 msgid "Invalid value of %d for memory size"
 msgstr ""
 
-#: tools/virsh.c:2218
+#: tools/virsh.c:4633 tools/virsh.c:4638
 msgid "Unable to change MaxMemorySize"
 msgstr ""
 
-#: tools/virsh.c:4639
+#: tools/virsh.c:4651
 msgid "Get or set blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4640
+#: tools/virsh.c:4652
 msgid ""
 "Get or set the current blkio parameters for a guest domain.\n"
 "    To get the blkio parameters use following command: \n"
@@ -20034,36 +20701,45 @@
 "    virsh # blkiotune <domain>"
 msgstr ""
 
-#: tools/virsh.c:4650
+#: tools/virsh.c:4662
 msgid "IO Weight in range [100, 1000]"
 msgstr ""
 
-#: tools/virsh.c:4693 tools/virsh.c:4852
+#: tools/virsh.c:4664
+msgid "per-device IO Weights, in the form of /path/to/device,weight,..."
+msgstr ""
+
+#: tools/virsh.c:4708 tools/virsh.c:4891 tools/virsh.c:6305 tools/virsh.c:6313
+#: tools/virsh.c:6321 tools/virsh.c:6329 tools/virsh.c:6337 tools/virsh.c:6345
 msgid "Unable to parse integer parameter"
 msgstr ""
 
-#: tools/virsh.c:4700
+#: tools/virsh.c:4715
 #, c-format
 msgid "Invalid value of %d for I/O weight"
 msgstr ""
 
-#: tools/virsh.c:4709
+#: tools/virsh.c:4723
+msgid "Unable to parse string parameter"
+msgstr ""
+
+#: tools/virsh.c:4734
 msgid "Unable to get number of blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4722
+#: tools/virsh.c:4747
 msgid "Unable to get blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4774
+#: tools/virsh.c:4810
 msgid "Unable to change blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4789
+#: tools/virsh.c:4828
 msgid "Get or set memory parameters"
 msgstr ""
 
-#: tools/virsh.c:4790
+#: tools/virsh.c:4829
 msgid ""
 "Get or set the current memory parameters for a guest domain.\n"
 "    To get the memory parameters use following command: \n"
@@ -20071,2970 +20747,3346 @@
 "    virsh # memtune <domain>"
 msgstr ""
 
-#: tools/virsh.c:4800
+#: tools/virsh.c:4839
 msgid "Max memory in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4802
+#: tools/virsh.c:4841
 msgid "Memory during contention in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4804
+#: tools/virsh.c:4843
 msgid "Max memory plus swap in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4806
+#: tools/virsh.c:4845
 msgid "Min guaranteed memory in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4872
+#: tools/virsh.c:4911
 msgid "Unable to get number of memory parameters"
 msgstr ""
 
-#: tools/virsh.c:4885
+#: tools/virsh.c:4924
 msgid "Unable to get memory parameters"
 msgstr ""
 
-#: tools/virsh.c:4965
+#: tools/virsh.c:5004
 msgid "Unable to change memory parameters"
 msgstr ""
 
-#: tools/virsh.c:2230
+#: tools/virsh.c:5019
 msgid "node information"
 msgstr "node information"
 
-#: tools/virsh.c:2231
+#: tools/virsh.c:5020
 msgid "Returns basic information about the node."
 msgstr "Returns basic information about the node."
 
-#: tools/virsh.c:2244
+#: tools/virsh.c:5033
 msgid "failed to get node information"
 msgstr "failed to get node information"
 
-#: tools/virsh.c:2247
+#: tools/virsh.c:5036
 msgid "CPU model:"
 msgstr "CPU model:"
 
-#: tools/virsh.c:2249
+#: tools/virsh.c:5038
 msgid "CPU frequency:"
 msgstr "CPU frequency:"
 
-#: tools/virsh.c:2250
+#: tools/virsh.c:5039
 msgid "CPU socket(s):"
 msgstr "CPU socket(s):"
 
-#: tools/virsh.c:2251
+#: tools/virsh.c:5040
 msgid "Core(s) per socket:"
 msgstr "Core(s) per socket:"
 
-#: tools/virsh.c:2252
+#: tools/virsh.c:5041
 msgid "Thread(s) per core:"
 msgstr "Thread(s) per core:"
 
-#: tools/virsh.c:2253
+#: tools/virsh.c:5042
 msgid "NUMA cell(s):"
 msgstr "NUMA cell(s):"
 
-#: tools/virsh.c:2254
+#: tools/virsh.c:5043
 msgid "Memory size:"
 msgstr "Memory size:"
 
-#: tools/virsh.c:5013
+#: tools/virsh.c:5052
 msgid "Prints cpu stats of the node."
 msgstr ""
 
-#: tools/virsh.c:5014
+#: tools/virsh.c:5053
 msgid "Returns cpu stats of the node, in nanoseconds."
 msgstr ""
 
-#: tools/virsh.c:5019
+#: tools/virsh.c:5058
 msgid "prints specified cpu statistics only."
 msgstr ""
 
-#: tools/virsh.c:5020
+#: tools/virsh.c:5059
 msgid "prints by percentage during 1 second."
 msgstr ""
 
-#: tools/virsh.c:5048
+#: tools/virsh.c:5087
 msgid "Invalid value of cpuNum"
 msgstr ""
 
-#: tools/virsh.c:5054
+#: tools/virsh.c:5093
 msgid "Unable to get number of cpu stats"
 msgstr ""
 
-#: tools/virsh.c:5068
+#: tools/virsh.c:5107
 msgid "Unable to get node cpu stats"
 msgstr ""
 
-#: tools/virsh.c:5098 tools/virsh.c:5121
+#: tools/virsh.c:5137 tools/virsh.c:5160
 msgid "user:"
 msgstr ""
 
-#: tools/virsh.c:5099 tools/virsh.c:5123
+#: tools/virsh.c:5138 tools/virsh.c:5162
 msgid "system:"
 msgstr ""
 
-#: tools/virsh.c:5100 tools/virsh.c:5108 tools/virsh.c:5125
+#: tools/virsh.c:5139 tools/virsh.c:5147 tools/virsh.c:5164
 msgid "idle:"
 msgstr ""
 
-#: tools/virsh.c:5101 tools/virsh.c:5127
+#: tools/virsh.c:5140 tools/virsh.c:5166
 msgid "iowait:"
 msgstr ""
 
-#: tools/virsh.c:5107 tools/virsh.c:5119
+#: tools/virsh.c:5146 tools/virsh.c:5158
 msgid "usage:"
 msgstr ""
 
-#: tools/virsh.c:5142
+#: tools/virsh.c:5181
 msgid "Prints memory stats of the node."
 msgstr ""
 
-#: tools/virsh.c:5143
+#: tools/virsh.c:5182
 msgid "Returns memory stats of the node, in kilobytes."
 msgstr ""
 
-#: tools/virsh.c:5148
+#: tools/virsh.c:5187
 msgid "prints specified cell statistics only."
 msgstr ""
 
-#: tools/virsh.c:5165
+#: tools/virsh.c:5204
 msgid "Invalid value of cellNum"
 msgstr ""
 
-#: tools/virsh.c:5172
+#: tools/virsh.c:5211
 msgid "Unable to get number of memory stats"
 msgstr ""
 
-#: tools/virsh.c:5185
+#: tools/virsh.c:5224
 msgid "Unable to get memory stats"
 msgstr ""
 
-#: tools/virsh.c:2263
+#: tools/virsh.c:5242
+msgid "suspend the host node for a given time duration"
+msgstr ""
+
+#: tools/virsh.c:5243
+msgid ""
+"Suspend the host node for a given time duration and attempt to resume "
+"thereafter."
+msgstr ""
+
+#: tools/virsh.c:5249
+msgid "mem(Suspend-to-RAM), disk(Suspend-to-Disk), hybrid(Hybrid-Suspend)"
+msgstr ""
+
+#: tools/virsh.c:5251
+msgid "Suspend duration in seconds"
+msgstr ""
+
+#: tools/virsh.c:5252
+msgid "Suspend flags, 0 for default"
+msgstr ""
+
+#: tools/virsh.c:5283
+msgid "Invalid target"
+msgstr ""
+
+#: tools/virsh.c:5288
+msgid "Invalid duration"
+msgstr ""
+
+#: tools/virsh.c:5294
+msgid "The host was not suspended"
+msgstr ""
+
+#: tools/virsh.c:5305
 msgid "capabilities"
 msgstr ""
 
-#: tools/virsh.c:2264
+#: tools/virsh.c:5306
 msgid "Returns capabilities of hypervisor/driver."
 msgstr ""
 
-#: tools/virsh.c:2277
+#: tools/virsh.c:5319
 msgid "failed to get capabilities"
 msgstr ""
 
-#: tools/virsh.c:2290
+#: tools/virsh.c:5332
 msgid "domain information in XML"
 msgstr "domain information in XML"
 
-#: tools/virsh.c:2291
+#: tools/virsh.c:5333
 msgid "Output the domain information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:2297 tools/virsh.c:3405
+#: tools/virsh.c:5339 tools/virsh.c:7262
 msgid "show inactive defined XML"
 msgstr ""
 
-#: tools/virsh.c:5239
+#: tools/virsh.c:5341
 msgid "update guest CPU according to host CPU"
 msgstr ""
 
-#: tools/virsh.c:2339
+#: tools/virsh.c:5385
 msgid "Convert native config to domain XML"
 msgstr ""
 
-#: tools/virsh.c:2340
+#: tools/virsh.c:5386
 msgid "Convert native guest configuration format to domain XML format."
 msgstr ""
 
-#: tools/virsh.c:2345
+#: tools/virsh.c:5391
 msgid "source config data format"
 msgstr ""
 
-#: tools/virsh.c:2346
+#: tools/virsh.c:5392
 msgid "config data file to import from"
 msgstr ""
 
-#: tools/virsh.c:2385
+#: tools/virsh.c:5431
 msgid "Convert domain XML to native config"
 msgstr ""
 
-#: tools/virsh.c:2386
+#: tools/virsh.c:5432
 msgid "Convert domain XML config to a native guest configuration format."
 msgstr ""
 
-#: tools/virsh.c:2391
+#: tools/virsh.c:5437
 msgid "target config data type format"
 msgstr ""
 
-#: tools/virsh.c:2392
+#: tools/virsh.c:5438
 msgid "xml data file to export from"
 msgstr ""
 
-#: tools/virsh.c:2431
+#: tools/virsh.c:5477
 msgid "convert a domain id or UUID to domain name"
 msgstr "convert a domain id or UUID to domain name"
 
-#: tools/virsh.c:2437
+#: tools/virsh.c:5483
 msgid "domain id or uuid"
 msgstr "domain id or uuid"
 
-#: tools/virsh.c:2461
+#: tools/virsh.c:5507
 msgid "convert a domain name or UUID to domain id"
 msgstr "convert a domain name or UUID to domain id"
 
-#: tools/virsh.c:2496
+#: tools/virsh.c:5542
 msgid "convert a domain name or id to domain UUID"
 msgstr "convert a domain name or id to domain UUID"
 
-#: tools/virsh.c:2502
+#: tools/virsh.c:5548
 msgid "domain id or name"
 msgstr "domain id or name"
 
-#: tools/virsh.c:2521
+#: tools/virsh.c:5567
 msgid "failed to get domain UUID"
 msgstr "failed to get domain UUID"
 
-#: tools/virsh.c:2531
+#: tools/virsh.c:5577
 msgid "migrate domain to another host"
 msgstr ""
 
-#: tools/virsh.c:2532
+#: tools/virsh.c:5578
 msgid "Migrate domain to another host.  Add --live for live migration."
 msgstr ""
 
-#: tools/virsh.c:2537
+#: tools/virsh.c:5583
 msgid "live migration"
 msgstr ""
 
-#: tools/virsh.c:2538
+#: tools/virsh.c:5584
 msgid "peer-2-peer migration"
 msgstr ""
 
-#: tools/virsh.c:2539
+#: tools/virsh.c:5585
 msgid "direct migration"
 msgstr ""
 
-#: tools/virsh.c:2540
+#: tools/virsh.c:5586
 msgid "tunnelled migration"
 msgstr ""
 
-#: tools/virsh.c:2541
+#: tools/virsh.c:5587
 msgid "persist VM on destination"
 msgstr ""
 
-#: tools/virsh.c:2542
+#: tools/virsh.c:5588
 msgid "undefine VM on source"
 msgstr ""
 
-#: tools/virsh.c:2543
+#: tools/virsh.c:5589
 msgid "do not restart the domain on the destination host"
 msgstr ""
 
-#: tools/virsh.c:5488
+#: tools/virsh.c:5590
 msgid "migration with non-shared storage with full disk copy"
 msgstr ""
 
-#: tools/virsh.c:5489
+#: tools/virsh.c:5591
 msgid ""
 "migration with non-shared storage with incremental copy (same base image "
 "shared between source and destination)"
 msgstr ""
 
-#: tools/virsh.c:5491
+#: tools/virsh.c:5593
 msgid "prevent any configuration changes to domain until migration ends)"
 msgstr ""
 
-#: tools/virsh.c:5492
+#: tools/virsh.c:5594
 msgid "display the progress of migration"
 msgstr ""
 
-#: tools/virsh.c:5494
+#: tools/virsh.c:5596
 msgid ""
 "connection URI of the destination host as seen from the client(normal "
 "migration) or source(p2p migration)"
 msgstr ""
 
-#: tools/virsh.c:2546
+#: tools/virsh.c:5597
 msgid "migration URI, usually can be omitted"
 msgstr ""
 
-#: tools/virsh.c:2547
+#: tools/virsh.c:5598
 msgid "rename to new name during migration (if supported)"
 msgstr ""
 
-#: tools/virsh.c:5497
+#: tools/virsh.c:5599
 msgid "force guest to suspend if live migration exceeds timeout (in seconds)"
 msgstr ""
 
-#: tools/virsh.c:5538 tools/virsh.c:7652 tools/virsh.c:8472 tools/virsh.c:8484
-#: tools/virsh.c:8823
+#: tools/virsh.c:5640 tools/virsh.c:8467 tools/virsh.c:9287 tools/virsh.c:9299
+#: tools/virsh.c:9638
 msgid "missing argument"
 msgstr ""
 
-#: tools/virsh.c:2597
+#: tools/virsh.c:5684
 msgid "migrate: Unexpected migrateuri for peer2peer/direct migration"
 msgstr ""
 
-#: tools/virsh.c:5673
+#: tools/virsh.c:5775
 msgid "migrate: Unexpected timeout for offline migration"
 msgstr ""
 
-#: tools/virsh.c:5678
+#: tools/virsh.c:5780
 msgid "migrate: Invalid timeout"
 msgstr ""
 
-#: tools/virsh.c:5684
+#: tools/virsh.c:5786
 msgid "migrate: Timeout is too big"
 msgstr ""
 
-#: tools/virsh.c:5778
+#: tools/virsh.c:5880
 msgid "set maximum tolerable downtime"
 msgstr ""
 
-#: tools/virsh.c:5779
+#: tools/virsh.c:5881
 msgid ""
 "Set maximum tolerable downtime of a domain which is being live-migrated to "
 "another host."
 msgstr ""
 
-#: tools/virsh.c:5785
+#: tools/virsh.c:5887
 msgid "maximum tolerable downtime (in milliseconds) for migration"
 msgstr ""
 
-#: tools/virsh.c:5804
+#: tools/virsh.c:5906
 msgid "migrate: Invalid downtime"
 msgstr ""
 
-#: tools/virsh.c:5822
+#: tools/virsh.c:5924
 msgid "Set the maximum migration bandwidth"
 msgstr ""
 
-#: tools/virsh.c:5823
+#: tools/virsh.c:5925
 msgid ""
 "Set the maximum migration bandwidth (in Mbps) for a domain which is being "
 "migrated to another host."
 msgstr ""
 
-#: tools/virsh.c:5830
+#: tools/virsh.c:5932
 msgid "migration bandwidth limit in Mbps"
 msgstr ""
 
-#: tools/virsh.c:5848
+#: tools/virsh.c:5950
 msgid "migrate: Invalid bandwidth"
 msgstr ""
 
-#: tools/virsh.c:5866
+#: tools/virsh.c:5968
 msgid "Get the maximum migration bandwidth"
 msgstr ""
 
-#: tools/virsh.c:5867
+#: tools/virsh.c:5969
 msgid "Get the maximum migration bandwidth (in Mbps) for a domain."
 msgstr ""
 
-#: tools/virsh.c:5927
+#: tools/virsh.c:6029
 msgid "bandwidth must be a number"
 msgstr ""
 
-#: tools/virsh.c:5950 tools/virsh.c:5951
+#: tools/virsh.c:6052 tools/virsh.c:6053
 msgid "Populate a disk from its backing image."
 msgstr ""
 
-#: tools/virsh.c:5957 tools/virsh.c:5981
+#: tools/virsh.c:6059 tools/virsh.c:6083
 msgid "Fully-qualified path of disk"
 msgstr ""
 
-#: tools/virsh.c:5958
+#: tools/virsh.c:6060
 msgid "Bandwidth limit in MB/s"
 msgstr ""
 
-#: tools/virsh.c:5974 tools/virsh.c:5975
+#: tools/virsh.c:6076 tools/virsh.c:6077
 msgid "Manage active block operations."
 msgstr ""
 
-#: tools/virsh.c:5982
+#: tools/virsh.c:6084
 msgid "Abort the active job on the speficied disk"
 msgstr ""
 
-#: tools/virsh.c:5983
+#: tools/virsh.c:6085
 msgid "Get active job information for the specified disk"
 msgstr ""
 
-#: tools/virsh.c:5984
+#: tools/virsh.c:6086
 msgid "Set the Bandwidth limit in MB/s"
 msgstr ""
 
-#: tools/virsh.c:6004
+#: tools/virsh.c:6106
 msgid "One of --abort, --info, or --bandwidth is required"
 msgstr ""
 
-#: tools/virsh.c:2628
+#: tools/virsh.c:6132 tools/virsh.c:6133
+msgid "Resize block device of domain."
+msgstr ""
+
+#: tools/virsh.c:6139
+msgid "Fully-qualified path of block device"
+msgstr ""
+
+#: tools/virsh.c:6140
+msgid "New size of the block device in kilobytes, the size must be integer"
+msgstr ""
+
+#: tools/virsh.c:6158
+msgid "Path must not be empty"
+msgstr ""
+
+#: tools/virsh.c:6163 tools/virsh.c:10088 tools/virsh.c:10093
+#: tools/virsh.c:10180 tools/virsh.c:10185
+msgid "Unable to parse integer"
+msgstr ""
+
+#: tools/virsh.c:6168
+#, c-format
+msgid "Size must be less than %llu"
+msgstr ""
+
+#: tools/virsh.c:6176
+#, c-format
+msgid "Failed to resize block device '%s'"
+msgstr ""
+
+#: tools/virsh.c:6178
+#, c-format
+msgid "Block device '%s' is resized"
+msgstr ""
+
+#: tools/virsh.c:6190
 msgid "autostart a network"
 msgstr ""
 
-#: tools/virsh.c:2630
+#: tools/virsh.c:6192
 msgid "Configure a network to be automatically started at boot."
 msgstr ""
 
-#: tools/virsh.c:2635 tools/virsh.c:3155
+#: tools/virsh.c:6197 tools/virsh.c:6580 tools/virsh.c:6619 tools/virsh.c:7012
+#: tools/virsh.c:13667
 msgid "network name or uuid"
 msgstr ""
 
-#: tools/virsh.c:2657
+#: tools/virsh.c:6219
 #, c-format
 msgid "failed to mark network %s as autostarted"
 msgstr ""
 
-#: tools/virsh.c:2659
+#: tools/virsh.c:6221
 #, c-format
 msgid "failed to unmark network %s as autostarted"
 msgstr ""
 
-#: tools/virsh.c:2665
+#: tools/virsh.c:6227
 #, c-format
 msgid "Network %s marked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:2667
+#: tools/virsh.c:6229
 #, c-format
 msgid "Network %s unmarked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:2677
+#: tools/virsh.c:6239
+msgid "Set or query a block device I/O tuning parameters."
+msgstr ""
+
+#: tools/virsh.c:6240
+msgid "Set or query disk I/O parameters such as block throttling."
+msgstr ""
+
+#: tools/virsh.c:6248
+msgid "total throughput limit in bytes per second"
+msgstr ""
+
+#: tools/virsh.c:6250
+msgid "read throughput limit in bytes per second"
+msgstr ""
+
+#: tools/virsh.c:6252
+msgid "write throughput limit in bytes per second"
+msgstr ""
+
+#: tools/virsh.c:6254
+msgid "total I/O operations limit per second"
+msgstr ""
+
+#: tools/virsh.c:6256
+msgid "read I/O operations limit per second"
+msgstr ""
+
+#: tools/virsh.c:6258
+msgid "write I/O operations limit per second"
+msgstr ""
+
+#: tools/virsh.c:6355
+msgid "Unable to get number of block I/O throttle parameters"
+msgstr ""
+
+#: tools/virsh.c:6368
+msgid "Unable to get block I/O throttle parameters"
+msgstr ""
+
+#: tools/virsh.c:6465
+msgid "Unable to change block I/O throttle"
+msgstr ""
+
+#: tools/virsh.c:6482
 msgid "create a network from an XML file"
 msgstr ""
 
-#: tools/virsh.c:2678
+#: tools/virsh.c:6483
 msgid "Create a network."
 msgstr ""
 
-#: tools/virsh.c:2683 tools/virsh.c:2731
+#: tools/virsh.c:6488 tools/virsh.c:6534
 msgid "file containing an XML network description"
 msgstr ""
 
-#: tools/virsh.c:2710
+#: tools/virsh.c:6513
 #, c-format
 msgid "Network %s created from %s\n"
 msgstr ""
 
-#: tools/virsh.c:2714
+#: tools/virsh.c:6517
 #, c-format
 msgid "Failed to create network from %s"
 msgstr ""
 
-#: tools/virsh.c:2725
+#: tools/virsh.c:6528
 msgid "define (but don't start) a network from an XML file"
 msgstr ""
 
-#: tools/virsh.c:2726
+#: tools/virsh.c:6529
 msgid "Define a network."
 msgstr ""
 
-#: tools/virsh.c:2758
+#: tools/virsh.c:6559
 #, c-format
 msgid "Network %s defined from %s\n"
 msgstr ""
 
-#: tools/virsh.c:2762
+#: tools/virsh.c:6563
 #, c-format
 msgid "Failed to define network from %s"
 msgstr ""
 
-#: tools/virsh.c:6172
+#: tools/virsh.c:6574
 msgid "destroy (stop) a network"
 msgstr ""
 
-#: tools/virsh.c:6173
+#: tools/virsh.c:6575
 msgid "Forcefully stop a given network."
 msgstr ""
 
-#: tools/virsh.c:2797
+#: tools/virsh.c:6598
 #, c-format
 msgid "Network %s destroyed\n"
 msgstr ""
 
-#: tools/virsh.c:2799
+#: tools/virsh.c:6600
 #, c-format
 msgid "Failed to destroy network %s"
 msgstr ""
 
-#: tools/virsh.c:2812
+#: tools/virsh.c:6613
 msgid "network information in XML"
 msgstr ""
 
-#: tools/virsh.c:2813
+#: tools/virsh.c:6614
 msgid "Output the network information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:6250
+#: tools/virsh.c:6652
 msgid "network information"
 msgstr ""
 
-#: tools/virsh.c:3194
+#: tools/virsh.c:6653
+msgid "Returns basic information about the network"
+msgstr ""
+
+#: tools/virsh.c:6658 tools/virsh.c:7051
 msgid "network name"
 msgstr ""
 
-#: tools/virsh.c:5631
+#: tools/virsh.c:6682 tools/virsh.c:8118 tools/virsh.c:11164
 msgid "UUID"
 msgstr ""
 
-#: tools/virsh.c:6284
+#: tools/virsh.c:6686
 msgid "Active:"
 msgstr ""
 
-#: tools/virsh.c:3034 tools/virsh.c:3057 tools/virsh.c:4280 tools/virsh.c:4303
+#: tools/virsh.c:6695 tools/virsh.c:6891 tools/virsh.c:6914 tools/virsh.c:8963
+#: tools/virsh.c:9459
 msgid "no autostart"
 msgstr ""
 
-#: tools/virsh.c:6299
+#: tools/virsh.c:6701
 msgid "Bridge:"
 msgstr ""
 
-#: tools/virsh.c:2852
+#: tools/virsh.c:6712
 msgid "edit XML configuration for a physical host interface"
 msgstr ""
 
-#: tools/virsh.c:2853
+#: tools/virsh.c:6713
 msgid "Edit the XML configuration for a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:2858 tools/virsh.c:3404 tools/virsh.c:3496 tools/virsh.c:3534
-#: tools/virsh.c:3572
+#: tools/virsh.c:6718 tools/virsh.c:7261 tools/virsh.c:7351 tools/virsh.c:7389
+#: tools/virsh.c:7427
 msgid "interface name or MAC address"
 msgstr ""
 
-#: tools/virsh.c:2901
+#: tools/virsh.c:6758
 #, c-format
 msgid "Interface %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:2917 tools/virsh.c:7230
+#: tools/virsh.c:6774 tools/virsh.c:8210 tools/virsh.c:13625
 msgid "ERROR: the XML configuration was changed by another user"
 msgstr ""
 
-#: tools/virsh.c:2927
+#: tools/virsh.c:6784
 #, c-format
 msgid "Interface %s XML configuration edited.\n"
 msgstr ""
 
-#: tools/virsh.c:2952
+#: tools/virsh.c:6809
 msgid "list networks"
 msgstr ""
 
-#: tools/virsh.c:2953
+#: tools/virsh.c:6810
 msgid "Returns list of networks."
 msgstr ""
 
-#: tools/virsh.c:2958
+#: tools/virsh.c:6815
 msgid "list inactive networks"
 msgstr ""
 
-#: tools/virsh.c:2959
+#: tools/virsh.c:6816
 msgid "list inactive & active networks"
 msgstr ""
 
-#: tools/virsh.c:2979 tools/virsh.c:2987
+#: tools/virsh.c:6836 tools/virsh.c:6844
 msgid "Failed to list active networks"
 msgstr ""
 
-#: tools/virsh.c:2998 tools/virsh.c:3008
+#: tools/virsh.c:6855 tools/virsh.c:6865
 msgid "Failed to list inactive networks"
 msgstr ""
 
-#: tools/virsh.c:3018 tools/virsh.c:4265
+#: tools/virsh.c:6875 tools/virsh.c:9109 tools/virsh.c:9138 tools/virsh.c:9197
 msgid "Autostart"
 msgstr ""
 
-#: tools/virsh.c:3040 tools/virsh.c:3306 tools/virsh.c:4286
+#: tools/virsh.c:6897 tools/virsh.c:7163 tools/virsh.c:9077
 msgid "active"
 msgstr ""
 
-#: tools/virsh.c:3063 tools/virsh.c:3323 tools/virsh.c:4309 tools/virsh.c:4511
+#: tools/virsh.c:6920 tools/virsh.c:7180 tools/virsh.c:9002 tools/virsh.c:9075
+#: tools/virsh.c:9425
 msgid "inactive"
 msgstr ""
 
-#: tools/virsh.c:3079
+#: tools/virsh.c:6936
 msgid "convert a network UUID to network name"
 msgstr ""
 
-#: tools/virsh.c:3085
+#: tools/virsh.c:6942
 msgid "network uuid"
 msgstr ""
 
-#: tools/virsh.c:3110
+#: tools/virsh.c:6967
 msgid "start a (previously defined) inactive network"
 msgstr ""
 
-#: tools/virsh.c:3111
+#: tools/virsh.c:6968
 msgid "Start a network."
 msgstr ""
 
-#: tools/virsh.c:3116
+#: tools/virsh.c:6973
 msgid "name of the inactive network"
 msgstr ""
 
-#: tools/virsh.c:3133
+#: tools/virsh.c:6990
 #, c-format
 msgid "Network %s started\n"
 msgstr ""
 
-#: tools/virsh.c:3136
+#: tools/virsh.c:6993
 #, c-format
 msgid "Failed to start network %s"
 msgstr ""
 
-#: tools/virsh.c:3149
+#: tools/virsh.c:7006
 msgid "undefine an inactive network"
 msgstr ""
 
-#: tools/virsh.c:3150
+#: tools/virsh.c:7007
 msgid "Undefine the configuration for an inactive network."
 msgstr ""
 
-#: tools/virsh.c:3173
+#: tools/virsh.c:7030
 #, c-format
 msgid "Network %s has been undefined\n"
 msgstr ""
 
-#: tools/virsh.c:3175
+#: tools/virsh.c:7032
 #, c-format
 msgid "Failed to undefine network %s"
 msgstr ""
 
-#: tools/virsh.c:3188
+#: tools/virsh.c:7045
 msgid "convert a network name to network UUID"
 msgstr ""
 
-#: tools/virsh.c:3214
+#: tools/virsh.c:7071
 msgid "failed to get network UUID"
 msgstr ""
 
-#: tools/virsh.c:3226
+#: tools/virsh.c:7083
 msgid "list physical host interfaces"
 msgstr ""
 
-#: tools/virsh.c:3227
+#: tools/virsh.c:7084
 msgid "Returns list of physical host interfaces."
 msgstr ""
 
-#: tools/virsh.c:3232
+#: tools/virsh.c:7089
 msgid "list inactive interfaces"
 msgstr ""
 
-#: tools/virsh.c:3233
+#: tools/virsh.c:7090
 msgid "list inactive & active interfaces"
 msgstr ""
 
-#: tools/virsh.c:3252 tools/virsh.c:3260
+#: tools/virsh.c:7109 tools/virsh.c:7117
 msgid "Failed to list active interfaces"
 msgstr ""
 
-#: tools/virsh.c:3271 tools/virsh.c:3281
+#: tools/virsh.c:7128 tools/virsh.c:7138
 msgid "Failed to list inactive interfaces"
 msgstr ""
 
-#: tools/virsh.c:3291
+#: tools/virsh.c:7148
 msgid "MAC Address"
 msgstr ""
 
-#: tools/virsh.c:3338
+#: tools/virsh.c:7195
 msgid "convert an interface MAC address to interface name"
 msgstr ""
 
-#: tools/virsh.c:3344
+#: tools/virsh.c:7201
 msgid "interface mac"
 msgstr ""
 
-#: tools/virsh.c:3368
+#: tools/virsh.c:7225
 msgid "convert an interface name to interface MAC address"
 msgstr ""
 
-#: tools/virsh.c:3374
+#: tools/virsh.c:7231
 msgid "interface name"
 msgstr ""
 
-#: tools/virsh.c:3398
+#: tools/virsh.c:7255
 msgid "interface information in XML"
 msgstr ""
 
-#: tools/virsh.c:3399
+#: tools/virsh.c:7256
 msgid ""
 "Output the physical host interface information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:3443
+#: tools/virsh.c:7300
 msgid "define (but don't start) a physical host interface from an XML file"
 msgstr ""
 
-#: tools/virsh.c:3444
+#: tools/virsh.c:7301
 msgid "Define a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:3449
+#: tools/virsh.c:7306
 msgid "file containing an XML interface description"
 msgstr ""
 
-#: tools/virsh.c:3476
+#: tools/virsh.c:7331
 #, c-format
 msgid "Interface %s defined from %s\n"
 msgstr ""
 
-#: tools/virsh.c:3480
+#: tools/virsh.c:7335
 #, c-format
 msgid "Failed to define interface from %s"
 msgstr ""
 
-#: tools/virsh.c:3490
+#: tools/virsh.c:7345
 msgid "undefine a physical host interface (remove it from configuration)"
 msgstr ""
 
-#: tools/virsh.c:3491
+#: tools/virsh.c:7346
 msgid "undefine an interface."
 msgstr ""
 
-#: tools/virsh.c:3514
+#: tools/virsh.c:7369
 #, c-format
 msgid "Interface %s undefined\n"
 msgstr ""
 
-#: tools/virsh.c:3516
+#: tools/virsh.c:7371
 #, c-format
 msgid "Failed to undefine interface %s"
 msgstr ""
 
-#: tools/virsh.c:3528
+#: tools/virsh.c:7383
 msgid "start a physical host interface (enable it / \"if-up\")"
 msgstr ""
 
-#: tools/virsh.c:3529
+#: tools/virsh.c:7384
 msgid "start a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:3552
+#: tools/virsh.c:7407 tools/virsh.c:7936
 #, c-format
 msgid "Interface %s started\n"
 msgstr ""
 
-#: tools/virsh.c:3554
+#: tools/virsh.c:7409 tools/virsh.c:7933
 #, c-format
 msgid "Failed to start interface %s"
 msgstr ""
 
-#: tools/virsh.c:3566
+#: tools/virsh.c:7421
 msgid "destroy a physical host interface (disable it / \"if-down\")"
 msgstr ""
 
-#: tools/virsh.c:7020
+#: tools/virsh.c:7422
 msgid "forcefully stop a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:3590
+#: tools/virsh.c:7445
 #, c-format
 msgid "Interface %s destroyed\n"
 msgstr ""
 
-#: tools/virsh.c:3592
+#: tools/virsh.c:7447
 #, c-format
 msgid "Failed to destroy interface %s"
 msgstr ""
 
-#: tools/virsh.c:7057
+#: tools/virsh.c:7459
 msgid ""
 "create a snapshot of current interfaces settings, which can be later "
 "commited (iface-commit) or restored (iface-rollback)"
 msgstr ""
 
-#: tools/virsh.c:7060
+#: tools/virsh.c:7462
 msgid "Create a restore point for interfaces settings"
 msgstr ""
 
-#: tools/virsh.c:7075
+#: tools/virsh.c:7477
 msgid "Failed to begin network config change transaction"
 msgstr ""
 
-#: tools/virsh.c:7079
+#: tools/virsh.c:7481
 msgid "Network config change transaction started\n"
 msgstr ""
 
-#: tools/virsh.c:7087
+#: tools/virsh.c:7489
 msgid "commit changes made since iface-begin and free restore point"
 msgstr ""
 
-#: tools/virsh.c:7088
+#: tools/virsh.c:7490
 msgid "commit changes and free restore point"
 msgstr ""
 
-#: tools/virsh.c:7103
+#: tools/virsh.c:7505
 msgid "Failed to commit network config change transaction"
 msgstr ""
 
-#: tools/virsh.c:7107
+#: tools/virsh.c:7509
 msgid "Network config change transaction committed\n"
 msgstr ""
 
-#: tools/virsh.c:7115
+#: tools/virsh.c:7517
 msgid "rollback to previous saved configuration created via iface-begin"
 msgstr ""
 
-#: tools/virsh.c:7116
+#: tools/virsh.c:7518
 msgid "rollback to previous restore point"
 msgstr ""
 
-#: tools/virsh.c:7131
+#: tools/virsh.c:7533
 msgid "Failed to rollback network config change transaction"
 msgstr ""
 
-#: tools/virsh.c:7135
+#: tools/virsh.c:7537
 msgid "Network config change transaction rolled back\n"
 msgstr ""
 
-#: tools/virsh.c:7143
+#: tools/virsh.c:7545
+msgid "create a bridge device and attach an existing network device to it"
+msgstr ""
+
+#: tools/virsh.c:7546
+msgid "bridge an existing network device"
+msgstr ""
+
+#: tools/virsh.c:7551
+msgid "existing interface name"
+msgstr ""
+
+#: tools/virsh.c:7552
+msgid "new bridge device name"
+msgstr ""
+
+#: tools/virsh.c:7553
+msgid "do not enable STP for this bridge"
+msgstr ""
+
+#: tools/virsh.c:7555
+msgid "number of seconds to squelch traffic on newly connected ports"
+msgstr ""
+
+#: tools/virsh.c:7556
+msgid "don't start the bridge immediately"
+msgstr ""
+
+#: tools/virsh.c:7587
+msgid "Missing bridge device name in command"
+msgstr ""
+
+#: tools/virsh.c:7593
+#, c-format
+msgid "Network device %s already exists"
+msgstr ""
+
+#: tools/virsh.c:7601
+msgid "Unable to parse delay parameter"
+msgstr ""
+
+#: tools/virsh.c:7611
+msgid "(interface definition)"
+msgstr ""
+
+#: tools/virsh.c:7612 tools/virsh.c:7810
+#, c-format
+msgid "Failed to parse configuration of %s"
+msgstr ""
+
+#: tools/virsh.c:7619 tools/virsh.c:7817
+#, c-format
+msgid "Existing device %s has no type"
+msgstr ""
+
+#: tools/virsh.c:7624
+#, c-format
+msgid "Existing device %s is already a bridge"
+msgstr ""
+
+#: tools/virsh.c:7631 tools/virsh.c:7830
+#, c-format
+msgid "Interface name from config %s doesn't match given supplied name %s"
+msgstr ""
+
+#: tools/virsh.c:7638
+msgid "Failed to create bridge node in xml document"
+msgstr ""
+
+#: tools/virsh.c:7646
+msgid "Failed to set stp attribute in xml document"
+msgstr ""
+
+#: tools/virsh.c:7653
+#, c-format
+msgid "Failed to set bridge delay %d in xml document"
+msgstr ""
+
+#: tools/virsh.c:7661
+msgid "Failed to set bridge interface type to 'bridge' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7666
+#, c-format
+msgid "Failed to set master bridge interface name to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7675
+msgid "Failed to create interface node under bridge node in xml document"
+msgstr ""
+
+#: tools/virsh.c:7683
+#, c-format
+msgid "Failed to set new slave interface type to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7689
+#, c-format
+msgid "Failed to set new slave interface name to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7709 tools/virsh.c:7892
+#, c-format
+msgid "Failed to move '%s' element in xml document"
+msgstr ""
+
+#: tools/virsh.c:7720
+#, c-format
+msgid "Failed to format new xml document for bridge %s"
+msgstr ""
+
+#: tools/virsh.c:7729
+#, c-format
+msgid "Failed to define new bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7734
+#, c-format
+msgid "Created bridge %s with attached device %s\n"
+msgstr ""
+
+#: tools/virsh.c:7740
+#, c-format
+msgid "Failed to start bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7743
+#, c-format
+msgid "Bridge interface %s started\n"
+msgstr ""
+
+#: tools/virsh.c:7766
+msgid "undefine a bridge device after detaching its slave device"
+msgstr ""
+
+#: tools/virsh.c:7767
+msgid "unbridge a network device"
+msgstr ""
+
+#: tools/virsh.c:7772
+msgid "current bridge device name"
+msgstr ""
+
+#: tools/virsh.c:7774
+msgid "don't start the un-slaved interface immediately (not recommended)"
+msgstr ""
+
+#: tools/virsh.c:7808
+msgid "(bridge interface definition)"
+msgstr ""
+
+#: tools/virsh.c:7822
+#, c-format
+msgid "Device %s is not a bridge"
+msgstr ""
+
+#: tools/virsh.c:7838
+msgid "No bridge node in xml document"
+msgstr ""
+
+#: tools/virsh.c:7843
+msgid "Multiple interfaecs attached to bridge"
+msgstr ""
+
+#: tools/virsh.c:7848
+msgid "No interface attached to bridge"
+msgstr ""
+
+#: tools/virsh.c:7856
+#, c-format
+msgid "Device attached to bridge %s has no name"
+msgstr ""
+
+#: tools/virsh.c:7861
+#, c-format
+msgid "Attached device %s has no type"
+msgstr ""
+
+#: tools/virsh.c:7866
+#, c-format
+msgid "Failed to set interface type to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7872
+#, c-format
+msgid "Failed to set interface name to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7903
+#, c-format
+msgid "Failed to format new xml document for un-enslaved interface %s"
+msgstr ""
+
+#: tools/virsh.c:7912
+#, c-format
+msgid "Failed to destroy bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7916
+#, c-format
+msgid "Failed to undefine bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7923
+#, c-format
+msgid "Failed to define new interface %s"
+msgstr ""
+
+#: tools/virsh.c:7927
+#, c-format
+msgid "Device %s un-attached from bridge %s\n"
+msgstr ""
+
+#: tools/virsh.c:7958
 msgid "define or update a network filter from an XML file"
 msgstr ""
 
-#: tools/virsh.c:7144
+#: tools/virsh.c:7959
 msgid "Define a new network filter or update an existing one."
 msgstr ""
 
-#: tools/virsh.c:7149
+#: tools/virsh.c:7964
 msgid "file containing an XML network filter description"
 msgstr ""
 
-#: tools/virsh.c:7174
+#: tools/virsh.c:7989
 #, c-format
 msgid "Network filter %s defined from %s\n"
 msgstr ""
 
-#: tools/virsh.c:7178
+#: tools/virsh.c:7993
 #, c-format
 msgid "Failed to define network filter from %s"
 msgstr ""
 
-#: tools/virsh.c:7189
+#: tools/virsh.c:8004
 msgid "undefine a network filter"
 msgstr ""
 
-#: tools/virsh.c:7190
+#: tools/virsh.c:8005
 msgid "Undefine a given network filter."
 msgstr ""
 
-#: tools/virsh.c:7195 tools/virsh.c:7234 tools/virsh.c:7340
+#: tools/virsh.c:8010 tools/virsh.c:8049 tools/virsh.c:8155
 msgid "network filter name or uuid"
 msgstr ""
 
-#: tools/virsh.c:7213
+#: tools/virsh.c:8028
 #, c-format
 msgid "Network filter %s undefined\n"
 msgstr ""
 
-#: tools/virsh.c:7215
+#: tools/virsh.c:8030
 #, c-format
 msgid "Failed to undefine network filter %s"
 msgstr ""
 
-#: tools/virsh.c:7228
+#: tools/virsh.c:8043
 msgid "network filter information in XML"
 msgstr ""
 
-#: tools/virsh.c:7229
+#: tools/virsh.c:8044
 msgid "Output the network filter information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:7267
+#: tools/virsh.c:8082
 msgid "list network filters"
 msgstr ""
 
-#: tools/virsh.c:7268
+#: tools/virsh.c:8083
 msgid "Returns list of network filters."
 msgstr ""
 
-#: tools/virsh.c:7288 tools/virsh.c:7296
+#: tools/virsh.c:8103 tools/virsh.c:8111
 msgid "Failed to list network filters"
 msgstr ""
 
-#: tools/virsh.c:7334
+#: tools/virsh.c:8149
 msgid "edit XML configuration for a network filter"
 msgstr ""
 
-#: tools/virsh.c:7335
+#: tools/virsh.c:8150
 msgid "Edit the XML configuration for a network filter."
 msgstr ""
 
-#: tools/virsh.c:7379
+#: tools/virsh.c:8194
 #, c-format
 msgid "Network filter %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:7405
+#: tools/virsh.c:8220
 #, c-format
 msgid "Network filter %s XML configuration edited.\n"
 msgstr ""
 
-#: tools/virsh.c:3605
+#: tools/virsh.c:8247
 msgid "autostart a pool"
 msgstr ""
 
-#: tools/virsh.c:3607
+#: tools/virsh.c:8249
 msgid "Configure a pool to be automatically started at boot."
 msgstr ""
 
-#: tools/virsh.c:3612 tools/virsh.c:4012 tools/virsh.c:4051 tools/virsh.c:4090
-#: tools/virsh.c:4129 tools/virsh.c:4168 tools/virsh.c:4482 tools/virsh.c:4747
-#: tools/virsh.c:4980 tools/virsh.c:5057 tools/virsh.c:5098 tools/virsh.c:5149
-#: tools/virsh.c:5190 tools/virsh.c:5334 tools/virsh.c:7288
+#: tools/virsh.c:8254 tools/virsh.c:8650 tools/virsh.c:8701 tools/virsh.c:8740
+#: tools/virsh.c:8779 tools/virsh.c:8818 tools/virsh.c:9394 tools/virsh.c:9751
+#: tools/virsh.c:9981 tools/virsh.c:10058 tools/virsh.c:10158
+#: tools/virsh.c:10254 tools/virsh.c:10295 tools/virsh.c:10336
+#: tools/virsh.c:10400 tools/virsh.c:10440 tools/virsh.c:10828
+#: tools/virsh.c:10861 tools/virsh.c:13684
 msgid "pool name or uuid"
 msgstr ""
 
-#: tools/virsh.c:3634
+#: tools/virsh.c:8276
 #, c-format
 msgid "failed to mark pool %s as autostarted"
 msgstr ""
 
-#: tools/virsh.c:3636
+#: tools/virsh.c:8278
 #, c-format
 msgid "failed to unmark pool %s as autostarted"
 msgstr ""
 
-#: tools/virsh.c:3642
+#: tools/virsh.c:8284
 #, c-format
 msgid "Pool %s marked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:3644
+#: tools/virsh.c:8286
 #, c-format
 msgid "Pool %s unmarked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:3654
+#: tools/virsh.c:8296
 msgid "create a pool from an XML file"
 msgstr ""
 
-#: tools/virsh.c:3655 tools/virsh.c:3877
+#: tools/virsh.c:8297 tools/virsh.c:8515
 msgid "Create a pool."
 msgstr ""
 
-#: tools/virsh.c:3661 tools/virsh.c:3923
+#: tools/virsh.c:8303 tools/virsh.c:8562
 msgid "file containing an XML pool description"
 msgstr ""
 
-#: tools/virsh.c:3688
+#: tools/virsh.c:8328
 #, c-format
 msgid "Pool %s created from %s\n"
 msgstr ""
 
-#: tools/virsh.c:3692
+#: tools/virsh.c:8332
 #, c-format
 msgid "Failed to create pool from %s"
 msgstr ""
 
-#: tools/virsh.c:3703
+#: tools/virsh.c:8343
 msgid "create a device defined by an XML file on the node"
 msgstr ""
 
-#: tools/virsh.c:3705
+#: tools/virsh.c:8345
 msgid ""
 "Create a device on the node.  Note that this command creates devices on the "
 "physical host that can then be assigned to a virtual machine."
 msgstr ""
 
-#: tools/virsh.c:3713
+#: tools/virsh.c:8353
 msgid "file containing an XML description of the device"
 msgstr ""
 
-#: tools/virsh.c:3742
+#: tools/virsh.c:8378
 #, c-format
 msgid "Node device %s created from %s\n"
 msgstr ""
 
-#: tools/virsh.c:3746
+#: tools/virsh.c:8382
 #, c-format
 msgid "Failed to create node device from %s"
 msgstr ""
 
-#: tools/virsh.c:7579
+#: tools/virsh.c:8394
 msgid "destroy (stop) a device on the node"
 msgstr ""
 
-#: tools/virsh.c:7580
+#: tools/virsh.c:8395
 msgid ""
 "Destroy a device on the node.  Note that this command destroys devices on "
 "the physical host"
 msgstr ""
 
-#: tools/virsh.c:3766
+#: tools/virsh.c:8402
 msgid "name of the device to be destroyed"
 msgstr ""
 
-#: tools/virsh.c:3790
+#: tools/virsh.c:8423
 #, c-format
 msgid "Destroyed node device '%s'\n"
 msgstr ""
 
-#: tools/virsh.c:3792
+#: tools/virsh.c:8425
 #, c-format
 msgid "Failed to destroy node device '%s'"
 msgstr ""
 
-#: tools/virsh.c:3805
+#: tools/virsh.c:8438
 msgid "name of the pool"
 msgstr ""
 
-#: tools/virsh.c:3806
+#: tools/virsh.c:8439
 msgid "print XML document, but don't define/create"
 msgstr ""
 
-#: tools/virsh.c:3807
+#: tools/virsh.c:8440
 msgid "type of the pool"
 msgstr ""
 
-#: tools/virsh.c:3808
+#: tools/virsh.c:8441
 msgid "source-host for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3809
+#: tools/virsh.c:8442
 msgid "source path for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3810
+#: tools/virsh.c:8443
 msgid "source device for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3811
+#: tools/virsh.c:8444
 msgid "source name for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3812
+#: tools/virsh.c:8445
 msgid "target for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:7631
+#: tools/virsh.c:8446
 msgid "format for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3859 tools/virsh.c:4713 tools/virsh.c:5018
+#: tools/virsh.c:8497 tools/virsh.c:9717 tools/virsh.c:10016
+#: tools/virsh.c:12468 tools/virsh.c:12948 tools/virsh.c:13529
+#: tools/virsh.c:13546
 msgid "Failed to allocate XML buffer"
 msgstr ""
 
-#: tools/virsh.c:3876
+#: tools/virsh.c:8514
 msgid "create a pool from a set of args"
 msgstr ""
 
-#: tools/virsh.c:3902
+#: tools/virsh.c:8541
 #, c-format
 msgid "Pool %s created\n"
 msgstr ""
 
-#: tools/virsh.c:3905
+#: tools/virsh.c:8544
 #, c-format
 msgid "Failed to create pool %s"
 msgstr ""
 
-#: tools/virsh.c:3917
+#: tools/virsh.c:8556
 msgid "define (but don't start) a pool from an XML file"
 msgstr ""
 
-#: tools/virsh.c:3918 tools/virsh.c:3966
+#: tools/virsh.c:8557 tools/virsh.c:8603
 msgid "Define a pool."
 msgstr ""
 
-#: tools/virsh.c:3950
+#: tools/virsh.c:8587
 #, c-format
 msgid "Pool %s defined from %s\n"
 msgstr ""
 
-#: tools/virsh.c:3954
+#: tools/virsh.c:8591
 #, c-format
 msgid "Failed to define pool from %s"
 msgstr ""
 
-#: tools/virsh.c:3965
+#: tools/virsh.c:8602
 msgid "define a pool from a set of args"
 msgstr ""
 
-#: tools/virsh.c:3991
+#: tools/virsh.c:8629
 #, c-format
 msgid "Pool %s defined\n"
 msgstr ""
 
-#: tools/virsh.c:3994
+#: tools/virsh.c:8632
 #, c-format
 msgid "Failed to define pool %s"
 msgstr ""
 
-#: tools/virsh.c:4006
+#: tools/virsh.c:8644
 msgid "build a pool"
 msgstr ""
 
-#: tools/virsh.c:4007
+#: tools/virsh.c:8645
 msgid "Build a given pool."
 msgstr ""
 
-#: tools/virsh.c:7836
+#: tools/virsh.c:8651
 msgid "do not overwrite an existing pool of this type"
 msgstr ""
 
-#: tools/virsh.c:7837
+#: tools/virsh.c:8652
 msgid "overwrite any existing data"
 msgstr ""
 
-#: tools/virsh.c:4030
+#: tools/virsh.c:8679
 #, c-format
 msgid "Pool %s built\n"
 msgstr ""
 
-#: tools/virsh.c:4032
+#: tools/virsh.c:8681
 #, c-format
 msgid "Failed to build pool %s"
 msgstr ""
 
-#: tools/virsh.c:7879
+#: tools/virsh.c:8694
 msgid "destroy (stop) a pool"
 msgstr ""
 
-#: tools/virsh.c:7881
+#: tools/virsh.c:8696
 msgid "Forcefully stop a given pool. Raw data in the pool is untouched"
 msgstr ""
 
-#: tools/virsh.c:4069
+#: tools/virsh.c:8719
 #, c-format
 msgid "Pool %s destroyed\n"
 msgstr ""
 
-#: tools/virsh.c:4071
+#: tools/virsh.c:8721
 #, c-format
 msgid "Failed to destroy pool %s"
 msgstr ""
 
-#: tools/virsh.c:4084
+#: tools/virsh.c:8734
 msgid "delete a pool"
 msgstr ""
 
-#: tools/virsh.c:4085
+#: tools/virsh.c:8735
 msgid "Delete a given pool."
 msgstr ""
 
-#: tools/virsh.c:4108
+#: tools/virsh.c:8758
 #, c-format
 msgid "Pool %s deleted\n"
 msgstr ""
 
-#: tools/virsh.c:4110
+#: tools/virsh.c:8760
 #, c-format
 msgid "Failed to delete pool %s"
 msgstr ""
 
-#: tools/virsh.c:4123
+#: tools/virsh.c:8773
 msgid "refresh a pool"
 msgstr ""
 
-#: tools/virsh.c:4124
+#: tools/virsh.c:8774
 msgid "Refresh a given pool."
 msgstr ""
 
-#: tools/virsh.c:4147
+#: tools/virsh.c:8797
 #, c-format
 msgid "Pool %s refreshed\n"
 msgstr ""
 
-#: tools/virsh.c:4149
+#: tools/virsh.c:8799
 #, c-format
 msgid "Failed to refresh pool %s"
 msgstr ""
 
-#: tools/virsh.c:4162
+#: tools/virsh.c:8812
 msgid "pool information in XML"
 msgstr ""
 
-#: tools/virsh.c:4163
+#: tools/virsh.c:8813
 msgid "Output the pool information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:4202
+#: tools/virsh.c:8852
 msgid "list pools"
 msgstr ""
 
-#: tools/virsh.c:4203
+#: tools/virsh.c:8853
 msgid "Returns list of pools."
 msgstr ""
 
-#: tools/virsh.c:4208
+#: tools/virsh.c:8858
 msgid "list inactive pools"
 msgstr ""
 
-#: tools/virsh.c:4209
+#: tools/virsh.c:8859
 msgid "list inactive & active pools"
 msgstr ""
 
-#: tools/virsh.c:8045
+#: tools/virsh.c:8860
 msgid "display extended details for pools"
 msgstr ""
 
-#: tools/virsh.c:4229 tools/virsh.c:4237
+#: tools/virsh.c:8901 tools/virsh.c:8927
 msgid "Failed to list active pools"
 msgstr ""
 
-#: tools/virsh.c:4248 tools/virsh.c:4256
+#: tools/virsh.c:8910 tools/virsh.c:8939
 msgid "Failed to list inactive pools"
 msgstr ""
 
-#: tools/virsh.c:8173
+#: tools/virsh.c:8988
 msgid "Could not retrieve pool information"
 msgstr ""
 
-#: tools/virsh.c:4515
+#: tools/virsh.c:9005 tools/virsh.c:9429
 msgid "building"
 msgstr ""
 
-#: tools/virsh.c:4519 tools/virsh.c:8271 tools/virsh.c:8297
+#: tools/virsh.c:9008 tools/virsh.c:9433 tools/virsh.c:16734
+#: tools/virsh.c:16947
 msgid "running"
 msgstr "running"
 
-#: tools/virsh.c:4523
+#: tools/virsh.c:9011 tools/virsh.c:9437
 msgid "degraded"
 msgstr ""
 
-#: tools/virsh.c:8199 tools/virsh.c:8626
+#: tools/virsh.c:9014 tools/virsh.c:9441
 msgid "inaccessible"
 msgstr ""
 
-#: tools/virsh.c:8237 tools/virsh.c:8238 tools/virsh.c:8239
+#: tools/virsh.c:9052 tools/virsh.c:9053 tools/virsh.c:9054
 msgid "-"
 msgstr ""
 
-#: tools/virsh.c:8328 tools/virsh.c:8383
+#: tools/virsh.c:9143 tools/virsh.c:9198
 msgid "Persistent"
 msgstr ""
 
-#: tools/virsh.c:8333 tools/virsh.c:8383 tools/virsh.c:9819
+#: tools/virsh.c:9148 tools/virsh.c:9198 tools/virsh.c:10634
 msgid "Capacity"
 msgstr ""
 
-#: tools/virsh.c:8338 tools/virsh.c:8383 tools/virsh.c:9824 tools/virsh.c:9855
+#: tools/virsh.c:9153 tools/virsh.c:9198 tools/virsh.c:10639
+#: tools/virsh.c:10670
 msgid "Allocation"
 msgstr ""
 
-#: tools/virsh.c:8343 tools/virsh.c:8383
+#: tools/virsh.c:9158 tools/virsh.c:9198
 msgid "Available"
 msgstr ""
 
-#: tools/virsh.c:4381
+#: tools/virsh.c:9232 tools/virsh.c:10701
 #, c-format
 msgid "virAsprintf failed (errno %d)"
 msgstr ""
 
-#: tools/virsh.c:4324
+#: tools/virsh.c:9262
 msgid "find potential storage pool sources"
 msgstr ""
 
-#: tools/virsh.c:4325 tools/virsh.c:4405
+#: tools/virsh.c:9263 tools/virsh.c:9339
 msgid "Returns XML <sources> document."
 msgstr ""
 
-#: tools/virsh.c:4331
+#: tools/virsh.c:9269
 msgid "type of storage pool sources to find"
 msgstr ""
 
-#: tools/virsh.c:4332
+#: tools/virsh.c:9270
 msgid "optional host to query"
 msgstr ""
 
-#: tools/virsh.c:4333
+#: tools/virsh.c:9271
 msgid "optional port to query"
 msgstr ""
 
-#: tools/virsh.c:8457
+#: tools/virsh.c:9272
 msgid "optional initiator IQN to use for query"
 msgstr ""
 
-#: tools/virsh.c:4390 tools/virsh.c:4441
+#: tools/virsh.c:9324 tools/virsh.c:9374
 #, c-format
 msgid "Failed to find any %s pool sources"
 msgstr ""
 
-#: tools/virsh.c:4404
+#: tools/virsh.c:9338
 msgid "discover potential storage pool sources"
 msgstr ""
 
-#: tools/virsh.c:4411
+#: tools/virsh.c:9345
 msgid "type of storage pool sources to discover"
 msgstr ""
 
-#: tools/virsh.c:4413
+#: tools/virsh.c:9347
 msgid "optional file of source xml to query for pools"
 msgstr ""
 
-#: tools/virsh.c:8546 tools/virsh.c:11470 tools/virsh.c:11769
-#: tools/virsh.c:15183
+#: tools/virsh.c:9361 tools/virsh.c:12543 tools/virsh.c:12847
+#: tools/virsh.c:16272
 msgid "missing option"
 msgstr ""
 
-#: tools/virsh.c:4476
+#: tools/virsh.c:9388
 msgid "storage pool information"
 msgstr ""
 
-#: tools/virsh.c:4477
+#: tools/virsh.c:9389
 msgid "Returns basic information about the storage pool."
 msgstr ""
 
-#: tools/virsh.c:4536
+#: tools/virsh.c:9472
 msgid "Available:"
 msgstr ""
 
-#: tools/virsh.c:4551
+#: tools/virsh.c:9487
 msgid "convert a pool UUID to pool name"
 msgstr ""
 
-#: tools/virsh.c:4557
+#: tools/virsh.c:9493
 msgid "pool uuid"
 msgstr ""
 
-#: tools/virsh.c:4582
+#: tools/virsh.c:9518
 msgid "start a (previously defined) inactive pool"
 msgstr ""
 
-#: tools/virsh.c:4583
+#: tools/virsh.c:9519
 msgid "Start a pool."
 msgstr ""
 
-#: tools/virsh.c:4588
+#: tools/virsh.c:9524
 msgid "name of the inactive pool"
 msgstr ""
 
-#: tools/virsh.c:4605
+#: tools/virsh.c:9541
 #, c-format
 msgid "Pool %s started\n"
 msgstr ""
 
-#: tools/virsh.c:4608
+#: tools/virsh.c:9544
 #, c-format
 msgid "Failed to start pool %s"
 msgstr ""
 
-#: tools/virsh.c:4621
+#: tools/virsh.c:9557
 msgid "create a volume from a set of args"
 msgstr ""
 
-#: tools/virsh.c:4622 tools/virsh.c:4818
+#: tools/virsh.c:9558 tools/virsh.c:9822
 msgid "Create a vol."
 msgstr ""
 
-#: tools/virsh.c:4627 tools/virsh.c:4786 tools/virsh.c:4823 tools/virsh.c:4881
+#: tools/virsh.c:9563 tools/virsh.c:9790 tools/virsh.c:9827 tools/virsh.c:9884
 msgid "pool name"
 msgstr ""
 
-#: tools/virsh.c:4628
+#: tools/virsh.c:9564
 msgid "name of the volume"
 msgstr ""
 
-#: tools/virsh.c:4629
+#: tools/virsh.c:9565
 msgid "size of the vol with optional k,M,G,T suffix"
 msgstr ""
 
-#: tools/virsh.c:4630
+#: tools/virsh.c:9566
 msgid "initial allocation size with optional k,M,G,T suffix"
 msgstr ""
 
-#: tools/virsh.c:4631
+#: tools/virsh.c:9567
 msgid "file format type raw,bochs,qcow,qcow2,vmdk"
 msgstr ""
 
-#: tools/virsh.c:8753
+#: tools/virsh.c:9568
 msgid "the backing volume if taking a snapshot"
 msgstr ""
 
-#: tools/virsh.c:8754
+#: tools/virsh.c:9569
 msgid "format of backing volume if taking a snapshot"
 msgstr ""
 
-#: tools/virsh.c:4689 tools/virsh.c:4694
+#: tools/virsh.c:9628 tools/virsh.c:9632
 #, c-format
 msgid "Malformed size %s"
 msgstr ""
 
-#: tools/virsh.c:7965
+#: tools/virsh.c:9692 tools/virsh.c:16306
 #, c-format
 msgid "failed to get vol '%s'"
 msgstr ""
 
-#: tools/virsh.c:4722
+#: tools/virsh.c:9726
 #, c-format
 msgid "Vol %s created\n"
 msgstr ""
 
-#: tools/virsh.c:4726
+#: tools/virsh.c:9730
 #, c-format
 msgid "Failed to create vol %s"
 msgstr ""
 
-#: tools/virsh.c:4741
+#: tools/virsh.c:9745
 msgid "undefine an inactive pool"
 msgstr ""
 
-#: tools/virsh.c:4742
+#: tools/virsh.c:9746
 msgid "Undefine the configuration for an inactive pool."
 msgstr ""
 
-#: tools/virsh.c:4765
+#: tools/virsh.c:9769
 #, c-format
 msgid "Pool %s has been undefined\n"
 msgstr ""
 
-#: tools/virsh.c:4767
+#: tools/virsh.c:9771
 #, c-format
 msgid "Failed to undefine pool %s"
 msgstr ""
 
-#: tools/virsh.c:4780
+#: tools/virsh.c:9784
 msgid "convert a pool name to pool UUID"
 msgstr ""
 
-#: tools/virsh.c:4806
+#: tools/virsh.c:9810
 msgid "failed to get pool UUID"
 msgstr ""
 
-#: tools/virsh.c:4817
+#: tools/virsh.c:9821
 msgid "create a vol from an XML file"
 msgstr ""
 
-#: tools/virsh.c:4824 tools/virsh.c:4882
+#: tools/virsh.c:9828 tools/virsh.c:9885
 msgid "file containing an XML vol description"
 msgstr ""
 
-#: tools/virsh.c:4861
+#: tools/virsh.c:9864
 #, c-format
 msgid "Vol %s created from %s\n"
 msgstr ""
 
-#: tools/virsh.c:4865 tools/virsh.c:4922
+#: tools/virsh.c:9868 tools/virsh.c:9924
 #, c-format
 msgid "Failed to create vol from %s"
 msgstr ""
 
-#: tools/virsh.c:4875
+#: tools/virsh.c:9878
 msgid "create a vol, using another volume as input"
 msgstr ""
 
-#: tools/virsh.c:4876
+#: tools/virsh.c:9879
 msgid "Create a vol from an existing volume."
 msgstr ""
 
-#: tools/virsh.c:4884
+#: tools/virsh.c:9886
 msgid "input vol name or key"
 msgstr ""
 
-#: tools/virsh.c:4883
+#: tools/virsh.c:9887
 msgid "pool name or uuid of the input volume's pool"
 msgstr ""
 
-#: tools/virsh.c:4919
+#: tools/virsh.c:9921
 #, c-format
 msgid "Vol %s created from input vol %s\n"
 msgstr ""
 
-#: tools/virsh.c:9135
+#: tools/virsh.c:9950
 msgid "(volume_definition)"
 msgstr ""
 
-#: tools/virsh.c:4974
+#: tools/virsh.c:9973
 msgid "clone a volume."
 msgstr ""
 
-#: tools/virsh.c:4975
+#: tools/virsh.c:9974
 msgid "Clone an existing volume."
 msgstr ""
 
-#: tools/virsh.c:4981
+#: tools/virsh.c:9979
 msgid "orig vol name or key"
 msgstr ""
 
-#: tools/virsh.c:4982
+#: tools/virsh.c:9980
 msgid "clone name"
 msgstr ""
 
-#: tools/virsh.c:5004
+#: tools/virsh.c:10003 tools/virsh.c:10795
 msgid "failed to get parent pool"
 msgstr ""
 
-#: tools/virsh.c:5025
+#: tools/virsh.c:10023
 #, c-format
 msgid "Vol %s cloned from %s\n"
 msgstr ""
 
-#: tools/virsh.c:5028
+#: tools/virsh.c:10026
 #, c-format
 msgid "Failed to clone vol from %s"
 msgstr ""
 
-#: tools/virsh.c:9235
+#: tools/virsh.c:10050
 msgid "upload a file into a volume"
 msgstr ""
 
-#: tools/virsh.c:9236
+#: tools/virsh.c:10051
 msgid "Upload a file into a volume"
 msgstr ""
 
-#: tools/virsh.c:5058 tools/virsh.c:5099 tools/virsh.c:5150
+#: tools/virsh.c:10056 tools/virsh.c:10156 tools/virsh.c:10253
+#: tools/virsh.c:10294 tools/virsh.c:10335 tools/virsh.c:10399
 msgid "vol name, key or path"
 msgstr ""
 
-#: tools/virsh.c:5123
+#: tools/virsh.c:10057 tools/virsh.c:10157 tools/virsh.c:10360
+#: tools/virsh.c:10530
 msgid "file"
 msgstr ""
 
-#: tools/virsh.c:9244
+#: tools/virsh.c:10059
 msgid "volume offset to upload to"
 msgstr ""
 
-#: tools/virsh.c:9245
+#: tools/virsh.c:10060
 msgid "amount of data to upload"
 msgstr ""
 
-#: tools/virsh.c:9273 tools/virsh.c:9278 tools/virsh.c:9365 tools/virsh.c:9370
-msgid "Unable to parse integer"
-msgstr ""
-
-#: tools/virsh.c:9298
+#: tools/virsh.c:10113
 #, c-format
 msgid "cannot upload to volume %s"
 msgstr ""
 
-#: tools/virsh.c:9303
+#: tools/virsh.c:10118
 #, c-format
 msgid "cannot send data to volume %s"
 msgstr ""
 
-#: tools/virsh.c:9314 tools/virsh.c:9410
+#: tools/virsh.c:10129 tools/virsh.c:10225
 #, c-format
 msgid "cannot close volume %s"
 msgstr ""
 
-#: tools/virsh.c:9335 tools/virsh.c:9336
+#: tools/virsh.c:10150 tools/virsh.c:10151
 msgid "Download a volume to a file"
 msgstr ""
 
-#: tools/virsh.c:9344
+#: tools/virsh.c:10159
 msgid "volume offset to download from"
 msgstr ""
 
-#: tools/virsh.c:9345
+#: tools/virsh.c:10160
 msgid "amount of data to download"
 msgstr ""
 
-#: tools/virsh.c:9385
+#: tools/virsh.c:10200
 #, c-format
 msgid "cannot create %s"
 msgstr ""
 
-#: tools/virsh.c:9394
+#: tools/virsh.c:10209
 #, c-format
 msgid "cannot download from volume %s"
 msgstr ""
 
-#: tools/virsh.c:9399
+#: tools/virsh.c:10214
 #, c-format
 msgid "cannot receive data from volume %s"
 msgstr ""
 
-#: tools/virsh.c:5051
+#: tools/virsh.c:10247
 msgid "delete a vol"
 msgstr ""
 
-#: tools/virsh.c:5052
+#: tools/virsh.c:10248
 msgid "Delete a given vol."
 msgstr ""
 
-#: tools/virsh.c:5077
+#: tools/virsh.c:10273
 #, c-format
 msgid "Vol %s deleted\n"
 msgstr ""
 
-#: tools/virsh.c:5079
+#: tools/virsh.c:10275
 #, c-format
 msgid "Failed to delete vol %s"
 msgstr ""
 
-#: tools/virsh.c:9473
+#: tools/virsh.c:10288
 msgid "wipe a vol"
 msgstr ""
 
-#: tools/virsh.c:9474
+#: tools/virsh.c:10289
 msgid "Ensure data previously on a volume is not accessible to future reads"
 msgstr ""
 
-#: tools/virsh.c:9499
+#: tools/virsh.c:10314
 #, c-format
 msgid "Vol %s wiped\n"
 msgstr ""
 
-#: tools/virsh.c:9501
+#: tools/virsh.c:10316
 #, c-format
 msgid "Failed to wipe vol %s"
 msgstr ""
 
-#: tools/virsh.c:5092
+#: tools/virsh.c:10329
 msgid "storage vol information"
 msgstr ""
 
-#: tools/virsh.c:5093
+#: tools/virsh.c:10330
 msgid "Returns basic information about the storage vol."
 msgstr ""
 
-#: tools/virsh.c:5121
+#: tools/virsh.c:10360 tools/virsh.c:10364 tools/virsh.c:10368
+#: tools/virsh.c:10372
 msgid "Type:"
 msgstr ""
 
-#: tools/virsh.c:5123
+#: tools/virsh.c:10364 tools/virsh.c:10533
 msgid "block"
 msgstr ""
 
-#: tools/virsh.c:9553 tools/virsh.c:9721
+#: tools/virsh.c:10368 tools/virsh.c:10536
 msgid "dir"
 msgstr ""
 
-#: tools/virsh.c:5143
+#: tools/virsh.c:10393
 msgid "vol information in XML"
 msgstr ""
 
-#: tools/virsh.c:5144
+#: tools/virsh.c:10394
 msgid "Output the vol information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:5184
+#: tools/virsh.c:10434
 msgid "list vols"
 msgstr ""
 
-#: tools/virsh.c:5185
+#: tools/virsh.c:10435
 msgid "Returns list of vols by pool."
 msgstr ""
 
-#: tools/virsh.c:9626
+#: tools/virsh.c:10441
 msgid "display extended details for volumes"
 msgstr ""
 
-#: tools/virsh.c:9667
+#: tools/virsh.c:10482
 msgid "Failed to list storage volumes"
 msgstr ""
 
-#: tools/virsh.c:5210 tools/virsh.c:5218
+#: tools/virsh.c:10492
 msgid "Failed to list active vols"
 msgstr ""
 
-#: tools/virsh.c:5226
+#: tools/virsh.c:10604 tools/virsh.c:10624 tools/virsh.c:10669
 msgid "Path"
 msgstr ""
 
-#: tools/virsh.c:9814 tools/virsh.c:9854
+#: tools/virsh.c:10629 tools/virsh.c:10669
 msgid "Type"
 msgstr ""
 
-#: tools/virsh.c:9917
+#: tools/virsh.c:10732
 msgid "returns the volume name for a given volume key or path"
 msgstr ""
 
-#: tools/virsh.c:9923 tools/virsh.c:9956
+#: tools/virsh.c:10738 tools/virsh.c:10771
 msgid "volume key or path"
 msgstr ""
 
-#: tools/virsh.c:9949
+#: tools/virsh.c:10764
 msgid "returns the storage pool for a given volume key or path"
 msgstr ""
 
-#: tools/virsh.c:9955
+#: tools/virsh.c:10770
 msgid "return the pool uuid rather than pool name"
 msgstr ""
 
-#: tools/virsh.c:10006
+#: tools/virsh.c:10821
 msgid "returns the volume key for a given volume name or path"
 msgstr ""
 
-#: tools/virsh.c:10012
+#: tools/virsh.c:10827
 msgid "volume name or path"
 msgstr ""
 
-#: tools/virsh.c:10039
+#: tools/virsh.c:10854
 msgid "returns the volume path for a given volume name or key"
 msgstr ""
 
-#: tools/virsh.c:10045
+#: tools/virsh.c:10860
 msgid "volume name or key"
 msgstr ""
 
-#: tools/virsh.c:5362
+#: tools/virsh.c:10894
 msgid "define or modify a secret from an XML file"
 msgstr ""
 
-#: tools/virsh.c:5363
+#: tools/virsh.c:10895
 msgid "Define or modify a secret."
 msgstr ""
 
-#: tools/virsh.c:5368
+#: tools/virsh.c:10900
 msgid "file containing secret attributes in XML"
 msgstr ""
 
-#: tools/virsh.c:5393
+#: tools/virsh.c:10925
 #, c-format
 msgid "Failed to set attributes from %s"
 msgstr ""
 
-#: tools/virsh.c:5397
+#: tools/virsh.c:10929
 msgid "Failed to get UUID of created secret"
 msgstr ""
 
-#: tools/virsh.c:5401
+#: tools/virsh.c:10933
 #, c-format
 msgid "Secret %s created\n"
 msgstr ""
 
-#: tools/virsh.c:5410
+#: tools/virsh.c:10942
 msgid "secret attributes in XML"
 msgstr ""
 
-#: tools/virsh.c:5411
+#: tools/virsh.c:10943
 msgid "Output attributes of a secret as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:5416 tools/virsh.c:5456 tools/virsh.c:5515 tools/virsh.c:5567
+#: tools/virsh.c:10948 tools/virsh.c:10988 tools/virsh.c:11048
+#: tools/virsh.c:11100
 msgid "secret UUID"
 msgstr ""
 
-#: tools/virsh.c:5450
+#: tools/virsh.c:10982
 msgid "set a secret value"
 msgstr ""
 
-#: tools/virsh.c:5451
+#: tools/virsh.c:10983
 msgid "Set a secret value."
 msgstr ""
 
-#: tools/virsh.c:5457
+#: tools/virsh.c:10989
 msgid "base64-encoded secret value"
 msgstr ""
 
-#: tools/virsh.c:5481
+#: tools/virsh.c:11014
 msgid "Invalid base64 data"
 msgstr ""
 
-#: tools/virsh.c:5494
+#: tools/virsh.c:11027
 msgid "Failed to set secret value"
 msgstr ""
 
-#: tools/virsh.c:5497
+#: tools/virsh.c:11030
 msgid "Secret value set\n"
 msgstr ""
 
-#: tools/virsh.c:5509
+#: tools/virsh.c:11042
 msgid "Output a secret value"
 msgstr ""
 
-#: tools/virsh.c:5510
+#: tools/virsh.c:11043
 msgid "Output a secret value to stdout."
 msgstr ""
 
-#: tools/virsh.c:5561
+#: tools/virsh.c:11094
 msgid "undefine a secret"
 msgstr ""
 
-#: tools/virsh.c:5562
+#: tools/virsh.c:11095
 msgid "Undefine a secret."
 msgstr ""
 
-#: tools/virsh.c:5586
+#: tools/virsh.c:11119
 #, c-format
 msgid "Failed to delete secret %s"
 msgstr ""
 
-#: tools/virsh.c:5589
+#: tools/virsh.c:11122
 #, c-format
 msgid "Secret %s deleted\n"
 msgstr ""
 
-#: tools/virsh.c:5601
+#: tools/virsh.c:11134
 msgid "list secrets"
 msgstr ""
 
-#: tools/virsh.c:5602
+#: tools/virsh.c:11135
 msgid "Returns a list of secrets"
 msgstr ""
 
-#: tools/virsh.c:5617 tools/virsh.c:5624
+#: tools/virsh.c:11150 tools/virsh.c:11157
 msgid "Failed to list secrets"
 msgstr ""
 
-#: tools/virsh.c:5631
+#: tools/virsh.c:11164
 msgid "Usage"
 msgstr ""
 
-#: tools/virsh.c:5645
+#: tools/virsh.c:11178
 msgid "Volume"
 msgstr ""
 
-#: tools/virsh.c:5655
+#: tools/virsh.c:11188
 msgid "Unused"
 msgstr ""
 
-#: tools/virsh.c:5669
+#: tools/virsh.c:11202
 msgid "show version"
 msgstr "show version"
 
-#: tools/virsh.c:5670
+#: tools/virsh.c:11203
 msgid "Display the system version information."
 msgstr "Display the system version information."
 
-#: tools/virsh.c:10393
+#: tools/virsh.c:11208
 msgid "report daemon version too"
 msgstr ""
 
-#: tools/virsh.c:5693
+#: tools/virsh.c:11231
 msgid "failed to get hypervisor type"
 msgstr "failed to get hypervisor type"
 
-#: tools/virsh.c:5702
+#: tools/virsh.c:11240
 #, c-format
 msgid "Compiled against library: libvir %d.%d.%d\n"
 msgstr "Compiled against library: libvir %d.%d.%d\n"
 
-#: tools/virsh.c:5707
+#: tools/virsh.c:11245
 msgid "failed to get the library version"
 msgstr "failed to get the library version"
 
-#: tools/virsh.c:5714
+#: tools/virsh.c:11252
 #, c-format
 msgid "Using library: libvir %d.%d.%d\n"
 msgstr "Using library: libvir %d.%d.%d\n"
 
-#: tools/virsh.c:5721
+#: tools/virsh.c:11259
 #, c-format
 msgid "Using API: %s %d.%d.%d\n"
 msgstr "Using API: %s %d.%d.%d\n"
 
-#: tools/virsh.c:5726
+#: tools/virsh.c:11264
 msgid "failed to get the hypervisor version"
 msgstr "failed to get the hypervisor version"
 
-#: tools/virsh.c:5731
+#: tools/virsh.c:11269
 #, c-format
 msgid "Cannot extract running %s hypervisor version\n"
 msgstr "Cannot extract running %s hypervisor version\n"
 
-#: tools/virsh.c:5738
+#: tools/virsh.c:11276
 #, c-format
 msgid "Running hypervisor: %s %d.%d.%d\n"
 msgstr "Running hypervisor: %s %d.%d.%d\n"
 
-#: tools/virsh.c:10468
+#: tools/virsh.c:11283
 msgid "failed to get the daemon version"
 msgstr ""
 
-#: tools/virsh.c:10474
+#: tools/virsh.c:11289
 #, c-format
 msgid "Running against daemon: %d.%d.%d\n"
 msgstr ""
 
-#: tools/virsh.c:5748
+#: tools/virsh.c:11301
 msgid "enumerate devices on this host"
 msgstr ""
 
-#: tools/virsh.c:5754
+#: tools/virsh.c:11307
 msgid "list devices in a tree"
 msgstr ""
 
-#: tools/virsh.c:5755
+#: tools/virsh.c:11308
 msgid "capability name"
 msgstr ""
 
-#: tools/virsh.c:5856
+#: tools/virsh.c:11408
 msgid "Failed to count node devices"
 msgstr ""
 
-#: tools/virsh.c:5866
+#: tools/virsh.c:11418
 msgid "Failed to list node devices"
 msgstr ""
 
-#: tools/virsh.c:5916
+#: tools/virsh.c:11468
 msgid "node device details in XML"
 msgstr ""
 
-#: tools/virsh.c:5917
+#: tools/virsh.c:11469
 msgid "Output the node device details as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:5923 tools/virsh.c:5966 tools/virsh.c:6007 tools/virsh.c:6048
+#: tools/virsh.c:11475 tools/virsh.c:11518 tools/virsh.c:11559
+#: tools/virsh.c:11600
 msgid "device key"
 msgstr ""
 
-#: tools/virsh.c:5939 tools/virsh.c:5982 tools/virsh.c:6023 tools/virsh.c:6064
+#: tools/virsh.c:11491 tools/virsh.c:11534 tools/virsh.c:11575
+#: tools/virsh.c:11616
 msgid "Could not find matching device"
 msgstr ""
 
-#: tools/virsh.c:5959
+#: tools/virsh.c:11511
 msgid "dettach node device from its device driver"
 msgstr ""
 
-#: tools/virsh.c:5960
+#: tools/virsh.c:11512
 msgid ""
 "Dettach node device from its device driver before assigning to a domain."
 msgstr ""
 
-#: tools/virsh.c:5987
+#: tools/virsh.c:11539
 #, c-format
 msgid "Device %s dettached\n"
 msgstr ""
 
-#: tools/virsh.c:5989
+#: tools/virsh.c:11541
 #, c-format
 msgid "Failed to dettach device %s"
 msgstr ""
 
-#: tools/virsh.c:6000
+#: tools/virsh.c:11552
 msgid "reattach node device to its device driver"
 msgstr ""
 
-#: tools/virsh.c:6001
+#: tools/virsh.c:11553
 msgid ""
 "Reattach node device to its device driver once released by the domain."
 msgstr ""
 
-#: tools/virsh.c:6028
+#: tools/virsh.c:11580
 #, c-format
 msgid "Device %s re-attached\n"
 msgstr ""
 
-#: tools/virsh.c:6030
+#: tools/virsh.c:11582
 #, c-format
 msgid "Failed to re-attach device %s"
 msgstr ""
 
-#: tools/virsh.c:6041
+#: tools/virsh.c:11593
 msgid "reset node device"
 msgstr ""
 
-#: tools/virsh.c:6042
+#: tools/virsh.c:11594
 msgid "Reset node device before or after assigning to a domain."
 msgstr ""
 
-#: tools/virsh.c:6069
+#: tools/virsh.c:11621
 #, c-format
 msgid "Device %s reset\n"
 msgstr ""
 
-#: tools/virsh.c:6071
+#: tools/virsh.c:11623
 #, c-format
 msgid "Failed to reset device %s"
 msgstr ""
 
-#: tools/virsh.c:6082
+#: tools/virsh.c:11634
 msgid "print the hypervisor hostname"
 msgstr ""
 
-#: tools/virsh.c:6097
+#: tools/virsh.c:11649
 msgid "failed to get hostname"
 msgstr ""
 
-#: tools/virsh.c:6111
+#: tools/virsh.c:11663
 msgid "print the hypervisor canonical URI"
 msgstr ""
 
-#: tools/virsh.c:6126
+#: tools/virsh.c:11678
 msgid "failed to get URI"
 msgstr ""
 
-#: tools/virsh.c:10877
+#: tools/virsh.c:11692
 msgid "print the hypervisor sysinfo"
 msgstr ""
 
-#: tools/virsh.c:10879
+#: tools/virsh.c:11694
 msgid "output an XML string for the hypervisor sysinfo, if available"
 msgstr ""
 
-#: tools/virsh.c:10893
+#: tools/virsh.c:11708
 msgid "failed to get sysinfo"
 msgstr ""
 
-#: tools/virsh.c:6140
+#: tools/virsh.c:11722
 msgid "vnc display"
 msgstr ""
 
-#: tools/virsh.c:6141
+#: tools/virsh.c:11723
 msgid "Output the IP address and port number for the VNC display."
 msgstr ""
 
-#: tools/virsh.c:6215
+#: tools/virsh.c:11791
 msgid "tty console"
 msgstr ""
 
-#: tools/virsh.c:6216
+#: tools/virsh.c:11792
 msgid "Output the device for the TTY console."
 msgstr ""
 
-#: tools/virsh.c:6276
+#: tools/virsh.c:11846
 msgid "attach device from an XML file"
 msgstr ""
 
-#: tools/virsh.c:6277
+#: tools/virsh.c:11847
 msgid "Attach device from an XML <file>."
 msgstr ""
 
-#: tools/virsh.c:6283 tools/virsh.c:6341
+#: tools/virsh.c:11853 tools/virsh.c:12162 tools/virsh.c:12241
 msgid "XML file"
 msgstr ""
 
-#: tools/virsh.c:11039
+#: tools/virsh.c:11854
 msgid "persist device attachment"
 msgstr ""
 
-#: tools/virsh.c:6318
+#: tools/virsh.c:11895
 #, c-format
 msgid "Failed to attach device from %s"
 msgstr ""
 
-#: tools/virsh.c:6322
+#: tools/virsh.c:11899
 msgid "Device attached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6334
+#: tools/virsh.c:11982 tools/virsh.c:11995
+msgid "Bad child elements counting."
+msgstr ""
+
+#: tools/virsh.c:12056
+#, c-format
+msgid "couldn't get XML description of domain %s"
+msgstr ""
+
+#: tools/virsh.c:12063
+msgid "Failed to parse domain definition xml"
+msgstr ""
+
+#: tools/virsh.c:12069
+msgid "Failed to parse device definition xml"
+msgstr ""
+
+#: tools/virsh.c:12091
+msgid "error when selecting nodes"
+msgstr ""
+
+#: tools/virsh.c:12120
+msgid "failed to create document saving context"
+msgstr ""
+
+#: tools/virsh.c:12155
 msgid "detach device from an XML file"
 msgstr ""
 
-#: tools/virsh.c:6335
+#: tools/virsh.c:12156
 msgid "Detach device from an XML <file>"
 msgstr ""
 
-#: tools/virsh.c:11104
+#: tools/virsh.c:12163
 msgid "persist device detachment"
 msgstr ""
 
-#: tools/virsh.c:6376
+#: tools/virsh.c:12194
+#, c-format
+msgid "no such device in %s"
+msgstr ""
+
+#: tools/virsh.c:12196
+msgid "given XML selects too many devices. Please, be more specific"
+msgstr ""
+
+#: tools/virsh.c:12215
 #, c-format
 msgid "Failed to detach device from %s"
 msgstr ""
 
-#: tools/virsh.c:6380
+#: tools/virsh.c:12219
 msgid "Device detached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:11161
+#: tools/virsh.c:12234
 msgid "update device from an XML file"
 msgstr ""
 
-#: tools/virsh.c:11162
+#: tools/virsh.c:12235
 msgid "Update device from an XML <file>."
 msgstr ""
 
-#: tools/virsh.c:11169
+#: tools/virsh.c:12242
 msgid "persist device update"
 msgstr ""
 
-#: tools/virsh.c:11170
+#: tools/virsh.c:12243
 msgid "force device update"
 msgstr ""
 
-#: tools/virsh.c:11215
+#: tools/virsh.c:12288
 #, c-format
 msgid "Failed to update device from %s"
 msgstr ""
 
-#: tools/virsh.c:6392
+#: tools/virsh.c:12304
 msgid "attach network interface"
 msgstr ""
 
-#: tools/virsh.c:6393
+#: tools/virsh.c:12305
 msgid "Attach new network interface."
 msgstr ""
 
-#: tools/virsh.c:6399 tools/virsh.c:6515
+#: tools/virsh.c:12311 tools/virsh.c:12510
 msgid "network interface type"
 msgstr ""
 
-#: tools/virsh.c:6400
+#: tools/virsh.c:12312
 msgid "source of network interface"
 msgstr ""
 
-#: tools/virsh.c:6401
+#: tools/virsh.c:12313
 msgid "target network name"
 msgstr ""
 
-#: tools/virsh.c:6402 tools/virsh.c:6516
+#: tools/virsh.c:12314 tools/virsh.c:12511
 msgid "MAC address"
 msgstr ""
 
-#: tools/virsh.c:6403
+#: tools/virsh.c:12315
 msgid "script used to bridge network interface"
 msgstr ""
 
-#: tools/virsh.c:11243
+#: tools/virsh.c:12316
 msgid "model type"
 msgstr ""
 
-#: tools/virsh.c:11244
+#: tools/virsh.c:12317
 msgid "persist interface attachment"
 msgstr ""
 
-#: tools/virsh.c:11245
+#: tools/virsh.c:12318
 msgid "control domain's incoming traffics"
 msgstr ""
 
-#: tools/virsh.c:11246
+#: tools/virsh.c:12319
 msgid "control domain's outgoing traffics"
 msgstr ""
 
-#: tools/virsh.c:11326
+#: tools/virsh.c:12399
 #, c-format
 msgid "No support for %s in command 'attach-interface'"
 msgstr ""
 
-#: tools/virsh.c:11334
+#: tools/virsh.c:12407
 msgid "inbound format is incorrect"
 msgstr ""
 
-#: tools/virsh.c:11338
+#: tools/virsh.c:12411
 msgid "inbound average is mandatory"
 msgstr ""
 
-#: tools/virsh.c:11345
+#: tools/virsh.c:12418
 msgid "outbound format is incorrect"
 msgstr ""
 
-#: tools/virsh.c:11349
+#: tools/virsh.c:12422
 msgid "outbound average is mandatory"
 msgstr ""
 
-#: tools/virsh.c:11413
+#: tools/virsh.c:12486
 msgid "Failed to attach interface"
 msgstr ""
 
-#: tools/virsh.c:6491
+#: tools/virsh.c:12488
 msgid "Interface attached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6508
+#: tools/virsh.c:12503
 msgid "detach network interface"
 msgstr ""
 
-#: tools/virsh.c:6509
+#: tools/virsh.c:12504
 msgid "Detach network interface."
 msgstr ""
 
-#: tools/virsh.c:11439
+#: tools/virsh.c:12512
 msgid "persist interface detachment"
 msgstr ""
 
-#: tools/virsh.c:6554 tools/virsh.c:6559
+#: tools/virsh.c:12554
 msgid "Failed to get interface information"
 msgstr ""
 
-#: tools/virsh.c:6567
+#: tools/virsh.c:12562
 #, c-format
 msgid "No found interface whose type is %s"
 msgstr ""
 
-#: tools/virsh.c:11494
+#: tools/virsh.c:12567
 #, c-format
 msgid ""
 "Domain has %d interfaces. Please specify which one to detach using --mac"
 msgstr ""
 
-#: tools/virsh.c:6589
+#: tools/virsh.c:12591
 #, c-format
 msgid "No found interface whose MAC address is %s"
 msgstr ""
 
-#: tools/virsh.c:11545
+#: tools/virsh.c:12618
 msgid "Failed to detach interface"
 msgstr ""
 
-#: tools/virsh.c:6608
+#: tools/virsh.c:12620
 msgid "Interface detached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6628
+#: tools/virsh.c:12638
 msgid "attach disk device"
 msgstr ""
 
-#: tools/virsh.c:6629
+#: tools/virsh.c:12639
 msgid "Attach new disk device."
 msgstr ""
 
-#: tools/virsh.c:6635
+#: tools/virsh.c:12646
 msgid "source of disk device"
 msgstr ""
 
-#: tools/virsh.c:6636 tools/virsh.c:6792
+#: tools/virsh.c:12647 tools/virsh.c:12990
 msgid "target of disk device"
 msgstr ""
 
-#: tools/virsh.c:6637
+#: tools/virsh.c:12648
 msgid "driver of disk device"
 msgstr ""
 
-#: tools/virsh.c:6638
+#: tools/virsh.c:12649
 msgid "subdriver of disk device"
 msgstr ""
 
-#: tools/virsh.c:11576
+#: tools/virsh.c:12650
 msgid "cache mode of disk device"
 msgstr ""
 
-#: tools/virsh.c:6639
+#: tools/virsh.c:12651
 msgid "target device type"
 msgstr ""
 
-#: tools/virsh.c:6640
+#: tools/virsh.c:12652
 msgid "mode of device reading and writing"
 msgstr ""
 
-#: tools/virsh.c:11579
+#: tools/virsh.c:12653
 msgid "persist disk attachment"
 msgstr ""
 
-#: tools/virsh.c:11580
+#: tools/virsh.c:12654
 msgid "type of source (block|file)"
 msgstr ""
 
-#: tools/virsh.c:11581
+#: tools/virsh.c:12655
 msgid "serial of disk device"
 msgstr ""
 
-#: tools/virsh.c:11582
+#: tools/virsh.c:12656
 msgid "shareable between domains"
 msgstr ""
 
-#: tools/virsh.c:11583
+#: tools/virsh.c:12657
 msgid "address of disk device"
 msgstr ""
 
-#: tools/virsh.c:11779
+#: tools/virsh.c:12857
 #, c-format
 msgid "Unknown source type: '%s'"
 msgstr ""
 
-#: tools/virsh.c:11785
+#: tools/virsh.c:12863
 #, c-format
 msgid "No support for %s in command 'attach-disk'"
 msgstr ""
 
-#: tools/virsh.c:11826
+#: tools/virsh.c:12905
 msgid "Invalid address."
 msgstr ""
 
-#: tools/virsh.c:11838
+#: tools/virsh.c:12917
 msgid "expecting a pci:0000.00.00.00 address."
 msgstr ""
 
-#: tools/virsh.c:11849
+#: tools/virsh.c:12928
 msgid "expecting a scsi:00.00.00 address."
 msgstr ""
 
-#: tools/virsh.c:11860
+#: tools/virsh.c:12939
 msgid "expecting an ide:00.00.00 address."
 msgstr ""
 
-#: tools/virsh.c:11887
+#: tools/virsh.c:12966
 msgid "Failed to attach disk"
 msgstr ""
 
-#: tools/virsh.c:6769
+#: tools/virsh.c:12968
 msgid "Disk attached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6785
+#: tools/virsh.c:12983
 msgid "detach disk device"
 msgstr ""
 
-#: tools/virsh.c:6786
+#: tools/virsh.c:12984
 msgid "Detach disk device."
 msgstr ""
 
-#: tools/virsh.c:11912
+#: tools/virsh.c:12991
 msgid "persist disk detachment"
 msgstr ""
 
-#: tools/virsh.c:6827 tools/virsh.c:6832 tools/virsh.c:6839
+#: tools/virsh.c:13027 tools/virsh.c:13034
 msgid "Failed to get disk information"
 msgstr ""
 
-#: tools/virsh.c:6858
+#: tools/virsh.c:13054
 #, c-format
 msgid "No found disk whose target is %s"
 msgstr ""
 
-#: tools/virsh.c:12002
+#: tools/virsh.c:13081
 msgid "Failed to detach disk"
 msgstr ""
 
-#: tools/virsh.c:6877
+#: tools/virsh.c:13083
 msgid "Disk detached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6897
+#: tools/virsh.c:13101
 msgid "compare host CPU with a CPU described by an XML file"
 msgstr ""
 
-#: tools/virsh.c:6898
+#: tools/virsh.c:13102
 msgid "compare CPU with host CPU"
 msgstr ""
 
-#: tools/virsh.c:6903
+#: tools/virsh.c:13107
 msgid "file containing an XML CPU description"
 msgstr ""
 
-#: tools/virsh.c:12053
+#: tools/virsh.c:13132
 #, c-format
 msgid "Failed to read file '%s' to compare"
 msgstr ""
 
-#: tools/virsh.c:12066
+#: tools/virsh.c:13145
 msgid "Can't create XML buffer to extract CPU element."
 msgstr ""
 
-#: tools/virsh.c:12071
+#: tools/virsh.c:13150
 msgid "Failed to extract CPU element snippet from domain XML."
 msgstr ""
 
-#: tools/virsh.c:12077
+#: tools/virsh.c:13156
 #, c-format
 msgid ""
 "File '%s' does not contain a <cpu> element or is not a valid domain or "
 "capabilities XML"
 msgstr ""
 
-#: tools/virsh.c:6931
+#: tools/virsh.c:13165
 #, c-format
 msgid "CPU described in %s is incompatible with host CPU\n"
 msgstr ""
 
-#: tools/virsh.c:6937
+#: tools/virsh.c:13171
 #, c-format
 msgid "CPU described in %s is identical to host CPU\n"
 msgstr ""
 
-#: tools/virsh.c:6943
+#: tools/virsh.c:13176
 #, c-format
 msgid "Host CPU is a superset of CPU described in %s\n"
 msgstr ""
 
-#: tools/virsh.c:6950
+#: tools/virsh.c:13182
 #, c-format
 msgid "Failed to compare host CPU with %s"
 msgstr ""
 
-#: tools/virsh.c:12122
+#: tools/virsh.c:13201
 msgid "compute baseline CPU"
 msgstr ""
 
-#: tools/virsh.c:12123
+#: tools/virsh.c:13202
 msgid "Compute baseline CPU for a set of given CPUs."
 msgstr ""
 
-#: tools/virsh.c:12128
+#: tools/virsh.c:13207
 msgid "file containing XML CPU descriptions"
 msgstr ""
 
-#: tools/virsh.c:12175
+#: tools/virsh.c:13254
 #, c-format
 msgid "No host CPU specified in '%s'"
 msgstr ""
 
-#: tools/virsh.c:12188
+#: tools/virsh.c:13267
 msgid "Failed to extract <cpu> element"
 msgstr ""
 
-#: tools/virsh.c:12237
+#: tools/virsh.c:13316
 #, c-format
 msgid "mkstemps: failed to create temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:6984
+#: tools/virsh.c:13323
 #, c-format
 msgid "write: %s: failed to write to temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:6992
+#: tools/virsh.c:13331
 #, c-format
 msgid "close: %s: failed to write or close temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:7030
+#: tools/virsh.c:13372
 #, c-format
 msgid ""
 "%s: temporary filename contains shell meta or other unacceptable characters "
 "(is $TMPDIR wrong?)"
 msgstr ""
 
-#: tools/virsh.c:7067
+#: tools/virsh.c:13405
 #, c-format
 msgid "%s: failed to read temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:7080
+#: tools/virsh.c:13417
 msgid "change the current directory"
 msgstr ""
 
-#: tools/virsh.c:7081
+#: tools/virsh.c:13418
 msgid "Change the current directory."
 msgstr ""
 
-#: tools/virsh.c:7086
+#: tools/virsh.c:13423
 msgid "directory to switch to (default: home or else root)"
 msgstr ""
 
-#: tools/virsh.c:7097
+#: tools/virsh.c:13435
 msgid "cd: command valid only in interactive mode"
 msgstr ""
 
-#: tools/virsh.c:7110
+#: tools/virsh.c:13447
 #, c-format
 msgid "cd: %s: %s"
 msgstr ""
 
-#: tools/virsh.c:7124
+#: tools/virsh.c:13459
 msgid "print the current directory"
 msgstr ""
 
-#: tools/virsh.c:7125
+#: tools/virsh.c:13460
 msgid "Print the current directory."
 msgstr ""
 
-#: tools/virsh.c:7148
+#: tools/virsh.c:13472
 #, c-format
 msgid "pwd: cannot get current directory: %s"
 msgstr ""
 
-#: tools/virsh.c:7151
+#: tools/virsh.c:13476
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: tools/virsh.c:12408
+#: tools/virsh.c:13487
 msgid "echo arguments"
 msgstr ""
 
-#: tools/virsh.c:12409
+#: tools/virsh.c:13488
 msgid "Echo back arguments, possibly with quoting."
 msgstr ""
 
-#: tools/virsh.c:12414
+#: tools/virsh.c:13493
 msgid "escape for shell use"
 msgstr ""
 
-#: tools/virsh.c:12415
+#: tools/virsh.c:13494
 msgid "escape for XML use"
 msgstr ""
 
-#: tools/virsh.c:12416
+#: tools/virsh.c:13495
 msgid "arguments to echo"
 msgstr ""
 
-#: tools/virsh.c:7162
+#: tools/virsh.c:13560
 msgid "edit XML configuration for a domain"
 msgstr ""
 
-#: tools/virsh.c:7163
+#: tools/virsh.c:13561
 msgid "Edit the XML configuration for a domain."
 msgstr ""
 
-#: tools/virsh.c:7214
+#: tools/virsh.c:13609
 #, c-format
 msgid "Domain %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:7240
+#: tools/virsh.c:13635
 #, c-format
 msgid "Domain %s XML configuration edited.\n"
 msgstr ""
 
-#: tools/virsh.c:7265
+#: tools/virsh.c:13661
 msgid "edit XML configuration for a network"
 msgstr ""
 
-#: tools/virsh.c:7266
+#: tools/virsh.c:13662
 msgid "Edit the XML configuration for a network."
 msgstr ""
 
-#: tools/virsh.c:7282
+#: tools/virsh.c:13678
 msgid "edit XML configuration for a storage pool"
 msgstr ""
 
-#: tools/virsh.c:7283
+#: tools/virsh.c:13679
 msgid "Edit the XML configuration for a storage pool."
 msgstr ""
 
-#: tools/virsh.c:7299
+#: tools/virsh.c:13695
 msgid "quit this interactive terminal"
 msgstr "quit this interactive terminal"
 
-#: tools/virsh.c:12657
+#: tools/virsh.c:13736
 msgid "cannot halt after snapshot of transient domain"
 msgstr ""
 
-#: tools/virsh.c:12676
+#: tools/virsh.c:13755
 msgid "Could not get snapshot name"
 msgstr ""
 
-#: tools/virsh.c:12681
+#: tools/virsh.c:13760
 #, c-format
 msgid "Domain snapshot %s created from '%s'"
 msgstr ""
 
-#: tools/virsh.c:12683
+#: tools/virsh.c:13762
 #, c-format
 msgid "Domain snapshot %s created"
 msgstr ""
 
-#: tools/virsh.c:12700
+#: tools/virsh.c:13779
 msgid "Create a snapshot from XML"
 msgstr ""
 
-#: tools/virsh.c:12701
+#: tools/virsh.c:13780
 msgid "Create a snapshot (disk and RAM) from XML"
 msgstr ""
 
-#: tools/virsh.c:12707
+#: tools/virsh.c:13786
 msgid "domain snapshot XML"
 msgstr ""
 
-#: tools/virsh.c:12708
+#: tools/virsh.c:13787
 msgid "redefine metadata for existing snapshot"
 msgstr ""
 
-#: tools/virsh.c:12709
+#: tools/virsh.c:13788
 msgid "with redefine, set current snapshot"
 msgstr ""
 
-#: tools/virsh.c:12710 tools/virsh.c:12840
+#: tools/virsh.c:13789 tools/virsh.c:13919
 msgid "take snapshot but create no metadata"
 msgstr ""
 
-#: tools/virsh.c:12711 tools/virsh.c:12841
+#: tools/virsh.c:13790 tools/virsh.c:13920
 msgid "halt domain after snapshot is created"
 msgstr ""
 
-#: tools/virsh.c:12712 tools/virsh.c:12842
+#: tools/virsh.c:13791 tools/virsh.c:13921
 msgid "capture disk state but not vm state"
 msgstr ""
 
-#: tools/virsh.c:12824
+#: tools/virsh.c:13903
 #, c-format
 msgid "unable to parse diskspec: %s"
 msgstr ""
 
-#: tools/virsh.c:12830
+#: tools/virsh.c:13909
 msgid "Create a snapshot from a set of args"
 msgstr ""
 
-#: tools/virsh.c:12831
+#: tools/virsh.c:13910
 msgid "Create a snapshot (disk and RAM) from arguments"
 msgstr ""
 
-#: tools/virsh.c:12837
+#: tools/virsh.c:13916
 msgid "name of snapshot"
 msgstr ""
 
-#: tools/virsh.c:12838
+#: tools/virsh.c:13917
 msgid "description of snapshot"
 msgstr ""
 
-#: tools/virsh.c:12839
+#: tools/virsh.c:13918
 msgid "print XML document rather than create"
 msgstr ""
 
-#: tools/virsh.c:12844
+#: tools/virsh.c:13923
 msgid "disk attributes: disk[,snapshot=type][,driver=type][,file=name]"
 msgstr ""
 
-#: tools/virsh.c:12876
+#: tools/virsh.c:13955
 msgid "argument must not be empty"
 msgstr ""
 
-#: tools/virsh.c:12932
+#: tools/virsh.c:14011
 #, c-format
 msgid "invalid argument for --%s"
 msgstr ""
 
-#: tools/virsh.c:12937
+#: tools/virsh.c:14016
 #, c-format
 msgid "--%s and --current are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:12946
+#: tools/virsh.c:14025
 #, c-format
 msgid "--%s or --current is required"
 msgstr ""
 
-#: tools/virsh.c:12962
+#: tools/virsh.c:14041
 msgid "edit XML for a snapshot"
 msgstr ""
 
-#: tools/virsh.c:12963
+#: tools/virsh.c:14042
 msgid "Edit the domain snapshot XML for a named snapshot"
 msgstr ""
 
-#: tools/virsh.c:12969 tools/virsh.c:13644 tools/virsh.c:13763
-#: tools/virsh.c:13837
+#: tools/virsh.c:14048 tools/virsh.c:14723 tools/virsh.c:14842
+#: tools/virsh.c:14916
 msgid "snapshot name"
 msgstr ""
 
-#: tools/virsh.c:12970
+#: tools/virsh.c:14049
 msgid "also set edited snapshot as current"
 msgstr ""
 
-#: tools/virsh.c:12971
+#: tools/virsh.c:14050
 msgid "allow renaming an existing snapshot"
 msgstr ""
 
-#: tools/virsh.c:12972
+#: tools/virsh.c:14051
 msgid "allow cloning to new name"
 msgstr ""
 
-#: tools/virsh.c:12995
+#: tools/virsh.c:14074
 msgid "--rename and --clone are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13041
+#: tools/virsh.c:14120
 #, c-format
 msgid "Snapshot %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:13056
+#: tools/virsh.c:14135
 #, c-format
 msgid "Snapshot %s edited.\n"
 msgstr ""
 
-#: tools/virsh.c:13058
+#: tools/virsh.c:14137
 #, c-format
 msgid "Snapshot %s cloned to %s.\n"
 msgstr ""
 
-#: tools/virsh.c:13067
+#: tools/virsh.c:14146
 #, c-format
 msgid "Failed to clean up %s"
 msgstr ""
 
-#: tools/virsh.c:13072
+#: tools/virsh.c:14151
 #, c-format
 msgid "Must use --rename or --clone to change %s to %s"
 msgstr ""
 
-#: tools/virsh.c:13100 tools/virsh.c:13101
+#: tools/virsh.c:14179 tools/virsh.c:14180
 msgid "Get or set the current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13107
+#: tools/virsh.c:14186
 msgid "list the name, rather than the full xml"
 msgstr ""
 
-#: tools/virsh.c:13111
+#: tools/virsh.c:14190
 msgid "name of existing snapshot to make current"
 msgstr ""
 
-#: tools/virsh.c:13138
+#: tools/virsh.c:14217
 #, c-format
 msgid "invalid snapshotname argument '%s'"
 msgstr ""
 
-#: tools/virsh.c:13148
+#: tools/virsh.c:14227
 msgid "--name and snapshotname are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13164
+#: tools/virsh.c:14243
 #, c-format
 msgid "Snapshot %s set as current"
 msgstr ""
 
-#: tools/virsh.c:13173
+#: tools/virsh.c:14252
 #, c-format
 msgid "domain '%s' has no current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13256
+#: tools/virsh.c:14335
 msgid "unable to determine if snapshot has parent"
 msgstr ""
 
-#: tools/virsh.c:13273
+#: tools/virsh.c:14352
 msgid "List snapshots for a domain"
 msgstr ""
 
-#: tools/virsh.c:13274
+#: tools/virsh.c:14353
 msgid "Snapshot List"
 msgstr ""
 
-#: tools/virsh.c:13280
+#: tools/virsh.c:14359
 msgid "add a column showing parent snapshot"
 msgstr ""
 
-#: tools/virsh.c:13281
+#: tools/virsh.c:14360
 msgid "list only snapshots without parents"
 msgstr ""
 
-#: tools/virsh.c:13282
+#: tools/virsh.c:14361
 msgid "list only snapshots without children"
 msgstr ""
 
-#: tools/virsh.c:13284
+#: tools/virsh.c:14363
 msgid "list only snapshots that have metadata that would prevent undefine"
 msgstr ""
 
-#: tools/virsh.c:13285
+#: tools/virsh.c:14364
 msgid "list snapshots in a tree"
 msgstr ""
 
-#: tools/virsh.c:13286
+#: tools/virsh.c:14365
 msgid "limit list to children of given snapshot"
 msgstr ""
 
-#: tools/virsh.c:13288
+#: tools/virsh.c:14367
 msgid "limit list to children of current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13289
+#: tools/virsh.c:14368
 msgid "with --from, list all descendants"
 msgstr ""
 
-#: tools/virsh.c:13338
+#: tools/virsh.c:14417
 msgid "--parent and --roots are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13343
+#: tools/virsh.c:14422
 msgid "--parent and --tree are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13350
+#: tools/virsh.c:14429
 msgid "--roots and --tree are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13355
+#: tools/virsh.c:14434
 msgid "--roots and --from are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13362
+#: tools/virsh.c:14441
 msgid "--leaves and --tree are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13410
+#: tools/virsh.c:14489
 msgid "missing support"
 msgstr ""
 
-#: tools/virsh.c:13417 tools/virsh.c:13421
+#: tools/virsh.c:14496 tools/virsh.c:14500
 msgid "Creation Time"
 msgstr ""
 
-#: tools/virsh.c:13418
+#: tools/virsh.c:14497
 msgid "Parent"
 msgstr ""
 
-#: tools/virsh.c:13507
+#: tools/virsh.c:14586
 #, c-format
 msgid "snapshot %s disappeared from list"
 msgstr ""
 
-#: tools/virsh.c:13592
+#: tools/virsh.c:14671
 msgid "time_t overflow"
 msgstr ""
 
-#: tools/virsh.c:13637
+#: tools/virsh.c:14716
 msgid "Dump XML for a domain snapshot"
 msgstr ""
 
-#: tools/virsh.c:13638
+#: tools/virsh.c:14717
 msgid "Snapshot Dump XML"
 msgstr ""
 
-#: tools/virsh.c:13699
+#: tools/virsh.c:14778
 msgid "Get the name of the parent of a snapshot"
 msgstr ""
 
-#: tools/virsh.c:13700
+#: tools/virsh.c:14779
 msgid "Extract the snapshot's parent, if any"
 msgstr ""
 
-#: tools/virsh.c:13706
+#: tools/virsh.c:14785
 msgid "find parent of snapshot name"
 msgstr ""
 
-#: tools/virsh.c:13707
+#: tools/virsh.c:14786
 msgid "find parent of current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13734
+#: tools/virsh.c:14813
 #, c-format
 msgid "snapshot '%s' has no parent"
 msgstr ""
 
-#: tools/virsh.c:13756
+#: tools/virsh.c:14835
 msgid "Revert a domain to a snapshot"
 msgstr ""
 
-#: tools/virsh.c:13757
+#: tools/virsh.c:14836
 msgid "Revert domain to snapshot"
 msgstr ""
 
-#: tools/virsh.c:13764
+#: tools/virsh.c:14843
 msgid "revert to current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13765
+#: tools/virsh.c:14844
 msgid "after reverting, change state to running"
 msgstr ""
 
-#: tools/virsh.c:13766
+#: tools/virsh.c:14845
 msgid "after reverting, change state to paused"
 msgstr ""
 
-#: tools/virsh.c:13767
+#: tools/virsh.c:14846
 msgid "try harder on risky reverts"
 msgstr ""
 
-#: tools/virsh.c:13830
+#: tools/virsh.c:14909
 msgid "Delete a domain snapshot"
 msgstr ""
 
-#: tools/virsh.c:13831
+#: tools/virsh.c:14910
 msgid "Snapshot Delete"
 msgstr ""
 
-#: tools/virsh.c:13838
+#: tools/virsh.c:14917
 msgid "delete current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13839
+#: tools/virsh.c:14918
 msgid "delete snapshot and all children"
 msgstr ""
 
-#: tools/virsh.c:13840
+#: tools/virsh.c:14919
 msgid "delete children but not snapshot"
 msgstr ""
 
-#: tools/virsh.c:13842
+#: tools/virsh.c:14921
 msgid "delete only libvirt metadata, leaving snapshot contents behind"
 msgstr ""
 
-#: tools/virsh.c:13878
+#: tools/virsh.c:14957
 #, c-format
 msgid "Domain snapshot %s children deleted\n"
 msgstr ""
 
-#: tools/virsh.c:13880
+#: tools/virsh.c:14959
 #, c-format
 msgid "Domain snapshot %s deleted\n"
 msgstr ""
 
-#: tools/virsh.c:13882
+#: tools/virsh.c:14961
 #, c-format
 msgid "Failed to delete snapshot %s"
 msgstr ""
 
-#: tools/virsh.c:13901 tools/virsh.c:13902
+#: tools/virsh.c:14980 tools/virsh.c:14981
 msgid "QEMU Monitor Command"
 msgstr ""
 
-#: tools/virsh.c:13908
+#: tools/virsh.c:14987
 msgid "command is in human monitor protocol"
 msgstr ""
 
-#: tools/virsh.c:13909
+#: tools/virsh.c:14988
 msgid "command"
 msgstr ""
 
-#: tools/virsh.c:13939
+#: tools/virsh.c:15018
 msgid "Failed to collect command"
 msgstr ""
 
-#: tools/virsh.c:13967 tools/virsh.c:13968
+#: tools/virsh.c:15046 tools/virsh.c:15047
 msgid "QEMU Attach"
 msgstr ""
 
-#: tools/virsh.c:13973
+#: tools/virsh.c:15052
 msgid "pid"
 msgstr ""
 
-#: tools/virsh.c:13989
+#: tools/virsh.c:15068
 msgid "missing pid value"
 msgstr ""
 
-#: tools/virsh.c:13997
+#: tools/virsh.c:15076
 #, c-format
 msgid "Domain %s attached to pid %u\n"
 msgstr ""
 
-#: tools/virsh.c:14002
+#: tools/virsh.c:15081
 #, c-format
 msgid "Failed to attach to pid %u"
 msgstr ""
 
-#: tools/virsh.c:14388
+#: tools/virsh.c:15474
 #, c-format
 msgid "option --%s already seen"
 msgstr ""
 
-#: tools/virsh.c:8176
+#: tools/virsh.c:15483
 #, c-format
 msgid "command '%s' doesn't support option --%s"
 msgstr "command '%s' doesn't support option --%s"
 
-#: tools/virsh.c:7519
+#: tools/virsh.c:15527
 #, c-format
 msgid "command '%s' requires <%s> option"
 msgstr "command '%s' requires <%s> option"
 
-#: tools/virsh.c:7520
+#: tools/virsh.c:15528
 #, c-format
 msgid "command '%s' requires --%s option"
 msgstr "command '%s' requires --%s option"
 
-#: tools/virsh.c:14485
+#: tools/virsh.c:15571
 #, c-format
 msgid "command group '%s' doesn't exist"
 msgstr ""
 
-#: tools/virsh.c:7547
+#: tools/virsh.c:15592
 #, c-format
 msgid "command '%s' doesn't exist"
 msgstr "command '%s' doesn't exist"
 
-#: tools/virsh.c:14518 tools/virsh.c:15374
+#: tools/virsh.c:15604 tools/virsh.c:16463
 #, c-format
 msgid "internal error: bad options in command: '%s'"
 msgstr ""
 
-#: tools/virsh.c:7554
+#: tools/virsh.c:15609
 msgid "  NAME\n"
 msgstr "  NAME\n"
 
-#: tools/virsh.c:7557
+#: tools/virsh.c:15612
 msgid ""
 "\n"
 "  SYNOPSIS\n"
 msgstr ""
 
-#: tools/virsh.c:7566
+#: tools/virsh.c:15625
 #, c-format
 msgid "[--%s <number>]"
 msgstr ""
 
-#: tools/virsh.c:7568
+#: tools/virsh.c:15631
 #, c-format
 msgid "[--%s <string>]"
 msgstr ""
 
-#: tools/virsh.c:14558
+#: tools/virsh.c:15644
 #, c-format
 msgid "{[--%s] <string>}..."
 msgstr ""
 
-#: tools/virsh.c:14559
+#: tools/virsh.c:15645
 #, c-format
 msgid "[[--%s] <string>]..."
 msgstr ""
 
-#: tools/virsh.c:14561
+#: tools/virsh.c:15647
 #, c-format
 msgid "<%s>..."
 msgstr ""
 
-#: tools/virsh.c:14562
+#: tools/virsh.c:15648
 #, c-format
 msgid "[<%s>]..."
 msgstr ""
 
-#: tools/virsh.c:7581
+#: tools/virsh.c:15662
 msgid ""
 "\n"
 "  DESCRIPTION\n"
@@ -23042,7 +24094,7 @@
 "\n"
 "  DESCRIPTION\n"
 
-#: tools/virsh.c:7587
+#: tools/virsh.c:15668
 msgid ""
 "\n"
 "  OPTIONS\n"
@@ -23050,72 +24102,72 @@
 "\n"
 "  OPTIONS\n"
 
-#: tools/virsh.c:14590
+#: tools/virsh.c:15676
 #, c-format
 msgid "[--%s] <number>"
 msgstr ""
 
-#: tools/virsh.c:7592
+#: tools/virsh.c:15677
 #, c-format
 msgid "--%s <number>"
 msgstr "--%s <number>"
 
-#: tools/virsh.c:7594
+#: tools/virsh.c:15681
 #, c-format
 msgid "--%s <string>"
 msgstr "--%s <string>"
 
-#: tools/virsh.c:14598 tools/virsh.c:14603
+#: tools/virsh.c:15684 tools/virsh.c:15689
 #, c-format
 msgid "[--%s] <string>"
 msgstr ""
 
-#: tools/virsh.c:14603
+#: tools/virsh.c:15689
 #, c-format
 msgid "<%s>"
 msgstr ""
 
-#: tools/virsh.c:7746
+#: tools/virsh.c:16052
 #, c-format
 msgid "internal error: virsh %s: no %s VSH_OT_DATA option"
 msgstr ""
 
-#: tools/virsh.c:7795
+#: tools/virsh.c:16100
 #, c-format
 msgid "failed to get domain '%s'"
 msgstr "failed to get domain '%s'"
 
-#: tools/virsh.c:7835
+#: tools/virsh.c:16138
 #, c-format
 msgid "failed to get network '%s'"
 msgstr ""
 
-#: tools/virsh.c:15091
+#: tools/virsh.c:16177
 #, c-format
 msgid "failed to get nwfilter '%s'"
 msgstr ""
 
-#: tools/virsh.c:7875
+#: tools/virsh.c:16218
 #, c-format
 msgid "failed to get interface '%s'"
 msgstr ""
 
-#: tools/virsh.c:7912
+#: tools/virsh.c:16253
 #, c-format
 msgid "failed to get pool '%s'"
 msgstr ""
 
-#: tools/virsh.c:15219
+#: tools/virsh.c:16308
 #, c-format
 msgid "failed to get vol '%s', specifying --%s might help"
 msgstr ""
 
-#: tools/virsh.c:7997
+#: tools/virsh.c:16340
 #, c-format
 msgid "failed to get secret '%s'"
 msgstr ""
 
-#: tools/virsh.c:8028
+#: tools/virsh.c:16387
 #, c-format
 msgid ""
 "\n"
@@ -23126,213 +24178,213 @@
 "(Time: %.3f ms)\n"
 "\n"
 
-#: tools/virsh.c:8168
+#: tools/virsh.c:16457
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "unknown command: '%s'"
 
-#: tools/virsh.c:8191
+#: tools/virsh.c:16496
 #, c-format
 msgid "expected syntax: --%s <%s>"
 msgstr "expected syntax: --%s <%s>"
 
-#: tools/virsh.c:8194
+#: tools/virsh.c:16499
 msgid "number"
 msgstr "number"
 
-#: tools/virsh.c:8194
+#: tools/virsh.c:16499
 msgid "string"
 msgstr "string"
 
-#: tools/virsh.c:15418
+#: tools/virsh.c:16507
 #, c-format
 msgid "invalid '=' after option --%s"
 msgstr ""
 
-#: tools/virsh.c:8200
+#: tools/virsh.c:16521
 #, c-format
 msgid "unexpected data '%s'"
 msgstr "unexpected data '%s'"
 
-#: tools/virsh.c:15454
+#: tools/virsh.c:16543
 msgid "optdata"
 msgstr ""
 
-#: tools/virsh.c:15454
+#: tools/virsh.c:16543
 msgid "bool"
 msgstr ""
 
-#: tools/virsh.c:15455
+#: tools/virsh.c:16544
 msgid "(none)"
 msgstr ""
 
-#: tools/virsh.c:15571
+#: tools/virsh.c:16660
 msgid "dangling \\"
 msgstr ""
 
-#: tools/virsh.c:8102
+#: tools/virsh.c:16673
 msgid "missing \""
 msgstr "missing \""
 
-#: tools/virsh.c:8273 tools/virsh.c:8295
+#: tools/virsh.c:16736 tools/virsh.c:16945
 msgid "idle"
 msgstr ""
 
-#: tools/virsh.c:8275
+#: tools/virsh.c:16738
 msgid "paused"
 msgstr "paused"
 
-#: tools/virsh.c:8277
+#: tools/virsh.c:16740
 msgid "in shutdown"
 msgstr "in shutdown"
 
-#: tools/virsh.c:8279
+#: tools/virsh.c:16742
 msgid "shut off"
 msgstr "shut off"
 
-#: tools/virsh.c:8281
+#: tools/virsh.c:16744 tools/virsh.c:16830
 msgid "crashed"
 msgstr "crashed"
 
-#: tools/virsh.c:691 tools/virsh.c:713 tools/virsh.c:8285 tools/virsh.c:8301
+#: tools/virsh.c:16749 tools/virsh.c:16951
 msgid "no state"
 msgstr "no state"
 
-#: tools/virsh.c:15677
+#: tools/virsh.c:16766
 msgid "booted"
 msgstr ""
 
-#: tools/virsh.c:15679 tools/virsh.c:15743
+#: tools/virsh.c:16768 tools/virsh.c:16832
 msgid "migrated"
 msgstr ""
 
-#: tools/virsh.c:15681
+#: tools/virsh.c:16770
 msgid "restored"
 msgstr ""
 
-#: tools/virsh.c:15683 tools/virsh.c:15717 tools/virsh.c:15749
+#: tools/virsh.c:16772 tools/virsh.c:16806 tools/virsh.c:16838
 msgid "from snapshot"
 msgstr ""
 
-#: tools/virsh.c:15685
+#: tools/virsh.c:16774
 msgid "unpaused"
 msgstr ""
 
-#: tools/virsh.c:15687
+#: tools/virsh.c:16776
 msgid "migration canceled"
 msgstr ""
 
-#: tools/virsh.c:15689
+#: tools/virsh.c:16778
 msgid "save canceled"
 msgstr ""
 
-#: tools/virsh.c:15705 tools/virsh.c:15728
+#: tools/virsh.c:16794 tools/virsh.c:16817
 msgid "user"
 msgstr ""
 
-#: tools/virsh.c:15707
+#: tools/virsh.c:16796
 msgid "migrating"
 msgstr ""
 
-#: tools/virsh.c:15709
+#: tools/virsh.c:16798
 msgid "saving"
 msgstr ""
 
-#: tools/virsh.c:15711
+#: tools/virsh.c:16800
 msgid "dumping"
 msgstr ""
 
-#: tools/virsh.c:15713
+#: tools/virsh.c:16802
 msgid "I/O error"
 msgstr ""
 
-#: tools/virsh.c:15715
+#: tools/virsh.c:16804
 msgid "watchdog"
 msgstr ""
 
-#: tools/virsh.c:15719
+#: tools/virsh.c:16808
 msgid "shutting down"
 msgstr ""
 
-#: tools/virsh.c:15737
+#: tools/virsh.c:16826
 msgid "shutdown"
 msgstr ""
 
-#: tools/virsh.c:15739
+#: tools/virsh.c:16828
 msgid "destroyed"
 msgstr ""
 
-#: tools/virsh.c:15747
+#: tools/virsh.c:16836
 msgid "failed"
 msgstr ""
 
-#: tools/virsh.c:15804
+#: tools/virsh.c:16893
 msgid "unimplemented block statistics parameter type"
 msgstr ""
 
-#: tools/virsh.c:15837
+#: tools/virsh.c:16926
 msgid "ok"
 msgstr ""
 
-#: tools/virsh.c:15839
+#: tools/virsh.c:16928
 msgid "background job"
 msgstr ""
 
-#: tools/virsh.c:15841
+#: tools/virsh.c:16930
 msgid "occupied"
 msgstr ""
 
-#: tools/virsh.c:8293
+#: tools/virsh.c:16943
 msgid "offline"
 msgstr "offline"
 
-#: tools/virsh.c:8312
+#: tools/virsh.c:16961
 msgid "no valid connection"
 msgstr "no valid connection"
 
-#: tools/virsh.c:8358
+#: tools/virsh.c:17032
 msgid "error: "
 msgstr "error: "
 
-#: tools/virsh.c:15976
+#: tools/virsh.c:17085
 msgid "VIRSH_DEBUG not set with a valid numeric value"
 msgstr ""
 
-#: tools/virsh.c:8443
+#: tools/virsh.c:17128
 msgid "failed to connect to the hypervisor"
 msgstr "failed to connect to the hypervisor"
 
-#: tools/virsh.c:8475
+#: tools/virsh.c:17158
 msgid "failed to get the log file information"
 msgstr ""
 
-#: tools/virsh.c:8480
+#: tools/virsh.c:17163
 msgid "the log path is not a file"
 msgstr ""
 
-#: tools/virsh.c:8488
+#: tools/virsh.c:17171
 msgid "failed to open the log file. check the log file path"
 msgstr ""
 
-#: tools/virsh.c:8557
+#: tools/virsh.c:17253
 msgid "failed to write the log file"
 msgstr ""
 
-#: tools/virsh.c:8572
+#: tools/virsh.c:17268
 #, c-format
 msgid "%s: failed to write log file: %s"
 msgstr ""
 
-#: tools/virsh.c:16303
+#: tools/virsh.c:17416
 msgid "Could not determine home directory"
 msgstr ""
 
-#: tools/virsh.c:16332
+#: tools/virsh.c:17445
 #, c-format
 msgid "Failed to create '%s': %s"
 msgstr ""
 
-#: tools/virsh.c:16413
+#: tools/virsh.c:17551
 #, c-format
 msgid ""
 "\n"
@@ -23340,89 +24392,100 @@
 "%s [options]... <command> [args...]\n"
 "\n"
 "  options:\n"
-"    -c | --connect <uri>    hypervisor connection URI\n"
+"    -c | --connect=URI      hypervisor connection URI\n"
 "    -r | --readonly         connect readonly\n"
-"    -d | --debug <num>      debug level [0-4]\n"
+"    -d | --debug=NUM        debug level [0-4]\n"
 "    -h | --help             this help\n"
 "    -q | --quiet            quiet mode\n"
 "    -t | --timing           print timing information\n"
-"    -l | --log <file>       output logging to file\n"
-"    -v | --version[=short]  program version\n"
-"    -V | --version=long     version and full options\n"
+"    -l | --log=FILE         output logging to file\n"
+"    -v                      short version\n"
+"    -V                      long version\n"
+"         --version[=TYPE]   version, TYPE is short or long (default short)\n"
+"    -e | --escape <char>    set escape sequence for console\n"
 "\n"
 "  commands (non interactive mode):\n"
 "\n"
 msgstr ""
 
-#: tools/virsh.c:16428
+#: tools/virsh.c:17568
 #, c-format
 msgid " %s (help keyword '%s')\n"
 msgstr ""
 
-#: tools/virsh.c:16438
+#: tools/virsh.c:17578
 msgid ""
 "\n"
 "  (specify help <group> for details about the commands in the group)\n"
 msgstr ""
 
-#: tools/virsh.c:8783
+#: tools/virsh.c:17580
 msgid ""
 "\n"
 "  (specify help <command> for details about the command)\n"
 "\n"
 msgstr ""
 
-#: tools/virsh.c:16451
+#: tools/virsh.c:17591
 #, c-format
 msgid "Virsh command line tool of libvirt %s\n"
 msgstr ""
 
-#: tools/virsh.c:16452
+#: tools/virsh.c:17592
 #, c-format
 msgid ""
 "See web site at %s\n"
 "\n"
 msgstr ""
 
-#: tools/virsh.c:16454
+#: tools/virsh.c:17594
 msgid "Compiled with support for:\n"
 msgstr ""
 
-#: tools/virsh.c:16455
+#: tools/virsh.c:17595
 msgid " Hypervisors:"
 msgstr ""
 
-#: tools/virsh.c:16491
+#: tools/virsh.c:17631
 msgid " Networking:"
 msgstr ""
 
-#: tools/virsh.c:16518
+#: tools/virsh.c:17658
 msgid " Storage:"
 msgstr ""
 
-#: tools/virsh.c:16542
+#: tools/virsh.c:17682
 msgid " Miscellaneous:"
 msgstr ""
 
-#: tools/virsh.c:16595
+#: tools/virsh.c:17736
 msgid "option -d takes a numeric argument"
 msgstr ""
 
-#: tools/virsh.c:8875
+#: tools/virsh.c:17774
+#, c-format
+msgid "Invalid string '%s' for escape sequence"
+msgstr ""
+
+#: tools/virsh.c:17780
 #, c-format
 msgid "unsupported option '-%c'. See --help."
 msgstr "unsupported option '-%c'. See --help."
 
-#: tools/virsh.c:8882
+#: tools/virsh.c:17787
 #, c-format
 msgid "extra argument '%s'. See --help."
 msgstr ""
 
-#: tools/virsh.c:16682
+#: tools/virsh.c:17837
+msgid "Failed to initialize mutex"
+msgstr ""
+
+#: tools/virsh.c:17842
 msgid "Failed to initialize libvirt"
 msgstr ""
 
-#: tools/virsh.c:8966
+#: tools/virsh.c:17871
 #, c-format
 msgid ""
 "Welcome to %s, the virtualization interactive terminal.\n"
@@ -23431,7 +24494,7 @@
 "Welcome to %s, the virtualization interactive terminal.\n"
 "\n"
 
-#: tools/virsh.c:8969
+#: tools/virsh.c:17874
 msgid ""
 "Type:  'help' for help with commands\n"
 "       'quit' to quit\n"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/Linux-PAM.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/Linux-PAM.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/Linux-PAM.po	2012-01-02 18:14:03.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/Linux-PAM.po	2012-02-23 07:17:17.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:44+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: libpam_misc/misc_conv.c:33
 msgid "...Time is running out...\n"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/ltsp-login.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/ltsp-login.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/ltsp-login.po	2012-01-02 18:14:14.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/ltsp-login.po	2012-02-23 07:17:25.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: 2011-12-29 15:05+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ltsp-login.sh:17
 #, sh-format
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/newt.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/newt.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/newt.po	2012-01-02 18:14:03.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/newt.po	2012-02-23 07:17:17.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:43+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../dialogboxes.c:43 ../dialogboxes.c:48 ../dialogboxes.c:493
 msgid "Ok"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/notify-osd-icons.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/notify-osd-icons.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/notify-osd-icons.po	2012-01-02 18:14:19.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/notify-osd-icons.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# Welsh translation for notify-osd-icons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the notify-osd-icons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: notify-osd-icons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-09-24 10:57+0000\n"
-"PO-Revision-Date: 2010-03-02 18:41+0000\n"
-"Last-Translator: danielt998 <daniel@fearnley.net>\n"
-"Language-Team: Welsh <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:02+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#: ../index.theme.in.h:1
-msgid "Ubuntu default theme for Notify-OSD"
-msgstr "Thema diofyn Ubuntu am Notify-OSD"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/pidgin.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/pidgin.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/pidgin.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/pidgin.po	2012-02-23 07:17:27.000000000 +0000
@@ -0,0 +1,19726 @@
+# Welsh translation for gaim
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the gaim package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gaim\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-05 16:39+0000\n"
+"PO-Revision-Date: 2012-01-06 19:00+0000\n"
+"Last-Translator: Craig Lomax <c.lomax.uk@googlemail.com>\n"
+"Language-Team: Welsh <cy@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
+"2 : 3;\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:48+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:66 ../finch/finch.c:336 ../finch/finch.c:365
+#: ../finch/finch.c:454
+msgid "Finch"
+msgstr ""
+
+#: ../finch/finch.c:247
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr ""
+
+#: ../finch/finch.c:249
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stderr\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+
+#: ../finch/finch.c:363 ../pidgin/gtkmain.c:772
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+
+#. the user did not fill in the captcha
+#: ../finch/gntaccount.c:128 ../finch/gntaccount.c:171
+#: ../finch/gntaccount.c:178 ../finch/gntaccount.c:558 ../finch/gntblist.c:647
+#: ../finch/gntblist.c:817 ../finch/gntplugin.c:198 ../finch/gntplugin.c:246
+#: ../finch/gntrequest.c:398 ../finch/gntstatus.c:303 ../finch/gntstatus.c:312
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/chat.c:812
+#: ../libpurple/protocols/jabber/chat.c:823
+#: ../libpurple/protocols/jabber/jabber.c:2352
+#: ../libpurple/protocols/jabber/jutil.c:665
+#: ../libpurple/protocols/mxit/login.c:523
+#: ../libpurple/protocols/mxit/protocol.c:2442
+#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1476
+#: ../libpurple/protocols/silc10/ops.c:1451
+#: ../pidgin/plugins/disco/xmppdisco.c:514
+#: ../pidgin/plugins/disco/xmppdisco.c:519
+msgid "Error"
+msgstr "Amryfusedd"
+
+#: ../finch/gntaccount.c:129 ../finch/gntaccount.c:171
+#: ../finch/gntaccount.c:178
+msgid "Account was not modified"
+msgstr ""
+
+#: ../finch/gntaccount.c:129
+msgid "Account was not added"
+msgstr "Dim cyfrif adiwyd"
+
+#: ../finch/gntaccount.c:130
+msgid "Username of an account must be non-empty."
+msgstr ""
+
+#: ../finch/gntaccount.c:172
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+#: ../finch/gntaccount.c:179
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
+#: ../finch/gntaccount.c:510
+msgid "New mail notifications"
+msgstr ""
+
+#: ../finch/gntaccount.c:520
+msgid "Remember password"
+msgstr "Cofiwch cyfrinair"
+
+#: ../finch/gntaccount.c:559
+msgid "There are no protocol plugins installed."
+msgstr ""
+
+#: ../finch/gntaccount.c:560
+msgid "(You probably forgot to 'make install'.)"
+msgstr ""
+
+#: ../finch/gntaccount.c:570 ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1576 ../pidgin/gtkblist.c:5128
+msgid "Modify Account"
+msgstr "Addasu cyfrif"
+
+#: ../finch/gntaccount.c:570
+msgid "New Account"
+msgstr "Cyfrif Newydd"
+
+#: ../finch/gntaccount.c:596 ../pidgin/gtkft.c:651
+msgid "Protocol:"
+msgstr "Protocol:"
+
+#: ../finch/gntaccount.c:604
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:288
+msgid "Username:"
+msgstr "Enw Defnyddiwr:"
+
+#: ../finch/gntaccount.c:617
+msgid "Password:"
+msgstr "Cyfrinair:"
+
+#: ../finch/gntaccount.c:627
+msgid "Alias:"
+msgstr "Ffugenw :"
+
+#. Register checkbox
+#: ../finch/gntaccount.c:638
+msgid "Create this account on the server"
+msgstr ""
+
+#. Cancel button
+#. Cancel
+#: ../finch/gntaccount.c:654 ../finch/gntaccount.c:718
+#: ../finch/gntaccount.c:1014 ../finch/gntblist.c:700 ../finch/gntblist.c:806
+#: ../finch/gntblist.c:854 ../finch/gntblist.c:1210 ../finch/gntblist.c:1449
+#: ../finch/gntblist.c:1583 ../finch/gntblist.c:2762 ../finch/gntblist.c:2813
+#: ../finch/gntblist.c:2887 ../finch/gntblist.c:2949 ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:473 ../finch/gntpounce.c:681
+#: ../finch/gntprefs.c:266 ../finch/gntsound.c:1081 ../finch/gntstatus.c:147
+#: ../finch/gntstatus.c:487 ../finch/gntstatus.c:612
+#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1222
+#: ../libpurple/account.c:1585 ../libpurple/account.c:1620
+#: ../libpurple/conversation.c:1311 ../libpurple/conversation.c:2139
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/gg/gg.c:614 ../libpurple/protocols/gg/gg.c:743
+#: ../libpurple/protocols/gg/gg.c:807 ../libpurple/protocols/gg/gg.c:872
+#: ../libpurple/protocols/jabber/buddy.c:681
+#: ../libpurple/protocols/jabber/buddy.c:2214
+#: ../libpurple/protocols/jabber/buddy.c:2263
+#: ../libpurple/protocols/jabber/chat.c:922
+#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:2558
+#: ../libpurple/protocols/jabber/jabber.c:3421
+#: ../libpurple/protocols/jabber/si.c:1584
+#: ../libpurple/protocols/jabber/usernick.c:83
+#: ../libpurple/protocols/jabber/xdata.c:404
+#: ../libpurple/protocols/msn/msn.c:452 ../libpurple/protocols/msn/msn.c:577
+#: ../libpurple/protocols/msn/msn.c:640 ../libpurple/protocols/msn/msn.c:655
+#: ../libpurple/protocols/msn/msn.c:672 ../libpurple/protocols/msn/msn.c:689
+#: ../libpurple/protocols/msn/msn.c:710
+#: ../libpurple/protocols/mxit/actions.c:295
+#: ../libpurple/protocols/mxit/actions.c:393
+#: ../libpurple/protocols/mxit/login.c:365
+#: ../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/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3558
+#: ../libpurple/protocols/sametime/sametime.c:5457
+#: ../libpurple/protocols/sametime/sametime.c:5547
+#: ../libpurple/protocols/sametime/sametime.c:5672
+#: ../libpurple/protocols/silc/buddy.c:459
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1199
+#: ../libpurple/protocols/silc/chat.c:622
+#: ../libpurple/protocols/silc/chat.c:756
+#: ../libpurple/protocols/silc/ops.c:1836
+#: ../libpurple/protocols/silc/silc.c:1063
+#: ../libpurple/protocols/silc/silc.c:1271
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1910
+#: ../libpurple/protocols/silc10/silc.c:761
+#: ../libpurple/protocols/silc10/silc.c:967
+#: ../libpurple/protocols/yahoo/libymsg.c:1290
+#: ../libpurple/protocols/yahoo/libymsg.c:4347
+#: ../libpurple/protocols/yahoo/libymsg.c:4358
+#: ../libpurple/protocols/yahoo/yahoo_aliases.c:589
+#: ../libpurple/protocols/yahoo/yahoo_aliases.c:600
+#: ../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/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
+#: ../pidgin/gtkrequest.c:301 ../pidgin/gtksavedstatuses.c:317
+#: ../pidgin/gtkstatusbox.c:1611 ../pidgin/gtkutils.c:1622
+#: ../pidgin/gtkutils.c:1642 ../pidgin/plugins/disco/gtkdisco.c:246
+msgid "Cancel"
+msgstr ""
+
+#. Save button
+#. Save
+#: ../finch/gntaccount.c:658 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:341
+#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:479 ../finch/gntprefs.c:266
+#: ../finch/gntsound.c:1078 ../finch/gntstatus.c:490 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:1619 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:680 ../pidgin/gtkblist.c:706
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:826
+#: ../pidgin/gtkrequest.c:307
+msgid "Save"
+msgstr ""
+
+#: ../finch/gntaccount.c:711 ../pidgin/gtkaccount.c:1936
+#: ../pidgin/gtksavedstatuses.c:305 ../pidgin/gtkstatusbox.c:1605
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr ""
+
+#: ../finch/gntaccount.c:714
+msgid "Delete Account"
+msgstr ""
+
+#. Delete button
+#: ../finch/gntaccount.c:717 ../finch/gntaccount.c:832
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:680 ../finch/gntpounce.c:743
+#: ../finch/gntstatus.c:146 ../finch/gntstatus.c:212
+#: ../pidgin/gtkaccount.c:1944 ../pidgin/gtklog.c:323
+#: ../pidgin/gtkpounce.c:1139 ../pidgin/gtkrequest.c:304
+#: ../pidgin/gtksavedstatuses.c:316 ../pidgin/gtkstatusbox.c:1610
+msgid "Delete"
+msgstr ""
+
+#: ../finch/gntaccount.c:793 ../finch/gntblist.c:2628 ../finch/gntui.c:99
+#: ../pidgin/gtkaccount.c:2341
+msgid "Accounts"
+msgstr ""
+
+#: ../finch/gntaccount.c:799
+msgid "You can enable/disable accounts from the following list."
+msgstr ""
+
+#. Add button
+#: ../finch/gntaccount.c:823 ../finch/gntaccount.c:1013
+#: ../finch/gntblist.c:699 ../finch/gntblist.c:806 ../finch/gntblist.c:854
+#: ../finch/gntblist.c:3069 ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:452
+#: ../finch/gntpounce.c:727 ../finch/gntroomlist.c:276
+#: ../finch/gntstatus.c:201 ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/sametime/sametime.c:5546
+#: ../libpurple/protocols/silc/chat.c:621
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2479
+#: ../pidgin/gtkblist.c:7333 ../pidgin/gtkconv.c:1696
+#: ../pidgin/gtkrequest.c:305
+msgid "Add"
+msgstr ""
+
+#. Modify button
+#: ../finch/gntaccount.c:828 ../finch/gntpounce.c:735
+msgid "Modify"
+msgstr ""
+
+#: ../finch/gntaccount.c:936 ../pidgin/gtkaccount.c:2426
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr ""
+
+#: ../finch/gntaccount.c:1009 ../pidgin/gtkaccount.c:2478
+msgid "Add buddy to your list?"
+msgstr ""
+
+#: ../finch/gntaccount.c:1069
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr ""
+
+#: ../finch/gntaccount.c:1094 ../finch/gntaccount.c:1097
+#: ../finch/gntaccount.c:1124 ../pidgin/gtkaccount.c:2611
+msgid "Authorize buddy?"
+msgstr ""
+
+#: ../finch/gntaccount.c:1101 ../finch/gntaccount.c:1128
+#: ../pidgin/gtkaccount.c:2612
+msgid "Authorize"
+msgstr ""
+
+#: ../finch/gntaccount.c:1102 ../finch/gntaccount.c:1129
+#: ../pidgin/gtkaccount.c:2613
+msgid "Deny"
+msgstr ""
+
+#: ../finch/gntblist.c:278
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+
+#: ../finch/gntblist.c:287
+#, c-format
+msgid "Account: %s (%s)"
+msgstr ""
+
+#: ../finch/gntblist.c:299
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+
+#: ../finch/gntblist.c:319 ../pidgin/gtkprefs.c:422 ../pidgin/gtkprefs.c:543
+#: ../pidgin/gtkprefs.c:551
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+#: ../pidgin/plugins/vvconfig.c:85
+msgid "Default"
+msgstr ""
+
+#: ../finch/gntblist.c:636
+msgid "You must provide a username for the buddy."
+msgstr ""
+
+#: ../finch/gntblist.c:638
+msgid "You must provide a group."
+msgstr ""
+
+#: ../finch/gntblist.c:640
+msgid "You must select an account."
+msgstr ""
+
+#: ../finch/gntblist.c:642
+msgid "The selected account is not online."
+msgstr ""
+
+#: ../finch/gntblist.c:647
+msgid "Error adding buddy"
+msgstr ""
+
+#: ../finch/gntblist.c:678 ../libpurple/protocols/irc/irc.c:1061
+#: ../libpurple/protocols/irc/msgs.c:370
+#: ../libpurple/protocols/jabber/jabber.c:1401
+#: ../libpurple/protocols/jabber/jabber.c:1403
+#: ../libpurple/protocols/oscar/oscar.c:3032
+#: ../libpurple/protocols/silc/buddy.c:1554
+#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1216
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1355
+#: ../libpurple/protocols/silc/silc.c:1245
+#: ../libpurple/protocols/silc10/buddy.c:1559
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:941 ../pidgin/gtkaccount.c:2018
+#: ../pidgin/gtksavedstatuses.c:951
+msgid "Username"
+msgstr ""
+
+#: ../finch/gntblist.c:681
+msgid "Alias (optional)"
+msgstr ""
+
+#: ../finch/gntblist.c:684
+msgid "Invite message (optional)"
+msgstr ""
+
+#: ../finch/gntblist.c:687
+msgid "Add in group"
+msgstr ""
+
+#: ../finch/gntblist.c:691 ../finch/gntblist.c:785 ../finch/gntblist.c:1794
+#: ../finch/gntblist.c:2743 ../finch/gntblist.c:2799 ../finch/gntblist.c:2874
+#: ../finch/gntblist.c:2934 ../finch/gntnotify.c:192 ../finch/gntstatus.c:578
+#: ../libpurple/plugins/idle.c:149 ../libpurple/plugins/idle.c:186
+#: ../pidgin/gtkblist.c:3780 ../pidgin/gtknotify.c:712
+#: ../pidgin/gtkpounce.c:1291 ../pidgin/plugins/gevolution/gevolution.c:456
+msgid "Account"
+msgstr ""
+
+#: ../finch/gntblist.c:697 ../finch/gntblist.c:1259
+#: ../libpurple/protocols/silc/buddy.c:730
+#: ../libpurple/protocols/silc/buddy.c:1035
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/libymsg.c:4155 ../pidgin/gtkblist.c:7096
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:451
+msgid "Add Buddy"
+msgstr ""
+
+#: ../finch/gntblist.c:697
+msgid "Please enter buddy information."
+msgstr ""
+
+#: ../finch/gntblist.c:753 ../libpurple/blist.c:1495
+msgid "Chats"
+msgstr ""
+
+#. Extract their Name and put it in
+#: ../finch/gntblist.c:791 ../finch/gntblist.c:2738 ../finch/gntblist.c:2794
+#: ../finch/gntblist.c:2929 ../finch/gntroomlist.c:300
+#: ../libpurple/protocols/jabber/jabber.c:1424
+#: ../libpurple/protocols/jabber/jabber.c:1428
+#: ../libpurple/protocols/msn/msn.c:529 ../libpurple/protocols/msn/msn.c:2432
+#: ../libpurple/protocols/msn/msn.c:2497 ../libpurple/protocols/msn/msn.c:2524
+#: ../pidgin/gtkplugin.c:765 ../pidgin/gtkroomlist.c:740
+#: ../pidgin/plugins/disco/gtkdisco.c:552
+#: ../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/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
+#: ../pidgin/gtkrequest.c:308
+msgid "Alias"
+msgstr ""
+
+#: ../finch/gntblist.c:797 ../finch/gntblist.c:3085
+#: ../pidgin/plugins/themeedit.c:255
+msgid "Group"
+msgstr ""
+
+#: ../finch/gntblist.c:801 ../finch/gntblist.c:1226
+msgid "Auto-join"
+msgstr ""
+
+#: ../finch/gntblist.c:804 ../finch/gntblist.c:1261 ../pidgin/gtkblist.c:7274
+msgid "Add Chat"
+msgstr ""
+
+#: ../finch/gntblist.c:805
+msgid "You can edit more information from the context menu later."
+msgstr ""
+
+#: ../finch/gntblist.c:817
+msgid "Error adding group"
+msgstr ""
+
+#: ../finch/gntblist.c:818
+msgid "You must give a name for the group to add."
+msgstr ""
+
+#: ../finch/gntblist.c:852 ../finch/gntblist.c:1263
+#: ../libpurple/protocols/sametime/sametime.c:5456
+#: ../libpurple/protocols/sametime/sametime.c:5544 ../pidgin/gtkblist.c:7330
+msgid "Add Group"
+msgstr ""
+
+#: ../finch/gntblist.c:852
+msgid "Enter the name of the group"
+msgstr ""
+
+#: ../finch/gntblist.c:1209 ../pidgin/gtkblist.c:705
+msgid "Edit Chat"
+msgstr ""
+
+#: ../finch/gntblist.c:1209
+msgid "Please Update the necessary fields."
+msgstr ""
+
+#: ../finch/gntblist.c:1210 ../finch/gntstatus.c:207
+msgid "Edit"
+msgstr ""
+
+#: ../finch/gntblist.c:1235
+msgid "Edit Settings"
+msgstr ""
+
+#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1005
+msgid "Information"
+msgstr ""
+
+#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1005
+msgid "Retrieving..."
+msgstr ""
+
+#: ../finch/gntblist.c:1336 ../finch/gntconv.c:629
+#: ../libpurple/protocols/silc/chat.c:910
+#: ../libpurple/protocols/silc10/chat.c:883
+msgid "Get Info"
+msgstr ""
+
+#: ../finch/gntblist.c:1340 ../pidgin/gtkpounce.c:536
+msgid "Add Buddy Pounce"
+msgstr ""
+
+#: ../finch/gntblist.c:1347 ../finch/gntconv.c:641
+#: ../libpurple/protocols/jabber/si.c:1584
+#: ../libpurple/protocols/oscar/userinfo.c:58 ../pidgin/gtkconv.c:1635
+msgid "Send File"
+msgstr ""
+
+#: ../finch/gntblist.c:1354 ../libpurple/protocols/gg/gg.c:2047
+#: ../libpurple/protocols/msn/msn.c:1125
+msgid "Blocked"
+msgstr ""
+
+#: ../finch/gntblist.c:1359
+msgid "Show when offline"
+msgstr ""
+
+#: ../finch/gntblist.c:1444
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr ""
+
+#: ../finch/gntblist.c:1446 ../finch/gntblist.c:1735
+msgid "Rename"
+msgstr ""
+
+#: ../finch/gntblist.c:1446
+msgid "Set Alias"
+msgstr ""
+
+#: ../finch/gntblist.c:1447
+msgid "Enter empty string to reset the name."
+msgstr ""
+
+#: ../finch/gntblist.c:1561
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+
+#: ../finch/gntblist.c:1569
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr ""
+
+#: ../finch/gntblist.c:1574
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr ""
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../finch/gntblist.c:1577
+msgid "Confirm Remove"
+msgstr ""
+
+#: ../finch/gntblist.c:1582 ../finch/gntblist.c:1737 ../finch/gntft.c:246
+#: ../pidgin/gtkconv.c:1693 ../pidgin/gtkrequest.c:306
+#: ../pidgin/gtkstatusbox.c:326
+msgid "Remove"
+msgstr ""
+
+#. Buddy List
+#: ../finch/gntblist.c:1711 ../finch/gntblist.c:3126 ../finch/gntprefs.c:259
+#: ../finch/gntui.c:100 ../pidgin/gtkblist.c:5769
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
+msgid "Buddy List"
+msgstr ""
+
+#: ../finch/gntblist.c:1742
+msgid "Place tagged"
+msgstr ""
+
+#: ../finch/gntblist.c:1747
+msgid "Toggle Tag"
+msgstr ""
+
+#: ../finch/gntblist.c:1751 ../finch/gntblist.c:2943
+msgid "View Log"
+msgstr ""
+
+#. General
+#: ../finch/gntblist.c:1787 ../libpurple/protocols/gg/gg.c:585
+#: ../libpurple/protocols/gg/gg.c:1208 ../libpurple/protocols/gg/gg.c:1280
+#: ../libpurple/protocols/gg/gg.c:2788
+#: ../libpurple/protocols/jabber/buddy.c:353
+#: ../libpurple/protocols/jabber/buddy.c:1050
+#: ../libpurple/protocols/jabber/buddy.c:2004
+#: ../libpurple/protocols/jabber/buddy.c:2197
+#: ../libpurple/protocols/jabber/jabber.c:1321
+#: ../libpurple/protocols/jabber/jabber.c:2375
+#: ../libpurple/protocols/jabber/jabber.c:2399
+#: ../libpurple/protocols/jabber/jabber.c:2415
+#: ../libpurple/protocols/jabber/jabber.c:2431
+#: ../libpurple/protocols/jabber/jabber.c:2445
+#: ../libpurple/protocols/msn/msn.c:2265 ../libpurple/protocols/msn/msn.c:2435
+#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/ops.c:1019
+#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1340
+#: ../libpurple/protocols/silc10/buddy.c:1555
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_aliases.c:546
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1065 ../pidgin/gtkblist.c:3804
+msgid "Nickname"
+msgstr ""
+
+#. Never know what those translations might end up like...
+#. Idle stuff
+#: ../finch/gntblist.c:1809 ../finch/gntprefs.c:262
+#: ../libpurple/protocols/bonjour/bonjour.c:370
+#: ../libpurple/protocols/jabber/buddy.c:748
+#: ../libpurple/protocols/jabber/jabber.c:2240
+#: ../libpurple/protocols/msn/msn.c:1071 ../libpurple/protocols/msn/msn.c:1088
+#: ../libpurple/protocols/msn/msn.c:1095 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2853
+#: ../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
+msgid "Idle"
+msgstr ""
+
+#: ../finch/gntblist.c:1823
+msgid "On Mobile"
+msgstr ""
+
+#: ../finch/gntblist.c:2130 ../pidgin/gtkdocklet.c:587
+msgid "New..."
+msgstr ""
+
+#: ../finch/gntblist.c:2137 ../pidgin/gtkdocklet.c:588
+msgid "Saved..."
+msgstr ""
+
+#: ../finch/gntblist.c:2596 ../finch/gntplugin.c:354 ../finch/gntui.c:105
+#: ../pidgin/gtkplugin.c:720
+msgid "Plugins"
+msgstr ""
+
+#: ../finch/gntblist.c:2751 ../finch/gntblist.c:2756
+msgid "Block/Unblock"
+msgstr ""
+
+#: ../finch/gntblist.c:2752
+msgid "Block"
+msgstr ""
+
+#: ../finch/gntblist.c:2753
+msgid "Unblock"
+msgstr ""
+
+#: ../finch/gntblist.c:2758
+msgid ""
+"Please enter the username or alias of the person you would like to "
+"Block/Unblock."
+msgstr ""
+
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2761 ../finch/gntblist.c:2812 ../finch/gntblist.c:2948
+#: ../finch/gntcertmgr.c:90 ../finch/gntconn.c:137 ../finch/gntnotify.c:83
+#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1221
+#: ../libpurple/account.c:1584 ../libpurple/protocols/gg/gg.c:476
+#: ../libpurple/protocols/gg/gg.c:613 ../libpurple/protocols/gg/gg.c:742
+#: ../libpurple/protocols/gg/gg.c:806
+#: ../libpurple/protocols/jabber/jabber.c:2557
+#: ../libpurple/protocols/jabber/xdata.c:403
+#: ../libpurple/protocols/msn/msn.c:451 ../libpurple/protocols/msn/msn.c:576
+#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/msn.c:671
+#: ../libpurple/protocols/msn/msn.c:688
+#: ../libpurple/protocols/mxit/login.c:365
+#: ../libpurple/protocols/myspace/user.c:823
+#: ../libpurple/protocols/myspace/user.c:884
+#: ../libpurple/protocols/oscar/oscar.c:5250
+#: ../libpurple/protocols/silc/buddy.c:458
+#: ../libpurple/protocols/silc/buddy.c:1198
+#: ../libpurple/protocols/silc/chat.c:451
+#: ../libpurple/protocols/silc/chat.c:488
+#: ../libpurple/protocols/silc/chat.c:755
+#: ../libpurple/protocols/silc/ops.c:1309
+#: ../libpurple/protocols/silc/ops.c:1835
+#: ../libpurple/protocols/silc/silc.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1191
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1909
+#: ../libpurple/protocols/silc10/silc.c:760
+#: ../libpurple/protocols/yahoo/libymsg.c:1289
+#: ../libpurple/protocols/yahoo/libymsg.c:4346
+#: ../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/gtkrequest.c:300 ../pidgin/gtkutils.c:1621
+#: ../pidgin/gtkutils.c:1641
+msgid "OK"
+msgstr ""
+
+#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:874
+msgid "New Instant Message"
+msgstr ""
+
+#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:876
+msgid ""
+"Please enter the username or alias of the person you would like to IM."
+msgstr ""
+
+#: ../finch/gntblist.c:2870
+msgid "Channel"
+msgstr ""
+
+#: ../finch/gntblist.c:2882 ../pidgin/gtkblist.c:1137
+msgid "Join a Chat"
+msgstr ""
+
+#: ../finch/gntblist.c:2884
+msgid "Please enter the name of the chat you want to join."
+msgstr ""
+
+#: ../finch/gntblist.c:2886 ../finch/gntnotify.c:461
+msgid "Join"
+msgstr ""
+
+#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1107
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+
+#. Create the "Options" frame.
+#: ../finch/gntblist.c:2999 ../finch/gntpounce.c:461 ../pidgin/gtkpounce.c:830
+msgid "Options"
+msgstr ""
+
+#: ../finch/gntblist.c:3005
+msgid "Send IM..."
+msgstr ""
+
+#: ../finch/gntblist.c:3010
+msgid "Block/Unblock..."
+msgstr ""
+
+#: ../finch/gntblist.c:3015 ../pidgin/gtkdocklet.c:714
+msgid "Join Chat..."
+msgstr ""
+
+#: ../finch/gntblist.c:3020 ../finch/gntconv.c:653
+msgid "View Log..."
+msgstr ""
+
+#: ../finch/gntblist.c:3025
+msgid "View All Logs"
+msgstr ""
+
+#: ../finch/gntblist.c:3030
+msgid "Show"
+msgstr ""
+
+#: ../finch/gntblist.c:3035
+msgid "Empty groups"
+msgstr ""
+
+#: ../finch/gntblist.c:3042
+msgid "Offline buddies"
+msgstr ""
+
+#: ../finch/gntblist.c:3049
+msgid "Sort"
+msgstr ""
+
+#: ../finch/gntblist.c:3054
+msgid "By Status"
+msgstr ""
+
+#: ../finch/gntblist.c:3059 ../pidgin/gtkblist.c:4819
+msgid "Alphabetically"
+msgstr ""
+
+#: ../finch/gntblist.c:3064
+msgid "By Log Size"
+msgstr ""
+
+#: ../finch/gntblist.c:3075 ../libpurple/conversation.c:2126
+#: ../pidgin/gtknotify.c:1597
+msgid "Buddy"
+msgstr ""
+
+#: ../finch/gntblist.c:3080 ../libpurple/protocols/oscar/userinfo.c:52
+#: ../libpurple/protocols/silc/silc.c:1008
+#: ../libpurple/protocols/silc/util.c:560
+#: ../libpurple/protocols/silc10/silc.c:704
+#: ../libpurple/protocols/silc10/util.c:553
+#: ../pidgin/plugins/disco/gtkdisco.c:480
+msgid "Chat"
+msgstr ""
+
+#: ../finch/gntblist.c:3090 ../finch/plugins/grouping.c:365
+msgid "Grouping"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:186
+msgid "Certificate Import"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:187
+msgid "Specify a hostname"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:88
+msgid "Type the host name this certificate is for."
+msgstr ""
+
+#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:208
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:210
+msgid "Certificate Import Error"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:211
+msgid "X.509 certificate import failed"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:222
+msgid "Select a PEM certificate"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:243
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:245
+msgid "Certificate Export Error"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:246
+msgid "X.509 certificate export failed"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:296
+msgid "PEM X.509 Certificate Export"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:188
+#, c-format
+msgid "Certificate for %s"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:195
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:198
+msgid "SSL Host Certificate"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:369
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:371
+msgid "Confirm certificate delete"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
+msgid "Certificate Manager"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/silc/silc.c:1247
+#: ../libpurple/protocols/silc10/silc.c:943 ../pidgin/gtkcertmgr.c:433
+msgid "Hostname"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:455 ../pidgin/gtkconv.c:1672
+#: ../pidgin/gtkdebug.c:940
+msgid "Info"
+msgstr ""
+
+#. Close button
+#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:256 ../finch/gntnotify.c:200
+#: ../finch/gntplugin.c:222 ../finch/gntplugin.c:415 ../finch/gntpounce.c:752
+#: ../finch/gntroomlist.c:277 ../finch/gntstatus.c:218
+#: ../libpurple/protocols/msn/msn.c:794
+#: ../libpurple/protocols/mxit/splashscreen.c:207
+#: ../libpurple/protocols/mxit/splashscreen.c:211
+#: ../libpurple/protocols/silc/util.c:386
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2453
+#: ../pidgin/gtkblist.c:5877 ../pidgin/gtkrequest.c:303
+msgid "Close"
+msgstr ""
+
+#: ../finch/gntconn.c:126
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../finch/gntconn.c:129
+#, c-format
+msgid "%s disconnected."
+msgstr ""
+
+#: ../finch/gntconn.c:130
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+
+#: ../finch/gntconn.c:139
+msgid "Re-enable Account"
+msgstr ""
+
+#: ../finch/gntconv.c:161
+msgid "No such command."
+msgstr ""
+
+#: ../finch/gntconv.c:165 ../pidgin/gtkconv.c:521
+msgid ""
+"Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+
+#: ../finch/gntconv.c:170 ../pidgin/gtkconv.c:527
+msgid "Your command failed for an unknown reason."
+msgstr ""
+
+#: ../finch/gntconv.c:175 ../pidgin/gtkconv.c:534
+msgid "That command only works in chats, not IMs."
+msgstr ""
+
+#: ../finch/gntconv.c:178 ../pidgin/gtkconv.c:537
+msgid "That command only works in IMs, not chats."
+msgstr ""
+
+#: ../finch/gntconv.c:182 ../pidgin/gtkconv.c:542
+msgid "That command doesn't work on this protocol."
+msgstr ""
+
+#: ../finch/gntconv.c:190
+msgid "Message was not sent, because you are not signed on."
+msgstr ""
+
+#: ../finch/gntconv.c:267
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr ""
+
+#: ../finch/gntconv.c:290
+#, c-format
+msgid "%s [%s]"
+msgstr ""
+
+#: ../finch/gntconv.c:295 ../finch/gntconv.c:990 ../pidgin/gtkconv.c:3708
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+
+#: ../finch/gntconv.c:314
+msgid "You have left this chat."
+msgstr ""
+
+#: ../finch/gntconv.c:382 ../pidgin/gtkconv.c:7600
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+
+#: ../finch/gntconv.c:462 ../pidgin/gtkconv.c:1358
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+
+#: ../finch/gntconv.c:466 ../pidgin/gtkconv.c:1366
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+
+#: ../finch/gntconv.c:553
+msgid "Send To"
+msgstr ""
+
+#: ../finch/gntconv.c:606
+msgid "Conversation"
+msgstr ""
+
+#: ../finch/gntconv.c:612
+msgid "Clear Scrollback"
+msgstr ""
+
+#: ../finch/gntconv.c:616 ../finch/gntprefs.c:192
+msgid "Show Timestamps"
+msgstr ""
+
+#: ../finch/gntconv.c:634
+msgid "Add Buddy Pounce..."
+msgstr ""
+
+#: ../finch/gntconv.c:648
+msgid "Invite..."
+msgstr ""
+
+#: ../finch/gntconv.c:657
+msgid "Enable Logging"
+msgstr ""
+
+#: ../finch/gntconv.c:663
+msgid "Enable Sounds"
+msgstr ""
+
+#: ../finch/gntconv.c:679
+msgid "You are not connected."
+msgstr ""
+
+#: ../finch/gntconv.c:943
+msgid "<AUTO-REPLY> "
+msgstr ""
+
+#: ../finch/gntconv.c:1083
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../finch/gntconv.c:1254 ../pidgin/gtkconv.c:360
+msgid "Supported debug options are: plugins version"
+msgstr ""
+
+#: ../finch/gntconv.c:1298 ../pidgin/gtkconv.c:420
+msgid "No such command (in this context)."
+msgstr ""
+
+#: ../finch/gntconv.c:1301 ../pidgin/gtkconv.c:423
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+
+#: ../finch/gntconv.c:1345
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+
+#: ../finch/gntconv.c:1352 ../finch/gntconv.c:1359
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+
+#: ../finch/gntconv.c:1415 ../pidgin/gtkconv.c:8079
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+
+#: ../finch/gntconv.c:1418 ../pidgin/gtkconv.c:8082
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+
+#: ../finch/gntconv.c:1421 ../pidgin/gtkconv.c:8085
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+
+#: ../finch/gntconv.c:1424 ../pidgin/gtkconv.c:8088
+msgid "clear: Clears the conversation scrollback."
+msgstr ""
+
+#: ../finch/gntconv.c:1427 ../pidgin/gtkconv.c:8094
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr ""
+
+#: ../finch/gntconv.c:1430
+msgid "users:  Show the list of users in the chat."
+msgstr ""
+
+#: ../finch/gntconv.c:1435
+msgid "plugins: Show the plugins window."
+msgstr ""
+
+#: ../finch/gntconv.c:1438
+msgid "buddylist: Show the buddylist."
+msgstr ""
+
+#: ../finch/gntconv.c:1441
+msgid "accounts: Show the accounts window."
+msgstr ""
+
+#: ../finch/gntconv.c:1444
+msgid "debugwin: Show the debug window."
+msgstr ""
+
+#: ../finch/gntconv.c:1447
+msgid "prefs: Show the preference window."
+msgstr ""
+
+#: ../finch/gntconv.c:1450
+msgid "statuses: Show the savedstatuses window."
+msgstr ""
+
+#: ../finch/gntconv.c:1455 ../finch/gntconv.c:1463
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    "
+"&lt;class&gt;: receive, send, highlight, action, timestamp<br>    "
+"&lt;foreground/background&gt;: black, red, green, blue, white, gray, "
+"darkgray, magenta, cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan "
+"default"
+msgstr ""
+
+#: ../finch/gntdebug.c:275 ../pidgin/gtkconv.c:998 ../pidgin/gtkdebug.c:230
+#: ../pidgin/gtkft.c:519 ../pidgin/gtkutils.c:3351
+msgid "Unable to open file."
+msgstr ""
+
+#: ../finch/gntdebug.c:315 ../finch/gntui.c:103 ../pidgin/gtkdebug.c:755
+msgid "Debug Window"
+msgstr ""
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#. 
+#: ../finch/gntdebug.c:336 ../pidgin/gtkdebug.c:835 ../pidgin/gtkdebug.c:837
+msgid "Clear"
+msgstr ""
+
+#: ../finch/gntdebug.c:347
+msgid "Filter:"
+msgstr ""
+
+#: ../finch/gntdebug.c:353 ../pidgin/gtkdebug.c:849 ../pidgin/gtkdebug.c:851
+msgid "Pause"
+msgstr ""
+
+#: ../finch/gntft.c:121 ../pidgin/gtkft.c:225
+#, c-format
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Create the window.
+#: ../finch/gntft.c:128 ../finch/gntft.c:215 ../finch/gntui.c:104
+#: ../pidgin/gtkft.c:232 ../pidgin/gtkft.c:718
+msgid "File Transfers"
+msgstr ""
+
+#: ../finch/gntft.c:220 ../pidgin/gtkft.c:601
+msgid "Progress"
+msgstr ""
+
+#: ../finch/gntft.c:220 ../pidgin/gtkft.c:608
+msgid "Filename"
+msgstr ""
+
+#: ../finch/gntft.c:220 ../pidgin/gtkft.c:615
+msgid "Size"
+msgstr ""
+
+#: ../finch/gntft.c:220
+msgid "Speed"
+msgstr ""
+
+#: ../finch/gntft.c:220 ../pidgin/gtkft.c:622
+msgid "Remaining"
+msgstr ""
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#. presence
+#: ../finch/gntft.c:220 ../finch/gntstatus.c:549 ../finch/gntstatus.c:578
+#: ../libpurple/protocols/bonjour/bonjour.c:374
+#: ../libpurple/protocols/gg/gg.c:1197 ../libpurple/protocols/gg/gg.c:1994
+#: ../libpurple/protocols/gg/gg.c:2002
+#: ../libpurple/protocols/jabber/buddy.c:770
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/jabber.c:2225
+#: ../libpurple/protocols/msn/msn.c:1081 ../libpurple/protocols/msn/msn.c:1090
+#: ../libpurple/protocols/msn/msn.c:1094 ../libpurple/protocols/msn/msn.c:1097
+#: ../libpurple/protocols/mxit/mxit.c:344
+#: ../libpurple/protocols/mxit/profile.c:200
+#: ../libpurple/protocols/novell/novell.c:2863
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:2319
+#: ../libpurple/protocols/oscar/userinfo.c:303
+#: ../libpurple/protocols/sametime/sametime.c:3347
+#: ../libpurple/protocols/sametime/sametime.c:4198
+#: ../libpurple/protocols/yahoo/libymsg.c:4030 ../pidgin/gtkblist.c:3877
+#: ../pidgin/gtkblist.c:3891 ../pidgin/gtkblist.c:3893
+#: ../pidgin/gtksavedstatuses.c:970 ../pidgin/gtksavedstatuses.c:1120
+msgid "Status"
+msgstr ""
+
+#: ../finch/gntft.c:230
+msgid "Close this window when all transfers finish"
+msgstr ""
+
+#: ../finch/gntft.c:237
+msgid "Clear finished transfers"
+msgstr ""
+
+#: ../finch/gntft.c:251 ../finch/gntroomlist.c:274
+msgid "Stop"
+msgstr ""
+
+#: ../finch/gntft.c:324 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:902
+msgid "Waiting for transfer to begin"
+msgstr ""
+
+#: ../finch/gntft.c:389 ../pidgin/gtkft.c:159 ../pidgin/gtkft.c:983
+msgid "Cancelled"
+msgstr ""
+
+#: ../finch/gntft.c:391 ../pidgin/gtkft.c:985
+msgid "Failed"
+msgstr ""
+
+#: ../finch/gntft.c:436 ../pidgin/gtkft.c:130
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+#: ../finch/gntft.c:447
+msgid "Sent"
+msgstr ""
+
+#: ../finch/gntft.c:447
+msgid "Received"
+msgstr ""
+
+#: ../finch/gntft.c:448 ../pidgin/gtkft.c:156 ../pidgin/gtkft.c:1047
+msgid "Finished"
+msgstr ""
+
+#: ../finch/gntft.c:450
+#, c-format
+msgid "The file was saved as %s."
+msgstr ""
+
+#: ../finch/gntft.c:457
+msgid "Sending"
+msgstr ""
+
+#: ../finch/gntft.c:457
+msgid "Receiving"
+msgstr ""
+
+#: ../finch/gntlog.c:193
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr ""
+
+#: ../finch/gntlog.c:196
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr ""
+
+#: ../finch/gntlog.c:239 ../pidgin/gtklog.c:504
+msgid "%B %Y"
+msgstr ""
+
+#: ../finch/gntlog.c:279 ../pidgin/gtklog.c:550
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+
+#: ../finch/gntlog.c:283 ../pidgin/gtklog.c:554
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+#: ../finch/gntlog.c:286 ../pidgin/gtklog.c:557
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+#: ../finch/gntlog.c:292 ../pidgin/gtklog.c:566
+msgid "No logs were found"
+msgstr ""
+
+#: ../finch/gntlog.c:339 ../pidgin/gtklog.c:643
+msgid "Total log size:"
+msgstr ""
+
+#. Search box *********
+#: ../finch/gntlog.c:347
+msgid "Scroll/Search: "
+msgstr ""
+
+#: ../finch/gntlog.c:405 ../pidgin/gtklog.c:713
+#, c-format
+msgid "Conversations in %s"
+msgstr ""
+
+#: ../finch/gntlog.c:413 ../finch/gntlog.c:490 ../pidgin/gtklog.c:721
+#: ../pidgin/gtklog.c:802
+#, c-format
+msgid "Conversations with %s"
+msgstr ""
+
+#: ../finch/gntlog.c:415
+msgid "All Conversations"
+msgstr ""
+
+#: ../finch/gntlog.c:515 ../pidgin/gtklog.c:827
+msgid "System Log"
+msgstr ""
+
+#: ../finch/gntmedia.c:159 ../pidgin/gtkmedia.c:339
+msgid "Calling..."
+msgstr ""
+
+#: ../finch/gntmedia.c:160
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#: ../finch/gntmedia.c:161 ../libpurple/certificate.c:1405
+msgid "Accept"
+msgstr ""
+
+#: ../finch/gntmedia.c:162 ../libpurple/certificate.c:1406
+msgid "Reject"
+msgstr ""
+
+#: ../finch/gntmedia.c:190 ../pidgin/gtkmedia.c:970 ../pidgin/gtkmedia.c:972
+msgid "Call in progress."
+msgstr ""
+
+#: ../finch/gntmedia.c:242 ../pidgin/gtkmedia.c:949
+msgid "The call has been terminated."
+msgstr ""
+
+#: ../finch/gntmedia.c:270 ../pidgin/gtkmedia.c:635
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#: ../finch/gntmedia.c:274
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#: ../finch/gntmedia.c:288 ../pidgin/gtkmedia.c:965
+msgid "You have rejected the call."
+msgstr ""
+
+#: ../finch/gntmedia.c:481
+msgid "call: Make an audio call."
+msgstr ""
+
+#: ../finch/gntnotify.c:183
+msgid "Emails"
+msgstr ""
+
+#: ../finch/gntnotify.c:189 ../finch/gntnotify.c:252
+msgid "You have mail!"
+msgstr ""
+
+#: ../finch/gntnotify.c:192 ../pidgin/gtknotify.c:719
+msgid "Sender"
+msgstr ""
+
+#: ../finch/gntnotify.c:192 ../pidgin/gtknotify.c:726
+msgid "Subject"
+msgstr ""
+
+#: ../finch/gntnotify.c:223
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../finch/gntnotify.c:252 ../pidgin/gtknotify.c:1530
+msgid "New Mail"
+msgstr ""
+
+#: ../finch/gntnotify.c:358 ../pidgin/gtknotify.c:1155
+#, c-format
+msgid "Info for %s"
+msgstr ""
+
+#: ../finch/gntnotify.c:359 ../pidgin/gtknotify.c:1156
+msgid "Buddy Information"
+msgstr ""
+
+#: ../finch/gntnotify.c:449 ../libpurple/protocols/mxit/login.c:690
+#: ../libpurple/protocols/mxit/splashscreen.c:211
+msgid "Continue"
+msgstr ""
+
+#: ../finch/gntnotify.c:458 ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtknotify.c:1572
+msgid "IM"
+msgstr ""
+
+#: ../finch/gntnotify.c:464 ../libpurple/conversation.c:2138
+#: ../libpurple/protocols/sametime/sametime.c:3557
+msgid "Invite"
+msgstr ""
+
+#: ../finch/gntnotify.c:467
+msgid "(none)"
+msgstr ""
+
+#. XXX: The following expects that finch_notify_message gets called. This
+#. * may not always happen, e.g. when another plugin sets its own
+#. * notify_message. So tread carefully.
+#: ../finch/gntnotify.c:493 ../finch/plugins/gnttinyurl.c:370
+msgid "URI"
+msgstr ""
+
+#: ../finch/gntplugin.c:86 ../finch/gntplugin.c:95
+msgid "ERROR"
+msgstr ""
+
+#: ../finch/gntplugin.c:86
+msgid "loading plugin failed"
+msgstr ""
+
+#: ../finch/gntplugin.c:95
+msgid "unloading plugin failed"
+msgstr ""
+
+#: ../finch/gntplugin.c:141
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+
+#: ../finch/gntplugin.c:199
+msgid "Plugin need to be loaded before you can configure it."
+msgstr ""
+
+#: ../finch/gntplugin.c:247
+msgid "No configuration options for this plugin."
+msgstr ""
+
+#: ../finch/gntplugin.c:268
+msgid "Error loading plugin"
+msgstr ""
+
+#: ../finch/gntplugin.c:269
+msgid "The selected file is not a valid plugin."
+msgstr ""
+
+#: ../finch/gntplugin.c:270
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+
+#: ../finch/gntplugin.c:333
+msgid "Select plugin to install"
+msgstr ""
+
+#: ../finch/gntplugin.c:359
+msgid "You can (un)load plugins from the following list."
+msgstr ""
+
+#: ../finch/gntplugin.c:410
+msgid "Install Plugin..."
+msgstr ""
+
+#: ../finch/gntplugin.c:420
+msgid "Configure Plugin"
+msgstr ""
+
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:526 ../finch/gntplugin.c:533 ../finch/gntprefs.c:265
+#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2813
+msgid "Preferences"
+msgstr ""
+
+#: ../finch/gntpounce.c:195 ../pidgin/gtkpounce.c:267
+msgid "Please enter a buddy to pounce."
+msgstr ""
+
+#: ../finch/gntpounce.c:340
+msgid "New Buddy Pounce"
+msgstr ""
+
+#: ../finch/gntpounce.c:340
+msgid "Edit Buddy Pounce"
+msgstr ""
+
+#: ../finch/gntpounce.c:345
+msgid "Pounce Who"
+msgstr ""
+
+#. Account:
+#: ../finch/gntpounce.c:348 ../finch/gntstatus.c:458
+msgid "Account:"
+msgstr ""
+
+#: ../finch/gntpounce.c:370
+msgid "Buddy name:"
+msgstr ""
+
+#. Create the "Pounce When Buddy..." frame.
+#: ../finch/gntpounce.c:388 ../pidgin/gtkpounce.c:610
+msgid "Pounce When Buddy..."
+msgstr ""
+
+#: ../finch/gntpounce.c:390
+msgid "Signs on"
+msgstr ""
+
+#: ../finch/gntpounce.c:391
+msgid "Signs off"
+msgstr ""
+
+#: ../finch/gntpounce.c:392
+msgid "Goes away"
+msgstr ""
+
+#: ../finch/gntpounce.c:393
+msgid "Returns from away"
+msgstr ""
+
+#: ../finch/gntpounce.c:394
+msgid "Becomes idle"
+msgstr ""
+
+#: ../finch/gntpounce.c:395
+msgid "Is no longer idle"
+msgstr ""
+
+#: ../finch/gntpounce.c:396
+msgid "Starts typing"
+msgstr ""
+
+#: ../finch/gntpounce.c:397
+msgid "Pauses while typing"
+msgstr ""
+
+#: ../finch/gntpounce.c:398
+msgid "Stops typing"
+msgstr ""
+
+#: ../finch/gntpounce.c:399
+msgid "Sends a message"
+msgstr ""
+
+#. Create the "Action" frame.
+#: ../finch/gntpounce.c:428 ../pidgin/gtkpounce.c:671
+msgid "Action"
+msgstr ""
+
+#: ../finch/gntpounce.c:430
+msgid "Open an IM window"
+msgstr ""
+
+#: ../finch/gntpounce.c:431
+msgid "Pop up a notification"
+msgstr ""
+
+#: ../finch/gntpounce.c:432
+msgid "Send a message"
+msgstr ""
+
+#: ../finch/gntpounce.c:433
+msgid "Execute a command"
+msgstr ""
+
+#: ../finch/gntpounce.c:434
+msgid "Play a sound"
+msgstr ""
+
+#: ../finch/gntpounce.c:462
+msgid "Pounce only when my status is not Available"
+msgstr ""
+
+#: ../finch/gntpounce.c:464 ../pidgin/gtkpounce.c:1304
+msgid "Recurring"
+msgstr ""
+
+#: ../finch/gntpounce.c:632
+msgid "Cannot create pounce"
+msgstr ""
+
+#: ../finch/gntpounce.c:633
+msgid "You do not have any accounts."
+msgstr ""
+
+#: ../finch/gntpounce.c:634
+msgid "You must create an account first before you can create a pounce."
+msgstr ""
+
+#: ../finch/gntpounce.c:676 ../pidgin/gtkpounce.c:1135
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr ""
+
+#: ../finch/gntpounce.c:710 ../finch/gntui.c:101 ../pidgin/gtkpounce.c:1347
+msgid "Buddy Pounces"
+msgstr ""
+
+#: ../finch/gntpounce.c:819
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr ""
+
+#: ../finch/gntpounce.c:820
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr ""
+
+#: ../finch/gntpounce.c:821
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr ""
+
+#: ../finch/gntpounce.c:822
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr ""
+
+#: ../finch/gntpounce.c:823
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr ""
+
+#: ../finch/gntpounce.c:824
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr ""
+
+#: ../finch/gntpounce.c:825
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr ""
+
+#: ../finch/gntpounce.c:826
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr ""
+
+#: ../finch/gntpounce.c:827
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr ""
+
+#: ../finch/gntpounce.c:828
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr ""
+
+#: ../finch/gntpounce.c:847
+msgid "Unknown pounce event. Please report this!"
+msgstr ""
+
+#: ../finch/gntprefs.c:93
+msgid "Based on keyboard use"
+msgstr ""
+
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2697
+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/plugins/win32/winprefs/winprefs.c:310
+msgid "Never"
+msgstr ""
+
+#: ../finch/gntprefs.c:185
+msgid "Show Idle Time"
+msgstr ""
+
+#: ../finch/gntprefs.c:186
+msgid "Show Offline Buddies"
+msgstr ""
+
+#: ../finch/gntprefs.c:193
+msgid "Notify buddies when you are typing"
+msgstr ""
+
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:157
+msgid "Log format"
+msgstr ""
+
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
+msgid "Log IMs"
+msgstr ""
+
+#: ../finch/gntprefs.c:201 ../finch/plugins/gnthistory.c:148
+msgid "Log chats"
+msgstr ""
+
+#: ../finch/gntprefs.c:202
+msgid "Log status change events"
+msgstr ""
+
+#: ../finch/gntprefs.c:208
+msgid "Report Idle time"
+msgstr ""
+
+#: ../finch/gntprefs.c:209
+msgid "Change status when idle"
+msgstr ""
+
+#: ../finch/gntprefs.c:210
+msgid "Minutes before changing status"
+msgstr ""
+
+#: ../finch/gntprefs.c:211
+msgid "Change status to"
+msgstr ""
+
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2784
+msgid "Conversations"
+msgstr ""
+
+#: ../finch/gntprefs.c:261 ../finch/plugins/gnthistory.c:155
+#: ../pidgin/gtkprefs.c:2208 ../pidgin/gtkprefs.c:2785
+msgid "Logging"
+msgstr ""
+
+#: ../finch/gntrequest.c:399
+msgid "You must fill all the required fields."
+msgstr ""
+
+#: ../finch/gntrequest.c:400
+msgid "The required fields are underlined."
+msgstr ""
+
+#: ../finch/gntrequest.c:661
+msgid "Not implemented yet."
+msgstr ""
+
+#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1584
+msgid "Save File..."
+msgstr ""
+
+#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1585
+msgid "Open File..."
+msgstr ""
+
+#: ../finch/gntrequest.c:783
+msgid "Choose Location..."
+msgstr ""
+
+#: ../finch/gntroomlist.c:209
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr ""
+
+#: ../finch/gntroomlist.c:275
+msgid "Get"
+msgstr ""
+
+#. Create the window.
+#: ../finch/gntroomlist.c:287 ../finch/gntui.c:106 ../pidgin/gtkblist.c:7280
+#: ../pidgin/gtkroomlist.c:531
+msgid "Room List"
+msgstr ""
+
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs in"
+msgstr ""
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Buddy logs out"
+msgstr ""
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received"
+msgstr ""
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message received begins conversation"
+msgstr ""
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Message sent"
+msgstr ""
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person enters chat"
+msgstr ""
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "Person leaves chat"
+msgstr ""
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "You talk in chat"
+msgstr ""
+
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+msgid "Others talk in chat"
+msgstr ""
+
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+msgid "Someone says your username in chat"
+msgstr ""
+
+#: ../finch/gntsound.c:108 ../pidgin/gtksound.c:76
+msgid "Attention received"
+msgstr ""
+
+#: ../finch/gntsound.c:384 ../pidgin/gtksound.c:326
+msgid "GStreamer Failure"
+msgstr ""
+
+#: ../finch/gntsound.c:385 ../pidgin/gtksound.c:327
+msgid "GStreamer failed to initialize."
+msgstr ""
+
+#: ../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
+msgid "(default)"
+msgstr ""
+
+#: ../finch/gntsound.c:752
+msgid "Select Sound File ..."
+msgstr ""
+
+#: ../finch/gntsound.c:927
+msgid "Sound Preferences"
+msgstr ""
+
+#: ../finch/gntsound.c:938
+msgid "Profiles"
+msgstr ""
+
+#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2496
+msgid "Automatic"
+msgstr ""
+
+#: ../finch/gntsound.c:980
+msgid "Console Beep"
+msgstr ""
+
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2500
+msgid "Command"
+msgstr ""
+
+#: ../finch/gntsound.c:982
+msgid "No Sound"
+msgstr ""
+
+#: ../finch/gntsound.c:984
+msgid "Sound Method"
+msgstr ""
+
+#: ../finch/gntsound.c:989
+msgid "Method: "
+msgstr ""
+
+#: ../finch/gntsound.c:996
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+
+#. Sound options
+#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2486
+msgid "Sound Options"
+msgstr ""
+
+#: ../finch/gntsound.c:1005
+msgid "Sounds when conversation has focus"
+msgstr ""
+
+#: ../finch/gntsound.c:1013 ../pidgin/gtkprefs.c:1347
+#: ../pidgin/gtkprefs.c:1359 ../pidgin/gtkprefs.c:2531
+#: ../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
+msgid "Only when available"
+msgstr ""
+
+#: ../finch/gntsound.c:1015 ../pidgin/gtkprefs.c:2530
+msgid "Only when not available"
+msgstr ""
+
+#: ../finch/gntsound.c:1022
+msgid "Volume(0-100):"
+msgstr ""
+
+#. Sound events
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:2558
+msgid "Sound Events"
+msgstr ""
+
+#: ../finch/gntsound.c:1043 ../pidgin/gtknotify.c:1609
+#: ../pidgin/gtkprefs.c:2612
+msgid "Event"
+msgstr ""
+
+#: ../finch/gntsound.c:1043
+msgid "File"
+msgstr ""
+
+#: ../finch/gntsound.c:1062
+msgid "Test"
+msgstr ""
+
+#: ../finch/gntsound.c:1065 ../pidgin/gtkpounce.c:699
+msgid "Reset"
+msgstr ""
+
+#: ../finch/gntsound.c:1068
+msgid "Choose..."
+msgstr ""
+
+#: ../finch/gntstatus.c:140
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr ""
+
+#: ../finch/gntstatus.c:143
+msgid "Delete Status"
+msgstr ""
+
+#: ../finch/gntstatus.c:178 ../pidgin/gtksavedstatuses.c:565
+msgid "Saved Statuses"
+msgstr ""
+
+#. title
+#: ../finch/gntstatus.c:185 ../finch/gntstatus.c:541
+#: ../libpurple/protocols/mxit/actions.c:271 ../pidgin/gtksavedstatuses.c:468
+msgid "Title"
+msgstr ""
+
+#: ../finch/gntstatus.c:185 ../pidgin/gtksavedstatuses.c:481
+msgid "Type"
+msgstr ""
+
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. saveable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:185 ../finch/gntstatus.c:566 ../finch/gntstatus.c:578
+#: ../libpurple/conversation.c:2131
+#: ../libpurple/protocols/bonjour/bonjour.c:287
+#: ../libpurple/protocols/bonjour/bonjour.c:294
+#: ../libpurple/protocols/bonjour/bonjour.c:376
+#: ../libpurple/protocols/gg/gg.c:1235 ../libpurple/protocols/gg/gg.c:1997
+#: ../libpurple/protocols/gg/gg.c:2013 ../libpurple/protocols/gg/gg.c:2023
+#: ../libpurple/protocols/gg/gg.c:2029 ../libpurple/protocols/gg/gg.c:2039
+#: ../libpurple/protocols/gg/gg.c:2048 ../libpurple/protocols/gg/gg.c:2053
+#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/jabber/jabber.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:2396
+#: ../libpurple/protocols/jabber/jabber.c:2412
+#: ../libpurple/protocols/jabber/jabber.c:2428
+#: ../libpurple/protocols/jabber/jabber.c:2442
+#: ../libpurple/protocols/jabber/jabber.c:2457
+#: ../libpurple/protocols/msn/msn.c:1150 ../libpurple/protocols/msn/msn.c:1156
+#: ../libpurple/protocols/msn/msn.c:1162 ../libpurple/protocols/msn/msn.c:1168
+#: ../libpurple/protocols/msn/msn.c:1173 ../libpurple/protocols/msn/msn.c:1178
+#: ../libpurple/protocols/mxit/roster.c:78
+#: ../libpurple/protocols/myspace/myspace.c:479
+#: ../libpurple/protocols/novell/novell.c:2866
+#: ../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: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
+#: ../libpurple/protocols/sametime/sametime.c:3461
+#: ../libpurple/protocols/silc/buddy.c:1566
+#: ../libpurple/protocols/silc10/buddy.c:1571
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/libymsg.c:4870
+#: ../libpurple/protocols/yahoo/libymsg.c:4876
+#: ../libpurple/protocols/yahoo/libymsg.c:4885
+#: ../libpurple/protocols/zephyr/zephyr.c:2342 ../pidgin/gtknotify.c:1617
+#: ../pidgin/gtksavedstatuses.c:496 ../pidgin/gtksavedstatuses.c:985
+msgid "Message"
+msgstr ""
+
+#. Use
+#: ../finch/gntstatus.c:196 ../finch/gntstatus.c:595
+msgid "Use"
+msgstr ""
+
+#: ../finch/gntstatus.c:303
+msgid "Invalid title"
+msgstr ""
+
+#: ../finch/gntstatus.c:304
+msgid "Please enter a non-empty title for the status."
+msgstr ""
+
+#: ../finch/gntstatus.c:312
+msgid "Duplicate title"
+msgstr ""
+
+#: ../finch/gntstatus.c:313
+msgid "Please enter a different title for the status."
+msgstr ""
+
+#: ../finch/gntstatus.c:454
+msgid "Substatus"
+msgstr ""
+
+#: ../finch/gntstatus.c:466 ../pidgin/gtkft.c:654
+msgid "Status:"
+msgstr ""
+
+#: ../finch/gntstatus.c:481
+msgid "Message:"
+msgstr ""
+
+#: ../finch/gntstatus.c:530
+msgid "Edit Status"
+msgstr ""
+
+#: ../finch/gntstatus.c:572
+msgid "Use different status for following accounts"
+msgstr ""
+
+#. Save & Use
+#: ../finch/gntstatus.c:606
+msgid "Save & Use"
+msgstr ""
+
+#: ../finch/gntui.c:102
+msgid "Certificates"
+msgstr ""
+
+#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2789
+msgid "Sounds"
+msgstr ""
+
+#: ../finch/gntui.c:109
+msgid "Statuses"
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid ""
+"This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:158
+msgid "GntClipboard"
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:160
+msgid "Clipboard plugin"
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:161
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:232
+#, c-format
+msgid "%s just signed on"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:239
+#, c-format
+msgid "%s just signed off"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:247
+#, c-format
+msgid "%s sent you a message"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:266
+#, c-format
+msgid "%s said your nick in %s"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:268
+#, c-format
+msgid "%s sent a message in %s"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:306
+msgid "Buddy signs on/off"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:307
+msgid "You receive an IM"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:308
+msgid "Someone speaks in a chat"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:309
+msgid "Someone says your name in a chat"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:337
+msgid "Notify with a toaster when"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:352
+msgid "Beep too!"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:358
+msgid "Set URGENT for the terminal window."
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:378
+msgid "GntGf"
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:380 ../finch/plugins/gntgf.c:381
+msgid "Toaster plugin"
+msgstr ""
+
+#: ../finch/plugins/gnthistory.c:118 ../pidgin/plugins/history.c:136
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr ""
+
+#: ../finch/plugins/gnthistory.c:176 ../pidgin/plugins/history.c:163
+msgid "History Plugin Requires Logging"
+msgstr ""
+
+#: ../finch/plugins/gnthistory.c:177 ../pidgin/plugins/history.c:164
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+
+#: ../finch/plugins/gnthistory.c:221
+msgid "GntHistory"
+msgstr ""
+
+#: ../finch/plugins/gnthistory.c:223 ../pidgin/plugins/history.c:207
+msgid "Shows recently logged conversations in new conversations."
+msgstr ""
+
+#: ../finch/plugins/gnthistory.c:224 ../pidgin/plugins/history.c:208
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+
+#: ../finch/plugins/gnttinyurl.c:324
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+#: ../finch/plugins/gnttinyurl.c:351
+#, c-format
+msgid "TinyURL for above: %s"
+msgstr ""
+
+#: ../finch/plugins/gnttinyurl.c:371
+msgid "Please wait while TinyURL fetches a shorter URL ..."
+msgstr ""
+
+#: ../finch/plugins/gnttinyurl.c:438
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr ""
+
+#: ../finch/plugins/gnttinyurl.c:442
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#: ../finch/plugins/gnttinyurl.c:471
+msgid "TinyURL"
+msgstr ""
+
+#: ../finch/plugins/gnttinyurl.c:473
+msgid "TinyURL plugin"
+msgstr ""
+
+#: ../finch/plugins/gnttinyurl.c:474
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:44 ../libpurple/protocols/oscar/oscar.c:181
+msgid "Online"
+msgstr ""
+
+#. primitive,						no,							id,			name
+#: ../finch/plugins/grouping.c:46 ../finch/plugins/grouping.c:143
+#: ../libpurple/protocols/gg/gg.c:1162
+#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../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/userinfo.c:279
+#: ../libpurple/protocols/yahoo/libymsg.c:3876 ../libpurple/status.c:162
+#: ../pidgin/gtkblist.c:3877 ../pidgin/gtkblist.c:4264
+#: ../pidgin/gtkdocklet.c:566 ../pidgin/gtkstatusbox.c:1100
+#: ../pidgin/plugins/themeedit-icon.c:67
+msgid "Offline"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:115 ../pidgin/gtkblist.c:3913
+msgid "Online Buddies"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:115
+msgid "Offline Buddies"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:125
+msgid "Online/Offline"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:162
+msgid "Meebo"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:211
+msgid "No Grouping"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:292
+msgid "Nested Subgroup"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:324
+msgid "Nested Grouping (experimental)"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:367 ../finch/plugins/grouping.c:368
+msgid "Provides alternate buddylist grouping options."
+msgstr ""
+
+#: ../finch/plugins/lastlog.c:69
+msgid "Lastlog"
+msgstr ""
+
+#. Translator Note: The "backlog" is the conversation buffer/history.
+#: ../finch/plugins/lastlog.c:100
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr ""
+
+#: ../finch/plugins/lastlog.c:122
+msgid "GntLastlog"
+msgstr ""
+
+#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
+msgid "Lastlog plugin."
+msgstr ""
+
+#: ../libpurple/account.c:972
+msgid "accounts"
+msgstr ""
+
+#: ../libpurple/account.c:1167 ../libpurple/protocols/jabber/auth.c:106
+#: ../libpurple/protocols/jabber/auth_cyrus.c:150
+#: ../libpurple/protocols/silc/silc.c:475
+msgid "Password is required to sign on."
+msgstr ""
+
+#: ../libpurple/account.c:1201
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr ""
+
+#: ../libpurple/account.c:1208
+msgid "Enter Password"
+msgstr ""
+
+#: ../libpurple/account.c:1213
+msgid "Save password"
+msgstr ""
+
+#: ../libpurple/account.c:1250 ../libpurple/connection.c:119
+#: ../libpurple/connection.c:197
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr ""
+
+#: ../libpurple/account.c:1251 ../libpurple/connection.c:122
+msgid "Connection Error"
+msgstr ""
+
+#: ../libpurple/account.c:1505 ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/jabber/jabber.c:2510
+msgid "New passwords do not match."
+msgstr ""
+
+#: ../libpurple/account.c:1518
+msgid "Fill out all fields completely."
+msgstr ""
+
+#: ../libpurple/account.c:1550
+msgid "Original password"
+msgstr ""
+
+#: ../libpurple/account.c:1558
+msgid "New password"
+msgstr ""
+
+#: ../libpurple/account.c:1566
+msgid "New password (again)"
+msgstr ""
+
+#: ../libpurple/account.c:1573
+#, c-format
+msgid "Change password for %s"
+msgstr ""
+
+#: ../libpurple/account.c:1581
+msgid "Please enter your current password and your new password."
+msgstr ""
+
+#: ../libpurple/account.c:1612
+#, c-format
+msgid "Change user information for %s"
+msgstr ""
+
+#: ../libpurple/account.c:1615
+#: ../libpurple/protocols/yahoo/yahoo_aliases.c:587
+#: ../libpurple/protocols/yahoo/yahoo_aliases.c:598
+msgid "Set User Info"
+msgstr ""
+
+#: ../libpurple/account.c:1869
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+#: ../libpurple/account.c:1909
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
+#: ../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/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
+msgid "Unknown"
+msgstr ""
+
+#. Changing this string?  Look in add_purple_buddy_to_groups
+#: ../libpurple/blist.c:585 ../libpurple/blist.c:1599
+#: ../libpurple/blist.c:1847 ../libpurple/blist.c:1849
+#: ../libpurple/protocols/jabber/roster.c:117
+#: ../libpurple/protocols/jabber/roster.c:256
+#: ../libpurple/protocols/myspace/myspace.c:3484 ../pidgin/gtkblist.c:6958
+#: ../pidgin/plugins/gevolution/gevo-util.c:73
+#: ../pidgin/plugins/gevolution/gevolution.c:106
+msgid "Buddies"
+msgstr ""
+
+#: ../libpurple/blist.c:612
+msgid "buddy list"
+msgstr ""
+
+#: ../libpurple/certificate.c:94
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+
+#: ../libpurple/certificate.c:98
+msgid ""
+"The certificate is not trusted because no certificate that can verify it is "
+"currently trusted."
+msgstr ""
+
+#: ../libpurple/certificate.c:102
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+
+#: ../libpurple/certificate.c:106
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+#: ../libpurple/certificate.c:112
+msgid "The certificate presented is not issued to this domain."
+msgstr ""
+
+#: ../libpurple/certificate.c:115
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+
+#: ../libpurple/certificate.c:119
+msgid "The certificate chain presented is invalid."
+msgstr ""
+
+#: ../libpurple/certificate.c:122
+msgid "The certificate has been revoked."
+msgstr ""
+
+#: ../libpurple/certificate.c:126
+msgid "An unknown certificate error occurred."
+msgstr ""
+
+#: ../libpurple/certificate.c:697
+msgid "(DOES NOT MATCH)"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:701
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr ""
+
+#: ../libpurple/certificate.c:702
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:707
+msgid "Single-use Certificate Verification"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1087
+msgid "Certificate Authorities"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1259
+msgid "SSL Peers Cache"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:1390
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1396
+msgid "SSL Certificate Verification"
+msgstr ""
+
+#: ../libpurple/certificate.c:1407
+msgid "_View Certificate..."
+msgstr ""
+
+#: ../libpurple/certificate.c:1436 ../libpurple/certificate.c:1455
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr ""
+
+#. TODO: Probably wrong.
+#: ../libpurple/certificate.c:1442
+msgid "SSL Certificate Error"
+msgstr ""
+
+#: ../libpurple/certificate.c:1443
+msgid "Unable to validate certificate"
+msgstr ""
+
+#: ../libpurple/certificate.c:1467
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:2188
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:2200
+msgid "Certificate Information"
+msgstr ""
+
+#. show error to user
+#: ../libpurple/connection.c:121 ../libpurple/protocols/mxit/login.c:289
+msgid "Registration Error"
+msgstr ""
+
+#: ../libpurple/connection.c:199
+msgid "Unregistration Error"
+msgstr ""
+
+#: ../libpurple/connection.c:359
+#, c-format
+msgid "+++ %s signed on"
+msgstr ""
+
+#: ../libpurple/connection.c:390
+#, c-format
+msgid "+++ %s signed off"
+msgstr ""
+
+#. Undocumented
+#. Unknown error
+#: ../libpurple/connection.c:567 ../libpurple/plugin.c:276
+#: ../libpurple/protocols/jabber/buddy.c:2138
+#: ../libpurple/protocols/msn/servconn.c:149
+#: ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msn/session.c:417
+#: ../libpurple/protocols/oscar/family_chatnav.c:66
+#: ../libpurple/protocols/oscar/family_icbm.c:64
+#: ../libpurple/protocols/oscar/family_icbm.c:65
+#: ../libpurple/protocols/yahoo/libymsg.c:1877
+#: ../libpurple/protocols/yahoo/libymsg.c:1886
+#: ../libpurple/protocols/yahoo/libymsg.c:2233
+msgid "Unknown error"
+msgstr ""
+
+#: ../libpurple/conversation.c:214
+msgid "Unable to send message: The message is too large."
+msgstr ""
+
+#: ../libpurple/conversation.c:217 ../libpurple/conversation.c:230
+#, c-format
+msgid "Unable to send message to %s."
+msgstr ""
+
+#: ../libpurple/conversation.c:218
+msgid "The message is too large."
+msgstr ""
+
+#: ../libpurple/conversation.c:227 ../libpurple/protocols/bonjour/jabber.c:305
+#: ../libpurple/protocols/bonjour/jabber.c:351
+msgid "Unable to send message."
+msgstr ""
+
+#: ../libpurple/conversation.c:1307
+msgid "Send Message"
+msgstr ""
+
+#: ../libpurple/conversation.c:1310
+msgid "_Send Message"
+msgstr ""
+
+#: ../libpurple/conversation.c:1712
+#, c-format
+msgid "%s entered the room."
+msgstr ""
+
+#: ../libpurple/conversation.c:1715
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr ""
+
+#: ../libpurple/conversation.c:1826
+#, c-format
+msgid "You are now known as %s"
+msgstr ""
+
+#: ../libpurple/conversation.c:1846
+#, c-format
+msgid "%s is now known as %s"
+msgstr ""
+
+#: ../libpurple/conversation.c:1921
+#, c-format
+msgid "%s left the room."
+msgstr ""
+
+#: ../libpurple/conversation.c:1924
+#, c-format
+msgid "%s left the room (%s)."
+msgstr ""
+
+#: ../libpurple/conversation.c:2123 ../libpurple/conversation.c:2134
+msgid "Invite to chat"
+msgstr ""
+
+#. Put our happy label in it.
+#: ../libpurple/conversation.c:2135 ../pidgin/gtkconv.c:901
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
+#: ../libpurple/dbus-server.c:610
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr ""
+
+#: ../libpurple/dbus-server.c:622
+#, c-format
+msgid "Failed to get name: %s"
+msgstr ""
+
+#: ../libpurple/dbus-server.c:634
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr ""
+
+#: ../libpurple/dbus-server.h:86
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr ""
+
+#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:880
+msgid "No name"
+msgstr ""
+
+#: ../libpurple/dnsquery.c:616
+msgid "Unable to create new resolver process\n"
+msgstr ""
+
+#: ../libpurple/dnsquery.c:621
+msgid "Unable to send request to resolver process\n"
+msgstr ""
+
+#: ../libpurple/dnsquery.c:654 ../libpurple/dnsquery.c:785
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+
+#: ../libpurple/dnsquery.c:657 ../libpurple/dnsquery.c:799
+#: ../libpurple/dnsquery.c:851 ../libpurple/dnsquery.c:862
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr ""
+
+#: ../libpurple/dnsquery.c:681
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+
+#: ../libpurple/dnsquery.c:685
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr ""
+
+#: ../libpurple/dnsquery.c:749
+#, c-format
+msgid "Error converting %s to punycode: %d"
+msgstr ""
+
+#: ../libpurple/dnsquery.c:824
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr ""
+
+#: ../libpurple/dnsquery.c:825 ../libpurple/protocols/oscar/oscar.c:1124
+#: ../libpurple/protocols/oscar/util.c:69
+msgid "Unknown reason"
+msgstr ""
+
+#: ../libpurple/dnsquery.c:899
+msgid "Aborting DNS lookup in Tor Proxy mode."
+msgstr ""
+
+#: ../libpurple/ft.c:346
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+
+#: ../libpurple/ft.c:350
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+
+#: ../libpurple/ft.c:354
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+
+#: ../libpurple/ft.c:392
+msgid "Directory is not writable."
+msgstr ""
+
+#: ../libpurple/ft.c:406
+msgid "Cannot send a file of 0 bytes."
+msgstr ""
+
+#: ../libpurple/ft.c:415
+msgid "Cannot send a directory."
+msgstr ""
+
+#: ../libpurple/ft.c:423
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr ""
+
+#: ../libpurple/ft.c:442
+msgid "File is not readable."
+msgstr ""
+
+#: ../libpurple/ft.c:506
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr ""
+
+#: ../libpurple/ft.c:513
+#, c-format
+msgid "%s wants to send you a file"
+msgstr ""
+
+#: ../libpurple/ft.c:562
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr ""
+
+#: ../libpurple/ft.c:566
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+#: ../libpurple/ft.c:602
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr ""
+
+#: ../libpurple/ft.c:661
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr ""
+
+#: ../libpurple/ft.c:688
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr ""
+
+#: ../libpurple/ft.c:699
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr ""
+
+#: ../libpurple/ft.c:887
+#, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr ""
+
+#: ../libpurple/ft.c:892
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr ""
+
+#: ../libpurple/ft.c:897
+msgid "File transfer complete"
+msgstr ""
+
+#: ../libpurple/ft.c:1511
+#, c-format
+msgid "You cancelled the transfer of %s"
+msgstr ""
+
+#: ../libpurple/ft.c:1516
+msgid "File transfer cancelled"
+msgstr ""
+
+#: ../libpurple/ft.c:1574
+#, c-format
+msgid "%s cancelled the transfer of %s"
+msgstr ""
+
+#: ../libpurple/ft.c:1579
+#, c-format
+msgid "%s cancelled the file transfer"
+msgstr ""
+
+#: ../libpurple/ft.c:1636
+#, c-format
+msgid "File transfer to %s failed."
+msgstr ""
+
+#: ../libpurple/ft.c:1638
+#, c-format
+msgid "File transfer from %s failed."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:1
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:2
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:3
+msgid "The handler for \"aim\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:4
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:5
+msgid "Run the command in a terminal"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:6
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:7
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:8
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:9
+msgid "The handler for \"gg\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:10
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:11
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:12
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:13
+msgid "The handler for \"icq\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:14
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:15
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:16
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:17
+msgid "The handler for \"irc\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:18
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:19
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:20
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:21
+msgid "The handler for \"msnim\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:22
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:23
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:24
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:25
+msgid "The handler for \"sip\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:26
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:27
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:28
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:29
+msgid "The handler for \"xmpp\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:30
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:31
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:32
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:33
+msgid "The handler for \"ymsgr\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:34
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr ""
+
+#: ../libpurple/log.c:198
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr ""
+
+#: ../libpurple/log.c:655
+msgid "HTML"
+msgstr ""
+
+#: ../libpurple/log.c:669
+msgid "Plain text"
+msgstr ""
+
+#: ../libpurple/log.c:683
+msgid "Old flat format"
+msgstr ""
+
+#: ../libpurple/log.c:914
+msgid "Logging of this conversation failed."
+msgstr ""
+
+#: ../libpurple/log.c:1357
+msgid "XML"
+msgstr ""
+
+#: ../libpurple/log.c:1444
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: ../libpurple/log.c:1446
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: ../libpurple/log.c:1505 ../libpurple/log.c:1638
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr ""
+
+#: ../libpurple/log.c:1517 ../libpurple/log.c:1647
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr ""
+
+#: ../libpurple/log.c:1579
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr ""
+
+#: ../libpurple/media/backend-fs2.c:855
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+
+#: ../libpurple/media/backend-fs2.c:863
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+
+#: ../libpurple/media/backend-fs2.c:887
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr ""
+
+#: ../libpurple/media/backend-fs2.c:1115
+msgid "Error with your microphone"
+msgstr ""
+
+#: ../libpurple/media/backend-fs2.c:1118
+msgid "Error with your webcam"
+msgstr ""
+
+#: ../libpurple/media/backend-fs2.c:1125
+msgid "Conference error"
+msgstr ""
+
+#: ../libpurple/media/backend-fs2.c:1512
+#, c-format
+msgid "Error creating session: %s"
+msgstr ""
+
+#: ../libpurple/plugin.c:355
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr ""
+
+#: ../libpurple/plugin.c:370
+msgid "This plugin has not defined an ID."
+msgstr ""
+
+#: ../libpurple/plugin.c:438
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr ""
+
+#: ../libpurple/plugin.c:455
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr ""
+
+#: ../libpurple/plugin.c:472
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+
+#: ../libpurple/plugin.c:537
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+
+#: ../libpurple/plugin.c:542
+msgid "Unable to load the plugin"
+msgstr ""
+
+#: ../libpurple/plugin.c:564
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr ""
+
+#: ../libpurple/plugin.c:568
+msgid "Unable to load your plugin."
+msgstr ""
+
+#: ../libpurple/plugin.c:658
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:23
+msgid "Autoaccept"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+msgid "Auto-accept file transfer requests from selected users."
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:78
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:80
+msgid "Autoaccept complete"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:200
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:202
+msgid "Set Autoaccept Setting"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:204
+msgid "_Save"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:205 ../libpurple/plugins/idle.c:166
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:226
+#: ../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/request.h:1508 ../libpurple/request.h:1521
+msgid "_Cancel"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:208 ../libpurple/plugins/autoaccept.c:274
+msgid "Ask"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:209 ../libpurple/plugins/autoaccept.c:275
+msgid "Auto Accept"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:210 ../libpurple/plugins/autoaccept.c:276
+msgid "Auto Reject"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:225
+msgid "Autoaccept File Transfers..."
+msgstr ""
+
+#. XXX: Is there a better way than this? There really should be.
+#: ../libpurple/plugins/autoaccept.c:266
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:271
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:280
+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
+msgid "Create a new directory for each user"
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:289
+msgid "Escape the filenames"
+msgstr ""
+
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2508
+#: ../libpurple/protocols/msn/msn.c:2538
+msgid "Notes"
+msgstr ""
+
+#: ../libpurple/plugins/buddynote.c:47
+msgid "Enter your notes below..."
+msgstr ""
+
+#: ../libpurple/plugins/buddynote.c:65
+msgid "Edit Notes..."
+msgstr ""
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:76
+msgid "Buddy Notes"
+msgstr ""
+
+#. *< name
+#. *< version
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:78
+msgid "Store notes on particular buddies."
+msgstr ""
+
+#. *< summary
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:79
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with libpurple."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/dbus-example.c:158
+#: ../libpurple/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/filectl.c:248
+msgid "File Control"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+msgid "Allows control by entering commands in a file."
+msgstr ""
+
+#: ../libpurple/plugins/idle.c:154 ../libpurple/plugins/idle.c:214
+msgid "Minutes"
+msgstr ""
+
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../libpurple/plugins/idle.c:161 ../libpurple/plugins/idle.c:195
+#: ../libpurple/plugins/idle.c:221 ../libpurple/plugins/idle.c:314
+msgid "I'dle Mak'er"
+msgstr ""
+
+#: ../libpurple/plugins/idle.c:162 ../libpurple/plugins/idle.c:254
+msgid "Set Account Idle Time"
+msgstr ""
+
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:225
+msgid "_Set"
+msgstr ""
+
+#: ../libpurple/plugins/idle.c:180
+msgid "None of your accounts are idle."
+msgstr ""
+
+#: ../libpurple/plugins/idle.c:196 ../libpurple/plugins/idle.c:258
+msgid "Unset Account Idle Time"
+msgstr ""
+
+#: ../libpurple/plugins/idle.c:199
+msgid "_Unset"
+msgstr ""
+
+#: ../libpurple/plugins/idle.c:222 ../libpurple/plugins/idle.c:262
+msgid "Set Idle Time for All Accounts"
+msgstr ""
+
+#: ../libpurple/plugins/idle.c:267
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr ""
+
+#: ../libpurple/plugins/idle.c:316 ../libpurple/plugins/idle.c:317
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr ""
+
+#. *  description
+#: ../libpurple/plugins/ipc-test-client.c:92
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr ""
+
+#. *  description
+#: ../libpurple/plugins/ipc-test-server.c:79
+msgid ""
+"Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+
+#: ../libpurple/plugins/joinpart.c:232
+msgid "Hide Joins/Parts"
+msgstr ""
+
+#. Translators: Followed by an input request a number of people
+#: ../libpurple/plugins/joinpart.c:237
+msgid "For rooms with more than this many people"
+msgstr ""
+
+#: ../libpurple/plugins/joinpart.c:242
+msgid "If user has not spoken in this many minutes"
+msgstr ""
+
+#: ../libpurple/plugins/joinpart.c:247
+msgid "Apply hiding rules to buddies"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/joinpart.c:277
+msgid "Join/Part Hiding"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/joinpart.c:280
+msgid "Hides extraneous join/part messages."
+msgstr ""
+
+#. *  description
+#: ../libpurple/plugins/joinpart.c:282
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+
+#. This is used in the place of a timezone abbreviation if the
+#. * offset is way off.  The user should never really see it, but
+#. * it's here just in case.  The parens are to make it clear it's
+#. * not a real timezone.
+#: ../libpurple/plugins/log_reader.c:499
+msgid "(UTC)"
+msgstr ""
+
+#: ../libpurple/plugins/log_reader.c:1562
+msgid "User is offline."
+msgstr ""
+
+#: ../libpurple/plugins/log_reader.c:1568
+msgid "Auto-response sent:"
+msgstr ""
+
+#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1586
+#: ../libpurple/plugins/statenotify.c:93
+#, c-format
+msgid "%s has signed off."
+msgstr ""
+
+#: ../libpurple/plugins/log_reader.c:1607
+msgid "One or more messages may have been undeliverable."
+msgstr ""
+
+#: ../libpurple/plugins/log_reader.c:1617
+msgid "You were disconnected from the server."
+msgstr ""
+
+#: ../libpurple/plugins/log_reader.c:1625
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+
+#: ../libpurple/plugins/log_reader.c:1640
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr ""
+
+#: ../libpurple/plugins/log_reader.c:1645
+msgid "Message could not be sent."
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2727
+#: ../libpurple/plugins/log_reader.c:2883
+msgid "Adium"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2740
+#: ../libpurple/plugins/log_reader.c:2888
+msgid "Fire"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2752
+#: ../libpurple/plugins/log_reader.c:2892
+msgid "Messenger Plus!"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2766
+#: ../libpurple/plugins/log_reader.c:2897
+msgid "QIP"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2778
+#: ../libpurple/plugins/log_reader.c:2901
+msgid "MSN Messenger"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2790
+#: ../libpurple/plugins/log_reader.c:2905
+msgid "Trillian"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2802
+#: ../libpurple/plugins/log_reader.c:2909
+msgid "aMSN"
+msgstr ""
+
+#. Add general preferences.
+#: ../libpurple/plugins/log_reader.c:2865
+msgid "General Log Reading Configuration"
+msgstr ""
+
+#: ../libpurple/plugins/log_reader.c:2869
+msgid "Fast size calculations"
+msgstr ""
+
+#: ../libpurple/plugins/log_reader.c:2873
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+#: ../libpurple/plugins/log_reader.c:2879
+msgid "Log Directory"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/log_reader.c:2938
+msgid "Log Reader"
+msgstr ""
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libpurple/plugins/log_reader.c:2942
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr ""
+
+#. * description
+#: ../libpurple/plugins/log_reader.c:2946
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+
+#: ../libpurple/plugins/mono/loader/mono.c:224
+msgid "Mono Plugin Loader"
+msgstr ""
+
+#: ../libpurple/plugins/mono/loader/mono.c:226
+#: ../libpurple/plugins/mono/loader/mono.c:227
+msgid "Loads .NET plugins with Mono."
+msgstr ""
+
+#: ../libpurple/plugins/newline.c:57
+msgid "Add new line in IMs"
+msgstr ""
+
+#: ../libpurple/plugins/newline.c:61
+msgid "Add new line in Chats"
+msgstr ""
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/newline.c:104
+msgid "New Line"
+msgstr ""
+
+#. *< name
+#. *< version
+#: ../libpurple/plugins/newline.c:106
+msgid "Prepends a newline to displayed message."
+msgstr ""
+
+#. *< summary
+#: ../libpurple/plugins/newline.c:107
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the username in the conversation window."
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:23
+msgid "Offline Message Emulation"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+msgid "Save messages sent to an offline user as pounce."
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:95
+msgid ""
+"The rest of the messages will be saved as pounces. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:156
+#, c-format
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:160
+msgid "Offline Message"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:161
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:165
+#: ../libpurple/protocols/msn/error.c:378
+#: ../libpurple/protocols/msn/msn.c:1123 ../libpurple/protocols/msn/msn.c:1126
+#: ../libpurple/protocols/mxit/mxit.c:364
+#: ../libpurple/protocols/mxit/profile.c:220
+#: ../libpurple/protocols/novell/novell.c:1934
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:298
+msgid "Yes"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:166
+#: ../libpurple/protocols/msn/error.c:379
+#: ../libpurple/protocols/msn/msn.c:1123 ../libpurple/protocols/msn/msn.c:1126
+#: ../libpurple/protocols/mxit/profile.c:220
+#: ../libpurple/protocols/novell/novell.c:1935
+#: ../libpurple/protocols/silc/buddy.c:319
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/wb.c:310
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:299
+msgid "No"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:193
+msgid "Save offline messages in pounce"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:197
+msgid "Do not ask. Always save in pounce."
+msgstr ""
+
+#: ../libpurple/plugins/one_time_password.c:68
+msgid "One Time Password"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/one_time_password.c:123
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/one_time_password.c:126
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+#: ../libpurple/plugins/one_time_password.c:128
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/perl/perl.c:671
+msgid "Perl Plugin Loader"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libpurple/plugins/perl/perl.c:673 ../libpurple/plugins/perl/perl.c:674
+msgid "Provides support for loading perl plugins."
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:20
+msgid "Psychic Mode"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:21
+msgid "Psychic mode for incoming conversation"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:22
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:72
+msgid "You feel a disturbance in the force..."
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:92
+msgid "Only enable for users on the buddy list"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:97
+msgid "Disable when away"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:101
+msgid "Display notification message in conversations"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:106
+msgid "Raise psychic conversations"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/signals-test.c:928
+msgid "Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/signals-test.c:931
+#: ../libpurple/plugins/signals-test.c:933
+msgid "Test to see that all signals are working properly."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr ""
+
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1148
+#: ../libpurple/plugins/ssl/ssl-nss.c:935
+msgid "X.509 Certificates"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1224
+msgid "GNUTLS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1227
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1229
+msgid "Provides SSL support through GNUTLS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:1012
+msgid "NSS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-nss.c:1015
+#: ../libpurple/plugins/ssl/ssl-nss.c:1017
+msgid "Provides SSL support through Mozilla NSS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+
+#: ../libpurple/plugins/statenotify.c:63
+#, c-format
+msgid "%s is no longer away."
+msgstr ""
+
+#: ../libpurple/plugins/statenotify.c:65
+#, c-format
+msgid "%s has gone away."
+msgstr ""
+
+#: ../libpurple/plugins/statenotify.c:75
+#, c-format
+msgid "%s has become idle."
+msgstr ""
+
+#: ../libpurple/plugins/statenotify.c:77
+#, c-format
+msgid "%s is no longer idle."
+msgstr ""
+
+#: ../libpurple/plugins/statenotify.c:86
+#, c-format
+msgid "%s has signed on."
+msgstr ""
+
+#: ../libpurple/plugins/statenotify.c:104
+msgid "Notify When"
+msgstr ""
+
+#: ../libpurple/plugins/statenotify.c:107
+msgid "Buddy Goes _Away"
+msgstr ""
+
+#: ../libpurple/plugins/statenotify.c:110
+msgid "Buddy Goes _Idle"
+msgstr ""
+
+#: ../libpurple/plugins/statenotify.c:113
+msgid "Buddy _Signs On/Off"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/statenotify.c:161
+msgid "Buddy State Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/statenotify.c:164
+#: ../libpurple/plugins/statenotify.c:167
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+
+#: ../libpurple/plugins/tcl/tcl.c:423
+msgid "Tcl Plugin Loader"
+msgstr ""
+
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
+msgid "Provides support for loading Tcl plugins"
+msgstr ""
+
+#: ../libpurple/plugins/tcl/tcl.c:509
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:99
+msgid ""
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see "
+"http://d.pidgin.im/BonjourWindows for more information."
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:119
+msgid "Unable to listen for incoming IM connections"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:146
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:386
+#: ../libpurple/protocols/bonjour/bonjour.c:736
+#: ../libpurple/protocols/gg/gg.c:580
+#: ../libpurple/protocols/jabber/jabber.c:1322
+msgid "First name"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:388
+#: ../libpurple/protocols/bonjour/bonjour.c:739
+#: ../libpurple/protocols/gg/gg.c:575
+#: ../libpurple/protocols/jabber/jabber.c:1323
+msgid "Last name"
+msgstr ""
+
+#. email
+#: ../libpurple/protocols/bonjour/bonjour.c:392
+#: ../libpurple/protocols/bonjour/bonjour.c:742
+#: ../libpurple/protocols/gg/gg.c:447
+#: ../libpurple/protocols/jabber/buddy.c:362
+#: ../libpurple/protocols/jabber/buddy.c:1127
+#: ../libpurple/protocols/jabber/buddy.c:1140
+#: ../libpurple/protocols/jabber/buddy.c:2006
+#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/mxit/actions.c:275
+#: ../libpurple/protocols/silc/ops.c:1058
+#: ../libpurple/protocols/silc/silc.c:1010
+#: ../libpurple/protocols/silc/silc.c:1251
+#: ../libpurple/protocols/silc/util.c:562
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/silc.c:706
+#: ../libpurple/protocols/silc10/silc.c:947
+#: ../libpurple/protocols/silc10/util.c:555
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1060
+msgid "Email"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:395
+#: ../libpurple/protocols/bonjour/bonjour.c:745
+msgid "AIM Account"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:398
+#: ../libpurple/protocols/bonjour/bonjour.c:748
+msgid "XMPP Account"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/bonjour/bonjour.c:557
+#: ../libpurple/protocols/bonjour/bonjour.c:559
+msgid "Bonjour Protocol Plugin"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:701
+msgid "Purple Person"
+msgstr ""
+
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:733
+msgid "Local Port"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.h:33
+msgid "Bonjour"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/jabber.c:398
+#, c-format
+msgid "%s has closed the conversation."
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:558
+#: ../libpurple/protocols/bonjour/jabber.c:603
+#: ../libpurple/protocols/bonjour/jabber.c:880
+#: ../libpurple/protocols/bonjour/jabber.c:901
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/mdns_win32.c:109
+msgid "Error communicating with local mDNSResponder."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:81 ../libpurple/proxy.c:2294
+#: ../libpurple/proxy.c:2362
+msgid "Invalid proxy settings"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:82 ../libpurple/proxy.c:2294
+#: ../libpurple/proxy.c:2362
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:177
+msgid "Token Error"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:117 ../libpurple/protocols/gg/gg.c:139
+#: ../libpurple/protocols/gg/gg.c:178
+msgid "Unable to fetch the token.\n"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:255 ../libpurple/protocols/gg/gg.c:262
+#: ../libpurple/protocols/gg/gg.c:268
+msgid "Save Buddylist..."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:256
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:263
+msgid "Buddylist saved successfully!"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:266
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:287 ../libpurple/protocols/gg/gg.c:288
+msgid "Couldn't load buddylist"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:304
+msgid "Load Buddylist..."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:305
+msgid "Buddylist loaded successfully!"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:316
+msgid "Save buddylist..."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:326 ../libpurple/protocols/gg/gg.c:2631
+msgid "Load buddylist from file..."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:359
+msgid "You must fill in all registration fields"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:366
+msgid "Passwords do not match"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:376
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:389
+msgid "New Gadu-Gadu Account Registered"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:390
+msgid "Registration completed successfully!"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:452 ../libpurple/protocols/gg/gg.c:715
+#: ../libpurple/protocols/jabber/jabber.c:1410
+#: ../libpurple/protocols/jabber/jabber.c:1414
+#: ../libpurple/protocols/jabber/jabber.c:2543
+msgid "Password"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:457
+#: ../libpurple/protocols/jabber/jabber.c:2549
+msgid "Password (again)"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:462
+msgid "Enter captcha text"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:468
+msgid "Captcha"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:472 ../libpurple/protocols/gg/gg.c:473
+msgid "Register New Gadu-Gadu Account"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:474
+msgid "Please, fill in the following fields"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:590 ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1283
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/oscar/userinfo.c:467
+#: ../libpurple/protocols/oscar/userinfo.c:475
+msgid "City"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:595
+msgid "Year of birth"
+msgstr ""
+
+#. gender
+#: ../libpurple/protocols/gg/gg.c:598 ../libpurple/protocols/msn/msn.c:2437
+#: ../libpurple/protocols/mxit/actions.c:242
+#: ../libpurple/protocols/mxit/login.c:349
+#: ../libpurple/protocols/mxit/profile.c:184
+#: ../libpurple/protocols/mxit/profile.c:294
+#: ../libpurple/protocols/myspace/user.c:131
+#: ../libpurple/protocols/oscar/userinfo.c:428
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1090
+msgid "Gender"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:599
+msgid "Male or female"
+msgstr ""
+
+#. 0
+#: ../libpurple/protocols/gg/gg.c:600
+#: ../libpurple/protocols/mxit/actions.c:244
+#: ../libpurple/protocols/mxit/login.c:351
+#: ../libpurple/protocols/mxit/profile.c:184
+#: ../libpurple/protocols/oscar/userinfo.c:428
+msgid "Male"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:601
+#: ../libpurple/protocols/mxit/actions.c:243
+#: ../libpurple/protocols/mxit/login.c:350
+#: ../libpurple/protocols/mxit/profile.c:184
+#: ../libpurple/protocols/oscar/userinfo.c:428
+msgid "Female"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:605
+msgid "Only online"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:609 ../libpurple/protocols/gg/gg.c:610
+msgid "Find buddies"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:611
+msgid "Please, enter your search criteria below"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:645
+msgid "Fill in the fields."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:657
+msgid "Your current password is different from the one that you specified."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:671
+msgid "Unable to change password. Error occurred.\n"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:680
+msgid "Change password for the Gadu-Gadu account"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:681
+msgid "Password was changed successfully!"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:710
+msgid "Current password"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:720
+msgid "Password (retype)"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:725
+msgid "Enter current token"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:731
+msgid "Current token"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:735
+msgid "Please, enter your current password and your new password for UIN: "
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:739 ../libpurple/protocols/gg/gg.c:740
+msgid "Change Gadu-Gadu Password"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:791
+msgid "Show status to:"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:792
+msgid "All people"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:793
+msgid "Only buddies"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:802 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:2635
+msgid "Change status broadcasting"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:804
+msgid "Please, select who can see your status"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:864
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:867 ../libpurple/protocols/gg/gg.c:868
+msgid "Add to chat..."
+msgstr ""
+
+#. 0
+#. Global
+#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/jabber/jutil.c:660
+#: ../libpurple/protocols/msn/state.c:35 ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msn/state.c:43 ../libpurple/protocols/msn/state.c:44
+#: ../libpurple/protocols/mxit/roster.c:54
+#: ../libpurple/protocols/novell/novell.c:2844
+#: ../libpurple/protocols/yahoo/libymsg.c:3878 ../libpurple/status.c:163
+#: ../pidgin/gtkdocklet.c:550 ../pidgin/gtkstatusbox.c:1096
+#: ../pidgin/plugins/themeedit-icon.c:63
+msgid "Available"
+msgstr ""
+
+#. 2
+#: ../libpurple/protocols/gg/gg.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:2394
+#: ../libpurple/protocols/jabber/jutil.c:661
+#: ../libpurple/protocols/mxit/roster.c:56
+msgid "Chatty"
+msgstr ""
+
+#. 3
+#: ../libpurple/protocols/gg/gg.c:1173
+#: ../libpurple/protocols/jabber/jabber.c:2440
+#: ../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/sametime/sametime.c:3381
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1176 ../libpurple/protocols/irc/irc.c:602
+#: ../libpurple/protocols/irc/msgs.c:364
+#: ../libpurple/protocols/jabber/jutil.c:662
+#: ../libpurple/protocols/mxit/roster.c:55
+#: ../libpurple/protocols/novell/novell.c:2847
+#: ../libpurple/protocols/oscar/oscar.c:165
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../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/gtkstatusbox.c:1097 ../pidgin/plugins/themeedit-icon.c:64
+msgid "Away"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1201 ../libpurple/protocols/gg/gg.c:1274
+#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2318
+#: ../libpurple/protocols/oscar/userinfo.c:405
+msgid "UIN"
+msgstr ""
+
+#. first name
+#. optional information
+#: ../libpurple/protocols/gg/gg.c:1204 ../libpurple/protocols/gg/gg.c:1277
+#: ../libpurple/protocols/jabber/buddy.c:2000
+#: ../libpurple/protocols/jabber/buddy.c:2187
+#: ../libpurple/protocols/mxit/actions.c:248
+#: ../libpurple/protocols/mxit/profile.c:187
+#: ../libpurple/protocols/mxit/profile.c:290
+#: ../libpurple/protocols/oscar/userinfo.c:416
+#: ../libpurple/protocols/silc/ops.c:1007
+#: ../libpurple/protocols/silc10/ops.c:1024
+#: ../libpurple/protocols/yahoo/yahoo_aliases.c:544
+msgid "First Name"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1217 ../libpurple/protocols/gg/gg.c:1286
+msgid "Birth Year"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1267 ../libpurple/protocols/gg/gg.c:1332
+#: ../libpurple/protocols/oscar/oscar.c:3021
+msgid "Unable to display the search results."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1323
+msgid "Gadu-Gadu Public Directory"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1324
+msgid "Search results"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1364
+msgid "No matching users found"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1365
+msgid "There are no users matching your search criteria."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1719 ../libpurple/protocols/gg/gg.c:1885
+msgid "Unable to read from socket"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1805
+msgid "Buddy list downloaded"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1806
+msgid "Your buddy list was downloaded from the server."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1813
+msgid "Buddy list uploaded"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1814
+msgid "Your buddy list was stored on the server."
+msgstr ""
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/myspace/myspace.c:1159
+#: ../libpurple/protocols/sametime/sametime.c:1579
+msgid "Connected"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:1924 ../libpurple/protocols/gg/gg.c:2177
+#: ../libpurple/protocols/silc/silc.c:375
+#: ../libpurple/protocols/silc/silc.c:422
+#: ../libpurple/protocols/silc10/silc.c:164
+msgid "Connection failed"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2073
+msgid "Add to chat"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2088
+msgid "Chat _name:"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2158
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr ""
+
+#. 1. connect to server
+#. connect to the server
+#: ../libpurple/protocols/gg/gg.c:2173 ../libpurple/protocols/irc/irc.c:385
+#: ../libpurple/protocols/jabber/jabber.c:1741
+#: ../libpurple/protocols/msn/session.c:432
+#: ../libpurple/protocols/myspace/myspace.c:2206
+#: ../libpurple/protocols/novell/novell.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:834
+#: ../libpurple/protocols/sametime/sametime.c:3770
+#: ../libpurple/protocols/simple/simple.c:1960
+#: ../libpurple/protocols/yahoo/libymsg.c:3682
+#: ../libpurple/protocols/zephyr/zephyr.c:1583 ../pidgin/gtkstatusbox.c:716
+msgid "Connecting"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2503
+msgid "Chat error"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2504
+msgid "This chat name is already in use"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2587
+msgid "Not connected to the server"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2603
+msgid "Find buddies..."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2609
+msgid "Change password..."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2615
+msgid "Upload buddylist to Server"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2619
+msgid "Download buddylist from Server"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2623
+msgid "Delete buddylist from Server"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2627
+msgid "Save buddylist to file..."
+msgstr ""
+
+#. magic
+#. major_version
+#. minor_version
+#. plugin type
+#. ui_requirement
+#. flags
+#. dependencies
+#. priority
+#. id
+#. name
+#. version
+#: ../libpurple/protocols/gg/gg.c:2739
+msgid "Gadu-Gadu Protocol Plugin"
+msgstr ""
+
+#. summary
+#: ../libpurple/protocols/gg/gg.c:2740
+msgid "Polish popular IM"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2789
+msgid "Gadu-Gadu User"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2793
+msgid "GG server"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2805
+#: ../libpurple/protocols/oscar/oscar.c:5773
+msgid "Don't use encryption"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2806
+#: ../libpurple/protocols/jabber/libxmpp.c:277
+#: ../libpurple/protocols/oscar/oscar.c:5771
+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
+msgid "Require encryption"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2813
+#: ../libpurple/protocols/jabber/libxmpp.c:286
+#: ../libpurple/protocols/oscar/oscar.c:5797
+msgid "Connection security"
+msgstr ""
+
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc10/silc.c:1609
+#, c-format
+msgid "Unknown command: %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/cmds.c:536
+#: ../libpurple/protocols/jabber/jabber.c:2863
+#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc10/silc.c:1299
+#, c-format
+msgid "current topic is: %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/cmds.c:540
+#: ../libpurple/protocols/jabber/jabber.c:2867
+#: ../libpurple/protocols/silc/silc.c:1595
+#: ../libpurple/protocols/silc10/silc.c:1303
+msgid "No topic is set"
+msgstr ""
+
+#: ../libpurple/protocols/irc/dcc_send.c:304
+#: ../libpurple/protocols/irc/dcc_send.c:345
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:345
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1151
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1867
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1948
+msgid "File Transfer Failed"
+msgstr ""
+
+#: ../libpurple/protocols/irc/dcc_send.c:305
+#: ../libpurple/protocols/irc/dcc_send.c:346
+msgid "Unable to open a listening port."
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:79
+msgid "Error displaying MOTD"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:79
+msgid "No MOTD available"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:80
+msgid "There is no MOTD associated with this connection."
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:83
+#, c-format
+msgid "MOTD for %s"
+msgstr ""
+
+#. 
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#. 
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../libpurple/protocols/irc/irc.c:131 ../libpurple/protocols/irc/irc.c:175
+#: ../libpurple/protocols/irc/irc.c:700 ../libpurple/protocols/irc/irc.c:731
+#: ../libpurple/protocols/jabber/bosh.c:1024
+#: ../libpurple/protocols/jabber/bosh.c:1080
+#: ../libpurple/protocols/jabber/jabber.c:408
+#: ../libpurple/protocols/jabber/jabber.c:444
+#: ../libpurple/protocols/jabber/jabber.c:671
+#: ../libpurple/protocols/jabber/jabber.c:729
+#: ../libpurple/protocols/myspace/myspace.c:2070
+#: ../libpurple/protocols/oscar/flap_connection.c:474
+#: ../libpurple/protocols/sametime/sametime.c:412
+#: ../libpurple/protocols/sametime/sametime.c:1780
+#: ../libpurple/protocols/simple/simple.c:433
+#: ../libpurple/protocols/yahoo/libymsg.c:3148
+#: ../libpurple/protocols/yahoo/libymsg.c:3302
+#: ../libpurple/protocols/yahoo/ycht.c:476 ../libpurple/proxy.c:895
+#: ../libpurple/proxy.c:1479 ../libpurple/proxy.c:1593
+#: ../libpurple/proxy.c:1828 ../libpurple/proxy.c:1904
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:313
+msgid "View MOTD"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:325 ../libpurple/protocols/silc/chat.c:34
+#: ../libpurple/protocols/silc10/chat.c:33
+msgid "_Channel:"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:331
+#: ../libpurple/protocols/jabber/chat.c:62 ../pidgin/gtkaccount.c:594
+msgid "_Password:"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:364
+msgid "IRC nick and server may not contain whitespace"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:395
+#: ../libpurple/protocols/jabber/bosh.c:975
+#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/novell/novell.c:2218
+#: ../libpurple/protocols/yahoo/libymsg.c:2043
+msgid "SSL support unavailable"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:408
+#: ../libpurple/protocols/jabber/bosh.c:981
+#: ../libpurple/protocols/jabber/jabber.c:794
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/msn/msn.c:1379
+#: ../libpurple/protocols/msn/servconn.c:143
+#: ../libpurple/protocols/myspace/myspace.c:2224
+#: ../libpurple/protocols/novell/novell.c:1748
+#: ../libpurple/protocols/oscar/oscar.c:829
+#: ../libpurple/protocols/oscar/oscar.c:1051
+#: ../libpurple/protocols/oscar/oscar.c:1172
+#: ../libpurple/protocols/sametime/sametime.c:3774
+#: ../libpurple/protocols/silc/silc.c:451
+#: ../libpurple/protocols/simple/simple.c:482
+#: ../libpurple/protocols/simple/simple.c:1860
+#: ../libpurple/protocols/yahoo/libymsg.c:3355
+#: ../libpurple/protocols/yahoo/libymsg.c:3543
+#: ../libpurple/protocols/yahoo/libymsg.c:3628
+#: ../libpurple/protocols/yahoo/libymsg.c:3650
+#: ../libpurple/protocols/yahoo/libymsg.c:3663
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1948
+#: ../libpurple/protocols/yahoo/yahoochat.c:1454
+#: ../libpurple/protocols/yahoo/yahoochat.c:1480
+#: ../libpurple/protocols/yahoo/ycht.c:549
+#: ../libpurple/protocols/yahoo/ycht.c:585
+msgid "Unable to connect"
+msgstr ""
+
+#. this is a regular connect, error out
+#: ../libpurple/protocols/irc/irc.c:491
+#: ../libpurple/protocols/myspace/myspace.c:2163
+#: ../libpurple/protocols/oscar/flap_connection.c:479
+#: ../libpurple/protocols/sametime/sametime.c:1805
+#: ../libpurple/protocols/simple/simple.c:452
+#: ../libpurple/protocols/simple/simple.c:1740
+#: ../libpurple/protocols/yahoo/libymsg.c:3237
+#: ../libpurple/protocols/yahoo/libymsg.c:3263
+#, c-format
+msgid "Unable to connect: %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:709 ../libpurple/protocols/irc/irc.c:740
+#: ../libpurple/protocols/jabber/jabber.c:669
+#: ../libpurple/protocols/jabber/jabber.c:727
+#: ../libpurple/protocols/myspace/myspace.c:2079
+#: ../libpurple/protocols/oscar/flap_connection.c:472
+#: ../libpurple/protocols/sametime/sametime.c:1772
+#: ../libpurple/protocols/yahoo/libymsg.c:3155
+#: ../libpurple/protocols/yahoo/libymsg.c:3309
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:884
+#: ../libpurple/proxy.c:1467 ../libpurple/proxy.c:1581
+#: ../libpurple/proxy.c:1817 ../libpurple/proxy.c:1892
+#, c-format
+msgid "Server closed the connection"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:876
+#: ../libpurple/protocols/silc/chat.c:1405
+#: ../libpurple/protocols/silc10/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1537
+msgid "Users"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:879
+#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/silc/chat.c:1408
+#: ../libpurple/protocols/silc/ops.c:1409
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1546
+msgid "Topic"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../libpurple/protocols/irc/irc.c:1023
+msgid "IRC Protocol Plugin"
+msgstr ""
+
+#. *  summary
+#: ../libpurple/protocols/irc/irc.c:1024
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr ""
+
+#. 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/sametime/sametime.c:5784
+#: ../libpurple/protocols/silc/ops.c:1265
+#: ../libpurple/protocols/silc/ops.c:1359
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:2164
+msgid "Server"
+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/sametime/sametime.c:5793
+#: ../libpurple/protocols/silc/silc.c:2197
+#: ../libpurple/protocols/silc10/silc.c:1910
+msgid "Port"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:1055
+msgid "Encodings"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:1058
+msgid "Auto-detect incoming UTF-8"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:1064 ../libpurple/protocols/irc/msgs.c:371
+#: ../libpurple/protocols/silc/silc.c:1249
+#: ../libpurple/protocols/silc10/silc.c:945
+msgid "Real name"
+msgstr ""
+
+#. 
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#. 
+#: ../libpurple/protocols/irc/irc.c:1072
+msgid "Use SSL"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:192
+msgid "Bad mode"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:215
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:219
+#, c-format
+msgid "Ban on %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:234
+msgid "End of ban list"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:248
+#, c-format
+msgid "You are banned from %s."
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:249
+msgid "Banned"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:266
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:355
+msgid " <i>(ircop)</i>"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:356
+msgid " <i>(identified)</i>"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:357
+#: ../libpurple/protocols/oscar/userinfo.c:406
+#: ../libpurple/protocols/silc/ops.c:1438
+#: ../libpurple/protocols/silc10/ops.c:1414
+msgid "Nick"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:383
+#: ../libpurple/protocols/silc/ops.c:1284
+#: ../libpurple/protocols/silc10/ops.c:1272
+msgid "Currently on"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:388
+msgid "Idle for"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:391
+msgid "Online since"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:395
+msgid "<b>Defining adjective:</b>"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:395
+msgid "Glorious"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:552
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:554
+#, c-format
+msgid "%s has cleared the topic."
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:562
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:580
+#, c-format
+msgid "Unknown message '%s'"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:581
+msgid "Unknown message"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:581
+msgid "The IRC server received a message it did not understand."
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:602
+#, c-format
+msgid "Users on %s: %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:715
+msgid "Time Response"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:716
+msgid "The IRC server's local time is:"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:727
+msgid "No such channel"
+msgstr ""
+
+#. does this happen?
+#: ../libpurple/protocols/irc/msgs.c:738
+msgid "no such channel"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:741
+msgid "User is not logged in"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:746
+msgid "No such nick or channel"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:766
+msgid "Could not send"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:822
+#, c-format
+msgid "Joining %s requires an invitation."
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:823
+msgid "Invitation only"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libpurple/protocols/jabber/presence.c:740
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr ""
+
+#. Remove user from channel
+#: ../libpurple/protocols/irc/msgs.c:962
+#: ../libpurple/protocols/jabber/presence.c:747
+#: ../libpurple/protocols/silc/ops.c:730
+#: ../libpurple/protocols/silc10/ops.c:720
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:985
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1075
+#: ../libpurple/protocols/irc/msgs.c:1076
+#: ../libpurple/protocols/jabber/jabber.c:2885
+msgid "Invalid nickname"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1077
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1082
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#: ../libpurple/protocols/irc/msgs.c:1098
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1100
+#: ../libpurple/protocols/irc/msgs.c:1101
+msgid "Nickname in use"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1145
+msgid "Cannot change nick"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1145
+msgid "Could not change nick"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1170
+#, c-format
+msgid "You have parted the channel%s%s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1214
+msgid "Error: invalid PONG from server"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1216
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1307
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1308
+#: ../libpurple/protocols/silc/ops.c:1109
+#: ../libpurple/protocols/silc10/ops.c:1128
+msgid "Cannot join channel"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1342
+msgid "Nick or channel is temporarily unavailable."
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1354
+#, c-format
+msgid "Wallops from %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:127
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:128
+msgid "authserv: Send a command to authserv"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:129
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:130
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:131
+msgid "chanserv: Send a command to chanserv"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:132
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:133
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:134
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:135
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:136
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:137
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:138
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:139
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:140
+msgid "memoserv: Send a command to memoserv"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:141
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:142
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:143
+msgid "names [channel]:  List the users currently in a channel."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/jabber/jabber.c:3615
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:145
+msgid "nickserv: Send a command to nickserv"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:146
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:147
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:148
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:149
+msgid "operserv: Send a command to operserv"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:150
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:151
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:152
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:153
+msgid ""
+"quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:154
+msgid "quote [...]:  Send a raw command to the server."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:155
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:156
+msgid "time: Displays the current local time at the IRC server."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:157
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:158
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:159
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:160
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:161
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:162
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:163
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:559
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:560
+msgid "PONG"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:560
+msgid "CTCP PING reply"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:672
+#: ../libpurple/protocols/irc/parse.c:679
+msgid "Disconnected."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:161
+#: ../libpurple/protocols/jabber/auth.c:199
+#: ../libpurple/protocols/jabber/auth_scram.c:73
+#: ../libpurple/protocols/jabber/jabber.c:1161
+#: ../libpurple/protocols/jabber/jabber.c:1196
+#: ../libpurple/protocols/jabber/jabber.c:2723
+msgid "Unknown Error"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:163
+#: ../libpurple/protocols/jabber/adhoccommands.c:164
+msgid "Ad-Hoc Command Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:198
+msgid "execute"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:82
+#: ../libpurple/protocols/jabber/auth_plain.c:80
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#. 
+#: ../libpurple/protocols/jabber/auth.c:150
+#: ../libpurple/protocols/jabber/auth.c:399
+#: ../libpurple/protocols/jabber/auth.c:428
+#: ../libpurple/protocols/jabber/auth.c:439
+#: ../libpurple/protocols/jabber/auth.c:484
+#: ../libpurple/protocols/jabber/auth_cyrus.c:526
+#: ../libpurple/protocols/jabber/auth_digest_md5.c:180
+#: ../libpurple/protocols/jabber/jabber.c:158
+msgid "Invalid response from server"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:191
+#: ../libpurple/protocols/jabber/auth.c:326
+#: ../libpurple/protocols/jabber/auth_cyrus.c:437
+msgid "Server does not use any supported authentication method"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:310
+#: ../libpurple/protocols/jabber/auth_plain.c:94
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:312
+#: ../libpurple/protocols/jabber/auth.c:313
+#: ../libpurple/protocols/jabber/auth_cyrus.c:246
+#: ../libpurple/protocols/jabber/auth_cyrus.c:247
+#: ../libpurple/protocols/jabber/auth_plain.c:96
+#: ../libpurple/protocols/jabber/auth_plain.c:97
+msgid "Plaintext Authentication"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:350
+#: ../libpurple/protocols/jabber/jabber.c:280
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:410
+#: ../libpurple/protocols/jabber/auth_digest_md5.c:200
+#: ../libpurple/protocols/jabber/auth_digest_md5.c:225
+#: ../libpurple/protocols/jabber/auth_scram.c:464
+#: ../libpurple/protocols/jabber/auth_scram.c:484
+#: ../libpurple/protocols/jabber/auth_scram.c:521
+#: ../libpurple/protocols/jabber/auth_scram.c:555
+msgid "Invalid challenge from server"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:444
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_cyrus.c:39
+msgid ""
+"Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_cyrus.c:244
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_cyrus.c:281
+msgid "SASL authentication failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_cyrus.c:460
+#: ../libpurple/protocols/jabber/jabber.c:542
+#: ../libpurple/protocols/jabber/jabber.c:700
+#, c-format
+msgid "SASL error: %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:55
+msgid "Invalid Encoding"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:57
+msgid "Unsupported Extension"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:59
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:61
+msgid ""
+"The server does support channel binding, but did not appear to advertise it. "
+" This indicates a likely MITM attack"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:63
+msgid "Server does not support channel binding"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:65
+msgid "Unsupported channel binding method"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:67
+#: ../libpurple/protocols/novell/nmuser.c:1896
+msgid "User not found"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:69
+msgid "Invalid Username Encoding"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:71
+#: ../libpurple/protocols/jabber/jabber.c:2788
+msgid "Resource Constraint"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:398
+msgid "Unable to canonicalize username"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:409
+msgid "Unable to canonicalize password"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:474
+#: ../libpurple/protocols/jabber/auth_scram.c:546
+msgid "Malicious challenge from server"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth_scram.c:536
+msgid "Unexpected response from server"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/bosh.c:441
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/bosh.c:544
+msgid "No session ID given"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/bosh.c:561
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/bosh.c:738
+msgid "Unable to establish a connection with the server"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/bosh.c:940
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/bosh.c:970
+#: ../libpurple/protocols/jabber/jabber.c:1059
+msgid "Unable to establish SSL connection"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:350
+#: ../libpurple/protocols/jabber/buddy.c:1024
+#: ../libpurple/protocols/sametime/sametime.c:4176
+#: ../libpurple/protocols/silc/ops.c:1003
+#: ../libpurple/protocols/silc10/ops.c:1020
+msgid "Full Name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:351
+#: ../libpurple/protocols/jabber/buddy.c:1035
+#: ../libpurple/protocols/silc/ops.c:1015
+#: ../libpurple/protocols/silc10/ops.c:1032
+msgid "Family Name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:352
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Given Name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:354
+#: ../libpurple/protocols/jabber/jabber.c:1329
+msgid "URL"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:355
+#: ../libpurple/protocols/jabber/buddy.c:1086
+msgid "Street Address"
+msgstr ""
+
+#. 
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#. 
+#: ../libpurple/protocols/jabber/buddy.c:356
+#: ../libpurple/protocols/jabber/buddy.c:1084
+msgid "Extended Address"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:357
+#: ../libpurple/protocols/jabber/buddy.c:1088
+msgid "Locality"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:358
+#: ../libpurple/protocols/jabber/buddy.c:1090
+msgid "Region"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:359
+#: ../libpurple/protocols/jabber/buddy.c:1092
+msgid "Postal Code"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:360
+#: ../libpurple/protocols/jabber/buddy.c:1095
+#: ../libpurple/protocols/mxit/profile.c:189
+#: ../libpurple/protocols/silc/silc.c:1255
+#: ../libpurple/protocols/silc10/silc.c:951
+msgid "Country"
+msgstr ""
+
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
+#: ../libpurple/protocols/jabber/buddy.c:361
+#: ../libpurple/protocols/jabber/buddy.c:1109
+#: ../libpurple/protocols/jabber/buddy.c:1115
+msgid "Telephone"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:363
+#: ../libpurple/protocols/jabber/buddy.c:1156
+msgid "Organization Name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:364
+#: ../libpurple/protocols/jabber/buddy.c:1158
+msgid "Organization Unit"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:365
+#: ../libpurple/protocols/jabber/buddy.c:1163
+#: ../libpurple/protocols/msn/msn.c:2525
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/silc/ops.c:1027
+#: ../libpurple/protocols/silc10/ops.c:1044
+msgid "Job Title"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:366
+#: ../libpurple/protocols/jabber/buddy.c:1165
+msgid "Role"
+msgstr ""
+
+#. birthday
+#. birthday (required)
+#: ../libpurple/protocols/jabber/buddy.c:367
+#: ../libpurple/protocols/jabber/buddy.c:1053
+#: ../libpurple/protocols/msn/msn.c:2506
+#: ../libpurple/protocols/mxit/actions.c:236
+#: ../libpurple/protocols/mxit/login.c:343
+#: ../libpurple/protocols/mxit/profile.c:181
+#: ../libpurple/protocols/oscar/userinfo.c:449
+msgid "Birthday"
+msgstr ""
+
+#: ../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
+msgid "Description"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:675
+#: ../libpurple/protocols/jabber/buddy.c:676
+msgid "Edit XMPP vCard"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:677
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:722
+msgid "Client"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:726
+msgid "Operating System"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:742
+msgid "Local Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:773
+#: ../libpurple/protocols/jabber/jabber.c:2371
+#: ../libpurple/protocols/jabber/jabber.c:2395
+#: ../libpurple/protocols/jabber/jabber.c:2411
+#: ../libpurple/protocols/jabber/jabber.c:2427
+#: ../libpurple/protocols/jabber/jabber.c:2441
+msgid "Priority"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/jabber.c:3359
+#: ../libpurple/protocols/jabber/libxmpp.c:265
+#: ../libpurple/protocols/jabber/si.c:1571
+msgid "Resource"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:832
+msgid "Uptime"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:836
+msgid "Logged Off"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1039
+#: ../libpurple/protocols/silc/ops.c:1011
+#: ../libpurple/protocols/silc10/ops.c:1028
+#: ../libpurple/protocols/yahoo/yahoo_aliases.c:547
+msgid "Middle Name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1072
+#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/oscar/userinfo.c:466
+#: ../libpurple/protocols/oscar/userinfo.c:474
+#: ../libpurple/protocols/silc/ops.c:1047
+#: ../libpurple/protocols/silc10/ops.c:1064
+msgid "Address"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1077
+msgid "P.O. Box"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1187
+#: ../libpurple/protocols/mxit/profile.c:235
+msgid "Photo"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1187
+msgid "Logo"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1732
+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1734
+#: ../libpurple/protocols/jabber/buddy.c:1843
+msgid "Cancel Presence Notification"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1831
+msgid "Un-hide From"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1835
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1850
+msgid "(Re-)Request authorization"
+msgstr ""
+
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#: ../libpurple/protocols/jabber/buddy.c:1859
+msgid "Unsubscribe"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1866
+#: ../libpurple/protocols/msn/msn.c:1300
+#: ../libpurple/protocols/novell/novell.c:3436
+msgid "Initiate _Chat"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1883
+msgid "Log In"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1887
+msgid "Log Out"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1998
+msgid "JID"
+msgstr ""
+
+#. last name
+#: ../libpurple/protocols/jabber/buddy.c:2002
+#: ../libpurple/protocols/jabber/buddy.c:2192
+#: ../libpurple/protocols/mxit/actions.c:252
+#: ../libpurple/protocols/mxit/profile.c:188
+#: ../libpurple/protocols/mxit/profile.c:292
+#: ../libpurple/protocols/oscar/userinfo.c:417
+#: ../libpurple/protocols/yahoo/yahoo_aliases.c:545
+msgid "Last Name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2034
+msgid "The following are the results of your search"
+msgstr ""
+
+#. current comment from Jabber User Directory users.jabber.org
+#: ../libpurple/protocols/jabber/buddy.c:2119
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2140
+msgid "Directory Query Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2141
+msgid "Could not query the directory server."
+msgstr ""
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../libpurple/protocols/jabber/buddy.c:2175
+#, c-format
+msgid "Server Instructions: %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2182
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2202
+#: ../libpurple/protocols/novell/novell.c:1501
+#: ../libpurple/protocols/oscar/userinfo.c:418
+#: ../libpurple/protocols/oscar/userinfo.c:422
+msgid "Email Address"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/protocols/jabber/buddy.c:2212
+msgid "Search for XMPP users"
+msgstr ""
+
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/sametime/sametime.c:5671
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:476
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
+msgid "Search"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2228
+msgid "Invalid Directory"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2258
+msgid "Enter a User Directory"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2259
+msgid "Select a user directory to search"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2262
+msgid "Search Directory"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:44
+#: ../libpurple/protocols/oscar/oscar.c:4417
+#: ../libpurple/protocols/yahoo/yahoochat.c:1086
+msgid "_Room:"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:50
+msgid "_Server:"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:56
+msgid "_Handle:"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:378
+#, c-format
+msgid "%s is not a valid room name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:379
+msgid "Invalid Room Name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:385
+#, c-format
+msgid "%s is not a valid server name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:386
+#: ../libpurple/protocols/jabber/chat.c:387
+msgid "Invalid Server Name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:392
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:393
+#: ../libpurple/protocols/jabber/chat.c:394
+msgid "Invalid Room Handle"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:538
+msgid "Configuration error"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:547
+#: ../libpurple/protocols/jabber/chat.c:691
+msgid "Unable to configure"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:562
+msgid "Room Configuration Error"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:563
+msgid "This room is not capable of being configured"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:613
+#: ../libpurple/protocols/jabber/chat.c:682
+msgid "Registration error"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:758
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:813
+#: ../libpurple/protocols/jabber/chat.c:824
+#: ../libpurple/protocols/silc/ops.c:1476
+#: ../libpurple/protocols/silc10/ops.c:1451
+msgid "Error retrieving room list"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:872
+#: ../pidgin/plugins/disco/gtkdisco.c:177
+msgid "Invalid Server"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:917
+msgid "Enter a Conference Server"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:918
+msgid "Select a conference server to query"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:921
+msgid "Find Rooms"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:1059
+msgid "Affiliations:"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:1071
+#: ../libpurple/protocols/jabber/chat.c:1166
+msgid "No users found"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:1154
+msgid "Roles:"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:252 ../libpurple/util.c:4168
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:259
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:621
+msgid "Ping timed out"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:945
+#: ../libpurple/protocols/jabber/jabber.c:983
+#: ../libpurple/protocols/jabber/jabber.c:3031
+msgid "Invalid XMPP ID"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:954
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:963
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1042
+msgid "Malformed BOSH URL"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1145
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1151
+#, c-format
+msgid "Registration to %s successful"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1154
+#: ../libpurple/protocols/jabber/jabber.c:1155
+msgid "Registration Successful"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1163
+#: ../libpurple/protocols/jabber/jabber.c:1164
+msgid "Registration Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1187
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1189
+#: ../libpurple/protocols/jabber/jabber.c:1190
+msgid "Unregistration Successful"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1198
+#: ../libpurple/protocols/jabber/jabber.c:1199
+msgid "Unregistration Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1326
+#: ../libpurple/protocols/oscar/userinfo.c:468
+#: ../libpurple/protocols/oscar/userinfo.c:476
+msgid "State"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1327
+msgid "Postal code"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1328
+#: ../libpurple/protocols/silc/ops.c:1052
+#: ../libpurple/protocols/silc/silc.c:1012
+#: ../libpurple/protocols/silc/util.c:564
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:708
+#: ../libpurple/protocols/silc10/util.c:557
+msgid "Phone"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1330 ../pidgin/gtknotify.c:1625
+msgid "Date"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1359
+#: ../libpurple/protocols/jabber/jabber.c:1360
+msgid "Already Registered"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1446
+msgid "Unregister"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1453
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1456
+msgid "Please fill out the information below to register your new account."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1464
+#: ../libpurple/protocols/jabber/jabber.c:1465
+msgid "Register New XMPP Account"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../pidgin/plugins/disco/gtkdisco.c:307
+#: ../pidgin/plugins/disco/gtkdisco.c:686
+msgid "Register"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1473
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1474
+#, c-format
+msgid "Register New Account at %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1477
+msgid "Change Registration"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1526
+msgid "Error unregistering account"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1532
+msgid "Account successfully unregistered"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1745
+msgid "Initializing Stream"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1750
+msgid "Initializing SSL/TLS"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1754
+#: ../libpurple/protocols/msn/session.c:438
+msgid "Authenticating"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1758
+msgid "Re-initializing Stream"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1927
+#: ../libpurple/protocols/jabber/jabber.c:1928
+msgid "Server doesn't support blocking"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2181
+#: ../libpurple/protocols/jabber/jabber.c:2701
+#: ../libpurple/protocols/jabber/jabber.c:2744
+#: ../libpurple/protocols/jabber/jabber.c:2782
+#: ../libpurple/protocols/oscar/oscar.c:4715
+#: ../libpurple/protocols/oscar/userinfo.c:272
+msgid "Not Authorized"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2316
+#: ../libpurple/protocols/jabber/jabber.c:2373
+#: ../libpurple/protocols/jabber/jabber.c:2397
+#: ../libpurple/protocols/jabber/jabber.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:2429
+#: ../libpurple/protocols/jabber/jabber.c:2443
+#: ../libpurple/protocols/mxit/mxit.c:352
+#: ../libpurple/protocols/mxit/profile.c:208
+#: ../libpurple/protocols/mxit/profile.c:210
+#: ../libpurple/protocols/oscar/userinfo.c:298
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1228
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2326
+#: ../libpurple/protocols/msn/msn.c:1046
+msgid "Now Listening"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2333
+#: ../libpurple/protocols/mxit/roster.c:252
+msgid "Both"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2335
+msgid "From (To pending)"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2337
+msgid "From"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2340
+msgid "To"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2342
+msgid "None (To pending)"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2344
+#: ../libpurple/protocols/mxit/profile.c:210
+#: ../libpurple/protocols/mxit/roster.c:262 ../pidgin/gtkblist.c:3543
+#: ../pidgin/gtkblist.c:3545 ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr ""
+
+#. subscription type
+#: ../libpurple/protocols/jabber/jabber.c:2347
+#: ../libpurple/protocols/mxit/mxit.c:356
+#: ../libpurple/protocols/mxit/profile.c:217
+msgid "Subscription"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2374
+#: ../libpurple/protocols/jabber/jabber.c:2398
+#: ../libpurple/protocols/jabber/jabber.c:2414
+#: ../libpurple/protocols/jabber/jabber.c:2430
+#: ../libpurple/protocols/jabber/jabber.c:2444
+msgid "Mood Text"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2376
+#: ../libpurple/protocols/jabber/jabber.c:2400
+#: ../libpurple/protocols/jabber/jabber.c:2416
+#: ../libpurple/protocols/jabber/jabber.c:2432
+msgid "Allow Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2383
+#: ../libpurple/protocols/mxit/roster.c:86
+#: ../libpurple/protocols/oscar/oscar.c:4896
+msgid "Mood Name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2384
+#: ../libpurple/protocols/oscar/oscar.c:4897
+msgid "Mood Comment"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+#: ../libpurple/protocols/jabber/jabber.c:2463
+#: ../libpurple/protocols/msn/msn.c:1196
+#: ../libpurple/protocols/myspace/myspace.c:501
+msgid "Tune Artist"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2464
+#: ../libpurple/protocols/msn/msn.c:1198
+#: ../libpurple/protocols/myspace/myspace.c:502
+msgid "Tune Title"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2465
+#: ../libpurple/protocols/msn/msn.c:1197
+msgid "Tune Album"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2466
+msgid "Tune Genre"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2467
+msgid "Tune Comment"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2468
+msgid "Tune Track"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2469
+msgid "Tune Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2470
+msgid "Tune Year"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2471
+msgid "Tune URL"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2484
+msgid "Password Changed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2485
+msgid "Your password has been changed."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2491
+#: ../libpurple/protocols/jabber/jabber.c:2492
+msgid "Error changing password"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2555
+#: ../libpurple/protocols/jabber/jabber.c:2556
+msgid "Change XMPP Password"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2556
+msgid "Please enter your new password"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2570
+#: ../libpurple/protocols/oscar/oscar.c:5516
+#: ../libpurple/protocols/silc/silc.c:1333
+#: ../libpurple/protocols/silc10/silc.c:1029
+#: ../libpurple/protocols/yahoo/libymsg.c:4211
+#: ../libpurple/protocols/yahoo/libymsg.c:4367
+msgid "Set User Info..."
+msgstr ""
+
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: ../libpurple/protocols/jabber/jabber.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:5527
+#: ../libpurple/protocols/silc/silc.c:1329
+#: ../libpurple/protocols/silc10/silc.c:1025
+msgid "Change Password..."
+msgstr ""
+
+#. }
+#: ../libpurple/protocols/jabber/jabber.c:2580
+msgid "Search for Users..."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2680
+msgid "Bad Request"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2683
+msgid "Conflict"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2685
+msgid "Feature Not Implemented"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2687
+msgid "Forbidden"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2689
+msgid "Gone"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2691
+#: ../libpurple/protocols/jabber/jabber.c:2772
+msgid "Internal Server Error"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2693
+msgid "Item Not Found"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2695
+msgid "Malformed XMPP ID"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2697
+msgid "Not Acceptable"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2699
+msgid "Not Allowed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2703
+msgid "Payment Required"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2705
+msgid "Recipient Unavailable"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2709
+msgid "Registration Required"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2711
+msgid "Remote Server Not Found"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2713
+msgid "Remote Server Timeout"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2715
+msgid "Server Overloaded"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2717
+msgid "Service Unavailable"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2719
+msgid "Subscription Required"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2721
+msgid "Unexpected Request"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2729
+msgid "Authorization Aborted"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2731
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2733
+msgid "Invalid authzid"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2735
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2738
+msgid "Authorization mechanism too weak"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2746
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2749
+msgid "Authentication Failure"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2757
+msgid "Bad Format"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2759
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2762
+msgid "Resource Conflict"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2764
+#: ../libpurple/protocols/msn/msn.c:232
+msgid "Connection Timeout"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2766
+msgid "Host Gone"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2768
+msgid "Host Unknown"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2770
+msgid "Improper Addressing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2774
+msgid "Invalid ID"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2776
+msgid "Invalid Namespace"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2778
+msgid "Invalid XML"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2780
+msgid "Non-matching Hosts"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2784
+msgid "Policy Violation"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2786
+msgid "Remote Connection Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2790
+msgid "Restricted XML"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2792
+msgid "See Other Host"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2794
+msgid "System Shutdown"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2796
+msgid "Undefined Condition"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2798
+msgid "Unsupported Encoding"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2800
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2802
+msgid "Unsupported Version"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2804
+msgid "XML Not Well Formed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2806
+msgid "Stream Error"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2916
+#, c-format
+msgid "Unable to ban user %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2936
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2946
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2971
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2981
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3063
+#, c-format
+msgid "Unable to kick user %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3100
+#, c-format
+msgid "Unable to ping user %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3122
+#, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3129
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3153
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+#: ../libpurple/protocols/jabber/jabber.c:3200
+#: ../libpurple/protocols/yahoo/libymsg.c:5292
+msgid "Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3201
+#: ../libpurple/protocols/yahoo/libymsg.c:5293
+#, c-format
+msgid "%s has buzzed you!"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3201
+#: ../libpurple/protocols/yahoo/libymsg.c:5293
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3331
+#, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3333
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3335
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3338
+#: ../libpurple/protocols/jabber/jabber.c:3339
+msgid "Media Initiation Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3409
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3419
+#: ../libpurple/protocols/jabber/si.c:1583
+msgid "Select a Resource"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3420
+msgid "Initiate Media"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3590
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3603
+msgid "config:  Configure a chat room."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3609
+msgid "configure:  Configure a chat room."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3622
+msgid "part [message]:  Leave the room."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3629
+msgid "register:  Register with a chat room."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3637
+msgid "topic [new topic]:  View or change the topic."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3645
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3653
+msgid ""
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3661
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with a role or set users' role with the room."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3669
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3677
+msgid "join: &lt;room[@server]&gt; [password]:  Join a chat."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3685
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3692
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3700
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3708
+#: ../libpurple/protocols/yahoo/libyahoo.c:53
+#: ../libpurple/protocols/yahoo/libyahoojp.c:50
+msgid "buzz: Buzz a user to get their attention"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:3715
+msgid "mood: Set current user mood"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jutil.c:663
+#: ../pidgin/plugins/themeedit-icon.c:65
+msgid "Extended Away"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
+msgid "XMPP Protocol Plugin"
+msgstr ""
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:261 ../pidgin/gtkaccount.c:570
+#: ../pidgin/gtkaccount.c:574
+msgid "Domain"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:278
+msgid "Use old-style SSL"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:291
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:296
+#: ../libpurple/protocols/myspace/myspace.c:3633
+#: ../libpurple/protocols/simple/simple.c:2170
+msgid "Connect port"
+msgstr ""
+
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
+#. Account options
+#: ../libpurple/protocols/jabber/libxmpp.c:300
+#: ../libpurple/protocols/myspace/myspace.c:3630
+#: ../libpurple/protocols/silc/silc.c:2193
+#: ../libpurple/protocols/silc10/silc.c:1906
+msgid "Connect server"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:305
+msgid "File transfer proxies"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:313
+msgid "BOSH URL"
+msgstr ""
+
+#. this should probably be part of global smiley theme settings later on,
+#. shared with MSN
+#: ../libpurple/protocols/jabber/libxmpp.c:320
+msgid "Show Custom Smileys"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/message.c:175
+#, c-format
+msgid "Message from %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/message.c:239
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/message.c:241
+#, c-format
+msgid "The topic is: %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/message.c:289
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/message.c:292
+msgid "XMPP Message Error"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/message.c:561
+#, c-format
+msgid "(Code %s)"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/message.c:984
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/parser.c:57
+msgid "XMPP stream header missing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/parser.c:78
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/parser.c:103
+msgid "XMPP stream missing ID"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/parser.c:305
+msgid "XML Parse error"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/presence.c:555
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/presence.c:558
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/presence.c:602
+#: ../libpurple/protocols/jabber/presence.c:603
+msgid "Create New Room"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/presence.c:604
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/presence.c:610
+msgid "_Configure Room"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/presence.c:611
+msgid "_Accept Defaults"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/presence.c:736
+msgid "No reason"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/presence.c:743
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/presence.c:750
+#, c-format
+msgid "Kicked (%s)"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/presence.c:955
+msgid "Unknown Error in presence"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/si.c:1446
+#: ../libpurple/protocols/jabber/si.c:1487
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr ""
+
+#. not success
+#: ../libpurple/protocols/jabber/si.c:1447
+#: ../libpurple/protocols/jabber/si.c:1448
+#: ../libpurple/protocols/jabber/si.c:1488
+#: ../libpurple/protocols/jabber/si.c:1489
+#: ../libpurple/protocols/jabber/si.c:1559
+#: ../libpurple/protocols/mxit/protocol.c:2155
+msgid "File Send Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/si.c:1552
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/si.c:1554
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/si.c:1556
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/si.c:1569
+#, c-format
+msgid ""
+"Please select the resource of %s to which you would like to send a file"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:34
+msgid "Afraid"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:35
+msgid "Amazed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:36
+msgid "Amorous"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:37
+#: ../libpurple/protocols/mxit/roster.c:138
+#: ../libpurple/protocols/mxit/roster.c:202
+#: ../libpurple/protocols/oscar/family_locate.c:415
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:987
+#: ../libpurple/protocols/silc/util.c:527
+#: ../libpurple/protocols/silc10/buddy.c:1517
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:519
+msgid "Angry"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:38
+msgid "Annoyed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:39
+#: ../libpurple/protocols/silc/buddy.c:1526
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/util.c:543
+#: ../libpurple/protocols/silc10/buddy.c:1533
+#: ../libpurple/protocols/silc10/silc.c:699
+#: ../libpurple/protocols/silc10/util.c:535
+msgid "Anxious"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:40
+msgid "Aroused"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:41
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:991
+#: ../libpurple/protocols/silc/util.c:531
+#: ../libpurple/protocols/silc10/buddy.c:1521
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:523
+msgid "Ashamed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:42
+#: ../libpurple/protocols/mxit/roster.c:148
+#: ../libpurple/protocols/mxit/roster.c:222
+#: ../libpurple/protocols/silc/buddy.c:1522
+#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/util.c:539
+#: ../libpurple/protocols/silc10/buddy.c:1529
+#: ../libpurple/protocols/silc10/silc.c:695
+#: ../libpurple/protocols/silc10/util.c:531
+msgid "Bored"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:43
+msgid "Brave"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:44
+msgid "Calm"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:45
+msgid "Cautious"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:46
+#: ../libpurple/protocols/mxit/roster.c:149
+#: ../libpurple/protocols/mxit/roster.c:224
+msgid "Cold"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:47
+msgid "Confident"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:48
+#: ../libpurple/protocols/mxit/roster.c:150
+#: ../libpurple/protocols/mxit/roster.c:226
+msgid "Confused"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:49
+msgid "Contemplative"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:50
+msgid "Contented"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:51
+msgid "Cranky"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:52
+msgid "Crazy"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:53
+msgid "Creative"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:54
+msgid "Curious"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:55
+msgid "Dejected"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:56
+msgid "Depressed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:57
+msgid "Disappointed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:58
+msgid "Disgusted"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:59
+msgid "Dismayed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:60
+msgid "Distracted"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:61
+msgid "Embarrassed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:62
+msgid "Envious"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:63
+#: ../libpurple/protocols/mxit/roster.c:139
+#: ../libpurple/protocols/mxit/roster.c:204
+#: ../libpurple/protocols/silc/buddy.c:1524
+#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/util.c:541
+#: ../libpurple/protocols/silc10/buddy.c:1531
+#: ../libpurple/protocols/silc10/silc.c:697
+#: ../libpurple/protocols/silc10/util.c:533
+msgid "Excited"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:64
+msgid "Flirtatious"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:65
+msgid "Frustrated"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:66
+msgid "Grateful"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:67
+msgid "Grieving"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:68
+#: ../libpurple/protocols/mxit/roster.c:140
+#: ../libpurple/protocols/mxit/roster.c:206
+msgid "Grumpy"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:69
+msgid "Guilty"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:70
+#: ../libpurple/protocols/mxit/roster.c:141
+#: ../libpurple/protocols/mxit/roster.c:208
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:983
+#: ../libpurple/protocols/silc/util.c:523
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:515
+msgid "Happy"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:71
+msgid "Hopeful"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:72
+#: ../libpurple/protocols/mxit/roster.c:145
+#: ../libpurple/protocols/mxit/roster.c:216
+msgid "Hot"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:73
+msgid "Humbled"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:74
+msgid "Humiliated"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:75
+#: ../libpurple/protocols/mxit/roster.c:151
+#: ../libpurple/protocols/mxit/roster.c:228
+msgid "Hungry"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:76
+msgid "Hurt"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:77
+msgid "Impressed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:78
+msgid "In awe"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:79
+#: ../libpurple/protocols/mxit/roster.c:142
+#: ../libpurple/protocols/oscar/family_locate.c:426
+#: ../libpurple/protocols/silc/silc.c:995
+#: ../libpurple/protocols/silc10/silc.c:691
+msgid "In love"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:80
+msgid "Indignant"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:81
+msgid "Interested"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:82
+msgid "Intoxicated"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:83
+#: ../libpurple/protocols/mxit/roster.c:143
+#: ../libpurple/protocols/mxit/roster.c:212
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:993
+#: ../libpurple/protocols/silc/util.c:533
+#: ../libpurple/protocols/silc10/buddy.c:1523
+#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/util.c:525
+msgid "Invincible"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:84
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:989
+#: ../libpurple/protocols/silc/util.c:529
+#: ../libpurple/protocols/silc10/buddy.c:1519
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:521
+msgid "Jealous"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:85
+msgid "Lonely"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:86
+msgid "Lost"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:87
+msgid "Lucky"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:88
+msgid "Mean"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:89
+msgid "Moody"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:90
+msgid "Nervous"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:91
+msgid "Neutral"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:92
+msgid "Offended"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:93
+msgid "Outraged"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:94
+msgid "Playful"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:95
+msgid "Proud"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:96
+msgid "Relaxed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:97
+msgid "Relieved"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:98
+msgid "Remorseful"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:99
+msgid "Restless"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:100
+#: ../libpurple/protocols/mxit/roster.c:144
+#: ../libpurple/protocols/mxit/roster.c:214
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/silc.c:985
+#: ../libpurple/protocols/silc/util.c:525
+#: ../libpurple/protocols/silc10/buddy.c:1515
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/util.c:517
+msgid "Sad"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:101
+msgid "Sarcastic"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:102
+msgid "Satisfied"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:103
+msgid "Serious"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:104
+msgid "Shocked"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:105
+msgid "Shy"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:106
+#: ../libpurple/protocols/mxit/roster.c:146
+#: ../libpurple/protocols/mxit/roster.c:218
+#: ../libpurple/protocols/oscar/family_locate.c:418
+msgid "Sick"
+msgstr ""
+
+#. Sleepy / Tired
+#: ../libpurple/protocols/jabber/usermood.c:107
+#: ../libpurple/protocols/mxit/roster.c:147
+#: ../libpurple/protocols/mxit/roster.c:220
+#: ../libpurple/protocols/oscar/family_locate.c:428
+#: ../libpurple/protocols/silc/buddy.c:1520
+#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/util.c:537
+#: ../libpurple/protocols/silc10/buddy.c:1527
+#: ../libpurple/protocols/silc10/silc.c:693
+#: ../libpurple/protocols/silc10/util.c:529
+msgid "Sleepy"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:108
+msgid "Spontaneous"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:109
+#: ../libpurple/protocols/mxit/roster.c:152
+#: ../libpurple/protocols/mxit/roster.c:230
+msgid "Stressed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:110
+msgid "Strong"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:111
+msgid "Surprised"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:112
+msgid "Thankful"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:113
+msgid "Thirsty"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:114
+msgid "Tired"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:115
+msgid "Undefined"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:116
+msgid "Weak"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:117
+msgid "Worried"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:81
+msgid "Set User Nickname"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:81
+msgid "Please specify a new nickname for you."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:82
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:83
+#: ../libpurple/protocols/mxit/actions.c:294
+#: ../libpurple/protocols/mxit/actions.c:392
+msgid "Set"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:103
+msgid "Set Nickname..."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/xdata.c:382
+msgid "Actions"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/xdata.c:384
+msgid "Select an action"
+msgstr ""
+
+#. 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/userlist.c:522
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr ""
+
+#: ../libpurple/protocols/msn/contact.c:1047
+#: ../libpurple/protocols/msn/contact.c:1143
+msgid "Buddy Add error"
+msgstr ""
+
+#: ../libpurple/protocols/msn/contact.c:1048
+#: ../libpurple/protocols/msn/contact.c:1144
+msgid "The username specified does not exist."
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:50
+#: ../libpurple/protocols/myspace/myspace.c:2122
+msgid "Unable to parse message"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:54
+msgid "Syntax Error (probably a client bug)"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:58
+msgid "Invalid email address"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:61
+msgid "User does not exist"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:64
+msgid "Fully qualified domain name missing"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:67
+msgid "Already logged in"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:70
+msgid "Invalid username"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:73
+msgid "Invalid friendly name"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:76
+msgid "List full"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:79
+msgid "Already there"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:83
+msgid "Not on list"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:86
+#: ../libpurple/protocols/zephyr/zephyr.c:759
+msgid "User is offline"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:89
+msgid "Already in the mode"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:93
+msgid "Already in opposite list"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:97
+msgid "Too many groups"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:100
+msgid "Invalid group"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:103
+msgid "User not in group"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:106
+msgid "Group name too long"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:109
+msgid "Cannot remove group zero"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:113
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:116
+msgid "Switchboard failed"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:120
+msgid "Notify transfer failed"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:125
+msgid "Required fields missing"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:129
+msgid "Too many hits to a FND"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:133
+#: ../libpurple/protocols/oscar/family_icbm.c:59
+#: ../libpurple/protocols/oscar/util.c:43
+msgid "Not logged in"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:137
+msgid "Service temporarily unavailable"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:140
+msgid "Database server error"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:144
+msgid "Command disabled"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:148
+msgid "File operation error"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:152
+msgid "Memory allocation error"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:156
+msgid "Wrong CHL value sent to server"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:161
+msgid "Server busy"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:164
+#: ../libpurple/protocols/msn/error.c:178
+#: ../libpurple/protocols/msn/error.c:236
+msgid "Server unavailable"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:167
+msgid "Peer notification server down"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:171
+msgid "Database connect error"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:175
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:182
+msgid "Error creating connection"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:186
+msgid "CVR parameters are either unknown or not allowed"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:190
+msgid "Unable to write"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:193
+msgid "Session overload"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:197
+msgid "User is too active"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:200
+msgid "Too many sessions"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:203
+msgid "Passport not verified"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:206
+msgid "Bad friend file"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:210
+msgid "Not expected"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:215
+msgid "Friendly name is changing too rapidly"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:224
+msgid "Server too busy"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:228
+#: ../libpurple/protocols/silc/silc.c:340
+#: ../libpurple/protocols/silc10/ops.c:1713 ../libpurple/proxy.c:1731
+msgid "Authentication failed"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:231
+msgid "Not allowed when offline"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:239
+msgid "Not accepting new users"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:242
+msgid "Kids Passport without parental consent"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:245
+msgid "Passport account not yet verified"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:248
+msgid "Passport account suspended"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:251
+msgid "Bad ticket"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:257
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:272
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:355
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:361
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:369
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+
+#: ../libpurple/protocols/msn/group.h:36
+msgid "Other Contacts"
+msgstr ""
+
+#: ../libpurple/protocols/msn/group.h:39
+msgid "Non-IM Contacts"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msg.c:799
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msg.c:805
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msg.c:825
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msg.c:831
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msg.c:1118
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:137
+msgid "Nudge"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:138
+#, c-format
+msgid "%s has nudged you!"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:138
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:151
+#: ../libpurple/protocols/myspace/myspace.c:3002
+msgid "Email Address..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:183 ../libpurple/protocols/msn/msn.c:261
+msgid "Your new MSN friendly name is too long."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:445
+#, c-format
+msgid "Set friendly name for %s."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:447
+msgid "Set Friendly Name"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:448
+msgid "This is the name that other MSN buddies will see you as."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:524
+msgid "This Location"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:526
+msgid "This is the name that identifies this location"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:535
+msgid "Other Locations"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:550
+msgid "You can sign out from other locations here"
+msgstr ""
+
+#. TODO: Due to limitations in our current request field API, the
+#. following string will show up with a trailing colon.  This should
+#. be fixed either by adding an "include_colon" boolean, or creating
+#. a separate purple_request_field_label_new_without_colon function,
+#. or by never automatically adding the colon and requiring that
+#. callers add the colon themselves.
+#: ../libpurple/protocols/msn/msn.c:565
+msgid "You are not signed in from any other locations."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:632
+msgid "Allow multiple logins?"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:633
+msgid ""
+"Do you want to allow or disallow connecting from multiple locations "
+"simultaneously?"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:638 ../libpurple/protocols/msn/msn.c:708
+msgid "Allow"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:639 ../libpurple/protocols/msn/msn.c:709
+msgid "Disallow"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:652
+msgid "Set your home phone number."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:669
+msgid "Set your work phone number."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:686
+msgid "Set your mobile phone number."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:701
+msgid "Allow MSN Mobile pages?"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:702
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:724
+#, c-format
+msgid "Blocked Text for %s"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:726
+msgid "No text is blocked for this account."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:729
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:750
+msgid "This account does not have email enabled."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:791
+msgid "Send a mobile message."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:793
+msgid "Page"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1049
+msgid "Playing a game"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1052
+#: ../libpurple/protocols/oscar/family_locate.c:446
+msgid "Working"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1122
+msgid "Has you"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1130
+#: ../libpurple/protocols/yahoo/libymsg.c:4045
+#: ../libpurple/protocols/yahoo/yahoo_aliases.c:548
+msgid "Home Phone Number"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1134
+#: ../libpurple/protocols/yahoo/libymsg.c:4046
+#: ../libpurple/protocols/yahoo/yahoo_aliases.c:549
+msgid "Work Phone Number"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1138
+#: ../libpurple/protocols/yahoo/libymsg.c:4047
+#: ../libpurple/protocols/yahoo/yahoo_aliases.c:550
+msgid "Mobile Phone Number"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1161 ../libpurple/protocols/msn/state.c:39
+#: ../libpurple/protocols/yahoo/libymsg.c:3854
+#: ../libpurple/protocols/yahoo/libymsg.c:4880
+msgid "Be Right Back"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1167 ../libpurple/protocols/msn/state.c:37
+#: ../libpurple/protocols/novell/novell.c:2850
+#: ../libpurple/protocols/novell/novell.c:2980
+#: ../libpurple/protocols/oscar/family_locate.c:409
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1500
+#: ../libpurple/protocols/silc10/silc.c:48
+#: ../libpurple/protocols/yahoo/libymsg.c:3856
+#: ../libpurple/protocols/yahoo/libymsg.c:4884
+#: ../pidgin/plugins/themeedit-icon.c:66
+msgid "Busy"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1172
+#: ../libpurple/protocols/yahoo/libymsg.c:3864
+#: ../libpurple/protocols/yahoo/libymsg.c:4898
+msgid "On the Phone"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1177
+#: ../libpurple/protocols/yahoo/libymsg.c:3868
+#: ../libpurple/protocols/yahoo/libymsg.c:4904
+msgid "Out to Lunch"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1199
+msgid "Game Title"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1200
+msgid "Office Title"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1218
+msgid "Set Friendly Name..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1225
+msgid "View Locations..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1231
+msgid "Set Home Phone Number..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1235
+msgid "Set Work Phone Number..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1239
+msgid "Set Mobile Phone Number..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1245
+msgid "Enable/Disable Mobile Devices..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1250
+msgid "Allow/Disallow Multiple Logins..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1254
+msgid "Allow/Disallow Mobile Pages..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1261
+msgid "View Blocked Text..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1267
+msgid "Open Hotmail Inbox"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1290
+msgid "Send to Mobile"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1338
+msgid ""
+"SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1803
+#, 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/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/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
+msgid "General"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2436
+#: ../libpurple/protocols/mxit/profile.c:296
+#: ../libpurple/protocols/myspace/user.c:127
+#: ../libpurple/protocols/oscar/userinfo.c:454
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1080
+msgid "Age"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2438
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1095
+msgid "Occupation"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2439
+#: ../libpurple/protocols/myspace/user.c:135
+#: ../libpurple/protocols/novell/novell.c:1491
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1075
+#: ../libpurple/protocols/zephyr/zephyr.c:807
+#: ../libpurple/protocols/zephyr/zephyr.c:1188
+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
+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
+msgid "A Little About Me"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2467
+msgid "Social"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2469
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
+msgid "Marital Status"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2470
+msgid "Interests"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2471
+msgid "Pets"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2472
+msgid "Hometown"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2473
+msgid "Places Lived"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2474
+msgid "Fashion"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2475
+msgid "Humor"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2476
+msgid "Music"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2477 ../libpurple/protocols/msn/msn.c:2658
+#: ../libpurple/protocols/msn/msn.c:2664
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1137
+msgid "Favorite Quote"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2494
+msgid "Contact Info"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2495
+msgid "Personal"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2498
+msgid "Significant Other"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2499
+msgid "Home Phone"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2500
+msgid "Home Phone 2"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2501
+#: ../libpurple/protocols/oscar/userinfo.c:464
+msgid "Home Address"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2502
+msgid "Personal Mobile"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2503
+msgid "Home Fax"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2504
+msgid "Personal Email"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2505
+msgid "Personal IM"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2507
+msgid "Anniversary"
+msgstr ""
+
+#. Business
+#: ../libpurple/protocols/msn/msn.c:2523
+msgid "Work"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2526
+#: ../libpurple/protocols/oscar/userinfo.c:482
+msgid "Company"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2527
+#: ../libpurple/protocols/novell/novell.c:1493
+msgid "Department"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2528
+msgid "Profession"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2529
+msgid "Work Phone"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2530
+msgid "Work Phone 2"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2531
+#: ../libpurple/protocols/oscar/userinfo.c:472
+msgid "Work Address"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2532
+msgid "Work Mobile"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2533
+msgid "Work Pager"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2534
+msgid "Work Fax"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2535
+msgid "Work Email"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2536
+msgid "Work IM"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2537
+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
+msgid "Favorite Things"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2672
+msgid "Last Updated"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2683
+#: ../libpurple/protocols/silc/ops.c:1043
+#: ../libpurple/protocols/silc10/ops.c:1060
+msgid "Homepage"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2709
+msgid "The user has not created a public profile."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2710
+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
+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/myspace/user.c:194
+#: ../libpurple/protocols/myspace/user.c:197
+#: ../libpurple/protocols/oscar/userinfo.c:544
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1237
+msgid "View web profile"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *< summary
+#: ../libpurple/protocols/msn/msn.c:3020 ../libpurple/protocols/msn/msn.c:3021
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:3055
+msgid "Use HTTP Method"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:3060
+msgid "HTTP Method Server"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:3065
+msgid "Show custom smileys"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:3070
+msgid "Allow direct connections"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:3075
+msgid "Allow connecting from multiple locations"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:3083
+msgid "nudge: nudge a user to get their attention"
+msgstr ""
+
+#: ../libpurple/protocols/msn/nexus.c:358
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr ""
+
+#: ../libpurple/protocols/msn/nexus.c:365
+msgid "Windows Live ID authentication:Invalid response"
+msgstr ""
+
+#: ../libpurple/protocols/msn/notification.c:819
+msgid "The following users are missing from your addressbook"
+msgstr ""
+
+#: ../libpurple/protocols/msn/notification.c:827
+#: ../libpurple/protocols/msn/notification.c:874
+#, c-format
+msgid "Unknown error (%d): %s"
+msgstr ""
+
+#: ../libpurple/protocols/msn/notification.c:831
+#: ../libpurple/protocols/msn/notification.c:855
+#: ../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/yahoo/libymsg.c:1997
+#, c-format
+msgid "Unknown error (%d)"
+msgstr ""
+
+#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:901
+msgid "Unable to remove user"
+msgstr ""
+
+#: ../libpurple/protocols/msn/notification.c:1200
+msgid "Mobile message was not sent because it was too long."
+msgstr ""
+
+#: ../libpurple/protocols/msn/notification.c:1202
+msgid "Mobile message was not sent because an unknown error occurred."
+msgstr ""
+
+#: ../libpurple/protocols/msn/notification.c:2204
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/msn/oim.c:406
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+
+#: ../libpurple/protocols/msn/oim.c:411
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+
+#: ../libpurple/protocols/msn/oim.c:415
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+
+#: ../libpurple/protocols/msn/oim.c:419
+msgid "Message was not sent because an unknown error occurred."
+msgstr ""
+
+#: ../libpurple/protocols/msn/servconn.c:145
+msgid "Writing error"
+msgstr ""
+
+#: ../libpurple/protocols/msn/servconn.c:147
+msgid "Reading error"
+msgstr ""
+
+#: ../libpurple/protocols/msn/servconn.c:169
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
+"%s"
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:376
+msgid "Our protocol is not supported by the server"
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:381
+msgid "Error parsing HTTP"
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:385
+#: ../libpurple/protocols/novell/novell.c:2033
+#: ../libpurple/protocols/oscar/flap_connection.c:468
+#: ../libpurple/protocols/yahoo/libymsg.c:163
+msgid "You have signed on from another location"
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:391
+msgid ""
+"The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:397
+msgid "The MSN servers are going down temporarily"
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:402
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:411
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:433
+#: ../libpurple/protocols/msn/session.c:435
+msgid "Handshaking"
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:434
+msgid "Transferring"
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:436
+msgid "Starting authentication"
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:437
+msgid "Getting cookie"
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:439
+msgid "Sending cookie"
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:440
+msgid "Retrieving buddy list"
+msgstr ""
+
+#: ../libpurple/protocols/msn/slpcall.c:580
+#, c-format
+msgid ""
+"%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#: ../libpurple/protocols/msn/slpcall.c:602
+#, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+
+#: ../libpurple/protocols/msn/state.c:40
+msgid "Away From Computer"
+msgstr ""
+
+#: ../libpurple/protocols/msn/state.c:41
+msgid "On The Phone"
+msgstr ""
+
+#: ../libpurple/protocols/msn/state.c:42
+msgid "Out To Lunch"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:464
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:500
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:504
+msgid "Message could not be sent because the user is offline:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:508
+msgid "Message could not be sent because a connection error occurred:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:512
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:516
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:523
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:531
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/userlist.c:468
+msgid "Delete Buddy from Address Book?"
+msgstr ""
+
+#: ../libpurple/protocols/msn/userlist.c:469
+msgid "Do you want to delete this buddy from your address book as well?"
+msgstr ""
+
+#: ../libpurple/protocols/msn/userlist.c:525
+msgid "The username specified is invalid."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:62
+msgid "The Display Name you entered is invalid."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:69
+#: ../libpurple/protocols/mxit/login.c:250
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+
+#. show error to user
+#: ../libpurple/protocols/mxit/actions.c:197
+msgid "Profile Update Error"
+msgstr ""
+
+#. no profile information yet, so we cannot update
+#. (reference: "libpurple/request.h")
+#: ../libpurple/protocols/mxit/actions.c:221
+#: ../libpurple/protocols/mxit/actions.c:294
+#: ../libpurple/protocols/oscar/userinfo.c:536
+msgid "Profile"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:221
+msgid ""
+"Your profile information is not yet retrieved. Please try again later."
+msgstr ""
+
+#. display name
+#. nick name (required)
+#: ../libpurple/protocols/mxit/actions.c:232
+#: ../libpurple/protocols/mxit/login.c:338
+#: ../libpurple/protocols/mxit/profile.c:178
+#: ../libpurple/protocols/mxit/profile.c:288
+msgid "Display Name"
+msgstr ""
+
+#. about me
+#: ../libpurple/protocols/mxit/actions.c:256
+#: ../libpurple/protocols/mxit/profile.c:192
+msgid "About Me"
+msgstr ""
+
+#. where I live
+#: ../libpurple/protocols/mxit/actions.c:260
+#: ../libpurple/protocols/mxit/profile.c:194
+msgid "Where I Live"
+msgstr ""
+
+#. mobile number
+#: ../libpurple/protocols/mxit/actions.c:279
+msgid "Mobile Number"
+msgstr ""
+
+#. is searchable
+#: ../libpurple/protocols/mxit/actions.c:283
+msgid "Can be searched"
+msgstr ""
+
+#. is suggestable
+#: ../libpurple/protocols/mxit/actions.c:287
+msgid "Can be suggested"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:294
+msgid "Update your MXit Profile"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:322
+#: ../libpurple/protocols/mxit/login.c:261
+msgid "The PIN you entered is invalid."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:327
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:332
+#: ../libpurple/protocols/mxit/login.c:271
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:338
+#: ../libpurple/protocols/mxit/login.c:277
+msgid "The two PINs you entered do not match."
+msgstr ""
+
+#. show error to user
+#: ../libpurple/protocols/mxit/actions.c:356
+msgid "PIN Update Error"
+msgstr ""
+
+#. pin
+#. pin (required)
+#: ../libpurple/protocols/mxit/actions.c:382
+#: ../libpurple/protocols/mxit/login.c:355
+msgid "PIN"
+msgstr ""
+
+#. verify pin
+#: ../libpurple/protocols/mxit/actions.c:387
+#: ../libpurple/protocols/mxit/login.c:359
+msgid "Verify PIN"
+msgstr ""
+
+#. (reference: "libpurple/request.h")
+#: ../libpurple/protocols/mxit/actions.c:392
+msgid "Change PIN"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:392
+msgid "Change MXit PIN"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:410
+msgid "View Splash"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:410
+msgid "There is no splash-screen currently available"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:430
+msgid "About"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:478
+msgid "Search for user"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:479
+msgid "Search for a MXit contact"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:480
+msgid "Type search information"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/actions.c:482
+#: ../libpurple/protocols/oscar/oscar.c:5364
+msgid "_Search"
+msgstr ""
+
+#. display / change profile
+#: ../libpurple/protocols/mxit/actions.c:502
+msgid "Change Profile..."
+msgstr ""
+
+#. change PIN
+#: ../libpurple/protocols/mxit/actions.c:506
+msgid "Change PIN..."
+msgstr ""
+
+#. suggested friends
+#: ../libpurple/protocols/mxit/actions.c:510
+msgid "Suggested friends..."
+msgstr ""
+
+#. search for contacts
+#: ../libpurple/protocols/mxit/actions.c:514
+msgid "Search for contacts..."
+msgstr ""
+
+#. display splash-screen
+#: ../libpurple/protocols/mxit/actions.c:518
+msgid "View Splash..."
+msgstr ""
+
+#. display plugin version
+#: ../libpurple/protocols/mxit/actions.c:522
+msgid "About..."
+msgstr ""
+
+#. the file is too big
+#: ../libpurple/protocols/mxit/filexfer.c:129
+msgid "The file you are trying to send is too large!"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/http.c:276
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:106
+msgid "Logging In..."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:168
+#: ../libpurple/protocols/mxit/login.c:205
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:193
+msgid "Connecting..."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:242
+msgid "The Display Name you entered is too short."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:266
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr ""
+
+#. mxit login name
+#: ../libpurple/protocols/mxit/login.c:333
+msgid "MXit ID"
+msgstr ""
+
+#. show the form to the user to complete
+#: ../libpurple/protocols/mxit/login.c:365
+msgid "Register New MXit Account"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:365
+msgid "Please fill in the following fields:"
+msgstr ""
+
+#. no reply from the WAP site
+#: ../libpurple/protocols/mxit/login.c:394
+#: ../libpurple/protocols/mxit/login.c:614
+msgid "Error contacting the MXit WAP site. Please try again later."
+msgstr ""
+
+#. wapserver error
+#. server could not find the user
+#: ../libpurple/protocols/mxit/login.c:403
+#: ../libpurple/protocols/mxit/login.c:623
+msgid ""
+"MXit is currently unable to process the request. Please try again later."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:413
+msgid "Wrong security code entered. Please try again later."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:416
+msgid "Your session has expired. Please try again later."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:419
+msgid "Invalid country selected. Please try again."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:422
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:425
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:432
+msgid "Internal error. Please try again later."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:523
+msgid "You did not enter the security code"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:641
+msgid "Security Code"
+msgstr ""
+
+#. ask for input (required)
+#: ../libpurple/protocols/mxit/login.c:645
+msgid "Enter Security Code"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:651
+msgid "Your Country"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:672
+msgid "Your Language"
+msgstr ""
+
+#. display the form to the user and wait for his/her input
+#: ../libpurple/protocols/mxit/login.c:689
+msgid "MXit Authorization"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:689
+msgid "MXit account validation"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/login.c:711
+msgid "Retrieving User Information..."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/multimx.c:215
+msgid "was kicked"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/multimx.c:230
+msgid "You have been kicked from this MultiMX."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/multimx.c:439
+msgid "_Room Name:"
+msgstr ""
+
+#. Display system message in chat window
+#: ../libpurple/protocols/mxit/multimx.c:574
+msgid "You have invited"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/mxit.c:215
+msgid "Loading menu..."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/mxit.c:348
+#: ../libpurple/protocols/mxit/profile.c:214
+#: ../libpurple/protocols/mxit/profile.c:239
+msgid "Status Message"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/mxit.c:360
+msgid "Rejection Message"
+msgstr ""
+
+#. hidden number
+#: ../libpurple/protocols/mxit/mxit.c:364
+#: ../libpurple/protocols/mxit/profile.c:220
+msgid "Hidden Number"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/mxit.c:582
+msgid "No profile available"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/mxit.c:582
+msgid "This contact does not have a profile."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/mxit.c:601
+msgid "Your MXit ID..."
+msgstr ""
+
+#. contact is in Deleted, Rejected or None state
+#: ../libpurple/protocols/mxit/mxit.c:655
+msgid "Re-Invite"
+msgstr ""
+
+#. Configuration options
+#. WAP server (reference: "libpurple/accountopt.h")
+#: ../libpurple/protocols/mxit/mxit.c:799
+msgid "WAP Server"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/mxit.c:802
+msgid "Connect via HTTP"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/mxit.c:805
+msgid "Enable splash-screen popup"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/profile.c:204
+msgid "Last Online"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/profile.c:229
+msgid "Invite Message"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/profile.c:277
+msgid "No results"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/profile.c:277
+msgid "No contacts found."
+msgstr ""
+
+#. define columns
+#: ../libpurple/protocols/mxit/profile.c:286
+msgid "UserId"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/profile.c:298
+msgid "Where I live"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/profile.c:325
+#, c-format
+msgid "You have %i suggested friend."
+msgid_plural "You have %i suggested friends."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/mxit/profile.c:327
+#, c-format
+msgid "We found %i contact that matches your search."
+msgid_plural "We found %i contacts that match your search."
+msgstr[0] ""
+msgstr[1] ""
+
+#. we must have lost the connection, so terminate it so that we can reconnect
+#: ../libpurple/protocols/mxit/protocol.c:411
+msgid "We have lost the connection to MXit. Please reconnect."
+msgstr ""
+
+#. packet could not be queued for transmission
+#: ../libpurple/protocols/mxit/protocol.c:507
+msgid "Message Send Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:507
+msgid "Unable to process your request at this time"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:533
+msgid "Timeout while waiting for a response from the MXit server."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:1459
+msgid "Successfully Logged In..."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:1554
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:1555
+#: ../libpurple/protocols/mxit/protocol.c:2389
+msgid "Message Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2195
+msgid "Cannot perform redirect using the specified protocol"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2358
+msgid "An internal MXit server error occurred."
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2377
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2382
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2386
+msgid "Contact Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2392
+msgid "Message Sending Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2395
+msgid "Status Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2398
+msgid "Mood Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2409
+msgid "Invitation Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2412
+msgid "Contact Removal Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2416
+msgid "Subscription Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2419
+msgid "Contact Update Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2422
+msgid "File Transfer Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2425
+msgid "Cannot create MultiMx room"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2428
+msgid "MultiMx Invitation Error"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2432
+msgid "Profile Error"
+msgstr ""
+
+#. bad packet
+#: ../libpurple/protocols/mxit/protocol.c:2646
+msgid "Invalid packet received from MXit."
+msgstr ""
+
+#. connection error
+#: ../libpurple/protocols/mxit/protocol.c:2711
+msgid "A connection error occurred to MXit. (read stage 0x01)"
+msgstr ""
+
+#. connection closed
+#: ../libpurple/protocols/mxit/protocol.c:2716
+msgid "A connection error occurred to MXit. (read stage 0x02)"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/protocol.c:2726
+msgid "A connection error occurred to MXit. (read stage 0x03)"
+msgstr ""
+
+#. malformed packet length record (too long)
+#: ../libpurple/protocols/mxit/protocol.c:2737
+msgid "A connection error occurred to MXit. (read stage 0x04)"
+msgstr ""
+
+#. connection error
+#: ../libpurple/protocols/mxit/protocol.c:2748
+msgid "A connection error occurred to MXit. (read stage 0x05)"
+msgstr ""
+
+#. connection closed
+#: ../libpurple/protocols/mxit/protocol.c:2753
+msgid "A connection error occurred to MXit. (read stage 0x06)"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/roster.c:210
+#: ../libpurple/protocols/silc/buddy.c:1518
+#: ../libpurple/protocols/silc/util.c:535
+#: ../libpurple/protocols/silc10/buddy.c:1525
+#: ../libpurple/protocols/silc10/util.c:527
+msgid "In Love"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/roster.c:254
+msgid "Pending"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/roster.c:256
+msgid "Invited"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/roster.c:258
+msgid "Rejected"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/roster.c:260
+msgid "Deleted"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/splashscreen.c:206
+#: ../libpurple/protocols/mxit/splashscreen.c:210
+msgid "MXit Advertising"
+msgstr ""
+
+#: ../libpurple/protocols/mxit/splashscreen.c:207
+msgid "More Information"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:136
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:138
+msgid "User lookup"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:693
+msgid "Reading challenge"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:703
+msgid "Unexpected challenge length from server"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:707
+msgid "Logging in"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:803
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:804
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:805
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:840
+msgid "Lost connection with server"
+msgstr ""
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
+#: ../libpurple/protocols/myspace/myspace.c:881
+msgid "New mail messages"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:882
+msgid "New blog comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:883
+msgid "New profile comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:884
+msgid "New friend requests!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:885
+msgid "New picture comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:909
+msgid "MySpace"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1011
+msgid "IM Friends"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1143
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1147
+msgid "Add contacts from server"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1824
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1846
+#, c-format
+msgid ""
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at "
+"http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePas"
+"sword and try again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1859
+#: ../libpurple/protocols/novell/nmuser.c:1921
+msgid "Incorrect username or password"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1871
+msgid "MySpaceIM Error"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2032
+msgid "Invalid input condition"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2657
+#: ../libpurple/protocols/myspace/myspace.c:2691
+msgid "Failed to add buddy"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2657
+msgid "'addbuddy' command failed."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2691
+#: ../libpurple/protocols/myspace/myspace.c:2741
+msgid "persist command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2722
+#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2754
+msgid "Failed to remove buddy"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2722
+msgid "'delbuddy' command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2754
+msgid "blocklist command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3100
+msgid "Missing Cipher"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3101
+msgid "The RC4 cipher could not be found"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3102
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3129
+#: ../libpurple/protocols/myspace/myspace.c:3192
+msgid "Add friends from MySpace.com"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3130
+msgid "Importing friends failed"
+msgstr ""
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:3185
+msgid "Find people..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3188
+msgid "Change IM name..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3574
+msgid "myim URL handler"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3575
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3576
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3637
+msgid "Show display name in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3640
+msgid "Show headline in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3645
+msgid "Send emoticons"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3650
+msgid "Screen resolution (dots per inch)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3653
+msgid "Base font size (points)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:120
+#: ../libpurple/protocols/zephyr/zephyr.c:794
+#: ../libpurple/protocols/zephyr/zephyr.c:1176
+msgid "User"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:140
+msgid "Headline"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:156
+msgid "Song"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:166
+msgid "Total Friends"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:184
+msgid "Client Version"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:632
+#: ../libpurple/protocols/myspace/user.c:786
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:806
+msgid "MySpaceIM - Username Available"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:807
+msgid "This username is available. Would you like to set it?"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:808
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:819
+#: ../libpurple/protocols/myspace/user.c:880
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:820
+msgid "This username is unavailable."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:821
+msgid "Please try another username:"
+msgstr ""
+
+#. Protocol won't log in now without a username set.. Disconnect
+#: ../libpurple/protocols/myspace/user.c:870
+msgid "No username set"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:881
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
+#. TODO: icons for each zap
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:217
+msgid "Zap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "%s has zapped you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Whack"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "%s has whacked you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:54
+msgid "Torch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:55
+#, c-format
+msgid "%s has torched you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:55
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:58
+msgid "Smooch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
+msgid "%s has smooched you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:62
+msgid "Hug"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
+msgid "%s has hugged you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:63
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:66
+msgid "Slap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:67
+#, c-format
+msgid "%s has slapped you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:67
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:70
+msgid "Goose"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
+msgid "%s has goosed you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
+msgid "Goosing %s..."
+msgstr ""
+
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
+msgid "High-five"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:77
+#, c-format
+msgid "%s has high-fived you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:77
+#, c-format
+msgid "High-fiving %s..."
+msgstr ""
+
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:82
+msgid "Punk"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:83
+#, c-format
+msgid "%s has punk'd you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:83
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:92
+msgid "Raspberry"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:93
+#, c-format
+msgid "%s has raspberried you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:93
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1863
+msgid "Required parameters not passed in"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1866
+msgid "Unable to write to network"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1869
+msgid "Unable to read from network"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1872
+msgid "Error communicating with server"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1876
+msgid "Conference not found"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1879
+msgid "Conference does not exist"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1883
+msgid "A folder with that name already exists"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1886
+msgid "Not supported"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1890
+msgid "Password has expired"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1893
+#: ../libpurple/protocols/oscar/clientlogin.c:487
+#: ../libpurple/protocols/oscar/oscar.c:1096
+#: ../libpurple/protocols/simple/simple.c:1127
+#: ../libpurple/protocols/yahoo/libymsg.c:1963
+msgid "Incorrect password"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1899
+msgid "Account has been disabled"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1902
+msgid "The server could not access the directory"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1905
+msgid "Your system administrator has disabled this operation"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1908
+msgid "The server is unavailable; try again later"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1911
+msgid "Cannot add a contact to the same folder twice"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1914
+msgid "Cannot add yourself"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1917
+msgid "Master archive is misconfigured"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1924
+msgid "Could not recognize the host of the username you entered"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1927
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1930
+msgid "You cannot add the same person twice to a conversation"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1934
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1937
+msgid "You have entered an incorrect username"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1940
+msgid "An error occurred while updating the directory"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1943
+msgid "Incompatible protocol version"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1946
+msgid "The user has blocked you"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1949
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1952
+msgid "The user is either offline or you are blocked"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1955
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:124
+#, c-format
+msgid "Unable to login: %s"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:255
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:404
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr ""
+
+#. TODO: Improve this! message to who or for what conference?
+#: ../libpurple/protocols/novell/novell.c:430
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:540
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:545
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:592
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:640
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:713
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:806
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:859
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:927
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1661
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1020
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1707
+msgid "Error communicating with server. Closing connection."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1489
+msgid "Telephone Number"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1495
+msgid "Personal Title"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1499
+msgid "Mailstop"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/sametime/sametime.c:4170
+msgid "User ID"
+msgstr ""
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. purple_notify_user_info_add_pair(user_info, tag, value);
+#. }
+#. 
+#: ../libpurple/protocols/novell/novell.c:1528
+msgid "Full name"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1651
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1734
+msgid "Authenticating..."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1751
+msgid "Waiting for response..."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1886
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1914
+msgid "Invitation to Conversation"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1915
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:1917
+msgid "Would you like to join the conversation?"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:2089
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:2189
+msgid ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:2526
+msgid "This conference has been closed. No more messages can be sent."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/novell/novell.c:3552
+#: ../libpurple/protocols/novell/novell.c:3554
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:3579
+msgid "Server address"
+msgstr ""
+
+#: ../libpurple/protocols/novell/novell.c:3583
+msgid "Server port"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/authorization.c:51
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/authorization.c:87
+#: ../libpurple/protocols/oscar/authorization.c:97
+#: ../libpurple/protocols/oscar/oscar.c:1964
+#: ../libpurple/protocols/oscar/oscar.c:4384
+#: ../libpurple/protocols/yahoo/libymsg.c:1288
+msgid "No reason given."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/authorization.c:96
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. 
+#: ../libpurple/protocols/oscar/authorization.c:98
+#: ../libpurple/protocols/oscar/oscar.c:1223
+#: ../libpurple/protocols/oscar/oscar.c:4967
+#: ../libpurple/protocols/oscar/oscar.c:5307 ../libpurple/request.h:1498
+msgid "_OK"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/clientlogin.c:116
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/clientlogin.c:118
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/clientlogin.c:237
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/clientlogin.c:283
+#: ../libpurple/protocols/oscar/oscar.c:1298
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#: ../libpurple/protocols/oscar/clientlogin.c:337
+#: ../libpurple/protocols/oscar/clientlogin.c:572
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/clientlogin.c:339
+#: ../libpurple/protocols/oscar/clientlogin.c:574
+msgid "The server returned an empty response"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/clientlogin.c:491
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/clientlogin.c:496
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/encoding.c:133
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/encoding.c:249
+#, c-format
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_chatnav.c:65
+msgid "Could not join chat room"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_chatnav.c:66
+msgid "Invalid chat room name"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:58
+#: ../libpurple/protocols/oscar/util.c:39
+msgid "Invalid error"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:60
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:61
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:62
+msgid "Cannot send SMS"
+msgstr ""
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#: ../libpurple/protocols/oscar/family_icbm.c:63
+msgid "Cannot send SMS to this country"
+msgstr ""
+
+#. Undocumented
+#: ../libpurple/protocols/oscar/family_icbm.c:66
+msgid "Cannot send SMS to unknown country"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:67
+msgid "Bot accounts cannot initiate IMs"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:68
+msgid "Bot account cannot IM this user"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:69
+msgid "Bot account reached IM limit"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:70
+msgid "Bot account reached daily IM limit"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:71
+msgid "Bot account reached monthly IM limit"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:72
+msgid "Unable to receive offline messages"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:73
+msgid "Offline message store full"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:172
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:175
+#, c-format
+msgid "Unable to send message: %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:180
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_icbm.c:184
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:408
+msgid "Thinking"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:410
+msgid "Shopping"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:414
+msgid "Questioning"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:416
+msgid "Eating"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:417
+msgid "Watching a movie"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:419 ../pidgin/gtkconv.c:6818
+#: ../pidgin/gtkstatusbox.c:714
+msgid "Typing"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:420
+msgid "At the office"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:421
+msgid "Taking a bath"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:422
+msgid "Watching TV"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:423
+msgid "Having fun"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:424
+msgid "Sleeping"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:425
+msgid "Using a PDA"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:429
+msgid "Meeting friends"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:430
+msgid "On the phone"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:431
+msgid "Surfing"
+msgstr ""
+
+#. "I am mobile." / "John is mobile."
+#: ../libpurple/protocols/oscar/family_locate.c:433 ../libpurple/status.c:168
+msgid "Mobile"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:434
+msgid "Searching the web"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:435
+msgid "At a party"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:436
+msgid "Having Coffee"
+msgstr ""
+
+#. Playing video games
+#: ../libpurple/protocols/oscar/family_locate.c:438
+msgid "Gaming"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:439
+msgid "Browsing the web"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:440
+msgid "Smoking"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:441
+msgid "Writing"
+msgstr ""
+
+#. Drinking [Alcohol]
+#: ../libpurple/protocols/oscar/family_locate.c:443
+msgid "Drinking"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:444 ../libpurple/status.c:169
+msgid "Listening to music"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:445
+msgid "Studying"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/family_locate.c:447
+msgid "In the restroom"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/flap_connection.c:477
+#: ../libpurple/proxy.c:1496 ../libpurple/proxy.c:1526
+#: ../libpurple/proxy.c:1606 ../libpurple/proxy.c:1677
+#: ../libpurple/proxy.c:1778 ../libpurple/proxy.c:1917
+msgid "Received invalid data on connection with server"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/oscar/libaim.c:123
+#: ../libpurple/protocols/oscar/libaim.c:125
+msgid "AIM Protocol Plugin"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/libicq.c:35
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/oscar/libicq.c:133
+#: ../libpurple/protocols/oscar/libicq.c:135
+msgid "ICQ Protocol Plugin"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/libicq.c:162
+#: ../libpurple/protocols/yahoo/libyahoo.c:326
+#: ../libpurple/protocols/yahoo/libyahoojp.c:222
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
+msgid "Encoding"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/odc.c:43
+msgid "The remote user has closed the connection."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/odc.c:45
+msgid "The remote user has declined your request."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/odc.c:47
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/odc.c:50
+msgid "Received invalid data on connection with remote user."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/odc.c:52
+msgid "Unable to establish a connection with the remote user."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/odc.c:561
+msgid "Direct IM established"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oft.c:666
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:157
+#: ../libpurple/protocols/oscar/oscar.c:4802
+msgid "Free For Chat"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:161
+#: ../libpurple/protocols/oscar/oscar.c:4884
+msgid "Not Available"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:163
+#: ../libpurple/protocols/oscar/oscar.c:4870
+msgid "Occupied"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:167
+msgid "Web Aware"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:169
+#: ../libpurple/protocols/yahoo/libymsg.c:3872 ../libpurple/status.c:165
+#: ../pidgin/gtkdocklet.c:562 ../pidgin/gtkstatusbox.c:1099
+msgid "Invisible"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:171
+#: ../libpurple/protocols/oscar/oscar.c:4810
+msgid "Evil"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:173
+#: ../libpurple/protocols/oscar/oscar.c:4818
+msgid "Depression"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:175
+#: ../libpurple/protocols/oscar/oscar.c:4826
+msgid "At home"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:177
+#: ../libpurple/protocols/oscar/oscar.c:4834
+msgid "At work"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:179
+msgid "At lunch"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:309
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:317
+#, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:376
+msgid "Username sent"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:380
+msgid "Connection established, cookie sent"
+msgstr ""
+
+#. TODO: Don't call this with ssi
+#: ../libpurple/protocols/oscar/oscar.c:461
+msgid "Finalizing connection"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:737
+#, c-format
+msgid ""
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:762
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:896
+#: ../libpurple/protocols/oscar/oscar.c:937
+#: ../libpurple/protocols/oscar/oscar.c:1010
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:900
+#: ../libpurple/protocols/oscar/oscar.c:941
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1014
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1057
+#: ../libpurple/protocols/oscar/oscar.c:1176
+msgid "Received authorization"
+msgstr ""
+
+#. Unregistered username
+#. the username does not exist
+#: ../libpurple/protocols/oscar/oscar.c:1090
+#: ../libpurple/protocols/yahoo/libymsg.c:1974
+#: ../libpurple/protocols/yahoo/libymsg.c:2237
+msgid "Username does not exist"
+msgstr ""
+
+#. Suspended account
+#: ../libpurple/protocols/oscar/oscar.c:1100
+msgid "Your account is currently suspended"
+msgstr ""
+
+#. service temporarily unavailable
+#: ../libpurple/protocols/oscar/oscar.c:1105
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr ""
+
+#. username connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1109
+msgid ""
+"Your username has been connecting and disconnecting too frequently. Wait ten "
+"minutes and try again. If you continue to try, you will need to wait even "
+"longer."
+msgstr ""
+
+#. client too old
+#: ../libpurple/protocols/oscar/oscar.c:1114
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr ""
+
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1121
+msgid ""
+"Your IP address has been connecting and disconnecting too frequently. Wait a "
+"minute and try again. If you continue to try, you will need to wait even "
+"longer."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1204
+msgid "The SecurID key entered is invalid"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1220
+msgid "Enter SecurID"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1221
+msgid "Enter the 6 digit number from the digital display."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1259
+msgid "Password sent"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1350
+msgid "Unable to initialize connection"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1964
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1965
+msgid "ICQ authorization denied."
+msgstr ""
+
+#. Someone has granted you authorization
+#: ../libpurple/protocols/oscar/oscar.c:1972
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1980
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1988
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1996
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2030
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2038
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2043 ../pidgin/gtkroomlist.c:325
+#: ../pidgin/plugins/disco/gtkdisco.c:692
+msgid "_Add"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2044
+msgid "_Decline"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2192
+#, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgid_plural "You missed %hu messages from %s because they were invalid."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2201
+#, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgid_plural "You missed %hu messages from %s because they were too large."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2210
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2219
+#, c-format
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2228
+#, c-format
+msgid ""
+"You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2237
+#, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2436
+msgid "Your AIM connection may be lost."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2782
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2852
+msgid "The new formatting is invalid."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2853
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:2987
+msgid "Pop-Up Message"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3027
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3058
+#, c-format
+msgid "No results found for email address %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3079
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3081
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3114
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3116
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3118
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3120
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3122
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many usernames associated with it."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3124
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3126
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3128
+msgid "Error Changing Account Info"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3134
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3136
+msgid "Account Info"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3324
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3553
+msgid "Unable to set AIM profile."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3554
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3568
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3573
+msgid "Profile too long."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3602
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3607
+msgid "Away message too long."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3843
+msgid "Unable to Retrieve Buddy List"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3844
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few minutes."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4027
+#: ../libpurple/protocols/oscar/oscar.c:4029
+#: ../libpurple/protocols/oscar/oscar.c:4253
+#: ../libpurple/protocols/oscar/oscar.c:4254
+#: ../libpurple/protocols/oscar/oscar.c:4259
+msgid "Orphans"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4178
+#, c-format
+msgid ""
+"Unable to add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4178
+#: ../libpurple/protocols/oscar/oscar.c:4193
+msgid "(no name)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4192
+#, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4309
+#, c-format
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4317
+msgid "Authorization Given"
+msgstr ""
+
+#. Granted
+#: ../libpurple/protocols/oscar/oscar.c:4380
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4381
+msgid "Authorization Granted"
+msgstr ""
+
+#. Denied
+#: ../libpurple/protocols/oscar/oscar.c:4384
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4385
+msgid "Authorization Denied"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4423
+msgid "_Exchange:"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4539
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4796
+msgid "iTunes Music Store Link"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4843
+msgid "Lunch"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4964
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4965
+msgid "Buddy Comment:"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5014
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5018
+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
+msgid "C_onnect"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5062
+msgid "You closed the connection."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5122
+msgid "Get AIM Info"
+msgstr ""
+
+#. We only do this if the user is in our buddy list
+#: ../libpurple/protocols/oscar/oscar.c:5131
+msgid "Edit Buddy Comment"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5139
+msgid "Get X-Status Msg"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5157
+msgid "End Direct IM Session"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5163
+msgid "Direct IM"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5181
+msgid "Re-request Authorization"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5240
+msgid "Require authorization"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5243
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5248
+msgid "ICQ Privacy Options"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5305
+msgid "Change Address To:"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5338
+msgid "you are not waiting for authorization"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5341
+msgid "You are awaiting authorization from the following buddies"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5342
+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
+msgid "Find Buddy by Email"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5360
+msgid "Search for a buddy by email address"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5361
+msgid "Type the email address of the buddy you are searching for."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5522
+msgid "Set User Info (web)..."
+msgstr ""
+
+#. This only happens when connecting with the old-style BUCP login
+#: ../libpurple/protocols/oscar/oscar.c:5534
+msgid "Change Password (web)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5541
+msgid "Configure IM Forwarding (web)"
+msgstr ""
+
+#. ICQ actions
+#: ../libpurple/protocols/oscar/oscar.c:5551
+msgid "Set Privacy Options..."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5555
+msgid "Show Visible List"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5558
+msgid "Show Invisible List"
+msgstr ""
+
+#. AIM actions
+#: ../libpurple/protocols/oscar/oscar.c:5564
+msgid "Confirm Account"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5568
+msgid "Display Currently Registered Email Address"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5572
+msgid "Change Currently Registered Email Address..."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5579
+msgid "Show Buddies Awaiting Authorization"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5585
+msgid "Search for Buddy by Email Address..."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5800
+msgid "Use clientLogin"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5805
+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
+msgid "Allow multiple simultaneous logins"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/peer.c:706
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/peer.c:800
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/peer.c:874
+msgid "Attempting to connect via proxy server."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/peer.c:1053
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/peer.c:1057
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#. Label
+#: ../libpurple/protocols/oscar/userinfo.c:43 ../pidgin/gtkutils.c:2310
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:331
+msgid "Buddy Icon"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:46
+#: ../pidgin/plugins/themeedit-icon.c:81
+msgid "Voice"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:49
+msgid "AIM Direct IM"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:55
+msgid "Get File"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:62
+msgid "Games"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:66
+msgid "ICQ Xtraz"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:69
+msgid "Add-Ins"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:72
+msgid "Send Buddy List"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:75
+msgid "ICQ Direct Connect"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:78
+msgid "AP User"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:81
+msgid "ICQ RTF"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:84
+msgid "Nihilist"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:87
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:90
+msgid "Old ICQ UTF8"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:93
+msgid "Trillian Encryption"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:96
+msgid "ICQ UTF8"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:99
+msgid "Hiptop"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:102
+msgid "Security Enabled"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:105
+msgid "Video Chat"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:109
+msgid "iChat AV"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:112
+msgid "Live Video"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:115
+msgid "Camera"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:118
+msgid "Screen Sharing"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:348
+#: ../libpurple/protocols/oscar/userinfo.c:413
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:720 ../pidgin/gtkprefs.c:1742
+msgid "IP Address"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:354
+msgid "Warning Level"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:364
+msgid "Buddy Comment"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:374
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:425
+#: ../libpurple/protocols/silc/util.c:592
+#: ../libpurple/protocols/silc10/util.c:586
+msgid "Mobile Phone"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:456
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. use_html_status
+#: ../libpurple/protocols/oscar/userinfo.c:460
+msgid "Additional Information"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:469
+#: ../libpurple/protocols/oscar/userinfo.c:477
+msgid "Zip Code"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:480
+msgid "Work Information"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:483
+msgid "Division"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:484
+msgid "Position"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:485
+msgid "Web Page"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:517
+msgid "Online Since"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:522
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1184
+msgid "Member Since"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/userinfo.c:527
+msgid "Capabilities"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:40
+msgid "Invalid SNAC"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:41
+msgid "Server rate limit exceeded"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:42
+msgid "Client rate limit exceeded"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:44
+msgid "Service unavailable"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:45
+msgid "Service not defined"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:46
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:47
+msgid "Not supported by host"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:48
+msgid "Not supported by client"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:49
+msgid "Refused by client"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:50
+msgid "Reply too big"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:51
+msgid "Responses lost"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:52
+msgid "Request denied"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:53
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:54
+msgid "Insufficient rights"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:55
+msgid "In local permit/deny"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:56
+msgid "Warning level too high (sender)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:57
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:58
+msgid "User temporarily unavailable"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:59
+msgid "No match"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:60
+msgid "List overflow"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:61
+msgid "Request ambiguous"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:62
+msgid "Queue full"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/util.c:63
+msgid "Not while on AOL"
+msgstr ""
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
+#: ../libpurple/protocols/oscar/visibility.c:26
+#: ../libpurple/protocols/yahoo/libymsg.c:4016
+#: ../libpurple/protocols/yahoo/libymsg.c:4092
+msgid "Appear Online"
+msgstr ""
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
+#: ../libpurple/protocols/oscar/visibility.c:31
+msgid "Don't Appear Online"
+msgstr ""
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
+#: ../libpurple/protocols/oscar/visibility.c:36
+#: ../libpurple/protocols/yahoo/libymsg.c:4098
+msgid "Appear Offline"
+msgstr ""
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
+#: ../libpurple/protocols/oscar/visibility.c:42
+msgid "Don't Appear Offline"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/visibility.c:113
+msgid "you have no buddies on this list"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/visibility.c:116
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting "
+"\"%s\""
+msgstr ""
+
+#: ../libpurple/protocols/oscar/visibility.c:127
+msgid "Visible List"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/visibility.c:128
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#: ../libpurple/protocols/oscar/visibility.c:137
+msgid "Invisible List"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/visibility.c:138
+msgid "These buddies will always see you as offline"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1321
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1322
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1324
+#, c-format
+msgid "Info for Group %s"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1326
+msgid "Notes Address Book Information"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1358
+msgid "Invite Group to Conference..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1368
+msgid "Get Notes Address Book Info"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1539
+msgid "Sending Handshake"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Waiting for Handshake Acknowledgement"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1549
+msgid "Handshake Acknowledged, Sending Login"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1554
+msgid "Waiting for Login Acknowledgement"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1559
+msgid "Login Redirected"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1565
+msgid "Forcing Login"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1569
+msgid "Login Acknowledged"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1574
+msgid "Starting Services"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1711
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1716
+msgid "Sametime Administrator Announcement"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1848
+#, c-format
+msgid "Announcement from %s"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:2022
+msgid "Conference Closed"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:2487
+msgid "Unable to send message: "
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:2493
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3043
+msgid "Place Closed"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3313
+msgid "Microphone"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3314
+msgid "Speakers"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3315
+msgid "Video Camera"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3319
+msgid "File Transfer"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3353
+#: ../libpurple/protocols/sametime/sametime.c:4193
+msgid "Supports"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3358
+#: ../libpurple/protocols/sametime/sametime.c:4167
+msgid "External User"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3464
+msgid "Create conference with user"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3465
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3469
+msgid "New Conference"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3471
+msgid "Create"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3536
+msgid "Available Conferences"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3542
+msgid "Create New Conference..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3549
+msgid "Invite user to a conference"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3550
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3555
+msgid "Invite to Conference"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3646
+msgid "Invite to Conference..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3651
+msgid "Send TEST Announcement"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3670 ../pidgin/gtkconv.c:4685
+msgid "Topic:"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3730
+msgid "A server is required to connect this account"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4183
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4185
+msgid "Last Known Client"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4349
+#: ../libpurple/protocols/sametime/sametime.c:5566
+msgid "User Name"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4352
+#: ../libpurple/protocols/sametime/sametime.c:5569
+msgid "Sametime ID"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4376
+msgid "An ambiguous user ID was entered"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4377
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4382
+msgid "Select User"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4466
+msgid "Unable to add user: user not found"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4468
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5057
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5206
+msgid "Remotely Stored Buddy List"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5211
+msgid "Buddy List Storage Mode"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5214
+msgid "Local Buddy List Only"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5216
+msgid "Merge List from Server"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5218
+msgid "Merge and Save List to Server"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5220
+msgid "Synchronize List with Server"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5275
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5315
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5369
+msgid "Unable to add group: group exists"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5370
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5503
+msgid "Unable to add group"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5432
+msgid "Possible Matches"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5448
+msgid "Notes Address Book group results"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5449
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5454
+msgid "Select Notes Address Book"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5497
+msgid "Unable to add group: group not found"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5499
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5540
+msgid "Notes Address Book Group"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5541
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5590
+#, c-format
+msgid "Search results for '%s'"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5591
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5598 ../pidgin/gtknotify.c:972
+msgid "Search Results"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5623
+msgid "No matches"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5624
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5628
+msgid "No Matches"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5665
+msgid "Search for a user"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5666
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5669
+msgid "User Search"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5682
+msgid "Import Sametime List..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5686
+msgid "Export Sametime List..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5690
+msgid "Add Notes Address Book Group..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5694
+msgid "User Search..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5801
+msgid "Force login (ignore server redirects)"
+msgstr ""
+
+#. pretend to be Sametime Connect
+#: ../libpurple/protocols/sametime/sametime.c:5811
+msgid "Hide client identity"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:414
+#: ../libpurple/protocols/silc/buddy.c:542
+#: ../libpurple/protocols/silc/buddy.c:705
+#: ../libpurple/protocols/silc/ft.c:424
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
+#, c-format
+msgid "User %s is not present in the network"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
+msgid "Key Agreement"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:55
+#: ../libpurple/protocols/silc10/buddy.c:54
+msgid "Cannot perform the key agreement"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:112
+#: ../libpurple/protocols/silc10/buddy.c:116
+msgid "Error occurred during key agreement"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc10/buddy.c:120
+msgid "Key Agreement failed"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:121
+#: ../libpurple/protocols/silc10/buddy.c:125
+msgid "Timeout during key agreement"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:126
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:131
+#: ../libpurple/protocols/silc10/buddy.c:135
+msgid "Key agreement is already started"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:136
+#: ../libpurple/protocols/silc10/buddy.c:140
+msgid "Key agreement cannot be started with yourself"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:256
+#: ../libpurple/protocols/silc/buddy.c:387
+#: ../libpurple/protocols/silc/buddy.c:501
+#: ../libpurple/protocols/silc/buddy.c:512
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
+msgid "The remote user is not present in the network any more"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc10/buddy.c:295
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:303
+#: ../libpurple/protocols/silc10/buddy.c:299
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:316
+#: ../libpurple/protocols/silc10/buddy.c:312
+msgid "Key Agreement Request"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:386
+#: ../libpurple/protocols/silc/buddy.c:416
+#: ../libpurple/protocols/silc/buddy.c:456
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
+msgid "IM With Password"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:417
+#: ../libpurple/protocols/silc10/buddy.c:424
+msgid "Cannot set IM key"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:457
+#: ../libpurple/protocols/silc10/buddy.c:466
+msgid "Set IM Password"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:500
+#: ../libpurple/protocols/silc/buddy.c:511
+#: ../libpurple/protocols/silc/buddy.c:544
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1530
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
+msgid "Get Public Key"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:545
+#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1531
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
+msgid "Cannot fetch the public key"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:626
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1674
+msgid "Show Public Key"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:627
+#: ../libpurple/protocols/silc/buddy.c:1035
+#: ../libpurple/protocols/silc/chat.c:241
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/chat.c:237
+msgid "Could not load public key"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:706
+#: ../libpurple/protocols/silc/ops.c:1069
+#: ../libpurple/protocols/silc/ops.c:1184
+#: ../libpurple/protocols/silc/ops.c:1306
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1325
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
+msgid "User Information"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:707
+#: ../libpurple/protocols/silc/ops.c:1185
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
+msgid "Cannot get user information"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:728
+#: ../libpurple/protocols/silc10/buddy.c:735
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:731
+#: ../libpurple/protocols/silc10/buddy.c:738
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+
+#. Open file selector to select the public key.
+#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc10/buddy.c:1070
+msgid "Open..."
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc10/buddy.c:1081
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc10/buddy.c:1084
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc10/buddy.c:1088
+msgid "_Import..."
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc10/buddy.c:1184
+msgid "Select correct user"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc10/buddy.c:1186
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1195
+#: ../libpurple/protocols/silc10/buddy.c:1188
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1487
+#: ../libpurple/protocols/silc10/buddy.c:1494
+msgid "Detached"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1491
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1498
+#: ../libpurple/protocols/silc10/silc.c:50
+msgid "Indisposed"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:62
+#: ../libpurple/protocols/silc10/buddy.c:1502
+#: ../libpurple/protocols/silc10/silc.c:52
+msgid "Wake Me Up"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:54
+#: ../libpurple/protocols/silc10/buddy.c:1504
+#: ../libpurple/protocols/silc10/silc.c:44
+msgid "Hyper Active"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc10/buddy.c:1506
+msgid "Robot"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/ops.c:1223
+#: ../libpurple/protocols/silc10/buddy.c:1565
+#: ../libpurple/protocols/silc10/ops.c:1202
+msgid "User Modes"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/ops.c:1240
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1219
+msgid "Preferred Contact"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1245
+#: ../libpurple/protocols/silc10/buddy.c:1587
+#: ../libpurple/protocols/silc10/ops.c:1224
+msgid "Preferred Language"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1587
+#: ../libpurple/protocols/silc/ops.c:1250
+#: ../libpurple/protocols/silc10/buddy.c:1592
+#: ../libpurple/protocols/silc10/ops.c:1229
+msgid "Device"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1592
+#: ../libpurple/protocols/silc/ops.c:1255
+#: ../libpurple/protocols/silc10/buddy.c:1597
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:747
+#: ../libpurple/protocols/silc10/silc.c:749
+msgid "Timezone"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1597
+#: ../libpurple/protocols/silc/ops.c:1260
+#: ../libpurple/protocols/silc10/buddy.c:1602
+#: ../libpurple/protocols/silc10/ops.c:1239
+msgid "Geolocation"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1656
+msgid "Reset IM Key"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1659
+#: ../libpurple/protocols/silc10/buddy.c:1662
+msgid "IM with Key Exchange"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1667
+msgid "IM with Password"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc10/buddy.c:1680
+msgid "Get Public Key..."
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1684
+#: ../libpurple/protocols/silc/ops.c:1628
+#: ../libpurple/protocols/silc10/buddy.c:1687
+#: ../libpurple/protocols/silc10/ops.c:1624
+msgid "Kill User"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1694
+#: ../libpurple/protocols/silc/chat.c:1004
+#: ../libpurple/protocols/silc10/buddy.c:1697
+#: ../libpurple/protocols/silc10/chat.c:977
+msgid "Draw On Whiteboard"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:40
+#: ../libpurple/protocols/silc10/chat.c:39
+msgid "_Passphrase:"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:80
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc/chat.c:177
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
+msgid "Channel Information"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:83
+#: ../libpurple/protocols/silc10/chat.c:82
+msgid "Cannot get channel information"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:120
+#: ../libpurple/protocols/silc10/chat.c:119
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:123
+#: ../libpurple/protocols/silc10/chat.c:122
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:130
+#: ../libpurple/protocols/silc10/chat.c:129
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:139
+#: ../libpurple/protocols/silc10/chat.c:138
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr ""
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../libpurple/protocols/silc/chat.c:144
+#: ../libpurple/protocols/silc10/chat.c:142
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:149
+#: ../libpurple/protocols/silc10/chat.c:147
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:154
+#: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
+msgid "<br><b>Channel Modes:</b> "
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:168
+#: ../libpurple/protocols/silc10/chat.c:165
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:169
+#: ../libpurple/protocols/silc10/chat.c:166
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:240
+#: ../libpurple/protocols/silc10/chat.c:236
+msgid "Add Channel Public Key"
+msgstr ""
+
+#. Add new public key
+#: ../libpurple/protocols/silc/chat.c:308
+#: ../libpurple/protocols/silc10/chat.c:291
+msgid "Open Public Key..."
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:427
+#: ../libpurple/protocols/silc10/chat.c:401
+msgid "Channel Passphrase"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:434
+#: ../libpurple/protocols/silc10/chat.c:408
+msgid "Channel Public Keys List"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:439
+#: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:485
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
+msgid "Channel Authentication"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:450
+#: ../libpurple/protocols/silc/chat.c:487
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
+msgid "Add / Remove"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:603
+#: ../libpurple/protocols/silc10/chat.c:581
+msgid "Group Name"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:607
+#: ../libpurple/protocols/silc/ops.c:1833
+#: ../libpurple/protocols/silc/silc.c:1260
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1907
+#: ../libpurple/protocols/silc10/silc.c:956
+msgid "Passphrase"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:618
+#: ../libpurple/protocols/silc10/chat.c:596
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc10/chat.c:598
+msgid "Add Channel Private Group"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:752
+#: ../libpurple/protocols/silc10/chat.c:726
+msgid "User Limit"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:753
+#: ../libpurple/protocols/silc10/chat.c:727
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:918
+#: ../libpurple/protocols/silc10/chat.c:891
+msgid "Invite List"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:923
+#: ../libpurple/protocols/silc10/chat.c:896
+msgid "Ban List"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc10/chat.c:904
+msgid "Add Private Group"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:944
+#: ../libpurple/protocols/silc10/chat.c:917
+msgid "Reset Permanent"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:949
+#: ../libpurple/protocols/silc10/chat.c:922
+msgid "Set Permanent"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:930
+msgid "Set User Limit"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:963
+#: ../libpurple/protocols/silc10/chat.c:936
+msgid "Reset Topic Restriction"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:968
+#: ../libpurple/protocols/silc10/chat.c:941
+msgid "Set Topic Restriction"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:975
+#: ../libpurple/protocols/silc10/chat.c:948
+msgid "Reset Private Channel"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:980
+#: ../libpurple/protocols/silc10/chat.c:953
+msgid "Set Private Channel"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:987
+#: ../libpurple/protocols/silc10/chat.c:960
+msgid "Reset Secret Channel"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:992
+#: ../libpurple/protocols/silc10/chat.c:965
+msgid "Set Secret Channel"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:1053
+#: ../libpurple/protocols/silc10/chat.c:1102
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:1055
+#: ../libpurple/protocols/silc10/chat.c:1104
+msgid "Join Private Group"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:1056
+#: ../libpurple/protocols/silc10/chat.c:1105
+msgid "Cannot join private group"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:1252
+#: ../libpurple/protocols/silc/silc.c:1463
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1162
+msgid "Call Command"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:1252
+#: ../libpurple/protocols/silc/silc.c:1464
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1162
+msgid "Cannot call command"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:1253
+#: ../libpurple/protocols/silc/silc.c:1465
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1163
+msgid "Unknown command"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc/ft.c:273
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc/ft.c:283
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc/ft.c:426
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
+msgid "Secure File Transfer"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:87 ../libpurple/protocols/silc/ft.c:103
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc/ft.c:110
+#: ../libpurple/protocols/silc/ft.c:114 ../libpurple/protocols/silc/ft.c:118
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
+msgid "Error during file transfer"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:88
+msgid "Remote disconnected"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:107 ../libpurple/protocols/silc10/ft.c:94
+msgid "Permission denied"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:111 ../libpurple/protocols/silc10/ft.c:98
+msgid "Key agreement failed"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:115 ../libpurple/protocols/silc/silc.c:352
+#: ../libpurple/protocols/silc10/ops.c:1725
+msgid "Connection timed out"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:119
+msgid "Creating connection failed"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:123 ../libpurple/protocols/silc10/ft.c:102
+msgid "File transfer session does not exist"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:274 ../libpurple/protocols/silc10/ft.c:206
+msgid "No file transfer session active"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:279 ../libpurple/protocols/silc10/ft.c:211
+msgid "File transfer already started"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:284 ../libpurple/protocols/silc10/ft.c:216
+msgid "Could not perform key agreement for file transfer"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:290 ../libpurple/protocols/silc10/ft.c:222
+msgid "Could not start the file transfer"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ft.c:427 ../libpurple/protocols/silc10/ft.c:341
+msgid "Cannot send file"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:77
+msgid "Error occurred"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:564 ../libpurple/protocols/silc/ops.c:573
+#: ../libpurple/protocols/silc/ops.c:582
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:648
+#: ../libpurple/protocols/silc10/ops.c:638
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:652
+#: ../libpurple/protocols/silc10/ops.c:642
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:685
+#: ../libpurple/protocols/silc10/ops.c:675
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:693
+#: ../libpurple/protocols/silc10/ops.c:683
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:722
+#: ../libpurple/protocols/silc10/ops.c:712
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:780 ../libpurple/protocols/silc/ops.c:785
+#: ../libpurple/protocols/silc/ops.c:790
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:827
+#: ../libpurple/protocols/silc10/ops.c:829
+msgid "Server signoff"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1000
+#: ../libpurple/protocols/silc10/ops.c:1017
+msgid "Personal Information"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1023
+#: ../libpurple/protocols/silc10/ops.c:1040
+msgid "Birth Day"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1031
+#: ../libpurple/protocols/silc10/ops.c:1048
+msgid "Job Role"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:1253
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:949
+msgid "Organization"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1039
+#: ../libpurple/protocols/silc10/ops.c:1056
+msgid "Unit"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1063
+#: ../libpurple/protocols/silc10/ops.c:1080
+msgid "Note"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1109
+#: ../libpurple/protocols/silc10/ops.c:1128
+msgid "Join Chat"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1143
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1147
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1206
+#: ../libpurple/protocols/silc/ops.c:1344
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1070
+msgid "Real Name"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/ops.c:1213 ../pidgin/gtkblist-theme.c:467
+msgid "Status Text"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1296
+#: ../libpurple/protocols/silc/ops.c:1370
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
+msgid "Public Key Fingerprint"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1297
+#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
+msgid "Public Key Babbleprint"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1310
+#: ../libpurple/protocols/silc10/ops.c:1298
+msgid "_More..."
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/silc.c:1317
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:1013
+msgid "Detach From Server"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1371
+msgid "Cannot detach"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1409
+#: ../libpurple/protocols/silc10/ops.c:1382
+msgid "Cannot set topic"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1438
+#: ../libpurple/protocols/silc10/ops.c:1414
+msgid "Failed to change nickname"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1487
+#: ../libpurple/protocols/silc10/ops.c:1462
+msgid "Roomlist"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1487
+#: ../libpurple/protocols/silc10/ops.c:1462
+msgid "Cannot get room list"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1488
+msgid "Network is empty"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc10/ops.c:1507
+msgid "No public key was received"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1544
+#: ../libpurple/protocols/silc/ops.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
+msgid "Server Information"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1520
+msgid "Cannot get server information"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1568
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
+msgid "Server Statistics"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1569
+#: ../libpurple/protocols/silc10/ops.c:1550
+msgid "Cannot get server statistics"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1576
+#: ../libpurple/protocols/silc10/ops.c:1581
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/ops.c:1604
+msgid "Network Statistics"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1616
+#: ../libpurple/protocols/silc/ops.c:1621
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1616
+#: ../libpurple/protocols/silc10/ops.c:1612
+msgid "Ping failed"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1621
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping reply received from server"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1629
+#: ../libpurple/protocols/silc10/ops.c:1625
+msgid "Could not kill user"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1668
+msgid "WATCH"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1668
+msgid "Cannot watch user"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1744
+#: ../libpurple/protocols/silc/ops.c:1795
+#: ../libpurple/protocols/silc/silc.c:396
+#: ../libpurple/protocols/silc10/ops.c:1817
+#: ../libpurple/protocols/silc10/ops.c:1864
+#: ../libpurple/protocols/silc10/silc.c:194
+msgid "Resuming session"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1746
+#: ../libpurple/protocols/silc10/ops.c:1819
+msgid "Authenticating connection"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1797
+#: ../libpurple/protocols/silc10/ops.c:1866
+msgid "Verifying server public key"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1834
+#: ../libpurple/protocols/silc10/ops.c:1908
+msgid "Passphrase required"
+msgstr ""
+
+#: ../libpurple/protocols/silc/pk.c:99 ../libpurple/protocols/silc10/pk.c:104
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+
+#: ../libpurple/protocols/silc/pk.c:104 ../libpurple/protocols/silc10/pk.c:109
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr ""
+
+#: ../libpurple/protocols/silc/pk.c:108 ../libpurple/protocols/silc10/pk.c:113
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/pk.c:111 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
+msgid "Verify Public Key"
+msgstr ""
+
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc10/pk.c:121
+msgid "_View..."
+msgstr ""
+
+#: ../libpurple/protocols/silc/pk.c:141 ../libpurple/protocols/silc10/pk.c:143
+msgid "Unsupported public key type"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:321
+#: ../libpurple/protocols/silc10/ops.c:1755
+msgid "Disconnected by server"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:329
+msgid "Error connecting to SILC Server"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:335
+#: ../libpurple/protocols/silc10/ops.c:1707
+msgid "Key Exchange failed"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:345
+#: ../libpurple/protocols/silc10/ops.c:1718
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:399
+#: ../libpurple/protocols/silc10/silc.c:197
+msgid "Performing key exchange"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:494
+#: ../libpurple/protocols/silc/silc.c:510
+#: ../libpurple/protocols/silc/silc.c:539
+msgid "Unable to load SILC key pair"
+msgstr ""
+
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:524
+#: ../libpurple/protocols/silc10/silc.c:330
+msgid "Connecting to SILC Server"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:570
+#: ../libpurple/protocols/silc10/silc.c:272
+msgid "Out of memory"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:621
+#: ../libpurple/protocols/silc10/silc.c:318
+msgid "Unable to initialize SILC protocol"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:634
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Error loading SILC key pair"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:693
+#: ../libpurple/protocols/silc/silc.c:1874
+#: ../libpurple/protocols/silc10/silc.c:405
+#: ../libpurple/protocols/silc10/silc.c:1582
+#, c-format
+msgid "Download %s: %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:979
+#: ../libpurple/protocols/silc10/silc.c:675
+msgid "Your Current Mood"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:981
+#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2394
+#, c-format
+msgid "Normal"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1006
+#: ../libpurple/protocols/silc10/silc.c:702
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1014
+#: ../libpurple/protocols/silc/util.c:568
+#: ../libpurple/protocols/silc10/silc.c:710
+#: ../libpurple/protocols/silc10/util.c:561
+msgid "SMS"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1016
+#: ../libpurple/protocols/silc/util.c:570
+#: ../libpurple/protocols/silc10/silc.c:712
+#: ../libpurple/protocols/silc10/util.c:563
+msgid "MMS"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1018
+#: ../libpurple/protocols/silc10/silc.c:714
+msgid "Video conferencing"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:719
+msgid "Your Current Status"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:726
+msgid "Online Services"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1033
+#: ../libpurple/protocols/silc10/silc.c:729
+msgid "Let others see what services you are using"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1039
+#: ../libpurple/protocols/silc10/silc.c:735
+msgid "Let others see what computer you are using"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1046
+#: ../libpurple/protocols/silc10/silc.c:742
+msgid "Your VCard File"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1052
+msgid "Timezone (UTC)"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1056
+#: ../libpurple/protocols/silc/silc.c:1057
+#: ../libpurple/protocols/silc10/silc.c:754
+#: ../libpurple/protocols/silc10/silc.c:755
+msgid "User Online Status Attributes"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1058
+#: ../libpurple/protocols/silc10/silc.c:756
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1099
+#: ../libpurple/protocols/silc/silc.c:1105
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:797
+#: ../libpurple/protocols/silc10/silc.c:803
+#: ../libpurple/protocols/silc10/silc.c:1440
+msgid "Message of the Day"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1099
+#: ../libpurple/protocols/silc10/silc.c:797
+msgid "No Message of the Day available"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1727
+#: ../libpurple/protocols/silc10/silc.c:798
+#: ../libpurple/protocols/silc10/silc.c:1435
+msgid "There is no Message of the Day associated with this connection"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1151
+#: ../libpurple/protocols/silc/silc.c:1197
+#: ../libpurple/protocols/silc/silc.c:1268
+#: ../libpurple/protocols/silc/silc.c:1269
+#: ../libpurple/protocols/silc10/silc.c:849
+#: ../libpurple/protocols/silc10/silc.c:893
+#: ../libpurple/protocols/silc10/silc.c:964
+#: ../libpurple/protocols/silc10/silc.c:965
+msgid "Create New SILC Key Pair"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1151
+#: ../libpurple/protocols/silc10/silc.c:849
+msgid "Passphrases do not match"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1197
+#: ../libpurple/protocols/silc10/silc.c:893
+msgid "Key Pair Generation failed"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc10/silc.c:932
+msgid "Key length"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1238
+#: ../libpurple/protocols/silc10/silc.c:934
+msgid "Public key file"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1240
+#: ../libpurple/protocols/silc10/silc.c:936
+msgid "Private key file"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1263
+#: ../libpurple/protocols/silc10/silc.c:959
+msgid "Passphrase (retype)"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1270
+#: ../libpurple/protocols/silc10/silc.c:966
+msgid "Generate Key Pair"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1313
+#: ../libpurple/protocols/silc10/silc.c:1009
+msgid "Online Status"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1321
+#: ../libpurple/protocols/silc10/silc.c:1017
+msgid "View Message of the Day"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1325
+#: ../libpurple/protocols/silc10/silc.c:1021
+msgid "Create SILC Key Pair..."
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1420
+#: ../libpurple/protocols/silc10/silc.c:1120
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1603
+#: ../libpurple/protocols/silc10/silc.c:1311
+msgid "Topic too long"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc10/silc.c:1392
+msgid "You must specify a nick"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1786
+#: ../libpurple/protocols/silc10/silc.c:1494
+#, c-format
+msgid "channel %s not found"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1791
+#: ../libpurple/protocols/silc10/silc.c:1499
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1793
+#: ../libpurple/protocols/silc10/silc.c:1501
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1806
+#: ../libpurple/protocols/silc10/silc.c:1514
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1836
+#: ../libpurple/protocols/silc10/silc.c:1544
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1917
+#: ../libpurple/protocols/silc10/silc.c:1625
+msgid "part [channel]:  Leave the chat"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1629
+msgid "leave [channel]:  Leave the chat"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1633
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1930
+#: ../libpurple/protocols/silc10/silc.c:1638
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1934
+#: ../libpurple/protocols/silc10/silc.c:1642
+msgid "list:  List channels on this network"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1938
+#: ../libpurple/protocols/silc10/silc.c:1646
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1942
+#: ../libpurple/protocols/silc10/silc.c:1650
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1946
+#: ../libpurple/protocols/silc10/silc.c:1654
+msgid ""
+"query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1950
+#: ../libpurple/protocols/silc10/silc.c:1658
+msgid "motd:  View the server's Message Of The Day"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1954
+#: ../libpurple/protocols/silc10/silc.c:1662
+msgid "detach:  Detach this session"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1666
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1962
+#: ../libpurple/protocols/silc10/silc.c:1670
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1968
+#: ../libpurple/protocols/silc10/silc.c:1676
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1972
+#: ../libpurple/protocols/silc10/silc.c:1680
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1976
+#: ../libpurple/protocols/silc10/silc.c:1684
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1980
+#: ../libpurple/protocols/silc10/silc.c:1688
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1984
+#: ../libpurple/protocols/silc10/silc.c:1692
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1988
+#: ../libpurple/protocols/silc10/silc.c:1696
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1992
+#: ../libpurple/protocols/silc10/silc.c:1700
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1996
+#: ../libpurple/protocols/silc10/silc.c:1704
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2000
+#: ../libpurple/protocols/silc10/silc.c:1708
+msgid ""
+"kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2004
+#: ../libpurple/protocols/silc10/silc.c:1712
+msgid "info [server]:  View server administrative details"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2008
+#: ../libpurple/protocols/silc10/silc.c:1716
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2012
+#: ../libpurple/protocols/silc10/silc.c:1720
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2016
+#: ../libpurple/protocols/silc10/silc.c:1724
+msgid "stats:  View server and network statistics"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2020
+#: ../libpurple/protocols/silc10/silc.c:1728
+msgid "ping:  Send PING to the connected server"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2025
+#: ../libpurple/protocols/silc10/silc.c:1733
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2029
+#: ../libpurple/protocols/silc10/silc.c:1737
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/protocols/silc/silc.c:2146
+#: ../libpurple/protocols/silc10/silc.c:1868
+msgid "SILC Protocol Plugin"
+msgstr ""
+
+#. *  description
+#: ../libpurple/protocols/silc/silc.c:2148
+#: ../libpurple/protocols/silc10/silc.c:1870
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2189
+#: ../libpurple/protocols/silc10/silc.c:1902 ../pidgin/gtkprefs.c:2786
+msgid "Network"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2200
+#: ../libpurple/protocols/silc10/silc.c:1913
+msgid "Public Key file"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2204
+#: ../libpurple/protocols/silc10/silc.c:1917
+msgid "Private Key file"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2214
+#: ../libpurple/protocols/silc10/silc.c:1927
+msgid "Cipher"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2224
+#: ../libpurple/protocols/silc10/silc.c:1937
+msgid "HMAC"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2227
+msgid "Use Perfect Forward Secrecy"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2231
+#: ../libpurple/protocols/silc10/silc.c:1940
+msgid "Public key authentication"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2234
+#: ../libpurple/protocols/silc10/silc.c:1943
+msgid "Block IMs without Key Exchange"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2237
+#: ../libpurple/protocols/silc10/silc.c:1946
+msgid "Block messages to whiteboard"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2240
+#: ../libpurple/protocols/silc10/silc.c:1949
+msgid "Automatically open whiteboard"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2243
+#: ../libpurple/protocols/silc10/silc.c:1952
+msgid "Digitally sign and verify all messages"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:208
+#: ../libpurple/protocols/silc/util.c:251
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
+msgid "Creating SILC key pair..."
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:217
+#: ../libpurple/protocols/silc/util.c:260
+msgid "Unable to create SILC key pair"
+msgstr ""
+
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:355
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:357
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:359
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:361
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc10/util.c:363
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:365
+#, c-format
+msgid "Country: \t%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:366
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:376
+#: ../libpurple/protocols/silc10/util.c:367
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:378
+#, c-format
+msgid "Version: \t%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:369
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:381
+#: ../libpurple/protocols/silc10/util.c:370
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:383
+#: ../libpurple/protocols/silc/util.c:384
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
+msgid "Public Key Information"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:566
+#: ../libpurple/protocols/silc10/util.c:559
+msgid "Paging"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:572
+#: ../libpurple/protocols/silc10/util.c:565
+msgid "Video Conferencing"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:590
+#: ../libpurple/protocols/silc10/util.c:584
+msgid "Computer"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:594
+#: ../libpurple/protocols/silc10/util.c:588
+msgid "PDA"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:596
+#: ../libpurple/protocols/silc10/util.c:590
+msgid "Terminal"
+msgstr ""
+
+#: ../libpurple/protocols/silc/wb.c:289 ../libpurple/protocols/silc10/wb.c:287
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr ""
+
+#: ../libpurple/protocols/silc/wb.c:293 ../libpurple/protocols/silc10/wb.c:291
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+
+#: ../libpurple/protocols/silc/wb.c:307 ../libpurple/protocols/silc10/wb.c:305
+msgid "Whiteboard"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1701
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
+msgid "Failure: Remote does not support proposed KE group"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1952
+#, c-format
+msgid "Failure: Remote does not support proposed hash function"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1955
+#, c-format
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1957
+#, c-format
+msgid "Failure: Incorrect signature"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1959
+#, c-format
+msgid "Failure: Invalid cookie"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1970
+#, c-format
+msgid "Failure: Authentication failed"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/silc.c:186
+msgid "Unable to initialize SILC Client connection"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/silc.c:295
+msgid "John Noname"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/silc.c:339
+#, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/silc.c:362
+msgid "Unable to create connection"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:1142
+msgid "Unknown server response"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:1780
+#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1900
+msgid "Unable to create listen socket"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:1809
+#: ../libpurple/protocols/simple/simple.c:1911 ../libpurple/proxy.c:2175
+msgid "Unable to resolve hostname"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:1929
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:1948
+msgid "SIP connect server not specified"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../libpurple/protocols/simple/simple.c:2138
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr ""
+
+#. *  summary
+#: ../libpurple/protocols/simple/simple.c:2139
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:2167
+msgid "Publish status (note: everyone may watch you)"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:2173
+msgid "Use UDP"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:2175
+msgid "Use proxy"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:2177 ../pidgin/gtkprefs.c:2787
+msgid "Proxy"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:2179
+msgid "Auth User"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:2181
+msgid "Auth Domain"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoo.c:44
+#: ../libpurple/protocols/yahoo/libyahoojp.c:41
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoo.c:49
+#: ../libpurple/protocols/yahoo/libyahoojp.c:46
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoo.c:57
+#: ../libpurple/protocols/yahoo/libyahoojp.c:54
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoo.c:166
+msgid "Yahoo ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/yahoo/libyahoo.c:289
+#: ../libpurple/protocols/yahoo/libyahoo.c:291
+msgid "Yahoo! Protocol Plugin"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoo.c:314
+#: ../libpurple/protocols/yahoo/libyahoojp.c:210
+msgid "Pager port"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoo.c:317
+#: ../libpurple/protocols/yahoo/libyahoojp.c:213
+msgid "File transfer server"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoo.c:320
+#: ../libpurple/protocols/yahoo/libyahoojp.c:216
+msgid "File transfer port"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoo.c:323
+#: ../libpurple/protocols/yahoo/libyahoojp.c:219
+msgid "Chat room locale"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoo.c:329
+#: ../libpurple/protocols/yahoo/libyahoojp.c:225
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoo.c:332
+#: ../libpurple/protocols/yahoo/libyahoojp.c:228
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoo.c:336
+#: ../libpurple/protocols/yahoo/libyahoojp.c:232
+msgid "Chat room list URL"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libyahoojp.c:62
+msgid "Yahoo JAPAN ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/yahoo/libyahoojp.c:185
+#: ../libpurple/protocols/yahoo/libyahoojp.c:187
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:874
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:939
+msgid "Your SMS was not delivered"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:1080
+msgid "Your Yahoo! message did not get sent."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:1187
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:1287
+msgid "Authorization denied message:"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:1305
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:1308
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:1310
+msgid "Add buddy rejected"
+msgstr ""
+
+#. Some error in the received stream
+#: ../libpurple/protocols/yahoo/libymsg.c:1872
+#: ../libpurple/protocols/yahoo/libymsg.c:1955
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+#: ../libpurple/protocols/yahoo/libymsg.c:1968
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+#: ../libpurple/protocols/yahoo/libymsg.c:1979
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. indicates a lock due to logging in too frequently
+#: ../libpurple/protocols/yahoo/libymsg.c:1985
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
+#. username or password missing
+#: ../libpurple/protocols/yahoo/libymsg.c:1992
+msgid "Username or password missing"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2099
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2103
+msgid "Failed Yahoo! Authentication"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2184
+#, c-format
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2187
+msgid "Ignore buddy?"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2259
+msgid "Invalid username or password"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2263
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2270
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2274
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2280
+#, c-format
+msgid ""
+"Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2369
+#, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2372
+msgid "Unable to add buddy to server list"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:2979
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:3325
+msgid "Received unexpected HTTP response from server"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:3381
+#, c-format
+msgid "Lost connection with %s: %s"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:3406
+#, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:3623
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:3657
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:3858
+#: ../libpurple/protocols/yahoo/libymsg.c:4889
+msgid "Not at Home"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:3860
+#: ../libpurple/protocols/yahoo/libymsg.c:4892
+msgid "Not at Desk"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:3862
+#: ../libpurple/protocols/yahoo/libymsg.c:4895
+msgid "Not in Office"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:3866
+#: ../libpurple/protocols/yahoo/libymsg.c:4901
+msgid "On Vacation"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:3870
+#: ../libpurple/protocols/yahoo/libymsg.c:4907
+msgid "Stepped Out"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:3968
+#: ../libpurple/protocols/yahoo/libymsg.c:3999
+msgid "Not on server list"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4019
+#: ../libpurple/protocols/yahoo/libymsg.c:4113
+msgid "Appear Permanently Offline"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4035
+msgid "Presence"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4107
+msgid "Don't Appear Permanently Offline"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4166
+msgid "Join in Chat"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4172
+msgid "Initiate Conference"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4200
+msgid "Presence Settings"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4205
+msgid "Start Doodling"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4344
+msgid "Select the ID you want to activate"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4355
+msgid "Join whom in chat?"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4371
+msgid "Activate ID..."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4375
+msgid "Join User in Chat..."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4380
+msgid "Open Inbox"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4407
+#: ../libpurple/protocols/yahoo/libymsg.c:4504
+msgid "Can't send SMS. Unable to obtain mobile carrier."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4437
+#: ../libpurple/protocols/yahoo/libymsg.c:4568
+msgid "Can't send SMS. Unknown mobile carrier."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/libymsg.c:4559
+msgid "Getting mobile carrier to send the SMS."
+msgstr ""
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#. 
+#: ../libpurple/protocols/yahoo/yahoo_doodle.c:97
+msgid "Sent Doodle request."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:167
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:247
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1248
+msgid "Unable to connect."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:346
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1868
+msgid "Unable to establish file descriptor."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1768
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:306
+msgid "Write Error"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
+msgid "Yahoo! Japan Profile"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
+msgid "Yahoo! Profile"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1032
+msgid "Yahoo! ID"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1108
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1112
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1116
+msgid "Hobbies"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1126
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1130
+msgid "Latest News"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1151
+msgid "Home Page"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+msgid "Cool Link 1"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1171
+msgid "Cool Link 2"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+msgid "Cool Link 3"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1189
+msgid "Last Update"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1202
+msgid ""
+"This profile is in a language or format that is not supported at this time."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1219
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1222
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1228
+msgid "The user's profile is empty."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:254
+#, c-format
+msgid "%s has declined to join."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:477
+msgid "Failed to join chat"
+msgstr ""
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:480
+msgid "Unknown room"
+msgstr ""
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:483
+msgid "Maybe the room is full"
+msgstr ""
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:486
+msgid "Not available"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:490
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:573
+#, c-format
+msgid "You are now chatting in %s."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:758
+msgid "Failed to join buddy in chat"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:759
+msgid "Maybe they're not in a chat?"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1454
+#: ../libpurple/protocols/yahoo/yahoochat.c:1480
+msgid "Fetching the room list failed."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1540
+msgid "Voices"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1543
+msgid "Webcams"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1554
+#: ../libpurple/protocols/yahoo/yahoochat.c:1625
+msgid "Connection problem"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1554
+#: ../libpurple/protocols/yahoo/yahoochat.c:1625
+msgid "Unable to fetch room list."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1617
+msgid "User Rooms"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/ycht.c:457
+msgid "Connection problem with the YCHT server"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:357
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:755
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:800
+#: ../libpurple/protocols/zephyr/zephyr.c:1183
+msgid "Hidden or not logged-in"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:806
+#: ../libpurple/protocols/zephyr/zephyr.c:1185
+#, c-format
+msgid "<br>At %s since %s"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:1508
+#: ../libpurple/protocols/zephyr/zephyr.c:1509
+msgid "Anyone"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2359
+msgid "_Class:"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2365
+msgid "_Instance:"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2371
+msgid "_Recipient:"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2382
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2726
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2731
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2737
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to "
+"&lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2743
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to "
+"&lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2749
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to "
+"&lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2754
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2830
+msgid "Resubscribe"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2833
+msgid "Retrieve subscriptions from server"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/zephyr/zephyr.c:2933
+#: ../libpurple/protocols/zephyr/zephyr.c:2935
+msgid "Zephyr Protocol Plugin"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2960
+msgid "Use tzc"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2963
+msgid "tzc command"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2966
+msgid "Export to .anyone"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2969
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
+msgid "Import from .anyone"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
+msgid "Import from .zephyr.subs"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
+msgid "Realm"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
+msgid "Exposure"
+msgstr ""
+
+#: ../libpurple/proxy.c:701 ../libpurple/proxy.c:763 ../libpurple/proxy.c:1204
+#: ../libpurple/proxy.c:1398 ../libpurple/proxy.c:2058
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+
+#: ../libpurple/proxy.c:958
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr ""
+
+#: ../libpurple/proxy.c:991 ../libpurple/proxy.c:1053
+#: ../libpurple/proxy.c:1082
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr ""
+
+#: ../libpurple/proxy.c:1078
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr ""
+
+#: ../libpurple/proxy.c:1278
+#, c-format
+msgid "Error resolving %s"
+msgstr ""
+
+#: ../libpurple/prpl.c:454
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#: ../libpurple/prpl.c:500
+#, c-format
+msgid "%s has requested your attention!"
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. 
+#: ../libpurple/request.h:1488 ../pidgin/gtkblist.c:564
+msgid "_Yes"
+msgstr ""
+
+#: ../libpurple/request.h:1488 ../pidgin/gtkblist.c:564
+msgid "_No"
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. 
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#. 
+#: ../libpurple/request.h:1508 ../libpurple/request.h:1521
+msgid "_Accept"
+msgstr ""
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#. 
+#: ../libpurple/savedstatuses.c:48
+msgid "I'm not here right now"
+msgstr ""
+
+#: ../libpurple/savedstatuses.c:537
+msgid "saved statuses"
+msgstr ""
+
+#: ../libpurple/server.c:265
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr ""
+
+#: ../libpurple/server.c:813
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+
+#: ../libpurple/server.c:818
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr ""
+
+#: ../libpurple/server.c:822
+msgid "Accept chat invitation?"
+msgstr ""
+
+#. Shortcut
+#: ../libpurple/smiley.c:411
+msgid "Shortcut"
+msgstr ""
+
+#: ../libpurple/smiley.c:412
+msgid "The text-shortcut for the smiley"
+msgstr ""
+
+#. Stored Image
+#: ../libpurple/smiley.c:418
+msgid "Stored Image"
+msgstr ""
+
+#: ../libpurple/smiley.c:419
+msgid "Stored Image. (that'll have to do for now)"
+msgstr ""
+
+#: ../libpurple/sslconn.c:176
+msgid "SSL Connection Failed"
+msgstr ""
+
+#: ../libpurple/sslconn.c:178
+msgid "SSL Handshake Failed"
+msgstr ""
+
+#: ../libpurple/sslconn.c:180
+msgid "SSL peer presented an invalid certificate"
+msgstr ""
+
+#: ../libpurple/sslconn.c:183
+msgid "Unknown SSL error"
+msgstr ""
+
+#: ../libpurple/status.c:161
+msgid "Unset"
+msgstr ""
+
+#: ../libpurple/status.c:164 ../pidgin/gtkdocklet.c:558
+#: ../pidgin/gtkstatusbox.c:1098
+msgid "Do not disturb"
+msgstr ""
+
+#: ../libpurple/status.c:167
+msgid "Extended away"
+msgstr ""
+
+#: ../libpurple/status.c:170
+msgid "Feeling"
+msgstr ""
+
+#: ../libpurple/status.c:619
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr ""
+
+#: ../libpurple/status.c:631
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr ""
+
+#: ../libpurple/status.c:638
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr ""
+
+#: ../libpurple/status.c:1265
+#, c-format
+msgid "%s became idle"
+msgstr ""
+
+#: ../libpurple/status.c:1285
+#, c-format
+msgid "%s became unidle"
+msgstr ""
+
+#: ../libpurple/status.c:1351
+#, c-format
+msgid "+++ %s became idle"
+msgstr ""
+
+#: ../libpurple/status.c:1353
+#, c-format
+msgid "+++ %s became unidle"
+msgstr ""
+
+#. 
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#. 
+#: ../libpurple/util.c:637
+#, c-format
+msgid "%x %X"
+msgstr ""
+
+#: ../libpurple/util.c:3277
+msgid "Calculating..."
+msgstr ""
+
+#: ../libpurple/util.c:3280
+msgid "Unknown."
+msgstr ""
+
+#: ../libpurple/util.c:3306
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/util.c:3318
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/util.c:3326
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/util.c:3332
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/util.c:3340
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/util.c:3346
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/util.c:3626
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr ""
+
+#: ../libpurple/util.c:3676 ../libpurple/util.c:4184
+#, c-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: ../libpurple/util.c:3814
+#, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+msgstr ""
+
+#: ../libpurple/util.c:3881
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+
+#: ../libpurple/util.c:3915
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr ""
+
+#: ../libpurple/util.c:4039
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr ""
+
+#: ../libpurple/util.c:4070 ../libpurple/util.c:4100 ../libpurple/util.c:4166
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: ../libpurple/util.c:5041
+#, c-format
+msgid " - %s"
+msgstr ""
+
+#: ../libpurple/util.c:5047
+#, c-format
+msgid " (%s)"
+msgstr ""
+
+#. 10053
+#: ../libpurple/win32/libc_interface.c:320
+msgid "Connection interrupted by other software on your computer."
+msgstr ""
+
+#. 10054
+#: ../libpurple/win32/libc_interface.c:323
+msgid "Remote host closed connection."
+msgstr ""
+
+#. 10060
+#: ../libpurple/win32/libc_interface.c:326
+msgid "Connection timed out."
+msgstr ""
+
+#. 10061
+#: ../libpurple/win32/libc_interface.c:329
+msgid "Connection refused."
+msgstr ""
+
+#. 10048
+#: ../libpurple/win32/libc_interface.c:332
+msgid "Address already in use."
+msgstr ""
+
+#: ../libpurple/xmlnode.c:793
+#, c-format
+msgid "Error Reading %s"
+msgstr ""
+
+#: ../libpurple/xmlnode.c:794
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
+#: ../pidgin.desktop.in.h:1
+msgid "Pidgin Internet Messenger"
+msgstr ""
+
+#: ../pidgin.desktop.in.h:2
+msgid "Internet Messenger"
+msgstr ""
+
+#: ../pidgin.desktop.in.h:3
+msgid ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgstr ""
+
+#. Build the login options frame.
+#: ../pidgin/gtkaccount.c:448
+msgid "Login Options"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:473
+msgid "Pro_tocol:"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:486 ../pidgin/gtkaccount.c:1129
+msgid "_Username:"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:599
+msgid "Remember pass_word"
+msgstr ""
+
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:654
+msgid "User Options"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:667
+msgid "_Local alias:"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:671
+msgid "New _mail notifications"
+msgstr ""
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:676
+msgid "Use this buddy _icon for this account:"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:808
+msgid "Ad_vanced"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:993
+msgid "Use GNOME Proxy Settings"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:994
+msgid "Use Global Proxy Settings"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1000
+msgid "No Proxy"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1006 ../pidgin/gtkprefs.c:2096
+msgid "SOCKS 4"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1012 ../pidgin/gtkprefs.c:2097
+msgid "SOCKS 5"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:2098
+msgid "Tor/Privacy (SOCKS5)"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1024 ../pidgin/gtkprefs.c:2099
+msgid "HTTP"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1030 ../pidgin/gtkprefs.c:2100
+msgid "Use Environmental Settings"
+msgstr ""
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../pidgin/gtkaccount.c:1075
+msgid "If you look real closely"
+msgstr ""
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../pidgin/gtkaccount.c:1078
+msgid "you can see the butterflies mating"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1108
+msgid "Proxy _type:"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1117 ../pidgin/gtkprefs.c:2116
+msgid "_Host:"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1121
+msgid "_Port:"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1138 ../pidgin/gtkprefs.c:2168
+msgid "Pa_ssword:"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1207
+msgid "Use _silence suppression"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1212
+msgid "_Voice and Video"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1301
+msgid "Unable to save new account"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1302
+msgid "An account already exists with the specified criteria."
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1576
+msgid "Add Account"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1593
+msgid "_Basic"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1601
+msgid "Create _this new account on the server"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1618
+msgid "P_roxy"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:2010 ../pidgin/gtkplugin.c:752
+#: ../pidgin/plugins/convcolors.c:343
+msgid "Enabled"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:2038
+msgid "Protocol"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:2225
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add...</b> button below and configure your first account. If you want %s "
+"to connect to multiple IM accounts, press <b>Add...</b> again to configure "
+"them all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:2575
+#, c-format
+msgid ""
+"<a href=\"viewinfo\">%s</a>%s%s%s wants to add you (%s) to his or her buddy "
+"list%s%s"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:2588
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:2622
+msgid "Send Instant Message"
+msgstr ""
+
+#. Buddy List
+#: ../pidgin/gtkblist-theme.c:370 ../pidgin/gtkimhtmltoolbar.c:1234
+msgid "Background Color"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:371
+msgid "The background color for the buddy list"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:375
+msgid "Layout"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:376
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr ""
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+#: ../pidgin/gtkblist-theme.c:384
+msgid "Expanded Background Color"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:385
+msgid "The background color of an expanded group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+#: ../pidgin/gtkblist-theme.c:391
+msgid "Expanded Text"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:392
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+#: ../pidgin/gtkblist-theme.c:398
+msgid "Collapsed Background Color"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:399
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+#: ../pidgin/gtkblist-theme.c:405
+msgid "Collapsed Text"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:406
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+#: ../pidgin/gtkblist-theme.c:413
+msgid "Contact/Chat Background Color"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:414
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+#: ../pidgin/gtkblist-theme.c:420
+msgid "Contact Text"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:421
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+#: ../pidgin/gtkblist-theme.c:427
+msgid "Online Text"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:428
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+#: ../pidgin/gtkblist-theme.c:434
+msgid "Away Text"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:435
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+#: ../pidgin/gtkblist-theme.c:441
+msgid "Offline Text"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:442
+msgid "The text information for when a buddy is offline"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+#: ../pidgin/gtkblist-theme.c:448
+msgid "Idle Text"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:449
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+#: ../pidgin/gtkblist-theme.c:455
+msgid "Message Text"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:456
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+#: ../pidgin/gtkblist-theme.c:462
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:463
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+
+#: ../pidgin/gtkblist-theme.c:468
+msgid "The text information for a buddy's status"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:561
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtkblist.c:562
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:705
+msgid "Please update the necessary fields."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1017
+msgid "A_ccount"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1138
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1143
+msgid "Room _List"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1405 ../pidgin/gtkprivacy.c:537
+#: ../pidgin/gtkprivacy.c:551
+msgid "_Block"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1405
+msgid "Un_block"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1448
+msgid "Move to"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1492
+msgid "Get _Info"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1495 ../pidgin/pidginstock.c:86
+msgid "I_M"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1504
+msgid "_Audio Call"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1509
+msgid "Audio/_Video Call"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1513
+msgid "_Video Call"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1525
+msgid "_Send File..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1532
+msgid "Add Buddy _Pounce..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1537 ../pidgin/gtkblist.c:1541
+#: ../pidgin/gtkblist.c:1754 ../pidgin/gtkblist.c:1781
+msgid "View _Log"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1547 ../pidgin/gtkblist.c:1727
+msgid "Hide When Offline"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1547 ../pidgin/gtkblist.c:1727
+msgid "Show When Offline"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1561 ../pidgin/gtkblist.c:1570
+#: ../pidgin/gtkblist.c:1764 ../pidgin/gtkblist.c:1787
+msgid "_Alias..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1564 ../pidgin/gtkblist.c:1572
+#: ../pidgin/gtkblist.c:1766 ../pidgin/gtkblist.c:1789
+msgid "_Remove"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1697
+msgid "Set Custom Icon"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1701 ../pidgin/gtkconv.c:2933
+msgid "Remove Custom Icon"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1715
+msgid "Add _Buddy..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1718
+msgid "Add C_hat..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1721
+msgid "_Delete Group"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1723
+msgid "_Rename"
+msgstr ""
+
+#. join button
+#: ../pidgin/gtkblist.c:1748 ../pidgin/gtkroomlist.c:323
+#: ../pidgin/gtkroomlist.c:588 ../pidgin/pidginstock.c:84
+msgid "_Join"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1750
+msgid "Auto-Join"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1752
+msgid "Persistent"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1762
+msgid "_Edit Settings..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1796 ../pidgin/gtkblist.c:1821
+msgid "_Collapse"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1826
+msgid "_Expand"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2073 ../pidgin/gtkblist.c:2085
+#: ../pidgin/gtkblist.c:6004 ../pidgin/gtkblist.c:6017
+msgid "/Tools/Mute Sounds"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2531 ../pidgin/gtkconv.c:5194
+#: ../pidgin/gtkpounce.c:448
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+#: ../pidgin/gtkblist.c:2900
+msgid "Unknown node type"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3541
+msgid "Please select your mood from the list"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3575
+msgid "Message (optional)"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3580
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
+#. Buddies menu
+#: ../pidgin/gtkblist.c:3605
+msgid "/_Buddies"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3606
+msgid "/Buddies/New Instant _Message..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3607
+msgid "/Buddies/Join a _Chat..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3608
+msgid "/Buddies/Get User _Info..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3609
+msgid "/Buddies/View User _Log..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3611
+msgid "/Buddies/Sh_ow"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3612
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3613
+msgid "/Buddies/Show/_Empty Groups"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3614
+msgid "/Buddies/Show/Buddy _Details"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3615
+msgid "/Buddies/Show/Idle _Times"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3616
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3617
+msgid "/Buddies/_Sort Buddies"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3619
+msgid "/Buddies/_Add Buddy..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3620
+msgid "/Buddies/Add C_hat..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3621
+msgid "/Buddies/Add _Group..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3623
+msgid "/Buddies/_Quit"
+msgstr ""
+
+#. Accounts menu
+#: ../pidgin/gtkblist.c:3626
+msgid "/_Accounts"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3627 ../pidgin/gtkblist.c:8021
+msgid "/Accounts/Manage Accounts"
+msgstr ""
+
+#. Tools
+#: ../pidgin/gtkblist.c:3630
+msgid "/_Tools"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3631
+msgid "/Tools/Buddy _Pounces"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3632
+msgid "/Tools/_Certificates"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3633
+msgid "/Tools/Custom Smile_ys"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3634
+msgid "/Tools/Plu_gins"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3635
+msgid "/Tools/Pr_eferences"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3636
+msgid "/Tools/Pr_ivacy"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3637
+msgid "/Tools/Set _Mood"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3639
+msgid "/Tools/_File Transfers"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3640
+msgid "/Tools/R_oom List"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3641
+msgid "/Tools/System _Log"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3643
+msgid "/Tools/Mute _Sounds"
+msgstr ""
+
+#. Help
+#: ../pidgin/gtkblist.c:3645
+msgid "/_Help"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3646
+msgid "/Help/Online _Help"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3648
+msgid "/Help/_Build Information"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3649
+msgid "/Help/_Debug Window"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3650
+msgid "/Help/De_veloper Information"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3651
+msgid "/Help/_Plugin Information"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3652
+msgid "/Help/_Translator Information"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3654
+msgid "/Help/_About"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3686
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3705
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3711
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3711
+msgid "(no topic set)"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3792
+msgid "Buddy Alias"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3821
+msgid "Logged In"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3867
+msgid "Last Seen"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3889
+msgid "Spooky"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3891
+msgid "Awesome"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3893
+msgid "Rockin'"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3923
+msgid "Total Buddies"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4280
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4282
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4284
+#, c-format
+msgid "Idle %dm"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4473
+msgid "/Buddies/New Instant Message..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4474 ../pidgin/gtkblist.c:4507
+msgid "/Buddies/Join a Chat..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4475
+msgid "/Buddies/Get User Info..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4476
+msgid "/Buddies/Add Buddy..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4477 ../pidgin/gtkblist.c:4510
+msgid "/Buddies/Add Chat..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4478
+msgid "/Buddies/Add Group..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4513
+msgid "/Tools/Privacy"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4516
+msgid "/Tools/Room List"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4648 ../pidgin/gtkdocklet.c:158
+#: ../pidgin/gtkdocklet.c:163
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtkblist.c:4818
+msgid "Manually"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4820
+msgid "By status"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4821
+msgid "By recent log activity"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5119
+#, c-format
+msgid "%s disconnected"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5121
+#, c-format
+msgid "%s disabled"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5125
+msgid "Reconnect"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5125 ../pidgin/gtkblist.c:5227
+msgid "Re-enable"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5138
+msgid "SSL FAQs"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5225
+msgid "Welcome back!"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5261
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtkblist.c:5535
+msgid "<b>Username:</b>"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5542
+msgid "<b>Password:</b>"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5553
+msgid "_Login"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5797
+msgid "/Help"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5809
+msgid "/Accounts"
+msgstr ""
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:5823
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the "
+"<b>Accounts</b> window at <b>Accounts->Manage Accounts</b>. Once you enable "
+"accounts, you'll be able to sign on, set your status, and talk to your "
+"friends."
+msgstr ""
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#. 
+#: ../pidgin/gtkblist.c:5998
+msgid "/Buddies/Show/Offline Buddies"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6001
+msgid "/Buddies/Show/Empty Groups"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6007
+msgid "/Buddies/Show/Buddy Details"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6010
+msgid "/Buddies/Show/Idle Times"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6013
+msgid "/Buddies/Show/Protocol Icons"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7097
+msgid "Add a buddy.\n"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7112
+msgid "Buddy's _username:"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7129
+msgid "(Optional) A_lias:"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7140
+msgid "(Optional) _Invite message:"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7145
+msgid "Add buddy to _group:"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7250
+msgid "This protocol does not support chat rooms."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7266
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7275
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7296
+msgid "A_lias:"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7303
+msgid "_Group:"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7307
+msgid "Auto_join when account connects."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7308
+msgid "_Remain in chat after window is closed."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:7331
+msgid "Please enter the name of the group to be added."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:8035
+msgid "Enable Account"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:8040
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:8094
+msgid "<PurpleMain>/Accounts/"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:8115
+msgid "_Edit Account"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:8133
+msgid "Set _Mood..."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:8143 ../pidgin/gtkconv.c:3349
+#: ../pidgin/gtkimhtml.c:1848
+msgid "No actions available"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:8150
+msgid "_Disable"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:8168
+msgid "/Tools"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:8239
+msgid "/Buddies/Sort Buddies"
+msgstr ""
+
+#: ../pidgin/gtkcertmgr.c:188
+msgid "Type the host name for this certificate."
+msgstr ""
+
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:531
+msgid "SSL Servers"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:514
+msgid "Unknown command."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:798 ../pidgin/gtkconv.c:825
+msgid "That buddy is not on the same protocol as this chat."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:819
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:871
+msgid "Invite Buddy Into Chat Room"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:922
+msgid "_Buddy:"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:935 ../pidgin/gtksavedstatuses.c:1152
+#: ../pidgin/gtksavedstatuses.c:1465
+msgid "_Message:"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:1006
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:1044
+msgid "Save Conversation"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:1659
+msgid "Un-Ignore"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:1662
+msgid "Ignore"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:1682
+msgid "Get Away Message"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:1705
+msgid "Last Said"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:2751
+msgid "Unable to save icon file to disk."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:2846
+msgid "Save Icon"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:2904
+msgid "Animate"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:2909
+msgid "Hide Icon"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:2912
+msgid "Save Icon As..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:2916
+msgid "Set Custom Icon..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:2920
+msgid "Change Size"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3055
+msgid "Show All"
+msgstr ""
+
+#. Conversation menu
+#: ../pidgin/gtkconv.c:3074
+msgid "/_Conversation"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3076
+msgid "/Conversation/New Instant _Message..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3078
+msgid "/Conversation/Join a _Chat..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3083
+msgid "/Conversation/_Find..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3085
+msgid "/Conversation/View _Log"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3086
+msgid "/Conversation/_Save As..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3088
+msgid "/Conversation/Clea_r Scrollback"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3093
+msgid "/Conversation/M_edia"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3095
+msgid "/Conversation/Media/_Audio Call"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3097
+msgid "/Conversation/Media/_Video Call"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3099
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3103
+msgid "/Conversation/Se_nd File..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3104
+msgid "/Conversation/Get _Attention"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3105
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3107
+msgid "/Conversation/_Get Info"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3109
+msgid "/Conversation/In_vite..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3111
+msgid "/Conversation/M_ore"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3115
+msgid "/Conversation/Al_ias..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3117
+msgid "/Conversation/_Block..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3119
+msgid "/Conversation/_Unblock..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3121
+msgid "/Conversation/_Add..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3123
+msgid "/Conversation/_Remove..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3128
+msgid "/Conversation/Insert Lin_k..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3130
+msgid "/Conversation/Insert Imag_e..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3136
+msgid "/Conversation/_Close"
+msgstr ""
+
+#. Options
+#: ../pidgin/gtkconv.c:3140
+msgid "/_Options"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3141
+msgid "/Options/Enable _Logging"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3142
+msgid "/Options/Enable _Sounds"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3144
+msgid "/Options/Show Formatting _Toolbars"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3145
+msgid "/Options/Show Ti_mestamps"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3337
+msgid "/Conversation/More"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3393
+msgid "/Options"
+msgstr ""
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../pidgin/gtkconv.c:3429 ../pidgin/gtkconv.c:3461
+msgid "/Conversation"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3469
+msgid "/Conversation/View Log"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3474
+msgid "/Conversation/Media/Audio Call"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3477
+msgid "/Conversation/Media/Video Call"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3480
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3487
+msgid "/Conversation/Send File..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3491
+msgid "/Conversation/Get Attention"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3494
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3500
+msgid "/Conversation/Get Info"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3504
+msgid "/Conversation/Invite..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3510
+msgid "/Conversation/Alias..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3514
+msgid "/Conversation/Block..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3518
+msgid "/Conversation/Unblock..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3522
+msgid "/Conversation/Add..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3526
+msgid "/Conversation/Remove..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3532
+msgid "/Conversation/Insert Link..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3536
+msgid "/Conversation/Insert Image..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3542
+msgid "/Options/Enable Logging"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3545
+msgid "/Options/Enable Sounds"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3558
+msgid "/Options/Show Formatting Toolbars"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3561
+msgid "/Options/Show Timestamps"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3639
+msgid "User is typing..."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:3710
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3889 ../pidgin/gtkconv.c:8613
+msgid "S_end To"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:4583 ../pidgin/plugins/sendbutton.c:61
+msgid "_Send"
+msgstr ""
+
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4752
+msgid "0 people in room"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:4907
+msgid "Close Find bar"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:4909
+msgid "Find:"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:6174 ../pidgin/gtkconv.c:6292
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtkconv.c:6822
+msgid "Stopped Typing"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:6825
+msgid "Nick Said"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:6828
+msgid "Unread Messages"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:6834
+msgid "New Event"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:8091
+msgid "clear: Clears all conversation scrollbacks."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:8296
+msgid "Confirm close"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:8328
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:8951
+msgid "Close other tabs"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:8957
+msgid "Close all tabs"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:8965
+msgid "Detach this tab"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:8971
+msgid "Close this tab"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:9474
+msgid "Close conversation"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:10064
+msgid "Last created window"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:10066
+msgid "Separate IM and Chat windows"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:10068 ../pidgin/gtkprefs.c:2000
+msgid "New window"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:10070
+msgid "By group"
+msgstr ""
+
+#: ../pidgin/gtkconv.c:10072
+msgid "By account"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:178 ../pidgin/gtkdebug.c:812 ../pidgin/gtkdebug.c:814
+msgid "Find"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:206
+msgid "_Search for:"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:245
+msgid "Save Debug Log"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:645
+msgid "Invert"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:648
+msgid "Highlight matches"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:715
+msgid "_Icon Only"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:716
+msgid "_Text Only"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:717
+msgid "_Both Icon & Text"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:865 ../pidgin/gtkdebug.c:867 ../pidgin/gtkdebug.c:869
+msgid "Filter"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:889 ../pidgin/gtkdebug.c:891
+msgid "Right click for more options."
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:925
+msgid "Level "
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:931 ../pidgin/gtkdebug.c:933
+msgid "Select the debug filter level."
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:938
+msgid "All"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:939
+msgid "Misc"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:941
+msgid "Warning"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:942
+msgid "Error "
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:943
+msgid "Fatal Error"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:79
+msgid "artist"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:90
+msgid "voice and video"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:92
+msgid "support"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:94 ../pidgin/gtkdialogs.c:121
+msgid "webmaster"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:113
+msgid "win32 port"
+msgstr ""
+
+#. feel free to not translate this
+#: ../pidgin/gtkdialogs.c:116
+msgid "Ka-Hing Cheung"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:117 ../pidgin/gtkdialogs.c:119
+msgid "maintainer"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:120
+msgid "libfaim maintainer"
+msgstr ""
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../pidgin/gtkdialogs.c:123
+msgid "hacker and designated driver [lazy bum]"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:127
+msgid "support/QA"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:128
+msgid "XMPP"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:129
+msgid "original author"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:131
+msgid "lead developer"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:139
+msgid "Senior Contributor/QA"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+msgid "Afrikaans"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:262
+msgid "Arabic"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:151
+msgid "Assamese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:152
+msgid "Belarusian Latin"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:263
+msgid "Bulgarian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:265
+msgid "Bengali"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:158
+msgid "Bengali-India"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:159
+msgid "Bosnian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:267
+msgid "Catalan"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:162
+msgid "Valencian-Catalan"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:269
+msgid "Czech"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+msgid "Danish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:270
+msgid "German"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:170
+msgid "Dzongkha"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+msgid "Greek"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Australian English"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:271
+msgid "British English"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Canadian English"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:176
+msgid "Esperanto"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:273 ../pidgin/gtkdialogs.c:274
+#: ../pidgin/gtkdialogs.c:275
+msgid "Spanish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:178
+msgid "Estonian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:276
+#: ../pidgin/gtkdialogs.c:277
+msgid "Basque"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
+msgid "Persian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:278
+#: ../pidgin/gtkdialogs.c:279
+msgid "Finnish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:280
+#: ../pidgin/gtkdialogs.c:281 ../pidgin/gtkdialogs.c:282
+#: ../pidgin/gtkdialogs.c:283
+msgid "French"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:185
+msgid "Irish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:284
+msgid "Galician"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+msgid "Gujarati"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:189
+msgid "Gujarati Language Team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:285
+msgid "Hebrew"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:286
+msgid "Hindi"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Croatian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:287
+msgid "Hungarian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Armenian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Indonesian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:288
+msgid "Italian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:289
+#: ../pidgin/gtkdialogs.c:290 ../pidgin/gtkdialogs.c:291
+#: ../pidgin/gtkdialogs.c:292
+msgid "Japanese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:293
+msgid "Georgian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:199
+msgid "Ubuntu Georgian Translators"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:200
+msgid "Khmer"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:201
+msgid "Kannada"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:201
+msgid "Kannada Translation team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:294
+#: ../pidgin/gtkdialogs.c:295
+msgid "Korean"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:205
+msgid "Kurdish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:206
+msgid "Lao"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
+msgid "Maithili"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:209
+msgid "Meadow Mari"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:299
+msgid "Macedonian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:213
+msgid "Malayalam"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:214
+msgid "Mongolian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:215
+msgid "Marathi"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:216
+msgid "Malay"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:300
+#: ../pidgin/gtkdialogs.c:301 ../pidgin/gtkdialogs.c:302
+msgid "Bokmål Norwegian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:218
+msgid "Nepali"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:303
+msgid "Dutch, Flemish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:220
+msgid "Norwegian Nynorsk"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:221
+msgid "Occitan"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:222
+msgid "Oriya"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:223
+msgid "Punjabi"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:304 ../pidgin/gtkdialogs.c:305
+#: ../pidgin/gtkdialogs.c:306 ../pidgin/gtkdialogs.c:307
+msgid "Polish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:226
+msgid "Portuguese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:308
+msgid "Portuguese-Brazil"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:228
+msgid "Pashto"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
+msgid "Romanian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:309
+#: ../pidgin/gtkdialogs.c:310 ../pidgin/gtkdialogs.c:311
+msgid "Russian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:232 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:312 ../pidgin/gtkdialogs.c:313
+#: ../pidgin/gtkdialogs.c:314
+msgid "Slovak"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:315
+msgid "Slovenian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:235
+msgid "Albanian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:316 ../pidgin/gtkdialogs.c:317
+msgid "Serbian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:238 ../pidgin/gtkdialogs.c:239
+msgid "Sinhala"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:240 ../pidgin/gtkdialogs.c:318
+#: ../pidgin/gtkdialogs.c:319
+msgid "Swedish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:241
+msgid "Swahili"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+msgid "Tamil"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:320
+msgid "Telugu"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:245
+msgid "Thai"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:246 ../pidgin/gtkdialogs.c:321
+msgid "Turkish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:247
+msgid "Ukranian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:248
+msgid "Urdu"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:249
+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
+msgid "Simplified Chinese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
+msgid "Hong Kong Chinese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:254 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:324
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:261
+msgid "Amharic"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:296 ../pidgin/gtkdialogs.c:297
+#: ../pidgin/gtkdialogs.c:298
+msgid "Lithuanian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:495
+#, c-format
+msgid ""
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with %s. "
+" There is no warranty for %s.<BR><BR>"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:505
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A "
+"HREF=\"%s\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked "
+"Questions</A><BR>\tIRC Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: "
+"devel@conference.pidgin.im<BR><BR>"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:512
+#, c-format
+msgid ""
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a "
+"href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>This is a "
+"<b>public</b> mailing list! (<a "
+"href=\"http://pidgin.im/pipermail/support/\">archive</a>)<br/>We can't help "
+"with third-party protocols or plugins!<br/>This list's primary language is "
+"<b>English</b>.  You are welcome to post in another language, but the "
+"responses may be less helpful.<br/>"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:522
+#, c-format
+msgid "About %s"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:544
+msgid "Build Information"
+msgstr ""
+
+#. End of not to be translated section
+#: ../pidgin/gtkdialogs.c:713
+#, c-format
+msgid "%s Build Information"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:734
+msgid "Current Developers"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:740
+msgid "Crazy Patch Writers"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:746
+msgid "Retired Developers"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:752
+msgid "Retired Crazy Patch Writers"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:755
+#, c-format
+msgid "%s Developer Information"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:776
+msgid "Current Translators"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:782
+msgid "Past Translators"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:785
+#, c-format
+msgid "%s Translator Information"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:796
+#, c-format
+msgid "%s Plugin Information"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:805
+msgid "Plugin Information"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:861 ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1081
+msgid "_Name"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:1005
+#: ../pidgin/gtkdialogs.c:1086
+msgid "_Account"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1013
+msgid "Get User Info"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1015
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1105
+msgid "View User Log"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1127
+msgid "Alias Contact"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1128
+msgid "Enter an alias for this contact."
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1150
+#, c-format
+msgid "Enter an alias for %s."
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1152
+msgid "Alias Buddy"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1173
+msgid "Alias Chat"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1174
+msgid "Enter an alias for this chat."
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1213
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtkdialogs.c:1221
+msgid "Remove Contact"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1224
+msgid "_Remove Contact"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1255
+#, 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
+msgid "Merge Groups"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1265
+msgid "_Merge Groups"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1315
+#, 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
+msgid "Remove Group"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1321
+msgid "_Remove Group"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1354
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1357
+msgid "Remove Buddy"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1360
+msgid "_Remove Buddy"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1381
+#, 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
+msgid "Remove Chat"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1387
+msgid "_Remove Chat"
+msgstr ""
+
+#: ../pidgin/gtkdocklet.c:155
+msgid "Right-click for more unread messages...\n"
+msgstr ""
+
+#: ../pidgin/gtkdocklet.c:538
+msgid "_Change Status"
+msgstr ""
+
+#: ../pidgin/gtkdocklet.c:684
+msgid "Show Buddy _List"
+msgstr ""
+
+#: ../pidgin/gtkdocklet.c:689
+msgid "_Unread Messages"
+msgstr ""
+
+#: ../pidgin/gtkdocklet.c:710
+msgid "New _Message..."
+msgstr ""
+
+#: ../pidgin/gtkdocklet.c:724
+msgid "_Accounts"
+msgstr ""
+
+#: ../pidgin/gtkdocklet.c:725
+msgid "Plu_gins"
+msgstr ""
+
+#: ../pidgin/gtkdocklet.c:726
+msgid "Pr_eferences"
+msgstr ""
+
+#: ../pidgin/gtkdocklet.c:730
+msgid "Mute _Sounds"
+msgstr ""
+
+#: ../pidgin/gtkdocklet.c:737
+msgid "_Blink on New Message"
+msgstr ""
+
+#: ../pidgin/gtkdocklet.c:747
+msgid "_Quit"
+msgstr ""
+
+#: ../pidgin/gtkft.c:150
+msgid "Not started"
+msgstr ""
+
+#: ../pidgin/gtkft.c:272
+msgid "<b>Receiving As:</b>"
+msgstr ""
+
+#: ../pidgin/gtkft.c:274
+msgid "<b>Receiving From:</b>"
+msgstr ""
+
+#: ../pidgin/gtkft.c:278
+msgid "<b>Sending To:</b>"
+msgstr ""
+
+#: ../pidgin/gtkft.c:280
+msgid "<b>Sending As:</b>"
+msgstr ""
+
+#: ../pidgin/gtkft.c:474 ../pidgin/gtkutils.c:3309
+msgid "There is no application configured to open this type of file."
+msgstr ""
+
+#: ../pidgin/gtkft.c:479 ../pidgin/gtkutils.c:3314
+msgid "An error occurred while opening the file."
+msgstr ""
+
+#: ../pidgin/gtkft.c:516 ../pidgin/gtkutils.c:3349
+#, c-format
+msgid "Error launching %s: %s"
+msgstr ""
+
+#: ../pidgin/gtkft.c:525 ../pidgin/gtkutils.c:3357
+#, c-format
+msgid "Error running %s"
+msgstr ""
+
+#: ../pidgin/gtkft.c:526 ../pidgin/gtkutils.c:3358
+#, c-format
+msgid "Process returned error code %d"
+msgstr ""
+
+#: ../pidgin/gtkft.c:652
+msgid "Filename:"
+msgstr ""
+
+#: ../pidgin/gtkft.c:653
+msgid "Local File:"
+msgstr ""
+
+#: ../pidgin/gtkft.c:655
+msgid "Speed:"
+msgstr ""
+
+#: ../pidgin/gtkft.c:656
+msgid "Time Elapsed:"
+msgstr ""
+
+#: ../pidgin/gtkft.c:657
+msgid "Time Remaining:"
+msgstr ""
+
+#: ../pidgin/gtkft.c:741
+msgid "Close this window when all transfers _finish"
+msgstr ""
+
+#: ../pidgin/gtkft.c:751
+msgid "C_lear finished transfers"
+msgstr ""
+
+#. "Download Details" arrow
+#: ../pidgin/gtkft.c:760
+msgid "File transfer _details"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:937
+msgid "Paste as Plain _Text"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:954 ../pidgin/gtkimhtmltoolbar.c:1352
+msgid "_Reset formatting"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:962
+msgid "Disable _smileys in selected text"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1589
+msgid "Hyperlink color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1590
+msgid "Color to draw hyperlinks."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1593
+msgid "Hyperlink visited color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1594
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1597
+msgid "Hyperlink prelight color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1598
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1601 ../pidgin/plugins/pidginrc.c:57
+msgid "Sent Message Name Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1602
+msgid "Color to draw the name of a message you sent."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1605 ../pidgin/plugins/pidginrc.c:58
+msgid "Received Message Name Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1606
+msgid "Color to draw the name of a message you received."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1609
+msgid "\"Attention\" Name Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1610
+msgid ""
+"Color to draw the name of a message you received containing your name."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1613 ../pidgin/plugins/pidginrc.c:60
+msgid "Action Message Name Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1614
+msgid "Color to draw the name of an action message."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1617
+msgid "Action Message Name Color for Whispered Message"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1618
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1621
+msgid "Whisper Message Name Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1622
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1631
+msgid "Typing notification color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1632
+msgid "The color to use for the typing notification"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1635
+msgid "Typing notification font"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1636
+msgid "The font to use for the typing notification"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1639 ../pidgin/gtkimhtml.c:1640
+msgid "Enable typing notification"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:3766
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:3796
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:3843
+msgid "Save Image"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:3889
+msgid "_Save Image..."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:3899
+msgid "_Add Custom Smiley..."
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:177 ../pidgin/plugins/themeedit.c:127
+msgid "Select Font"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:257
+msgid "Select Text Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:337
+msgid "Select Background Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:426
+msgid "_URL"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:434
+msgid "_Description"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:437
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:441
+msgid "Please enter the URL of the link that you want to insert."
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:446 ../pidgin/gtkimhtmltoolbar.c:1239
+msgid "Insert Link"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:450 ../pidgin/gtkimhtmltoolbar.c:1422
+msgid "_Insert"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:515
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:540
+msgid "Insert Image"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:673
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:804
+msgid "Smile!"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:819
+msgid "_Manage custom smileys"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:856
+msgid "This theme has no available smileys."
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:971 ../pidgin/gtkimhtmltoolbar.c:1377
+msgid "_Font"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1192
+msgid "Group Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1192
+msgid "Ungroup Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1224 ../pidgin/plugins/convcolors.c:358
+msgid "Bold"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1225 ../pidgin/plugins/convcolors.c:367
+msgid "Italic"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1226 ../pidgin/plugins/convcolors.c:376
+msgid "Underline"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1227
+msgid "Strikethrough"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1229
+msgid "Increase Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1230
+msgid "Decrease Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1232
+msgid "Font Face"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1233
+msgid "Foreground Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1236
+msgid "Reset Formatting"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1238
+msgid "Insert IM Image"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1241
+msgid "Insert Smiley"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1266
+msgid "Send Attention"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1337
+msgid "<b>_Bold</b>"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1338
+msgid "<i>_Italic</i>"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1339
+msgid "<u>_Underline</u>"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1340
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1341
+msgid "<span size='larger'>_Larger</span>"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1343
+msgid "_Normal"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1345
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr ""
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1349
+msgid "_Font face"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1350
+msgid "Foreground _color"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1351
+msgid "Bac_kground color"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1430
+msgid "_Image"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1438
+msgid "_Link"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1446
+msgid "_Horizontal rule"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1468
+msgid "_Smile!"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1490
+msgid "_Attention!"
+msgstr ""
+
+#: ../pidgin/gtklog.c:245
+msgid "Log Deletion Failed"
+msgstr ""
+
+#: ../pidgin/gtklog.c:246
+msgid "Check permissions and try again."
+msgstr ""
+
+#: ../pidgin/gtklog.c:289
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+
+#: ../pidgin/gtklog.c:300
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
+msgstr ""
+
+#: ../pidgin/gtklog.c:305
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
+msgstr ""
+
+#: ../pidgin/gtklog.c:320
+msgid "Delete Log?"
+msgstr ""
+
+#: ../pidgin/gtklog.c:331
+msgid "Delete Log..."
+msgstr ""
+
+#: ../pidgin/gtklog.c:451
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr ""
+
+#: ../pidgin/gtklog.c:454
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr ""
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:581
+msgid "_Browse logs folder"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:427
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:431
+#, c-format
+msgid ""
+"Usage: %s [OPTION]...\n"
+"\n"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:433
+msgid "DIR"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:433
+msgid "use DIR for config files"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:435
+msgid "print debugging messages to stdout"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:437
+msgid "force online, regardless of network status"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:439
+msgid "display this help and exit"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:441
+msgid "allow multiple instances"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:443
+msgid "don't automatically login"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:445
+msgid "NAME"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:446
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled)."
+msgstr ""
+
+#: ../pidgin/gtkmain.c:453
+msgid "X display to use"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:456
+msgid "display the current version and exit"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:546
+#, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%swiki/GetABacktrace\n"
+msgstr ""
+
+#: ../pidgin/gtkmain.c:834
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+#: ../pidgin/gtkmedia.c:271
+msgid "_Media"
+msgstr ""
+
+#: ../pidgin/gtkmedia.c:272
+msgid "_Hangup"
+msgstr ""
+
+#: ../pidgin/gtkmedia.c:632
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#: ../pidgin/gtkmedia.c:638
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
+
+#: ../pidgin/gtkmedia.c:644
+msgid "Incoming Call"
+msgstr ""
+
+#: ../pidgin/gtkmedia.c:792
+msgid "_Hold"
+msgstr ""
+
+#: ../pidgin/gtkmedia.c:863 ../pidgin/pidginstock.c:92
+msgid "_Pause"
+msgstr ""
+
+#: ../pidgin/gtkmedia.c:881
+msgid "_Mute"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:752
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtknotify.c:781
+#, c-format
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtknotify.c:1206
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr ""
+
+#: ../pidgin/gtknotify.c:1208 ../pidgin/gtknotify.c:1220
+#: ../pidgin/gtknotify.c:1233 ../pidgin/gtknotify.c:1391
+msgid "Unable to open URL"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:1218 ../pidgin/gtknotify.c:1231
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:1392
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+
+#: ../pidgin/gtknotify.c:1458
+msgid "No message"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:1536
+msgid "Open All Messages"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:1566
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:1569
+msgid "New Pounces"
+msgstr ""
+
+#. Translators: Make sure you translate "Dismiss" differently than
+#. "close"!  This string is used in the "You have pounced" dialog
+#. that appears when one of your Buddy Pounces is triggered.  In
+#. this context "Dismiss" means "I acknowledge that I've seen that
+#. this pounce was triggered--remove it from this list."  Translating
+#. it as "Remove" is acceptable if you can't think of a more precise
+#. word.
+#: ../pidgin/gtknotify.c:1588
+msgid "Dismiss"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:1633
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:284
+msgid "The following plugins will be unloaded."
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:303
+msgid "Multiple plugins will be unloaded."
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:307
+msgid "Unload Plugins"
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:324
+msgid "Could not unload plugin"
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:325
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:462
+#, c-format
+msgid ""
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:591
+msgid "Author"
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:669
+msgid "<b>Written by:</b>"
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:689
+msgid "<b>Web site:</b>"
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:698
+msgid "<b>Filename:</b>"
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:725
+msgid "Configure Pl_ugin"
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:787
+msgid "<b>Plugin Details</b>"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:158
+msgid "Select a file"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:536
+msgid "Modify Buddy Pounce"
+msgstr ""
+
+#. Create the "Pounce on Whom" frame.
+#: ../pidgin/gtkpounce.c:557
+msgid "Pounce on Whom"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:564 ../pidgin/gtkroomlist.c:548
+#: ../pidgin/plugins/disco/gtkdisco.c:651
+msgid "_Account:"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:584
+msgid "_Buddy name:"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:618
+msgid "Si_gns on"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:620
+msgid "Signs o_ff"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:622
+msgid "Goes a_way"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:624
+msgid "Ret_urns from away"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:626
+msgid "Becomes _idle"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:628
+msgid "Is no longer i_dle"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:630
+msgid "Starts _typing"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:632
+msgid "P_auses while typing"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:634
+msgid "Stops t_yping"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:636
+msgid "Sends a _message"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:679
+msgid "Ope_n an IM window"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:681
+msgid "_Pop up a notification"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:683
+msgid "Send a _message"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:685
+msgid "E_xecute a command"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:687
+msgid "P_lay a sound"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:693
+msgid "Brows_e..."
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:697
+msgid "Br_owse..."
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:698 ../pidgin/gtkprefs.c:2637
+msgid "Pre_view"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:838
+msgid "P_ounce only when my status is not Available"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:843
+msgid "_Recurring"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1269
+msgid "Pounce Target"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1446
+msgid "Started typing"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1448
+msgid "Paused while typing"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1450
+msgid "Signed on"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1452
+msgid "Returned from being idle"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1454
+msgid "Returned from being away"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1456
+msgid "Stopped typing"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1458
+msgid "Signed off"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1460
+msgid "Became idle"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1462
+msgid "Went away"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1464
+msgid "Sent a message"
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:1465
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:358
+msgid "(Custom)"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:423 ../pidgin/gtkprefs.c:543 ../pidgin/gtkprefs.c:551
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "Penguin Pimps"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:424
+msgid "The default Pidgin sound theme"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:544
+msgid "The default Pidgin buddy list theme"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:552
+msgid "The default Pidgin status icon theme"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:691 ../pidgin/gtkprefs.c:699
+msgid "Theme failed to unpack."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:740 ../pidgin/gtkprefs.c:781
+msgid "Theme failed to load."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:784
+msgid "Theme failed to copy."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1085
+msgid "Theme Selections"
+msgstr ""
+
+#. Instructions
+#: ../pidgin/gtkprefs.c:1088
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1102
+msgid "Buddy List Theme:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1108
+msgid "Status Icon Theme:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1114
+msgid "Sound Theme:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1120
+msgid "Smiley Theme:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1293
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1313
+msgid "Cl_ose conversations with the Escape key"
+msgstr ""
+
+#. System Tray
+#: ../pidgin/gtkprefs.c:1344
+msgid "System Tray Icon"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1345
+msgid "_Show system tray icon:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1348
+msgid "On unread messages"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1354
+msgid "Conversation Window"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1355
+msgid "_Hide new IM conversations:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1358 ../pidgin/gtkprefs.c:2733
+msgid "When away"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1365
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
+#. All the tab options!
+#: ../pidgin/gtkprefs.c:1369
+msgid "Tabs"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1371
+msgid "Show IMs and chats in _tabbed windows"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1385
+msgid "Show close b_utton on tabs"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1388
+msgid "_Placement:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1390
+msgid "Top"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1391
+msgid "Bottom"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1392
+msgid "Left"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1393
+msgid "Right"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1394
+msgid "Left Vertical"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1395
+msgid "Right Vertical"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1401
+msgid "N_ew conversations:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1471
+msgid "Show _formatting on incoming messages"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1473
+msgid "Close IMs immediately when the tab is closed"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1476
+msgid "Show _detailed information"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1478
+msgid "Enable buddy ic_on animation"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1485
+msgid "_Notify buddies that you are typing to them"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1488
+msgid "Highlight _misspelled words"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1492
+msgid "Use smooth-scrolling"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1495
+msgid "F_lash window when IMs are received"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1499
+msgid "Resize incoming custom smileys"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1503
+msgid "Maximum size:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1517
+msgid "Minimum input area height in lines:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1525
+msgid "Font"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1527
+msgid "Use font from _theme"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1538
+msgid "Conversation _font:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1548
+msgid "Default Formatting"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1566
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1676
+msgid "Cannot start proxy configuration program."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1689
+msgid "Cannot start browser configuration program."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1724
+msgid "Disabled"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1726
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1752
+msgid "ST_UN server:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1764
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1779
+msgid "Public _IP:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1791
+msgid "Ports"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1794
+msgid "_Enable automatic router port forwarding"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1799
+msgid "_Manually specify range of ports to listen on:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1802
+msgid "_Start:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1809
+msgid "_End:"
+msgstr ""
+
+#. TURN server
+#: ../pidgin/gtkprefs.c:1821
+msgid "Relay Server (TURN)"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1831
+msgid "_TURN server:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1834
+msgid "_UDP Port:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1837
+msgid "T_CP Port:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1840
+msgid "Use_rname:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1842
+msgid "Pass_word:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1873
+msgid "Seamonkey"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1874
+msgid "Opera"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1875
+msgid "Netscape"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1876
+msgid "Mozilla"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1877
+msgid "Konqueror"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1878
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
+#: ../pidgin/gtkprefs.c:1881
+msgid "Desktop Default"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1882
+msgid "GNOME Default"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1883
+msgid "Galeon"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1884
+msgid "Firefox"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1885
+msgid "Firebird"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1886
+msgid "Epiphany"
+msgstr ""
+
+#. Translators: please do not translate "chromium-browser" here!
+#: ../pidgin/gtkprefs.c:1888
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+#: ../pidgin/gtkprefs.c:1890
+msgid "Chromium (chrome)"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1899
+msgid "Manual"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1956
+msgid "Browser Selection"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1962
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1972
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1975
+msgid "Configure _Browser"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1988
+msgid "_Browser:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1996
+msgid "_Open link in:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1998
+msgid "Browser default"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1999
+msgid "Existing window"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2001
+msgid "New tab"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2018
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2050
+msgid "Proxy Server"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2057
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2071
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2074
+msgid "Configure _Proxy"
+msgstr ""
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+#: ../pidgin/gtkprefs.c:2089
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2093
+msgid "Proxy t_ype:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2095
+msgid "No proxy"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2134
+msgid "P_ort:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2150
+msgid "User_name:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2211
+msgid "Log _format:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2216
+msgid "Log all _instant messages"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2218
+msgid "Log all c_hats"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2220
+msgid "Log all _status changes to system log"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2377
+msgid "Sound Selection"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2388
+#, c-format
+msgid "Quietest"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2390
+#, c-format
+msgid "Quieter"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2392
+#, c-format
+msgid "Quiet"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2396
+#, c-format
+msgid "Loud"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2398
+#, c-format
+msgid "Louder"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2400
+#, c-format
+msgid "Loudest"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2492
+msgid "_Method:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2494
+msgid "Console beep"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2501
+msgid "No sounds"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2514
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2522
+msgid "M_ute sounds"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2525
+msgid "Sounds when conversation has _focus"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2527
+msgid "_Enable sounds:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2544
+msgid "V_olume:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2605
+msgid "Play"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2633
+msgid "_Browse..."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2641
+msgid "_Reset"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2694
+msgid "_Report idle time:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2699
+msgid "Based on keyboard or mouse use"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2706
+msgid "_Minutes before becoming idle:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2712
+msgid "Change to this status when _idle:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2730
+msgid "_Auto-reply:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2734
+msgid "When both away and idle"
+msgstr ""
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:2740
+msgid "Status at Startup"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2742
+msgid "Use status from last _exit at startup"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2751
+msgid "Status to a_pply at startup:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2775
+msgid "Interface"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2781
+msgid "Browser"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2790
+msgid "Status / Idle"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:2791
+msgid "Themes"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:81
+msgid "Allow all users to contact me"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:82
+msgid "Allow only the users on my buddy list"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:83
+msgid "Allow only the users below"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:84
+msgid "Block all users"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:85
+msgid "Block only the users below"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:343
+msgid "Privacy"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:353
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:362
+msgid "Set privacy for:"
+msgstr ""
+
+#. Remove All button
+#: ../pidgin/gtkprivacy.c:405
+msgid "Remove Al_l"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:491 ../pidgin/gtkprivacy.c:508
+msgid "Permit User"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:492
+msgid "Type a user you permit to contact you."
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:493
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:496 ../pidgin/gtkprivacy.c:512
+msgid "_Permit"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:502
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:504
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:533 ../pidgin/gtkprivacy.c:547
+msgid "Block User"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:534
+msgid "Type a user to block."
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:535
+msgid "Please enter the name of the user you wish to block."
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:543
+#, c-format
+msgid "Block %s?"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:545
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr ""
+
+#: ../pidgin/gtkrequest.c:302
+msgid "Apply"
+msgstr ""
+
+#: ../pidgin/gtkrequest.c:1552
+msgid "That file already exists"
+msgstr ""
+
+#: ../pidgin/gtkrequest.c:1553
+msgid "Would you like to overwrite it?"
+msgstr ""
+
+#: ../pidgin/gtkrequest.c:1556
+msgid "Overwrite"
+msgstr ""
+
+#: ../pidgin/gtkrequest.c:1557
+msgid "Choose New Name"
+msgstr ""
+
+#: ../pidgin/gtkrequest.c:1656
+msgid "Select Folder..."
+msgstr ""
+
+#. list button
+#: ../pidgin/gtkroomlist.c:571
+msgid "_Get List"
+msgstr ""
+
+#. add button
+#: ../pidgin/gtkroomlist.c:579
+msgid "_Add Chat"
+msgstr ""
+
+#: ../pidgin/gtksavedstatuses.c:309
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr ""
+
+#. Use button
+#: ../pidgin/gtksavedstatuses.c:584 ../pidgin/gtksavedstatuses.c:1212
+msgid "_Use"
+msgstr ""
+
+#: ../pidgin/gtksavedstatuses.c:728
+msgid "Title already in use.  You must choose a unique title."
+msgstr ""
+
+#: ../pidgin/gtksavedstatuses.c:941
+msgid "Different"
+msgstr ""
+
+#: ../pidgin/gtksavedstatuses.c:1139
+msgid "_Title:"
+msgstr ""
+
+#: ../pidgin/gtksavedstatuses.c:1147 ../pidgin/gtksavedstatuses.c:1431
+msgid "_Status:"
+msgstr ""
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1165
+msgid "Use a _different status for some accounts"
+msgstr ""
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1219
+msgid "Sa_ve & Use"
+msgstr ""
+
+#: ../pidgin/gtksavedstatuses.c:1415
+#, c-format
+msgid "Status for %s"
+msgstr ""
+
+#: ../pidgin/gtksmiley.c:236
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
+#: ../pidgin/gtksmiley.c:238 ../pidgin/gtksmiley.c:351
+msgid "Custom Smiley"
+msgstr ""
+
+#: ../pidgin/gtksmiley.c:239
+msgid "Duplicate Shortcut"
+msgstr ""
+
+#: ../pidgin/gtksmiley.c:400
+msgid "Edit Smiley"
+msgstr ""
+
+#: ../pidgin/gtksmiley.c:400
+msgid "Add Smiley"
+msgstr ""
+
+#: ../pidgin/gtksmiley.c:424
+msgid "_Image:"
+msgstr ""
+
+#. Shortcut text
+#: ../pidgin/gtksmiley.c:455
+msgid "S_hortcut text:"
+msgstr ""
+
+#: ../pidgin/gtksmiley.c:569
+msgid "Smiley"
+msgstr ""
+
+#: ../pidgin/gtksmiley.c:579
+msgid "Shortcut Text"
+msgstr ""
+
+#: ../pidgin/gtksmiley.c:864
+msgid "Custom Smiley Manager"
+msgstr ""
+
+#: ../pidgin/gtkstatusbox.c:322
+msgid "Select Buddy Icon"
+msgstr ""
+
+#: ../pidgin/gtkstatusbox.c:455
+msgid "Click to change your buddyicon for this account."
+msgstr ""
+
+#: ../pidgin/gtkstatusbox.c:456
+msgid "Click to change your buddyicon for all accounts."
+msgstr ""
+
+#: ../pidgin/gtkstatusbox.c:718
+msgid "Waiting for network connection"
+msgstr ""
+
+#: ../pidgin/gtkstatusbox.c:1106
+msgid "New status..."
+msgstr ""
+
+#: ../pidgin/gtkstatusbox.c:1107
+msgid "Saved statuses..."
+msgstr ""
+
+#: ../pidgin/gtkstatusbox.c:1771
+msgid "Status Selector"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:692
+msgid "Google Talk"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:693
+msgid "Facebook (XMPP)"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1477 ../pidgin/gtkutils.c:1506
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1480 ../pidgin/gtkutils.c:1508
+msgid "Failed to load image"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1584
+#, c-format
+msgid "Cannot send folder %s."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1585
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1618 ../pidgin/gtkutils.c:1630
+#: ../pidgin/gtkutils.c:1637
+msgid "You have dragged an image"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1619
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1625 ../pidgin/gtkutils.c:1645
+msgid "Set as buddy icon"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1626 ../pidgin/gtkutils.c:1646
+msgid "Send image file"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1627 ../pidgin/gtkutils.c:1646
+msgid "Insert in message"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1631
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1638
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1639
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+
+#. I don't know if we really want to do anything here.  Most of
+#. * the desktop item types are crap like "MIME Type" (I have no
+#. * clue how that would be a desktop item) and "Comment"...
+#. * nothing we can really send.  The only logical one is
+#. * "Application," but do we really want to send a binary and
+#. * nothing else? Probably not.  I'll just give an error and
+#. * return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: ../pidgin/gtkutils.c:1698
+msgid "Cannot send launcher"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1699
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2280
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2528
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2530
+msgid "Icon Error"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2530
+msgid "Could not set icon"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:3241
+msgid "_Open Link"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:3248
+msgid "_Copy Link Location"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:3270
+msgid "_Copy Email Address"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:3395
+msgid "_Open File"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:3402
+msgid "Open _Containing Directory"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:3451 ../pidgin/gtkwhiteboard.c:754
+msgid "Save File"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:3471
+msgid "_Play Sound"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:3479
+msgid "_Save File"
+msgstr ""
+
+#: ../pidgin/gtkwhiteboard.c:730
+msgid "Do you really want to clear?"
+msgstr ""
+
+#: ../pidgin/gtkwhiteboard.c:857
+msgid "Select color"
+msgstr ""
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:51
+msgid "Pidgin"
+msgstr ""
+
+#: ../pidgin/pidginstock.c:83
+msgid "_Alias"
+msgstr ""
+
+#: ../pidgin/pidginstock.c:85
+msgid "Close _tabs"
+msgstr ""
+
+#: ../pidgin/pidginstock.c:87
+msgid "_Get Info"
+msgstr ""
+
+#: ../pidgin/pidginstock.c:88
+msgid "_Invite"
+msgstr ""
+
+#: ../pidgin/pidginstock.c:89
+msgid "_Modify..."
+msgstr ""
+
+#: ../pidgin/pidginstock.c:90
+msgid "_Add..."
+msgstr ""
+
+#: ../pidgin/pidginstock.c:91
+msgid "_Open Mail"
+msgstr ""
+
+#: ../pidgin/pidginstock.c:93
+msgid "_Edit"
+msgstr ""
+
+#: ../pidgin/pidgintooltip.c:124
+msgid "Pidgin Tooltip"
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "none"
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/small/16/small.theme.in.h:1
+msgid "Small"
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/small/16/small.theme.in.h:2
+msgid "Smaller versions of the default smileys"
+msgstr ""
+
+#: ../pidgin/plugins/cap/cap.c:444 ../pidgin/plugins/cap/cap.c:447
+msgid "Response Probability:"
+msgstr ""
+
+#: ../pidgin/plugins/cap/cap.c:772
+msgid "Statistics Configuration"
+msgstr ""
+
+#. msg_difference spinner
+#: ../pidgin/plugins/cap/cap.c:775
+msgid "Maximum response timeout:"
+msgstr ""
+
+#: ../pidgin/plugins/cap/cap.c:778 ../pidgin/plugins/cap/cap.c:785
+#: ../pidgin/plugins/cap/cap.c:792 ../pidgin/plugins/timestamp.c:156
+msgid "minutes"
+msgstr ""
+
+#. last_seen spinner
+#: ../pidgin/plugins/cap/cap.c:782
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#. threshold spinner
+#: ../pidgin/plugins/cap/cap.c:789
+msgid "Threshold:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/cap/cap.c:897
+msgid "Contact Availability Prediction"
+msgstr ""
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/cap/cap.c:899
+msgid "Contact Availability Prediction plugin."
+msgstr ""
+
+#. *  summary
+#: ../pidgin/plugins/cap/cap.c:900
+msgid "Displays statistical information about your buddies' availability"
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr ""
+
+#. Not used yet.
+#: ../pidgin/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/contact_priority.c:188
+msgid "Contact Priority"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../pidgin/plugins/contact_priority.c:191
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+#: ../pidgin/plugins/contact_priority.c:193
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:87
+msgid "Error Messages"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:88
+msgid "Highlighted Messages"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:89
+msgid "System Messages"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:90
+msgid "Sent Messages"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:91
+msgid "Received Messages"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:232 ../pidgin/plugins/pidginrc.c:271
+#, c-format
+msgid "Select Color for %s"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:388
+msgid "Ignore incoming format"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:389
+msgid "Apply in Chats"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:390
+msgid "Apply in IMs"
+msgstr ""
+
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+#: ../pidgin/plugins/disco/gtkdisco.c:242
+msgid "Server name request"
+msgstr ""
+
+#: ../pidgin/plugins/disco/gtkdisco.c:242
+msgid "Enter an XMPP Server"
+msgstr ""
+
+#: ../pidgin/plugins/disco/gtkdisco.c:243
+msgid "Select an XMPP server to query"
+msgstr ""
+
+#: ../pidgin/plugins/disco/gtkdisco.c:245
+msgid "Find Services"
+msgstr ""
+
+#: ../pidgin/plugins/disco/gtkdisco.c:302
+msgid "Add to Buddy List"
+msgstr ""
+
+#: ../pidgin/plugins/disco/gtkdisco.c:472
+msgid "Gateway"
+msgstr ""
+
+#: ../pidgin/plugins/disco/gtkdisco.c:476
+msgid "Directory"
+msgstr ""
+
+#: ../pidgin/plugins/disco/gtkdisco.c:484
+msgid "PubSub Collection"
+msgstr ""
+
+#: ../pidgin/plugins/disco/gtkdisco.c:488
+msgid "PubSub Leaf"
+msgstr ""
+
+#: ../pidgin/plugins/disco/gtkdisco.c:492
+msgid "Other"
+msgstr ""
+
+#: ../pidgin/plugins/disco/gtkdisco.c:500
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+
+#. Create the window.
+#: ../pidgin/plugins/disco/gtkdisco.c:635
+msgid "Service Discovery"
+msgstr ""
+
+#: ../pidgin/plugins/disco/gtkdisco.c:676
+msgid "_Browse"
+msgstr ""
+
+#: ../pidgin/plugins/disco/xmppdisco.c:515
+msgid "Server does not exist"
+msgstr ""
+
+#: ../pidgin/plugins/disco/xmppdisco.c:520
+msgid "Server does not support service discovery"
+msgstr ""
+
+#: ../pidgin/plugins/disco/xmppdisco.c:600
+#: ../pidgin/plugins/disco/xmppdisco.c:659
+msgid "XMPP Service Discovery"
+msgstr ""
+
+#: ../pidgin/plugins/disco/xmppdisco.c:661
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#: ../pidgin/plugins/disco/xmppdisco.c:662
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#: ../pidgin/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr ""
+
+#: ../pidgin/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr ""
+
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+
+#: ../pidgin/plugins/extplacement.c:111
+msgid "Number of conversations per window"
+msgstr ""
+
+#: ../pidgin/plugins/extplacement.c:117
+msgid "Separate IM and Chat windows when placing by number"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/extplacement.c:146
+msgid "ExtPlacement"
+msgstr ""
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:148
+msgid "Extra conversation placement options."
+msgstr ""
+
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:150
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+
+#. Configuration frame
+#: ../pidgin/plugins/gestures/gestures.c:243
+msgid "Mouse Gestures Configuration"
+msgstr ""
+
+#: ../pidgin/plugins/gestures/gestures.c:250
+#: ../pidgin/plugins/gestures/gestures.c:263
+msgid "Middle mouse button"
+msgstr ""
+
+#: ../pidgin/plugins/gestures/gestures.c:251
+#: ../pidgin/plugins/gestures/gestures.c:268
+msgid "Right mouse button"
+msgstr ""
+
+#. "Visual gesture display" checkbox
+#: ../pidgin/plugins/gestures/gestures.c:281
+msgid "_Visual gesture display"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gestures/gestures.c:317
+msgid "Mouse Gestures"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:320
+msgid "Provides support for mouse gestures"
+msgstr ""
+
+#. *  description
+#: ../pidgin/plugins/gestures/gestures.c:322
+msgid ""
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:142
+msgid "Instant Messaging"
+msgstr ""
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:463
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:547
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:299
+msgid "Group:"
+msgstr ""
+
+#. "New Person" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:566
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:450
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:246
+msgid "New Person"
+msgstr ""
+
+#. "Select Buddy" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:583
+msgid "Select Buddy"
+msgstr ""
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+
+#. Add the expander
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:423
+msgid "User _details"
+msgstr ""
+
+#. "Associate Buddy" button
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+msgid "_Associate Buddy"
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/gevolution.c:251
+#: ../pidgin/plugins/gevolution/gevolution.c:257
+msgid "Unable to send email"
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/gevolution.c:252
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/gevolution.c:258
+msgid "An email address was not found for this buddy."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/gevolution.c:284
+msgid "Add to Address Book"
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/gevolution.c:296
+msgid "Send Email"
+msgstr ""
+
+#. Configuration frame
+#: ../pidgin/plugins/gevolution/gevolution.c:432
+msgid "Evolution Integration Configuration"
+msgstr ""
+
+#. Label
+#: ../pidgin/plugins/gevolution/gevolution.c:435
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gevolution/gevolution.c:538
+msgid "Evolution Integration"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gevolution/gevolution.c:541
+#: ../pidgin/plugins/gevolution/gevolution.c:543
+msgid "Provides integration with Evolution."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:260
+msgid "Please enter the person's information below."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:264
+msgid "Please enter the buddy's username and account type below."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:284
+msgid "Account type:"
+msgstr ""
+
+#. Optional Information section
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:308
+msgid "Optional information:"
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:343
+msgid "First name:"
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:355
+msgid "Last name:"
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:375
+msgid "Email:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gtk-signals-test.c:161
+msgid "GTK Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gtk-signals-test.c:164
+#: ../pidgin/plugins/gtk-signals-test.c:166
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+
+#: ../pidgin/plugins/gtkbuddynote.c:38
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+
+#: ../pidgin/plugins/history.c:205
+msgid "History"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr ""
+
+#: ../pidgin/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr ""
+
+#: ../pidgin/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr ""
+
+#: ../pidgin/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:23
+msgid "Markerline"
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:240
+msgid "Jump to markerline"
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:274
+msgid "Draw Markerline in "
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:278 ../pidgin/plugins/notify.c:694
+msgid "_IM windows"
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:282 ../pidgin/plugins/notify.c:701
+msgid "C_hat windows"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
+msgid "Music Messaging"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
+msgid "There was a conflict in running the command:"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
+msgid "Error Running Editor"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
+msgid "The following error has occurred:"
+msgstr ""
+
+#. Configuration frame
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
+msgid "Music Messaging Configuration"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
+msgid "Score Editor Path"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
+msgid "_Apply"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr ""
+
+#. *  summary
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editing a common score in real-time."
+msgstr ""
+
+#. ---------- "Notify For" ----------
+#: ../pidgin/plugins/notify.c:690
+msgid "Notify For"
+msgstr ""
+
+#: ../pidgin/plugins/notify.c:709
+msgid "\t_Only when someone says your username"
+msgstr ""
+
+#: ../pidgin/plugins/notify.c:719
+msgid "_Focused windows"
+msgstr ""
+
+#. ---------- "Notification Methods" ----------
+#: ../pidgin/plugins/notify.c:727
+msgid "Notification Methods"
+msgstr ""
+
+#: ../pidgin/plugins/notify.c:734
+msgid "Prepend _string into window title:"
+msgstr ""
+
+#. Count method button
+#: ../pidgin/plugins/notify.c:753
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#. Count xprop method button
+#: ../pidgin/plugins/notify.c:762
+msgid "Insert count of new message into _X property"
+msgstr ""
+
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:770
+msgid "Set window manager \"_URGENT\" hint"
+msgstr ""
+
+#: ../pidgin/plugins/notify.c:772
+msgid "_Flash window"
+msgstr ""
+
+#. Raise window method button
+#: ../pidgin/plugins/notify.c:781
+msgid "R_aise conversation window"
+msgstr ""
+
+#. Present conversation method button
+#: ../pidgin/plugins/notify.c:789
+msgid "_Present conversation window"
+msgstr ""
+
+#. ---------- "Notification Removals" ----------
+#: ../pidgin/plugins/notify.c:797
+msgid "Notification Removal"
+msgstr ""
+
+#. Remove on focus button
+#: ../pidgin/plugins/notify.c:802
+msgid "Remove when conversation window _gains focus"
+msgstr ""
+
+#. Remove on click button
+#: ../pidgin/plugins/notify.c:809
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#. Remove on type button
+#: ../pidgin/plugins/notify.c:817
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#. Remove on message send button
+#: ../pidgin/plugins/notify.c:825
+msgid "Remove when a _message gets sent"
+msgstr ""
+
+#. Remove on conversation switch button
+#: ../pidgin/plugins/notify.c:834
+msgid "Remove on switch to conversation ta_b"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/notify.c:927
+msgid "Message Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/notify.c:930 ../pidgin/plugins/notify.c:932
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr ""
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:55
+msgid "Hyperlink Color"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:56
+msgid "Visited Hyperlink Color"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:59
+msgid "Highlighted Message Name Color"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:61
+msgid "Typing Notification Color"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:72
+msgid "GtkTreeView Horizontal Separation"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:89
+msgid "Conversation Entry"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:90
+msgid "Conversation History"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:91
+msgid "Request Dialog"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:92
+msgid "Notify Dialog"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:273 ../pidgin/plugins/themeedit.c:154
+msgid "Select Color"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:326
+#, c-format
+msgid "Select Interface Font"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:329
+#, c-format
+msgid "Select Font for %s"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:422
+msgid "GTK+ Interface Font"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:482
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:514
+msgid "Disable Typing Notification Text"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:561
+msgid "GTK+ Theme Control Settings"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:569
+msgid "Colors"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:572
+msgid "Fonts"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:575
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:580
+msgid "Gtkrc File Tools"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:585
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:593
+msgid "Re-read gtkrc files"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:627
+msgid "Pidgin GTK+ Theme Control"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:629 ../pidgin/plugins/pidginrc.c:630
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
+
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr ""
+
+#: ../pidgin/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+
+#: ../pidgin/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+
+#: ../pidgin/plugins/relnot.c:111
+#, c-format
+msgid "You can upgrade to %s %s today."
+msgstr ""
+
+#: ../pidgin/plugins/relnot.c:116
+msgid "New Version Available"
+msgstr ""
+
+#: ../pidgin/plugins/relnot.c:119
+msgid "Later"
+msgstr ""
+
+#: ../pidgin/plugins/relnot.c:120
+msgid "Download Now"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/relnot.c:199
+msgid "Release Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/relnot.c:202
+msgid "Checks periodically for new releases."
+msgstr ""
+
+#. *  description
+#: ../pidgin/plugins/relnot.c:204
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/sendbutton.c:176
+msgid "Send Button"
+msgstr ""
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/sendbutton.c:178
+msgid "Conversation Window Send Button."
+msgstr ""
+
+#. *< summary
+#: ../pidgin/plugins/sendbutton.c:179
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for use when no physical keyboard is present."
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:1971
+msgid "Duplicate Correction"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:1972
+msgid "The specified word already exists in the correction list."
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2172
+msgid "Text Replacements"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2186
+msgid "You type"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2200
+msgid "You send"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2214
+msgid "Whole words only"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2226
+msgid "Case sensitive"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2254
+msgid "Add a new text replacement"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2270
+msgid "You _type:"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2274
+msgid "You _send:"
+msgstr ""
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../pidgin/plugins/spellchk.c:2277
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2279
+msgid "Only replace _whole words"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2304
+msgid "General Text Replacement Options"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2305
+msgid "Enable replacement of last word on send"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2338
+msgid "Text replacement"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2340 ../pidgin/plugins/spellchk.c:2341
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:68
+msgid "Just logged in"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:69
+msgid "Just logged out"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:70
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:71
+msgid "Icon for Chat"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:74
+msgid "Ignored"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:75
+msgid "Founder"
+msgstr ""
+
+#. A user in a chat room who has special privileges.
+#: ../pidgin/plugins/themeedit-icon.c:77
+msgid "Operator"
+msgstr ""
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+#: ../pidgin/plugins/themeedit-icon.c:80
+msgid "Half Operator"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:84
+msgid "Authorization dialog"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:85
+msgid "Error dialog"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:86
+msgid "Information dialog"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:87
+msgid "Mail dialog"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:88
+msgid "Question dialog"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:89
+msgid "Warning dialog"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:91
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:99
+msgid "Status Icons"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:100
+msgid "Chatroom Emblems"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:101
+msgid "Dialog Icons"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit-icon.c:264
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit.c:242
+msgid "Contact"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit.c:266
+msgid "Pidgin Buddylist Theme Editor"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit.c:332
+msgid "Edit Buddylist Theme"
+msgstr ""
+
+#: ../pidgin/plugins/themeedit.c:334
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#: ../pidgin/plugins/themeedit.c:352 ../pidgin/plugins/themeedit.c:357
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/themeedit.c:355
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/ticker/ticker.c:75 ../pidgin/plugins/ticker/ticker.c:372
+msgid "Buddy Ticker"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/ticker/ticker.c:375 ../pidgin/plugins/ticker/ticker.c:377
+msgid "A horizontal scrolling version of the buddy list."
+msgstr ""
+
+#: ../pidgin/plugins/timestamp.c:143
+msgid "Display Timestamps Every"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:208
+msgid "Timestamp"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:211
+msgid "Display iChat-style timestamps"
+msgstr ""
+
+#. *  description
+#: ../pidgin/plugins/timestamp.c:213
+msgid "Display iChat-style timestamps every N minutes."
+msgstr ""
+
+#: ../pidgin/plugins/timestamp_format.c:35
+#: ../pidgin/plugins/timestamp_format.c:204
+msgid "Timestamp Format Options"
+msgstr ""
+
+#: ../pidgin/plugins/timestamp_format.c:38
+#, c-format
+msgid "_Force timestamp format:"
+msgstr ""
+
+#: ../pidgin/plugins/timestamp_format.c:43
+msgid "Use system default"
+msgstr ""
+
+#: ../pidgin/plugins/timestamp_format.c:44
+msgid "12 hour time format"
+msgstr ""
+
+#: ../pidgin/plugins/timestamp_format.c:45
+msgid "24 hour time format"
+msgstr ""
+
+#: ../pidgin/plugins/timestamp_format.c:49
+msgid "Show dates in..."
+msgstr ""
+
+#: ../pidgin/plugins/timestamp_format.c:54
+msgid "Co_nversations:"
+msgstr ""
+
+#: ../pidgin/plugins/timestamp_format.c:56
+#: ../pidgin/plugins/timestamp_format.c:65
+msgid "For delayed messages"
+msgstr ""
+
+#: ../pidgin/plugins/timestamp_format.c:57
+#: ../pidgin/plugins/timestamp_format.c:66
+msgid "For delayed messages and in chats"
+msgstr ""
+
+#: ../pidgin/plugins/timestamp_format.c:63
+msgid "_Message Logs:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp_format.c:272
+msgid "Message Timestamp Formats"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp_format.c:275
+msgid "Customizes the message timestamp formats."
+msgstr ""
+
+#. *  description
+#: ../pidgin/plugins/timestamp_format.c:277
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:301
+msgid "Audio"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:303
+msgid "Video"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:314 ../pidgin/plugins/vvconfig.c:321
+msgid "Output"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:314 ../pidgin/plugins/vvconfig.c:321
+msgid "_Plugin"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:315 ../pidgin/plugins/vvconfig.c:322
+msgid "_Device"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:317 ../pidgin/plugins/vvconfig.c:324
+msgid "Input"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:317 ../pidgin/plugins/vvconfig.c:324
+msgid "P_lugin"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:318 ../pidgin/plugins/vvconfig.c:325
+msgid "D_evice"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:620
+msgid "DROP"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:677
+msgid "Volume:"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:681
+msgid "Silence threshold:"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:728
+msgid "Input and Output Settings"
+msgstr ""
+
+#: ../pidgin/plugins/vvconfig.c:733
+msgid "Microphone Test"
+msgstr ""
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/vvconfig.c:774
+msgid "Voice/Video Settings"
+msgstr ""
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/vvconfig.c:776
+msgid "Configure your microphone and webcam."
+msgstr ""
+
+#. *< summary
+#: ../pidgin/plugins/vvconfig.c:777
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:173
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:588
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
+msgid "Opacity:"
+msgstr ""
+
+#. IM Convo trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:552
+msgid "IM Conversation Windows"
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
+msgid "_IM window transparency"
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:567
+msgid "_Show slider bar in IM window"
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:574
+msgid "Remove IM window transparency on focus"
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:625
+msgid "Always on top"
+msgstr ""
+
+#. Buddy List trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:609
+msgid "Buddy List Window"
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
+msgid "_Buddy List window transparency"
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:623
+msgid "Remove Buddy List window transparency on focus"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:683
+msgid "Transparency"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:686
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr ""
+
+#. *  description
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+
+#. Autostart
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:280
+msgid "Startup"
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:281
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:293
+msgid "Allow multiple instances"
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:304
+msgid "_Dockable Buddy List"
+msgstr ""
+
+#. Blist On Top
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:308
+msgid "_Keep Buddy List window on top:"
+msgstr ""
+
+#. XXX: Did this ever work?
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:313
+msgid "Only when docked"
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:343
+msgid "Windows Pidgin Options"
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+msgid "Options specific to Pidgin for Windows."
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:346
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:684
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/xmppconsole.c:760 ../pidgin/plugins/xmppconsole.c:832
+#: ../pidgin/plugins/xmppconsole.c:851
+msgid "XMPP Console"
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:767
+msgid "Account: "
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:789
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/xmppconsole.c:854
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+#: ../pidgin/plugins/xmppconsole.c:856
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:1
+msgid "The installer is already running."
+msgstr ""
+
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:2
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. "Next >" appears on a button on the License Page of the Installer
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:4
+msgid "Next >"
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:6
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:8
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:10
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:12
+msgid "Shortcuts"
+msgstr ""
+
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:14
+msgid "Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:16
+msgid "Start Menu"
+msgstr ""
+
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:18
+msgid "Localizations"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:20
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:22
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:24
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:26
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:28
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:30
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:32
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:33
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:34
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:36
+msgid "URI Handlers"
+msgstr ""
+
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:38
+msgid "Spellchecking Support"
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:41
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: "
+"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i"
+"nstallation"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:43
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:45
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:47
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:48
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:49
+msgid "You do not have permission to uninstall this application."
+msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/python-apt.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/python-apt.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/python-apt.po	2012-01-02 18:14:03.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/python-apt.po	2012-02-23 07:17:18.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: python-apt\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-09 12:08+0000\n"
+"POT-Creation-Date: 2012-02-15 09:31+0000\n"
 "PO-Revision-Date: 2011-09-03 02:43+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:07+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:54+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -411,7 +411,7 @@
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:210 ../aptsources/distro.py:438
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:434
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -419,35 +419,35 @@
 #. More than one server is used. Since we don't handle this case
 #. in the user interface we set "custom servers" to true and
 #. append a list of all used servers
-#: ../aptsources/distro.py:228 ../aptsources/distro.py:234
-#: ../aptsources/distro.py:250
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:254
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:261 ../apt/progress/gtk2.py:317
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:267 ../apt/progress/gtk2.py:323
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:343
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Manylion"
 
-#: ../apt/progress/gtk2.py:431
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:437
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
@@ -456,11 +456,11 @@
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:1074 ../apt/package.py:1180
+#: ../apt/package.py:1085 ../apt/package.py:1191
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:1186
+#: ../apt/package.py:1197
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -469,29 +469,34 @@
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1193
+#: ../apt/package.py:1204
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
 
-#: ../apt/debfile.py:85
+#: ../apt/debfile.py:82
 #, python-format
 msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:205
+#: ../apt/debfile.py:93
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr ""
+
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:226
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
 #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation
-#: ../apt/debfile.py:371
+#: ../apt/debfile.py:373
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' dependency %(depname)s "
@@ -499,63 +504,59 @@
 msgstr ""
 
 #. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation
-#: ../apt/debfile.py:387
+#: ../apt/debfile.py:389
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
 "%(targetver)s)"
 msgstr ""
 
-#: ../apt/debfile.py:397
+#: ../apt/debfile.py:399
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
 "the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
 
-#: ../apt/debfile.py:445
+#: ../apt/debfile.py:447
 msgid "No Architecture field in the package"
 msgstr ""
 
-#: ../apt/debfile.py:455
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:462
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:487
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:517
+#: ../apt/debfile.py:519
 #, python-format
 msgid "Cannot install '%s'"
 msgstr ""
 
-#: ../apt/debfile.py:561
-msgid "Python-debian module not available"
-msgstr ""
-
-#: ../apt/debfile.py:604
+#: ../apt/debfile.py:593
 msgid ""
 "Automatically decompressed:\n"
 "\n"
 msgstr ""
 
-#: ../apt/debfile.py:610
+#: ../apt/debfile.py:599
 msgid "Automatically converted to printable ascii:\n"
 msgstr ""
 
-#: ../apt/debfile.py:700
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:711
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr ""
 
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/screen-resolution-extra.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/screen-resolution-extra.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/screen-resolution-extra.po	2012-01-02 18:14:18.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/screen-resolution-extra.po	2012-02-23 07:17:29.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: screen-resolution-extra\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-19 17:01+0000\n"
+"POT-Creation-Date: 2012-01-13 09:12+0000\n"
 "PO-Revision-Date: 2010-03-31 17:05+0000\n"
 "Last-Translator: Cadan ap Tomos <cadz123@googlemail.com>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:19+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:17+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../ScreenResolution/ui.py:59
 msgid ""
@@ -55,13 +55,13 @@
 msgstr "Newid ffurfwedd Cydraniad y Sgrîn"
 
 #: ../screenresolution-mechanism.policy.in.h:2
-msgid "Change the effect of Ctrl+Alt+Backspace"
-msgstr "Newid effaith Ctrl+Alt+Olio"
-
-#: ../screenresolution-mechanism.policy.in.h:3
 msgid "Changing the Screen Resolution configuration requires privileges."
 msgstr "Mae angen breintiau er mwyn newid ffurfwedd Cydraniad y Sgrîn."
 
+#: ../screenresolution-mechanism.policy.in.h:3
+msgid "Change the effect of Ctrl+Alt+Backspace"
+msgstr "Newid effaith Ctrl+Alt+Olio"
+
 #: ../screenresolution-mechanism.policy.in.h:4
 msgid "Changing the effect of Ctrl+Alt+Backspace requires privileges."
 msgstr "Mae angen breintiau er mwyn newid effaith Ctrl+Alt+Olio."
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/shared-mime-info.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/shared-mime-info.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/shared-mime-info.po	2012-01-02 18:14:04.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/shared-mime-info.po	2012-02-23 07:17:18.000000000 +0000
@@ -7,2677 +7,2681 @@
 msgstr ""
 "Project-Id-Version: shared-mime-info\n"
 "Report-Msgid-Bugs-To: http://bugzilla.freedesktop.org/\n"
-"POT-Creation-Date: 2011-11-29 06:49+0000\n"
+"POT-Creation-Date: 2012-02-08 16:48+0000\n"
 "PO-Revision-Date: 2010-11-18 22:47+0000\n"
 "Last-Translator: Rhys Jones <rhys@sucs.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:12+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:57+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: cy\n"
 
 #: ../freedesktop.org.xml.in.h:1
-msgid "3D Studio image"
-msgstr "Delwedd \"3D Studio\""
+msgid "ATK inset"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:2
-msgid "3GPP multimedia file"
+msgid "electronic book document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:3
-msgid "3GPP2 multimedia file"
-msgstr ""
+msgid "Adobe Illustrator document"
+msgstr "Dogfen Adobe Illustrator"
 
 #: ../freedesktop.org.xml.in.h:4
-msgid "7-zip archive"
-msgstr ""
+msgid "Macintosh BinHex-encoded file"
+msgstr "Ffeil BinHex-amgodwyd Macintosh"
 
 #: ../freedesktop.org.xml.in.h:5
-msgid "ACE archive"
+msgid "Mathematica Notebook"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:6
-msgid "AIFC audio"
-msgstr "Sain AIFC"
+msgid "MathML document"
+msgstr "Dogfen MathML"
 
 #: ../freedesktop.org.xml.in.h:7
-msgid "AIFF audio"
-msgstr "Sain AIFF"
+msgid "mailbox file"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:8
-msgid "AIFF/Amiga/Mac audio"
-msgstr "Sain AIFF/Amiga/Mac"
+msgid "Metalink file"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:9
-msgid "AMR audio"
-msgstr ""
+msgid "unknown"
+msgstr "Anhysbys"
 
 #: ../freedesktop.org.xml.in.h:10
-msgid "AMR-WB audio"
-msgstr ""
+msgid "ODA document"
+msgstr "Dogfen ODA"
 
 #: ../freedesktop.org.xml.in.h:11
-msgid "ANIM animation"
-msgstr "Animeiddiad ANIM"
+msgid "WWF document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:12
-msgid "AR archive"
-msgstr "Archif AR"
+msgid "PDF document"
+msgstr "Dogfen PDF"
 
 #: ../freedesktop.org.xml.in.h:13
-msgid "ARC archive"
+msgid "XSPF playlist"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:14
-msgid "ARJ archive"
-msgstr "Archif ARJ"
+msgid "Microsoft Windows theme pack"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:15
-msgid "ASF video"
+msgid "GSM 06.10 audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:16
-msgid "ASP page"
+msgid "iRiver Playlist"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:17
-msgid "ATK inset"
+msgid "PGP/MIME-encrypted message header"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:18
-msgid "AVI video"
-msgstr "Fideo AVI"
+msgid "PGP keys"
+msgstr "Allweddi PGP"
 
 #: ../freedesktop.org.xml.in.h:19
-msgid "AWK script"
-msgstr "Sgript AWK"
+msgid "detached OpenPGP signature"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:20
-msgid "AbiWord document"
-msgstr "Dogfen AbiWord"
+msgid "S/MIME file"
+msgstr "Ffeil S/MIME"
 
 #: ../freedesktop.org.xml.in.h:21
-msgid "Ada source code"
-msgstr "Ffynhonnell Rhaglen Ada"
+msgid "detached S/MIME signature"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:22
-msgid "Adobe DNG negative"
+msgid "PKCS#8 private key"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:23
-msgid "Adobe FrameMaker MIF document"
+msgid "PKCS#10 certification request"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:24
-msgid "Adobe FrameMaker document"
+msgid "X.509 certificate"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:25
-msgid "Adobe FrameMaker font"
-msgstr "Ffont Adobe FrameMaker"
+msgid "Certificate revocation list"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:26
-msgid "Adobe Illustrator document"
-msgstr "Dogfen Adobe Illustrator"
+msgid "PkiPath certification path"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:27
-msgid "Adobe font metrics"
-msgstr "Metrigau Ffont Adobe"
+msgid "PS document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:28
-msgid "Alzip archive"
+msgid "Plucker document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:29
-msgid "Amiga SoundTracker audio"
-msgstr "Sain \"soundtracker\" Amiga"
+msgid "RELAX NG XML schema"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:30
-msgid "Android package"
+msgid "RTF document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:31
-msgid "Annodex Audio"
+msgid "Sieve mail filter script"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:32
-msgid "Annodex Video"
+msgid "SMIL document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:33
-msgid "Annodex exchange format"
+msgid "WPL playlist"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:34
-msgid "AportisDoc document"
+msgid "SQLite2 database"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:35
-msgid "Apple disk image"
+msgid "SQLite3 database"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:36
-msgid "Applix Graphics image"
-msgstr "Delwedd Applix Graphics"
+msgid "GEDCOM family history"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:37
-msgid "Applix Spreadsheets spreadsheet"
-msgstr "Taenlen Applix Spreadsheets"
+msgid "Flash video"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:38
-msgid "Applix Words document"
-msgstr "Dogfen Applix Words"
-
-#: ../freedesktop.org.xml.in.h:39
-msgid "Atom syndication feed"
+msgid "JavaFX video"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:40
-msgid "AutoCAD image"
-msgstr "Delwedd AutoCAD"
-
-#: ../freedesktop.org.xml.in.h:41
-msgid "BCPIO document"
-msgstr "Dogfen BCPIO"
-
+#. translators: a record is in this context a description of a board game
+#. that has been played, and that can be played back again:
+#. http://www.red-bean.com/sgf/
 #: ../freedesktop.org.xml.in.h:42
-msgid "BDF font"
-msgstr "Ffont BDF"
+msgid "SGF record"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:43
-msgid "BibTeX document"
+msgid "XLIFF translation file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:44
-msgid "BitTorrent seed file"
-msgstr "Ffeil hadu BitTorrent"
+msgid "YAML document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:45
-msgid "Blender scene"
+msgid "Corel Draw drawing"
+msgstr "Darlun Corel Draw"
+
+#: ../freedesktop.org.xml.in.h:46
+msgid "HPGL file"
 msgstr ""
 
-#. http://en.wikipedia.org/wiki/Blu-ray_Disc
-#. http://www.blu-raydisc.com/Section-13470/Section-13890/Index.html
-#: ../freedesktop.org.xml.in.h:48
-msgid "Blu-ray video disc"
+#: ../freedesktop.org.xml.in.h:47
+msgid "PCL file"
 msgstr ""
 
+#: ../freedesktop.org.xml.in.h:48
+msgid "Lotus 1-2-3 spreadsheet"
+msgstr "Taenlen Lotus 1-2-3"
+
 #: ../freedesktop.org.xml.in.h:49
-msgid "Bzip archive"
+msgid "JET database"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:50
-msgid "C header"
+msgid "Microsoft Cabinet archive"
 msgstr ""
 
-# EFALLAI (plisgyn?)
 #: ../freedesktop.org.xml.in.h:51
-msgid "C shell script"
-msgstr "Sgript plisgyn C"
+msgid "Excel spreadsheet"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:52
-msgid "C source code"
-msgstr "Ffynhonnell Rhaglen C"
+msgid "Excel add-in"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:53
-msgid "C# source code"
-msgstr "Ffynhonnell Rhaglen C#"
+msgid "Excel 2007 binary spreadsheet"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:54
-msgid "C++ header"
+msgid "Excel macro-enabled spreadsheet"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:55
-msgid "C++ source code"
-msgstr "Ffynhonnell Rhaglen C++"
+msgid "Excel macro-enabled spreadsheet template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:56
-msgid "CCITT G3 fax"
-msgstr "Ffacs CCITT grŵp 3"
+msgid "PowerPoint presentation"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:57
-msgid "CD Table Of Contents"
+msgid "PowerPoint add-in"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:58
-msgid "CD image cuesheet"
+msgid "PowerPoint macro-enabled presentation"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:59
-msgid "CHM document"
+msgid "PowerPoint macro-enabled slide"
 msgstr ""
 
-# Efallai (raster?)
 #: ../freedesktop.org.xml.in.h:60
-msgid "CMU raster image"
-msgstr "Delwedd raster CMU"
+msgid "PowerPoint macro-enabled presentation template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:61
-msgid "CMake source code"
+msgid "Word macro-enabled document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:62
-msgid "COBOL source file"
+msgid "Word macro-enabled document template"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:63
-msgid "CPIO archive"
-msgstr "Archif CPIO"
+msgid "XPS document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:64
-msgid "CPIO archive (gzip-compressed)"
-msgstr "Archif CPIO (gywasgwyd drwy gzip)"
+msgid "Microsoft Works document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:65
-msgid "CSS stylesheet"
+msgid "Microsoft Visio document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:66
-msgid "CSV document"
+msgid "Word document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:67
-msgid "Canon CR2 raw image"
+msgid "Word template"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:68
-msgid "Canon CRW raw image"
+msgid "GNUnet search file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:69
-msgid "Certificate revocation list"
+msgid "TNEF message"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:70
-msgid "ChangeLog document"
-msgstr ""
+msgid "StarCalc spreadsheet"
+msgstr "Taenlen StarCalc"
 
 #: ../freedesktop.org.xml.in.h:71
-msgid "Cisco VPN Settings"
-msgstr ""
+msgid "StarChart chart"
+msgstr "Siart StarChart"
 
 #: ../freedesktop.org.xml.in.h:72
-msgid "Citrix ICA settings file"
-msgstr ""
+msgid "StarDraw drawing"
+msgstr "Darlun StarDraw"
 
 #: ../freedesktop.org.xml.in.h:73
-msgid "Commodore 64 audio"
-msgstr "Sain Commodore 64"
+msgid "StarImpress presentation"
+msgstr "Cyflwyniad StarImpress"
 
 #: ../freedesktop.org.xml.in.h:74
-msgid "Computer Graphics Metafile"
-msgstr "Delwedd ffurf CGM"
+msgid "StarMail email"
+msgstr "Ebost StarMail"
 
 #: ../freedesktop.org.xml.in.h:75
-msgid "Corel Draw drawing"
-msgstr "Darlun Corel Draw"
+msgid "StarMath formula"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:76
-msgid "D source code"
-msgstr "Ffynhonnell Rhaglen D"
+msgid "StarWriter document"
+msgstr "Dogfen StarWriter"
 
 #: ../freedesktop.org.xml.in.h:77
-msgid "DAR archive"
+msgid "OpenOffice Calc spreadsheet"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:78
-msgid "DCL script"
-msgstr "Sgript DCL"
+msgid "OpenOffice Calc template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:79
-msgid "DER/PEM/Netscape-encoded X.509 certificate"
+msgid "OpenOffice Draw drawing"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:80
-msgid "DIB image"
+msgid "OpenOffice Draw template"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:81
-msgid "DICOM image"
-msgstr ""
+msgid "OpenOffice Impress presentation"
+msgstr "Cyflwyniad OpenOffice (Impress)"
 
 #: ../freedesktop.org.xml.in.h:82
-msgid "DOS font"
-msgstr "Ffont DOS"
+msgid "OpenOffice Impress template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:83
-msgid "DOS/Windows executable"
+msgid "OpenOffice Math formula"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:84
-msgid "DPX image"
-msgstr ""
+msgid "OpenOffice Writer document"
+msgstr "Dogfen OpenOffice (Writer)"
 
 #: ../freedesktop.org.xml.in.h:85
-msgid "DSSSL document"
-msgstr "Dogfen DSSSL"
+msgid "OpenOffice Writer global document"
+msgstr "Dogfen eang OpenOffice (Writer)"
 
 #: ../freedesktop.org.xml.in.h:86
-msgid "DTD file"
-msgstr ""
+msgid "OpenOffice Writer template"
+msgstr "Templed OpenOffice (Writer)"
 
 #: ../freedesktop.org.xml.in.h:87
-msgid "DV video"
+msgid "ODT document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:88
-msgid "DXF vector image"
-msgstr "Delwedd Fector DXF"
+msgid "ODT document (Flat XML)"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:89
-msgid "Debian package"
-msgstr "Pecyn Debian"
+msgid "ODT template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:90
-msgid "Dia diagram"
-msgstr "Diagram Dia"
+msgid "OTH template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:91
-msgid "Dia shape"
+msgid "ODM document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:92
-msgid "DirectDraw surface"
+msgid "ODG drawing"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:93
-msgid "DjVu image"
+msgid "ODG drawing (Flat XML)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:94
-msgid "DocBook document"
+msgid "ODG template"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:95
-msgid "Dolby Digital audio"
-msgstr "Sain Dolby Digital"
+msgid "ODP presentation"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:96
-msgid "Dreamcast ROM"
-msgstr "ROM Dreamcast"
+msgid "ODP presentation (Flat XML)"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:97
-msgid "ECMAScript program"
+msgid "ODP template"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:98
-msgid "EMF image"
+msgid "ODS spreadsheet"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:99
-msgid "EPS image"
+msgid "ODS spreadsheet (Flat XML)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:100
-msgid "EPS image (bzip-compressed)"
+msgid "ODS template"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:101
-msgid "EPS image (gzip-compressed)"
+msgid "ODC chart"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:102
-msgid "EXR image"
+msgid "ODC template"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:103
-msgid "Egon Animator animation"
-msgstr "Animeiddiad Egon Animator"
+msgid "ODF formula"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:104
-msgid "Eiffel source code"
+msgid "ODF template"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:105
-msgid "Emacs Lisp source code"
-msgstr "Ffynhonnell rhaglen EMACS LISP"
+msgid "ODB database"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:106
-msgid "Enlightenment theme"
-msgstr "Thema Enlightenment"
+msgid "ODI image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:107
-msgid "Erlang source code"
+msgid "OpenOffice.org extension"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:108
-msgid "Excel 2007 binary spreadsheet"
+msgid "Android package"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:109
-msgid "Excel 2007 spreadsheet"
+msgid "SIS package"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:110
-msgid "Excel 2007 spreadsheet template"
+msgid "SISX package"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:111
-msgid "Excel add-in"
+msgid "Network Packet Capture"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:112
-msgid "Excel macro-enabled spreadsheet"
-msgstr ""
+msgid "WordPerfect document"
+msgstr "Dogfen WordPerfect"
 
 #: ../freedesktop.org.xml.in.h:113
-msgid "Excel macro-enabled spreadsheet template"
+msgid "SPSS Portable Data File"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:114
-msgid "Excel spreadsheet"
+msgid "SPSS Data File"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:115
-msgid "FITS document"
-msgstr ""
+msgid "XBEL bookmarks"
+msgstr "Ffeil llyfrnodau XBEL"
 
 #: ../freedesktop.org.xml.in.h:116
-msgid "FLAC audio"
+msgid "7-zip archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:117
-msgid "FLIC animation"
-msgstr ""
+msgid "AbiWord document"
+msgstr "Dogfen AbiWord"
 
 #: ../freedesktop.org.xml.in.h:118
-msgid "FLTK Fluid file"
+msgid "CD image cuesheet"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:119
-msgid "FPX image"
-msgstr ""
+msgid "Lotus AmiPro document"
+msgstr "Dogfen Lotus AmiPro"
 
 #: ../freedesktop.org.xml.in.h:120
-msgid "FastTracker II audio"
-msgstr "Sain FastTracker II"
+msgid "AportisDoc document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:121
-msgid "FictionBook document"
-msgstr ""
+msgid "Applix Spreadsheets spreadsheet"
+msgstr "Taenlen Applix Spreadsheets"
 
 #: ../freedesktop.org.xml.in.h:122
-msgid "Flash video"
-msgstr ""
+msgid "Applix Words document"
+msgstr "Dogfen Applix Words"
 
 #: ../freedesktop.org.xml.in.h:123
-msgid "Fortran source code"
-msgstr "Ffynhonnell rhaglen FORTRAN"
+msgid "ARC archive"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:124
-msgid "Fuji RAF raw image"
-msgstr ""
+msgid "AR archive"
+msgstr "Archif AR"
 
 #: ../freedesktop.org.xml.in.h:125
-msgid "G3 fax image"
-msgstr "Delwedd Ffacs G3"
+msgid "ARJ archive"
+msgstr "Archif ARJ"
 
 #: ../freedesktop.org.xml.in.h:126
-msgid "GDBM database"
+msgid "ASP page"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:127
-msgid "GEDCOM family history"
-msgstr ""
+msgid "AWK script"
+msgstr "Sgript AWK"
 
 #: ../freedesktop.org.xml.in.h:128
-msgid "GIF image"
-msgstr "Delwedd GIF"
+msgid "BCPIO document"
+msgstr "Dogfen BCPIO"
 
 #: ../freedesktop.org.xml.in.h:129
-msgid "GIMP image"
-msgstr "Delwedd GIMP"
+msgid "BitTorrent seed file"
+msgstr "Ffeil hadu BitTorrent"
 
 #: ../freedesktop.org.xml.in.h:130
-msgid "GMC link"
-msgstr "Cyswllt GMC"
+msgid "Blender scene"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:131
-msgid "GNU Oleo spreadsheet"
+msgid "TeX DVI document (bzip-compressed)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:132
-msgid "GNU mail message"
-msgstr "Neges E-Bost GNU"
+msgid "Bzip archive"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:133
-msgid "GNUnet search file"
+msgid "Tar archive (bzip-compressed)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:134
-msgid "GSM 06.10 audio"
+msgid "PDF document (bzip-compressed)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:135
-msgid "GTKtalog catalog"
-msgstr "Catalog Gtktalog"
+msgid "PostScript document (bzip-compressed)"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:136
-msgid "Game Boy Advance ROM"
+msgid "comic book archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:137
-msgid "Game Boy ROM"
-msgstr "ROM Game Boy"
+msgid "Lrzip archive"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:138
+msgid "Tar archive (lrzip-compressed)"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:139
+msgid "Apple disk image"
+msgstr ""
 
-#. Translate this to Megadrive if the console was known as such in your locale
-#. Should be Megadrive in all but en_US: http://en.wikipedia.org/wiki/Megadrive#History
 #: ../freedesktop.org.xml.in.h:140
-msgid "Genesis ROM"
-msgstr "ROM Genesis"
+msgid "raw CD image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:141
-msgid "Glade project"
-msgstr "Prosiect Glade"
+msgid "CD Table Of Contents"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:142
-msgid "GnuCash financial data"
+msgid "PGN chess game notation"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:143
-msgid "Gnumeric spreadsheet"
-msgstr "Taenlen Gnumeric"
+msgid "CHM document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:144
-msgid "Gnuplot document"
-msgstr ""
+msgid "Java byte code"
+msgstr "Côd beit Java"
 
 #: ../freedesktop.org.xml.in.h:145
-msgid "Go source code"
+msgid "UNIX-compressed file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:146
-msgid "Google Video Pointer"
+msgid "Tar archive (gzip-compressed)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:147
-msgid "Graphite scientific graph"
+msgid "program crash data"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:148
-msgid "Graphviz DOT graph"
-msgstr ""
+msgid "CPIO archive"
+msgstr "Archif CPIO"
 
 #: ../freedesktop.org.xml.in.h:149
-msgid "Gzip archive"
+msgid "CPIO archive (gzip-compressed)"
+msgstr "Archif CPIO (gywasgwyd drwy gzip)"
+
+# EFALLAI (plisgyn?)
+#: ../freedesktop.org.xml.in.h:150
+msgid "C shell script"
+msgstr "Sgript plisgyn C"
+
+#: ../freedesktop.org.xml.in.h:151
+msgid "Xbase document"
 msgstr ""
 
-#. http://en.wikipedia.org/wiki/HD_DVD
-#. http://www.dvdafteredit.com/wiki/The_HVDVD_TS_Folder
 #: ../freedesktop.org.xml.in.h:152
-msgid "HD DVD video disc"
+msgid "ECMAScript program"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:153
-msgid "HDF document"
-msgstr "Dogfen HDF"
+msgid "Dreamcast ROM"
+msgstr "ROM Dreamcast"
 
 #: ../freedesktop.org.xml.in.h:154
-msgid "HPGL file"
+msgid "Nintendo DS ROM"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:155
-msgid "HTML document"
-msgstr ""
+msgid "Debian package"
+msgstr "Pecyn Debian"
 
 #: ../freedesktop.org.xml.in.h:156
-msgid "HTTP Live Streaming playlist"
-msgstr ""
+msgid "Qt Designer file"
+msgstr "Ffeil Qt Designer"
 
 #: ../freedesktop.org.xml.in.h:157
-msgid "Haansoft Hangul document"
+msgid "Qt Markup Language file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:158
-msgid "Haansoft Hangul document template"
+msgid "desktop configuration file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:159
-msgid "Haskell source code"
-msgstr "Ffynhonnell rhaglen Haskell"
+msgid "FictionBook document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:160
-msgid "ICC profile"
-msgstr ""
+msgid "Dia diagram"
+msgstr "Diagram Dia"
 
 #: ../freedesktop.org.xml.in.h:161
-msgid "IDL document"
-msgstr "Dogfen IDL"
+msgid "Dia shape"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:162
-msgid "IEF image"
-msgstr "Delwedd IEF"
+msgid "TeX DVI document"
+msgstr "Dogfen TeX DVI"
 
 #: ../freedesktop.org.xml.in.h:163
-msgid "IFF image"
-msgstr "Delwedd IFF"
+msgid "Enlightenment theme"
+msgstr "Thema Enlightenment"
 
 #: ../freedesktop.org.xml.in.h:164
-msgid "ILBM image"
-msgstr "Delwedd ILBM"
+msgid "Egon Animator animation"
+msgstr "Animeiddiad Egon Animator"
 
 #: ../freedesktop.org.xml.in.h:165
-msgid "ISI video"
-msgstr "Fideo ISI"
+msgid "executable"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:166
-msgid "IT 8.7 color calibration file"
+msgid "FLTK Fluid file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:167
-msgid "Impulse Tracker audio"
-msgstr "Sain Impulse Tracker"
+msgid "Postscript type-1 font"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:168
-msgid "Internet shortcut"
-msgstr ""
+msgid "Adobe font metrics"
+msgstr "Metrigau Ffont Adobe"
 
 #: ../freedesktop.org.xml.in.h:169
-msgid "JAD document"
-msgstr ""
+msgid "BDF font"
+msgstr "Ffont BDF"
 
 #: ../freedesktop.org.xml.in.h:170
-msgid "JBuilder project"
-msgstr ""
+msgid "DOS font"
+msgstr "Ffont DOS"
 
 #: ../freedesktop.org.xml.in.h:171
-msgid "JET database"
-msgstr ""
+msgid "Adobe FrameMaker font"
+msgstr "Ffont Adobe FrameMaker"
 
 #: ../freedesktop.org.xml.in.h:172
-msgid "JNG image"
-msgstr "Delwedd JNG"
+msgid "LIBGRX font"
+msgstr "Ffont LIBGRX"
 
 #: ../freedesktop.org.xml.in.h:173
-msgid "JNLP file"
-msgstr ""
+msgid "Linux PSF console font"
+msgstr "Ffont Linux PSF"
 
 #: ../freedesktop.org.xml.in.h:174
-msgid "JPEG image"
-msgstr "Delwedd JPEG"
+msgid "Linux PSF console font (gzip-compressed)"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:175
-msgid "JPEG-2000 image"
-msgstr "Delwedd JPEG-2000"
+msgid "PCF font"
+msgstr "Ffont PCF"
 
 #: ../freedesktop.org.xml.in.h:176
-msgid "Java JCE keystore"
-msgstr ""
+msgid "OpenType font"
+msgstr "Ffont OpenType"
 
 #: ../freedesktop.org.xml.in.h:177
-msgid "Java archive"
-msgstr ""
+msgid "Speedo font"
+msgstr "Ffont Speedo"
 
 #: ../freedesktop.org.xml.in.h:178
-msgid "Java byte code"
-msgstr "Côd beit Java"
+msgid "SunOS News font"
+msgstr "Ffont SunOS News"
 
 #: ../freedesktop.org.xml.in.h:179
-msgid "Java class"
-msgstr ""
+msgid "TeX font"
+msgstr "Ffont TeX"
 
 #: ../freedesktop.org.xml.in.h:180
-msgid "Java keystore"
-msgstr ""
+msgid "TeX font metrics"
+msgstr "Metrigau Ffont TeX"
 
 #: ../freedesktop.org.xml.in.h:181
-msgid "Java source code"
-msgstr "Ffynhonnell rhaglen Java"
+msgid "TrueType font"
+msgstr "Ffont Truetype"
 
 #: ../freedesktop.org.xml.in.h:182
-msgid "JavaFX video"
+msgid "TrueType XML font"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:183
-msgid "JavaScript program"
-msgstr ""
+msgid "V font"
+msgstr "Ffont V"
 
 #: ../freedesktop.org.xml.in.h:184
-msgid "KChart chart"
+msgid "Adobe FrameMaker document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:185
-msgid "KFormula formula"
-msgstr ""
+msgid "Game Boy ROM"
+msgstr "ROM Game Boy"
 
 #: ../freedesktop.org.xml.in.h:186
-msgid "KIllustrator drawing"
+msgid "Game Boy Advance ROM"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:187
-msgid "KML geographic compressed data"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:188
-msgid "KML geographic data"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:189
-msgid "KPovModeler scene"
+msgid "GDBM database"
 msgstr ""
 
+#. Translate this to Megadrive if the console was known as such in your locale
+#. Should be Megadrive in all but en_US: http://en.wikipedia.org/wiki/Megadrive#History
 #: ../freedesktop.org.xml.in.h:190
-msgid "KPresenter presentation"
-msgstr ""
+msgid "Genesis ROM"
+msgstr "ROM Genesis"
 
 #: ../freedesktop.org.xml.in.h:191
-msgid "KSpread spreadsheet"
+msgid "translated messages (machine-readable)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:192
-msgid "KSpread spreadsheet (encrypted)"
-msgstr "Taenlen KSpread (wedi ei hamgryptio)"
+msgid "Glade project"
+msgstr "Prosiect Glade"
 
 #: ../freedesktop.org.xml.in.h:193
-msgid "KSysV init package"
-msgstr ""
+msgid "GMC link"
+msgstr "Cyswllt GMC"
 
 #: ../freedesktop.org.xml.in.h:194
-msgid "KWord document"
-msgstr "Dogfen KWord"
+msgid "GnuCash financial data"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:195
-msgid "KWord document (encrypted)"
-msgstr "Dogfen KWord (wedi ei hamgryptio)"
+msgid "Gnumeric spreadsheet"
+msgstr "Taenlen Gnumeric"
 
 #: ../freedesktop.org.xml.in.h:196
-msgid "Karbon14 drawing"
-msgstr "Darlun Karbon14"
+msgid "Gnuplot document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:197
-msgid "Kexi database file-based project"
+msgid "Graphite scientific graph"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:198
-msgid "Kexi settings for database server connection"
-msgstr ""
+msgid "GTKtalog catalog"
+msgstr "Catalog Gtktalog"
 
 #: ../freedesktop.org.xml.in.h:199
-msgid "Kivio flowchart"
+msgid "TeX DVI document (gzip-compressed)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:200
-msgid "Kodak DCR raw image"
+msgid "Gzip archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:201
-msgid "Kodak K25 raw image"
+msgid "PDF document (gzip-compressed)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:202
-msgid "Kodak KDC raw image"
-msgstr ""
+msgid "PostScript document (gzip-compressed)"
+msgstr "Archif PostScript (gywasgwyd drwy gzip)"
 
 #: ../freedesktop.org.xml.in.h:203
-msgid "Kontour drawing"
-msgstr "Darlun Kontour"
+msgid "HDF document"
+msgstr "Dogfen HDF"
 
 #: ../freedesktop.org.xml.in.h:204
-msgid "Krita document"
-msgstr "Dogfen Krita"
+msgid "iPod firmware"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:205
-msgid "Kugar document"
-msgstr "Dogfen Kugar"
+msgid "Java archive"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:206
-msgid "LDIF address book"
+msgid "Java class"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:207
-msgid "LHA archive"
-msgstr "Archif LHA"
+msgid "JNLP file"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:208
-msgid "LHS source code"
+msgid "Java keystore"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:209
-msgid "LHZ archive"
-msgstr "Archif LZH"
+msgid "Java JCE keystore"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:210
-msgid "LIBGRX font"
-msgstr "Ffont LIBGRX"
+msgid "Pack200 Java archive"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:211
-msgid "LZMA archive"
+msgid "JavaScript program"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:212
-msgid "LZO archive"
-msgstr "Archif LZO"
+msgid "JBuilder project"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:213
-msgid "LightWave object"
-msgstr "Gwrthrych LightWave"
+msgid "Karbon14 drawing"
+msgstr "Darlun Karbon14"
 
 #: ../freedesktop.org.xml.in.h:214
-msgid "LightWave scene"
-msgstr "Golygfa LightWave"
+msgid "KChart chart"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:215
-msgid "Lilypond music sheet"
+msgid "Kexi settings for database server connection"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:216
-msgid "Linear and integer program expression format"
+msgid "shortcut to Kexi project on database server"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:217
-msgid "Linux PSF console font"
-msgstr "Ffont Linux PSF"
+msgid "Kexi database file-based project"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:218
-msgid "Linux PSF console font (gzip-compressed)"
+msgid "KFormula formula"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:219
-msgid "Lotus 1-2-3 spreadsheet"
-msgstr "Taenlen Lotus 1-2-3"
+msgid "KIllustrator drawing"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:220
-msgid "Lotus AmiPro document"
-msgstr "Dogfen Lotus AmiPro"
+msgid "Kivio flowchart"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:221
-msgid "Lrzip archive"
-msgstr ""
+msgid "Kontour drawing"
+msgstr "Darlun Kontour"
 
 #: ../freedesktop.org.xml.in.h:222
-msgid "Lua script"
+msgid "KPovModeler scene"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:223
-msgid "LyX document"
-msgstr "Dogfen LyX"
+msgid "KPresenter presentation"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:224
-msgid "Lzip archive"
-msgstr ""
+msgid "Krita document"
+msgstr "Dogfen Krita"
 
 #: ../freedesktop.org.xml.in.h:225
-msgid "M4 macro"
+msgid "KSpread spreadsheet"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:226
-msgid "MATLAB script/function"
-msgstr ""
+msgid "KSpread spreadsheet (encrypted)"
+msgstr "Taenlen KSpread (wedi ei hamgryptio)"
 
 #: ../freedesktop.org.xml.in.h:227
-msgid "MIDI audio"
-msgstr "Sain MIDI"
+msgid "KSysV init package"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:228
-msgid "MNG animation"
-msgstr "Animeiddiad MNG"
+msgid "Kugar document"
+msgstr "Dogfen Kugar"
 
 #: ../freedesktop.org.xml.in.h:229
-msgid "MP2 audio"
-msgstr ""
+msgid "KWord document"
+msgstr "Dogfen KWord"
 
 #: ../freedesktop.org.xml.in.h:230
-msgid "MP3 ShoutCast playlist"
-msgstr "Rhestr Chwarae MP3 ShoutCast"
+msgid "KWord document (encrypted)"
+msgstr "Dogfen KWord (wedi ei hamgryptio)"
 
 #: ../freedesktop.org.xml.in.h:231
-msgid "MP3 audio"
-msgstr "Sain MP3"
+msgid "LHA archive"
+msgstr "Archif LHA"
 
 #: ../freedesktop.org.xml.in.h:232
-msgid "MP3 audio (streamed)"
-msgstr "Sain MP3 (wedi llifo)"
+msgid "LHZ archive"
+msgstr "Archif LZH"
 
 #: ../freedesktop.org.xml.in.h:233
-msgid "MPEG video"
-msgstr "Fideo MPEG"
+msgid "message catalog"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:234
-msgid "MPEG video (streamed)"
-msgstr ""
+msgid "LyX document"
+msgstr "Dogfen LyX"
 
 #: ../freedesktop.org.xml.in.h:235
-msgid "MPEG-2 transport stream"
+msgid "Lzip archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:236
-msgid "MPEG-4 audio"
+msgid "LZMA archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:237
-msgid "MPEG-4 audio book"
+msgid "Tar archive (LZMA-compressed)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:238
-msgid "MPEG-4 video"
-msgstr ""
+msgid "LZO archive"
+msgstr "Archif LZO"
 
 #: ../freedesktop.org.xml.in.h:239
-msgid "MPSub subtitles"
-msgstr ""
+msgid "MagicPoint presentation"
+msgstr "Cyflwyniad MagicPoint"
 
 #: ../freedesktop.org.xml.in.h:240
-msgid "MRML playlist"
+msgid "Macintosh MacBinary file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:241
-msgid "MSX ROM"
-msgstr "ROM MSX"
+msgid "Matroska stream"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:242
-msgid "MXF video"
-msgstr ""
+msgid "Matroska video"
+msgstr "Fideo Matroska"
 
 #: ../freedesktop.org.xml.in.h:243
-msgid "MacOS X icon"
+msgid "Matroska audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:244
-msgid "MacPaint Bitmap image"
+msgid "WebM video"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:245
-msgid "Macintosh AppleDouble-encoded file"
-msgstr "Ffeil AppleDouble-amgodedig Macintosh"
+msgid "WebM audio"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:246
-msgid "Macintosh BinHex-encoded file"
-msgstr "Ffeil BinHex-amgodwyd Macintosh"
+msgid "MXF video"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:247
-msgid "Macintosh MacBinary file"
+msgid "OCL file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:248
-msgid "Macintosh Quickdraw/PICT drawing"
+msgid "COBOL source file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:249
-msgid "MagicPoint presentation"
-msgstr "Cyflwyniad MagicPoint"
+msgid "Mobipocket e-book"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:250
-msgid "Makefile"
-msgstr "Ffeil \"make\""
+msgid "Adobe FrameMaker MIF document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:251
-msgid "Managed Object Format"
+msgid "Mozilla bookmarks"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:252
-msgid "Markaby script"
+msgid "DOS/Windows executable"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:253
-msgid "Markdown document"
+msgid "Internet shortcut"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:254
-msgid "MathML document"
-msgstr "Dogfen MathML"
+msgid "WRI document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:255
-msgid "Mathematica Notebook"
-msgstr ""
+msgid "MSX ROM"
+msgstr "ROM MSX"
 
 #: ../freedesktop.org.xml.in.h:256
-msgid "Matroska audio"
+msgid "M4 macro"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:257
-msgid "Matroska stream"
+msgid "Nintendo64 ROM"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:258
-msgid "Matroska video"
-msgstr "Fideo Matroska"
-
-#: ../freedesktop.org.xml.in.h:259
-msgid "Metalink file"
-msgstr ""
+msgid "Nautilus link"
+msgstr "Cyswllt Nautilus"
 
+#. Translate this to Famicom if the console was known as such in your locale
 #: ../freedesktop.org.xml.in.h:260
-msgid "MicroDVD subtitles"
-msgstr ""
+msgid "NES ROM"
+msgstr "ROM NES"
 
 #: ../freedesktop.org.xml.in.h:261
-msgid "Microsoft ASX playlist"
+msgid "Unidata NetCDF document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:262
-msgid "Microsoft Cabinet archive"
+msgid "NewzBin usenet index"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:263
-msgid "Microsoft Document Imaging format"
+msgid "object code"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:264
-msgid "Microsoft Windows theme pack"
+msgid "Annodex exchange format"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:265
-msgid "Microsoft Works document"
+msgid "Annodex Video"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:266
-msgid "Microsoft icon"
+msgid "Annodex Audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:267
-msgid "MiniPSF audio"
+msgid "Ogg multimedia file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:268
-msgid "Minolta MRW raw image"
+msgid "Ogg Audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:269
-msgid "Mobipocket e-book"
+msgid "Ogg Video"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:270
-msgid "Monkey's audio"
-msgstr ""
+msgid "Ogg Vorbis audio"
+msgstr "Sain Ogg Vorbis"
 
 #: ../freedesktop.org.xml.in.h:271
-msgid "Mozilla bookmarks"
+msgid "Ogg FLAC audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:272
-msgid "Mup publication"
+msgid "Ogg Speex audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:273
-msgid "Musepack audio"
+msgid "Speex audio"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:274
+msgid "Ogg Theora video"
 msgstr ""
 
-#. Translate this to Famicom if the console was known as such in your locale
 #: ../freedesktop.org.xml.in.h:275
-msgid "NES ROM"
-msgstr "ROM NES"
+msgid "OGM video"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:276
-msgid "NFO document"
+msgid "OLE2 compound document storage"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:277
-msgid "NIFF image"
+msgid "Windows Installer package"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:278
-msgid "Nautilus link"
-msgstr "Cyswllt Nautilus"
+msgid "GNU Oleo spreadsheet"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:279
-msgid "Network Packet Capture"
+msgid "PAK archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:280
-msgid "NewzBin usenet index"
-msgstr ""
+msgid "Palm OS database"
+msgstr "Cronfa Ddata Palm OS"
 
 #: ../freedesktop.org.xml.in.h:281
-msgid "Nikon NEF raw image"
+msgid "Parchive archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:282
-msgid "Nintendo DS ROM"
+msgid "PEF executable"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:283
-msgid "Nintendo64 ROM"
-msgstr ""
+msgid "Perl script"
+msgstr "Sgript Perl"
 
 #: ../freedesktop.org.xml.in.h:284
-msgid "NullSoft video"
-msgstr ""
+msgid "PHP script"
+msgstr "Sgript PHP"
 
 #: ../freedesktop.org.xml.in.h:285
-msgid "OCL file"
+msgid "PKCS#7 certificate bundle"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:286
-msgid "OCaml source code"
+msgid "PKCS#12 certificate bundle"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:287
-msgid "ODA document"
-msgstr "Dogfen ODA"
+msgid "PlanPerfect spreadsheet"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:288
-msgid "ODB database"
+msgid "Pocket Word document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:289
-msgid "ODC chart"
+msgid "Linear and integer program expression format"
 msgstr ""
 
+# EFALLAI (proffeilio?)
 #: ../freedesktop.org.xml.in.h:290
-msgid "ODC template"
-msgstr ""
+msgid "profiler results"
+msgstr "canlyniadau proffeilio"
 
 #: ../freedesktop.org.xml.in.h:291
-msgid "ODF formula"
-msgstr ""
+msgid "Pathetic Writer document"
+msgstr "Dogfen Pathetic Writer"
 
+# EFALLAI (côd beit?)
 #: ../freedesktop.org.xml.in.h:292
-msgid "ODF template"
-msgstr ""
+msgid "Python bytecode"
+msgstr "Côd beit Python"
 
 #: ../freedesktop.org.xml.in.h:293
-msgid "ODG drawing"
-msgstr ""
+msgid "Quattro Pro spreadsheet"
+msgstr "Taenlen Quattro Pro"
 
 #: ../freedesktop.org.xml.in.h:294
-msgid "ODG drawing (Flat XML)"
+msgid "QuickTime metalink playlist"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:295
-msgid "ODG template"
-msgstr ""
+msgid "Quicken document"
+msgstr "Dogfen Quicken"
 
 #: ../freedesktop.org.xml.in.h:296
-msgid "ODI image"
-msgstr ""
+msgid "RAR archive"
+msgstr "Archif RAR"
 
 #: ../freedesktop.org.xml.in.h:297
-msgid "ODM document"
+msgid "DAR archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:298
-msgid "ODP presentation"
+msgid "Alzip archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:299
-msgid "ODP presentation (Flat XML)"
+msgid "rejected patch"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:300
-msgid "ODP template"
-msgstr ""
+msgid "RPM package"
+msgstr "Ffeil becyn RPM"
 
 #: ../freedesktop.org.xml.in.h:301
-msgid "ODS spreadsheet"
-msgstr ""
+msgid "Ruby script"
+msgstr "Sgript Ruby"
 
 #: ../freedesktop.org.xml.in.h:302
-msgid "ODS spreadsheet (Flat XML)"
+msgid "Markaby script"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:303
-msgid "ODS template"
+msgid "SC/Xspread spreadsheet"
 msgstr ""
 
+# EFALLAI (plisgyn?)
 #: ../freedesktop.org.xml.in.h:304
-msgid "ODT document"
-msgstr ""
+msgid "shell archive"
+msgstr "archif plisgyn"
 
 #: ../freedesktop.org.xml.in.h:305
-msgid "ODT document (Flat XML)"
+msgid "libtool shared library"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:306
-msgid "ODT template"
-msgstr ""
+msgid "shared library"
+msgstr "llyfrgell wedi ei rhannu"
 
+# EFALLAI (plisgyn?)
 #: ../freedesktop.org.xml.in.h:307
-msgid "OGM video"
-msgstr ""
+msgid "shell script"
+msgstr "sgript plisgyn"
 
 #: ../freedesktop.org.xml.in.h:308
-msgid "OLE2 compound document storage"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:309
-msgid "OOC source code"
-msgstr ""
+msgid "Shockwave Flash file"
+msgstr "Ffeil Shockwave Flash"
 
+#. translators: "Shorten" is the name of an audio codec
 #: ../freedesktop.org.xml.in.h:310
-msgid "OPML syndication feed"
+msgid "Shorten audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:311
-msgid "OTH template"
-msgstr ""
+msgid "Siag spreadsheet"
+msgstr "Taenlen Siag"
 
 #: ../freedesktop.org.xml.in.h:312
-msgid "Objective-C source code"
+msgid "Skencil document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:313
-msgid "Office drawing"
-msgstr ""
+msgid "Stampede package"
+msgstr "Pecyn Stampede"
 
 #: ../freedesktop.org.xml.in.h:314
-msgid "Ogg Audio"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:315
-msgid "Ogg FLAC audio"
+msgid "Sega Master System/Game Gear ROM"
 msgstr ""
 
+#. Translate this as Super Famicom (in Far East Asia) or Super Nintendo (in Europe) if the console was known as such in your locale
 #: ../freedesktop.org.xml.in.h:316
-msgid "Ogg Speex audio"
+msgid "Super NES ROM"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:317
-msgid "Ogg Theora video"
+msgid "StuffIt archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:318
-msgid "Ogg Video"
+msgid "SubRip subtitles"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:319
-msgid "Ogg Vorbis audio"
-msgstr "Sain Ogg Vorbis"
+msgid "WebVTT subtitles"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:320
-msgid "Ogg multimedia file"
+msgid "SAMI subtitles"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:321
-msgid "Olympus ORF raw image"
+msgid "MicroDVD subtitles"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:322
-msgid "OpenOffice Calc spreadsheet"
+msgid "MPSub subtitles"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:323
-msgid "OpenOffice Calc template"
+msgid "SSA subtitles"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:324
-msgid "OpenOffice Draw drawing"
+msgid "SubViewer subtitles"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:325
-msgid "OpenOffice Draw template"
+msgid "iMelody ringtone"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:326
-msgid "OpenOffice Impress presentation"
-msgstr "Cyflwyniad OpenOffice (Impress)"
+msgid "SMAF audio"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:327
-msgid "OpenOffice Impress template"
+msgid "MRML playlist"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:328
-msgid "OpenOffice Math formula"
+msgid "XMF audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:329
-msgid "OpenOffice Writer document"
-msgstr "Dogfen OpenOffice (Writer)"
+msgid "SV4 CPIO archive"
+msgstr "Archif CPIO SV4"
 
 #: ../freedesktop.org.xml.in.h:330
-msgid "OpenOffice Writer global document"
-msgstr "Dogfen eang OpenOffice (Writer)"
+msgid "SV4 CPIO archive (with CRC)"
+msgstr "Archif CPIO SV4 (efo CRC)"
 
 #: ../freedesktop.org.xml.in.h:331
-msgid "OpenOffice Writer template"
-msgstr "Templed OpenOffice (Writer)"
+msgid "Tar archive"
+msgstr "Archif tar"
 
 #: ../freedesktop.org.xml.in.h:332
-msgid "OpenOffice.org extension"
+msgid "Tar archive (compressed)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:333
-msgid "OpenRaster archiving image"
+msgid "generic font file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:334
-msgid "OpenType font"
-msgstr "Ffont OpenType"
+msgid "packed font file"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:335
-msgid "PAK archive"
-msgstr ""
+msgid "TGIF document"
+msgstr "Dogfen TGIF"
 
 #: ../freedesktop.org.xml.in.h:336
-msgid "PBM image"
-msgstr "Delwedd PBM"
+msgid "theme"
+msgstr "thema"
 
 #: ../freedesktop.org.xml.in.h:337
-msgid "PCD image"
-msgstr ""
+msgid "ToutDoux document"
+msgstr "Dogfen ToutDoux"
 
 #: ../freedesktop.org.xml.in.h:338
-msgid "PCF font"
-msgstr "Ffont PCF"
+msgid "backup file"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:339
-msgid "PCL file"
-msgstr ""
+msgid "Troff document"
+msgstr "Dogfen troff"
 
 #: ../freedesktop.org.xml.in.h:340
-msgid "PCM audio"
-msgstr "Sain PCM"
+msgid "Troff document (with manpage macros)"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:341
-msgid "PCX image"
-msgstr ""
+msgid "manual page (compressed)"
+msgstr "tudalen llawlyfr (wedi ei gywasgu)"
 
 #: ../freedesktop.org.xml.in.h:342
-msgid "PDF document"
-msgstr "Dogfen PDF"
+msgid "Tar archive (LZO-compressed)"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:343
-msgid "PDF document (XZ-compressed)"
+msgid "XZ archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:344
-msgid "PDF document (bzip-compressed)"
+msgid "Tar archive (XZ-compressed)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:345
-msgid "PDF document (gzip-compressed)"
+msgid "PDF document (XZ-compressed)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:346
-msgid "PEF executable"
+msgid "Ustar archive"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:347
-msgid "PGM image"
-msgstr "Delwedd PGM"
+msgid "WAIS source code"
+msgstr "Ffynhonnell Rhaglen WAIS"
 
 #: ../freedesktop.org.xml.in.h:348
-msgid "PGN chess game notation"
-msgstr ""
+msgid "WordPerfect/Drawperfect image"
+msgstr "Delwedd WordPerfect/DrawPerfect"
 
 #: ../freedesktop.org.xml.in.h:349
-msgid "PGP keys"
-msgstr "Allweddi PGP"
+msgid "DER/PEM/Netscape-encoded X.509 certificate"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:350
-msgid "PGP/MIME-encrypted message header"
+msgid "empty document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:351
-msgid "PHP script"
-msgstr "Sgript PHP"
+msgid "Zoo archive"
+msgstr "Archif zoo"
 
 #: ../freedesktop.org.xml.in.h:352
-msgid "PKCS#10 certification request"
-msgstr ""
+msgid "XHTML page"
+msgstr "Tudalen XHTML"
 
 #: ../freedesktop.org.xml.in.h:353
-msgid "PKCS#12 certificate bundle"
-msgstr ""
+msgid "Zip archive"
+msgstr "Archif ZIP"
 
 #: ../freedesktop.org.xml.in.h:354
-msgid "PKCS#7 certificate bundle"
+msgid "Windows Imaging Format Disk Image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:355
-msgid "PKCS#8 private key"
-msgstr ""
+msgid "Dolby Digital audio"
+msgstr "Sain Dolby Digital"
 
 #: ../freedesktop.org.xml.in.h:356
-msgid "PNG image"
-msgstr "Delwedd PNG"
+msgid "AMR audio"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:357
-msgid "PNM image"
-msgstr "Delwedd PNM"
+msgid "AMR-WB audio"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:358
-msgid "PPM image"
-msgstr "Delwedd PPM"
+msgid "ULAW (Sun) audio"
+msgstr "Sain ULAW (Sun)"
 
 #: ../freedesktop.org.xml.in.h:359
-msgid "PS document"
-msgstr ""
+msgid "Commodore 64 audio"
+msgstr "Sain Commodore 64"
 
 #: ../freedesktop.org.xml.in.h:360
-msgid "PSF audio"
-msgstr ""
+msgid "PCM audio"
+msgstr "Sain PCM"
 
 #: ../freedesktop.org.xml.in.h:361
-msgid "PSFlib audio library"
-msgstr ""
+msgid "AIFC audio"
+msgstr "Sain AIFC"
 
 #: ../freedesktop.org.xml.in.h:362
-msgid "Pack200 Java archive"
-msgstr ""
+msgid "AIFF/Amiga/Mac audio"
+msgstr "Sain AIFF/Amiga/Mac"
 
 #: ../freedesktop.org.xml.in.h:363
-msgid "Palm OS database"
-msgstr "Cronfa Ddata Palm OS"
+msgid "AIFF audio"
+msgstr "Sain AIFF"
 
 #: ../freedesktop.org.xml.in.h:364
-msgid "Panasonic raw image"
+msgid "Monkey's audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:365
-msgid "Panasonic raw2 image"
-msgstr ""
+msgid "Impulse Tracker audio"
+msgstr "Sain Impulse Tracker"
 
 #: ../freedesktop.org.xml.in.h:366
-msgid "Parchive archive"
+msgid "FLAC audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:367
-msgid "Pascal source code"
+msgid "WavPack audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:368
-msgid "Pathetic Writer document"
-msgstr "Dogfen Pathetic Writer"
+msgid "WavPack audio correction file"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:369
-msgid "Pentax PEF raw image"
-msgstr ""
+msgid "MIDI audio"
+msgstr "Sain MIDI"
 
 #: ../freedesktop.org.xml.in.h:370
-msgid "Perl script"
-msgstr "Sgript Perl"
+msgid "compressed Tracker audio"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:371
-msgid "Photoshop image"
+msgid "MPEG-4 audio"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:372
+msgid "MPEG-4 video"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:373
+msgid "MPEG-4 audio book"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:374
+msgid "3GPP multimedia file"
 msgstr ""
 
-#. TRANSLATORS: This is a brand-name, not a generic term. Please see
-#. http://en.wikipedia.org/wiki/Picture_CD
-#. http://www.re.org/kristin/picturecd.html
 #: ../freedesktop.org.xml.in.h:375
-msgid "Picture CD"
+msgid "3GPP2 multimedia file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:376
-msgid "PkiPath certification path"
-msgstr ""
+msgid "Amiga SoundTracker audio"
+msgstr "Sain \"soundtracker\" Amiga"
 
 #: ../freedesktop.org.xml.in.h:377
-msgid "PlanPerfect spreadsheet"
+msgid "MP2 audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:378
-msgid "Plucker document"
-msgstr ""
+msgid "MP3 audio"
+msgstr "Sain MP3"
 
 #: ../freedesktop.org.xml.in.h:379
-msgid "Pocket Word document"
-msgstr ""
+msgid "MP3 audio (streamed)"
+msgstr "Sain MP3 (wedi llifo)"
 
 #: ../freedesktop.org.xml.in.h:380
-msgid "PostScript document (bzip-compressed)"
+msgid "HTTP Live Streaming playlist"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:381
-msgid "PostScript document (gzip-compressed)"
-msgstr "Archif PostScript (gywasgwyd drwy gzip)"
+msgid "Microsoft ASX playlist"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:382
-msgid "Postscript type-1 font"
+msgid "PSF audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:383
-msgid "PowerPoint 2007 presentation"
+msgid "MiniPSF audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:384
-msgid "PowerPoint 2007 presentation template"
+msgid "PSFlib audio library"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:385
-msgid "PowerPoint 2007 show"
+msgid "Windows Media audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:386
-msgid "PowerPoint 2007 slide"
+msgid "Musepack audio"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:387
-msgid "PowerPoint add-in"
+msgid "RealAudio document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:388
-msgid "PowerPoint macro-enabled presentation"
+msgid "RealMedia Metafile"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:389
-msgid "PowerPoint macro-enabled presentation template"
+msgid "RealVideo document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:390
-msgid "PowerPoint macro-enabled slide"
+msgid "RealMedia document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:391
-msgid "PowerPoint presentation"
+msgid "RealPix document"
 msgstr ""
 
-# EFALLAI (côd beit?)
 #: ../freedesktop.org.xml.in.h:392
-msgid "Python bytecode"
-msgstr "Côd beit Python"
+msgid "RealText document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:393
-msgid "Python script"
-msgstr "Sgript Python"
+msgid "RIFF audio"
+msgstr "Sain RIFF"
 
 #: ../freedesktop.org.xml.in.h:394
-msgid "Qt Designer file"
-msgstr "Ffeil Qt Designer"
+msgid "Scream Tracker 3 audio"
+msgstr "Sain Scream Tracker 3"
 
 #: ../freedesktop.org.xml.in.h:395
-msgid "Qt MOC file"
-msgstr ""
+msgid "MP3 ShoutCast playlist"
+msgstr "Rhestr Chwarae MP3 ShoutCast"
 
 #: ../freedesktop.org.xml.in.h:396
-msgid "Qt Markup Language file"
-msgstr ""
+msgid "Scream Tracker audio"
+msgstr "Sain Scream Tracker"
 
 #: ../freedesktop.org.xml.in.h:397
-msgid "Quattro Pro spreadsheet"
-msgstr "Taenlen Quattro Pro"
+msgid "VOC audio"
+msgstr "Sain VOC"
 
 #: ../freedesktop.org.xml.in.h:398
-msgid "QuickTime image"
-msgstr ""
+msgid "WAV audio"
+msgstr "Sain WAV"
 
 #: ../freedesktop.org.xml.in.h:399
-msgid "QuickTime metalink playlist"
-msgstr ""
+msgid "Scream Tracker instrument"
+msgstr "Offeryn Scream Tracker"
 
 #: ../freedesktop.org.xml.in.h:400
-msgid "QuickTime video"
-msgstr "Fideo QuickTime"
+msgid "FastTracker II audio"
+msgstr "Sain FastTracker II"
 
 #: ../freedesktop.org.xml.in.h:401
-msgid "Quicken document"
-msgstr "Dogfen Quicken"
+msgid "TrueAudio audio"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:402
-msgid "RAR archive"
-msgstr "Archif RAR"
+msgid "Windows BMP image"
+msgstr "Delwedd BMP Windows"
 
 #: ../freedesktop.org.xml.in.h:403
-msgid "RDF file"
+msgid "WBMP image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:404
-msgid "README document"
-msgstr "Dogfen README"
+msgid "Computer Graphics Metafile"
+msgstr "Delwedd ffurf CGM"
 
 #: ../freedesktop.org.xml.in.h:405
-msgid "RELAX NG XML schema"
-msgstr ""
+msgid "CCITT G3 fax"
+msgstr "Ffacs CCITT grŵp 3"
 
 #: ../freedesktop.org.xml.in.h:406
-msgid "RGB image"
-msgstr "Delwedd RGB"
+msgid "G3 fax image"
+msgstr "Delwedd Ffacs G3"
 
 #: ../freedesktop.org.xml.in.h:407
-msgid "RIFF audio"
-msgstr "Sain RIFF"
+msgid "GIF image"
+msgstr "Delwedd GIF"
 
 #: ../freedesktop.org.xml.in.h:408
-msgid "RPM package"
-msgstr "Ffeil becyn RPM"
+msgid "IEF image"
+msgstr "Delwedd IEF"
 
 #: ../freedesktop.org.xml.in.h:409
-msgid "RPM spec file"
-msgstr ""
+msgid "JPEG image"
+msgstr "Delwedd JPEG"
 
 #: ../freedesktop.org.xml.in.h:410
-msgid "RSS summary"
-msgstr ""
+msgid "JPEG-2000 image"
+msgstr "Delwedd JPEG-2000"
 
 #: ../freedesktop.org.xml.in.h:411
-msgid "RTF document"
+msgid "OpenRaster archiving image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:412
-msgid "RealAudio document"
+msgid "DirectDraw surface"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:413
-msgid "RealMedia Metafile"
+msgid "X11 cursor"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:414
-msgid "RealMedia document"
+msgid "EXR image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:415
-msgid "RealPix document"
+msgid "Macintosh Quickdraw/PICT drawing"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:416
-msgid "RealText document"
+msgid "UFRaw ID image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:417
-msgid "RealVideo document"
+msgid "digital raw image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:418
-msgid "Ruby script"
-msgstr "Sgript Ruby"
+msgid "Adobe DNG negative"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:419
-msgid "Run Length Encoded bitmap image"
+msgid "Canon CRW raw image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:420
-msgid "S/MIME file"
-msgstr "Ffeil S/MIME"
+msgid "Canon CR2 raw image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:421
-msgid "SAMI subtitles"
+msgid "Fuji RAF raw image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:422
-msgid "SC/Xspread spreadsheet"
+msgid "Kodak DCR raw image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:423
-msgid "SDP multicast stream file"
+msgid "Kodak K25 raw image"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:424
+msgid "Kodak KDC raw image"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:425
+msgid "Minolta MRW raw image"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:426
+msgid "Nikon NEF raw image"
 msgstr ""
 
-#. translators: a record is in this context a description of a board game
-#. that has been played, and that can be played back again:
-#. http://www.red-bean.com/sgf/
 #: ../freedesktop.org.xml.in.h:427
-msgid "SGF record"
+msgid "Olympus ORF raw image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:428
-msgid "SGI image"
+msgid "Panasonic raw image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:429
-msgid "SGI video"
-msgstr "Video SGI"
+msgid "Panasonic raw2 image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:430
-msgid "SGML document"
-msgstr "Dogfen SGML"
+msgid "Pentax PEF raw image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:431
-msgid "SIS package"
+msgid "Sigma X3F raw image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:432
-msgid "SISX package"
+msgid "Sony SRF raw image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:433
-msgid "SMAF audio"
+msgid "Sony SR2 raw image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:434
-msgid "SMIL document"
+msgid "Sony ARW raw image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:435
-msgid "SPSS Data File"
-msgstr ""
+msgid "PNG image"
+msgstr "Delwedd PNG"
 
 #: ../freedesktop.org.xml.in.h:436
-msgid "SPSS Portable Data File"
+msgid "Run Length Encoded bitmap image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:437
-msgid "SQL code"
-msgstr "Côd SQL"
+msgid "SVG image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:438
-msgid "SQLite2 database"
+msgid "compressed SVG image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:439
-msgid "SQLite3 database"
-msgstr ""
+msgid "TIFF image"
+msgstr "Delwedd IFF"
 
 #: ../freedesktop.org.xml.in.h:440
-msgid "SSA subtitles"
-msgstr ""
+msgid "AutoCAD image"
+msgstr "Delwedd AutoCAD"
 
 #: ../freedesktop.org.xml.in.h:441
-msgid "SV4 CPIO archive"
-msgstr "Archif CPIO SV4"
+msgid "DXF vector image"
+msgstr "Delwedd Fector DXF"
 
 #: ../freedesktop.org.xml.in.h:442
-msgid "SV4 CPIO archive (with CRC)"
-msgstr "Archif CPIO SV4 (efo CRC)"
+msgid "Microsoft Document Imaging format"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:443
-msgid "SVG image"
-msgstr ""
+msgid "3D Studio image"
+msgstr "Delwedd \"3D Studio\""
 
 #: ../freedesktop.org.xml.in.h:444
-msgid "Scala source code"
-msgstr ""
+msgid "Applix Graphics image"
+msgstr "Delwedd Applix Graphics"
 
 #: ../freedesktop.org.xml.in.h:445
-msgid "Scheme source code"
-msgstr "Ffynhonnell Rhaglen Scheme"
+msgid "EPS image (bzip-compressed)"
+msgstr ""
 
+# Efallai (raster?)
 #: ../freedesktop.org.xml.in.h:446
-msgid "Scream Tracker 3 audio"
-msgstr "Sain Scream Tracker 3"
+msgid "CMU raster image"
+msgstr "Delwedd raster CMU"
 
 #: ../freedesktop.org.xml.in.h:447
-msgid "Scream Tracker audio"
-msgstr "Sain Scream Tracker"
+msgid "compressed GIMP image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:448
-msgid "Scream Tracker instrument"
-msgstr "Offeryn Scream Tracker"
+msgid "DICOM image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:449
-msgid "Sega Master System/Game Gear ROM"
+msgid "DocBook document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:450
-msgid "Setext document"
-msgstr "Dogfen Setext"
+msgid "DIB image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:451
-msgid "Shockwave Flash file"
-msgstr "Ffeil Shockwave Flash"
+msgid "DjVu image"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:452
+msgid "DPX image"
+msgstr ""
 
-#. translators: "Shorten" is the name of an audio codec
 #: ../freedesktop.org.xml.in.h:453
-msgid "Shorten audio"
+msgid "EPS image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:454
-msgid "Siag spreadsheet"
-msgstr "Taenlen Siag"
+msgid "FITS document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:455
-msgid "Sieve mail filter script"
+msgid "FPX image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:456
-msgid "Sigma X3F raw image"
+msgid "EPS image (gzip-compressed)"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:457
-msgid "Skencil document"
+msgid "Microsoft icon"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:458
-msgid "Sony ARW raw image"
+msgid "MacOS X icon"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:459
-msgid "Sony SR2 raw image"
-msgstr ""
+msgid "IFF image"
+msgstr "Delwedd IFF"
 
 #: ../freedesktop.org.xml.in.h:460
-msgid "Sony SRF raw image"
-msgstr ""
+msgid "ILBM image"
+msgstr "Delwedd ILBM"
 
 #: ../freedesktop.org.xml.in.h:461
-msgid "Speedo font"
-msgstr "Ffont Speedo"
+msgid "JNG image"
+msgstr "Delwedd JNG"
 
 #: ../freedesktop.org.xml.in.h:462
-msgid "Speex audio"
-msgstr ""
+msgid "LightWave object"
+msgstr "Gwrthrych LightWave"
 
 #: ../freedesktop.org.xml.in.h:463
-msgid "Stampede package"
-msgstr "Pecyn Stampede"
+msgid "LightWave scene"
+msgstr "Golygfa LightWave"
 
 #: ../freedesktop.org.xml.in.h:464
-msgid "StarCalc spreadsheet"
-msgstr "Taenlen StarCalc"
+msgid "MacPaint Bitmap image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:465
-msgid "StarChart chart"
-msgstr "Siart StarChart"
+msgid "Office drawing"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:466
-msgid "StarDraw drawing"
-msgstr "Darlun StarDraw"
+msgid "NIFF image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:467
-msgid "StarImpress presentation"
-msgstr "Cyflwyniad StarImpress"
+msgid "PCX image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:468
-msgid "StarMail email"
-msgstr "Ebost StarMail"
+msgid "PCD image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:469
-msgid "StarMath formula"
-msgstr ""
+msgid "PNM image"
+msgstr "Delwedd PNM"
 
 #: ../freedesktop.org.xml.in.h:470
-msgid "StarWriter document"
-msgstr "Dogfen StarWriter"
+msgid "PBM image"
+msgstr "Delwedd PBM"
 
 #: ../freedesktop.org.xml.in.h:471
-msgid "StuffIt archive"
-msgstr ""
+msgid "PGM image"
+msgstr "Delwedd PGM"
 
 #: ../freedesktop.org.xml.in.h:472
-msgid "SubRip subtitles"
-msgstr ""
+msgid "PPM image"
+msgstr "Delwedd PPM"
 
 #: ../freedesktop.org.xml.in.h:473
-msgid "SubViewer subtitles"
+msgid "Photoshop image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:474
-msgid "Sun raster image"
-msgstr ""
+msgid "RGB image"
+msgstr "Delwedd RGB"
 
 #: ../freedesktop.org.xml.in.h:475
-msgid "SunOS News font"
-msgstr "Ffont SunOS News"
+msgid "SGI image"
+msgstr ""
 
-#. Translate this as Super Famicom (in Far East Asia) or Super Nintendo (in Europe) if the console was known as such in your locale
-#: ../freedesktop.org.xml.in.h:477
-msgid "Super NES ROM"
+#: ../freedesktop.org.xml.in.h:476
+msgid "Sun raster image"
 msgstr ""
 
-#. TRANSLATORS: This is a brand-name, not a generic term. Please see
-#. http://en.wikipedia.org/wiki/Super_Video_CD
-#. http://everything2.com/index.pl?node_id=1009222
-#: ../freedesktop.org.xml.in.h:481
-msgid "Super Video CD"
+#: ../freedesktop.org.xml.in.h:477
+msgid "TGA image"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:482
-msgid "SystemVerilog header"
+#: ../freedesktop.org.xml.in.h:478
+msgid "Windows cursor"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:483
-msgid "SystemVerilog source code"
+#: ../freedesktop.org.xml.in.h:479
+msgid "Windows animated cursor"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:484
-msgid "T602 document"
+#: ../freedesktop.org.xml.in.h:480
+msgid "EMF image"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:485
-msgid "TGA image"
+#: ../freedesktop.org.xml.in.h:481
+msgid "WMF image"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:482
+msgid "XBM image"
 msgstr ""
 
+#: ../freedesktop.org.xml.in.h:483
+msgid "GIMP image"
+msgstr "Delwedd GIMP"
+
+#: ../freedesktop.org.xml.in.h:484
+msgid "XFig image"
+msgstr "Delwedd XFig"
+
+#: ../freedesktop.org.xml.in.h:485
+msgid "XPM image"
+msgstr "Delwedd XPM"
+
 #: ../freedesktop.org.xml.in.h:486
-msgid "TGIF document"
-msgstr "Dogfen TGIF"
+msgid "X window image"
+msgstr "Delwedd ffenest X"
 
 #: ../freedesktop.org.xml.in.h:487
-msgid "TIFF image"
-msgstr "Delwedd IFF"
+msgid "block device"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:488
-msgid "TNEF message"
+msgid "character device"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:489
-msgid "TSV document"
-msgstr ""
+msgid "folder"
+msgstr "Plygell"
 
 #: ../freedesktop.org.xml.in.h:490
-msgid "Tar archive"
-msgstr "Archif tar"
+msgid "pipe"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:491
-msgid "Tar archive (LZMA-compressed)"
+msgid "mount point"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:492
-msgid "Tar archive (LZO-compressed)"
+msgid "socket"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:493
-msgid "Tar archive (XZ-compressed)"
-msgstr ""
+msgid "symbolic link"
+msgstr "cyswllt symbolaidd"
 
 #: ../freedesktop.org.xml.in.h:494
-msgid "Tar archive (bzip-compressed)"
-msgstr ""
+msgid "mail delivery report"
+msgstr "Adroddiad trosgludo post"
 
+# EFALLAI (ffurf?)
 #: ../freedesktop.org.xml.in.h:495
-msgid "Tar archive (compressed)"
-msgstr ""
+msgid "mail disposition report"
+msgstr "adroddiad ffurf post"
 
 #: ../freedesktop.org.xml.in.h:496
-msgid "Tar archive (gzip-compressed)"
-msgstr ""
+msgid "reference to remote file"
+msgstr "cyfeiriad at ffeil bell"
 
 #: ../freedesktop.org.xml.in.h:497
-msgid "Tar archive (lrzip-compressed)"
-msgstr ""
+msgid "Usenet news message"
+msgstr "Neges newyddion Usenet"
 
 #: ../freedesktop.org.xml.in.h:498
-msgid "Tcl script"
-msgstr "Sgript Tcl"
+msgid "partial email message"
+msgstr "darn o neges e-bost"
 
 #: ../freedesktop.org.xml.in.h:499
-msgid "TeX DVI document"
-msgstr "Dogfen TeX DVI"
+msgid "email message"
+msgstr "neges ebost"
 
 #: ../freedesktop.org.xml.in.h:500
-msgid "TeX DVI document (bzip-compressed)"
-msgstr ""
+msgid "GNU mail message"
+msgstr "Neges E-Bost GNU"
 
 #: ../freedesktop.org.xml.in.h:501
-msgid "TeX DVI document (gzip-compressed)"
-msgstr ""
+msgid "VRML document"
+msgstr "Dogfen VRML"
 
 #: ../freedesktop.org.xml.in.h:502
-msgid "TeX document"
-msgstr "Dogfen TeX"
+msgid "message in several formats"
+msgstr "neges mewn sawl fformat"
 
 #: ../freedesktop.org.xml.in.h:503
-msgid "TeX font"
-msgstr "Ffont TeX"
+msgid "Macintosh AppleDouble-encoded file"
+msgstr "Ffeil AppleDouble-amgodedig Macintosh"
 
 #: ../freedesktop.org.xml.in.h:504
-msgid "TeX font metrics"
-msgstr "Metrigau Ffont TeX"
+msgid "message digest"
+msgstr "crynodeb negeseuon"
 
 #: ../freedesktop.org.xml.in.h:505
-msgid "TeXInfo document"
-msgstr "Dogfen TeXInfo"
+msgid "encrypted message"
+msgstr "Neges wedi ei hamgryptio"
 
 #: ../freedesktop.org.xml.in.h:506
-msgid "ToutDoux document"
-msgstr "Dogfen ToutDoux"
+msgid "compound documents"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:507
-msgid "Troff ME input document"
-msgstr ""
+msgid "compound document"
+msgstr "dogfen gyfansawdd"
 
 #: ../freedesktop.org.xml.in.h:508
-msgid "Troff MM input document"
-msgstr ""
+msgid "mail system report"
+msgstr "adroddiad system bost"
 
 #: ../freedesktop.org.xml.in.h:509
-msgid "Troff MS input document"
-msgstr ""
+msgid "signed message"
+msgstr "neges lofnodwyd"
 
 #: ../freedesktop.org.xml.in.h:510
-msgid "Troff document"
-msgstr "Dogfen troff"
+msgid "stream of data (server push)"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:511
-msgid "Troff document (with manpage macros)"
+msgid "VCS/ICS calendar"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:512
-msgid "TrueAudio audio"
+msgid "CSS stylesheet"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:513
-msgid "TrueType XML font"
+msgid "electronic business card"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:514
-msgid "TrueType font"
-msgstr "Ffont Truetype"
+msgid "txt2tags document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:515
-msgid "UFRaw ID image"
+msgid "Verilog source code"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:516
-msgid "ULAW (Sun) audio"
-msgstr "Sain ULAW (Sun)"
+msgid "SystemVerilog header"
+msgstr ""
 
-#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
-#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
-#: ../freedesktop.org.xml.in.h:519
-msgid "UNIX software"
+#: ../freedesktop.org.xml.in.h:517
+msgid "SystemVerilog source code"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:520
-msgid "UNIX-compressed file"
+#: ../freedesktop.org.xml.in.h:518
+msgid "VHDL source code"
 msgstr ""
 
+#: ../freedesktop.org.xml.in.h:519
+msgid "enriched text document"
+msgstr "Dogfen testun wedi ei gyfoethogi"
+
+#: ../freedesktop.org.xml.in.h:520
+msgid "help page"
+msgstr "tudalen gymorth"
+
 #: ../freedesktop.org.xml.in.h:521
-msgid "Unidata NetCDF document"
+msgid "plain text document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:522
-msgid "Usenet news message"
-msgstr "Neges newyddion Usenet"
+msgid "RDF file"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:523
-msgid "Ustar archive"
-msgstr ""
+msgid "email headers"
+msgstr "penawdau e-bost"
 
 #: ../freedesktop.org.xml.in.h:524
-msgid "V font"
-msgstr "Ffont V"
+msgid "rich text document"
+msgstr "dogfen testun gyfoethog (rtf)"
 
 #: ../freedesktop.org.xml.in.h:525
-msgid "VCS/ICS calendar"
+msgid "RSS summary"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:526
-msgid "VHDL source code"
+msgid "Atom syndication feed"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:527
-msgid "VOC audio"
-msgstr "Sain VOC"
+msgid "OPML syndication feed"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:528
-msgid "VRML document"
-msgstr "Dogfen VRML"
+msgid "SGML document"
+msgstr "Dogfen SGML"
 
 #: ../freedesktop.org.xml.in.h:529
-msgid "Vala source code"
+msgid "spreadsheet interchange document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:530
-msgid "Verilog source code"
+msgid "TSV document"
 msgstr ""
 
-#. TRANSLATORS: This is a brand-name, not a generic term. Please see
-#. http://en.wikipedia.org/wiki/Video_CD
-#. http://www.herongyang.com/CD-DVD/VCD-Movie-File-Directory-Structure.html
+#: ../freedesktop.org.xml.in.h:531
+msgid "Graphviz DOT graph"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:532
+msgid "JAD document"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:533
+msgid "WML document"
+msgstr "Dogfen WML"
+
 #: ../freedesktop.org.xml.in.h:534
-msgid "Video CD"
+msgid "WMLScript program"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:535
-msgid "Vivo video"
-msgstr "Fideo Vivo"
+msgid "ACE archive"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:536
-msgid "WAIS source code"
-msgstr "Ffynhonnell Rhaglen WAIS"
+msgid "Ada source code"
+msgstr "Ffynhonnell Rhaglen Ada"
 
 #: ../freedesktop.org.xml.in.h:537
-msgid "WAV audio"
-msgstr "Sain WAV"
+msgid "author list"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:538
-msgid "WBMP image"
+msgid "BibTeX document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:539
-msgid "WMF image"
+msgid "C++ header"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:540
-msgid "WML document"
-msgstr "Dogfen WML"
+msgid "C++ source code"
+msgstr "Ffynhonnell Rhaglen C++"
 
 #: ../freedesktop.org.xml.in.h:541
-msgid "WMLScript program"
+msgid "ChangeLog document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:542
-msgid "WPL playlist"
+msgid "C header"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:543
-msgid "WRI document"
+msgid "CMake source code"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:544
-msgid "WWF document"
+msgid "CSV document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:545
-msgid "WavPack audio"
+msgid "license terms"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:546
-msgid "WavPack audio correction file"
+msgid "author credits"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:547
-msgid "Wavelet video"
-msgstr "Fideo Wavelet"
+msgid "C source code"
+msgstr "Ffynhonnell Rhaglen C"
 
 #: ../freedesktop.org.xml.in.h:548
-msgid "Web application cache manifest"
-msgstr ""
+msgid "C# source code"
+msgstr "Ffynhonnell Rhaglen C#"
 
 #: ../freedesktop.org.xml.in.h:549
-msgid "WebM audio"
+msgid "Vala source code"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:550
-msgid "WebM video"
+msgid "OOC source code"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:551
-msgid "WebVTT subtitles"
-msgstr ""
+msgid "DCL script"
+msgstr "Sgript DCL"
 
 #: ../freedesktop.org.xml.in.h:552
-msgid "Windows BMP image"
-msgstr "Delwedd BMP Windows"
+msgid "DSSSL document"
+msgstr "Dogfen DSSSL"
 
 #: ../freedesktop.org.xml.in.h:553
-msgid "Windows Imaging Format Disk Image"
-msgstr ""
+msgid "D source code"
+msgstr "Ffynhonnell Rhaglen D"
 
 #: ../freedesktop.org.xml.in.h:554
-msgid "Windows Installer package"
+msgid "DTD file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:555
-msgid "Windows Media Station file"
+msgid "Eiffel source code"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:556
-msgid "Windows Media audio"
-msgstr ""
+msgid "Emacs Lisp source code"
+msgstr "Ffynhonnell rhaglen EMACS LISP"
 
 #: ../freedesktop.org.xml.in.h:557
-msgid "Windows Media video"
+msgid "Erlang source code"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:558
-msgid "Windows Registry extract"
-msgstr ""
+msgid "Fortran source code"
+msgstr "Ffynhonnell rhaglen FORTRAN"
 
 #: ../freedesktop.org.xml.in.h:559
-msgid "Windows animated cursor"
+msgid "translation file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:560
-msgid "Windows cursor"
+msgid "translation template"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:561
+msgid "HTML document"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:562
+msgid "Web application cache manifest"
 msgstr ""
 
-#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
-#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
 #: ../freedesktop.org.xml.in.h:563
-msgid "Windows software"
+msgid "Google Video Pointer"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:564
-msgid "Word 2007 document"
-msgstr ""
+msgid "Haskell source code"
+msgstr "Ffynhonnell rhaglen Haskell"
 
 #: ../freedesktop.org.xml.in.h:565
-msgid "Word 2007 document template"
-msgstr ""
+msgid "IDL document"
+msgstr "Dogfen IDL"
 
 #: ../freedesktop.org.xml.in.h:566
-msgid "Word document"
+msgid "installation instructions"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:567
-msgid "Word macro-enabled document"
-msgstr ""
+msgid "Java source code"
+msgstr "Ffynhonnell rhaglen Java"
 
 #: ../freedesktop.org.xml.in.h:568
-msgid "Word macro-enabled document template"
+msgid "LDIF address book"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:569
-msgid "Word template"
+msgid "Lilypond music sheet"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:570
-msgid "WordPerfect document"
-msgstr "Dogfen WordPerfect"
+msgid "LHS source code"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:571
-msgid "WordPerfect/Drawperfect image"
-msgstr "Delwedd WordPerfect/DrawPerfect"
+msgid "application log"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:572
-msgid "X window image"
-msgstr "Delwedd ffenest X"
+msgid "Makefile"
+msgstr "Ffeil \"make\""
 
 #: ../freedesktop.org.xml.in.h:573
-msgid "X-Motif UIL table"
+msgid "Markdown document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:574
-msgid "X.509 certificate"
+msgid "Qt MOC file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:575
-msgid "X11 cursor"
+msgid "Windows Registry extract"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:576
-msgid "XBEL bookmarks"
-msgstr "Ffeil llyfrnodau XBEL"
+msgid "Managed Object Format"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:577
-msgid "XBM image"
+msgid "Mup publication"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:578
-msgid "XFig image"
-msgstr "Delwedd XFig"
+msgid "Objective-C source code"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:579
-msgid "XHTML page"
-msgstr "Tudalen XHTML"
+msgid "OCaml source code"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:580
-msgid "XLIFF translation file"
+msgid "MATLAB script/function"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:581
-msgid "XMCD CD database"
+msgid "Pascal source code"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:582
-msgid "XMF audio"
+msgid "differences between files"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:583
-msgid "XMI file"
+msgid "Go source code"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:584
-msgid "XML document"
-msgstr ""
+msgid "Python script"
+msgstr "Sgript Python"
 
 #: ../freedesktop.org.xml.in.h:585
-msgid "XML entities document"
+msgid "Lua script"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:586
-msgid "XPInstall installer module"
-msgstr ""
+msgid "README document"
+msgstr "Dogfen README"
 
 #: ../freedesktop.org.xml.in.h:587
-msgid "XPM image"
-msgstr "Delwedd XPM"
+msgid "NFO document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:588
-msgid "XPS document"
+msgid "RPM spec file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:589
-msgid "XSL FO file"
+msgid "Scala source code"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:590
-msgid "XSLT stylesheet"
-msgstr ""
+msgid "Scheme source code"
+msgstr "Ffynhonnell Rhaglen Scheme"
 
 #: ../freedesktop.org.xml.in.h:591
-msgid "XSPF playlist"
-msgstr ""
+msgid "Setext document"
+msgstr "Dogfen Setext"
 
 #: ../freedesktop.org.xml.in.h:592
-msgid "XUL interface document"
-msgstr ""
+msgid "SQL code"
+msgstr "Côd SQL"
 
 #: ../freedesktop.org.xml.in.h:593
-msgid "XZ archive"
-msgstr ""
+msgid "Tcl script"
+msgstr "Sgript Tcl"
 
 #: ../freedesktop.org.xml.in.h:594
-msgid "Xbase document"
-msgstr ""
+msgid "TeX document"
+msgstr "Dogfen TeX"
 
 #: ../freedesktop.org.xml.in.h:595
-msgid "YAML document"
-msgstr ""
+msgid "TeXInfo document"
+msgstr "Dogfen TeXInfo"
 
 #: ../freedesktop.org.xml.in.h:596
-msgid "Zip archive"
-msgstr "Archif ZIP"
+msgid "Troff ME input document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:597
-msgid "Zoo archive"
-msgstr "Archif zoo"
+msgid "Troff MM input document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:598
-msgid "application log"
+msgid "Troff MS input document"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:599
+msgid "X-Motif UIL table"
 msgstr ""
 
-#. http://en.wikipedia.org/wiki/Red_Book_(audio_CD_standard)
 #: ../freedesktop.org.xml.in.h:600
-msgid "audio CD"
+msgid "resource location"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:601
+msgid "XMI file"
 msgstr ""
 
-#. http://en.wikipedia.org/wiki/DVD-Audio
 #: ../freedesktop.org.xml.in.h:602
-msgid "audio DVD"
+msgid "XSL FO file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:603
-msgid "author credits"
+msgid "iptables configuration file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:604
-msgid "author list"
+msgid "XSLT stylesheet"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:605
-msgid "backup file"
+msgid "XMCD CD database"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:606
+msgid "XML document"
 msgstr ""
 
-#. http://en.wikipedia.org/wiki/Blu-ray_Disc
 #: ../freedesktop.org.xml.in.h:607
-msgid "blank Blu-ray disc"
+msgid "XML entities document"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:608
+msgid "DV video"
 msgstr ""
 
-#. http://en.wikipedia.org/wiki/Compact_Disc
 #: ../freedesktop.org.xml.in.h:609
-msgid "blank CD disc"
+msgid "ISI video"
+msgstr "Fideo ISI"
+
+#: ../freedesktop.org.xml.in.h:610
+msgid "MPEG-2 transport stream"
 msgstr ""
 
-#. http://en.wikipedia.org/wiki/DVD
 #: ../freedesktop.org.xml.in.h:611
-msgid "blank DVD disc"
+msgid "MPEG video"
+msgstr "Fideo MPEG"
+
+#: ../freedesktop.org.xml.in.h:612
+msgid "MPEG video (streamed)"
 msgstr ""
 
-#. http://en.wikipedia.org/wiki/HD_DVD
 #: ../freedesktop.org.xml.in.h:613
-msgid "blank HD DVD disc"
-msgstr ""
+msgid "QuickTime video"
+msgstr "Fideo QuickTime"
 
 #: ../freedesktop.org.xml.in.h:614
-msgid "block device"
+msgid "QuickTime image"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:615
-msgid "character device"
-msgstr ""
+msgid "Vivo video"
+msgstr "Fideo Vivo"
 
 #: ../freedesktop.org.xml.in.h:616
-msgid "comic book archive"
-msgstr ""
+msgid "Wavelet video"
+msgstr "Fideo Wavelet"
 
 #: ../freedesktop.org.xml.in.h:617
-msgid "compound document"
-msgstr "dogfen gyfansawdd"
+msgid "ANIM animation"
+msgstr "Animeiddiad ANIM"
 
 #: ../freedesktop.org.xml.in.h:618
-msgid "compound documents"
+msgid "FLIC animation"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:619
-msgid "compressed GIMP image"
+msgid "Haansoft Hangul document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:620
-msgid "compressed SVG image"
+msgid "Haansoft Hangul document template"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:621
-msgid "compressed Tracker audio"
-msgstr ""
+msgid "MNG animation"
+msgstr "Animeiddiad MNG"
 
 #: ../freedesktop.org.xml.in.h:622
-msgid "desktop configuration file"
+msgid "ASF video"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:623
-msgid "detached OpenPGP signature"
+msgid "Windows Media Station file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:624
-msgid "detached S/MIME signature"
+msgid "Windows Media video"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:625
-msgid "differences between files"
+msgid "AVI video"
+msgstr "Fideo AVI"
+
+#: ../freedesktop.org.xml.in.h:626
+msgid "NullSoft video"
 msgstr ""
 
-#. http://en.wikipedia.org/wiki/Design_rule_for_Camera_File_system
 #: ../freedesktop.org.xml.in.h:627
-msgid "digital photos"
+msgid "SDP multicast stream file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:628
-msgid "digital raw image"
+msgid "SGI video"
+msgstr "Video SGI"
+
+#: ../freedesktop.org.xml.in.h:629
+msgid "eMusic download package"
 msgstr ""
 
-#. see fd.o hal spec
 #: ../freedesktop.org.xml.in.h:630
-msgid "e-book reader"
+msgid "KML geographic data"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:631
-msgid "eMusic download package"
+msgid "KML geographic compressed data"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:632
-msgid "electronic book document"
+msgid "Citrix ICA settings file"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:633
-msgid "electronic business card"
+msgid "XUL interface document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:634
-msgid "email headers"
-msgstr "penawdau e-bost"
+msgid "XPInstall installer module"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:635
-msgid "email message"
-msgstr "neges ebost"
+msgid "Word 2007 document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:636
-msgid "empty document"
+msgid "Word 2007 document template"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:637
-msgid "encrypted message"
-msgstr "Neges wedi ei hamgryptio"
+msgid "PowerPoint 2007 presentation"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:638
-msgid "enriched text document"
-msgstr "Dogfen testun wedi ei gyfoethogi"
+msgid "PowerPoint 2007 slide"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:639
-msgid "executable"
+msgid "PowerPoint 2007 show"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:640
-msgid "folder"
-msgstr "Plygell"
+msgid "PowerPoint 2007 presentation template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:641
-msgid "generic font file"
+msgid "Excel 2007 spreadsheet"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:642
-msgid "help page"
-msgstr "tudalen gymorth"
+msgid "Excel 2007 spreadsheet template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:643
-msgid "iMelody ringtone"
+msgid "T602 document"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:644
-msgid "iPod firmware"
+msgid "Cisco VPN Settings"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:645
-msgid "iRiver Playlist"
+msgid "ICC profile"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:646
-msgid "installation instructions"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:647
-msgid "iptables configuration file"
+msgid "IT 8.7 color calibration file"
 msgstr ""
 
+#. http://en.wikipedia.org/wiki/Design_rule_for_Camera_File_system
 #: ../freedesktop.org.xml.in.h:648
-msgid "libtool shared library"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:649
-msgid "license terms"
+msgid "digital photos"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:650
-msgid "mail delivery report"
-msgstr "Adroddiad trosgludo post"
-
-# EFALLAI (ffurf?)
-#: ../freedesktop.org.xml.in.h:651
-msgid "mail disposition report"
-msgstr "adroddiad ffurf post"
-
+#. TRANSLATORS: This is a brand-name, not a generic term. Please see
+#. http://en.wikipedia.org/wiki/Video_CD
+#. http://www.herongyang.com/CD-DVD/VCD-Movie-File-Directory-Structure.html
 #: ../freedesktop.org.xml.in.h:652
-msgid "mail system report"
-msgstr "adroddiad system bost"
-
-#: ../freedesktop.org.xml.in.h:653
-msgid "mailbox file"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:654
-msgid "manual page (compressed)"
-msgstr "tudalen llawlyfr (wedi ei gywasgu)"
-
-#: ../freedesktop.org.xml.in.h:655
-msgid "message catalog"
+msgid "Video CD"
 msgstr ""
 
+#. TRANSLATORS: This is a brand-name, not a generic term. Please see
+#. http://en.wikipedia.org/wiki/Super_Video_CD
+#. http://everything2.com/index.pl?node_id=1009222
 #: ../freedesktop.org.xml.in.h:656
-msgid "message digest"
-msgstr "crynodeb negeseuon"
-
-#: ../freedesktop.org.xml.in.h:657
-msgid "message in several formats"
-msgstr "neges mewn sawl fformat"
-
-#: ../freedesktop.org.xml.in.h:658
-msgid "mount point"
+msgid "Super Video CD"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:659
-msgid "object code"
+#. http://en.wikipedia.org/wiki/DVD-Video
+#: ../freedesktop.org.xml.in.h:658
+msgid "video DVD"
 msgstr ""
 
+#. http://en.wikipedia.org/wiki/Red_Book_(audio_CD_standard)
 #: ../freedesktop.org.xml.in.h:660
-msgid "packed font file"
+msgid "audio CD"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:661
-msgid "partial email message"
-msgstr "darn o neges e-bost"
-
+#. http://en.wikipedia.org/wiki/Compact_Disc
 #: ../freedesktop.org.xml.in.h:662
-msgid "pipe"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:663
-msgid "plain text document"
+msgid "blank CD disc"
 msgstr ""
 
-#. see fd.o hal spec
-#: ../freedesktop.org.xml.in.h:665
-msgid "portable audio player"
+#. http://en.wikipedia.org/wiki/DVD
+#: ../freedesktop.org.xml.in.h:664
+msgid "blank DVD disc"
 msgstr ""
 
-# EFALLAI (proffeilio?)
+#. http://en.wikipedia.org/wiki/Blu-ray_Disc
 #: ../freedesktop.org.xml.in.h:666
-msgid "profiler results"
-msgstr "canlyniadau proffeilio"
-
-#: ../freedesktop.org.xml.in.h:667
-msgid "program crash data"
+msgid "blank Blu-ray disc"
 msgstr ""
 
+#. http://en.wikipedia.org/wiki/HD_DVD
 #: ../freedesktop.org.xml.in.h:668
-msgid "raw CD image"
+msgid "blank HD DVD disc"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:669
-msgid "reference to remote file"
-msgstr "cyfeiriad at ffeil bell"
-
+#. http://en.wikipedia.org/wiki/DVD-Audio
 #: ../freedesktop.org.xml.in.h:670
-msgid "rejected patch"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:671
-msgid "resource location"
+msgid "audio DVD"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:672
-msgid "rich text document"
-msgstr "dogfen testun gyfoethog (rtf)"
-
+#. http://en.wikipedia.org/wiki/Blu-ray_Disc
+#. http://www.blu-raydisc.com/Section-13470/Section-13890/Index.html
 #: ../freedesktop.org.xml.in.h:673
-msgid "shared library"
-msgstr "llyfrgell wedi ei rhannu"
-
-# EFALLAI (plisgyn?)
-#: ../freedesktop.org.xml.in.h:674
-msgid "shell archive"
-msgstr "archif plisgyn"
-
-# EFALLAI (plisgyn?)
-#: ../freedesktop.org.xml.in.h:675
-msgid "shell script"
-msgstr "sgript plisgyn"
+msgid "Blu-ray video disc"
+msgstr ""
 
+#. http://en.wikipedia.org/wiki/HD_DVD
+#. http://www.dvdafteredit.com/wiki/The_HVDVD_TS_Folder
 #: ../freedesktop.org.xml.in.h:676
-msgid "shortcut to Kexi project on database server"
+msgid "HD DVD video disc"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:677
-msgid "signed message"
-msgstr "neges lofnodwyd"
-
+#. see fd.o hal spec
 #: ../freedesktop.org.xml.in.h:678
-msgid "socket"
-msgstr ""
-
-#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
-#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
-#: ../freedesktop.org.xml.in.h:681
-msgid "software"
+msgid "e-book reader"
 msgstr ""
 
+#. TRANSLATORS: This is a brand-name, not a generic term. Please see
+#. http://en.wikipedia.org/wiki/Picture_CD
+#. http://www.re.org/kristin/picturecd.html
 #: ../freedesktop.org.xml.in.h:682
-msgid "spreadsheet interchange document"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:683
-msgid "stream of data (server push)"
+msgid "Picture CD"
 msgstr ""
 
+#. see fd.o hal spec
 #: ../freedesktop.org.xml.in.h:684
-msgid "symbolic link"
-msgstr "cyswllt symbolaidd"
-
-#: ../freedesktop.org.xml.in.h:685
-msgid "theme"
-msgstr "thema"
-
-#: ../freedesktop.org.xml.in.h:686
-msgid "translated messages (machine-readable)"
+msgid "portable audio player"
 msgstr ""
 
+#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
 #: ../freedesktop.org.xml.in.h:687
-msgid "translation file"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:688
-msgid "translation template"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:689
-msgid "txt2tags document"
+msgid "software"
 msgstr ""
 
+#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
 #: ../freedesktop.org.xml.in.h:690
-msgid "unknown"
-msgstr "Anhysbys"
+msgid "UNIX software"
+msgstr ""
 
-#. http://en.wikipedia.org/wiki/DVD-Video
-#: ../freedesktop.org.xml.in.h:692
-msgid "video DVD"
+#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
+#: ../freedesktop.org.xml.in.h:693
+msgid "Windows software"
 msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/software-properties.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/software-properties.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/software-properties.po	2012-01-02 18:14:17.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/software-properties.po	2012-02-23 07:17:27.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: software-properties\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-21 15:45+0000\n"
-"PO-Revision-Date: 2011-12-07 20:36+0000\n"
+"POT-Creation-Date: 2012-02-03 21:11+0000\n"
+"PO-Revision-Date: 2012-02-04 00:56+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,30 +16,30 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:28+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:28+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../data/com.ubuntu.softwareproperties.policy.in.h:1
-msgid "To change software repository settings, you need to authenticate."
+msgid "Write Configuration"
 msgstr ""
 
 #: ../data/com.ubuntu.softwareproperties.policy.in.h:2
-msgid "Write Configuration"
+msgid "To change software repository settings, you need to authenticate."
 msgstr ""
 
 #: ../data/software-properties-gtk.desktop.in.h:1
 #: ../data/software-properties-kde.desktop.in.h:1
-msgid "Configure the sources for installable software and updates"
-msgstr ""
-
-#: ../data/software-properties-gtk.desktop.in.h:2
-#: ../data/software-properties-kde.desktop.in.h:2
 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:582
 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:602
-#: ../data/gtkbuilder/main.ui.h:29
+#: ../data/gtkbuilder/main.ui.h:14
 msgid "Software Sources"
 msgstr "Cronfeydd Meddalwedd"
 
+#: ../data/software-properties-gtk.desktop.in.h:2
+#: ../data/software-properties-kde.desktop.in.h:2
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
 #: ../add-apt-repository:35
 #, c-format
 msgid "The %s named '%s' has no PPA named '%s'"
@@ -52,7 +52,7 @@
 #: ../add-apt-repository:39
 #, c-format
 msgid " * '%s':  %s"
-msgstr ""
+msgstr " * '%s':  %s"
 
 #: ../add-apt-repository:41
 #, c-format
@@ -82,32 +82,43 @@
 msgstr ""
 
 #: ../add-apt-repository:136
+#, c-format
+msgid ""
+"Cannot access PPA (%s) to get PPA information, please check your internet "
+"connection."
+msgstr ""
+
+#: ../add-apt-repository:142
+msgid "Adding private PPAs is not supported currently"
+msgstr ""
+
+#: ../add-apt-repository:146
 msgid "You are about to remove the following PPA from your system:"
 msgstr ""
 
-#: ../add-apt-repository:138
+#: ../add-apt-repository:148
 msgid "You are about to add the following PPA to your system:"
 msgstr ""
 
-#: ../add-apt-repository:140
+#: ../add-apt-repository:150
 #, c-format
 msgid " More info: %s"
-msgstr ""
+msgstr " Mwy o wybodaeth: %s"
 
-#: ../add-apt-repository:144
+#: ../add-apt-repository:154
 msgid "Press [ENTER] to continue or ctrl-c to cancel removing it"
 msgstr ""
 
-#: ../add-apt-repository:146
+#: ../add-apt-repository:156
 msgid "Press [ENTER] to continue or ctrl-c to cancel adding it"
 msgstr ""
 
-#: ../add-apt-repository:160 ../add-apt-repository:164
+#: ../add-apt-repository:170 ../add-apt-repository:174
 #, c-format
 msgid "Error: '%s' doesn't exist in a sourcelist file"
 msgstr ""
 
-#: ../add-apt-repository:168
+#: ../add-apt-repository:178
 #, c-format
 msgid "Error: '%s' invalid"
 msgstr ""
@@ -152,7 +163,7 @@
 #: ../softwareproperties/kde/DialogMirror.py:181
 #: ../softwareproperties/kde/DialogMirror.py:184
 msgid "Cancel"
-msgstr ""
+msgstr "Diddymu"
 
 #: ../softwareproperties/kde/DialogMirror.py:216
 #: ../softwareproperties/gtk/DialogMirror.py:329
@@ -167,7 +178,7 @@
 #: ../softwareproperties/kde/DialogMirror.py:232
 #: ../softwareproperties/gtk/DialogMirror.py:345
 msgid "Canceling..."
-msgstr ""
+msgstr "Diddymu..."
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:164
 #: ../data/gtkbuilder/main.ui.h:9
@@ -175,19 +186,19 @@
 msgstr ""
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:165
-#: ../data/gtkbuilder/main.ui.h:17
+#: ../data/gtkbuilder/main.ui.h:10
 msgid "Every two days"
-msgstr ""
+msgstr "Bob dau ddiwrnod"
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:166
-#: ../data/gtkbuilder/main.ui.h:35
+#: ../data/gtkbuilder/main.ui.h:11
 msgid "Weekly"
-msgstr ""
+msgstr "Wythnosol"
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:167
-#: ../data/gtkbuilder/main.ui.h:18
+#: ../data/gtkbuilder/main.ui.h:12
 msgid "Every two weeks"
-msgstr ""
+msgstr "Bob pythefnos"
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:174
 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:219
@@ -202,7 +213,7 @@
 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:288
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #. add a separator and the option to choose another mirror from the list
 #. #FIXME server_store.append(["sep", None, True])
@@ -240,7 +251,7 @@
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:703
 msgid "Reload"
-msgstr ""
+msgstr "Ail-lwytho"
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:705
 #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:2
@@ -301,21 +312,21 @@
 msgstr ""
 
 #: ../softwareproperties/kde/DialogEdit.py:41
-#: ../data/gtkbuilder/dialog-edit-source.ui.h:6
+#: ../data/gtkbuilder/dialog-edit-source.ui.h:1
 msgid "Binary"
-msgstr ""
+msgstr "Deuol"
 
-#: ../softwareproperties/kde/DialogEdit.py:42 ../data/gtkbuilder/main.ui.h:30
+#: ../softwareproperties/kde/DialogEdit.py:42 ../data/gtkbuilder/main.ui.h:15
 msgid "Source code"
-msgstr ""
+msgstr "Cod Gwreiddiol"
 
 #: ../softwareproperties/SoftwareProperties.py:490
 msgid "(Source Code)"
-msgstr ""
+msgstr "(Cod Gwreiddiol )"
 
 #: ../softwareproperties/SoftwareProperties.py:496
 msgid "Source Code"
-msgstr ""
+msgstr "Cod Gwreiddiol"
 
 #: ../softwareproperties/gtk/DialogMirror.py:245
 msgid "New mirror"
@@ -393,33 +404,33 @@
 msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
 msgstr ""
 
-#: ../data/gtkbuilder/dialog-edit-source.ui.h:1
-msgid "<b>Comment:</b>"
-msgstr ""
-
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:2
-msgid "<b>Components:</b>"
+msgid "Source"
 msgstr ""
 
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:3
-msgid "<b>Distribution:</b>"
+msgid "Edit Source"
 msgstr ""
 
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:4
 msgid "<b>Type:</b>"
-msgstr ""
+msgstr "<b>Math:</b>"
 
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:5
 msgid "<b>URI:</b>"
 msgstr ""
 
-#: ../data/gtkbuilder/dialog-edit-source.ui.h:7
-msgid "Edit Source"
+#: ../data/gtkbuilder/dialog-edit-source.ui.h:6
+msgid "<b>Distribution:</b>"
 msgstr ""
 
+#: ../data/gtkbuilder/dialog-edit-source.ui.h:7
+msgid "<b>Components:</b>"
+msgstr "<b>Cydrannau:</b>"
+
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:8
-msgid "Source"
-msgstr ""
+msgid "<b>Comment:</b>"
+msgstr "<b>Sylw:</b>"
 
 #: ../data/gtkbuilder/dialog-add-sources-list.ui.h:1
 msgid "_Replace"
@@ -430,170 +441,170 @@
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:1
-msgid "    "
+msgid "Display immediately"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:2
-msgid "<b>Downloadable from the Internet</b>"
+msgid "Display weekly"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:3
-msgid "<b>Installable from CD-ROM/DVD</b>"
+msgid "Display every two weeks"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:4
-msgid "<b>Trusted software providers</b>"
+msgid "For any new version"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:5
-msgid "Add Volume..."
+msgid "For long-term support versions"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:6
-msgid "Add..."
+msgid "Never"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:7
-msgid "Authentication"
+msgid "Download automatically"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:8
-msgid "Automatically check for updates:"
-msgstr ""
-
-#: ../data/gtkbuilder/main.ui.h:10
-msgid "Display every two weeks"
-msgstr ""
-
-#: ../data/gtkbuilder/main.ui.h:11
-msgid "Display immediately"
-msgstr ""
-
-#: ../data/gtkbuilder/main.ui.h:12
-msgid "Display weekly"
+msgid "Download and install automatically"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:13
-msgid "Download and install automatically"
+msgid "To install from a CD-ROM or DVD, insert the medium into the drive."
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:14
-msgid "Download automatically"
+#: ../data/gtkbuilder/main.ui.h:16
+msgid "Download from:"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:15
-msgid "Download from:"
+#: ../data/gtkbuilder/main.ui.h:17
+msgid "<b>Downloadable from the Internet</b>"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:16
-msgid "Edit..."
+#: ../data/gtkbuilder/main.ui.h:18
+msgid "<b>Installable from CD-ROM/DVD</b>"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:19
-msgid "For any new version"
-msgstr ""
+msgid "Add..."
+msgstr "Ychwanegu..."
 
 #: ../data/gtkbuilder/main.ui.h:20
-msgid "For long-term support versions"
-msgstr ""
+msgid "Edit..."
+msgstr "Golygu..."
 
 #: ../data/gtkbuilder/main.ui.h:21
-msgid "Import the public key from a trusted software provider"
+msgid "Add Volume..."
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:22
-msgid "Install updates from:"
+msgid "Other Software"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:23
-msgid ""
-"Keys are used to authenticate the correct source of software and so protect "
-"your computer from malicious software"
+msgid "Install updates from:"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:24
-msgid "Never"
+msgid "Automatically check for updates:"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:25
-msgid "Notify me of a new Ubuntu version:"
+msgid "When there are security updates:"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:26
-msgid "Other Software"
+msgid "When there are other updates:"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:27
-msgid "Restore _Defaults"
+msgid "Notify me of a new Ubuntu version:"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:28
-msgid "Restore the default keys of your distribution"
+msgid "Updates"
 msgstr ""
 
+#: ../data/gtkbuilder/main.ui.h:29
+msgid "<b>Trusted software providers</b>"
+msgstr ""
+
+#: ../data/gtkbuilder/main.ui.h:30
+msgid "    "
+msgstr "    "
+
 #: ../data/gtkbuilder/main.ui.h:31
-msgid "Statistics"
+msgid ""
+"Keys are used to authenticate the correct source of software and so protect "
+"your computer from malicious software"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:32
-msgid "Submit statistical information"
+msgid "_Import Key File..."
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:33
-msgid "To install from a CD-ROM or DVD, insert the medium into the drive."
+msgid "Import the public key from a trusted software provider"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:34
-msgid "Updates"
+msgid "Restore _Defaults"
 msgstr ""
 
-#: ../data/gtkbuilder/main.ui.h:36
-msgid "When there are other updates:"
+#: ../data/gtkbuilder/main.ui.h:35
+msgid "Restore the default keys of your distribution"
 msgstr ""
 
+#: ../data/gtkbuilder/main.ui.h:36
+msgid "Authentication"
+msgstr "Dilysiad"
+
 #: ../data/gtkbuilder/main.ui.h:37
-msgid "When there are security updates:"
+msgid "Submit statistical information"
 msgstr ""
 
 #: ../data/gtkbuilder/main.ui.h:38
-msgid "_Import Key File..."
-msgstr ""
+msgid "Statistics"
+msgstr "Ystadegau"
 
 #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:1
-#: ../data/gtkbuilder/dialog-mirror.ui.h:1
+#: ../data/gtkbuilder/dialog-mirror.ui.h:6
 msgid " "
-msgstr ""
+msgstr " "
 
 #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:7
 msgid "_Reload"
-msgstr ""
+msgstr "Ail-lwytho"
 
-#: ../data/gtkbuilder/dialog-mirror.ui.h:2
-msgid ""
-"<b><big>Testing download servers</big></b>\n"
-"\n"
-"A series of tests will be performed to find the best mirror for your "
-"location."
+#: ../data/gtkbuilder/dialog-mirror.ui.h:1
+msgid "Choose a Download Server"
 msgstr ""
 
-#: ../data/gtkbuilder/dialog-mirror.ui.h:5
-msgid "Choose _Server"
+#: ../data/gtkbuilder/dialog-mirror.ui.h:2
+msgid "Protocol:"
 msgstr ""
 
-#: ../data/gtkbuilder/dialog-mirror.ui.h:6
-msgid "Choose a Download Server"
+#: ../data/gtkbuilder/dialog-mirror.ui.h:3
+msgid "_Select Best Server"
 msgstr ""
 
-#: ../data/gtkbuilder/dialog-mirror.ui.h:7
+#: ../data/gtkbuilder/dialog-mirror.ui.h:4
 msgid "Performs a connection test to find the best mirror for your location"
 msgstr ""
 
-#: ../data/gtkbuilder/dialog-mirror.ui.h:8
-msgid "Protocol:"
+#: ../data/gtkbuilder/dialog-mirror.ui.h:5
+msgid "Choose _Server"
 msgstr ""
 
-#: ../data/gtkbuilder/dialog-mirror.ui.h:9
-msgid "_Select Best Server"
+#: ../data/gtkbuilder/dialog-mirror.ui.h:7
+msgid ""
+"<b><big>Testing download servers</big></b>\n"
+"\n"
+"A series of tests will be performed to find the best mirror for your "
+"location."
 msgstr ""
 
 #: ../data/gtkbuilder/dialog-add.ui.h:2
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/system-config-kickstart.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/system-config-kickstart.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/system-config-kickstart.po	2012-01-02 18:14:13.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/system-config-kickstart.po	2012-02-23 07:17:25.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../src/RHELPackageGroupList.py:12
 msgid "X Window System"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/tasksel.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/tasksel.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/tasksel.po	2012-01-02 18:14:13.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/tasksel.po	2012-02-23 07:17:25.000000000 +0000
@@ -7,14 +7,14 @@
 "Project-Id-Version: tarksel\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-12-06 16:51-0400\n"
-"PO-Revision-Date: 2011-08-10 17:11+0000\n"
+"PO-Revision-Date: 2012-01-21 00:42+0000\n"
 "Last-Translator: Dafydd Harries <Unknown>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../tasksel.pl:433
 msgid ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/ubuntuone-client.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/ubuntuone-client.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/ubuntuone-client.po	2012-01-02 18:14:19.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/ubuntuone-client.po	2012-02-23 07:17:29.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntuone-client\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-23 16:27+0000\n"
+"POT-Creation-Date: 2012-02-21 05:09+0000\n"
 "PO-Revision-Date: 2011-01-15 03:19+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:08+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../ubuntuone/clientdefs.py.in:39
 #: ../ubuntuone/platform/credentials/__init__.py:69
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/ubuntuone-installer.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/ubuntuone-installer.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/ubuntuone-installer.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/ubuntuone-installer.po	2012-02-23 07:17:36.000000000 +0000
@@ -0,0 +1,58 @@
+# Welsh translation for ubuntuone-installer
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the ubuntuone-installer package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntuone-installer\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 20:51+0000\n"
+"PO-Revision-Date: 2012-02-03 01:07+0000\n"
+"Last-Translator: David Jones <Unknown>\n"
+"Language-Team: Welsh <cy@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:47+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#: ../ubuntuone-installer.desktop.in.h:1
+msgid "Configure and manage your Ubuntu One account"
+msgstr "Cyflunio a rheoli dy gyfri Ubuntu One"
+
+#: ../ubuntuone/installer/gui.py:98
+msgid "Install Ubuntu One"
+msgstr "Gosod Ubuntu One"
+
+#: ../ubuntuone/installer/gui.py:105
+msgid "Discover the freedom of your personal cloud"
+msgstr ""
+
+#: ../ubuntuone/installer/gui.py:224
+msgid "Sync"
+msgstr ""
+
+#: ../ubuntuone/installer/gui.py:240
+msgid "Sync files across your devices."
+msgstr ""
+
+#: ../ubuntuone/installer/gui.py:254
+msgid "Stream"
+msgstr "Llif"
+
+#: ../ubuntuone/installer/gui.py:267
+msgid "Stream your music on the move and offline."
+msgstr ""
+
+#: ../ubuntuone/installer/gui.py:281
+msgid "Share"
+msgstr "Rhannu"
+
+#: ../ubuntuone/installer/gui.py:294
+msgid "Share with colleagues, friends, and family."
+msgstr ""
+
+#: ../ubuntuone/installer/gui.py:313
+msgid "Ubuntu One is installing…"
+msgstr ""
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/ubuntu-sso-client.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/ubuntu-sso-client.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/ubuntu-sso-client.po	2012-01-02 18:14:20.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/ubuntu-sso-client.po	2012-02-23 07:17: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: 2011-12-29 19:24+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../ubuntu_sso/gtk/gui.py:152
 msgid "Type the characters above"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/unity-2d.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/unity-2d.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/unity-2d.po	2012-01-02 18:14:20.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/unity-2d.po	2012-02-23 07:17:30.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: unity-2d\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-09-29 11:48+0200\n"
-"PO-Revision-Date: 2011-12-07 22:31+0000\n"
+"PO-Revision-Date: 2012-01-10 18:39+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:41+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:18+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: libunity-2d-private/src/launcherdevice.cpp:273
 msgid "Eject"
@@ -29,7 +29,7 @@
 
 #: libunity-2d-private/src/workspaces.cpp:73
 msgid "Workspaces"
-msgstr ""
+msgstr "Gweithleoedd"
 
 #: libunity-2d-private/src/trash.cpp:128
 msgid "Trash"
@@ -60,7 +60,7 @@
 
 #: libunity-2d-private/src/unity2dapplication.cpp:151
 msgid "QT_LAYOUT_DIRECTION"
-msgstr ""
+msgstr "QT_LAYOUT_DIRECTION"
 
 #: libunity-2d-private/src/bfb.cpp:71
 msgid "Dash home"
@@ -75,11 +75,11 @@
 
 #: launcher/LauncherList.qml:85
 msgid "not running"
-msgstr ""
+msgstr "ddim yn rhedeg"
 
 #: places/LensBar.qml:100
 msgid "home"
-msgstr ""
+msgstr "adra"
 
 #: places/Home.qml:80
 msgid "Shortcuts"
@@ -156,4 +156,4 @@
 
 #: places/SearchEntry.qml:176
 msgid "Search"
-msgstr ""
+msgstr "Chwilio"
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/update-manager.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/update-manager.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/update-manager.po	2012-01-02 18:14:04.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/update-manager.po	2012-02-23 07:17:18.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-10 19:09+0000\n"
+"POT-Creation-Date: 2012-02-17 03:06+0000\n"
 "PO-Revision-Date: 2011-12-06 06:42+0000\n"
 "Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"
 "Language-Team: Welsh <cy@li.org>\n"
@@ -16,33 +16,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:16+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#. TRANSLATORS: download size is 0
-#: ../DistUpgrade/utils.py:392 ../UpdateManager/Core/utils.py:392
-msgid "0 kB"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../DistUpgrade/utils.py:395 ../UpdateManager/Core/utils.py:395
-msgid "1 kB"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-02-21 19:00+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:398 ../UpdateManager/Core/utils.py:398
+#: ../DistUpgrade/utils.py:397 ../UpdateManager/Core/utils.py:397
 #, python-format
-msgid "%.0f kB"
-msgstr ""
+msgid "%(size).0f kB"
+msgid_plural "%(size).0f kB"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:401 ../UpdateManager/Core/utils.py:401
+#: ../DistUpgrade/utils.py:352 ../UpdateManager/Core/utils.py:352
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
 #. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:210 ../DistUpgrade/distro.py:438
+#: ../DistUpgrade/distro.py:208 ../DistUpgrade/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Gweinydd ar gyfer %s"
@@ -50,20 +42,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:228 ../DistUpgrade/distro.py:234
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:226 ../DistUpgrade/distro.py:232
+#: ../DistUpgrade/distro.py:248
 msgid "Main server"
 msgstr "Prif weinydd"
 
-#: ../DistUpgrade/distro.py:254
+#: ../DistUpgrade/distro.py:252
 msgid "Custom servers"
 msgstr "Gweinyddion addasiedig"
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:131
 msgid "Could not calculate sources.list entry"
 msgstr "Methu cyfrifo cofnod sources.list"
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:234
 msgid ""
 "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
 "wrong architecture?"
@@ -71,11 +63,11 @@
 "Methu cael hyd i ffeiliau pecynnau, efallai mai nid disg Ubuntu yw hwn, "
 "neu'r math o adeiladaeth anghywir?"
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:277
 msgid "Failed to add the CD"
 msgstr "Methu ychwanegu'r CD"
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:278
 #, python-format
 msgid ""
 "There was a error adding the CD, the upgrade will abort. Please report this "
@@ -90,7 +82,7 @@
 "Y neges gwall oedd:\n"
 "'%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:147
+#: ../DistUpgrade/DistUpgradeCache.py:130
 msgid "Remove package in bad state"
 msgid_plural "Remove packages in bad state"
 msgstr[0] "Tynnu pecyn mewn cyflwr gwael"
@@ -98,7 +90,7 @@
 msgstr[2] "Tynnu pecynnau mewn cyflwr gwael"
 msgstr[3] "Tynnu pecynnau mewn cyflwr gwael"
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:133
 #, python-format
 msgid ""
 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -126,15 +118,15 @@
 
 #. FIXME: not ideal error message, but we just reuse a
 #. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:231
 msgid "The server may be overloaded"
 msgstr "Efallai bod gormod o lwyth ar y gweinydd"
 
-#: ../DistUpgrade/DistUpgradeCache.py:361
+#: ../DistUpgrade/DistUpgradeCache.py:341
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
-#: ../DistUpgrade/DistUpgradeCache.py:362
+#: ../DistUpgrade/DistUpgradeCache.py:342
 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."
@@ -143,7 +135,7 @@
 "hwn. Trwsia nhw'n gyntaf drwy ddefnyddio synaptic neu apt-get cyn parhau."
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:659
+#: ../DistUpgrade/DistUpgradeCache.py:631
 #, python-format
 msgid ""
 "An unresolvable problem occurred while calculating the upgrade:\n"
@@ -164,27 +156,27 @@
 " * Pecynnau meddalwedd answyddogol sydd ddim yn cael eu darparu gan Ubuntu\n"
 "\n"
 
-#: ../DistUpgrade/DistUpgradeCache.py:669
+#: ../DistUpgrade/DistUpgradeCache.py:641
 msgid "This is most likely a transient problem, please try again later."
 msgstr ""
 "Mwy na thebyg mai problem dros dro yw hon, rho gynnig arall arni'n hwyrach."
 
-#: ../DistUpgrade/DistUpgradeCache.py:672
+#: ../DistUpgrade/DistUpgradeCache.py:673
 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:677
-#: ../UpdateManager/UpdateManager.py:1034
+#: ../DistUpgrade/DistUpgradeCache.py:650
+#: ../UpdateManager/UpdateManager.py:772
 msgid "Could not calculate the upgrade"
 msgstr "Methu cyfrifo'r uwchraddiad"
 
-#: ../DistUpgrade/DistUpgradeCache.py:728
+#: ../DistUpgrade/DistUpgradeCache.py:700
 msgid "Error authenticating some packages"
 msgstr "Gwall wrth ddilysu rhai pecynnau"
 
-#: ../DistUpgrade/DistUpgradeCache.py:729
+#: ../DistUpgrade/DistUpgradeCache.py:701
 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 "
@@ -194,7 +186,7 @@
 "dros dro yw hon. Rho gynnig arni wedyn. Gweler isod am restr o becynnau sydd "
 "heb eu dilysu."
 
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:721
 #, python-format
 msgid ""
 "The package '%s' is marked for removal but it is in the removal blacklist."
@@ -202,33 +194,33 @@
 "Marciwyd pecyn '%s' ar gyfer ei dynnu ond mae yn rhestr ddu pecynnau i'w "
 "tynnu."
 
-#: ../DistUpgrade/DistUpgradeCache.py:753
+#: ../DistUpgrade/DistUpgradeCache.py:725
 #, python-format
 msgid "The essential package '%s' is marked for removal."
 msgstr "Marciwyd y pecyn hanfodol '%s' i'w dynnu."
 
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:734
 #, python-format
 msgid "Trying to install blacklisted version '%s'"
 msgstr "Ceisio gosod fersiwn rhestr ddu '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:880
+#: ../DistUpgrade/DistUpgradeCache.py:851
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Methu gosod '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:881
+#: ../DistUpgrade/DistUpgradeCache.py:882
 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:892
+#: ../DistUpgrade/DistUpgradeCache.py:861
 msgid "Can't guess meta-package"
 msgstr "Methu dyfalu pecyn-meta"
 
-#: ../DistUpgrade/DistUpgradeCache.py:893
+#: ../DistUpgrade/DistUpgradeCache.py:862
 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 "
@@ -241,15 +233,15 @@
 "Ubuntu rwyt ti'n ei rhedeg.\n"
 " Gosoda un o'r pecynnau uchod yn gyntaf drwy synaptic neu apt-get cyn parhau."
 
-#: ../DistUpgrade/DistUpgradeController.py:100
+#: ../DistUpgrade/DistUpgradeController.py:86
 msgid "Reading cache"
 msgstr "Yn darllen storfa"
 
-#: ../DistUpgrade/DistUpgradeController.py:210
+#: ../DistUpgrade/DistUpgradeController.py:189
 msgid "Unable to get exclusive lock"
 msgstr "Methu cael clo unigryw"
 
-#: ../DistUpgrade/DistUpgradeController.py:211
+#: ../DistUpgrade/DistUpgradeController.py:190
 msgid ""
 "This usually means that another package management application (like apt-get "
 "or aptitude) already running. Please close that application first."
@@ -257,11 +249,11 @@
 "Mae hyn fel arfer yn golygu bod rhaglen rheoli pecynnau arall (fel apt-get "
 "neu aptitude) eisoes yn rhedeg. Mae angen cau'r rhaglen honno'n gyntaf."
 
-#: ../DistUpgrade/DistUpgradeController.py:244
+#: ../DistUpgrade/DistUpgradeController.py:236
 msgid "Upgrading over remote connection not supported"
 msgstr "Nid yw uwchraddio dros gysylltiad o bell yn cael ei gefnogi"
 
-#: ../DistUpgrade/DistUpgradeController.py:245
+#: ../DistUpgrade/DistUpgradeController.py:237
 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-"
@@ -275,11 +267,11 @@
 "\n"
 "Bydd yr uwchraddiad yn dod i ben nawr. Tria heb ssh."
 
-#: ../DistUpgrade/DistUpgradeController.py:259
+#: ../DistUpgrade/DistUpgradeController.py:251
 msgid "Continue running under SSH?"
 msgstr "Parhau i redeg dan SSH?"
 
-#: ../DistUpgrade/DistUpgradeController.py:260
+#: ../DistUpgrade/DistUpgradeController.py:252
 #, python-format
 msgid ""
 "This session appears to be running under ssh. It is not recommended to "
@@ -295,11 +287,11 @@
 "Os wnei di barhau, bydd daemon ssh yn cychwyn ar borth '%s'.\n"
 "Wyt ti eisiau parhau?"
 
-#: ../DistUpgrade/DistUpgradeController.py:274
+#: ../DistUpgrade/DistUpgradeController.py:267
 msgid "Starting additional sshd"
 msgstr "Cychwyn sshd ychwanegol"
 
-#: ../DistUpgrade/DistUpgradeController.py:275
+#: ../DistUpgrade/DistUpgradeController.py:268
 #, python-format
 msgid ""
 "To make recovery in case of failure easier, an additional sshd will be "
@@ -310,7 +302,7 @@
 "borth '%s'. Os fydd rhywbeth yn mynd o'i le wrth redeg ssh bydd modd i ti "
 "gysylltu drwy'r un ychwanegol.\n"
 
-#: ../DistUpgrade/DistUpgradeController.py:283
+#: ../DistUpgrade/DistUpgradeController.py:282
 #, python-format
 msgid ""
 "If you run a firewall, you may need to temporarily open this port. As this "
@@ -319,55 +311,51 @@
 "'%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:355
-#: ../DistUpgrade/DistUpgradeController.py:400
+#: ../DistUpgrade/DistUpgradeController.py:339
+#: ../DistUpgrade/DistUpgradeController.py:384
 msgid "Can not upgrade"
 msgstr "Methu uwchraddio"
 
-#: ../DistUpgrade/DistUpgradeController.py:356
+#: ../DistUpgrade/DistUpgradeController.py:340
 #, python-format
 msgid "An upgrade from '%s' to '%s' is not supported with this tool."
 msgstr ""
 "Nid yw uwchraddio o '%s' i '%s' yn cael ei gefnogi gan y rhaglen hon."
 
-#: ../DistUpgrade/DistUpgradeController.py:365
+#: ../DistUpgrade/DistUpgradeController.py:349
 msgid "Sandbox setup failed"
 msgstr "Methwyd creu blwch tywod"
 
-#: ../DistUpgrade/DistUpgradeController.py:366
+#: ../DistUpgrade/DistUpgradeController.py:350
 msgid "It was not possible to create the sandbox environment."
 msgstr "Doedd hi ddim yn bosib creu amgylchedd blwch tywod"
 
-#: ../DistUpgrade/DistUpgradeController.py:372
+#: ../DistUpgrade/DistUpgradeController.py:356
 msgid "Sandbox mode"
 msgstr "Modd blwch tywod"
 
-#: ../DistUpgrade/DistUpgradeController.py:373
+#: ../DistUpgrade/DistUpgradeController.py:372
 #, python-format
 msgid ""
 "This upgrade is running in sandbox (test) mode. All changes are written to "
 "'%s' and will be lost on the next reboot.\n"
 "\n"
-"*No* changes written to a systemdir from now until the next reboot are "
-"permanent."
+"*No* changes written to a system directory from now until the next reboot "
+"are permanent."
 msgstr ""
-"Mae'r uwchraddiad yn rhedeg ym modd blwch tywod (prawf). Bydd pob newid yn "
-"cael ei ysgrifennu i '%s' a'i golli y tro nesaf i ti ailgychwyn.\n"
-"Fydd *dim* newidiadau sy'n cael eu hysgrifennu i systemdir rhwng nawr a'r "
-"ailgychwyn nesaf yn barhaol."
 
-#: ../DistUpgrade/DistUpgradeController.py:401
+#: ../DistUpgrade/DistUpgradeController.py:385
 msgid ""
 "Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
 msgstr ""
 "Mae dy osodiad o python wedi llygru. Trwsia'r ddolen symbolig "
 "'/usr/bin/python' ."
 
-#: ../DistUpgrade/DistUpgradeController.py:427
+#: ../DistUpgrade/DistUpgradeController.py:411
 msgid "Package 'debsig-verify' is installed"
 msgstr "Mae pecyn 'debsig-verify' wedi ei osod"
 
-#: ../DistUpgrade/DistUpgradeController.py:428
+#: ../DistUpgrade/DistUpgradeController.py:412
 msgid ""
 "The upgrade can not continue with that package installed.\n"
 "Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
@@ -377,24 +365,24 @@
 "Tynna hwn drwy synaptic neu 'apt-get remove debsig-verify' yn gyntaf a "
 "rhedeg yr uwchraddiad eto."
 
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:439
 #, python-format
 msgid "Can not write to '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:440
 #, python-format
 msgid ""
-"Its not possible to write to the systemdir '%s' on your system. The upgrade "
-"can not continue.\n"
-"Please make sure that the system dir is writable."
+"Its not possible to write to the system directory '%s' on your system. The "
+"upgrade can not continue.\n"
+"Please make sure that the system directory is writable."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:452
+#: ../DistUpgrade/DistUpgradeController.py:422
 msgid "Include latest updates from the Internet?"
 msgstr "Cynnwys diweddariadau mwyaf newydd o'r Rhyngrwyd?"
 
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:423
 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 "
@@ -415,16 +403,16 @@
 "Os wyt ti'n ateb 'na' fan hyn, fydd y rhwydwaith ddim yn cael ei ddefnyddio "
 "o gwbl."
 
-#: ../DistUpgrade/DistUpgradeController.py:673
+#: ../DistUpgrade/DistUpgradeController.py:647
 #, python-format
 msgid "disabled on upgrade to %s"
 msgstr "analluogwyd wrth uwchraddio i %s"
 
-#: ../DistUpgrade/DistUpgradeController.py:700
+#: ../DistUpgrade/DistUpgradeController.py:674
 msgid "No valid mirror found"
 msgstr "Heb ganfod drych dilys"
 
-#: ../DistUpgrade/DistUpgradeController.py:701
+#: ../DistUpgrade/DistUpgradeController.py:675
 #, python-format
 msgid ""
 "While scanning your repository information no mirror entry for the upgrade "
@@ -444,11 +432,11 @@
 "Os wnei di ddewis 'Na' bydd yr uwchraddiad yn terfynu."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:721
+#: ../DistUpgrade/DistUpgradeController.py:695
 msgid "Generate default sources?"
 msgstr "Creu cronfeydd diofyn"
 
-#: ../DistUpgrade/DistUpgradeController.py:722
+#: ../DistUpgrade/DistUpgradeController.py:696
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -461,22 +449,21 @@
 "A ddylid ychwanegu cofnod '%s' diofyn? Os wnei di ddewis 'Na' bydd yr "
 "uwchraddiad yn terfynu."
 
-#: ../DistUpgrade/DistUpgradeController.py:757
+#: ../DistUpgrade/DistUpgradeController.py:731
 msgid "Repository information invalid"
 msgstr "Gwybodaeth cronfeydd annilys"
 
-#: ../DistUpgrade/DistUpgradeController.py:758
+#: ../DistUpgrade/DistUpgradeController.py:757
 msgid ""
-"Upgrading the repository information resulted in a invalid file. Please "
-"report this as a bug using the command 'ubuntu-bug update-manager' in a "
-"terminal."
+"Upgrading the repository information resulted in a invalid file so a bug "
+"reporting process is being started."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:766
+#: ../DistUpgrade/DistUpgradeController.py:738
 msgid "Third party sources disabled"
 msgstr "Cronfeydd trydydd plaid wedi'u hanalluogi"
 
-#: ../DistUpgrade/DistUpgradeController.py:767
+#: ../DistUpgrade/DistUpgradeController.py:739
 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 "
@@ -486,7 +473,7 @@
 "galluogi eto wedi'r uwchraddiad gyda'r teclyn 'priodweddau-meddalwedd' yn dy "
 "reolwr pecynnau."
 
-#: ../DistUpgrade/DistUpgradeController.py:807
+#: ../DistUpgrade/DistUpgradeController.py:779
 msgid "Package in inconsistent state"
 msgid_plural "Packages in inconsistent state"
 msgstr[0] "Pecyn mewn cyflwr anghyson"
@@ -494,7 +481,7 @@
 msgstr[2] "Pecynnau mewn cyflwr anghyson"
 msgstr[3] "Pecynnau mewn cyflwr anghyson"
 
-#: ../DistUpgrade/DistUpgradeController.py:810
+#: ../DistUpgrade/DistUpgradeController.py:782
 #, python-format
 msgid ""
 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -521,11 +508,11 @@
 "canfod archif ar eu cyfer. Ailosoda'r pecynnau eto gyda llaw neu eu tynnu "
 "o'r system."
 
-#: ../DistUpgrade/DistUpgradeController.py:858
+#: ../DistUpgrade/DistUpgradeController.py:830
 msgid "Error during update"
 msgstr "Gwall wrth ddiweddaru"
 
-#: ../DistUpgrade/DistUpgradeController.py:859
+#: ../DistUpgrade/DistUpgradeController.py:831
 msgid ""
 "A problem occurred during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -534,12 +521,12 @@
 "arfer. Gwiria dy gysylltiad rhwydwaith a cheisio eto."
 
 #. print "on_button_install_clicked"
-#: ../DistUpgrade/DistUpgradeController.py:868
-#: ../UpdateManager/UpdateManager.py:759
+#: ../DistUpgrade/DistUpgradeController.py:840
+#: ../UpdateManager/UpdateManager.py:577
 msgid "Not enough free disk space"
 msgstr "Dim digon o le disg rhydd"
 
-#: ../DistUpgrade/DistUpgradeController.py:869
+#: ../DistUpgrade/DistUpgradeController.py:867
 #, python-format
 msgid ""
 "The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -553,32 +540,32 @@
 
 #. calc the dist-upgrade and see if the removals are ok/expected
 #. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:898
-#: ../DistUpgrade/DistUpgradeController.py:1643
+#: ../DistUpgrade/DistUpgradeController.py:869
+#: ../DistUpgrade/DistUpgradeController.py:1610
 msgid "Calculating the changes"
 msgstr "Cyfrifo'r newidiadau"
 
-#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:930
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeController.py:920
 msgid "Do you want to start the upgrade?"
 msgstr "Wyt ti eisiau dechrau uwchraddio?"
 
-#: ../DistUpgrade/DistUpgradeController.py:996
+#: ../DistUpgrade/DistUpgradeController.py:985
 msgid "Upgrade canceled"
 msgstr "Terfynwyd yr uwchraddiad"
 
-#: ../DistUpgrade/DistUpgradeController.py:997
+#: ../DistUpgrade/DistUpgradeController.py:995
 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:1003
-#: ../DistUpgrade/DistUpgradeController.py:1129
+#: ../DistUpgrade/DistUpgradeController.py:991
+#: ../DistUpgrade/DistUpgradeController.py:1097
 msgid "Could not download the upgrades"
 msgstr "Methu lawrthwytho'r uwchraddiad"
 
-#: ../DistUpgrade/DistUpgradeController.py:1004
+#: ../DistUpgrade/DistUpgradeController.py:1002
 msgid ""
 "The upgrade has aborted. Please check your Internet connection or "
 "installation media and try again. All files downloaded so far have been kept."
@@ -586,27 +573,27 @@
 
 #. FIXME: strings are not good, but we are in string freeze
 #. currently
-#: ../DistUpgrade/DistUpgradeController.py:1080
-#: ../DistUpgrade/DistUpgradeController.py:1117
-#: ../DistUpgrade/DistUpgradeController.py:1222
+#: ../DistUpgrade/DistUpgradeController.py:1049
+#: ../DistUpgrade/DistUpgradeController.py:1085
+#: ../DistUpgrade/DistUpgradeController.py:1190
 msgid "Error during commit"
 msgstr "Gwall wrth gyflwyno"
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1082
-#: ../DistUpgrade/DistUpgradeController.py:1119
-#: ../DistUpgrade/DistUpgradeController.py:1261
+#: ../DistUpgrade/DistUpgradeController.py:1051
+#: ../DistUpgrade/DistUpgradeController.py:1087
+#: ../DistUpgrade/DistUpgradeController.py:1229
 msgid "Restoring original system state"
 msgstr "Adfer cyflwr gwreiddiol y system"
 
-#: ../DistUpgrade/DistUpgradeController.py:1083
-#: ../DistUpgrade/DistUpgradeController.py:1098
-#: ../DistUpgrade/DistUpgradeController.py:1120
+#: ../DistUpgrade/DistUpgradeController.py:1052
+#: ../DistUpgrade/DistUpgradeController.py:1066
+#: ../DistUpgrade/DistUpgradeController.py:1088
 msgid "Could not install the upgrades"
 msgstr "Methu gosod yr uwchraddiad"
 
 #. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1086
 msgid ""
 "The upgrade has aborted. Your system could be in an unusable state. A "
 "recovery will run now (dpkg --configure -a)."
@@ -614,17 +601,18 @@
 "Mae'r uwchraddiad wedi terfynu. Efallai fod cyflwr nad oes modd ei "
 "ddefnyddio ar dy system. Bydd adferiad yn rhedeg nawr (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeController.py:1093
+#: ../DistUpgrade/DistUpgradeController.py:1091
 #, python-format
 msgid ""
 "\n"
 "\n"
-"Please report this bug using the command 'ubuntu-bug update-manager' in a "
-"terminal and include the files in /var/log/dist-upgrade/ in the bug report.\n"
+"Please report this bug in a browser at "
+"http://bugs.launchpad.net/ubuntu/+source/update-manager/+filebug and attach "
+"the files in /var/log/dist-upgrade/ to the bug report.\n"
 "%s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:1130
+#: ../DistUpgrade/DistUpgradeController.py:1128
 msgid ""
 "The upgrade has aborted. Please check your Internet connection or "
 "installation media and try again. "
@@ -632,20 +620,20 @@
 "Mae'r uwchraddiad wedi terfynu. Gwiria dy gysylltiad rhyngrwyd neu gyfrwng "
 "gosod a thrio eto. "
 
-#: ../DistUpgrade/DistUpgradeController.py:1210
+#: ../DistUpgrade/DistUpgradeController.py:1178
 msgid "Remove obsolete packages?"
 msgstr "Tynnu pecynnau darfodedig?"
 
-#: ../DistUpgrade/DistUpgradeController.py:1211
-#: ../DistUpgrade/DistUpgrade.ui.h:8
+#: ../DistUpgrade/DistUpgradeController.py:1179
+#: ../DistUpgrade/DistUpgrade.ui.h:22
 msgid "_Keep"
 msgstr "_Cadw"
 
-#: ../DistUpgrade/DistUpgradeController.py:1211
+#: ../DistUpgrade/DistUpgradeController.py:1179
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: ../DistUpgrade/DistUpgradeController.py:1223
+#: ../DistUpgrade/DistUpgradeController.py:1191
 msgid ""
 "A problem occurred during the clean-up. Please see the below message for "
 "more information. "
@@ -654,114 +642,109 @@
 
 #. FIXME: instead of error out, fetch and install it
 #. here
-#: ../DistUpgrade/DistUpgradeController.py:1299
+#: ../DistUpgrade/DistUpgradeController.py:1267
 msgid "Required depends is not installed"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:1300
+#: ../DistUpgrade/DistUpgradeController.py:1268
 #, python-format
 msgid "The required dependency '%s' is not installed. "
 msgstr "Dyw'r dibyniaeth angenrheidiol '%s' ddim wedi ei osod. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1540
-#: ../DistUpgrade/DistUpgradeController.py:1610
+#: ../DistUpgrade/DistUpgradeController.py:1513
+#: ../DistUpgrade/DistUpgradeController.py:1580
 msgid "Checking package manager"
 msgstr "Gwirio rheolwr pecynnau"
 
-#: ../DistUpgrade/DistUpgradeController.py:1545
+#: ../DistUpgrade/DistUpgradeController.py:1518
 msgid "Preparing the upgrade failed"
 msgstr "Methwyd paratoi'r uwchraddiad"
 
-#: ../DistUpgrade/DistUpgradeController.py:1546
+#: ../DistUpgrade/DistUpgradeController.py:1543
 msgid ""
-"Preparing the system for the upgrade failed. Please report this using the "
-"command 'ubuntu-bug update-manager' in a terminal and include the files in "
-"/var/log/dist-upgrade/ in the bug report."
+"Preparing the system for the upgrade failed so a bug reporting process "
+"isbeing started."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:1562
+#: ../DistUpgrade/DistUpgradeController.py:1535
 msgid "Getting upgrade prerequisites failed"
 msgstr "Methwyd paratoi rhagblaen ar gyfer uwchraddio"
 
-#: ../DistUpgrade/DistUpgradeController.py:1563
+#: ../DistUpgrade/DistUpgradeController.py:1558
 msgid ""
 "The system was unable to get the prerequisites for the upgrade. The upgrade "
 "will abort now and restore the original system state.\n"
 "\n"
-"Please report this as a bug using the command 'ubuntu-bug update-manager' in "
-"a terminal and include the files in /var/log/dist-upgrade/ in the bug report."
+"Additionally, a bug reporting process is being started."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1566
 msgid "Updating repository information"
 msgstr "Diweddaru gwybodaeth cronfeydd"
 
-#: ../DistUpgrade/DistUpgradeController.py:1601
+#: ../DistUpgrade/DistUpgradeController.py:1593
 msgid "Failed to add the cdrom"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:1602
+#: ../DistUpgrade/DistUpgradeController.py:1594
 msgid "Sorry, adding the cdrom was not successful."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:1630
+#: ../DistUpgrade/DistUpgradeController.py:1598
 msgid "Invalid package information"
 msgstr "Gwybodaeth pecyn annilys"
 
-#: ../DistUpgrade/DistUpgradeController.py:1631
+#: ../DistUpgrade/DistUpgradeController.py:1623
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
-"not be found anymore.\n"
-"This indicates a serious error, please report this bug using the command "
-"'ubuntu-bug update-manager' in a terminal and include the files in "
-"/var/log/dist-upgrade/ in the bug report."
+"not be found anymore so a bug reporting process is being started."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:1649
-#: ../DistUpgrade/DistUpgradeController.py:1702
+#: ../DistUpgrade/DistUpgradeController.py:1616
+#: ../DistUpgrade/DistUpgradeController.py:1664
 msgid "Fetching"
 msgstr "Cyrchu"
 
-#: ../DistUpgrade/DistUpgradeController.py:1655
-#: ../DistUpgrade/DistUpgradeController.py:1706
+#: ../DistUpgrade/DistUpgradeController.py:1622
+#: ../DistUpgrade/DistUpgradeController.py:1668
 msgid "Upgrading"
 msgstr "Uwchraddio"
 
 #. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1660
-#: ../DistUpgrade/DistUpgradeController.py:1708
-#: ../DistUpgrade/DistUpgradeController.py:1715
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1627
+#: ../DistUpgrade/DistUpgradeController.py:1670
+#: ../DistUpgrade/DistUpgradeController.py:1677
+#: ../DistUpgrade/DistUpgradeController.py:1688
 msgid "Upgrade complete"
 msgstr "Uwchraddiad wedi cwblhau"
 
-#: ../DistUpgrade/DistUpgradeController.py:1661
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1716
+#: ../DistUpgrade/DistUpgradeController.py:1651
+#: ../DistUpgrade/DistUpgradeController.py:1699
+#: ../DistUpgrade/DistUpgradeController.py:1706
 msgid ""
 "The upgrade has completed but there were errors during the upgrade process."
 msgstr "Mae'r uwchraddiad wedi cwblhau ond roedd gwallau yn ystod y broses."
 
-#: ../DistUpgrade/DistUpgradeController.py:1668
+#: ../DistUpgrade/DistUpgradeController.py:1635
 msgid "Searching for obsolete software"
 msgstr "Chwilio am feddalwedd darfodedig"
 
-#: ../DistUpgrade/DistUpgradeController.py:1677
+#: ../DistUpgrade/DistUpgradeController.py:1640
 msgid "System upgrade is complete."
 msgstr "Uwchraddio'r sytem wedi cwblhau."
 
-#: ../DistUpgrade/DistUpgradeController.py:1727
+#: ../DistUpgrade/DistUpgradeController.py:1689
 msgid "The partial upgrade was completed."
 msgstr "Uwchraddiad rhannol wedi cwblhau."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:202
+#: ../DistUpgrade/DistUpgradeQuirks.py:168
 msgid "evms in use"
 msgstr "evms yn cael ei ddefnyddio"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:203
+#: ../DistUpgrade/DistUpgradeQuirks.py:169
 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 "
@@ -771,20 +754,20 @@
 "meddalwedd 'evms' yn derbyn cefnogaeth bellach. Diffodda hwn a rhedeg yr "
 "uwchraddiad eto wedyn."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:508
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
 msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:510
+#: ../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?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:444
+#: ../DistUpgrade/DistUpgradeQuirks.py:472
+#: ../DistUpgrade/DistUpgradeQuirks.py:499
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -792,8 +775,8 @@
 "Gall uwchraddio leihau effeithiau penbwrdd a pherfformiad gyda gêmau a "
 "rhaglenni eraill sy'n drwm ar graffeg."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:534
-#: ../DistUpgrade/DistUpgradeQuirks.py:562
+#: ../DistUpgrade/DistUpgradeQuirks.py:448
+#: ../DistUpgrade/DistUpgradeQuirks.py:476
 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 "
@@ -807,7 +790,7 @@
 "\n"
 "Wyt ti eisiau parhau?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:589
+#: ../DistUpgrade/DistUpgradeQuirks.py:503
 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 "
@@ -821,11 +804,11 @@
 "\n"
 "Wyt ti eisiau parhau?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:619
+#: ../DistUpgrade/DistUpgradeQuirks.py:607
 msgid "No i686 CPU"
 msgstr "Dim CPU i686"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:620
+#: ../DistUpgrade/DistUpgradeQuirks.py:608
 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 "
@@ -837,11 +820,11 @@
 "Nid yw'n bosib uwchraddio dy system i fersiwn newydd o Ubuntu gyda'r "
 "caledwedd hwn."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:656
+#: ../DistUpgrade/DistUpgradeQuirks.py:530
 msgid "No ARMv6 CPU"
 msgstr "Dim CPU ARMv6"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:657
+#: ../DistUpgrade/DistUpgradeQuirks.py:531
 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 "
@@ -853,11 +836,11 @@
 "bod yn gweithio. Nid yw'n bosib uwchraddio dy system i fersiwn newydd o "
 "Ubuntu gyda'r caledwedd hwn."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:677
+#: ../DistUpgrade/DistUpgradeQuirks.py:551
 msgid "No init available"
 msgstr "Dim init ar gael"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
 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 "
@@ -872,16 +855,16 @@
 "\n"
 "Wyt ti'n siwr dy fod eisiau parhau?"
 
-#: ../DistUpgrade/DistUpgradeMain.py:63
+#: ../DistUpgrade/DistUpgradeMain.py:48
 msgid "Sandbox upgrade using aufs"
 msgstr "Uwchraddiad bocs tywod yn defnyddio aufs"
 
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:50
 msgid "Use the given path to search for a cdrom with upgradable packages"
 msgstr ""
 "Defnyddia'r llwybr roddwyd i chwilio am cdrom gyda phecynnau uwchraddio"
 
-#: ../DistUpgrade/DistUpgradeMain.py:71
+#: ../DistUpgrade/DistUpgradeMain.py:56
 msgid ""
 "Use frontend. Currently available: \n"
 "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
@@ -893,7 +876,7 @@
 msgid "*DEPRECATED* this option will be ignored"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeMain.py:77
+#: ../DistUpgrade/DistUpgradeMain.py:62
 msgid "Perform a partial upgrade only (no sources.list rewriting)"
 msgstr ""
 "Perfformio uwchraddiad rhannol yn unig (dim ailysgrifennu sources.list)"
@@ -902,45 +885,39 @@
 msgid "Disable GNU screen support"
 msgstr "Analluogi cefnogaeth sgrin GNU"
 
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:64
 msgid "Set datadir"
 msgstr "Gosod datadir"
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:114
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:189
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewKDE.py:190
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Rho '%s' mewn i yrriant '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:135
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:203
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewKDE.py:204
 msgid "Fetching is complete"
 msgstr "Wedi gorffen cyrchu"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:146
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:216
+#: ../DistUpgrade/DistUpgradeViewGtk.py:142
+#: ../DistUpgrade/DistUpgradeViewKDE.py:217
 #, python-format
 msgid "Fetching file %li of %li at %sB/s"
 msgstr "Yn cyrchu ffeil %li o %li ar %sB/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:295
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:301
-#: ../DistUpgrade/DistUpgradeViewKDE.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:361
+#: ../DistUpgrade/DistUpgradeViewGtk.py:143
+#: ../DistUpgrade/DistUpgradeViewGtk.py:280
+#: ../DistUpgrade/DistUpgradeViewKDE.py:218
+#: ../DistUpgrade/DistUpgradeViewKDE.py:358
 #, python-format
 msgid "About %s remaining"
 msgstr "Tua %s yn weddill"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:219
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
 #, python-format
 msgid "Fetching file %li of %li"
 msgstr "Yn cyrchu ffeil %li o %li"
@@ -948,29 +925,25 @@
 #. 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:183
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:253
+#: ../DistUpgrade/DistUpgradeViewGtk.py:177
+#: ../DistUpgrade/DistUpgradeViewKDE.py:254
 msgid "Applying changes"
 msgstr "Yn gweithredu newidiadau"
 
 #. we do not report followup errors from earlier failures
-#: ../DistUpgrade/DistUpgradeViewGtk.py:208
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:211
-#: ../DistUpgrade/DistUpgradeViewKDE.py:266
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#: ../DistUpgrade/DistUpgradeViewKDE.py:267
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemau dibyniaeth - yn gadael heb ei gyflunio"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:213
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:216
-#: ../DistUpgrade/DistUpgradeViewKDE.py:268
+#: ../DistUpgrade/DistUpgradeViewGtk.py:207
+#: ../DistUpgrade/DistUpgradeViewKDE.py:269
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Methu gosod '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:214
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:269
+#: ../DistUpgrade/DistUpgradeViewGtk.py:208
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
 #, python-format
 msgid ""
 "The upgrade will continue but the '%s' package may not be in a working "
@@ -980,9 +953,8 @@
 "Ystyria gyflwyno adroddiad chwilen am hwn."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:231
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:234
-#: ../DistUpgrade/DistUpgradeViewKDE.py:290
+#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:291
 #, python-format
 msgid ""
 "Replace the customized configuration file\n"
@@ -991,9 +963,8 @@
 "Amnewid y ffeil cyfluniad addasiedig\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:232
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:291
+#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewKDE.py:292
 msgid ""
 "You will lose any changes you have made to this configuration file if you "
 "choose to replace it with a newer version."
@@ -1001,15 +972,13 @@
 "Fe fyddi di'n colli unrhyw newidiadau wnaed i'r ffeil cyfluniad yma os wyt "
 "ti'n ei amnewid am fersiwn mwy newydd."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:250
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:253
-#: ../DistUpgrade/DistUpgradeViewKDE.py:313
+#: ../DistUpgrade/DistUpgradeViewGtk.py:240
+#: ../DistUpgrade/DistUpgradeViewKDE.py:310
 msgid "The 'diff' command was not found"
 msgstr "Methwyd canfod gorchymyn 'diff'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:463
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:469
-#: ../DistUpgrade/DistUpgradeViewText.py:90
+#: ../DistUpgrade/DistUpgradeViewGtk.py:445
+#: ../DistUpgrade/DistUpgradeViewText.py:88
 msgid "A fatal error occurred"
 msgstr "Digwyddodd gwall marwol"
 
@@ -1026,13 +995,11 @@
 "dy adroddiad. Mae'r uwchraddiad wedi terfynu.\n"
 "Cadwyd dy sources.list gwreiddiol yn /etc/apt/sources.list.distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:481
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:487
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
 msgid "Ctrl-c pressed"
 msgstr "Gwasgwyd Ctrl-c"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:488
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
 msgid ""
 "This will abort the operation and may leave the system in a broken state. "
 "Are you sure you want to do that?"
@@ -1041,8 +1008,7 @@
 "ti'n siwr dy fod eisiau gwneud hyn?"
 
 #. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:630
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:621
+#: ../DistUpgrade/DistUpgradeViewGtk.py:611
 msgid "To prevent data loss close all open applications and documents."
 msgstr "Cau pob rhaglen a dogfen i osgoi colli data."
 
@@ -1083,92 +1049,96 @@
 msgstr "Uwchraddio (%s)"
 
 #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:190
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:149
+#: ../DistUpgrade/DistUpgradeViewKDE.py:191
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
 msgid "Media Change"
 msgstr "Newid Cyfrwng"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:325
+#: ../DistUpgrade/DistUpgradeViewKDE.py:322
 msgid "Show Difference >>>"
 msgstr "Dangos Gwahaniaeth >>>"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:328
+#: ../DistUpgrade/DistUpgradeViewKDE.py:325
 msgid "<<< Hide Difference"
 msgstr "<<< Cuddio Gwahaniaeth"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:543
+#: ../DistUpgrade/DistUpgradeViewKDE.py:539
 msgid "Error"
 msgstr "Gwall"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:555
+#: ../DistUpgrade/DistUpgradeViewKDE.py:551
 msgid "&Cancel"
 msgstr "&Canslo"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:557
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewKDE.py:553
+#: ../DistUpgrade/DistUpgradeViewKDE.py:792
 msgid "&Close"
 msgstr "&Cau"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:603
+#: ../DistUpgrade/DistUpgradeViewKDE.py:599
 msgid "Show Terminal >>>"
 msgstr "Dangos Terfynell >>>"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:606
+#: ../DistUpgrade/DistUpgradeViewKDE.py:602
 msgid "<<< Hide Terminal"
 msgstr "<<< Cuddio Terfynell"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:686
+#: ../DistUpgrade/DistUpgradeViewKDE.py:682
 msgid "Information"
 msgstr "Gwybodaeth"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:737
-#: ../DistUpgrade/DistUpgradeViewKDE.py:782
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:732
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
+#: ../DistUpgrade/DistUpgradeViewKDE.py:778 ../DistUpgrade/DistUpgrade.ui.h:11
 msgid "Details"
 msgstr "Manylion"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:763
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
 #, python-format
 msgid "No longer supported %s"
 msgstr "Ddim bellach yn cefnogi %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:765
+#: ../DistUpgrade/DistUpgradeViewGtk.py:627
+#: ../DistUpgrade/DistUpgradeViewKDE.py:758
 #, python-format
 msgid "Remove %s"
 msgstr "Tynnu %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:767
-#: ../DistUpgrade/DistUpgradeViewText.py:179
+#: ../DistUpgrade/DistUpgradeViewGtk.py:632
+#: ../DistUpgrade/DistUpgradeViewKDE.py:760
+#: ../DistUpgrade/DistUpgradeViewText.py:169
 #, python-format
 msgid "Remove (was auto installed) %s"
 msgstr "Tynnu (wedi ei osod yn awtomatig) %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:769
+#: ../DistUpgrade/DistUpgradeViewGtk.py:635
+#: ../DistUpgrade/DistUpgradeViewKDE.py:762
 #, python-format
 msgid "Install %s"
 msgstr "Gosod %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewGtk.py:637
+#: ../DistUpgrade/DistUpgradeViewKDE.py:764
 #, python-format
 msgid "Upgrade %s"
 msgstr "Uwchraddio %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:795
-#: ../DistUpgrade/DistUpgradeViewText.py:227
+#: ../DistUpgrade/DistUpgradeViewKDE.py:788
+#: ../DistUpgrade/DistUpgradeViewText.py:217
 msgid "Restart required"
 msgstr "Angen ailgychwyn"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:795
+#: ../DistUpgrade/DistUpgradeViewKDE.py:788
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr "<b><big>Ailgychwyn y system i gwblhau'r uwchraddiad</big></b>"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:798 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:791 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../data/glade/UpdateManager.ui.h:31
 msgid "_Restart Now"
 msgstr "_Ailgychwyn Nawr"
 
 #. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:816
+#: ../DistUpgrade/DistUpgradeViewKDE.py:809
 msgid ""
 "<b><big>Cancel the running upgrade?</big></b>\n"
 "\n"
@@ -1180,11 +1150,11 @@
 "Efallai na fydd modd defnyddio'r system os wnei di ganslo'r uwchraddiad. "
 "Cynghorir ti yn gryf i ailgychwyn yr uwchraddiad."
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:820
+#: ../DistUpgrade/DistUpgradeViewKDE.py:813
 msgid "Cancel Upgrade?"
 msgstr "Canslo Uwchraddiad?"
 
-#: ../DistUpgrade/DistUpgradeView.py:59
+#: ../DistUpgrade/DistUpgradeView.py:60
 #, python-format
 msgid "%li day"
 msgid_plural "%li days"
@@ -1193,7 +1163,7 @@
 msgstr[2] "%li diwrnod"
 msgstr[3] "%li diwrnod"
 
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:62
 #, python-format
 msgid "%li hour"
 msgid_plural "%li hours"
@@ -1202,7 +1172,7 @@
 msgstr[2] "%li awr"
 msgstr[3] "%li awr"
 
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:64
 #, python-format
 msgid "%li minute"
 msgid_plural "%li minutes"
@@ -1211,7 +1181,7 @@
 msgstr[2] "%li munud"
 msgstr[3] "%li munud"
 
-#: ../DistUpgrade/DistUpgradeView.py:64
+#: ../DistUpgrade/DistUpgradeView.py:65
 #, python-format
 msgid "%li second"
 msgid_plural "%li seconds"
@@ -1229,7 +1199,7 @@
 #. plural form
 #. 
 #. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:80
+#: ../DistUpgrade/DistUpgradeView.py:78
 #, python-format
 msgid "%(str_days)s %(str_hours)s"
 msgstr "%(str_days)s %(str_hours)s"
@@ -1243,14 +1213,14 @@
 #. plural form
 #. 
 #. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:98
+#: ../DistUpgrade/DistUpgradeView.py:93
 #, python-format
 msgid "%(str_hours)s %(str_minutes)s"
 msgstr "%(str_hours)s %(str_minutes)s"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:147
+#: ../DistUpgrade/DistUpgradeView.py:128
 #, python-format
 msgid ""
 "This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1260,32 +1230,32 @@
 "modem 56k."
 
 #. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:132
 #, python-format
 msgid "This download will take about %s with your connection. "
 msgstr "Bydd lawrlwytho yn cymrud tua %s gyda dy gysylltiad di. "
 
-#: ../DistUpgrade/DistUpgradeView.py:253 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:234 ../DistUpgrade/DistUpgrade.ui.h:16
 msgid "Preparing to upgrade"
 msgstr "Paratoi i uwchraddio"
 
-#: ../DistUpgrade/DistUpgradeView.py:254
+#: ../DistUpgrade/DistUpgradeView.py:235
 msgid "Getting new software channels"
 msgstr "Cyrchu sianeli meddalwedd newydd"
 
-#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:236 ../DistUpgrade/DistUpgrade.ui.h:14
 msgid "Getting new packages"
 msgstr "Cyrchu pecynnau newydd"
 
-#: ../DistUpgrade/DistUpgradeView.py:256 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:237 ../DistUpgrade/DistUpgrade.ui.h:15
 msgid "Installing the upgrades"
 msgstr "Gosod yr uwchraddiad"
 
-#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:238 ../DistUpgrade/DistUpgrade.ui.h:10
 msgid "Cleaning up"
 msgstr "Yn glanhau"
 
-#: ../DistUpgrade/DistUpgradeView.py:342
+#: ../DistUpgrade/DistUpgradeView.py:344
 #, python-format
 msgid ""
 "%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1308,7 +1278,7 @@
 
 #. FIXME: make those two separate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:351
+#: ../DistUpgrade/DistUpgradeView.py:322
 #, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
@@ -1317,7 +1287,7 @@
 msgstr[2] "Mae %d o becynnau yn mynd i gael eu tynnu."
 msgstr[3] "Mae %d o becynnau yn mynd i gael eu tynnu."
 
-#: ../DistUpgrade/DistUpgradeView.py:356
+#: ../DistUpgrade/DistUpgradeView.py:327
 #, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
@@ -1326,7 +1296,7 @@
 msgstr[2] "Bydd %d o becynnau newydd yn cael eu gosod."
 msgstr[3] "Bydd %d o becynnau newydd yn cael eu gosod."
 
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:333
 #, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
@@ -1335,7 +1305,7 @@
 msgstr[2] "Bydd %d o becynnau yn cael eu huwchraddio."
 msgstr[3] "Bydd %d o becynnau yn cael eu huwchraddio."
 
-#: ../DistUpgrade/DistUpgradeView.py:367
+#: ../DistUpgrade/DistUpgradeView.py:338
 #, python-format
 msgid ""
 "\n"
@@ -1346,20 +1316,28 @@
 "\n"
 "Rwyt ti wedi lawrlwytho cyfanswm o %s. "
 
-#: ../DistUpgrade/DistUpgradeView.py:371
+#: ../DistUpgrade/DistUpgradeView.py:374
+msgid ""
+"Installing the upgrade can take several hours. Once the download has "
+"finished, the process cannot be canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:378
 msgid ""
 "Fetching and installing the upgrade can take several hours. Once the "
-"download has finished, the process cannot be cancelled."
+"download has finished, the process cannot be canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:383
+msgid "Removing the packages can take several hours. "
 msgstr ""
-"Gall cyrchu a gosod yr uwchraddiad gymryd sawl awr. Unwaith i'r lawrlwythiad "
-"orffen does dim modd canslo'r broses."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:377 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:675
 msgid "The software on this computer is up to date."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:349
 msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
@@ -1367,11 +1345,11 @@
 "Does dim uwchraddiad ar gael ar gyfer dy system. Bydd yr uwchraddiad yn cael "
 "ei ganslo."
 
-#: ../DistUpgrade/DistUpgradeView.py:391
+#: ../DistUpgrade/DistUpgradeView.py:362
 msgid "Reboot required"
 msgstr "Angen ailgychwyn"
 
-#: ../DistUpgrade/DistUpgradeView.py:392
+#: ../DistUpgrade/DistUpgradeView.py:363
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -1390,10 +1368,10 @@
 msgid "extracting '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:132
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:133
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:132
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:133
 msgid "Could not run the upgrade tool"
 msgstr "Methu rhedeg y teclyn uwchraddio"
 
@@ -1404,33 +1382,33 @@
 "using the command 'ubuntu-bug update-manager'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:202
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:202
 msgid "Upgrade tool signature"
 msgstr "Llofnod teclyn uwchraddio"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:205
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:205
 msgid "Upgrade tool"
 msgstr "Teclyn uwchraddio"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
 msgid "Failed to fetch"
 msgstr "Methwyd cyrchu"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:235
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:235
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "Methwyd cyrchu'r uwchraddiad. Efallai bod problem rhwydwaith. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:239
 msgid "Authentication failed"
 msgstr "Methwyd dilysu"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:240
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:240
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -1438,13 +1416,13 @@
 "Methwyd cadarnhau dilysrwydd yr uwchraddiad. Efallai bod problem gyda'r "
 "rhwydwaith neu'r gweinydd. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:245
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:245
 msgid "Failed to extract"
 msgstr "Methwyd echdynnu"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:246
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:246
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -1452,13 +1430,13 @@
 "Methwyd echdynnu'r uwchraddiad. Efallai bod problem gyda'r rhwydwaith neu'r "
 "gweinydd. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:251
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:251
 msgid "Verification failed"
 msgstr "Methwyd dilysu"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
@@ -1466,10 +1444,10 @@
 "Methwyd dilysu'r uwchraddiad. Efallai bod problem gyda'r rhwydwaith neu'r "
 "gweinydd. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:266
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:272
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:266
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:272
 msgid "Can not run the upgrade"
 msgstr "Methu rhedeg yr uwchraddiad"
 
@@ -1480,8 +1458,8 @@
 "remount without noexec and run the upgrade again."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
 #, python-format
 msgid "The error message is '%s'."
 msgstr "Y neges gwall yw '%s'."
@@ -1497,11 +1475,11 @@
 "a /var/log/dist-upgrade/apt.log yn dy adroddiad. Terfynwyd yr uwchraddiad.\n"
 "Cadwyd y ffeil sources.list gwreiddiol yn /etc/apt/sources.list.distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewText.py:115
+#: ../DistUpgrade/DistUpgradeViewText.py:113
 msgid "Aborting"
 msgstr "Yn terfynu"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:120
+#: ../DistUpgrade/DistUpgradeViewText.py:118
 msgid "Demoted:\n"
 msgstr "Diraddiwyd:\n"
 
@@ -1509,33 +1487,33 @@
 msgid "To continue please press [ENTER]"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewText.py:155
-#: ../DistUpgrade/DistUpgradeViewText.py:193
-#: ../DistUpgrade/DistUpgradeViewText.py:200
+#: ../DistUpgrade/DistUpgradeViewText.py:150
+#: ../DistUpgrade/DistUpgradeViewText.py:183
+#: ../DistUpgrade/DistUpgradeViewText.py:190
 msgid "Continue [yN] "
 msgstr "Parhau [yN] "
 
-#: ../DistUpgrade/DistUpgradeViewText.py:155
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:150
+#: ../DistUpgrade/DistUpgradeViewText.py:183
 msgid "Details [d]"
 msgstr "Manylion [d]"
 
 #. TRANSLATORS: the "y" is "yes"
 #. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:159
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:154
+#: ../DistUpgrade/DistUpgradeViewText.py:193
 msgid "y"
 msgstr "i"
 
 #. TRANSLATORS: the "n" is "no"
 #. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:157
+#: ../DistUpgrade/DistUpgradeViewText.py:200
 msgid "n"
 msgstr "n"
 
 #. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:165
+#: ../DistUpgrade/DistUpgradeViewText.py:160
 msgid "d"
 msgstr "m"
 
@@ -1544,26 +1522,26 @@
 msgid "No longer supported: %s\n"
 msgstr "Ddim yn derbyn cefnogaeth bellach: %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:175
+#: ../DistUpgrade/DistUpgradeViewText.py:165
 #, python-format
 msgid "Remove: %s\n"
 msgstr "Tynnu: %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:185
+#: ../DistUpgrade/DistUpgradeViewText.py:175
 #, python-format
 msgid "Install: %s\n"
 msgstr "Gosod: %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:190
+#: ../DistUpgrade/DistUpgradeViewText.py:180
 #, python-format
 msgid "Upgrade: %s\n"
 msgstr "Uwchraddio: %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:207
+#: ../DistUpgrade/DistUpgradeViewText.py:197
 msgid "Continue [Yn] "
 msgstr "Parhau [Yn] "
 
-#: ../DistUpgrade/DistUpgradeViewText.py:228
+#: ../DistUpgrade/DistUpgradeViewText.py:218
 msgid ""
 "To finish the upgrade, a restart is required.\n"
 "If you select 'y' the system will be restarted."
@@ -1571,15 +1549,15 @@
 "I gwblhau'r uwchraddiad, mae angen ailgychwyn.\n"
 "Os wnei di ddewis 'i' bydd y system yn ailgychwyn."
 
-#: ../DistUpgrade/DistUpgrade.ui.h:1
+#: ../DistUpgrade/DistUpgrade.ui.h:20
 msgid "_Cancel Upgrade"
 msgstr "_Canslo Uwchraddiad"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:2
+#: ../DistUpgrade/DistUpgrade.ui.h:26
 msgid "_Resume Upgrade"
 msgstr "_Ailgychwyn Uwchraddiad"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:3
+#: ../DistUpgrade/DistUpgrade.ui.h:2
 msgid ""
 "<b><big>Cancel the running upgrade?</big></b>\n"
 "\n"
@@ -1591,31 +1569,31 @@
 "Gallai'r system fod yn ansefydlog os wnei di ganslo'r uwchraddiad. Y cyngor "
 "yw i ti ailgychwyn uwchraddio."
 
-#: ../DistUpgrade/DistUpgrade.ui.h:6
+#: ../DistUpgrade/DistUpgrade.ui.h:27
 msgid "_Start Upgrade"
 msgstr "_Dechrau Uwchraddiad"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:9
+#: ../DistUpgrade/DistUpgrade.ui.h:23
 msgid "_Replace"
 msgstr "_Amnewid"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:10
+#: ../DistUpgrade/DistUpgrade.ui.h:12
 msgid "Difference between the files"
 msgstr "Y gwahaniaeth rhwng y ffeiliau"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:11
+#: ../DistUpgrade/DistUpgrade.ui.h:24
 msgid "_Report Bug"
 msgstr "_Adrodd Chwilen"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:12
+#: ../DistUpgrade/DistUpgrade.ui.h:21
 msgid "_Continue"
 msgstr "_Parhau"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:13
+#: ../DistUpgrade/DistUpgrade.ui.h:8
 msgid "<b><big>Start the upgrade?</big></b>"
 msgstr "<b><big>Dechrau'r uwchraddiad?</big></b>"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:15
+#: ../DistUpgrade/DistUpgrade.ui.h:5
 msgid ""
 "<b><big>Restart the system to complete the upgrade</big></b>\n"
 "\n"
@@ -1625,7 +1603,7 @@
 "\n"
 "Cofia gadw dy waith cyn parhau."
 
-#: ../DistUpgrade/DistUpgrade.ui.h:18
+#: ../DistUpgrade/DistUpgrade.ui.h:13
 msgid "Distribution Upgrade"
 msgstr "Uwchraddio Dosbarthiad"
 
@@ -1633,100 +1611,100 @@
 msgid "<b><big>Upgrading Ubuntu to version 12.04</big></b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.ui.h:20
+#: ../DistUpgrade/DistUpgrade.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../DistUpgrade/DistUpgrade.ui.h:22
+#: ../DistUpgrade/DistUpgrade.ui.h:18
 msgid "Setting new software channels"
 msgstr "Gosod sianeli meddalwedd newydd"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:24
+#: ../DistUpgrade/DistUpgrade.ui.h:17
 msgid "Restarting the computer"
 msgstr "Ailgychwyn y cyfrifiadur"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:27
+#: ../DistUpgrade/DistUpgrade.ui.h:19
 msgid "Terminal"
 msgstr "Terfynell"
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:42
 msgid "Please wait, this can take some time."
 msgstr "Bydd yn amyneddgar, gall hyn gymryd amser."
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:44
 msgid "Update is complete"
 msgstr "Uwchraddiad wedi cwblhau"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:108
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:102
+#: ../UpdateManager/DistUpgradeFetcher.py:85
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
 msgid "Could not find the release notes"
 msgstr "Methu canfod nodiadau rhyddhau"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:109
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
+#: ../UpdateManager/DistUpgradeFetcher.py:86
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
 msgid "The server may be overloaded. "
 msgstr "Gall fod pwysau ar y gweinydd. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:119
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:107
+#: ../UpdateManager/DistUpgradeFetcher.py:96
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
 msgid "Could not download the release notes"
 msgstr "Methu lawrlwytho'r nodiadau rhyddhau"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:120
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
+#: ../UpdateManager/DistUpgradeFetcher.py:97
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
 msgid "Please check your internet connection."
 msgstr "Gwiria dy gysylltiad rhyngrwyd."
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:61
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:84
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
 msgid "Upgrade"
 msgstr "Uwchraddio"
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:88
-#: ../data/gtkbuilder/UpdateManager.ui.h:20
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
+#: ../data/glade/UpdateManager.ui.h:12
+#: ../data/glade/UpgradePromptDialog.ui.h:4
 msgid "Release Notes"
 msgstr "Nodiadau Ryddhau"
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:127
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:140
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:142
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
 msgid "Downloading additional package files..."
 msgstr "Lawrlwytho ffeiliau pecynnau ychwanegol..."
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:140
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
 #, python-format
 msgid "File %s of %s at %sB/s"
 msgstr "Ffeil %s o %s ar %sB/s"
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:142
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
 #, python-format
 msgid "File %s of %s"
 msgstr "Ffeil %s o %s"
 
-#: ../UpdateManager/ChangelogViewer.py:73
+#: ../UpdateManager/ChangelogViewer.py:70
 msgid "Open Link in Browser"
 msgstr "Agor Dolen Mewn Porwr"
 
-#: ../UpdateManager/ChangelogViewer.py:76
+#: ../UpdateManager/ChangelogViewer.py:72
 msgid "Copy Link to Clipboard"
 msgstr "Copio Dolen i'r Clipfwrdd"
 
-#: ../UpdateManager/GtkProgress.py:159
+#: ../UpdateManager/GtkProgress.py:116
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Lawrlwytho ffeil %(current)li o %(total)li gyda %(speed)s/s"
 
-#: ../UpdateManager/GtkProgress.py:164
+#: ../UpdateManager/GtkProgress.py:121
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Lawrlwytho ffeil %(current)li o %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:96
+#: ../UpdateManager/UpdateManager.py:104 ../do-release-upgrade:95
 msgid "Your Ubuntu release is not supported anymore."
 msgstr "Nid yw dy fersiwn o Ubuntu'n derbyn cefnogaeth bellach."
 
-#: ../UpdateManager/UpdateManager.py:106
+#: ../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."
@@ -1734,34 +1712,33 @@
 "Fyddi di ddim yn derbyn diweddariadau hanfodol na rhai diogelwch. Uwchraddia "
 "i fersiwn mwy newydd o Ubuntu Linux."
 
-#: ../UpdateManager/UpdateManager.py:114
+#: ../UpdateManager/UpdateManager.py:827
 msgid "Upgrade information"
 msgstr "Gwybodaeth diweddaru"
 
-#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:308
 #, python-format
 msgid "Version %s: \n"
 msgstr "Fersiwn %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:446
+#: ../UpdateManager/UpdateManager.py:445
 msgid ""
 "No network connection detected, you can not download changelog information."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:454
+#: ../UpdateManager/UpdateManager.py:365
 msgid "Downloading list of changes..."
 msgstr "Lawrlwytho rhestr o newidiadau..."
 
-#: ../UpdateManager/UpdateManager.py:498
+#: ../UpdateManager/UpdateManager.py:497
 msgid "_Deselect All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:504
+#: ../UpdateManager/UpdateManager.py:503
 msgid "Select _All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:564
+#: ../UpdateManager/UpdateManager.py:563
 #, python-format
 msgid "%(count)s update has been selected."
 msgid_plural "%(count)s updates have been selected."
@@ -1770,44 +1747,39 @@
 msgstr[2] "%(count)s diweddariad wedi eu dewis."
 msgstr[3] "%(count)s diweddariad wedi eu dewis."
 
-#: ../UpdateManager/UpdateManager.py:568
+#: ../UpdateManager/UpdateManager.py:567
 #, python-format
 msgid "%s will be downloaded."
 msgstr "Bydd %s yn cael ei lawrlwytho."
 
-#: ../UpdateManager/UpdateManager.py:580
-msgid "The update has already been downloaded, but not installed"
-msgid_plural "The updates have already been downloaded, but not installed"
-msgstr[0] "Mae'r diweddariad wedi cael ei lawrlwytho, ond heb gael ei osod."
+#: ../UpdateManager/UpdateManager.py:579
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
+msgstr[0] ""
 msgstr[1] ""
-"Mae'r diweddariadau wedi cael eu lawrlwytho, ond heb gael eu gosod."
-msgstr[2] ""
-"Mae'r diweddariadau wedi cael eu lawrlwytho, ond heb gael eu gosod."
-msgstr[3] ""
-"Mae'r diweddariadau wedi cael eu lawrlwytho, ond heb gael eu gosod."
 
-#: ../UpdateManager/UpdateManager.py:585
-msgid "There are no updates to install"
-msgstr "Does dim diweddariadau i'w gosod"
+#: ../UpdateManager/UpdateManager.py:584
+msgid "There are no updates to install."
+msgstr ""
 
 #. TRANSLATORS: this allows to switch the order of the count of
 #. updates and the download size string (if needed)
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:590
 #, python-format
 msgid "%(count_str)s %(download_str)s"
 msgstr "%(count_str)s %(download_str)s"
 
-#: ../UpdateManager/UpdateManager.py:598
+#: ../UpdateManager/UpdateManager.py:597
 msgid "Unknown download size."
 msgstr "Maint lawrlwythiad anhysbys."
 
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:623
 msgid ""
 "It is unknown when the package information was updated last. Please click "
 "the 'Check' button to update the information."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:629
 #, python-format
 msgid ""
 "The package information was last updated %(days_ago)s days ago.\n"
@@ -1816,7 +1788,7 @@
 "Diweddarwyd gwybodaeth am y pecynnau %(days_ago)s dydd yn ôl.\n"
 "Clicia botwm 'Gwirio' isod i wirio am ddiweddariadau meddalwedd newydd."
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:634
 #, python-format
 msgid "The package information was last updated %(days_ago)s day ago."
 msgid_plural ""
@@ -1826,7 +1798,7 @@
 msgstr[2] "Diweddarwyd gwybodaeth am y pecynnau %(days_ago)s dydd yn ôl."
 msgstr[3] "Diweddarwyd gwybodaeth am y pecynnau %(days_ago)s dydd l.yn ô"
 
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:638
 #, python-format
 msgid "The package information was last updated %(hours_ago)s hour ago."
 msgid_plural ""
@@ -1837,18 +1809,17 @@
 msgstr[3] "Diweddarwyd gwybodaeth am y pecynnau %(hours_ago)s awr yn ôl."
 
 #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:643 ../UpdateManager/UpdateManager.py:645
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "The package information was last updated about %s minutes ago."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:649
 msgid "The package information was just updated."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:670
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
+#: ../UpdateManager/UpdateManager.py:505 ../data/glade/UpdateManager.ui.h:23
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities and "
 "provide new features."
@@ -1856,40 +1827,40 @@
 "Mae diweddariadau meddalwedd yn trwsio gwallau, cael gwared ar fylchau "
 "diogelwch, ac yn cynnig nodweddion newydd."
 
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:688
 msgid "Software updates may be available for your computer."
 msgstr ""
 "Efallai bod diweddariadau meddalwedd ar gael ar gyfer dy gyfrifiadur."
 
-#: ../UpdateManager/UpdateManager.py:697
+#: ../UpdateManager/UpdateManager.py:524
 msgid "Welcome to Ubuntu"
 msgstr "Croeso i Ubuntu"
 
-#: ../UpdateManager/UpdateManager.py:699
+#: ../UpdateManager/UpdateManager.py:698
 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."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../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:704
+#: ../UpdateManager/UpdateManager.py:528
 msgid "Software updates are available for this computer"
 msgstr "Mae diweddariadau meddalwedd ar gael ar gyfer y cyfrifiadur hwn."
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:705
 msgid ""
 "If you don't want to install them now, choose \"Update Manager\" from "
 "Applications later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:708
+#: ../UpdateManager/UpdateManager.py:529
 msgid ""
 "If you don't want to install them now, choose \"Update Manager\" from the "
 "Administration menu later."
@@ -1897,7 +1868,7 @@
 "Os nad wyt ti eisiau eu gosod nawr, defnyddia \"Rheolwr Diweddariadau\" o'r "
 "ddewislen Gweinyddiaeth yn nes ymlaen."
 
-#: ../UpdateManager/UpdateManager.py:760
+#: ../UpdateManager/UpdateManager.py:578
 #, python-format
 msgid ""
 "The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1908,7 +1879,7 @@
 "Bydd angen rhyddhau %s o le ar ddisg '%s'. Gwagia'r sbwriel, a thynnu "
 "pecynnau dros dro fersiynau blaenorol drwy ddefnyddio 'sudo apt-get clean'."
 
-#: ../UpdateManager/UpdateManager.py:785
+#: ../data/glade/UpdateManager.ui.h:24
 msgid ""
 "The computer needs to restart to finish installing updates. Please save your "
 "work before continuing."
@@ -1916,23 +1887,24 @@
 "Mae angen ailgychwyn y cyfrifiadur i orffen gosod diweddariadau. Cofia gadw "
 "dy waith cyn parhau."
 
-#: ../UpdateManager/UpdateManager.py:849
+#: ../UpdateManager/UpdateManager.py:637
+#: ../UpdateManagerHildon/UpdateManagerHildon.py:114
 msgid "Reading package information"
 msgstr "Darllen gwybodaeth pecynnau"
 
-#: ../UpdateManager/UpdateManager.py:864
+#: ../UpdateManager/UpdateManager.py:863
 msgid "Connecting..."
 msgstr "Cysylltu ..."
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:880
 msgid "You may not be able to check for updates or download new updates."
 msgstr "Efallai na fydd modd i ti wirio am ddiweddariadau na'u lawrlwytho."
 
-#: ../UpdateManager/UpdateManager.py:1005
+#: ../UpdateManager/UpdateManager.py:750
 msgid "Could not initialize the package information"
 msgstr "Methu cychwyn y gwybodaeth pecynnau"
 
-#: ../UpdateManager/UpdateManager.py:1006
+#: ../UpdateManager/UpdateManager.py:751
 msgid ""
 "An unresolvable problem occurred while initializing the package "
 "information.\n"
@@ -1946,7 +1918,7 @@
 "Adrodda hwn fel chwilen yn erbyn pecyn 'update-manager' a chynnwys y neges "
 "gwall canlynol:\n"
 
-#: ../UpdateManager/UpdateManager.py:1035
+#: ../UpdateManager/UpdateManager.py:773
 msgid ""
 "An unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -1958,31 +1930,31 @@
 "Adrodda hwn fel chwilen yn erbyn pecyn 'update-manager' a chynnwys y neges "
 "gwall canlynol:"
 
-#: ../UpdateManager/UpdateManager.py:1060
+#: ../UpdateManager/UpdateManager.py:796
 msgid " (New install)"
 msgstr " (Gosod o'r newydd)"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:800
 #, python-format
 msgid "(Size: %s)"
 msgstr "(Maint: %s)"
 
-#: ../UpdateManager/UpdateManager.py:1069
+#: ../UpdateManager/UpdateManager.py:802
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "O fersiwn %(old_version)s i %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:1073
+#: ../UpdateManager/UpdateManager.py:806
 #, python-format
 msgid "Version %s"
 msgstr "Fersiwn %s"
 
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:108
+#: ../UpdateManager/UpdateManager.py:1103 ../do-release-upgrade:107
 msgid "Release upgrade not possible right now"
 msgstr "Uwchraddiad fersiwn ddim yn bosib ar hyn o bryd"
 
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:109
+#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:108
 #, c-format, python-format
 msgid ""
 "The release upgrade can not be performed currently, please try again later. "
@@ -1991,21 +1963,22 @@
 "Nid yw'n bosib uwchraddio'r fersiwn ar hyn o bryd, tria eto yn nes ymlaen. "
 "Adroddodd y gweinydd: '%s'"
 
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:116
+#. print "on_button_dist_upgrade_clicked"
+#: ../UpdateManager/UpdateManager.py:847 ../check-new-release-gtk:87
 msgid "Downloading the release upgrade tool"
 msgstr "Lawrlwytho'r teclyn uwchraddio fersiwn"
 
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:854
 #, python-format
 msgid "<b>New Ubuntu release '%s' is available</b>"
 msgstr "<b>Mae fersiwn newydd '%s' o Ubuntu ar gael</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:893
 msgid "Software index is broken"
 msgstr "Mynegai meddalwedd wedi torri"
 
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:894
 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 "
@@ -2023,11 +1996,11 @@
 msgid "Install All Available Updates"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:31
+#: ../UpdateManagerText/UpdateManagerText.py:26
 msgid "Cancel"
 msgstr "Canslo"
 
-#: ../UpdateManagerText/UpdateManagerText.py:32
+#: ../UpdateManagerText/UpdateManagerText.py:27
 msgid "Install"
 msgstr "Gosod"
 
@@ -2039,11 +2012,11 @@
 msgid "Updates"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:50
+#: ../UpdateManagerText/UpdateManagerText.py:45
 msgid "Building Updates List"
 msgstr "Creu Rhestr Diweddariadau"
 
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:48
 msgid ""
 "\n"
 "A normal upgrade can not be calculated, please run: \n"
@@ -2067,11 +2040,11 @@
 " * Pecynnau meddalwedd answyddogol sydd ddim yn cael eu darparu gan Ubuntu\n"
 " * Newidiadau normal o fersiwn cyn rhyddhau o Ubuntu"
 
-#: ../UpdateManagerText/UpdateManagerText.py:122
+#: ../UpdateManagerText/UpdateManagerText.py:117
 msgid "Downloading changelog"
 msgstr "Lawrlwytho log newid"
 
-#: ../UpdateManager/Core/MyCache.py:130
+#: ../UpdateManager/Core/MyCache.py:124
 #, python-format
 msgid "Other updates (%s)"
 msgstr "Diweddariadau eraill (%s)"
@@ -2089,7 +2062,7 @@
 msgid "This update does not come from a source that supports changelogs."
 msgstr ""
 
-#: ../UpdateManager/Core/MyCache.py:305 ../UpdateManager/Core/MyCache.py:326
+#: ../UpdateManager/Core/MyCache.py:297
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -2097,7 +2070,7 @@
 "Methwyd lawrlwytho rhestr newidiadau. \n"
 "Gwiria dy gysylltiad rhyngrwyd."
 
-#: ../UpdateManager/Core/MyCache.py:315
+#: ../UpdateManager/Core/MyCache.py:286
 #, python-format
 msgid ""
 "The changelog does not contain any relevant changes.\n"
@@ -2110,7 +2083,7 @@
 "Defnyddia http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "tan fod y newidiadau ar gael neu tria eto yn nes ymlaen."
 
-#: ../UpdateManager/Core/MyCache.py:320
+#: ../UpdateManager/Core/MyCache.py:291
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -2123,52 +2096,52 @@
 "Defnyddia http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "tan ei fod ar gael neu tria eto yn nes ymlaen."
 
-#: ../UpdateManager/Core/UpdateList.py:49
+#: ../UpdateManager/Core/UpdateList.py:50
 msgid "Failed to detect distribution"
 msgstr "Methwyd canfod fersiwn"
 
-#: ../UpdateManager/Core/UpdateList.py:50
+#: ../UpdateManager/Core/UpdateList.py:51
 #, python-format
 msgid "A error '%s' occurred while checking what system you are using."
 msgstr "Digwyddodd gwall '%s' wrth wirio pa system rwyt ti'n defnyddio."
 
-#: ../UpdateManager/Core/UpdateList.py:61
+#: ../UpdateManager/Core/UpdateList.py:62
 msgid "Important security updates"
 msgstr "Diweddariadau diogelwch pwysig"
 
-#: ../UpdateManager/Core/UpdateList.py:62
+#: ../UpdateManager/Core/UpdateList.py:63
 msgid "Recommended updates"
 msgstr "Diweddariadau sy'n cael eu hargymell"
 
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:64
 msgid "Proposed updates"
 msgstr "Diweddariadau a gynigir"
 
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:65
 msgid "Backports"
 msgstr "Ol ddiweddariadau"
 
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:66
 msgid "Distribution updates"
 msgstr "Diweddariadau fersiwn"
 
-#: ../UpdateManager/Core/UpdateList.py:70
+#: ../UpdateManager/Core/UpdateList.py:71
 msgid "Other updates"
 msgstr "Diweddariadau eraill"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:1
+#: ../data/glade/UpdateManager.ui.h:6
 msgid "<big><b>Starting Update Manager</b></big>"
 msgstr "<big><b>Cychwyn Rheolwr Diweddariadau</b></big>"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:3
+#: ../data/glade/UpdateManager.ui.h:30
 msgid "_Partial Upgrade"
 msgstr "_Uwchraddiad Rhannol"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:4
+#: ../data/glade/UpdateManager.ui.h:4
 msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr "<big><b>Does dim modd gosod pob diweddariad</b></big>"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:5
+#: ../data/glade/UpdateManager.ui.h:14
 msgid ""
 "Run a partial upgrade, to install as many updates as possible. \n"
 "\n"
@@ -2186,11 +2159,11 @@
 " * Pecynnau meddalwedd answyddogol sydd ddim yn cael eu darparu gan Ubuntu\n"
 " * Newidiadau normal o fersiwn cyn rhyddhau o Ubuntu"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:12
+#: ../data/glade/UpdateManager.ui.h:8
 msgid "Chec_k"
 msgstr "Gwirio"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:13
+#: ../data/glade/UpdateManager.ui.h:1
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
@@ -2203,34 +2176,34 @@
 "cyflunio'r weithred hon yn <i>Cronfeydd Meddalwedd</i> yn y tab "
 "<i>Diweddariadau</i>."
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:16
+#: ../data/glade/UpdateManager.ui.h:28
 msgid "_Hide this information in the future"
 msgstr "_Cuddio'r wybodaeth yma yn y dyfodol"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:17
+#: ../data/glade/UpdateManager.ui.h:9
 msgid "Co_ntinue"
 msgstr "Parhau"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:18
+#: ../data/glade/UpdateManager.ui.h:5
 msgid "<big><b>Running on battery</b></big>"
 msgstr "<big><b>Yn rhedeg ar fatri</b></big>"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:19
+#: ../data/glade/UpdateManager.ui.h:27
 msgid "Your system is running on battery. Are you sure you want to continue?"
 msgstr ""
 "Mae dy system yn rhedeg ar fatri. Wyt ti'n siwr dy fod eisiau parhau?"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:21
+#: ../data/glade/UpdateManager.ui.h:32
 msgid "_Upgrade"
 msgstr "_Uwchraddio"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:22
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:8
+#: ../data/glade/UpdateManager.ui.h:22
+#: ../data/glade/UpgradePromptDialog.ui.h:5
 msgid "Show progress of individual files"
 msgstr "Dangos cynnydd ffeiliau unigol"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:23
-#: ../data/update-manager.desktop.in.h:1
+#: ../data/glade/UpdateManager.ui.h:26 ../data/update-manager.desktop.in.h:3
+#: ../data/update-manager-hildon.desktop.in.h:3
 msgid "Update Manager"
 msgstr "Rheolwr Diweddariadau"
 
@@ -2238,11 +2211,11 @@
 msgid "Starting Update Manager"
 msgstr "Cychwyn Rheolwr Diweddariadau"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:25
+#: ../data/glade/UpdateManager.ui.h:25
 msgid "U_pgrade"
 msgstr "Uwchraddio"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
+#: ../data/glade/UpdateManager.ui.h:33
 msgid "updates"
 msgstr "diweddariadau"
 
@@ -2260,19 +2233,19 @@
 msgid "It’s safer to connect the computer to AC power before updating."
 msgstr "Mae'n fwy diogel cysylltu'r cyfrifiadur i bwer AC cyn diweddaru."
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:31
+#: ../data/glade/UpdateManager.ui.h:29
 msgid "_Install Updates"
 msgstr "_Gosod diweddariadau"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:32
+#: ../data/glade/UpdateManager.ui.h:7
 msgid "Changes"
 msgstr "Newidiadau"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:33
+#: ../data/glade/UpdateManager.ui.h:10
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:34
+#: ../data/glade/UpdateManager.ui.h:11
 msgid "Description of update"
 msgstr "Disgrifiad o'r diweddariad"
 
@@ -2280,29 +2253,29 @@
 msgid "_Settings..."
 msgstr ""
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
+#: ../data/glade/UpgradePromptDialog.ui.h:1
 msgid ""
 "<b>A new version of Ubuntu is available. Would you like to upgrade?</b>"
 msgstr ""
 "<b>Mae fersiwn newydd o Ubuntu ar gael. Wyt ti eisiau uwchraddio?</b>"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:3
+#: ../data/glade/UpgradePromptDialog.ui.h:3
 msgid "Don't Upgrade"
 msgstr "Peidio Uwchraddio"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:4
+#: ../data/glade/UpgradePromptDialog.ui.h:2
 msgid "Ask Me Later"
 msgstr "Gofyn Wedyn"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:5
+#: ../data/glade/UpgradePromptDialog.ui.h:6
 msgid "Yes, Upgrade Now"
 msgstr "Ydw, Uwchraddio Nawr"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:6
+#: ../data/glade/UpgradePromptDialog.ui.h:8
 msgid "You have declined to upgrade to the new Ubuntu"
 msgstr "Rwyt ti wedi penderfynu peidio uwchraddio i'r Ubuntu newydd"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
+#: ../data/glade/UpgradePromptDialog.ui.h:7
 msgid ""
 "You can upgrade at a later time by opening Update Manager and click on "
 "\"Upgrade\"."
@@ -2311,40 +2284,42 @@
 "\"Uwchraddio\"."
 
 #: ../data/update-manager.desktop.in.h:2
+#: ../data/update-manager-hildon.desktop.in.h:2
 msgid "Software Updates"
 msgstr "Diweddariadau Meddalwedd"
 
-#: ../data/update-manager.desktop.in.h:3
+#: ../data/update-manager.desktop.in.h:1
+#: ../data/update-manager-hildon.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr "Dangos a gosod diweddariadau sydd ar gael"
 
-#: ../update-manager:61 ../update-manager-text:49 ../do-release-upgrade:47
+#: ../update-manager:53 ../do-release-upgrade:33
 msgid "Show version and exit"
 msgstr "Dangos fersiwn a gadael"
 
-#: ../update-manager:64
+#: ../update-manager:56
 msgid "Directory that contains the data files"
 msgstr "Cyfeiriadur sy'n cynnwys y ffeiliau data"
 
-#: ../update-manager:67
+#: ../update-manager:59
 msgid "Check if a new Ubuntu release is available"
 msgstr "Gwirio i weld os oes fersiwn newydd o Ubuntu ar gael"
 
-#: ../update-manager:70 ../do-release-upgrade:50 ../check-new-release-gtk:180
+#: ../update-manager:62 ../do-release-upgrade:36 ../check-new-release-gtk:138
 msgid "Check if upgrading to the latest devel release is possible"
 msgstr ""
 "Gwirio i weld os yw'n bosib uwchraddio i'r fersiwn datblygol diweddaraf"
 
-#: ../update-manager:74
+#: ../update-manager:66
 msgid "Upgrade using the latest proposed version of the release upgrader"
 msgstr ""
 "Uwchraddio drwy ddefnyddio'r fersiwn diweddaraf o'r uwchraddiwr fersiwn"
 
-#: ../update-manager:81
+#: ../update-manager:73
 msgid "Do not focus on map when starting"
 msgstr "Peidio canolbwyntio ar map wrth gychwyn"
 
-#: ../update-manager:84
+#: ../update-manager:76
 msgid "Try to run a dist-upgrade"
 msgstr "Ceisio rhedeg dist-upgrade"
 
@@ -2352,24 +2327,24 @@
 msgid "Do not check for updates when starting"
 msgstr ""
 
-#: ../update-manager:91 ../do-release-upgrade:66
+#: ../update-manager:80 ../do-release-upgrade:52
 msgid "Test upgrade with a sandbox aufs overlay"
 msgstr "Profi uwchraddiad gyda throshaeniad blwch tywod aufs"
 
-#: ../update-manager:111
+#: ../update-manager:100
 msgid "Running partial upgrade"
 msgstr "Yn rhedeg uwchraddiad rhannol"
 
-#: ../update-manager-text:53
+#: ../update-manager-text:54
 msgid "Show description of the package instead of the changelog"
 msgstr ""
 
-#: ../do-release-upgrade:54 ../check-new-release-gtk:184
+#: ../do-release-upgrade:40 ../check-new-release-gtk:142
 msgid ""
 "Try upgrading to the latest release using the upgrader from $distro-proposed"
 msgstr "Ceisio uwchraddio i'r fersiwn diweddaraf o $distro-proposed"
 
-#: ../do-release-upgrade:58
+#: ../do-release-upgrade:44
 msgid ""
 "Run in a special upgrade mode.\n"
 "Currently 'desktop' for regular upgrades of a desktop system and 'server' "
@@ -2379,11 +2354,11 @@
 "Ar hyn o bryd mae 'desktop' ar gyfer uwchraddio system penbwrdd arferol a "
 "'server' ar gyfer systemau gweinydd yn cael eu cefnogi."
 
-#: ../do-release-upgrade:64
+#: ../do-release-upgrade:50
 msgid "Run the specified frontend"
 msgstr ""
 
-#: ../do-release-upgrade:69
+#: ../do-release-upgrade:55
 msgid ""
 "Check only if a new distribution release is available and report the result "
 "via the exit code"
@@ -2391,11 +2366,11 @@
 "Gwirio dim ond os oes fersiwn newydd ar gael ac adrodd y canlyniad drwy'r "
 "cod gadael"
 
-#: ../do-release-upgrade:83
-msgid "Checking for a new ubuntu release"
-msgstr "Yn gwirio am fersiwn newydd o Ubuntu"
+#: ../do-release-upgrade:82
+msgid "Checking for a new Ubuntu release"
+msgstr ""
 
-#: ../do-release-upgrade:97
+#: ../do-release-upgrade:96
 msgid ""
 "For upgrade information, please visit:\n"
 "%(url)s\n"
@@ -2403,87 +2378,87 @@
 "Am wybodaeth am uwchraddio, cer i:\n"
 "%(url)s\n"
 
-#: ../do-release-upgrade:103
+#: ../do-release-upgrade:79
 msgid "No new release found"
 msgstr "Dim fersiwn newydd wedi ei ganfod"
 
-#: ../do-release-upgrade:115
+#: ../do-release-upgrade:84
 #, c-format
 msgid "New release '%s' available."
 msgstr "Fersiwn newydd '%s' ar gael."
 
-#: ../do-release-upgrade:116
+#: ../do-release-upgrade:85
 msgid "Run 'do-release-upgrade' to upgrade to it."
 msgstr "Rheda 'do-release-upgrade' i uwchraddio i hwn."
 
-#: ../check-new-release-gtk:91
+#: ../check-new-release-gtk:67
 msgid "Ubuntu %(version)s Upgrade Available"
 msgstr "Uwchraddiad i Ubuntu %(version)s Ar Gael"
 
-#: ../check-new-release-gtk:132
+#: ../check-new-release-gtk:103
 #, c-format
 msgid "You have declined the upgrade to Ubuntu %s"
 msgstr "Rwyt ti wedi penderfynu peidio uwchraddio i Ubuntu %s"
 
-#: ../check-new-release-gtk:190
+#: ../check-new-release-gtk:192
 msgid "Add debug output"
 msgstr ""
 
-#: ../ubuntu-support-status:81
+#: ../ubuntu-support-status:79
 msgid "Show unsupported packages on this machine"
 msgstr ""
 
-#: ../ubuntu-support-status:84
+#: ../ubuntu-support-status:82
 msgid "Show supported packages on this machine"
 msgstr ""
 
-#: ../ubuntu-support-status:87
+#: ../ubuntu-support-status:85
 msgid "Show all packages with their status"
 msgstr ""
 
-#: ../ubuntu-support-status:90
+#: ../ubuntu-support-status:88
 msgid "Show all packages in a list"
 msgstr ""
 
-#: ../ubuntu-support-status:132
+#: ../ubuntu-support-status:130
 #, c-format
 msgid "Support status summary of '%s':"
 msgstr ""
 
-#: ../ubuntu-support-status:135
+#: ../ubuntu-support-status:133
 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
 msgstr ""
 
-#: ../ubuntu-support-status:141
+#: ../ubuntu-support-status:139
 msgid ""
 "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
 "downloaded"
 msgstr ""
 
-#: ../ubuntu-support-status:144
+#: ../ubuntu-support-status:142
 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
 msgstr ""
 
-#: ../ubuntu-support-status:152
+#: ../ubuntu-support-status:150
 msgid ""
 "Run with --show-unsupported, --show-supported or --show-all to see more "
 "details"
 msgstr ""
 
-#: ../ubuntu-support-status:156
+#: ../ubuntu-support-status:154
 msgid "No longer downloadable:"
 msgstr ""
 
-#: ../ubuntu-support-status:159
+#: ../ubuntu-support-status:157
 msgid "Unsupported: "
 msgstr ""
 
-#: ../ubuntu-support-status:164
+#: ../ubuntu-support-status:162
 #, c-format
 msgid "Supported until %s:"
 msgstr ""
 
-#: ../ubuntu-support-status:173
+#: ../ubuntu-support-status:171
 msgid "Unsupported"
 msgstr ""
 
diff -Nru language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/zeitgeist-datahub.po language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/zeitgeist-datahub.po
--- language-pack-cy-base-12.04+20111229/data/cy/LC_MESSAGES/zeitgeist-datahub.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/data/cy/LC_MESSAGES/zeitgeist-datahub.po	2012-02-23 07:17:30.000000000 +0000
@@ -0,0 +1,26 @@
+# Welsh translation for zeitgeist-datahub
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the zeitgeist-datahub package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zeitgeist-datahub\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 12:00+0000\n"
+"PO-Revision-Date: 2012-01-10 18:49+0000\n"
+"Last-Translator: David Jones <Unknown>\n"
+"Language-Team: Welsh <cy@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#: ../src/zeitgeist-datahub.desktop.in.h:1
+msgid "Zeitgeist Datahub"
+msgstr "Zeitgeist Datahub"
+
+#: ../src/zeitgeist-datahub.desktop.in.h:2
+msgid "Start the Zeitgeist Datahub for passive loggers"
+msgstr ""
Binary files /tmp/Tup0synvZm/language-pack-cy-base-12.04+20111229/data/extra.tar and /tmp/JjFO5TzUoU/language-pack-cy-base-12.04+20120221/data/extra.tar differ
diff -Nru language-pack-cy-base-12.04+20111229/debian/changelog language-pack-cy-base-12.04+20120221/debian/changelog
--- language-pack-cy-base-12.04+20111229/debian/changelog	2012-01-02 18:13:59.000000000 +0000
+++ language-pack-cy-base-12.04+20120221/debian/changelog	2012-02-23 07:17:15.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-cy-base (1:12.04+20111229) precise; urgency=low
+language-pack-cy-base (1:12.04+20120221) precise; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Mon, 02 Jan 2012 18:13:59 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Thu, 23 Feb 2012 07:17:14 +0000