diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/apparmorapplet.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/apparmorapplet.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/apparmorapplet.po 2012-05-08 22:53:37.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/apparmorapplet.po 2012-08-03 13:45:41.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: 2012-05-08 05:56+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 15:34+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/app-install-data.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/app-install-data.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/app-install-data.po 2012-05-08 22:53:37.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/app-install-data.po 2012-08-03 13:45:41.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 06:02+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 15:39+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ../menu-data-additional/7zip.desktop.in.h:1 msgid "7zip" @@ -1033,6 +1033,7 @@ #: ../menu-data/arora:arora.desktop.in.h:2 #: ../menu-data/dooble:dooble.desktop.in.h:2 #: ../menu-data/firefox:firefox.desktop.in.h:2 +#: ../menu-data/hv3:hv3.desktop.in.h:2 #: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:2 msgid "Browse the World Wide Web" msgstr "" @@ -1160,11 +1161,11 @@ msgid "Rip audio tracks from your audio CDs" msgstr "" -#: ../menu-data/auto-multiple-choice:auto-multiple-choice.desktop.in.h:1 +#: ../menu-data/auto-multiple-choice-common:auto-multiple-choice.desktop.in.h:1 msgid "Auto Multiple Choice" msgstr "" -#: ../menu-data/auto-multiple-choice:auto-multiple-choice.desktop.in.h:2 +#: ../menu-data/auto-multiple-choice-common:auto-multiple-choice.desktop.in.h:2 msgid "" "Manage multiple choice questionnaires, with automatic marking from papers' " "scans" @@ -2267,6 +2268,7 @@ #: ../menu-data/cbrpager:cbrpager.desktop.in.h:2 #: ../menu-data/comix:comix.desktop.in.h:2 +#: ../menu-data/mcomix:mcomix.desktop.in.h:2 msgid "A viewer for comic book archives" msgstr "" @@ -3303,7 +3305,6 @@ #: ../menu-data/dolphin:kde4__dolphin.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 "" @@ -3542,11 +3543,11 @@ msgid "A graphical GNUstep diff utility" msgstr "" -#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:1 +#: ../menu-data/easymp3gain-gtk:easymp3gain-gnome.desktop.in.h:1 msgid "easyMP3Gain" msgstr "" -#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:2 +#: ../menu-data/easymp3gain-gtk:easymp3gain-gnome.desktop.in.h:2 msgid "A GUI for mp3gain, vorbisgain and aacgain" msgstr "" @@ -3733,6 +3734,8 @@ msgstr "" #: ../menu-data/emacs23:emacs23.desktop.in.h:2 +#: ../menu-data/emacs24-lucid:emacs24-lucid.desktop.in.h:2 +#: ../menu-data/emacs24:emacs24.desktop.in.h:2 msgid "View and edit files" msgstr "" @@ -4044,7 +4047,8 @@ #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:2 #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2 -#: ../menu-data/roxterm:roxterm.desktop.in.h:2 +#: ../menu-data/roxterm-gtk2:roxterm.desktop.in.h:2 +#: ../menu-data/roxterm-gtk3:roxterm.desktop.in.h:2 #: ../menu-data/sakura:sakura.desktop.in.h:2 msgid "Use the command line" msgstr "" @@ -4143,10 +4147,14 @@ msgid "Play Nintendo ROM files" msgstr "" +#: ../menu-data/fcitx-config-gtk2:fcitx-config-gtk2.desktop.in.h:1 +#: ../menu-data/fcitx-config-gtk:fcitx-config-gtk3.desktop.in.h:1 #: ../menu-data/fcitx-data:fcitx-configtool.desktop.in.h:1 msgid "Fcitx Config Tool" msgstr "" +#: ../menu-data/fcitx-config-gtk2:fcitx-config-gtk2.desktop.in.h:2 +#: ../menu-data/fcitx-config-gtk:fcitx-config-gtk3.desktop.in.h:2 #: ../menu-data/fcitx-data:fcitx-configtool.desktop.in.h:2 msgid "Fcitx GUI Config Tool" msgstr "" @@ -4672,6 +4680,7 @@ #: ../menu-data/freedm:freedm.desktop.in.h:2 #: ../menu-data/freedoom:freedoom.desktop.in.h:2 +#: ../menu-data/vavoom:vavoom.desktop.in.h:2 msgid "First Person Shooter Game" msgstr "" @@ -4794,11 +4803,11 @@ msgid "Realtime audio processor based on frequency spectral manipulation" msgstr "" -#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:1 +#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:2 msgid "LilyPond Music Editor" msgstr "" -#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:2 +#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:1 msgid "Frescobaldi" msgstr "" @@ -4815,7 +4824,6 @@ msgstr "" #: ../menu-data/fritzing:fritzing.desktop.in.h:2 -#: ../menu-data/kicad:kicad.desktop.in.h:2 msgid "PCB-Suite" msgstr "" @@ -5479,7 +5487,6 @@ #: ../menu-data/gedit:gedit.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 "" @@ -5823,7 +5830,7 @@ msgid "gLabels Label Designer" msgstr "" -#: ../menu-data/glabels:glabels.desktop.in.h:2 +#: ../menu-data/glabels:glabels-3.0.desktop.in.h:2 msgid "Create labels, business cards and media covers" msgstr "" @@ -6297,7 +6304,7 @@ msgid "Disk Utility" msgstr "" -#: ../menu-data/gnome-disk-utility:palimpsest.desktop.in.h:2 +#: ../menu-data/gnome-disk-utility:gnome-disks.desktop.in.h:2 msgid "Manage Drives and Media" msgstr "" @@ -6376,7 +6383,7 @@ msgid "Keyring Access" msgstr "" -#: ../menu-data/gnome-keyring:gnome-keyring-prompt.desktop.in.h:2 +#: ../menu-data/gcr:gcr-prompter.desktop.in.h:2 msgid "Unlock access to passwords and other secrets" msgstr "" @@ -6651,7 +6658,6 @@ 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 "Mines" msgstr "" @@ -6782,11 +6788,11 @@ msgid "Calculation, Analysis, and Visualization of Information" msgstr "" -#: ../menu-data/gnunet-gtk:gnunet-gtk.desktop.in.h:1 +#: ../menu-data/gnunet-gtk:gnunet-fs-gtk.desktop.in.h:1 msgid "GNUnet Secured P2P" msgstr "" -#: ../menu-data/gnunet-gtk:gnunet-gtk.desktop.in.h:2 +#: ../menu-data/gnunet-gtk:gnunet-fs-gtk.desktop.in.h:2 msgid "Share files using GNU's anonymous and censorship-resistant network" msgstr "" @@ -6826,11 +6832,12 @@ msgid "GoatTracker" msgstr "" -#: ../menu-data/gobby:gobby.desktop.in.h:1 +#: ../menu-data/gobby-0.4:gobby.desktop.in.h:1 msgid "Gobby Collaborative Editor (0.4)" msgstr "" -#: ../menu-data/gobby:gobby.desktop.in.h:2 +#: ../menu-data/gobby-0.4:gobby.desktop.in.h:2 +#: ../menu-data/gobby-0.5:gobby-0.5.desktop.in.h:2 msgid "Edit text files collaboratively" msgstr "" @@ -7411,7 +7418,8 @@ msgid "Getting Things GNOME!" msgstr "" -#: ../menu-data/gtg:gtg.desktop.in.h:2 +#. Gnome and KDE 3 use Comment +#: ../menu-data/gtg:gtg.desktop.in.h:3 msgid "Personal organizer for the GNOME desktop environment" msgstr "" @@ -7748,7 +7756,7 @@ "A GTK+ utility to awake turned off machine using the Wake On LAN feature." msgstr "" -#: ../menu-data/gwaterfall:waterfall.desktop.in.h:1 +#: ../menu-data/gwaterfall:gwaterfall.desktop.in.h:1 msgid "Waterfall" msgstr "" @@ -8104,11 +8112,11 @@ msgid "Organd Soft Synth" msgstr "" -#: ../menu-data/hotot:hotot.desktop.in.h:1 +#: ../menu-data/hotot-gtk:hotot.desktop.in.h:1 msgid "Hotot Twitter Client" msgstr "" -#: ../menu-data/hotot:hotot.desktop.in.h:2 +#: ../menu-data/hotot-gtk:hotot.desktop.in.h:2 msgid "Lightweight Twitter Client base on Gtk2 and Webkit" msgstr "" @@ -8284,6 +8292,7 @@ msgid "Application to manage remote site configurations" msgstr "" +#: ../menu-data/fcitx-data:fcitx.desktop.in.h:2 #: ../menu-data/im-config:im-config.desktop.in.h:1 #: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1 msgid "Input Method" @@ -8731,12 +8740,10 @@ msgid "Manage system jobs present on your computer" msgstr "" -#: ../menu-data/jockey-gtk:jockey-gtk.desktop.in.h:1 #: ../menu-data/jockey-kde:jockey-kde.desktop.in.h:1 msgid "Additional Drivers" msgstr "" -#: ../menu-data/jockey-gtk:jockey-gtk.desktop.in.h:2 #: ../menu-data/jockey-kde:jockey-kde.desktop.in.h:2 msgid "Configure third-party and proprietary drivers" msgstr "" @@ -9243,7 +9250,7 @@ msgid "Touchpad management" msgstr "" -#: ../menu-data/kde-runtime-data:kde4__nepomukbackup.desktop.in.h:1 +#: ../menu-data/nepomuk-core-data:kde4__nepomukbackup.desktop.in.h:1 msgid "Nepomuk Backup" msgstr "" @@ -9303,7 +9310,6 @@ msgstr "" #: ../menu-data/kdepasswd:kde4__kdepasswd.desktop.in.h:1 -#: ../menu-data/lwat:chguserpw.desktop.in.h:1 msgid "Change Password" msgstr "" @@ -9455,11 +9461,11 @@ msgid "Send keys to multiple windows simultaneously" msgstr "" -#: ../menu-data/keymon:key-mon.desktop.in.h:1 +#: ../menu-data/key-mon:key-mon.desktop.in.h:1 msgid "KeyMon" msgstr "" -#: ../menu-data/keymon:key-mon.desktop.in.h:2 +#: ../menu-data/key-mon:key-mon.desktop.in.h:2 msgid "Keyboard and Mouse Monitor for screencasts" msgstr "" @@ -9606,7 +9612,7 @@ msgid "Convert Khmer between Unicode and legacy Khmer encodings." msgstr "" -#: ../menu-data/kicad:kicad.desktop.in.h:1 +#: ../menu-data/kicad-common:kicad.desktop.in.h:2 msgid "KiCad" msgstr "" @@ -9735,12 +9741,11 @@ msgid "Panorama" msgstr "" -#. X-DocPath=photolayoutseditor/index.html -#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:2 +#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:1 msgid "Photo Layouts Editor" msgstr "" -#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:3 +#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:2 msgid "Create beautiful and professional photo layouts from your photos" msgstr "" @@ -10585,11 +10590,11 @@ msgid "A virtual keyboard for KDE" msgstr "" -#: ../menu-data/kvpm:kvpm.desktop.in.h:1 +#: ../menu-data/kvpm:kde4__kvpm.desktop.in.h:1 msgid "KVPM" msgstr "" -#: ../menu-data/kvpm:kvpm.desktop.in.h:2 +#: ../menu-data/kvpm:kde4__kvpm.desktop.in.h:2 msgid "KDE Volume Partition Manager" msgstr "" @@ -10813,7 +10818,7 @@ msgid "Panzer General clone" msgstr "" -#: ../menu-data/libfm-gtk-data:libfm-pref-apps.desktop.in.h:1 +#: ../menu-data/libfm-gtk-bin:libfm-pref-apps.desktop.in.h:1 msgid "Preferred Applications" msgstr "" @@ -11427,11 +11432,11 @@ msgid "Play classic Mahjong puzzle game" msgstr "" -#: ../menu-data/mahjongg:mahjongg.desktop.in.h:1 +#: ../menu-data/gnome-mahjongg:gnome-mahjongg.desktop.in.h:1 msgid "Mahjongg" msgstr "" -#: ../menu-data/mahjongg:mahjongg.desktop.in.h:2 +#: ../menu-data/gnome-mahjongg:gnome-mahjongg.desktop.in.h:2 msgid "Disassemble a pile of tiles by removing matching pairs" msgstr "" @@ -12173,6 +12178,7 @@ msgid "Muon Software Center" msgstr "" +#: ../menu-data/muon-discover:kde4__muon-discover.desktop.in.h:2 #: ../menu-data/muon-installer:kde4__muon-installer.desktop.in.h:2 msgid "Software Center" msgstr "" @@ -12182,7 +12188,6 @@ msgstr "" #: ../menu-data/muon-updater:kde4__muon-updater.desktop.in.h:2 -#: ../menu-data/update-manager:update-manager.desktop.in.h:1 msgid "Update Manager" msgstr "" @@ -12584,11 +12589,12 @@ "Displays, modifies and exports in PostScript format phylogenetic trees" msgstr "" -#: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:1 +#: ../menu-data/nmapsi4:kde4__nmapsi4.desktop.in.h:1 msgid "NmapSI4 - User mode" msgstr "" -#: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:2 +#: ../menu-data/nmapsi4:kde4__nmapsi4-admin.desktop.in.h:2 +#: ../menu-data/nmapsi4:kde4__nmapsi4.desktop.in.h:2 msgid "Is a Qt4 interface for nmap scanner" msgstr "" @@ -12710,11 +12716,11 @@ msgid "The complete OCR suite." msgstr "" -#: ../menu-data/octave3.2:octave3.2.desktop.in.h:1 +#: ../menu-data/octave:www.octave.org-octave.desktop.in.h:1 msgid "GNU Octave" msgstr "" -#: ../menu-data/octave3.2:octave3.2.desktop.in.h:2 +#: ../menu-data/octave:www.octave.org-octave.desktop.in.h:2 msgid "Scientific Computing using GNU Octave" msgstr "" @@ -13089,7 +13095,7 @@ msgid "Pan Newsreader" msgstr "" -#: ../menu-data/pan:pan.desktop.in.h:2 ../menu-data/xpn:xpn.desktop.in.h:2 +#: ../menu-data/xpn:xpn.desktop.in.h:2 msgid "Read News from Usenet" msgstr "" @@ -14018,7 +14024,7 @@ msgid "PureData" msgstr "" -#: ../menu-data/puredata-core:puredata.desktop.in.h:2 +#: ../menu-data/puredata-gui:puredata.desktop.in.h:2 msgid "Visual dataflow programming platform for multimedia" msgstr "" @@ -15187,7 +15193,7 @@ msgid "Search and replace using regular expressions" msgstr "" -#: ../menu-data/regina-normal:kde4__regina.desktop.in.h:1 +#: ../menu-data/regina-normal:regina.desktop.in.h:1 msgid "Regina" msgstr "" @@ -15421,7 +15427,8 @@ "A high quality, fast scrolling first-person perspective 3D action game" msgstr "" -#: ../menu-data/roxterm:roxterm.desktop.in.h:1 +#: ../menu-data/roxterm-gtk2:roxterm.desktop.in.h:1 +#: ../menu-data/roxterm-gtk3:roxterm.desktop.in.h:1 msgid "ROXTerm" msgstr "" @@ -16582,6 +16589,7 @@ msgid "Squeak" msgstr "" +#: ../menu-data/scratch:scratch.desktop.in.h:2 #: ../menu-data/squeak-vm:squeak.desktop.in.h:2 msgid " Programming system and content development tool" msgstr "" @@ -16760,16 +16768,14 @@ msgstr "" #: ../menu-data/sugar-emulator-0.84:sugar-emulator.desktop.in.h:1 -#: ../menu-data/sugar-emulator-0.86:sugar-emulator.desktop.in.h:1 #: ../menu-data/sugar-emulator-0.88:sugar-emulator.desktop.in.h:1 -#: ../menu-data/sugar-emulator-0.90:sugar-emulator.desktop.in.h:1 +#: ../menu-data/sugar-emulator-0.96:sugar-emulator.desktop.in.h:1 msgid "Sugar" msgstr "" #: ../menu-data/sugar-emulator-0.84:sugar-emulator.desktop.in.h:2 -#: ../menu-data/sugar-emulator-0.86:sugar-emulator.desktop.in.h:2 #: ../menu-data/sugar-emulator-0.88:sugar-emulator.desktop.in.h:2 -#: ../menu-data/sugar-emulator-0.90:sugar-emulator.desktop.in.h:2 +#: ../menu-data/sugar-emulator-0.96:sugar-emulator.desktop.in.h:2 msgid "The emulator for the Sugar Desktop Environment" msgstr "" @@ -17278,6 +17284,7 @@ msgstr "" #: ../menu-data/texmaker:texmaker.desktop.in.h:1 +#: ../menu-data/texstudio:texstudio.desktop.in.h:1 msgid "LaTeX development environment" msgstr "" @@ -18654,7 +18661,6 @@ msgstr "" #: ../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 "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/apt.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/apt.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/apt.po 2012-05-08 22:53:24.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/apt.po 2012-08-03 13:45:28.000000000 +0000 @@ -7,7 +7,7 @@ "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: deity@lists.debian.org\n" "POT-Creation-Date: 2012-03-15 19:05+0000\n" -"PO-Revision-Date: 2012-04-20 13:28+0000\n" +"PO-Revision-Date: 2012-06-15 01:54+0000\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" "MIME-Version: 1.0\n" @@ -15,95 +15,93 @@ "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-05-08 01:55+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 10:33+0000\n" +"X-Generator: Launchpad (build 15719)\n" "Language: cy\n" -#: cmdline/apt-cache.cc:154 +#: cmdline/apt-cache.cc:141 #, 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:245 msgid "Total package names: " msgstr "" -#: cmdline/apt-cache.cc:284 +#: cmdline/apt-cache.cc:286 msgid "Total package structures: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr "" -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:326 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:328 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:330 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:332 +#: cmdline/apt-cache.cc:293 msgid "Total distinct descriptions: " msgstr "" -#: cmdline/apt-cache.cc:334 +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:337 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:300 msgid "Total Desc/File relations: " msgstr "" -#: cmdline/apt-cache.cc:341 +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:367 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:372 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:380 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221 #, 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:1453 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1218 +#: cmdline/apt-cache.cc:1221 msgid "You must give at least one search pattern" msgstr "" @@ -111,53 +109,56 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1448 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644 +#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021 +#: cmdline/apt-cache.cc:1425 cmdline/apt-cache.cc:1577 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:1478 +#: cmdline/apt-cache.cc:1530 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576 +#: cmdline/apt-cache.cc:1537 cmdline/apt-cache.cc:1624 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:1551 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1519 +#. Installed version +#: cmdline/apt-cache.cc:1584 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1520 +#. Candidate Version +#: cmdline/apt-cache.cc:1591 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1553 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1562 +#: cmdline/apt-cache.cc:1610 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:3243 cmdline/apt-internal-solver.cc:30 -#: cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1720 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:588 +#: cmdline/apt-get.cc:2723 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -216,11 +217,11 @@ msgid "Repeat this process for the rest of the CDs in your set." msgstr "" -#: cmdline/apt-config.cc:44 +#: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Nid yw ymresymiadau mewn parau" -#: cmdline/apt-config.cc:79 +#: cmdline/apt-config.cc:76 msgid "" "Usage: apt-config [options] command\n" "\n" @@ -260,35 +261,35 @@ msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" -#: cmdline/apt-extracttemplates.cc:309 +#: cmdline/apt-extracttemplates.cc:310 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:169 ftparchive/apt-ftparchive.cc:346 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:171 ftparchive/apt-ftparchive.cc:188 +#: ftparchive/apt-ftparchive.cc:211 ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:275 ftparchive/apt-ftparchive.cc:297 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:260 +#: ftparchive/apt-ftparchive.cc:259 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:376 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:406 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:595 +#: ftparchive/apt-ftparchive.cc:594 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -330,11 +331,11 @@ " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:801 +#: ftparchive/apt-ftparchive.cc:800 msgid "No selections matched" msgstr "Dim dewisiadau'n cyfateb" -#: ftparchive/apt-ftparchive.cc:879 +#: ftparchive/apt-ftparchive.cc:878 #, 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'" @@ -365,101 +366,101 @@ msgid "Failed to stat %s" msgstr "Methodd stat() o %s" -#: ftparchive/cachedb.cc:245 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Does dim cofnod rheoli gan yr archif" -#: ftparchive/cachedb.cc:482 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:73 #, 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:78 #, 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:134 msgid "E: " msgstr "G: " -#: ftparchive/writer.cc:141 +#: ftparchive/writer.cc:136 msgid "W: " msgstr "Rh: " -#: ftparchive/writer.cc:148 +#: ftparchive/writer.cc:143 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:161 ftparchive/writer.cc:193 #, c-format msgid "Failed to resolve %s" msgstr "Methwyd datrys %s" -#: ftparchive/writer.cc:179 +#: ftparchive/writer.cc:174 msgid "Tree walking failed" msgstr "Methwyd cerdded y goeden" -#: ftparchive/writer.cc:206 +#: ftparchive/writer.cc:201 #, c-format msgid "Failed to open %s" msgstr "Methwyd agor %s" # FIXME -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:260 #, c-format msgid " DeLink %s [%s]\n" msgstr " DatGysylltu %s [%s]\n" -#: ftparchive/writer.cc:273 +#: ftparchive/writer.cc:268 #, c-format msgid "Failed to readlink %s" msgstr "Methwyd darllen y cyswllt %s" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:272 #, c-format msgid "Failed to unlink %s" msgstr "Methwyd datgysylltu %s" -#: ftparchive/writer.cc:284 +#: ftparchive/writer.cc:279 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Methwyd cysylltu %s at %s" -#: ftparchive/writer.cc:294 +#: ftparchive/writer.cc:289 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:399 +#: ftparchive/writer.cc:392 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:400 ftparchive/writer.cc:687 #, 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:463 ftparchive/writer.cc:790 #, 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:697 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:723 +#: ftparchive/writer.cc:701 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:337 ftparchive/contents.cc:368 +#: ftparchive/contents.cc:362 ftparchive/contents.cc:393 msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" @@ -488,56 +489,56 @@ msgid "Failed to read the override file %s" msgstr "Methwydd darllen y ffeil dargyfeirio %s" -#: ftparchive/multicompress.cc:67 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:97 +#: ftparchive/multicompress.cc:103 #, 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:170 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: ftparchive/multicompress.cc:191 +#: ftparchive/multicompress.cc:196 msgid "Failed to create FILE*" msgstr "Methwyd creu FILE*" -#: ftparchive/multicompress.cc:194 +#: ftparchive/multicompress.cc:199 msgid "Failed to fork" msgstr "Methodd fork()" -#: ftparchive/multicompress.cc:208 +#: ftparchive/multicompress.cc:213 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:231 +#: ftparchive/multicompress.cc:236 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:401 +#: ftparchive/multicompress.cc:404 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:453 +#: ftparchive/multicompress.cc:456 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:470 +#: ftparchive/multicompress.cc:473 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:485 +#: ftparchive/multicompress.cc:488 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-get.cc:135 +#: cmdline/apt-get.cc:127 msgid "Y" msgstr "I" @@ -545,133 +546,133 @@ msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1756 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" -#: cmdline/apt-get.cc:257 +#: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: cmdline/apt-get.cc:347 +#: cmdline/apt-get.cc:334 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: cmdline/apt-get.cc:349 +#: cmdline/apt-get.cc:336 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:356 +#: cmdline/apt-get.cc:343 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: cmdline/apt-get.cc:358 +#: cmdline/apt-get.cc:345 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:348 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:348 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:353 msgid " or" msgstr " neu" -#: cmdline/apt-get.cc:395 +#: cmdline/apt-get.cc:382 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:408 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: cmdline/apt-get.cc:443 +#: cmdline/apt-get.cc:430 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:464 +#: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:505 +#: cmdline/apt-get.cc:492 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: cmdline/apt-get.cc:560 +#: cmdline/apt-get.cc:545 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: cmdline/apt-get.cc:568 +#: cmdline/apt-get.cc:553 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:599 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: cmdline/apt-get.cc:603 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: cmdline/apt-get.cc:605 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: cmdline/apt-get.cc:607 +#: cmdline/apt-get.cc:592 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: cmdline/apt-get.cc:611 +#: cmdline/apt-get.cc:596 #, c-format 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:628 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "" -#: cmdline/apt-get.cc:639 +#: cmdline/apt-get.cc:634 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:1126 #, 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:1138 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:671 msgid " [Not candidate version]" msgstr "" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:1143 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:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -679,178 +680,170 @@ "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:699 +#: cmdline/apt-get.cc:1167 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:706 #, c-format msgid "Package '%s' has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:717 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" -#: cmdline/apt-get.cc:766 +#: cmdline/apt-get.cc:748 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:796 +#: cmdline/apt-get.cc:1097 #, 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:800 +#: cmdline/apt-get.cc:782 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -#: cmdline/apt-get.cc:812 +#: cmdline/apt-get.cc:1190 #, 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:817 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:836 cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:59 +#: cmdline/apt-get.cc:1798 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:862 +#: cmdline/apt-get.cc:844 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "" -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:849 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:909 +#: cmdline/apt-get.cc:1115 #, 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:987 +#: cmdline/apt-get.cc:669 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:672 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:675 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:678 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:998 +#: cmdline/apt-get.cc:680 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:986 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:1005 +#: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:712 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:716 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:723 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:725 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:1052 cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:775 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:784 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:795 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:836 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:1158 +#: cmdline/apt-get.cc:841 #, 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:1163 +#: cmdline/apt-get.cc:844 #, 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:1170 +#: cmdline/apt-get.cc:849 #, 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:1175 +#: cmdline/apt-get.cc:852 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1190 cmdline/apt-get.cc:1193 cmdline/apt-get.cc:2519 -#: cmdline/apt-get.cc:2522 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2303 +#: cmdline/apt-get.cc:2306 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:1203 +#: cmdline/apt-get.cc:880 #, 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:1219 cmdline/apt-get.cc:1239 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 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:1221 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -858,28 +851,28 @@ " ?] " msgstr "" -#: cmdline/apt-get.cc:1229 cmdline/apt-get.cc:1248 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:1244 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:1316 cmdline/apt-get.cc:2584 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2359 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:1334 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1335 cmdline/apt-get.cc:2596 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2368 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:1341 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -887,19 +880,19 @@ "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1022 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:1350 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1363 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -909,35 +902,35 @@ msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1367 msgid "Note: This is done automatic and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1335 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1405 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1607 +#: cmdline/apt-get.cc:1421 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1669 +#: cmdline/apt-get.cc:1490 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1764 +#: cmdline/apt-get.cc:1547 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -953,15 +946,15 @@ #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1767 cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1550 cmdline/apt-get.cc:1841 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1554 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1778 +#: cmdline/apt-get.cc:1754 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -970,7 +963,7 @@ msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1782 +#: cmdline/apt-get.cc:1758 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -978,20 +971,20 @@ msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1542 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1803 +#: cmdline/apt-get.cc:1573 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1902 +#: cmdline/apt-get.cc:1878 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:1906 +#: cmdline/apt-get.cc:1814 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1000,7 +993,7 @@ "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1826 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" @@ -1012,28 +1005,28 @@ "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: cmdline/apt-get.cc:1942 +#: cmdline/apt-get.cc:1844 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:1873 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:1962 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:1963 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:2101 +#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1779 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:2108 cmdline/apt-mark.cc:61 +#: cmdline/apt-get.cc:2082 #, c-format msgid "%s set to automatically installed.\n" msgstr "" @@ -1044,41 +1037,41 @@ "instead." msgstr "" -#: cmdline/apt-get.cc:2132 +#: cmdline/apt-get.cc:1992 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1995 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2000 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2207 cmdline/apt-get.cc:2215 +#: cmdline/apt-get.cc:2067 cmdline/apt-get.cc:2075 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2239 cmdline/apt-get.cc:2272 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2099 cmdline/apt-get.cc:2132 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:2323 +#: cmdline/apt-get.cc:2294 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2381 +#: cmdline/apt-get.cc:2175 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:2421 cmdline/apt-get.cc:2733 +#: cmdline/apt-get.cc:2205 cmdline/apt-get.cc:2482 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2438 +#: cmdline/apt-get.cc:2221 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -1093,64 +1086,60 @@ "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2496 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2533 +#: cmdline/apt-get.cc:2316 #, 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:2542 +#: cmdline/apt-get.cc:2322 #, 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:2547 +#: cmdline/apt-get.cc:2325 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2553 +#: cmdline/apt-get.cc:2331 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2364 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2622 +#: cmdline/apt-get.cc:2393 #, 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:2634 +#: cmdline/apt-get.cc:2405 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2635 +#: cmdline/apt-get.cc:2406 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2657 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2677 +#: cmdline/apt-get.cc:2443 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2696 +#: cmdline/apt-get.cc:2459 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" @@ -1162,12 +1151,12 @@ "APT::Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2738 +#: cmdline/apt-get.cc:2487 #, 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:2758 +#: cmdline/apt-get.cc:2507 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" @@ -1179,7 +1168,7 @@ "packages" msgstr "" -#: cmdline/apt-get.cc:2909 +#: cmdline/apt-get.cc:2559 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1188,7 +1177,7 @@ "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:2932 +#: cmdline/apt-get.cc:2648 #, c-format msgid "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" @@ -1210,26 +1199,26 @@ "version" msgstr "" -#: cmdline/apt-get.cc:3000 +#: cmdline/apt-get.cc:2675 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:3016 +#: cmdline/apt-get.cc:2691 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:3021 +#: cmdline/apt-get.cc:2696 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:3114 cmdline/apt-get.cc:3126 +#: cmdline/apt-get.cc:2977 cmdline/apt-get.cc:2989 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3248 +#: cmdline/apt-get.cc:2728 msgid "Supported modules:" msgstr "" @@ -1279,7 +1268,7 @@ " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3454 +#: cmdline/apt-get.cc:2936 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1287,33 +1276,33 @@ " so don't depend on the relevance to the real current situation!" msgstr "" -#: cmdline/acqprogress.cc:57 +#: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "Presennol " -#: cmdline/acqprogress.cc:81 +#: cmdline/acqprogress.cc:79 msgid "Get:" msgstr "Cyrchu:" -#: cmdline/acqprogress.cc:112 +#: cmdline/acqprogress.cc:110 msgid "Ign " msgstr "Anwybyddu " -#: cmdline/acqprogress.cc:116 +#: cmdline/acqprogress.cc:114 msgid "Err " msgstr "Gwall " -#: cmdline/acqprogress.cc:137 +#: cmdline/acqprogress.cc:135 #, 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:225 #, c-format msgid " [Working]" msgstr " [Gweithio]" -#: cmdline/acqprogress.cc:283 +#: cmdline/acqprogress.cc:271 #, c-format msgid "" "Media change: please insert the disc labeled\n" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/apturl.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/apturl.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/apturl.po 2012-05-08 22:53:37.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/apturl.po 2012-08-03 13:45:41.000000000 +0000 @@ -14,10 +14,10 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 06:13+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 15:51+0000\n" +"X-Generator: Launchpad (build 15719)\n" -#: ../apturl-gtk:50 ../apturl-kde:53 +#: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." msgstr "" @@ -43,35 +43,35 @@ msgid "No ':' in the uri" msgstr "" -#: ../AptUrl/AptUrl.py:77 +#: ../AptUrl/AptUrl.py:73 #, python-format msgid "Enabling '%s' failed" msgstr "" -#: ../AptUrl/AptUrl.py:94 +#: ../AptUrl/AptUrl.py:91 #, python-format msgid "Unknown channel '%s'" msgstr "" -#: ../AptUrl/AptUrl.py:95 +#: ../AptUrl/AptUrl.py:92 #, python-format msgid "The channel '%s' is not known" msgstr "" -#: ../AptUrl/AptUrl.py:103 +#: ../AptUrl/AptUrl.py:100 #, python-format msgid "Enabling channel '%s' failed" msgstr "" -#: ../AptUrl/AptUrl.py:115 +#: ../AptUrl/AptUrl.py:112 msgid "Invalid /etc/apt/sources.list file" msgstr "" -#: ../AptUrl/AptUrl.py:118 +#: ../AptUrl/AptUrl.py:115 msgid "Software index is broken" msgstr "" -#: ../AptUrl/AptUrl.py:119 +#: ../AptUrl/AptUrl.py:116 msgid "" "This is a major failure of your software management system. Please check for " "broken packages with synaptic, check the file permissions and correctness of " @@ -79,26 +79,26 @@ "'sudo apt-get update' and 'sudo apt-get install -f'." msgstr "" -#: ../AptUrl/AptUrl.py:147 +#: ../AptUrl/AptUrl.py:144 msgid "Need a url to continue, exiting" msgstr "" -#: ../AptUrl/AptUrl.py:150 +#: ../AptUrl/AptUrl.py:147 #, python-format msgid "Invalid url: '%s' given, exiting" msgstr "" -#: ../AptUrl/AptUrl.py:186 +#: ../AptUrl/AptUrl.py:183 #, python-format msgid "Can not deal with protocol '%s' " msgstr "" -#: ../AptUrl/AptUrl.py:207 +#: ../AptUrl/AptUrl.py:205 #, python-format msgid "Package '%s' is virtual." msgstr "" -#: ../AptUrl/AptUrl.py:210 +#: ../AptUrl/AptUrl.py:208 #, python-format msgid "Could not find package '%s'." msgstr "" @@ -108,35 +108,35 @@ msgid "Package '%s' is already installed" msgstr "" -#: ../AptUrl/AptUrl.py:228 +#: ../AptUrl/AptUrl.py:229 #, python-format msgid "Can not install '%s' (%s) " msgstr "" -#: ../AptUrl/AptUrl.py:233 +#: ../AptUrl/AptUrl.py:235 #, python-format msgid "" "Package '%s' requests minimal version '%s', but only '%s' is available" msgstr "" -#: ../AptUrl/UI.py:17 +#: ../AptUrl/UI.py:16 msgid "Enable additional components" msgstr "" -#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:77 ../AptUrl/kde/KdeUI.py:78 +#: ../AptUrl/UI.py:24 ../AptUrl/gtk/GtkUI.py:83 ../AptUrl/kde/KdeUI.py:80 msgid "Enable additional software channel" msgstr "" -#: ../AptUrl/UI.py:26 ../AptUrl/gtk/GtkUI.py:78 ../AptUrl/kde/KdeUI.py:79 +#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:84 ../AptUrl/kde/KdeUI.py:81 #, python-format msgid "Do you want to enable the following software channel: '%s'?" msgstr "" -#: ../AptUrl/gtk/GtkUI.py:142 ../AptUrl/kde/KdeUI.py:128 +#: ../AptUrl/gtk/GtkUI.py:152 ../AptUrl/kde/KdeUI.py:133 msgid "Install additional software?" msgstr "" -#: ../AptUrl/gtk/GtkUI.py:143 ../AptUrl/kde/KdeUI.py:129 +#: ../AptUrl/gtk/GtkUI.py:153 ../AptUrl/kde/KdeUI.py:134 #, python-format msgid "Do you want to install package '%s'?" msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/checkbox.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/checkbox.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/checkbox.po 2012-05-08 22:53:38.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/checkbox.po 2012-08-03 13:45:42.000000000 +0000 @@ -14,16 +14,16 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 06:43+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 16:23+0000\n" +"X-Generator: Launchpad (build 15719)\n" #. Title of the user interface #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1 -#: ../plugins/user_interface.py:43 ../qt/frontend/ui_qtfront.h:589 +#: ../plugins/user_interface.py:43 ../qt/frontend/ui_qtfront.h:600 msgid "System Testing" msgstr "" -#: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:538 +#: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:561 msgid "_Test" msgstr "Prawf" @@ -39,8 +39,8 @@ msgid "_Skip this test" msgstr "" -#: ../gtk/checkbox-gtk.ui.h:6 ../checkbox_cli/cli_interface.py:444 -#: ../checkbox_urwid/urwid_interface.py:267 +#: ../gtk/checkbox-gtk.ui.h:6 ../checkbox_cli/cli_interface.py:445 +#: ../checkbox_urwid/urwid_interface.py:289 msgid "Further information:" msgstr "" @@ -70,7 +70,7 @@ msgstr "" #. description -#: ../jobs/audio.txt.in:16 +#: ../jobs/audio.txt.in:17 msgid "" "PURPOSE:\n" " This test will check that internal speakers work correctly\n" @@ -83,7 +83,7 @@ msgstr "" #. description -#: ../jobs/audio.txt.in:33 +#: ../jobs/audio.txt.in:55 msgid "" "PURPOSE:\n" " This test will check that headphones connector works correctly\n" @@ -96,7 +96,7 @@ msgstr "" #. description -#: ../jobs/audio.txt.in:49 +#: ../jobs/audio.txt.in:71 msgid "" "PURPOSE:\n" " This test will check that recording sound using the onboard microphone " @@ -110,7 +110,7 @@ msgstr "" #. description -#: ../jobs/audio.txt.in:66 +#: ../jobs/audio.txt.in:88 msgid "" "PURPOSE:\n" " This test will check that recording sound using an external microphone " @@ -124,7 +124,7 @@ msgstr "" #. description -#: ../jobs/audio.txt.in:82 +#: ../jobs/audio.txt.in:104 msgid "" "PURPOSE:\n" " This test will check that a USB audio device works correctly\n" @@ -137,7 +137,7 @@ msgstr "" #. description -#: ../jobs/audio.txt.in:99 +#: ../jobs/audio.txt.in:121 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 " @@ -302,22 +302,22 @@ msgstr "" #. description -#: ../jobs/cpu.txt.in:15 +#: ../jobs/cpu.txt.in:21 msgid "Test for clock jitter." msgstr "" #. description -#: ../jobs/cpu.txt.in:23 +#: ../jobs/cpu.txt.in:29 msgid "Test offlining CPUs in a multicore system." msgstr "" #. description -#: ../jobs/cpu.txt.in:30 +#: ../jobs/cpu.txt.in:36 msgid "This test checks cpu topology for accuracy" msgstr "" #. description -#: ../jobs/cpu.txt.in:38 +#: ../jobs/cpu.txt.in:44 msgid "This test checks that CPU frequency governors are obeyed when set." msgstr "" @@ -382,32 +382,32 @@ msgstr "" #. description -#: ../jobs/disk.txt.in:9 +#: ../jobs/benchmarks.txt.in:18 msgid "Benchmark for each disk" msgstr "" #. description -#: ../jobs/disk.txt.in:23 +#: ../jobs/disk.txt.in:9 msgid "Check stats changes for each disk" msgstr "" #. description -#: ../jobs/disk.txt.in:40 +#: ../jobs/disk.txt.in:29 msgid "SMART test" msgstr "" #. description -#: ../jobs/disk.txt.in:56 +#: ../jobs/disk.txt.in:47 msgid "Maximum disk space used during a default installation test" msgstr "" #. description -#: ../jobs/disk.txt.in:71 +#: ../jobs/disk.txt.in:64 msgid "Verify system storage performs at or above baseline performance" msgstr "" #. description -#: ../jobs/disk.txt.in:88 +#: ../jobs/disk.txt.in:82 msgid "" "Verify that storage devices, such as Fibre Channel and RAID can be detected " "and perform under stress." @@ -471,7 +471,7 @@ msgstr "" #. description -#: ../jobs/firewire.txt.in:19 +#: ../jobs/firewire.txt.in:23 msgid "" "This is an automated test which performs read/write operations on an " "attached FireWire HDD" @@ -582,7 +582,7 @@ msgstr "https://help.ubuntu.com/community/Installation/SystemRequirements" #. description -#: ../jobs/graphics.txt.in:95 +#: ../jobs/graphics.txt.in:97 msgid "" "PURPOSE:\n" " This test will test the default display\n" @@ -593,12 +593,12 @@ msgstr "" #. description -#: ../jobs/graphics.txt.in:106 +#: ../jobs/graphics.txt.in:108 msgid "Check that VESA drivers are not in use" msgstr "" #. description -#: ../jobs/graphics.txt.in:113 +#: ../jobs/graphics.txt.in:115 msgid "" "PURPOSE:\n" " This test cycles through the detected video modes\n" @@ -609,17 +609,17 @@ msgstr "" #. description -#: ../jobs/graphics.txt.in:126 +#: ../jobs/graphics.txt.in:128 msgid "Check that hardware is able to run compiz" msgstr "" #. description -#: ../jobs/graphics.txt.in:133 +#: ../jobs/graphics.txt.in:135 msgid "Check that hardware is able to run Unity 3D" msgstr "" #. description -#: ../jobs/graphics.txt.in:139 +#: ../jobs/graphics.txt.in:141 msgid "" "PURPOSE:\n" " This test tests the basic 3D capabilities of your video card\n" @@ -676,43 +676,43 @@ msgstr "" #. description -#: ../jobs/info.txt.in:31 +#: ../jobs/info.txt.in:37 msgid "Attaches very verbose lspci output." msgstr "" #. description -#: ../jobs/info.txt.in:40 +#: ../jobs/info.txt.in:58 msgid "Attaches the contents of the various modprobe conf files." msgstr "" #. description -#: ../jobs/info.txt.in:45 +#: ../jobs/info.txt.in:63 msgid "Attaches the contents of the /etc/modules file." msgstr "" #. description -#: ../jobs/info.txt.in:50 +#: ../jobs/info.txt.in:68 msgid "attaches the contents of various sysctl config files." msgstr "" #. description -#: ../jobs/info.txt.in:54 +#: ../jobs/info.txt.in:72 msgid "Attaches a report of sysfs attributes." msgstr "" #. description -#: ../jobs/info.txt.in:65 +#: ../jobs/info.txt.in:83 msgid "" "Attaches a dump of the udev database showing system hardware information." msgstr "" #. description -#: ../jobs/info.txt.in:72 +#: ../jobs/info.txt.in:90 msgid "Attaches a tarball of gcov data if present." msgstr "" #. description -#: ../jobs/info.txt.in:77 +#: ../jobs/info.txt.in:95 msgid "Attaches a list of the currently running kernel modules." msgstr "" @@ -727,42 +727,42 @@ msgstr "" #. description -#: ../jobs/info.txt.in:96 +#: ../jobs/info.txt.in:94 msgid "Gather log from the Firmware Test Suite run." msgstr "" #. description -#: ../jobs/info.txt.in:103 +#: ../jobs/info.txt.in:100 msgid "Attaches the contents of /proc/acpi/sleep if it exists." msgstr "" #. description -#: ../jobs/info.txt.in:107 +#: ../jobs/info.txt.in:104 msgid "Bootchart information." msgstr "" #. description -#: ../jobs/info.txt.in:116 +#: ../jobs/info.txt.in:113 msgid "SATA/IDE device information." msgstr "" #. description -#: ../jobs/info.txt.in:133 +#: ../jobs/info.txt.in:132 msgid "Attaches the bootchart png file for bootchart runs" msgstr "" #. description -#: ../jobs/info.txt.in:142 +#: ../jobs/info.txt.in:141 msgid "Attaches the bootchart log for bootchart test runs." msgstr "" #. description -#: ../jobs/info.txt.in:150 +#: ../jobs/info.txt.in:149 msgid "installs the installer bootchart tarball if it exists." msgstr "" #. description -#: ../jobs/info.txt.in:155 +#: ../jobs/info.txt.in:154 msgid "Attaches the installer debug log if it exists." msgstr "" @@ -965,57 +965,57 @@ msgstr "" #. description -#: ../jobs/local.txt.in:122 +#: ../jobs/local.txt.in:129 msgid "Linux Test Project tests" msgstr "" #. description -#: ../jobs/local.txt.in:129 +#: ../jobs/local.txt.in:136 msgid "Mago Automated Desktop Testing" msgstr "" #. description -#: ../jobs/local.txt.in:136 +#: ../jobs/local.txt.in:122 msgid "Media Card tests" msgstr "" #. description -#: ../jobs/local.txt.in:143 +#: ../jobs/local.txt.in:129 msgid "Memory tests" msgstr "" #. description -#: ../jobs/local.txt.in:150 +#: ../jobs/local.txt.in:136 msgid "Miscellaneous tests" msgstr "" #. description -#: ../jobs/local.txt.in:157 +#: ../jobs/local.txt.in:143 msgid "Monitor tests" msgstr "" #. description -#: ../jobs/local.txt.in:164 +#: ../jobs/local.txt.in:150 msgid "Networking tests" msgstr "" #. description -#: ../jobs/local.txt.in:171 +#: ../jobs/local.txt.in:157 msgid "Optical Drive tests" msgstr "" #. description -#: ../jobs/local.txt.in:178 +#: ../jobs/local.txt.in:164 msgid "Panel Clock Verification tests" msgstr "" #. description -#: ../jobs/local.txt.in:185 +#: ../jobs/local.txt.in:171 msgid "PCMCIA/PCIX Card tests" msgstr "" #. description -#: ../jobs/local.txt.in:192 +#: ../jobs/local.txt.in:178 msgid "Peripheral tests" msgstr "" @@ -1025,7 +1025,7 @@ msgstr "" #. description -#: ../jobs/local.txt.in:206 +#: ../jobs/local.txt.in:185 msgid "Power Management tests" msgstr "" @@ -1035,17 +1035,17 @@ msgstr "" #. description -#: ../jobs/local.txt.in:220 +#: ../jobs/local.txt.in:192 msgid "Server Services checks" msgstr "" #. description -#: ../jobs/local.txt.in:227 +#: ../jobs/local.txt.in:199 msgid "Suspend tests" msgstr "" #. description -#: ../jobs/local.txt.in:234 +#: ../jobs/local.txt.in:206 msgid "Touchpad tests" msgstr "" @@ -1055,22 +1055,22 @@ msgstr "" #. description -#: ../jobs/local.txt.in:248 +#: ../jobs/local.txt.in:213 msgid "USB tests" msgstr "" #. description -#: ../jobs/local.txt.in:255 +#: ../jobs/local.txt.in:220 msgid "User Applications" msgstr "" #. description -#: ../jobs/local.txt.in:262 +#: ../jobs/local.txt.in:227 msgid "Wireless networking tests" msgstr "" #. description -#: ../jobs/local.txt.in:269 +#: ../jobs/local.txt.in:234 msgid "Stress tests" msgstr "" @@ -1104,7 +1104,7 @@ msgstr "" #. description -#: ../jobs/mediacard.txt.in:20 +#: ../jobs/mediacard.txt.in:24 msgid "" "This test is automated and executes after the mediacard/mmc-insert test is " "run. It tests reading and writing to the MMC card." @@ -1140,7 +1140,7 @@ msgstr "" #. description -#: ../jobs/mediacard.txt.in:59 +#: ../jobs/mediacard.txt.in:69 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 " @@ -1178,7 +1178,7 @@ msgstr "" #. description -#: ../jobs/mediacard.txt.in:97 +#: ../jobs/mediacard.txt.in:113 msgid "" "This test is automated and executes after the mediacard/sd-insert test is " "run. It tests reading and writing to the SD card." @@ -1214,7 +1214,7 @@ msgstr "" #. description -#: ../jobs/mediacard.txt.in:136 +#: ../jobs/mediacard.txt.in:158 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 " @@ -1253,7 +1253,7 @@ msgstr "" #. description -#: ../jobs/mediacard.txt.in:174 +#: ../jobs/mediacard.txt.in:202 msgid "" "This test is automated and executes after the mediacard/sdhc-insert test is " "run. It tests reading and writing to the SDHC card." @@ -1290,7 +1290,7 @@ msgstr "" #. description -#: ../jobs/mediacard.txt.in:213 +#: ../jobs/mediacard.txt.in:247 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 " @@ -1328,7 +1328,7 @@ msgstr "" #. description -#: ../jobs/mediacard.txt.in:251 +#: ../jobs/mediacard.txt.in:291 msgid "" "This test is automated and executes after the mediacard/cf-insert test is " "run. It tests reading and writing to the CF card." @@ -1364,7 +1364,7 @@ msgstr "" #. description -#: ../jobs/mediacard.txt.in:290 +#: ../jobs/mediacard.txt.in:336 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 " @@ -1399,7 +1399,7 @@ msgstr "" #. description -#: ../jobs/miscellanea.txt.in:8 +#: ../jobs/miscellanea.txt.in:22 msgid "" "PURPOSE:\n" " This test will check that the system can switch to a virtual terminal " @@ -1413,26 +1413,26 @@ msgstr "" #. description -#: ../jobs/miscellanea.txt.in:21 +#: ../jobs/miscellanea.txt.in:36 msgid "Run Firmware Test Suite (fwts) automated tests." msgstr "" #. description -#: ../jobs/miscellanea.txt.in:31 +#: ../jobs/miscellanea.txt.in:53 msgid "" "This will run some basic connectivity tests against a BMC, verifying that " "IPMI works." msgstr "" #. description -#: ../jobs/miscellanea.txt.in:37 +#: ../jobs/miscellanea.txt.in:59 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 +#: ../jobs/miscellanea.txt.in:67 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 " @@ -1440,7 +1440,7 @@ msgstr "" #. description -#: ../jobs/miscellanea.txt.in:53 +#: ../jobs/miscellanea.txt.in:75 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" @@ -1628,7 +1628,7 @@ msgstr "" #. description -#: ../jobs/networking.txt.in:128 +#: ../jobs/networking.txt.in:131 msgid "Test to measure the network bandwidth" msgstr "" @@ -1655,7 +1655,7 @@ msgstr "" #. description -#: ../jobs/optical.txt.in:33 +#: ../jobs/optical.txt.in:42 msgid "" "PURPOSE:\n" " This test will check your system's CD writing capabilities. This test " @@ -1672,7 +1672,7 @@ msgstr "" #. description -#: ../jobs/optical.txt.in:46 +#: ../jobs/optical.txt.in:55 msgid "" "PURPOSE:\n" " This test will check your CD audio playback capabilities\n" @@ -1691,7 +1691,7 @@ msgstr "" #. description -#: ../jobs/optical.txt.in:69 +#: ../jobs/optical.txt.in:78 msgid "" "PURPOSE:\n" " This test will check your system's DVD writing capabilities. This test " @@ -1708,7 +1708,7 @@ msgstr "" #. description -#: ../jobs/optical.txt.in:82 +#: ../jobs/optical.txt.in:91 msgid "" "PURPOSE:\n" " This test will check your DVD movie playback capabilities. Note that " @@ -1727,7 +1727,7 @@ msgstr "" #. description -#: ../jobs/optical.txt.in:100 +#: ../jobs/optical.txt.in:109 msgid "" "PURPOSE:\n" " This test will check your DVD playback capabilities\n" @@ -1750,7 +1750,7 @@ msgstr "" #. description -#: ../jobs/panel_clock_test.txt.in:16 +#: ../jobs/panel_clock_test.txt.in:18 msgid "" "PURPOSE:\n" " This test will verify that the desktop clock synchronizes with the system " @@ -1854,7 +1854,7 @@ msgstr "" #. description -#: ../jobs/power-management.txt.in:15 +#: ../jobs/power-management.txt.in:83 msgid "" "PURPOSE:\n" " This test will check your lid sensors\n" @@ -1865,7 +1865,7 @@ msgstr "" #. description -#: ../jobs/power-management.txt.in:32 +#: ../jobs/power-management.txt.in:100 msgid "" "PURPOSE:\n" " This test will check your lid sensors\n" @@ -1877,7 +1877,7 @@ msgstr "" #. description -#: ../jobs/power-management.txt.in:50 +#: ../jobs/power-management.txt.in:118 msgid "" "PURPOSE:\n" " This test will check your lid sensors\n" @@ -1891,17 +1891,17 @@ msgstr "" #. description -#: ../jobs/power-management.txt.in:66 +#: ../jobs/power-management.txt.in:134 msgid "Make sure that the RTC (Real-Time Clock) device exists." msgstr "" #. description -#: ../jobs/power-management.txt.in:71 +#: ../jobs/power-management.txt.in:120 msgid "Test ACPI Wakealarm (fwts wakealarm) " msgstr "" #. description -#: ../jobs/power-management.txt.in:80 +#: ../jobs/power-management.txt.in:140 msgid "" "Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple " "regression check)" @@ -2009,14 +2009,14 @@ msgstr "" #. description -#: ../jobs/suspend.txt.in:49 +#: ../jobs/suspend.txt.in:40 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 +#: ../jobs/suspend.txt.in:77 msgid "" "PURPOSE:\n" " This test will check suspend and resume\n" @@ -2032,34 +2032,34 @@ msgstr "" #. description -#: ../jobs/suspend.txt.in:96 +#: ../jobs/suspend.txt.in:108 msgid "Test the network after resuming." msgstr "" #. description -#: ../jobs/suspend.txt.in:102 +#: ../jobs/suspend.txt.in:114 msgid "" "Test to see that we have the same resolution after resuming as before." msgstr "" #. description -#: ../jobs/suspend.txt.in:111 +#: ../jobs/suspend.txt.in:123 msgid "" "Verify that mixer settings after suspend are the same as before suspend." msgstr "" #. description -#: ../jobs/suspend.txt.in:127 +#: ../jobs/suspend.txt.in:139 msgid "Verify that all CPUs are online after resuming." msgstr "" #. description -#: ../jobs/suspend.txt.in:144 +#: ../jobs/suspend.txt.in:156 msgid "Verify that all memory is available after resuming from suspend." msgstr "" #. description -#: ../jobs/suspend.txt.in:153 +#: ../jobs/suspend.txt.in:150 msgid "" "PURPOSE:\n" " This test will check that the display is correct after suspend and " @@ -2069,7 +2069,7 @@ msgstr "" #. description -#: ../jobs/suspend.txt.in:174 +#: ../jobs/suspend.txt.in:178 msgid "" "This test checks that the wireless interface is working after suspending the " "system. It disconnects all interfaces and then connects to the wireless " @@ -2077,21 +2077,21 @@ msgstr "" #. description -#: ../jobs/suspend.txt.in:186 +#: ../jobs/suspend.txt.in:234 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 +#: ../jobs/suspend.txt.in:254 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 +#: ../jobs/suspend.txt.in:264 msgid "" "PURPOSE:\n" " This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a " @@ -2106,7 +2106,7 @@ msgstr "" #. description -#: ../jobs/suspend.txt.in:220 +#: ../jobs/suspend.txt.in:278 msgid "" "PURPOSE:\n" " This test will cycle through the detected display modes\n" @@ -2117,7 +2117,7 @@ msgstr "" #. description -#: ../jobs/suspend.txt.in:232 +#: ../jobs/suspend.txt.in:290 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 " @@ -2125,14 +2125,14 @@ msgstr "" #. description -#: ../jobs/suspend.txt.in:241 +#: ../jobs/suspend.txt.in:299 msgid "" "This attaches screenshots from the " "suspend/cycle_resolutions_after_suspend_auto test to the results submission." msgstr "" #. description -#: ../jobs/suspend.txt.in:251 +#: ../jobs/suspend.txt.in:309 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 " @@ -2141,12 +2141,12 @@ msgstr "" #. description -#: ../jobs/suspend.txt.in:260 +#: ../jobs/suspend.txt.in:93 msgid "This is the automated version of suspend/suspend_advanced." msgstr "" #. description -#: ../jobs/suspend.txt.in:269 +#: ../jobs/suspend.txt.in:310 msgid "" "This automatically tests Wake-on-LAN capability with the aid of a suitably " "configured server. During this process the system will suspend, then " @@ -2173,7 +2173,7 @@ msgstr "" #. description -#: ../jobs/usb.txt.in:12 +#: ../jobs/usb.txt.in:14 msgid "" "PURPOSE:\n" " This test will check that your system detects USB storage devices.\n" @@ -2187,7 +2187,7 @@ msgstr "" #. description -#: ../jobs/usb.txt.in:28 +#: ../jobs/usb.txt.in:30 msgid "" "PURPOSE:\n" " This test will check your USB connection.\n" @@ -2199,7 +2199,7 @@ msgstr "" #. description -#: ../jobs/usb.txt.in:41 +#: ../jobs/usb.txt.in:43 msgid "" "PURPOSE:\n" " This test will check your USB connection.\n" @@ -2240,7 +2240,7 @@ msgstr "" #. description -#: ../jobs/usb.txt.in:88 +#: ../jobs/usb.txt.in:96 msgid "" "PURPOSE:\n" " This test will check your USB connection.\n" @@ -2254,12 +2254,12 @@ msgstr "" #. description -#: ../jobs/usb.txt.in:104 +#: ../jobs/usb.txt.in:114 msgid "This test is automated and executes after the usb/insert test is run." msgstr "" #. description -#: ../jobs/usb.txt.in:111 +#: ../jobs/usb.txt.in:112 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 " @@ -2267,7 +2267,7 @@ msgstr "" #. description -#: ../jobs/usb.txt.in:119 +#: ../jobs/usb.txt.in:132 msgid "" "PURPOSE:\n" " This test will check your USB connection.\n" @@ -2881,107 +2881,107 @@ msgstr "" #: ../checkbox_cli/cli_interface.py:31 -#: ../checkbox_urwid/urwid_interface.py:917 ../checkbox_qt/qt_interface.py:37 +#: ../checkbox_urwid/urwid_interface.py:939 ../checkbox_qt/qt_interface.py:34 msgid "yes" msgstr "" #: ../checkbox_cli/cli_interface.py:32 -#: ../checkbox_urwid/urwid_interface.py:918 ../checkbox_qt/qt_interface.py:38 +#: ../checkbox_urwid/urwid_interface.py:940 ../checkbox_qt/qt_interface.py:35 msgid "no" msgstr "" #: ../checkbox_cli/cli_interface.py:33 -#: ../checkbox_urwid/urwid_interface.py:919 ../checkbox_qt/qt_interface.py:39 +#: ../checkbox_urwid/urwid_interface.py:941 ../checkbox_qt/qt_interface.py:36 msgid "skip" msgstr "" -#: ../checkbox_cli/cli_interface.py:126 +#: ../checkbox_cli/cli_interface.py:127 msgid "Press any key to continue..." msgstr "" -#: ../checkbox_cli/cli_interface.py:135 ../checkbox_cli/cli_interface.py:234 +#: ../checkbox_cli/cli_interface.py:136 ../checkbox_cli/cli_interface.py:235 #, python-format msgid "Please choose (%s): " msgstr "" -#: ../checkbox_cli/cli_interface.py:229 ../checkbox_cli/cli_interface.py:338 -#: ../checkbox_cli/cli_interface.py:368 +#: ../checkbox_cli/cli_interface.py:230 ../checkbox_cli/cli_interface.py:339 +#: ../checkbox_cli/cli_interface.py:369 msgid "Space when finished" msgstr "" -#: ../checkbox_cli/cli_interface.py:367 +#: ../checkbox_cli/cli_interface.py:368 msgid "Combine with character above to expand node" msgstr "" -#: ../checkbox_cli/cli_interface.py:416 +#: ../checkbox_cli/cli_interface.py:417 msgid "test" msgstr "profi" -#: ../checkbox_cli/cli_interface.py:440 +#: ../checkbox_cli/cli_interface.py:441 msgid "test again" msgstr "profi eto" -#: ../checkbox_cli/cli_interface.py:446 +#: ../checkbox_cli/cli_interface.py:447 msgid "Please type here and press Ctrl-D when finished:\n" msgstr "" -#: ../checkbox_urwid/urwid_interface.py:66 +#: ../checkbox_urwid/urwid_interface.py:86 msgid "Checkbox System Testing" msgstr "" -#: ../checkbox_urwid/urwid_interface.py:105 +#: ../checkbox_urwid/urwid_interface.py:127 msgid "Continue" msgstr "Parhau" -#: ../checkbox_urwid/urwid_interface.py:198 -#: ../checkbox_urwid/urwid_interface.py:274 -#: ../checkbox_urwid/urwid_interface.py:425 -#: ../checkbox_urwid/urwid_interface.py:547 ../qt/frontend/ui_qtfront.h:609 +#: ../checkbox_urwid/urwid_interface.py:220 +#: ../checkbox_urwid/urwid_interface.py:296 +#: ../checkbox_urwid/urwid_interface.py:447 +#: ../checkbox_urwid/urwid_interface.py:569 ../qt/frontend/ui_qtfront.h:622 msgid "Previous" msgstr "Cynt" -#: ../checkbox_urwid/urwid_interface.py:199 -#: ../checkbox_urwid/urwid_interface.py:275 -#: ../checkbox_urwid/urwid_interface.py:426 -#: ../checkbox_urwid/urwid_interface.py:548 ../qt/frontend/ui_qtfront.h:608 +#: ../checkbox_urwid/urwid_interface.py:221 +#: ../checkbox_urwid/urwid_interface.py:297 +#: ../checkbox_urwid/urwid_interface.py:448 +#: ../checkbox_urwid/urwid_interface.py:570 ../qt/frontend/ui_qtfront.h:621 msgid "Next" msgstr "Nesaf" #. Show buttons -#: ../checkbox_urwid/urwid_interface.py:423 ../qt/frontend/qtfront.cpp:136 +#: ../checkbox_urwid/urwid_interface.py:445 msgid "Select All" msgstr "Dewis Popeth" -#: ../checkbox_urwid/urwid_interface.py:424 ../qt/frontend/qtfront.cpp:137 +#: ../checkbox_urwid/urwid_interface.py:446 msgid "Deselect All" msgstr "" #. Show buttons -#: ../checkbox_urwid/urwid_interface.py:545 +#: ../checkbox_urwid/urwid_interface.py:567 msgid "Expand All" msgstr "" -#: ../checkbox_urwid/urwid_interface.py:546 +#: ../checkbox_urwid/urwid_interface.py:568 msgid "Collapse All" msgstr "" -#: ../checkbox_urwid/urwid_interface.py:1013 ../qt/frontend/ui_qtfront.h:603 +#: ../checkbox_urwid/urwid_interface.py:1034 ../qt/frontend/ui_qtfront.h:616 msgid "Test" msgstr "Profi" -#: ../checkbox_urwid/urwid_interface.py:1028 +#: ../checkbox_urwid/urwid_interface.py:1049 msgid "Test Again" msgstr "Profi Eto" -#: ../checkbox_gtk/gtk_interface.py:503 +#: ../checkbox_gtk/gtk_interface.py:525 msgid "_Test Again" msgstr "" -#: ../checkbox_gtk/gtk_interface.py:551 ../qt/frontend/qtfront.cpp:490 +#: ../checkbox_gtk/gtk_interface.py:574 ../qt/frontend/qtfront.cpp:547 msgid "Info" msgstr "Gwybodaeth" -#: ../checkbox_gtk/gtk_interface.py:575 ../qt/frontend/qtfront.cpp:247 +#: ../checkbox_gtk/gtk_interface.py:599 ../qt/frontend/qtfront.cpp:244 msgid "Error" msgstr "Gwall" @@ -3129,174 +3129,174 @@ msgstr "" #. Get results -#: ../plugins/suites_prompt.py:110 +#: ../plugins/suites_prompt.py:126 msgid "Select the suites to test" msgstr "" -#: ../scripts/keyboard_test:21 +#: ../scripts/keyboard_test:22 msgid "Enter text:\n" msgstr "" -#: ../scripts/keyboard_test:41 +#: ../scripts/keyboard_test:43 msgid "Type Text" msgstr "" -#: ../scripts/internet_test:139 +#: ../scripts/internet_test:211 msgid "No Internet connection" msgstr "" -#: ../scripts/internet_test:142 +#: ../scripts/internet_test:214 msgid "Connection established lost a packet" msgstr "" -#: ../scripts/internet_test:145 +#: ../scripts/internet_test:217 msgid "Internet connection fully established" msgstr "" -#: ../qt/frontend/qtfront.cpp:85 +#: ../qt/frontend/qtfront.cpp:91 msgid "Audio Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:86 +#: ../qt/frontend/qtfront.cpp:92 msgid "Bluetooth Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:87 +#: ../qt/frontend/qtfront.cpp:93 msgid "Camera Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:88 +#: ../qt/frontend/qtfront.cpp:94 msgid "CPU Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:89 +#: ../qt/frontend/qtfront.cpp:95 msgid "Disk Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:90 +#: ../qt/frontend/qtfront.cpp:96 msgid "Firewire Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:91 +#: ../qt/frontend/qtfront.cpp:97 msgid "Graphics Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:92 +#: ../qt/frontend/qtfront.cpp:98 msgid "Info Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:93 +#: ../qt/frontend/qtfront.cpp:99 msgid "Input Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:94 +#: ../qt/frontend/qtfront.cpp:100 msgid "Keys Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:95 +#: ../qt/frontend/qtfront.cpp:101 msgid "Media Card Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:96 +#: ../qt/frontend/qtfront.cpp:102 msgid "Memory Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:97 +#: ../qt/frontend/qtfront.cpp:103 msgid "Miscellanea Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:98 +#: ../qt/frontend/qtfront.cpp:104 msgid "Monitor Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:99 +#: ../qt/frontend/qtfront.cpp:105 msgid "Networking Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:100 +#: ../qt/frontend/qtfront.cpp:106 msgid "Wireless Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:101 +#: ../qt/frontend/qtfront.cpp:107 msgid "Optical Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:102 +#: ../qt/frontend/qtfront.cpp:108 msgid "PCMCIA/PCIX Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:103 +#: ../qt/frontend/qtfront.cpp:109 msgid "Power Management Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:104 +#: ../qt/frontend/qtfront.cpp:110 msgid "Suspend Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:105 +#: ../qt/frontend/qtfront.cpp:111 msgid "USB Test" msgstr "" -#: ../qt/frontend/qtfront.cpp:107 +#: ../qt/frontend/qtfront.cpp:113 msgid "Not Started" msgstr "" -#: ../qt/frontend/qtfront.cpp:108 ../qt/frontend/qtfront.cpp:109 +#: ../qt/frontend/qtfront.cpp:114 ../qt/frontend/qtfront.cpp:115 msgid "Done" msgstr "" -#: ../qt/frontend/qtfront.cpp:110 +#: ../qt/frontend/qtfront.cpp:116 msgid "Not Supported" msgstr "" -#: ../qt/frontend/qtfront.cpp:111 +#: ../qt/frontend/qtfront.cpp:117 msgid "Not Resolved" msgstr "" -#: ../qt/frontend/qtfront.cpp:112 +#: ../qt/frontend/qtfront.cpp:118 msgid "Not Tested" msgstr "" -#: ../qt/frontend/qtfront.cpp:113 +#: ../qt/frontend/qtfront.cpp:119 msgid "In Progress" msgstr "" -#: ../qt/frontend/qtfront.cpp:182 +#: ../qt/frontend/qtfront.cpp:183 msgid "Are you sure?" msgstr "" -#: ../qt/frontend/qtfront.cpp:182 +#: ../qt/frontend/qtfront.cpp:183 msgid "Do you really want to skip this test?" msgstr "" -#: ../qt/frontend/qtfront.cpp:183 +#: ../qt/frontend/qtfront.cpp:184 msgid "Don't ask me again" msgstr "" -#: ../qt/frontend/treemodel.cpp:13 +#: ../plugins/suites_prompt.py:36 msgid "" "Unselecting a test will invalidate your submission for Ubuntu Friendly. If " "you plan to participate in Ubuntu Friendly, please, select all tests. You " "can always skip individual tests if you don't have the needed equipment." msgstr "" -#: ../qt/frontend/ui_qtfront.h:588 +#: ../qt/frontend/ui_qtfront.h:599 msgid "Form" msgstr "" -#: ../qt/frontend/ui_qtfront.h:590 +#: ../qt/frontend/ui_qtfront.h:601 msgid "OK" msgstr "" -#: ../qt/frontend/ui_qtfront.h:591 +#: ../qt/frontend/ui_qtfront.h:602 msgid "Don't show me this message in the future" msgstr "" -#: ../qt/frontend/ui_qtfront.h:592 ../qt/frontend/ui_qtfront.h:606 +#: ../qt/frontend/ui_qtfront.h:603 ../qt/frontend/ui_qtfront.h:619 msgid "Tab 1" msgstr "" -#: ../qt/frontend/ui_qtfront.h:593 +#: ../qt/frontend/ui_qtfront.h:604 msgid "10 tests completed out of 30 (30%)" msgstr "" @@ -3304,47 +3304,47 @@ msgid "Lists of tests to run based on your system:" msgstr "" -#: ../qt/frontend/ui_qtfront.h:596 +#: ../qt/frontend/ui_qtfront.h:607 msgid "Components" msgstr "" -#: ../qt/frontend/ui_qtfront.h:597 +#: ../qt/frontend/ui_qtfront.h:608 msgid "Status" msgstr "" -#: ../qt/frontend/ui_qtfront.h:598 +#: ../qt/frontend/ui_qtfront.h:611 msgid "Start testing" msgstr "" -#: ../qt/frontend/ui_qtfront.h:599 +#: ../qt/frontend/ui_qtfront.h:612 msgid " Selection " msgstr "" -#: ../qt/frontend/ui_qtfront.h:600 ../qt/frontend/ui_qtfront.h:601 +#: ../qt/frontend/ui_qtfront.h:613 ../qt/frontend/ui_qtfront.h:614 msgid "TextLabel" msgstr "" -#: ../qt/frontend/ui_qtfront.h:602 +#: ../qt/frontend/ui_qtfront.h:615 msgid "Yes" msgstr "" -#: ../qt/frontend/ui_qtfront.h:604 +#: ../qt/frontend/ui_qtfront.h:617 msgid "No" msgstr "" -#: ../qt/frontend/ui_qtfront.h:605 +#: ../qt/frontend/ui_qtfront.h:618 msgid "Comment" msgstr "" -#: ../qt/frontend/ui_qtfront.h:607 ../qt/frontend/ui_qtfront.h:623 +#: ../qt/frontend/ui_qtfront.h:620 ../qt/frontend/ui_qtfront.h:636 msgid "Tab 2" msgstr "" -#: ../qt/frontend/ui_qtfront.h:610 +#: ../qt/frontend/ui_qtfront.h:623 msgid " Run " msgstr "" -#: ../qt/frontend/ui_qtfront.h:611 +#: ../qt/frontend/ui_qtfront.h:624 msgid "" "\n" @@ -3367,18 +3367,18 @@ msgid "Personal details" msgstr "" -#: ../qt/frontend/ui_qtfront.h:619 +#: ../qt/frontend/ui_qtfront.h:632 msgid "Email:" msgstr "" -#: ../qt/frontend/ui_qtfront.h:620 +#: ../qt/frontend/ui_qtfront.h:633 msgid "Submit results" msgstr "" -#: ../qt/frontend/ui_qtfront.h:621 +#: ../qt/frontend/ui_qtfront.h:634 msgid "View results" msgstr "" -#: ../qt/frontend/ui_qtfront.h:622 +#: ../qt/frontend/ui_qtfront.h:635 msgid " Results " msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/command-not-found.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/command-not-found.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/command-not-found.po 2012-05-08 22:53:36.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/command-not-found.po 2012-08-03 13:45:39.000000000 +0000 @@ -7,31 +7,73 @@ msgstr "" "Project-Id-Version: command-not-found\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2007-03-20 18:10+0100\n" +"POT-Creation-Date: 2012-05-31 17:42+0300\n" "PO-Revision-Date: 2009-10-11 15:22+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Welsh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 05:21+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 14:57+0000\n" +"X-Generator: Launchpad (build 15719)\n" -#: ../CommandNotFound/CommandNotFound.py:135 -msgid "Ubuntu has the following similar programs" +#: ../CommandNotFound/CommandNotFound.py:148 +#, python-format +msgid "No command '%s' found, but there are %s similar ones" +msgstr "" + +#: ../CommandNotFound/CommandNotFound.py:150 +#, python-format +msgid "No command '%s' found, did you mean:" +msgstr "" + +#: ../CommandNotFound/CommandNotFound.py:152 +#, python-format +msgid " Command '%s' from package '%s' (%s)" +msgstr "" + +#: ../CommandNotFound/CommandNotFound.py:210 +msgid "Do you want to install it? (N/y)" +msgstr "" + +#: ../CommandNotFound/CommandNotFound.py:218 +msgid "y" +msgstr "" + +#: ../CommandNotFound/CommandNotFound.py:245 +#, python-format +msgid "Command '%(command)s' is available in '%(place)s'" +msgstr "" + +#: ../CommandNotFound/CommandNotFound.py:247 +#, python-format +msgid "Command '%(command)s' is available in the following places" +msgstr "" + +#: ../CommandNotFound/CommandNotFound.py:252 +#, python-format +msgid "" +"The command could not be located because '%s' is not included in the PATH " +"environment variable." +msgstr "" + +#: ../CommandNotFound/CommandNotFound.py:254 +msgid "" +"This is most likely caused by the lack of administrative privileges " +"associated with your user account." msgstr "" -#: ../CommandNotFound/CommandNotFound.py:139 +#: ../CommandNotFound/CommandNotFound.py:269 #, 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:141 -#: ../CommandNotFound/CommandNotFound.py:144 +#: ../CommandNotFound/CommandNotFound.py:271 +#: ../CommandNotFound/CommandNotFound.py:275 msgid "You can install it by typing:" msgstr "Gallwch ei sefydlu drwy deipio:" -#: ../CommandNotFound/CommandNotFound.py:147 +#: ../CommandNotFound/CommandNotFound.py:279 #, python-format msgid "" "To run '%(command)s' please ask your administrator to install the package " @@ -40,32 +82,71 @@ "Er mwyn rhedeg '%(command)s' gofynnwch i'ch gweinyddwr i sefydlu'r pecyn " "'%(package)s' os gwelwch yn dda." -#: ../CommandNotFound/CommandNotFound.py:149 -#: ../CommandNotFound/CommandNotFound.py:161 +#: ../CommandNotFound/CommandNotFound.py:281 #, python-format -msgid "Make sure you have the '%s' component enabled" +msgid "You will have to enable the component called '%s'" msgstr "" -#: ../CommandNotFound/CommandNotFound.py:151 +#: ../CommandNotFound/CommandNotFound.py:284 #, 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:155 -#: ../CommandNotFound/CommandNotFound.py:157 +#: ../CommandNotFound/CommandNotFound.py:289 +#, python-format +msgid "You will have to enable component called '%s'" +msgstr "" + +#: ../CommandNotFound/CommandNotFound.py:291 +#: ../CommandNotFound/CommandNotFound.py:293 #, python-format msgid "Try: %s " msgstr "Ceisiwch: %s " -#: ../CommandNotFound/CommandNotFound.py:159 +#: ../CommandNotFound/CommandNotFound.py:295 msgid "Ask your administrator to install one of them" msgstr "Gofynnwch i'ch gweinyddwr i sefydlu un ohonynt" -#: ../command-not-found:18 +#: ../command-not-found:74 #, c-format msgid "%prog [options] " msgstr "%prog [options] " -#: ../command-not-found:20 +#: ../command-not-found:77 msgid "use this path to locate data fields" msgstr "defnyddiwch y llwybr hon i ganfod maesydd data" + +#: ../command-not-found:80 +msgid "ignore local binaries and display the available packages" +msgstr "" + +#: ../command-not-found:83 +msgid "don't print ': command not found'" +msgstr "" + +#: ../command-not-found:88 +#, c-format +msgid "%s: command not found" +msgstr "" + +#: ../CommandNotFound/util.py:26 +msgid "Sorry, command-not-found has crashed! Please file a bug report at:" +msgstr "" + +#: ../CommandNotFound/util.py:28 +msgid "Please include the following information with the report:" +msgstr "" + +#: ../CommandNotFound/util.py:30 +#, python-format +msgid "command-not-found version: %s" +msgstr "" + +#: ../CommandNotFound/util.py:31 +#, python-format +msgid "Python version: %d.%d.%d %s %d" +msgstr "" + +#: ../CommandNotFound/util.py:37 +msgid "Exception information:" +msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/compiz.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/compiz.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/compiz.po 2012-05-08 22:53:35.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/compiz.po 2012-08-03 13:45:39.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-27 12:02+0000\n" -"PO-Revision-Date: 2012-04-27 14:52+0000\n" +"POT-Creation-Date: 2012-07-10 18:35+0000\n" +"PO-Revision-Date: 2012-07-10 22:09+0000\n" "Last-Translator: Kevin Donnelly \n" "Language-Team: Welsh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 05:17+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 14:52+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ../gtk/gnome/compiz.desktop.in.h:1 msgid "Compiz" @@ -3160,26 +3160,50 @@ msgstr "" #: ../plugins/water/water.xml.in.h:13 -msgid "Title wave" +msgid "lightVec X" msgstr "" #: ../plugins/water/water.xml.in.h:14 -msgid "Wave effect from window title" +msgid "Light vector X coordinate" msgstr "" #: ../plugins/water/water.xml.in.h:15 -msgid "Point" +msgid "lightVec Y" msgstr "" #: ../plugins/water/water.xml.in.h:16 -msgid "Add point" +msgid "Light vector Y coordinate" msgstr "" #: ../plugins/water/water.xml.in.h:17 -msgid "Line" +msgid "lightVec Z" msgstr "" #: ../plugins/water/water.xml.in.h:18 +msgid "Light vector Z coordinate" +msgstr "" + +#: ../plugins/water/water.xml.in.h:19 +msgid "Title wave" +msgstr "" + +#: ../plugins/water/water.xml.in.h:20 +msgid "Wave effect from window title" +msgstr "" + +#: ../plugins/water/water.xml.in.h:21 +msgid "Point" +msgstr "" + +#: ../plugins/water/water.xml.in.h:22 +msgid "Add point" +msgstr "" + +#: ../plugins/water/water.xml.in.h:23 +msgid "Line" +msgstr "" + +#: ../plugins/water/water.xml.in.h:24 msgid "Add line" msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/debian-tasks.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/debian-tasks.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/debian-tasks.po 2012-05-08 22:53:34.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/debian-tasks.po 2012-08-03 13:45:38.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: 2012-05-08 04:51+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 14:24+0000\n" +"X-Generator: Launchpad (build 15719)\n" "Language: cy\n" #. Description diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/example-content.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/example-content.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/example-content.po 2012-05-08 22:53:35.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/example-content.po 2012-08-03 13:45:39.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 05:16+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 14:52+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ../data/examples.desktop.in.h:1 msgid "Examples" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/friendly-recovery.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/friendly-recovery.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/friendly-recovery.po 2012-05-08 22:53:37.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/friendly-recovery.po 2012-08-03 13:45:41.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 06:14+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 15:52+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ../lib/recovery-mode/options/apt-snapshots:20 #, sh-format diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/ggzcore.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/ggzcore.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/ggzcore.po 2012-05-08 22:53:29.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/ggzcore.po 2012-08-03 13:45:32.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: 2012-05-08 03:35+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 12:48+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ../../ggzcore/server.c:872 msgid "Unknown negotation" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/gwibber-service-sina.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/gwibber-service-sina.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/gwibber-service-sina.po 2012-05-08 22:53:46.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/gwibber-service-sina.po 2012-08-03 13:45:49.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 10:38+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 20:29+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ../gtk/sina/__init__.py:47 ../gtk/sina/__init__.py:165 #, python-format diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/human-theme.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/human-theme.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/human-theme.po 2012-05-08 22:53:36.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/human-theme.po 2012-08-03 13:45:39.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 05:21+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 14:56+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ../index.theme.in.h:1 msgid "Ubuntu default theme" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/jockey.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/jockey.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/jockey.po 2012-05-08 22:53:38.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/jockey.po 2012-08-03 13:45:42.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: jockey\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-04-12 07:35+0000\n" +"POT-Creation-Date: 2012-07-26 00:04+0000\n" "PO-Revision-Date: 2009-09-08 12:09+0000\n" "Last-Translator: Ciaran Crocker \n" "Language-Team: Welsh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 06:26+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 16:04+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ../text/jockey-text.py:72 msgid "Please enter 'y' or 'n' and press Enter" @@ -47,24 +47,8 @@ "graphics cards, as well as provide 2D acceleration of newer cards." msgstr "" -#: ../examples/handlers/nvidia.py:26 ../data/handlers/nvidia.py:28 -msgid "NVIDIA accelerated graphics driver" -msgstr "Gyrrwr graffeg cyflymedig NVIDIA" - -#: ../examples/handlers/nvidia.py:27 -msgid "3D-accelerated proprietary graphics driver for NVIDIA cards." -msgstr "Gyrrwr graffeg cyflymedig 3D priodol ar gyfer cerdiau NVIDIA" - -#: ../examples/handlers/nvidia.py:29 -msgid "" -"This driver is required to fully utilise the 3D potential of NVIDIA graphics " -"cards, as well as provide 2D acceleration of newer cards.\n" -"\n" -"If you wish to enable desktop effects, this driver is required.\n" -"\n" -"If this driver is not enabled, you will not be able to enable desktop " -"effects and will not be able to run software that requires 3D acceleration, " -"such as some games." +#: ../data/handlers/broadcom_wl.py:20 +msgid "Broadcom STA wireless driver" msgstr "" #: ../examples/handlers/madwifi.py:22 ../data/handlers/madwifi.py:22 @@ -104,6 +88,32 @@ "graphics cards, as well as provide 2D acceleration of newer cards." msgstr "" +#: ../examples/handlers/sl_modem.py:15 ../data/handlers/sl_modem.py:15 +msgid "Software modem" +msgstr "" + +#: ../examples/handlers/sl_modem.py:17 ../data/handlers/sl_modem.py:17 +msgid "" +"This driver enables the usage of many software modems, as commonly found in " +"laptops.\n" +"\n" +"If this driver is not enabled, you will not be able to use your modem." +msgstr "" + +#: ../data/handlers/cdv.py:22 +msgid "Intel Cedarview graphics driver" +msgstr "" + +#: ../data/handlers/cdv.py:27 +msgid "3D-accelerated proprietary graphics driver for Intel Cedarview cards." +msgstr "" + +#: ../data/handlers/cdv.py:29 +msgid "" +"This driver is required to fully utilise the 3D potential of some Intel " +"Cedarview cards, as well as provide 2D acceleration of newer cards." +msgstr "" + #: ../examples/handlers/vmware-client.py:17 #: ../data/handlers/vmware-client.py:17 msgid "VMWare Client Tools" @@ -147,6 +157,10 @@ msgid "Use a different target kernel version than the currently running one." msgstr "" +#: ../data/handlers/dvb_usb_firmware.py:21 +msgid "Firmware for DVB cards" +msgstr "" + #: ../kde/autostart/jockey-kde.desktop.in.h:1 #: ../gtk/autostart/jockey-gtk.desktop.in.h:1 msgid "Check for new hardware drivers" @@ -157,18 +171,6 @@ msgid "Notify about new hardware drivers available for the system" msgstr "Rhoi gwybod am gyrrwyr caledwedd bewydd ar gael am y system" -#: ../examples/handlers/sl_modem.py:15 ../data/handlers/sl_modem.py:15 -msgid "Software modem" -msgstr "" - -#: ../examples/handlers/sl_modem.py:17 ../data/handlers/sl_modem.py:17 -msgid "" -"This driver enables the usage of many software modems, as commonly found in " -"laptops.\n" -"\n" -"If this driver is not enabled, you will not be able to use your modem." -msgstr "" - #: ../kde/jockey-kde.desktop.in.h:1 ../jockey/ui.py:206 ../jockey/ui.py:582 #: ../jockey/ui.py:590 ../jockey/ui.py:598 ../jockey/ui.py:802 #: ../gtk/jockey-gtk.desktop.in.h:1 @@ -179,10 +181,6 @@ msgid "Configure third-party and proprietary drivers" msgstr "" -#: ../data/handlers/dvb_usb_firmware.py:21 -msgid "Firmware for DVB cards" -msgstr "" - #: ../jockey/ui.py:121 msgid "" "Cannot connect to D-BUS, please use the --no-dbus option as root to use " @@ -544,6 +542,10 @@ msgid "NVIDIA accelerated graphics driver (post-release updates)" msgstr "" +#: ../data/handlers/nvidia.py:28 ../examples/handlers/nvidia.py:26 +msgid "NVIDIA accelerated graphics driver" +msgstr "Gyrrwr graffeg cyflymedig NVIDIA" + #: ../data/handlers/nvidia.py:34 msgid "" "3D-accelerated proprietary graphics driver for NVIDIA cards. Required if you " @@ -594,6 +596,18 @@ msgid "To install or remove device drivers, you need to authenticate." msgstr "" -#: ../data/handlers/broadcom_wl.py:20 -msgid "Broadcom STA wireless driver" +#: ../examples/handlers/nvidia.py:27 +msgid "3D-accelerated proprietary graphics driver for NVIDIA cards." +msgstr "Gyrrwr graffeg cyflymedig 3D priodol ar gyfer cerdiau NVIDIA" + +#: ../examples/handlers/nvidia.py:29 +msgid "" +"This driver is required to fully utilise the 3D potential of NVIDIA graphics " +"cards, as well as provide 2D acceleration of newer cards.\n" +"\n" +"If you wish to enable desktop effects, this driver is required.\n" +"\n" +"If this driver is not enabled, you will not be able to enable desktop " +"effects and will not be able to run software that requires 3D acceleration, " +"such as some games." msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/kcm_gtk.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/kcm_gtk.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/kcm_gtk.po 2012-05-08 22:53:38.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/kcm_gtk.po 2012-08-03 13:45:42.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 06:57+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 16:34+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: kcmgtk.cpp:68 msgid "kcm_gtk" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/language-selector.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/language-selector.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/language-selector.po 2012-05-08 22:53:34.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/language-selector.po 2012-08-03 13:45:38.000000000 +0000 @@ -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: 2012-05-08 04:52+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 14:26+0000\n" +"X-Generator: Launchpad (build 15719)\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:50 +#: ../LanguageSelector/LocaleInfo.py:54 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:52 +#: ../LanguageSelector/LocaleInfo.py:56 msgid "Chinese (traditional)" msgstr "Tsieinërg (traddodiadol)" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:225 -#: ../LanguageSelector/qt/QtLanguageSelector.py:85 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:231 +#: ../LanguageSelector/qt/QtLanguageSelector.py:94 msgid "No language information available" msgstr "Dim gwybodaeth iaith ar gael" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:226 -#: ../LanguageSelector/qt/QtLanguageSelector.py:86 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:232 +#: ../LanguageSelector/qt/QtLanguageSelector.py:95 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:230 -#: ../LanguageSelector/qt/QtLanguageSelector.py:80 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:236 +#: ../LanguageSelector/qt/QtLanguageSelector.py:89 msgid "_Update" msgstr "_Diweddaru" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:314 -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:351 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:320 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:357 #: ../data/LanguageSelector.ui.h:23 msgid "Language" msgstr "Iaith" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:321 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:327 msgid "Installed" msgstr "Wedi'i osod" -#. print "%(INSTALL)d to install, %(REMOVE)d to remove" % (countInstall, countRemove) +#. 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:389 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:395 #, 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:391 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:397 #, python-format msgid "%(REMOVE)d to remove" msgid_plural "%(REMOVE)d to remove" @@ -82,24 +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:400 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:406 #, python-format msgid "%s, %s" msgstr "%s, %s" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:462 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:468 msgid "none" msgstr "" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:512 -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:716 -#: ../LanguageSelector/qt/QtLanguageSelector.py:69 -#: ../LanguageSelector/qt/QtLanguageSelector.py:328 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:518 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:722 +#: ../LanguageSelector/qt/QtLanguageSelector.py:78 +#: ../LanguageSelector/qt/QtLanguageSelector.py:336 msgid "Software database is broken" msgstr "Cronfa ddata meddalwedd wei torri" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:513 -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:717 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:519 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:723 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 " @@ -109,11 +109,11 @@ "\"Synaptic\" neu redeg \"sudo apt-get install -f\" mewn terfynell i drwsio'r " "broblem." -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:554 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:560 msgid "Could not install the selected language support" msgstr "Methu gosod y gefnogaeth iaith ddewiswyd" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:555 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:561 msgid "" "This is perhaps a bug of this application. Please file a bug report at " "https://bugs.launchpad.net/ubuntu/+source/language-selector/+filebug" @@ -121,13 +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:579 -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:614 -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:618 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:585 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:620 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:624 msgid "Could not install the full language support" msgstr "Methu gosod cefnogaeth iaith gyflawn" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:580 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:586 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,17 +135,17 @@ "Sources\")." msgstr "" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:615 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:621 msgid "Failed to authorize to install packages." msgstr "" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:673 -#: ../LanguageSelector/qt/QtLanguageSelector.py:162 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:679 +#: ../LanguageSelector/qt/QtLanguageSelector.py:171 msgid "The language support is not installed completely" msgstr "Nid chafodd cefnogaeth iaith ei osod yn llwyr" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:674 -#: ../LanguageSelector/qt/QtLanguageSelector.py:163 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:680 +#: ../LanguageSelector/qt/QtLanguageSelector.py:172 msgid "" "Some translations or writing aids available for your chosen languages are " "not installed yet. Do you want to install them now?" @@ -153,23 +153,23 @@ "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:677 -#: ../LanguageSelector/qt/QtLanguageSelector.py:81 -#: ../LanguageSelector/qt/QtLanguageSelector.py:158 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:683 +#: ../LanguageSelector/qt/QtLanguageSelector.py:90 +#: ../LanguageSelector/qt/QtLanguageSelector.py:167 msgid "_Remind Me Later" msgstr "_Atgoffa Fi Wedyn" #. FIXME: add "details" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:678 -#: ../LanguageSelector/qt/QtLanguageSelector.py:157 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:684 +#: ../LanguageSelector/qt/QtLanguageSelector.py:166 msgid "_Install" msgstr "_Gosod" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:681 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:687 msgid "Details" msgstr "Manylion" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:939 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:947 #, python-format msgid "" "Failed to apply the '%s' format\n" @@ -177,89 +177,89 @@ "close and re-open Language Support." msgstr "" -#: ../LanguageSelector/qt/QtLanguageSelector.py:70 +#: ../LanguageSelector/qt/QtLanguageSelector.py:79 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Muon\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../LanguageSelector/qt/QtLanguageSelector.py:114 +#: ../LanguageSelector/qt/QtLanguageSelector.py:123 msgid "Set System Language" msgstr "Gosod iaith y system" -#: ../LanguageSelector/qt/QtLanguageSelector.py:115 +#: ../LanguageSelector/qt/QtLanguageSelector.py:124 msgid "Default system language:" msgstr "Iaith ddiofyn y system" -#: ../LanguageSelector/qt/QtLanguageSelector.py:116 +#: ../LanguageSelector/qt/QtLanguageSelector.py:125 msgid "Keyboard input method:" msgstr "Dull mewnbwn bysellfwrdd" -#: ../LanguageSelector/qt/QtLanguageSelector.py:117 +#: ../LanguageSelector/qt/QtLanguageSelector.py:126 msgid "Select language to install:" msgstr "Dewis iaith i'w gosod:" -#: ../LanguageSelector/qt/QtLanguageSelector.py:118 +#: ../LanguageSelector/qt/QtLanguageSelector.py:127 msgid "Select language to uninstall:" msgstr "Dewis iaith i'w tynnu:" -#: ../LanguageSelector/qt/QtLanguageSelector.py:119 +#: ../LanguageSelector/qt/QtLanguageSelector.py:128 msgid "Translations" msgstr "Cyfieithiadau" -#: ../LanguageSelector/qt/QtLanguageSelector.py:120 +#: ../LanguageSelector/qt/QtLanguageSelector.py:129 msgid "Input methods" msgstr "Dulliau mewnbwn" -#: ../LanguageSelector/qt/QtLanguageSelector.py:121 +#: ../LanguageSelector/qt/QtLanguageSelector.py:130 msgid "Spellchecking and writing aids" msgstr "Gwirio sillafu a chymorth ysgrifennu" -#: ../LanguageSelector/qt/QtLanguageSelector.py:122 +#: ../LanguageSelector/qt/QtLanguageSelector.py:131 msgid "Extra fonts" msgstr "Ffontiau ychwanegol" -#: ../LanguageSelector/qt/QtLanguageSelector.py:123 +#: ../LanguageSelector/qt/QtLanguageSelector.py:132 msgid "Components:" msgstr "Cydrannau:" #. not sure how to unset all flags, but this disables the item -#: ../LanguageSelector/qt/QtLanguageSelector.py:202 +#: ../LanguageSelector/qt/QtLanguageSelector.py:210 msgid "Already installed" msgstr "Wedi'i osod yn barod" -#: ../LanguageSelector/qt/QtLanguageSelector.py:205 +#: ../LanguageSelector/qt/QtLanguageSelector.py:213 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:208 +#: ../LanguageSelector/qt/QtLanguageSelector.py:216 msgid "Not installed" msgstr "Heb ei osod" -#: ../LanguageSelector/qt/QtLanguageSelector.py:243 +#: ../LanguageSelector/qt/QtLanguageSelector.py:251 msgid "Component already installed" msgstr "" -#: ../LanguageSelector/qt/QtLanguageSelector.py:245 +#: ../LanguageSelector/qt/QtLanguageSelector.py:253 msgid "Component not available" msgstr "" -#: ../LanguageSelector/qt/QtLanguageSelector.py:247 +#: ../LanguageSelector/qt/QtLanguageSelector.py:255 msgid "Component not installed" msgstr "" -#: ../LanguageSelector/qt/QtLanguageSelector.py:288 +#: ../LanguageSelector/qt/QtLanguageSelector.py:296 #, python-format msgid "Default system Language now set to %s." msgstr "Gosodwyd iaith ddiofyn y system i %s." -#: ../LanguageSelector/qt/QtLanguageSelector.py:288 +#: ../LanguageSelector/qt/QtLanguageSelector.py:296 msgid "Language Set" msgstr "Iaith wedi ei gosod" -#: ../LanguageSelector/qt/QtLanguageSelector.py:329 +#: ../LanguageSelector/qt/QtLanguageSelector.py:337 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 " @@ -269,39 +269,39 @@ "\"Adept\" neu redeg \"sudo apt-get install -f\" mewn terfynell i drwsio'r " "broblem." -#: ../LanguageSelector/qt/QtLanguageSelector.py:354 +#: ../LanguageSelector/qt/QtLanguageSelector.py:362 #, python-format msgid "" "All selected components have now been installed for %s. Select them from " "Country/Region & Language." msgstr "" -#: ../LanguageSelector/qt/QtLanguageSelector.py:354 +#: ../LanguageSelector/qt/QtLanguageSelector.py:362 msgid "Language Installed" msgstr "Iaith wedi'i gosod" -#: ../LanguageSelector/qt/QtLanguageSelector.py:356 +#: ../LanguageSelector/qt/QtLanguageSelector.py:364 #, 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:356 +#: ../LanguageSelector/qt/QtLanguageSelector.py:364 msgid "Language Uninstalled" msgstr "Iaith wedi'i thynnu" -#: ../LanguageSelector/qt/QtLanguageSelector.py:364 +#: ../LanguageSelector/qt/QtLanguageSelector.py:372 msgid "Failed to set system language." msgstr "Methwyd gosod iaith y system." -#: ../LanguageSelector/qt/QtLanguageSelector.py:364 +#: ../LanguageSelector/qt/QtLanguageSelector.py:372 msgid "Language Not Set" msgstr "Iaith heb ei gosod" -#: ../LanguageSelector/qt/QtLanguageSelector.py:433 +#: ../LanguageSelector/qt/QtLanguageSelector.py:441 msgid "Please run this software with administrative rights." msgstr "Rheda'r meddalwedd hwn gyda hawliau gweinyddwr." -#: ../LanguageSelector/qt/QtLanguageSelector.py:433 +#: ../LanguageSelector/qt/QtLanguageSelector.py:441 msgid "Not Root User" msgstr "Ddim yn ddefnyddiwr gwraidd" @@ -504,70 +504,70 @@ msgid "don't verify installed language support" msgstr "" -#: ../gnome-language-selector:20 ../check-language-support:25 +#: ../gnome-language-selector:20 ../check-language-support:27 msgid "alternative datadir" msgstr "datadir amgen" -#: ../fontconfig-voodoo:17 +#: ../fontconfig-voodoo:19 msgid "Aborting" msgstr "Yn terfynu" -#: ../fontconfig-voodoo:25 +#: ../fontconfig-voodoo:27 msgid "Force even when a configuration exists" msgstr "Gorfodi hyd yn oed pan fod ffurfweddiad yn bodoli" -#: ../fontconfig-voodoo:27 +#: ../fontconfig-voodoo:29 msgid "Set fontconfig voodoo for the selected language" msgstr "" -#: ../fontconfig-voodoo:31 +#: ../fontconfig-voodoo:33 msgid "" "Guess a configuration based on the LANGUAGE environment. Sets the config to " "'none' if nothing suitable was found" msgstr "" -#: ../fontconfig-voodoo:36 +#: ../fontconfig-voodoo:38 msgid "List the available fontconfig-voodoo configs" msgstr "" -#: ../fontconfig-voodoo:39 +#: ../fontconfig-voodoo:41 msgid "Show the current fontconfig-voodoo config" msgstr "" -#: ../fontconfig-voodoo:42 +#: ../fontconfig-voodoo:44 msgid "Remove the current fontconfig-voodoo config" msgstr "Tynnu ffurfweddiad fontconfig-voodoo cyfredol" -#: ../fontconfig-voodoo:64 +#: ../fontconfig-voodoo:66 msgid "Unconfigured" msgstr "Heb gael ei ffurfweddu" -#: ../fontconfig-voodoo:80 +#: ../fontconfig-voodoo:82 msgid "A configuration exists already. Use '--force' to overwrite it. " msgstr "" "Mae ffurfweddiad eisoes yn bodoli. Defnyddia '--force' i ysgrifennu dros " "hwn. " -#: ../fontconfig-voodoo:89 +#: ../fontconfig-voodoo:91 msgid "No fontconfig-voodoo configuration found for the current LANGUAGE" msgstr "" -#: ../fontconfig-voodoo:96 +#: ../fontconfig-voodoo:98 msgid "No fontconfig-voodoo configuration found for the selected locale" msgstr "" -#: ../check-language-support:22 +#: ../check-language-support:24 msgid "target language code" msgstr "" -#: ../check-language-support:26 +#: ../check-language-support:28 msgid "check for the given package(s) only -- separate packagenames by comma" msgstr "" -#: ../check-language-support:28 +#: ../check-language-support:30 msgid "output all available language support packages for all languages" msgstr "" -#: ../check-language-support:31 +#: ../check-language-support:33 msgid "show installed packages as well as missing ones" msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/launchpad-integration.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/launchpad-integration.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/launchpad-integration.po 2012-05-08 22:53:34.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/launchpad-integration.po 2012-08-03 13:45:38.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 04:56+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 14:31+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: lib/launchpad-integration.c:71 msgid "The Launchpad helper application failed" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/libapt-inst1.4.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/libapt-inst1.4.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/libapt-inst1.4.po 2012-05-08 22:53:24.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/libapt-inst1.4.po 2012-08-03 13:45:28.000000000 +0000 @@ -7,14 +7,14 @@ "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: deity@lists.debian.org\n" "POT-Creation-Date: 2012-03-15 19:05+0000\n" -"PO-Revision-Date: 2012-04-20 12:56+0000\n" +"PO-Revision-Date: 2012-06-16 00:14+0000\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 01:56+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 10:33+0000\n" +"X-Generator: Launchpad (build 15719)\n" "Language: cy\n" #: apt-inst/contrib/extracttar.cc:114 @@ -25,7 +25,7 @@ msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip " -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Archif llygredig" @@ -33,7 +33,7 @@ msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" @@ -95,12 +95,12 @@ 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 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" @@ -155,22 +155,22 @@ msgstr "Mae'r llwybr yn rhy hir" # FIXME: wtf? -#: apt-inst/extract.cc:412 +#: apt-inst/extract.cc:414 #, 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 +#: apt-inst/extract.cc:431 #, 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 +#: apt-inst/extract.cc:464 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" -#: apt-inst/extract.cc:489 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Ni ellir gwneud stat() o %s" @@ -271,18 +271,18 @@ 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 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, 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 +#: apt-inst/deb/debfile.cc:52 #, 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 +#: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" msgstr "Methwyd newid i %s" @@ -292,10 +292,10 @@ msgid "Internal error, could not locate member %s" msgstr "" -#: apt-inst/deb/debfile.cc:189 +#: apt-inst/deb/debfile.cc:179 msgid "Failed to locate a valid control file" msgstr "Methwyd lleoli ffeil rheoli dilys" -#: apt-inst/deb/debfile.cc:274 +#: apt-inst/deb/debfile.cc:264 msgid "Unparsable control file" msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/libapt-pkg4.12.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/libapt-pkg4.12.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/libapt-pkg4.12.po 2012-05-08 22:53:25.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/libapt-pkg4.12.po 2012-08-03 13:45:28.000000000 +0000 @@ -7,14 +7,14 @@ "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: deity@lists.debian.org\n" "POT-Creation-Date: 2012-03-15 19:05+0000\n" -"PO-Revision-Date: 2012-04-20 12:27+0000\n" +"PO-Revision-Date: 2012-06-15 01:29+0000\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 01:56+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 10:34+0000\n" +"X-Generator: Launchpad (build 15719)\n" "Language: cy\n" #: methods/bzip2.cc:60 methods/gzip.cc:52 @@ -32,42 +32,42 @@ 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 +#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 +#: methods/rred.cc:533 msgid "Failed to stat" msgstr "Methwyd stat()" #: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 -#: methods/rred.cc:533 +#: methods/rred.cc:530 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" -#: methods/cdrom.cc:200 +#: methods/cdrom.cc:199 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Methwyd darllen y cronfa ddata CD-ROM %s" -#: methods/cdrom.cc:209 +#: methods/cdrom.cc:208 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 +#: methods/cdrom.cc:218 msgid "Wrong CD-ROM" msgstr "" -#: methods/cdrom.cc:246 +#: methods/cdrom.cc:245 #, 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 +#: methods/cdrom.cc:250 msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265 +#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265 msgid "File not found" msgstr "Ffeil heb ei ganfod" @@ -76,34 +76,34 @@ 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 +#: methods/ftp.cc:168 msgid "Logging in" msgstr "Yn mewngofnodi" -#: methods/ftp.cc:175 +#: methods/ftp.cc:174 msgid "Unable to determine the peer name" msgstr "Ni ellir darganfod enw'r cymar" -#: methods/ftp.cc:180 +#: methods/ftp.cc:179 msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" -#: methods/ftp.cc:211 methods/ftp.cc:239 +#: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:217 +#: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: methods/ftp.cc:224 +#: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: methods/ftp.cc:244 +#: methods/ftp.cc:243 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -112,120 +112,120 @@ "Acquire::ftp::ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:272 +#: methods/ftp.cc:271 #, 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 +#: methods/ftp.cc:297 #, 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 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:342 +#: methods/ftp.cc:341 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 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191 msgid "Read error" msgstr "Gwall darllen" -#: methods/ftp.cc:352 methods/rsh.cc:198 +#: methods/ftp.cc:351 methods/rsh.cc:198 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:369 methods/ftp.cc:381 +#: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 +#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:704 +#: methods/ftp.cc:703 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 +#: methods/ftp.cc:707 methods/connect.cc:111 msgid "Failed" msgstr "Methwyd" -#: methods/ftp.cc:710 +#: methods/ftp.cc:709 msgid "Could not connect passive socket." msgstr "" # FIXME -#: methods/ftp.cc:728 +#: methods/ftp.cc:727 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:742 +#: methods/ftp.cc:741 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:746 +#: methods/ftp.cc:745 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:753 +#: methods/ftp.cc:752 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:785 +#: methods/ftp.cc:784 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:795 +#: methods/ftp.cc:794 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:804 +#: methods/ftp.cc:803 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:824 +#: methods/ftp.cc:823 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:831 +#: methods/ftp.cc:830 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:883 +#: methods/ftp.cc:882 #, 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 +#: methods/ftp.cc:897 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:928 +#: methods/ftp.cc:927 #, 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 +#: methods/ftp.cc:1004 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1117 +#: methods/ftp.cc:1116 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -346,43 +346,43 @@ msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:800 +#: methods/http.cc:799 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:805 +#: methods/http.cc:804 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:828 +#: methods/http.cc:827 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:859 +#: methods/http.cc:858 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:887 +#: methods/http.cc:886 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:901 +#: methods/http.cc:900 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:903 +#: methods/http.cc:902 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1183 +#: methods/http.cc:1160 msgid "Bad header data" msgstr "" -#: methods/http.cc:1200 methods/http.cc:1255 +#: methods/http.cc:1177 methods/http.cc:1232 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1347 +#: methods/http.cc:1324 msgid "Internal error" msgstr "Gwall mewnol" @@ -408,30 +408,30 @@ msgid "Unable to synchronize mmap" msgstr "" -#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258 +#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" -#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291 +#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283 msgid "Failed to truncate file" msgstr "" -#: apt-pkg/contrib/mmap.cc:310 +#: apt-pkg/contrib/mmap.cc:302 #, 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 +#: apt-pkg/contrib/mmap.cc:401 #, 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 +#: apt-pkg/contrib/mmap.cc:404 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -465,69 +465,69 @@ msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:465 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:523 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:678 #, 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 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:727 +#: apt-pkg/contrib/configuration.cc:714 #, 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 +#: apt-pkg/contrib/configuration.cc:754 #, 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 +#: apt-pkg/contrib/configuration.cc:761 #, 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 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, 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 +#: apt-pkg/contrib/configuration.cc:774 #, 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 +#: apt-pkg/contrib/configuration.cc:777 #, c-format msgid "" "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -#: apt-pkg/contrib/configuration.cc:840 +#: apt-pkg/contrib/configuration.cc:827 #, 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 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Gwall!" -#: apt-pkg/contrib/progress.cc:146 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Wedi Gorffen" @@ -580,29 +580,29 @@ msgid "Invalid operation %s" msgstr "Gweithred annilys %s" -#: apt-pkg/contrib/cdromutl.cc:52 +#: apt-pkg/contrib/cdromutl.cc:53 #, 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/contrib/cdromutl.cc:176 apt-pkg/contrib/cdromutl.cc:210 #: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 -#: methods/mirror.cc:98 +#: methods/mirror.cc:97 #, 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/contrib/cdromutl.cc:180 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 +#: apt-pkg/init.cc:106 apt-pkg/init.cc:114 apt-pkg/clean.cc:33 +#: apt-pkg/policy.cc:302 methods/mirror.cc:91 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" -#: apt-pkg/contrib/cdromutl.cc:220 +#: apt-pkg/contrib/cdromutl.cc:218 msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" @@ -647,37 +647,37 @@ "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:690 +#: apt-pkg/contrib/fileutl.cc:679 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:702 +#: apt-pkg/contrib/fileutl.cc:691 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:704 +#: apt-pkg/contrib/fileutl.cc:693 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:708 +#: apt-pkg/contrib/fileutl.cc:697 #, 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 +#: apt-pkg/contrib/fileutl.cc:699 #, 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 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:792 +#: apt-pkg/contrib/fileutl.cc:781 #, c-format msgid "Could not open file descriptor %d" msgstr "" @@ -700,39 +700,39 @@ msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1021 +#: apt-pkg/contrib/fileutl.cc:1010 #, c-format msgid "Problem closing the gzip file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1024 +#: apt-pkg/contrib/fileutl.cc:1013 #, c-format msgid "Problem closing the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1029 +#: apt-pkg/contrib/fileutl.cc:1018 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1040 +#: apt-pkg/contrib/fileutl.cc:1029 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1053 +#: apt-pkg/contrib/fileutl.cc:1042 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:145 msgid "Empty package cache" msgstr "Storfa pecyn gwag" -#: apt-pkg/pkgcache.cc:153 +#: apt-pkg/pkgcache.cc:151 msgid "The package cache file is corrupted" msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-pkg/pkgcache.cc:158 +#: apt-pkg/pkgcache.cc:156 msgid "The package cache file is an incompatible version" msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" @@ -740,104 +740,104 @@ msgid "The package cache file is corrupted, it is too small" msgstr "" -#: apt-pkg/pkgcache.cc:166 +#: apt-pkg/pkgcache.cc:161 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:171 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache was built for a different architecture" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:304 +#: apt-pkg/pkgcache.cc:296 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:304 +#: apt-pkg/pkgcache.cc:296 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:304 +#: apt-pkg/pkgcache.cc:296 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:297 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:297 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:297 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:298 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:298 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:298 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:317 +#: apt-pkg/pkgcache.cc:309 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:317 +#: apt-pkg/pkgcache.cc:309 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:317 +#: apt-pkg/pkgcache.cc:309 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:310 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:310 msgid "extra" msgstr "ychwanegol" -#: apt-pkg/depcache.cc:127 apt-pkg/depcache.cc:156 +#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:128 +#: apt-pkg/depcache.cc:126 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:157 +#: apt-pkg/depcache.cc:155 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:177 apt-pkg/depcache.cc:210 apt-pkg/depcache.cc:214 +#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:239 +#: apt-pkg/depcache.cc:237 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:245 +#: apt-pkg/depcache.cc:243 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" # FIXME: number? -#: apt-pkg/tagfile.cc:123 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:210 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" @@ -898,7 +898,7 @@ msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444 +#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." @@ -913,7 +913,7 @@ msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645 +#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:593 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -926,7 +926,7 @@ msgstr "" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:456 +#: apt-pkg/packagemanager.cc:445 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -942,7 +942,7 @@ msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:250 +#: apt-pkg/algorithms.cc:249 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -950,7 +950,7 @@ "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1185 +#: apt-pkg/algorithms.cc:1175 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -958,17 +958,17 @@ "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1187 +#: apt-pkg/algorithms.cc:1177 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:1480 +#: apt-pkg/algorithms.cc:1427 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: apt-pkg/algorithms.cc:1506 apt-pkg/algorithms.cc:1508 +#: apt-pkg/algorithms.cc:1453 apt-pkg/algorithms.cc:1455 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -991,12 +991,12 @@ #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:858 +#: apt-pkg/acquire.cc:857 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:860 +#: apt-pkg/acquire.cc:859 #, c-format msgid "Retrieving file %li of %li" msgstr "" @@ -1011,18 +1011,18 @@ msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:423 +#: apt-pkg/acquire-worker.cc:424 #, c-format msgid "" "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:151 +#: apt-pkg/init.cc:149 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:167 +#: apt-pkg/init.cc:165 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -1056,18 +1056,18 @@ "available in the sources" msgstr "" -#: apt-pkg/policy.cc:393 +#: apt-pkg/policy.cc:339 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" # FIXME: tense -#: apt-pkg/policy.cc:415 +#: apt-pkg/policy.cc:361 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:423 +#: apt-pkg/policy.cc:369 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" @@ -1088,50 +1088,50 @@ msgid "Error occurred while processing %s (%s%d)" msgstr "" -#: apt-pkg/pkgcachegen.cc:352 +#: apt-pkg/pkgcachegen.cc:348 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:355 +#: apt-pkg/pkgcachegen.cc:351 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:358 +#: apt-pkg/pkgcachegen.cc:354 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:361 +#: apt-pkg/pkgcachegen.cc:357 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:410 +#: apt-pkg/pkgcachegen.cc:406 #, 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:976 +#: apt-pkg/pkgcachegen.cc:960 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:1064 apt-pkg/pkgcachegen.cc:1168 -#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1336 +#: apt-pkg/pkgcachegen.cc:1048 apt-pkg/pkgcachegen.cc:1152 +#: apt-pkg/pkgcachegen.cc:1158 apt-pkg/pkgcachegen.cc:1304 msgid "Reading package lists" msgstr "" -#: apt-pkg/pkgcachegen.cc:1081 +#: apt-pkg/pkgcachegen.cc:1065 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:1165 +#: apt-pkg/pkgcachegen.cc:1149 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" -#: apt-pkg/pkgcachegen.cc:1275 apt-pkg/pkgcachegen.cc:1282 +#: apt-pkg/pkgcachegen.cc:1243 apt-pkg/pkgcachegen.cc:1250 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" @@ -1144,12 +1144,12 @@ msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1858 -#: apt-pkg/acquire-item.cc:2001 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1833 +#: apt-pkg/acquire-item.cc:1976 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1387 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -1161,7 +1161,7 @@ msgid "Unable to find hash sum for '%s' in Release file" msgstr "" -#: apt-pkg/acquire-item.cc:1438 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" @@ -1172,12 +1172,12 @@ "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1498 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1531 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -1185,13 +1185,13 @@ msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546 +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1645 +#: apt-pkg/acquire-item.cc:1624 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -1209,14 +1209,14 @@ "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:1763 +#: apt-pkg/acquire-item.cc:1738 #, 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:1850 +#: apt-pkg/acquire-item.cc:1825 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -1240,7 +1240,7 @@ msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:129 +#: apt-pkg/indexrecords.cc:125 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "" @@ -1250,104 +1250,105 @@ msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:525 +#: apt-pkg/cdrom.cc:518 #, 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 +#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:562 +#: apt-pkg/cdrom.cc:552 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847 +#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827 msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:578 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:596 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:614 +#: apt-pkg/cdrom.cc:600 msgid "Waiting for disc...\n" msgstr "" -#: apt-pkg/cdrom.cc:623 +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:608 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:626 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:684 +#: apt-pkg/cdrom.cc:666 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:695 +#: apt-pkg/cdrom.cc:677 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:722 +#: apt-pkg/cdrom.cc:703 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:751 +#: apt-pkg/cdrom.cc:732 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:768 +#: apt-pkg/cdrom.cc:748 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:770 +#: apt-pkg/cdrom.cc:752 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:797 +#: apt-pkg/cdrom.cc:778 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:805 +#: apt-pkg/cdrom.cc:787 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -1455,92 +1456,92 @@ msgid "Execute external solver" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:68 +#: apt-pkg/deb/dpkgpm.cc:52 #, c-format msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:69 apt-pkg/deb/dpkgpm.cc:863 +#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:828 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:70 apt-pkg/deb/dpkgpm.cc:870 +#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:835 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:71 +#: apt-pkg/deb/dpkgpm.cc:55 #, c-format msgid "Completely removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:72 +#: apt-pkg/deb/dpkgpm.cc:56 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:73 +#: apt-pkg/deb/dpkgpm.cc:57 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:669 +#: apt-pkg/deb/dpkgpm.cc:651 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:684 apt-pkg/deb/dpkgpm.cc:704 +#: apt-pkg/deb/dpkgpm.cc:666 apt-pkg/deb/dpkgpm.cc:680 #, c-format msgid "Could not open file '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:856 +#: apt-pkg/deb/dpkgpm.cc:821 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:857 +#: apt-pkg/deb/dpkgpm.cc:822 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:862 +#: apt-pkg/deb/dpkgpm.cc:827 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:864 +#: apt-pkg/deb/dpkgpm.cc:829 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:869 +#: apt-pkg/deb/dpkgpm.cc:834 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:871 +#: apt-pkg/deb/dpkgpm.cc:836 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:876 +#: apt-pkg/deb/dpkgpm.cc:841 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:877 +#: apt-pkg/deb/dpkgpm.cc:842 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1097 +#: apt-pkg/deb/dpkgpm.cc:1062 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1128 +#: apt-pkg/deb/dpkgpm.cc:1093 msgid "Running dpkg" msgstr "" @@ -1548,28 +1549,28 @@ msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1353 +#: apt-pkg/deb/dpkgpm.cc:1301 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 +#: apt-pkg/deb/dpkgpm.cc:1306 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1360 +#: apt-pkg/deb/dpkgpm.cc:1308 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 +#: apt-pkg/deb/dpkgpm.cc:1314 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1373 +#: apt-pkg/deb/dpkgpm.cc:1321 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -1581,62 +1582,62 @@ "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1407 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:79 +#: apt-pkg/deb/debsystem.cc:69 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:82 +#: apt-pkg/deb/debsystem.cc:72 #, 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 +#: apt-pkg/deb/debsystem.cc:88 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:116 +#: apt-pkg/deb/debsystem.cc:106 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 +#: methods/mirror.cc:256 #, 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 +#: methods/mirror.cc:263 #, c-format msgid "Can not read mirror file '%s'" msgstr "" -#: methods/mirror.cc:438 +#: methods/mirror.cc:407 #, c-format msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:506 +#: methods/rred.cc:503 #, 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 +#: methods/rred.cc:508 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/libvirt.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/libvirt.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/libvirt.po 2012-05-08 22:53:37.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/libvirt.po 2012-08-03 13:45:40.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: libvirt\n" "Report-Msgid-Bugs-To: libvir-list@redhat.com\n" "POT-Creation-Date: 2011-12-08 14:59+0800\n" -"PO-Revision-Date: 2012-05-03 15:24+0000\n" +"PO-Revision-Date: 2012-08-01 07:49+0000\n" "Last-Translator: Serge Hallyn \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: 2012-05-08 05:46+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 15:23+0000\n" +"X-Generator: Launchpad (build 15719)\n" "Language: \n" #: daemon/libvirtd.c:256 diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/Linux-PAM.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/Linux-PAM.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/Linux-PAM.po 2012-05-08 22:53:28.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/Linux-PAM.po 2012-08-03 13:45:32.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: 2012-05-08 03:08+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 12:08+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: libpam_misc/misc_conv.c:33 msgid "...Time is running out...\n" @@ -33,7 +33,7 @@ msgstr "" #: libpam/pam_get_authtok.c:39 modules/pam_exec/pam_exec.c:142 -#: modules/pam_unix/pam_unix_auth.c:157 modules/pam_userdb/pam_userdb.c:63 +#: modules/pam_unix/pam_unix_auth.c:157 modules/pam_userdb/pam_userdb.c:64 msgid "Password: " msgstr "Cyfrinair: " @@ -51,12 +51,12 @@ msgid "Sorry, passwords do not match." msgstr "" -#: libpam/pam_get_authtok.c:132 libpam/pam_get_authtok.c:208 +#: libpam/pam_get_authtok.c:133 libpam/pam_get_authtok.c:209 #, c-format msgid "Retype %s" msgstr "" -#: libpam/pam_get_authtok.c:152 libpam/pam_get_authtok.c:221 +#: libpam/pam_get_authtok.c:153 libpam/pam_get_authtok.c:222 msgid "Password change aborted." msgstr "" @@ -233,12 +233,12 @@ msgstr "" #: modules/pam_cracklib/pam_cracklib.c:555 -#: modules/pam_unix/pam_unix_passwd.c:475 +#: modules/pam_unix/pam_unix_passwd.c:476 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:555 -#: modules/pam_unix/pam_unix_passwd.c:475 +#: modules/pam_unix/pam_unix_passwd.c:476 msgid "Password unchanged" msgstr "" @@ -315,38 +315,38 @@ msgid "Too many logins for '%s'." msgstr "" -#: modules/pam_mail/pam_mail.c:318 +#: modules/pam_mail/pam_mail.c:297 msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:321 +#: modules/pam_mail/pam_mail.c:300 msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:324 +#: modules/pam_mail/pam_mail.c:303 msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:328 +#: modules/pam_mail/pam_mail.c:307 msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:335 +#: modules/pam_mail/pam_mail.c:314 #, c-format msgid "You have no mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:339 +#: modules/pam_mail/pam_mail.c:318 #, c-format msgid "You have new mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:343 +#: modules/pam_mail/pam_mail.c:322 #, c-format msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:348 +#: modules/pam_mail/pam_mail.c:327 #, c-format msgid "You have mail in folder %s." msgstr "" @@ -362,7 +362,7 @@ msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:218 -#: modules/pam_unix/pam_unix_passwd.c:496 +#: modules/pam_unix/pam_unix_passwd.c:497 msgid "Password has been already used. Choose another." msgstr "" @@ -396,17 +396,17 @@ msgid "No default type for role %s\n" msgstr "" -#: modules/pam_selinux/pam_selinux.c:677 +#: modules/pam_selinux/pam_selinux.c:667 #, c-format msgid "Unable to get valid context for %s" msgstr "" -#: modules/pam_selinux/pam_selinux.c:728 +#: modules/pam_selinux/pam_selinux.c:718 #, c-format msgid "Security Context %s Assigned" msgstr "" -#: modules/pam_selinux/pam_selinux.c:749 +#: modules/pam_selinux/pam_selinux.c:739 #, c-format msgid "Key Creation Context %s Assigned" msgstr "" @@ -503,7 +503,7 @@ " [-r] [--reset[=n]] [--quiet]\n" msgstr "" -#: modules/pam_timestamp/pam_timestamp.c:339 +#: modules/pam_timestamp/pam_timestamp.c:345 #, c-format msgid "Access granted (last access was %ld seconds ago)." msgstr "" @@ -537,27 +537,27 @@ msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:492 +#: modules/pam_unix/pam_unix_passwd.c:493 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:597 +#: modules/pam_unix/pam_unix_passwd.c:600 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:608 +#: modules/pam_unix/pam_unix_passwd.c:611 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:643 +#: modules/pam_unix/pam_unix_passwd.c:646 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:703 +#: modules/pam_unix/pam_unix_passwd.c:706 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:704 +#: modules/pam_unix/pam_unix_passwd.c:707 msgid "Retype new UNIX password: " msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/ltsp-login.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/ltsp-login.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/ltsp-login.po 2012-05-08 22:53:34.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/ltsp-login.po 2012-08-03 13:45:38.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 04:57+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 14:31+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ltsp-login.sh:17 #, sh-format diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/newt.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/newt.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/newt.po 2012-05-08 22:53:28.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/newt.po 2012-08-03 13:45:32.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: 2012-05-08 03:07+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 12:07+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ../dialogboxes.c:43 ../dialogboxes.c:48 ../dialogboxes.c:493 msgid "Ok" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/pidgin.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/pidgin.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/pidgin.po 2012-05-08 22:53:37.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/pidgin.po 2012-08-03 13:45:41.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: 2012-05-08 06:08+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 15:46+0000\n" +"X-Generator: Launchpad (build 15719)\n" #. Translators may want to transliterate the name. #. It is not to be translated. @@ -112,7 +112,7 @@ msgstr "" #: ../finch/gntaccount.c:570 ../finch/gntconn.c:138 -#: ../pidgin/gtkaccount.c:1576 ../pidgin/gtkblist.c:5128 +#: ../pidgin/gtkaccount.c:1576 ../pidgin/gtkblist.c:5127 msgid "Modify Account" msgstr "Addasu cyfrif" @@ -208,14 +208,14 @@ #: ../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:881 ../pidgin/gtkdialogs.c:1020 -#: ../pidgin/gtkdialogs.c:1112 ../pidgin/gtkdialogs.c:1132 -#: ../pidgin/gtkdialogs.c:1156 ../pidgin/gtkdialogs.c:1178 -#: ../pidgin/gtkdialogs.c:1226 ../pidgin/gtkdialogs.c:1267 -#: ../pidgin/gtkdialogs.c:1323 ../pidgin/gtkdialogs.c:1362 -#: ../pidgin/gtkdialogs.c:1389 ../pidgin/gtkimhtmltoolbar.c:451 +#: ../pidgin/gtkblist.c:705 ../pidgin/gtkblist.c:3582 +#: ../pidgin/gtkblist.c:7331 ../pidgin/gtkcertmgr.c:195 +#: ../pidgin/gtkdialogs.c:883 ../pidgin/gtkdialogs.c:1022 +#: ../pidgin/gtkdialogs.c:1114 ../pidgin/gtkdialogs.c:1134 +#: ../pidgin/gtkdialogs.c:1158 ../pidgin/gtkdialogs.c:1180 +#: ../pidgin/gtkdialogs.c:1228 ../pidgin/gtkdialogs.c:1269 +#: ../pidgin/gtkdialogs.c:1325 ../pidgin/gtkdialogs.c:1364 +#: ../pidgin/gtkdialogs.c:1391 ../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 @@ -231,7 +231,7 @@ #: ../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 +#: ../libpurple/protocols/jabber/buddy.c:680 ../pidgin/gtkblist.c:705 #: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:826 #: ../pidgin/gtkrequest.c:307 msgid "Save" @@ -275,7 +275,7 @@ #: ../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/gtkblist.c:7330 ../pidgin/gtkconv.c:1696 #: ../pidgin/gtkrequest.c:305 msgid "Add" msgstr "" @@ -360,8 +360,8 @@ msgid "Error adding buddy" msgstr "" -#: ../finch/gntblist.c:678 ../libpurple/protocols/irc/irc.c:1061 -#: ../libpurple/protocols/irc/msgs.c:370 +#: ../finch/gntblist.c:678 ../libpurple/protocols/irc/irc.c:1034 +#: ../libpurple/protocols/irc/msgs.c:435 #: ../libpurple/protocols/jabber/jabber.c:1401 #: ../libpurple/protocols/jabber/jabber.c:1403 #: ../libpurple/protocols/oscar/oscar.c:3032 @@ -397,7 +397,7 @@ #: ../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/gtkblist.c:3779 ../pidgin/gtknotify.c:712 #: ../pidgin/gtkpounce.c:1291 ../pidgin/plugins/gevolution/gevolution.c:456 msgid "Account" msgstr "" @@ -411,7 +411,7 @@ #: ../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 +#: ../libpurple/protocols/yahoo/libymsg.c:4155 ../pidgin/gtkblist.c:7093 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:451 msgid "Add Buddy" msgstr "" @@ -445,8 +445,8 @@ #: ../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:1131 -#: ../pidgin/gtkdialogs.c:1155 ../pidgin/gtkdialogs.c:1177 +#: ../libpurple/protocols/zephyr/zephyr.c:1180 ../pidgin/gtkdialogs.c:1133 +#: ../pidgin/gtkdialogs.c:1157 ../pidgin/gtkdialogs.c:1179 #: ../pidgin/gtkrequest.c:308 msgid "Alias" msgstr "" @@ -460,7 +460,7 @@ msgid "Auto-join" msgstr "" -#: ../finch/gntblist.c:804 ../finch/gntblist.c:1261 ../pidgin/gtkblist.c:7274 +#: ../finch/gntblist.c:804 ../finch/gntblist.c:1261 ../pidgin/gtkblist.c:7271 msgid "Add Chat" msgstr "" @@ -478,7 +478,7 @@ #: ../finch/gntblist.c:852 ../finch/gntblist.c:1263 #: ../libpurple/protocols/sametime/sametime.c:5456 -#: ../libpurple/protocols/sametime/sametime.c:5544 ../pidgin/gtkblist.c:7330 +#: ../libpurple/protocols/sametime/sametime.c:5544 ../pidgin/gtkblist.c:7327 msgid "Add Group" msgstr "" @@ -486,7 +486,7 @@ msgid "Enter the name of the group" msgstr "" -#: ../finch/gntblist.c:1209 ../pidgin/gtkblist.c:705 +#: ../finch/gntblist.c:1209 ../pidgin/gtkblist.c:704 msgid "Edit Chat" msgstr "" @@ -578,7 +578,7 @@ #. Buddy List #: ../finch/gntblist.c:1711 ../finch/gntblist.c:3126 ../finch/gntprefs.c:259 -#: ../finch/gntui.c:100 ../pidgin/gtkblist.c:5769 +#: ../finch/gntui.c:100 ../pidgin/gtkblist.c:5768 #: ../pidgin/plugins/win32/winprefs/winprefs.c:303 msgid "Buddy List" msgstr "" @@ -619,7 +619,7 @@ #: ../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 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1065 ../pidgin/gtkblist.c:3803 msgid "Nickname" msgstr "" @@ -634,8 +634,8 @@ #: ../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:2709 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:709 ../pidgin/gtkblist.c:3831 +#: ../pidgin/gtkblist.c:4286 ../pidgin/gtkprefs.c:2709 msgid "Idle" msgstr "" @@ -712,19 +712,19 @@ #: ../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:880 -#: ../pidgin/gtkdialogs.c:1019 ../pidgin/gtkdialogs.c:1111 +#: ../libpurple/protocols/yahoo/yahoo_aliases.c:599 ../pidgin/gtkblist.c:3581 +#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:882 +#: ../pidgin/gtkdialogs.c:1021 ../pidgin/gtkdialogs.c:1113 #: ../pidgin/gtkrequest.c:300 ../pidgin/gtkutils.c:1621 #: ../pidgin/gtkutils.c:1641 msgid "OK" msgstr "" -#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:875 +#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:877 msgid "New Instant Message" msgstr "" -#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:877 +#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:879 msgid "" "Please enter the username or alias of the person you would like to IM." msgstr "" @@ -733,7 +733,7 @@ msgid "Channel" msgstr "" -#: ../finch/gntblist.c:2882 ../pidgin/gtkblist.c:1137 +#: ../finch/gntblist.c:2882 ../pidgin/gtkblist.c:1136 msgid "Join a Chat" msgstr "" @@ -745,7 +745,7 @@ msgid "Join" msgstr "" -#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1108 +#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1110 msgid "" "Please enter the username or alias of the person whose log you would like to " "view." @@ -796,7 +796,7 @@ msgid "By Status" msgstr "" -#: ../finch/gntblist.c:3059 ../pidgin/gtkblist.c:4819 +#: ../finch/gntblist.c:3059 ../pidgin/gtkblist.c:4818 msgid "Alphabetically" msgstr "" @@ -922,7 +922,7 @@ #: ../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 +#: ../pidgin/gtkblist.c:5874 ../pidgin/gtkrequest.c:303 msgid "Close" msgstr "" @@ -999,7 +999,7 @@ msgid "You have left this chat." msgstr "" -#: ../finch/gntconv.c:382 ../pidgin/gtkconv.c:7600 +#: ../finch/gntconv.c:382 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." @@ -1087,27 +1087,27 @@ msgid "%s is not a valid color. See '/help msgcolor' for valid colors." msgstr "" -#: ../finch/gntconv.c:1415 ../pidgin/gtkconv.c:8079 +#: ../finch/gntconv.c:1415 ../pidgin/gtkconv.c:8085 msgid "" "say <message>: Send a message normally as if you weren't using a " "command." msgstr "" -#: ../finch/gntconv.c:1418 ../pidgin/gtkconv.c:8082 +#: ../finch/gntconv.c:1418 ../pidgin/gtkconv.c:8088 msgid "me <action>: Send an IRC style action to a buddy or chat." msgstr "" -#: ../finch/gntconv.c:1421 ../pidgin/gtkconv.c:8085 +#: ../finch/gntconv.c:1421 ../pidgin/gtkconv.c:8091 msgid "" "debug <option>: Send various debug information to the current " "conversation." msgstr "" -#: ../finch/gntconv.c:1424 ../pidgin/gtkconv.c:8088 +#: ../finch/gntconv.c:1424 ../pidgin/gtkconv.c:8094 msgid "clear: Clears the conversation scrollback." msgstr "" -#: ../finch/gntconv.c:1427 ../pidgin/gtkconv.c:8094 +#: ../finch/gntconv.c:1427 ../pidgin/gtkconv.c:8100 msgid "help <command>: Help on a specific command." msgstr "" @@ -1227,8 +1227,8 @@ #: ../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 +#: ../libpurple/protocols/yahoo/libymsg.c:4030 ../pidgin/gtkblist.c:3876 +#: ../pidgin/gtkblist.c:3890 ../pidgin/gtkblist.c:3892 #: ../pidgin/gtksavedstatuses.c:970 ../pidgin/gtksavedstatuses.c:1120 msgid "Status" msgstr "" @@ -1803,7 +1803,7 @@ msgstr "" #. Create the window. -#: ../finch/gntroomlist.c:287 ../finch/gntui.c:106 ../pidgin/gtkblist.c:7280 +#: ../finch/gntroomlist.c:287 ../finch/gntui.c:106 ../pidgin/gtkblist.c:7277 #: ../pidgin/gtkroomlist.c:531 msgid "Room List" msgstr "" @@ -2006,7 +2006,7 @@ #: ../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/irc/irc.c:273 #: ../libpurple/protocols/jabber/jabber.c:2372 #: ../libpurple/protocols/jabber/jabber.c:2396 #: ../libpurple/protocols/jabber/jabber.c:2412 @@ -2281,13 +2281,13 @@ #: ../libpurple/protocols/oscar/oscar.c:4703 #: ../libpurple/protocols/oscar/userinfo.c:279 #: ../libpurple/protocols/yahoo/libymsg.c:3876 ../libpurple/status.c:162 -#: ../pidgin/gtkblist.c:3877 ../pidgin/gtkblist.c:4264 +#: ../pidgin/gtkblist.c:3876 ../pidgin/gtkblist.c:4263 #: ../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 +#: ../finch/plugins/grouping.c:115 ../pidgin/gtkblist.c:3912 msgid "Online Buddies" msgstr "" @@ -2433,7 +2433,7 @@ #: ../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 +#: ../libpurple/protocols/myspace/myspace.c:3484 ../pidgin/gtkblist.c:6955 #: ../pidgin/plugins/gevolution/gevo-util.c:73 #: ../pidgin/plugins/gevolution/gevolution.c:106 msgid "Buddies" @@ -3086,29 +3086,29 @@ msgid "(%s) %s : %s\n" msgstr "" -#: ../libpurple/media/backend-fs2.c:865 +#: ../libpurple/media/backend-fs2.c:880 msgid "" "No codecs found. Install some GStreamer codecs found in GStreamer plugins " "packages." msgstr "" -#: ../libpurple/media/backend-fs2.c:882 +#: ../libpurple/media/backend-fs2.c:922 msgid "A non-recoverable Farstream error has occurred." msgstr "" -#: ../libpurple/media/backend-fs2.c:1110 +#: ../libpurple/media/backend-fs2.c:1191 msgid "Error with your microphone" msgstr "" -#: ../libpurple/media/backend-fs2.c:1113 +#: ../libpurple/media/backend-fs2.c:1194 msgid "Error with your webcam" msgstr "" -#: ../libpurple/media/backend-fs2.c:1120 +#: ../libpurple/media/backend-fs2.c:1201 msgid "Conference error" msgstr "" -#: ../libpurple/media/backend-fs2.c:1520 +#: ../libpurple/media/backend-fs2.c:1610 #, c-format msgid "Error creating session: %s" msgstr "" @@ -4084,13 +4084,13 @@ msgid "Error communicating with local mDNSResponder." msgstr "" -#: ../libpurple/protocols/gg/gg.c:81 ../libpurple/proxy.c:2294 -#: ../libpurple/proxy.c:2362 +#: ../libpurple/protocols/gg/gg.c:81 ../libpurple/proxy.c:2347 +#: ../libpurple/proxy.c:2415 msgid "Invalid proxy settings" msgstr "" -#: ../libpurple/protocols/gg/gg.c:82 ../libpurple/proxy.c:2294 -#: ../libpurple/proxy.c:2362 +#: ../libpurple/protocols/gg/gg.c:82 ../libpurple/proxy.c:2347 +#: ../libpurple/proxy.c:2415 msgid "" "Either the host name or port number specified for your given proxy type is " "invalid." @@ -4360,8 +4360,8 @@ #. 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/gg/gg.c:1176 ../libpurple/protocols/irc/irc.c:575 +#: ../libpurple/protocols/irc/msgs.c:429 #: ../libpurple/protocols/jabber/jutil.c:662 #: ../libpurple/protocols/mxit/roster.c:55 #: ../libpurple/protocols/novell/novell.c:2847 @@ -4473,7 +4473,7 @@ #. 1. connect to server #. connect to the server -#: ../libpurple/protocols/gg/gg.c:2173 ../libpurple/protocols/irc/irc.c:385 +#: ../libpurple/protocols/gg/gg.c:2173 ../libpurple/protocols/irc/irc.c:360 #: ../libpurple/protocols/jabber/jabber.c:1741 #: ../libpurple/protocols/msn/session.c:432 #: ../libpurple/protocols/myspace/myspace.c:2206 @@ -4612,19 +4612,19 @@ msgid "Unable to open a listening port." msgstr "" -#: ../libpurple/protocols/irc/irc.c:79 +#: ../libpurple/protocols/irc/irc.c:77 msgid "Error displaying MOTD" msgstr "" -#: ../libpurple/protocols/irc/irc.c:79 +#: ../libpurple/protocols/irc/irc.c:77 msgid "No MOTD available" msgstr "" -#: ../libpurple/protocols/irc/irc.c:80 +#: ../libpurple/protocols/irc/irc.c:78 msgid "There is no MOTD associated with this connection." msgstr "" -#: ../libpurple/protocols/irc/irc.c:83 +#: ../libpurple/protocols/irc/irc.c:81 #, c-format msgid "MOTD for %s" msgstr "" @@ -4635,8 +4635,8 @@ #. * 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/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:173 +#: ../libpurple/protocols/irc/irc.c:673 ../libpurple/protocols/irc/irc.c:704 #: ../libpurple/protocols/jabber/bosh.c:1024 #: ../libpurple/protocols/jabber/bosh.c:1080 #: ../libpurple/protocols/jabber/jabber.c:408 @@ -4650,32 +4650,32 @@ #: ../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 +#: ../libpurple/protocols/yahoo/ycht.c:476 ../libpurple/proxy.c:948 +#: ../libpurple/proxy.c:1532 ../libpurple/proxy.c:1646 +#: ../libpurple/proxy.c:1881 ../libpurple/proxy.c:1957 #, c-format msgid "Lost connection with server: %s" msgstr "" -#: ../libpurple/protocols/irc/irc.c:313 +#: ../libpurple/protocols/irc/irc.c:288 msgid "View MOTD" msgstr "" -#: ../libpurple/protocols/irc/irc.c:325 ../libpurple/protocols/silc/chat.c:34 +#: ../libpurple/protocols/irc/irc.c:300 ../libpurple/protocols/silc/chat.c:34 #: ../libpurple/protocols/silc10/chat.c:33 msgid "_Channel:" msgstr "" -#: ../libpurple/protocols/irc/irc.c:331 +#: ../libpurple/protocols/irc/irc.c:306 #: ../libpurple/protocols/jabber/chat.c:62 ../pidgin/gtkaccount.c:594 msgid "_Password:" msgstr "" -#: ../libpurple/protocols/irc/irc.c:364 +#: ../libpurple/protocols/irc/irc.c:339 msgid "IRC nick and server may not contain whitespace" msgstr "" -#: ../libpurple/protocols/irc/irc.c:395 +#: ../libpurple/protocols/irc/irc.c:370 #: ../libpurple/protocols/jabber/bosh.c:975 #: ../libpurple/protocols/jabber/jabber.c:1064 #: ../libpurple/protocols/novell/novell.c:2218 @@ -4683,7 +4683,7 @@ msgid "SSL support unavailable" msgstr "" -#: ../libpurple/protocols/irc/irc.c:408 +#: ../libpurple/protocols/irc/irc.c:383 #: ../libpurple/protocols/jabber/bosh.c:981 #: ../libpurple/protocols/jabber/jabber.c:794 #: ../libpurple/protocols/jabber/jabber.c:879 @@ -4712,7 +4712,7 @@ msgstr "" #. this is a regular connect, error out -#: ../libpurple/protocols/irc/irc.c:491 +#: ../libpurple/protocols/irc/irc.c:466 #: ../libpurple/protocols/myspace/myspace.c:2163 #: ../libpurple/protocols/oscar/flap_connection.c:479 #: ../libpurple/protocols/sametime/sametime.c:1805 @@ -4724,7 +4724,7 @@ msgid "Unable to connect: %s" msgstr "" -#: ../libpurple/protocols/irc/irc.c:709 ../libpurple/protocols/irc/irc.c:740 +#: ../libpurple/protocols/irc/irc.c:682 ../libpurple/protocols/irc/irc.c:713 #: ../libpurple/protocols/jabber/jabber.c:669 #: ../libpurple/protocols/jabber/jabber.c:727 #: ../libpurple/protocols/myspace/myspace.c:2079 @@ -4732,21 +4732,21 @@ #: ../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 +#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:937 +#: ../libpurple/proxy.c:1520 ../libpurple/proxy.c:1634 +#: ../libpurple/proxy.c:1870 ../libpurple/proxy.c:1945 #, c-format msgid "Server closed the connection" msgstr "" -#: ../libpurple/protocols/irc/irc.c:876 +#: ../libpurple/protocols/irc/irc.c:849 #: ../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/irc/irc.c:852 #: ../libpurple/protocols/sametime/sametime.c:3458 #: ../libpurple/protocols/silc/chat.c:1408 #: ../libpurple/protocols/silc/ops.c:1409 @@ -4764,17 +4764,17 @@ #. *< id #. *< name #. *< version -#: ../libpurple/protocols/irc/irc.c:1023 +#: ../libpurple/protocols/irc/irc.c:996 msgid "IRC Protocol Plugin" msgstr "" #. * summary -#: ../libpurple/protocols/irc/irc.c:1024 +#: ../libpurple/protocols/irc/irc.c:997 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/irc/irc.c:1022 ../libpurple/protocols/irc/msgs.c:442 #: ../libpurple/protocols/msn/msn.c:3025 #: ../libpurple/protocols/oscar/oscar.c:5771 #: ../libpurple/protocols/sametime/sametime.c:5784 @@ -4787,7 +4787,7 @@ msgstr "" #. port to connect to -#: ../libpurple/protocols/irc/irc.c:1052 ../libpurple/protocols/msn/msn.c:3030 +#: ../libpurple/protocols/irc/irc.c:1025 ../libpurple/protocols/msn/msn.c:3030 #: ../libpurple/protocols/oscar/oscar.c:5774 #: ../libpurple/protocols/sametime/sametime.c:5793 #: ../libpurple/protocols/silc/silc.c:2197 @@ -4795,15 +4795,15 @@ msgid "Port" msgstr "" -#: ../libpurple/protocols/irc/irc.c:1055 +#: ../libpurple/protocols/irc/irc.c:1028 msgid "Encodings" msgstr "" -#: ../libpurple/protocols/irc/irc.c:1058 +#: ../libpurple/protocols/irc/irc.c:1031 msgid "Auto-detect incoming UTF-8" msgstr "" -#: ../libpurple/protocols/irc/irc.c:1064 ../libpurple/protocols/irc/msgs.c:371 +#: ../libpurple/protocols/irc/irc.c:1037 ../libpurple/protocols/irc/msgs.c:436 #: ../libpurple/protocols/silc/silc.c:1249 #: ../libpurple/protocols/silc10/silc.c:945 msgid "Real name" @@ -4813,158 +4813,158 @@ #. 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 +#: ../libpurple/protocols/irc/irc.c:1045 msgid "Use SSL" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:192 +#: ../libpurple/protocols/irc/msgs.c:257 msgid "Bad mode" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:215 +#: ../libpurple/protocols/irc/msgs.c:280 #, c-format msgid "Ban on %s by %s, set %s ago" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:219 +#: ../libpurple/protocols/irc/msgs.c:284 #, c-format msgid "Ban on %s" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:234 +#: ../libpurple/protocols/irc/msgs.c:299 msgid "End of ban list" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:248 +#: ../libpurple/protocols/irc/msgs.c:313 #, c-format msgid "You are banned from %s." msgstr "" -#: ../libpurple/protocols/irc/msgs.c:249 +#: ../libpurple/protocols/irc/msgs.c:314 msgid "Banned" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:266 +#: ../libpurple/protocols/irc/msgs.c:331 #, c-format msgid "Cannot ban %s: banlist is full" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:355 +#: ../libpurple/protocols/irc/msgs.c:420 msgid " (ircop)" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:356 +#: ../libpurple/protocols/irc/msgs.c:421 msgid " (identified)" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:357 +#: ../libpurple/protocols/irc/msgs.c:422 #: ../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/irc/msgs.c:448 #: ../libpurple/protocols/silc/ops.c:1284 #: ../libpurple/protocols/silc10/ops.c:1272 msgid "Currently on" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:388 +#: ../libpurple/protocols/irc/msgs.c:453 msgid "Idle for" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:391 +#: ../libpurple/protocols/irc/msgs.c:456 msgid "Online since" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:395 +#: ../libpurple/protocols/irc/msgs.c:460 msgid "Defining adjective:" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:395 +#: ../libpurple/protocols/irc/msgs.c:460 msgid "Glorious" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:552 +#: ../libpurple/protocols/irc/msgs.c:621 #, c-format msgid "%s has changed the topic to: %s" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:554 +#: ../libpurple/protocols/irc/msgs.c:623 #, c-format msgid "%s has cleared the topic." msgstr "" -#: ../libpurple/protocols/irc/msgs.c:562 +#: ../libpurple/protocols/irc/msgs.c:631 #, c-format msgid "The topic for %s is: %s" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:580 +#: ../libpurple/protocols/irc/msgs.c:649 #, c-format msgid "Unknown message '%s'" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:581 +#: ../libpurple/protocols/irc/msgs.c:650 msgid "Unknown message" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:581 +#: ../libpurple/protocols/irc/msgs.c:650 msgid "The IRC server received a message it did not understand." msgstr "" -#: ../libpurple/protocols/irc/msgs.c:602 +#: ../libpurple/protocols/irc/msgs.c:671 #, c-format msgid "Users on %s: %s" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:715 +#: ../libpurple/protocols/irc/msgs.c:784 msgid "Time Response" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:716 +#: ../libpurple/protocols/irc/msgs.c:785 msgid "The IRC server's local time is:" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:727 +#: ../libpurple/protocols/irc/msgs.c:796 msgid "No such channel" msgstr "" #. does this happen? -#: ../libpurple/protocols/irc/msgs.c:738 +#: ../libpurple/protocols/irc/msgs.c:807 msgid "no such channel" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:741 +#: ../libpurple/protocols/irc/msgs.c:810 msgid "User is not logged in" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:746 +#: ../libpurple/protocols/irc/msgs.c:815 msgid "No such nick or channel" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:766 +#: ../libpurple/protocols/irc/msgs.c:835 msgid "Could not send" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:822 +#: ../libpurple/protocols/irc/msgs.c:891 #, c-format msgid "Joining %s requires an invitation." msgstr "" -#: ../libpurple/protocols/irc/msgs.c:823 +#: ../libpurple/protocols/irc/msgs.c:892 msgid "Invitation only" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:957 +#: ../libpurple/protocols/irc/msgs.c:1026 #: ../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/irc/msgs.c:1031 #: ../libpurple/protocols/jabber/presence.c:747 #: ../libpurple/protocols/silc/ops.c:730 #: ../libpurple/protocols/silc10/ops.c:720 @@ -4972,24 +4972,24 @@ msgid "Kicked by %s (%s)" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:985 +#: ../libpurple/protocols/irc/msgs.c:1054 #, c-format msgid "mode (%s %s) by %s" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1075 -#: ../libpurple/protocols/irc/msgs.c:1076 +#: ../libpurple/protocols/irc/msgs.c:1144 +#: ../libpurple/protocols/irc/msgs.c:1145 #: ../libpurple/protocols/jabber/jabber.c:2885 msgid "Invalid nickname" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1077 +#: ../libpurple/protocols/irc/msgs.c:1146 msgid "" "Your selected nickname was rejected by the server. It probably contains " "invalid characters." msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1082 +#: ../libpurple/protocols/irc/msgs.c:1151 msgid "" "Your selected account name was rejected by the server. It probably contains " "invalid characters." @@ -4998,54 +4998,54 @@ #. 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 +#: ../libpurple/protocols/irc/msgs.c:1167 #, c-format msgid "The nickname \"%s\" is already being used." msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1100 -#: ../libpurple/protocols/irc/msgs.c:1101 +#: ../libpurple/protocols/irc/msgs.c:1169 +#: ../libpurple/protocols/irc/msgs.c:1170 msgid "Nickname in use" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1145 +#: ../libpurple/protocols/irc/msgs.c:1214 msgid "Cannot change nick" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1145 +#: ../libpurple/protocols/irc/msgs.c:1214 msgid "Could not change nick" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1170 +#: ../libpurple/protocols/irc/msgs.c:1239 #, c-format msgid "You have parted the channel%s%s" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1214 +#: ../libpurple/protocols/irc/msgs.c:1283 msgid "Error: invalid PONG from server" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1216 +#: ../libpurple/protocols/irc/msgs.c:1285 #, c-format msgid "PING reply -- Lag: %lu seconds" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1307 +#: ../libpurple/protocols/irc/msgs.c:1376 #, c-format msgid "Cannot join %s: Registration is required." msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1308 +#: ../libpurple/protocols/irc/msgs.c:1377 #: ../libpurple/protocols/silc/ops.c:1109 #: ../libpurple/protocols/silc10/ops.c:1128 msgid "Cannot join channel" msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1342 +#: ../libpurple/protocols/irc/msgs.c:1411 msgid "Nick or channel is temporarily unavailable." msgstr "" -#: ../libpurple/protocols/irc/msgs.c:1354 +#: ../libpurple/protocols/irc/msgs.c:1423 #, c-format msgid "Wallops from %s" msgstr "" @@ -5552,7 +5552,7 @@ #: ../libpurple/protocols/jabber/buddy.c:368 #: ../libpurple/protocols/jabber/buddy.c:1167 -#: ../libpurple/protocols/jabber/chat.c:911 ../pidgin/gtkblist.c:3889 +#: ../libpurple/protocols/jabber/chat.c:911 ../pidgin/gtkblist.c:3888 #: ../pidgin/gtkplugin.c:590 ../pidgin/plugins/disco/gtkdisco.c:571 msgid "Description" msgstr "" @@ -6089,8 +6089,8 @@ #: ../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 +#: ../libpurple/protocols/mxit/roster.c:262 ../pidgin/gtkblist.c:3542 +#: ../pidgin/gtkblist.c:3544 ../pidgin/plugins/gevolution/eds-utils.c:73 #: ../pidgin/plugins/gevolution/eds-utils.c:86 msgid "None" msgstr "" @@ -7260,20 +7260,20 @@ #. only notify the user about problems adding to the friends list #. * maybe we should do something else for other lists, but it probably #. * won't cause too many problems if we just ignore it -#: ../libpurple/protocols/msn/contact.c:1067 -#: ../libpurple/protocols/msn/contact.c:1163 +#: ../libpurple/protocols/msn/contact.c:1070 +#: ../libpurple/protocols/msn/contact.c:1166 #: ../libpurple/protocols/msn/userlist.c:522 #, c-format msgid "Unable to add \"%s\"." msgstr "" -#: ../libpurple/protocols/msn/contact.c:1068 -#: ../libpurple/protocols/msn/contact.c:1164 +#: ../libpurple/protocols/msn/contact.c:1071 +#: ../libpurple/protocols/msn/contact.c:1167 msgid "Buddy Add error" msgstr "" -#: ../libpurple/protocols/msn/contact.c:1069 -#: ../libpurple/protocols/msn/contact.c:1165 +#: ../libpurple/protocols/msn/contact.c:1072 +#: ../libpurple/protocols/msn/contact.c:1168 msgid "The username specified does not exist." msgstr "" @@ -7473,7 +7473,7 @@ #: ../libpurple/protocols/msn/error.c:228 #: ../libpurple/protocols/silc/silc.c:340 -#: ../libpurple/protocols/silc10/ops.c:1713 ../libpurple/proxy.c:1731 +#: ../libpurple/protocols/silc10/ops.c:1713 ../libpurple/proxy.c:1784 msgid "Authentication failed" msgstr "" @@ -7538,27 +7538,27 @@ msgid "Non-IM Contacts" msgstr "" -#: ../libpurple/protocols/msn/msg.c:799 +#: ../libpurple/protocols/msn/msg.c:833 #, c-format msgid "%s sent a wink. Click here to play it" msgstr "" -#: ../libpurple/protocols/msn/msg.c:805 +#: ../libpurple/protocols/msn/msg.c:839 #, c-format msgid "%s sent a wink, but it could not be saved" msgstr "" -#: ../libpurple/protocols/msn/msg.c:825 +#: ../libpurple/protocols/msn/msg.c:859 #, c-format msgid "%s sent a voice clip. Click here to play it" msgstr "" -#: ../libpurple/protocols/msn/msg.c:831 +#: ../libpurple/protocols/msn/msg.c:865 #, c-format msgid "%s sent a voice clip, but it could not be saved" msgstr "" -#: ../libpurple/protocols/msn/msg.c:1118 +#: ../libpurple/protocols/msn/msg.c:1152 #, c-format msgid "%s sent you a voice chat invite, which is not yet supported." msgstr "" @@ -9839,7 +9839,7 @@ msgid "Watching a movie" msgstr "" -#: ../libpurple/protocols/oscar/family_locate.c:419 ../pidgin/gtkconv.c:6818 +#: ../libpurple/protocols/oscar/family_locate.c:419 ../pidgin/gtkconv.c:6824 #: ../pidgin/gtkstatusbox.c:714 msgid "Typing" msgstr "" @@ -9932,9 +9932,9 @@ 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 +#: ../libpurple/proxy.c:1549 ../libpurple/proxy.c:1579 +#: ../libpurple/proxy.c:1659 ../libpurple/proxy.c:1730 +#: ../libpurple/proxy.c:1831 ../libpurple/proxy.c:1970 msgid "Received invalid data on connection with server" msgstr "" @@ -13140,7 +13140,7 @@ msgstr "" #: ../libpurple/protocols/simple/simple.c:1809 -#: ../libpurple/protocols/simple/simple.c:1911 ../libpurple/proxy.c:2175 +#: ../libpurple/protocols/simple/simple.c:1911 ../libpurple/proxy.c:2228 msgid "Unable to resolve hostname" msgstr "" @@ -13863,29 +13863,29 @@ msgid "Exposure" msgstr "" -#: ../libpurple/proxy.c:701 ../libpurple/proxy.c:763 ../libpurple/proxy.c:1204 -#: ../libpurple/proxy.c:1398 ../libpurple/proxy.c:2058 +#: ../libpurple/proxy.c:754 ../libpurple/proxy.c:816 ../libpurple/proxy.c:1257 +#: ../libpurple/proxy.c:1451 ../libpurple/proxy.c:2111 #, c-format msgid "Unable to create socket: %s" msgstr "" -#: ../libpurple/proxy.c:958 +#: ../libpurple/proxy.c:1011 #, c-format msgid "Unable to parse response from HTTP proxy: %s" msgstr "" -#: ../libpurple/proxy.c:991 ../libpurple/proxy.c:1053 -#: ../libpurple/proxy.c:1082 +#: ../libpurple/proxy.c:1044 ../libpurple/proxy.c:1106 +#: ../libpurple/proxy.c:1135 #, c-format msgid "HTTP proxy connection error %d" msgstr "" -#: ../libpurple/proxy.c:1078 +#: ../libpurple/proxy.c:1131 #, c-format msgid "Access denied: HTTP proxy server forbids port %d tunneling" msgstr "" -#: ../libpurple/proxy.c:1278 +#: ../libpurple/proxy.c:1331 #, c-format msgid "Error resolving %s" msgstr "" @@ -13903,11 +13903,11 @@ #. * #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons. #. -#: ../libpurple/request.h:1488 ../pidgin/gtkblist.c:564 +#: ../libpurple/request.h:1488 ../pidgin/gtkblist.c:563 msgid "_Yes" msgstr "" -#: ../libpurple/request.h:1488 ../pidgin/gtkblist.c:564 +#: ../libpurple/request.h:1488 ../pidgin/gtkblist.c:563 msgid "_No" msgstr "" @@ -14515,7 +14515,7 @@ msgid "The text information for a buddy's status" msgstr "" -#: ../pidgin/gtkblist.c:561 +#: ../pidgin/gtkblist.c:560 #, c-format msgid "You have %d contact named %s. Would you like to merge them?" msgid_plural "" @@ -14523,151 +14523,151 @@ msgstr[0] "" msgstr[1] "" -#: ../pidgin/gtkblist.c:562 +#: ../pidgin/gtkblist.c:561 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 +#: ../pidgin/gtkblist.c:704 msgid "Please update the necessary fields." msgstr "" -#: ../pidgin/gtkblist.c:1017 +#: ../pidgin/gtkblist.c:1016 msgid "A_ccount" msgstr "" -#: ../pidgin/gtkblist.c:1138 +#: ../pidgin/gtkblist.c:1137 msgid "" "Please enter the appropriate information about the chat you would like to " "join.\n" msgstr "" -#: ../pidgin/gtkblist.c:1143 +#: ../pidgin/gtkblist.c:1142 msgid "Room _List" msgstr "" -#: ../pidgin/gtkblist.c:1405 ../pidgin/gtkprivacy.c:537 +#: ../pidgin/gtkblist.c:1404 ../pidgin/gtkprivacy.c:537 #: ../pidgin/gtkprivacy.c:551 msgid "_Block" msgstr "" -#: ../pidgin/gtkblist.c:1405 +#: ../pidgin/gtkblist.c:1404 msgid "Un_block" msgstr "" -#: ../pidgin/gtkblist.c:1448 +#: ../pidgin/gtkblist.c:1447 msgid "Move to" msgstr "" -#: ../pidgin/gtkblist.c:1492 +#: ../pidgin/gtkblist.c:1491 msgid "Get _Info" msgstr "" -#: ../pidgin/gtkblist.c:1495 ../pidgin/pidginstock.c:86 +#: ../pidgin/gtkblist.c:1494 ../pidgin/pidginstock.c:86 msgid "I_M" msgstr "" -#: ../pidgin/gtkblist.c:1504 +#: ../pidgin/gtkblist.c:1503 msgid "_Audio Call" msgstr "" -#: ../pidgin/gtkblist.c:1509 +#: ../pidgin/gtkblist.c:1508 msgid "Audio/_Video Call" msgstr "" -#: ../pidgin/gtkblist.c:1513 +#: ../pidgin/gtkblist.c:1512 msgid "_Video Call" msgstr "" -#: ../pidgin/gtkblist.c:1525 +#: ../pidgin/gtkblist.c:1524 msgid "_Send File..." msgstr "" -#: ../pidgin/gtkblist.c:1532 +#: ../pidgin/gtkblist.c:1531 msgid "Add Buddy _Pounce..." msgstr "" -#: ../pidgin/gtkblist.c:1537 ../pidgin/gtkblist.c:1541 -#: ../pidgin/gtkblist.c:1754 ../pidgin/gtkblist.c:1781 +#: ../pidgin/gtkblist.c:1536 ../pidgin/gtkblist.c:1540 +#: ../pidgin/gtkblist.c:1753 ../pidgin/gtkblist.c:1780 msgid "View _Log" msgstr "" -#: ../pidgin/gtkblist.c:1547 ../pidgin/gtkblist.c:1727 +#: ../pidgin/gtkblist.c:1546 ../pidgin/gtkblist.c:1726 msgid "Hide When Offline" msgstr "" -#: ../pidgin/gtkblist.c:1547 ../pidgin/gtkblist.c:1727 +#: ../pidgin/gtkblist.c:1546 ../pidgin/gtkblist.c:1726 msgid "Show When Offline" msgstr "" -#: ../pidgin/gtkblist.c:1561 ../pidgin/gtkblist.c:1570 -#: ../pidgin/gtkblist.c:1764 ../pidgin/gtkblist.c:1787 +#: ../pidgin/gtkblist.c:1560 ../pidgin/gtkblist.c:1569 +#: ../pidgin/gtkblist.c:1763 ../pidgin/gtkblist.c:1786 msgid "_Alias..." msgstr "" -#: ../pidgin/gtkblist.c:1564 ../pidgin/gtkblist.c:1572 -#: ../pidgin/gtkblist.c:1766 ../pidgin/gtkblist.c:1789 +#: ../pidgin/gtkblist.c:1563 ../pidgin/gtkblist.c:1571 +#: ../pidgin/gtkblist.c:1765 ../pidgin/gtkblist.c:1788 msgid "_Remove" msgstr "" -#: ../pidgin/gtkblist.c:1697 +#: ../pidgin/gtkblist.c:1696 msgid "Set Custom Icon" msgstr "" -#: ../pidgin/gtkblist.c:1701 ../pidgin/gtkconv.c:2933 +#: ../pidgin/gtkblist.c:1700 ../pidgin/gtkconv.c:2933 msgid "Remove Custom Icon" msgstr "" -#: ../pidgin/gtkblist.c:1715 +#: ../pidgin/gtkblist.c:1714 msgid "Add _Buddy..." msgstr "" -#: ../pidgin/gtkblist.c:1718 +#: ../pidgin/gtkblist.c:1717 msgid "Add C_hat..." msgstr "" -#: ../pidgin/gtkblist.c:1721 +#: ../pidgin/gtkblist.c:1720 msgid "_Delete Group" msgstr "" -#: ../pidgin/gtkblist.c:1723 +#: ../pidgin/gtkblist.c:1722 msgid "_Rename" msgstr "" #. join button -#: ../pidgin/gtkblist.c:1748 ../pidgin/gtkroomlist.c:323 +#: ../pidgin/gtkblist.c:1747 ../pidgin/gtkroomlist.c:323 #: ../pidgin/gtkroomlist.c:588 ../pidgin/pidginstock.c:84 msgid "_Join" msgstr "" -#: ../pidgin/gtkblist.c:1750 +#: ../pidgin/gtkblist.c:1749 msgid "Auto-Join" msgstr "" -#: ../pidgin/gtkblist.c:1752 +#: ../pidgin/gtkblist.c:1751 msgid "Persistent" msgstr "" -#: ../pidgin/gtkblist.c:1762 +#: ../pidgin/gtkblist.c:1761 msgid "_Edit Settings..." msgstr "" -#: ../pidgin/gtkblist.c:1796 ../pidgin/gtkblist.c:1821 +#: ../pidgin/gtkblist.c:1795 ../pidgin/gtkblist.c:1820 msgid "_Collapse" msgstr "" -#: ../pidgin/gtkblist.c:1826 +#: ../pidgin/gtkblist.c:1825 msgid "_Expand" msgstr "" -#: ../pidgin/gtkblist.c:2073 ../pidgin/gtkblist.c:2085 -#: ../pidgin/gtkblist.c:6004 ../pidgin/gtkblist.c:6017 +#: ../pidgin/gtkblist.c:2072 ../pidgin/gtkblist.c:2084 +#: ../pidgin/gtkblist.c:6001 ../pidgin/gtkblist.c:6014 msgid "/Tools/Mute Sounds" msgstr "" -#: ../pidgin/gtkblist.c:2531 ../pidgin/gtkconv.c:5194 +#: ../pidgin/gtkblist.c:2530 ../pidgin/gtkconv.c:5194 #: ../pidgin/gtkpounce.c:448 msgid "" "You are not currently signed on with an account that can add that buddy." @@ -14676,279 +14676,279 @@ #. 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 +#: ../pidgin/gtkblist.c:2899 msgid "Unknown node type" msgstr "" -#: ../pidgin/gtkblist.c:3541 +#: ../pidgin/gtkblist.c:3540 msgid "Please select your mood from the list" msgstr "" -#: ../pidgin/gtkblist.c:3575 +#: ../pidgin/gtkblist.c:3574 msgid "Message (optional)" msgstr "" -#: ../pidgin/gtkblist.c:3580 +#: ../pidgin/gtkblist.c:3579 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 +#: ../pidgin/gtkblist.c:3604 msgid "/_Buddies" msgstr "" -#: ../pidgin/gtkblist.c:3606 +#: ../pidgin/gtkblist.c:3605 msgid "/Buddies/New Instant _Message..." msgstr "" -#: ../pidgin/gtkblist.c:3607 +#: ../pidgin/gtkblist.c:3606 msgid "/Buddies/Join a _Chat..." msgstr "" -#: ../pidgin/gtkblist.c:3608 +#: ../pidgin/gtkblist.c:3607 msgid "/Buddies/Get User _Info..." msgstr "" -#: ../pidgin/gtkblist.c:3609 +#: ../pidgin/gtkblist.c:3608 msgid "/Buddies/View User _Log..." msgstr "" -#: ../pidgin/gtkblist.c:3611 +#: ../pidgin/gtkblist.c:3610 msgid "/Buddies/Sh_ow" msgstr "" -#: ../pidgin/gtkblist.c:3612 +#: ../pidgin/gtkblist.c:3611 msgid "/Buddies/Show/_Offline Buddies" msgstr "" -#: ../pidgin/gtkblist.c:3613 +#: ../pidgin/gtkblist.c:3612 msgid "/Buddies/Show/_Empty Groups" msgstr "" -#: ../pidgin/gtkblist.c:3614 +#: ../pidgin/gtkblist.c:3613 msgid "/Buddies/Show/Buddy _Details" msgstr "" -#: ../pidgin/gtkblist.c:3615 +#: ../pidgin/gtkblist.c:3614 msgid "/Buddies/Show/Idle _Times" msgstr "" -#: ../pidgin/gtkblist.c:3616 +#: ../pidgin/gtkblist.c:3615 msgid "/Buddies/Show/_Protocol Icons" msgstr "" -#: ../pidgin/gtkblist.c:3617 +#: ../pidgin/gtkblist.c:3616 msgid "/Buddies/_Sort Buddies" msgstr "" -#: ../pidgin/gtkblist.c:3619 +#: ../pidgin/gtkblist.c:3618 msgid "/Buddies/_Add Buddy..." msgstr "" -#: ../pidgin/gtkblist.c:3620 +#: ../pidgin/gtkblist.c:3619 msgid "/Buddies/Add C_hat..." msgstr "" -#: ../pidgin/gtkblist.c:3621 +#: ../pidgin/gtkblist.c:3620 msgid "/Buddies/Add _Group..." msgstr "" -#: ../pidgin/gtkblist.c:3623 +#: ../pidgin/gtkblist.c:3622 msgid "/Buddies/_Quit" msgstr "" #. Accounts menu -#: ../pidgin/gtkblist.c:3626 +#: ../pidgin/gtkblist.c:3625 msgid "/_Accounts" msgstr "" -#: ../pidgin/gtkblist.c:3627 ../pidgin/gtkblist.c:8021 +#: ../pidgin/gtkblist.c:3626 ../pidgin/gtkblist.c:8018 msgid "/Accounts/Manage Accounts" msgstr "" #. Tools -#: ../pidgin/gtkblist.c:3630 +#: ../pidgin/gtkblist.c:3629 msgid "/_Tools" msgstr "" -#: ../pidgin/gtkblist.c:3631 +#: ../pidgin/gtkblist.c:3630 msgid "/Tools/Buddy _Pounces" msgstr "" -#: ../pidgin/gtkblist.c:3632 +#: ../pidgin/gtkblist.c:3631 msgid "/Tools/_Certificates" msgstr "" -#: ../pidgin/gtkblist.c:3633 +#: ../pidgin/gtkblist.c:3632 msgid "/Tools/Custom Smile_ys" msgstr "" -#: ../pidgin/gtkblist.c:3634 +#: ../pidgin/gtkblist.c:3633 msgid "/Tools/Plu_gins" msgstr "" -#: ../pidgin/gtkblist.c:3635 +#: ../pidgin/gtkblist.c:3634 msgid "/Tools/Pr_eferences" msgstr "" -#: ../pidgin/gtkblist.c:3636 +#: ../pidgin/gtkblist.c:3635 msgid "/Tools/Pr_ivacy" msgstr "" -#: ../pidgin/gtkblist.c:3637 +#: ../pidgin/gtkblist.c:3636 msgid "/Tools/Set _Mood" msgstr "" -#: ../pidgin/gtkblist.c:3639 +#: ../pidgin/gtkblist.c:3638 msgid "/Tools/_File Transfers" msgstr "" -#: ../pidgin/gtkblist.c:3640 +#: ../pidgin/gtkblist.c:3639 msgid "/Tools/R_oom List" msgstr "" -#: ../pidgin/gtkblist.c:3641 +#: ../pidgin/gtkblist.c:3640 msgid "/Tools/System _Log" msgstr "" -#: ../pidgin/gtkblist.c:3643 +#: ../pidgin/gtkblist.c:3642 msgid "/Tools/Mute _Sounds" msgstr "" #. Help -#: ../pidgin/gtkblist.c:3645 +#: ../pidgin/gtkblist.c:3644 msgid "/_Help" msgstr "" -#: ../pidgin/gtkblist.c:3646 +#: ../pidgin/gtkblist.c:3645 msgid "/Help/Online _Help" msgstr "" -#: ../pidgin/gtkblist.c:3648 +#: ../pidgin/gtkblist.c:3647 msgid "/Help/_Build Information" msgstr "" -#: ../pidgin/gtkblist.c:3649 +#: ../pidgin/gtkblist.c:3648 msgid "/Help/_Debug Window" msgstr "" -#: ../pidgin/gtkblist.c:3650 +#: ../pidgin/gtkblist.c:3649 msgid "/Help/De_veloper Information" msgstr "" -#: ../pidgin/gtkblist.c:3651 +#: ../pidgin/gtkblist.c:3650 msgid "/Help/_Plugin Information" msgstr "" -#: ../pidgin/gtkblist.c:3652 +#: ../pidgin/gtkblist.c:3651 msgid "/Help/_Translator Information" msgstr "" -#: ../pidgin/gtkblist.c:3654 +#: ../pidgin/gtkblist.c:3653 msgid "/Help/_About" msgstr "" -#: ../pidgin/gtkblist.c:3686 +#: ../pidgin/gtkblist.c:3685 #, c-format msgid "Account: %s" msgstr "" -#: ../pidgin/gtkblist.c:3705 +#: ../pidgin/gtkblist.c:3704 #, c-format msgid "" "\n" "Occupants: %d" msgstr "" -#: ../pidgin/gtkblist.c:3711 +#: ../pidgin/gtkblist.c:3710 #, c-format msgid "" "\n" "Topic: %s" msgstr "" -#: ../pidgin/gtkblist.c:3711 +#: ../pidgin/gtkblist.c:3710 msgid "(no topic set)" msgstr "" -#: ../pidgin/gtkblist.c:3792 +#: ../pidgin/gtkblist.c:3791 msgid "Buddy Alias" msgstr "" -#: ../pidgin/gtkblist.c:3821 +#: ../pidgin/gtkblist.c:3820 msgid "Logged In" msgstr "" -#: ../pidgin/gtkblist.c:3867 +#: ../pidgin/gtkblist.c:3866 msgid "Last Seen" msgstr "" -#: ../pidgin/gtkblist.c:3889 +#: ../pidgin/gtkblist.c:3888 msgid "Spooky" msgstr "" -#: ../pidgin/gtkblist.c:3891 +#: ../pidgin/gtkblist.c:3890 msgid "Awesome" msgstr "" -#: ../pidgin/gtkblist.c:3893 +#: ../pidgin/gtkblist.c:3892 msgid "Rockin'" msgstr "" -#: ../pidgin/gtkblist.c:3923 +#: ../pidgin/gtkblist.c:3922 msgid "Total Buddies" msgstr "" -#: ../pidgin/gtkblist.c:4280 +#: ../pidgin/gtkblist.c:4279 #, c-format msgid "Idle %dd %dh %02dm" msgstr "" -#: ../pidgin/gtkblist.c:4282 +#: ../pidgin/gtkblist.c:4281 #, c-format msgid "Idle %dh %02dm" msgstr "" -#: ../pidgin/gtkblist.c:4284 +#: ../pidgin/gtkblist.c:4283 #, c-format msgid "Idle %dm" msgstr "" -#: ../pidgin/gtkblist.c:4473 +#: ../pidgin/gtkblist.c:4472 msgid "/Buddies/New Instant Message..." msgstr "" -#: ../pidgin/gtkblist.c:4474 ../pidgin/gtkblist.c:4507 +#: ../pidgin/gtkblist.c:4473 ../pidgin/gtkblist.c:4506 msgid "/Buddies/Join a Chat..." msgstr "" -#: ../pidgin/gtkblist.c:4475 +#: ../pidgin/gtkblist.c:4474 msgid "/Buddies/Get User Info..." msgstr "" -#: ../pidgin/gtkblist.c:4476 +#: ../pidgin/gtkblist.c:4475 msgid "/Buddies/Add Buddy..." msgstr "" -#: ../pidgin/gtkblist.c:4477 ../pidgin/gtkblist.c:4510 +#: ../pidgin/gtkblist.c:4476 ../pidgin/gtkblist.c:4509 msgid "/Buddies/Add Chat..." msgstr "" -#: ../pidgin/gtkblist.c:4478 +#: ../pidgin/gtkblist.c:4477 msgid "/Buddies/Add Group..." msgstr "" -#: ../pidgin/gtkblist.c:4513 +#: ../pidgin/gtkblist.c:4512 msgid "/Tools/Privacy" msgstr "" -#: ../pidgin/gtkblist.c:4516 +#: ../pidgin/gtkblist.c:4515 msgid "/Tools/Room List" msgstr "" -#: ../pidgin/gtkblist.c:4648 ../pidgin/gtkdocklet.c:158 +#: ../pidgin/gtkblist.c:4647 ../pidgin/gtkdocklet.c:158 #: ../pidgin/gtkdocklet.c:163 #, c-format msgid "%d unread message from %s\n" @@ -14956,45 +14956,45 @@ msgstr[0] "" msgstr[1] "" -#: ../pidgin/gtkblist.c:4818 +#: ../pidgin/gtkblist.c:4817 msgid "Manually" msgstr "" -#: ../pidgin/gtkblist.c:4820 +#: ../pidgin/gtkblist.c:4819 msgid "By status" msgstr "" -#: ../pidgin/gtkblist.c:4821 +#: ../pidgin/gtkblist.c:4820 msgid "By recent log activity" msgstr "" -#: ../pidgin/gtkblist.c:5119 +#: ../pidgin/gtkblist.c:5118 #, c-format msgid "%s disconnected" msgstr "" -#: ../pidgin/gtkblist.c:5121 +#: ../pidgin/gtkblist.c:5120 #, c-format msgid "%s disabled" msgstr "" -#: ../pidgin/gtkblist.c:5125 +#: ../pidgin/gtkblist.c:5124 msgid "Reconnect" msgstr "" -#: ../pidgin/gtkblist.c:5125 ../pidgin/gtkblist.c:5227 +#: ../pidgin/gtkblist.c:5124 ../pidgin/gtkblist.c:5226 msgid "Re-enable" msgstr "" -#: ../pidgin/gtkblist.c:5138 +#: ../pidgin/gtkblist.c:5137 msgid "SSL FAQs" msgstr "" -#: ../pidgin/gtkblist.c:5225 +#: ../pidgin/gtkblist.c:5224 msgid "Welcome back!" msgstr "" -#: ../pidgin/gtkblist.c:5261 +#: ../pidgin/gtkblist.c:5260 #, c-format msgid "%d account was disabled because you signed on from another location:" msgid_plural "" @@ -15002,15 +15002,15 @@ msgstr[0] "" msgstr[1] "" -#: ../pidgin/gtkblist.c:5535 +#: ../pidgin/gtkblist.c:5534 msgid "Username:" msgstr "" -#: ../pidgin/gtkblist.c:5542 +#: ../pidgin/gtkblist.c:5541 msgid "Password:" msgstr "" -#: ../pidgin/gtkblist.c:5553 +#: ../pidgin/gtkblist.c:5552 msgid "_Login" msgstr "" @@ -15018,12 +15018,12 @@ msgid "/Help" msgstr "" -#: ../pidgin/gtkblist.c:5809 +#: ../pidgin/gtkblist.c:5806 msgid "/Accounts" msgstr "" #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy -#: ../pidgin/gtkblist.c:5823 +#: ../pidgin/gtkblist.c:5820 #, c-format msgid "" "Welcome to %s!\n" @@ -15037,116 +15037,116 @@ #. set the Show Offline Buddies option. must be done #. * after the treeview or faceprint gets mad. -Robot101 #. -#: ../pidgin/gtkblist.c:5998 +#: ../pidgin/gtkblist.c:5995 msgid "/Buddies/Show/Offline Buddies" msgstr "" -#: ../pidgin/gtkblist.c:6001 +#: ../pidgin/gtkblist.c:5998 msgid "/Buddies/Show/Empty Groups" msgstr "" -#: ../pidgin/gtkblist.c:6007 +#: ../pidgin/gtkblist.c:6004 msgid "/Buddies/Show/Buddy Details" msgstr "" -#: ../pidgin/gtkblist.c:6010 +#: ../pidgin/gtkblist.c:6007 msgid "/Buddies/Show/Idle Times" msgstr "" -#: ../pidgin/gtkblist.c:6013 +#: ../pidgin/gtkblist.c:6010 msgid "/Buddies/Show/Protocol Icons" msgstr "" -#: ../pidgin/gtkblist.c:7097 +#: ../pidgin/gtkblist.c:7094 msgid "Add a buddy.\n" msgstr "" -#: ../pidgin/gtkblist.c:7112 +#: ../pidgin/gtkblist.c:7109 msgid "Buddy's _username:" msgstr "" -#: ../pidgin/gtkblist.c:7129 +#: ../pidgin/gtkblist.c:7126 msgid "(Optional) A_lias:" msgstr "" -#: ../pidgin/gtkblist.c:7140 +#: ../pidgin/gtkblist.c:7137 msgid "(Optional) _Invite message:" msgstr "" -#: ../pidgin/gtkblist.c:7145 +#: ../pidgin/gtkblist.c:7142 msgid "Add buddy to _group:" msgstr "" -#: ../pidgin/gtkblist.c:7250 +#: ../pidgin/gtkblist.c:7247 msgid "This protocol does not support chat rooms." msgstr "" -#: ../pidgin/gtkblist.c:7266 +#: ../pidgin/gtkblist.c:7263 msgid "" "You are not currently signed on with any protocols that have the ability to " "chat." msgstr "" -#: ../pidgin/gtkblist.c:7275 +#: ../pidgin/gtkblist.c:7272 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 +#: ../pidgin/gtkblist.c:7293 msgid "A_lias:" msgstr "" -#: ../pidgin/gtkblist.c:7303 +#: ../pidgin/gtkblist.c:7300 msgid "_Group:" msgstr "" -#: ../pidgin/gtkblist.c:7307 +#: ../pidgin/gtkblist.c:7304 msgid "Auto_join when account connects." msgstr "" -#: ../pidgin/gtkblist.c:7308 +#: ../pidgin/gtkblist.c:7305 msgid "_Remain in chat after window is closed." msgstr "" -#: ../pidgin/gtkblist.c:7331 +#: ../pidgin/gtkblist.c:7328 msgid "Please enter the name of the group to be added." msgstr "" -#: ../pidgin/gtkblist.c:8035 +#: ../pidgin/gtkblist.c:8032 msgid "Enable Account" msgstr "" -#: ../pidgin/gtkblist.c:8040 +#: ../pidgin/gtkblist.c:8037 msgid "/Accounts/Enable Account" msgstr "" -#: ../pidgin/gtkblist.c:8094 +#: ../pidgin/gtkblist.c:8091 msgid "/Accounts/" msgstr "" -#: ../pidgin/gtkblist.c:8115 +#: ../pidgin/gtkblist.c:8112 msgid "_Edit Account" msgstr "" -#: ../pidgin/gtkblist.c:8133 +#: ../pidgin/gtkblist.c:8130 msgid "Set _Mood..." msgstr "" -#: ../pidgin/gtkblist.c:8143 ../pidgin/gtkconv.c:3349 +#: ../pidgin/gtkblist.c:8140 ../pidgin/gtkconv.c:3349 #: ../pidgin/gtkimhtml.c:1848 msgid "No actions available" msgstr "" -#: ../pidgin/gtkblist.c:8150 +#: ../pidgin/gtkblist.c:8147 msgid "_Disable" msgstr "" -#: ../pidgin/gtkblist.c:8168 +#: ../pidgin/gtkblist.c:8165 msgid "/Tools" msgstr "" -#: ../pidgin/gtkblist.c:8239 +#: ../pidgin/gtkblist.c:8236 msgid "/Buddies/Sort Buddies" msgstr "" @@ -15473,7 +15473,7 @@ msgstr "" #. Build the Send To menu -#: ../pidgin/gtkconv.c:3889 ../pidgin/gtkconv.c:8613 +#: ../pidgin/gtkconv.c:3889 ../pidgin/gtkconv.c:8619 msgid "S_end To" msgstr "" @@ -15494,78 +15494,78 @@ msgid "Find:" msgstr "" -#: ../pidgin/gtkconv.c:6174 ../pidgin/gtkconv.c:6292 +#: ../pidgin/gtkconv.c:6177 ../pidgin/gtkconv.c:6295 #, c-format msgid "%d person in room" msgid_plural "%d people in room" msgstr[0] "" msgstr[1] "" -#: ../pidgin/gtkconv.c:6822 +#: ../pidgin/gtkconv.c:6828 msgid "Stopped Typing" msgstr "" -#: ../pidgin/gtkconv.c:6825 +#: ../pidgin/gtkconv.c:6831 msgid "Nick Said" msgstr "" -#: ../pidgin/gtkconv.c:6828 +#: ../pidgin/gtkconv.c:6834 msgid "Unread Messages" msgstr "" -#: ../pidgin/gtkconv.c:6834 +#: ../pidgin/gtkconv.c:6840 msgid "New Event" msgstr "" -#: ../pidgin/gtkconv.c:8091 +#: ../pidgin/gtkconv.c:8097 msgid "clear: Clears all conversation scrollbacks." msgstr "" -#: ../pidgin/gtkconv.c:8296 +#: ../pidgin/gtkconv.c:8302 msgid "Confirm close" msgstr "" -#: ../pidgin/gtkconv.c:8328 +#: ../pidgin/gtkconv.c:8334 msgid "You have unread messages. Are you sure you want to close the window?" msgstr "" -#: ../pidgin/gtkconv.c:8951 +#: ../pidgin/gtkconv.c:8957 msgid "Close other tabs" msgstr "" -#: ../pidgin/gtkconv.c:8957 +#: ../pidgin/gtkconv.c:8963 msgid "Close all tabs" msgstr "" -#: ../pidgin/gtkconv.c:8965 +#: ../pidgin/gtkconv.c:8971 msgid "Detach this tab" msgstr "" -#: ../pidgin/gtkconv.c:8971 +#: ../pidgin/gtkconv.c:8977 msgid "Close this tab" msgstr "" -#: ../pidgin/gtkconv.c:9474 +#: ../pidgin/gtkconv.c:9480 msgid "Close conversation" msgstr "" -#: ../pidgin/gtkconv.c:10064 +#: ../pidgin/gtkconv.c:10070 msgid "Last created window" msgstr "" -#: ../pidgin/gtkconv.c:10066 +#: ../pidgin/gtkconv.c:10072 msgid "Separate IM and Chat windows" msgstr "" -#: ../pidgin/gtkconv.c:10068 ../pidgin/gtkprefs.c:2009 +#: ../pidgin/gtkconv.c:10074 ../pidgin/gtkprefs.c:2009 msgid "New window" msgstr "" -#: ../pidgin/gtkconv.c:10070 +#: ../pidgin/gtkconv.c:10076 msgid "By group" msgstr "" -#: ../pidgin/gtkconv.c:10072 +#: ../pidgin/gtkconv.c:10078 msgid "By account" msgstr "" @@ -15649,426 +15649,426 @@ msgid "support" msgstr "" -#: ../pidgin/gtkdialogs.c:94 ../pidgin/gtkdialogs.c:121 +#: ../pidgin/gtkdialogs.c:94 ../pidgin/gtkdialogs.c:122 msgid "webmaster" msgstr "" -#: ../pidgin/gtkdialogs.c:113 +#: ../pidgin/gtkdialogs.c:114 msgid "win32 port" msgstr "" #. feel free to not translate this -#: ../pidgin/gtkdialogs.c:116 +#: ../pidgin/gtkdialogs.c:117 msgid "Ka-Hing Cheung" msgstr "" -#: ../pidgin/gtkdialogs.c:117 ../pidgin/gtkdialogs.c:119 +#: ../pidgin/gtkdialogs.c:118 ../pidgin/gtkdialogs.c:120 msgid "maintainer" msgstr "" -#: ../pidgin/gtkdialogs.c:120 +#: ../pidgin/gtkdialogs.c:121 msgid "libfaim maintainer" msgstr "" #. If "lazy bum" translates literally into a serious insult, use something else or omit it. -#: ../pidgin/gtkdialogs.c:123 +#: ../pidgin/gtkdialogs.c:124 msgid "hacker and designated driver [lazy bum]" msgstr "" -#: ../pidgin/gtkdialogs.c:127 +#: ../pidgin/gtkdialogs.c:128 msgid "support/QA" msgstr "" -#: ../pidgin/gtkdialogs.c:128 +#: ../pidgin/gtkdialogs.c:129 msgid "XMPP" msgstr "" -#: ../pidgin/gtkdialogs.c:129 +#: ../pidgin/gtkdialogs.c:130 msgid "original author" msgstr "" -#: ../pidgin/gtkdialogs.c:131 +#: ../pidgin/gtkdialogs.c:132 msgid "lead developer" msgstr "" -#: ../pidgin/gtkdialogs.c:139 +#: ../pidgin/gtkdialogs.c:140 msgid "Senior Contributor/QA" msgstr "" -#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149 +#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150 msgid "Afrikaans" msgstr "" -#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:262 +#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:264 msgid "Arabic" msgstr "" -#: ../pidgin/gtkdialogs.c:151 +#: ../pidgin/gtkdialogs.c:152 msgid "Assamese" msgstr "" -#: ../pidgin/gtkdialogs.c:152 +#: ../pidgin/gtkdialogs.c:153 msgid "Belarusian Latin" msgstr "" -#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:154 -#: ../pidgin/gtkdialogs.c:263 +#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155 +#: ../pidgin/gtkdialogs.c:265 msgid "Bulgarian" msgstr "" -#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156 -#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:264 -#: ../pidgin/gtkdialogs.c:265 +#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157 +#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:266 +#: ../pidgin/gtkdialogs.c:267 msgid "Bengali" msgstr "" -#: ../pidgin/gtkdialogs.c:158 +#: ../pidgin/gtkdialogs.c:159 msgid "Bengali-India" msgstr "" -#: ../pidgin/gtkdialogs.c:159 +#: ../pidgin/gtkdialogs.c:160 msgid "Bosnian" msgstr "" -#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:266 -#: ../pidgin/gtkdialogs.c:267 +#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:268 +#: ../pidgin/gtkdialogs.c:269 msgid "Catalan" msgstr "" -#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:162 +#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164 msgid "Valencian-Catalan" msgstr "" -#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:268 -#: ../pidgin/gtkdialogs.c:269 +#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:270 +#: ../pidgin/gtkdialogs.c:271 msgid "Czech" msgstr "" -#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165 +#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:167 msgid "Danish" msgstr "" -#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:167 -#: ../pidgin/gtkdialogs.c:270 +#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:169 +#: ../pidgin/gtkdialogs.c:272 msgid "German" msgstr "" -#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:169 -#: ../pidgin/gtkdialogs.c:170 +#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171 +#: ../pidgin/gtkdialogs.c:172 msgid "Dzongkha" msgstr "" -#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172 +#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174 msgid "Greek" msgstr "" -#: ../pidgin/gtkdialogs.c:173 +#: ../pidgin/gtkdialogs.c:175 msgid "Australian English" msgstr "" -#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:271 +#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:273 msgid "British English" msgstr "" -#: ../pidgin/gtkdialogs.c:175 +#: ../pidgin/gtkdialogs.c:177 msgid "Canadian English" msgstr "" -#: ../pidgin/gtkdialogs.c:176 +#: ../pidgin/gtkdialogs.c:178 msgid "Esperanto" msgstr "" -#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:272 -#: ../pidgin/gtkdialogs.c:273 ../pidgin/gtkdialogs.c:274 -#: ../pidgin/gtkdialogs.c:275 +#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:274 +#: ../pidgin/gtkdialogs.c:275 ../pidgin/gtkdialogs.c:276 +#: ../pidgin/gtkdialogs.c:277 msgid "Spanish" msgstr "" -#: ../pidgin/gtkdialogs.c:178 +#: ../pidgin/gtkdialogs.c:180 msgid "Estonian" msgstr "" -#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:276 -#: ../pidgin/gtkdialogs.c:277 +#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:278 +#: ../pidgin/gtkdialogs.c:279 msgid "Basque" msgstr "" -#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181 -#: ../pidgin/gtkdialogs.c:182 +#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183 +#: ../pidgin/gtkdialogs.c:184 msgid "Persian" msgstr "" -#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:278 -#: ../pidgin/gtkdialogs.c:279 +#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:280 +#: ../pidgin/gtkdialogs.c:281 msgid "Finnish" msgstr "" -#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:280 -#: ../pidgin/gtkdialogs.c:281 ../pidgin/gtkdialogs.c:282 -#: ../pidgin/gtkdialogs.c:283 +#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:282 +#: ../pidgin/gtkdialogs.c:283 ../pidgin/gtkdialogs.c:284 +#: ../pidgin/gtkdialogs.c:285 msgid "French" msgstr "" -#: ../pidgin/gtkdialogs.c:185 +#: ../pidgin/gtkdialogs.c:187 msgid "Irish" msgstr "" -#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187 -#: ../pidgin/gtkdialogs.c:284 +#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189 +#: ../pidgin/gtkdialogs.c:286 msgid "Galician" msgstr "" -#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189 +#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191 msgid "Gujarati" msgstr "" -#: ../pidgin/gtkdialogs.c:189 +#: ../pidgin/gtkdialogs.c:191 msgid "Gujarati Language Team" msgstr "" -#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:285 +#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:287 msgid "Hebrew" msgstr "" -#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192 -#: ../pidgin/gtkdialogs.c:286 +#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194 +#: ../pidgin/gtkdialogs.c:288 msgid "Hindi" msgstr "" -#: ../pidgin/gtkdialogs.c:193 +#: ../pidgin/gtkdialogs.c:195 msgid "Croatian" msgstr "" -#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:287 +#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:289 msgid "Hungarian" msgstr "" -#: ../pidgin/gtkdialogs.c:195 +#: ../pidgin/gtkdialogs.c:197 msgid "Armenian" msgstr "" -#: ../pidgin/gtkdialogs.c:196 +#: ../pidgin/gtkdialogs.c:198 msgid "Indonesian" msgstr "" -#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:288 +#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:290 msgid "Italian" msgstr "" -#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:289 -#: ../pidgin/gtkdialogs.c:290 ../pidgin/gtkdialogs.c:291 -#: ../pidgin/gtkdialogs.c:292 +#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:291 +#: ../pidgin/gtkdialogs.c:292 ../pidgin/gtkdialogs.c:293 +#: ../pidgin/gtkdialogs.c:294 msgid "Japanese" msgstr "" -#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:293 +#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:295 msgid "Georgian" msgstr "" -#: ../pidgin/gtkdialogs.c:199 +#: ../pidgin/gtkdialogs.c:201 msgid "Ubuntu Georgian Translators" msgstr "" -#: ../pidgin/gtkdialogs.c:200 +#: ../pidgin/gtkdialogs.c:202 msgid "Khmer" msgstr "" -#: ../pidgin/gtkdialogs.c:201 +#: ../pidgin/gtkdialogs.c:203 msgid "Kannada" msgstr "" -#: ../pidgin/gtkdialogs.c:201 +#: ../pidgin/gtkdialogs.c:203 msgid "Kannada Translation team" msgstr "" -#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:294 -#: ../pidgin/gtkdialogs.c:295 +#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:296 +#: ../pidgin/gtkdialogs.c:297 msgid "Korean" msgstr "" -#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204 -#: ../pidgin/gtkdialogs.c:205 +#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206 +#: ../pidgin/gtkdialogs.c:207 msgid "Kurdish" msgstr "" -#: ../pidgin/gtkdialogs.c:206 +#: ../pidgin/gtkdialogs.c:208 msgid "Lao" msgstr "" -#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208 +#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:210 msgid "Maithili" msgstr "" -#: ../pidgin/gtkdialogs.c:209 +#: ../pidgin/gtkdialogs.c:211 msgid "Meadow Mari" msgstr "" -#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211 -#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:299 +#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:213 +#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:301 msgid "Macedonian" msgstr "" -#: ../pidgin/gtkdialogs.c:213 +#: ../pidgin/gtkdialogs.c:215 msgid "Malayalam" msgstr "" -#: ../pidgin/gtkdialogs.c:214 +#: ../pidgin/gtkdialogs.c:216 msgid "Mongolian" msgstr "" -#: ../pidgin/gtkdialogs.c:215 +#: ../pidgin/gtkdialogs.c:217 msgid "Marathi" msgstr "" -#: ../pidgin/gtkdialogs.c:216 +#: ../pidgin/gtkdialogs.c:218 msgid "Malay" msgstr "" -#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:300 -#: ../pidgin/gtkdialogs.c:301 ../pidgin/gtkdialogs.c:302 +#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:302 +#: ../pidgin/gtkdialogs.c:303 ../pidgin/gtkdialogs.c:304 msgid "Bokmål Norwegian" msgstr "" -#: ../pidgin/gtkdialogs.c:218 +#: ../pidgin/gtkdialogs.c:220 msgid "Nepali" msgstr "" -#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:303 +#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:305 msgid "Dutch, Flemish" msgstr "" -#: ../pidgin/gtkdialogs.c:220 +#: ../pidgin/gtkdialogs.c:222 msgid "Norwegian Nynorsk" msgstr "" -#: ../pidgin/gtkdialogs.c:221 +#: ../pidgin/gtkdialogs.c:223 msgid "Occitan" msgstr "" -#: ../pidgin/gtkdialogs.c:222 +#: ../pidgin/gtkdialogs.c:224 msgid "Oriya" msgstr "" -#: ../pidgin/gtkdialogs.c:223 +#: ../pidgin/gtkdialogs.c:225 msgid "Punjabi" msgstr "" -#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225 -#: ../pidgin/gtkdialogs.c:304 ../pidgin/gtkdialogs.c:305 +#: ../pidgin/gtkdialogs.c:226 ../pidgin/gtkdialogs.c:227 #: ../pidgin/gtkdialogs.c:306 ../pidgin/gtkdialogs.c:307 +#: ../pidgin/gtkdialogs.c:308 ../pidgin/gtkdialogs.c:309 msgid "Polish" msgstr "" -#: ../pidgin/gtkdialogs.c:226 +#: ../pidgin/gtkdialogs.c:228 msgid "Portuguese" msgstr "" -#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:308 +#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:310 msgid "Portuguese-Brazil" msgstr "" -#: ../pidgin/gtkdialogs.c:228 +#: ../pidgin/gtkdialogs.c:230 msgid "Pashto" msgstr "" -#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230 +#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232 msgid "Romanian" msgstr "" -#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:309 -#: ../pidgin/gtkdialogs.c:310 ../pidgin/gtkdialogs.c:311 +#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:311 +#: ../pidgin/gtkdialogs.c:312 ../pidgin/gtkdialogs.c:313 msgid "Russian" msgstr "" -#: ../pidgin/gtkdialogs.c:232 ../pidgin/gtkdialogs.c:233 -#: ../pidgin/gtkdialogs.c:312 ../pidgin/gtkdialogs.c:313 -#: ../pidgin/gtkdialogs.c:314 +#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235 +#: ../pidgin/gtkdialogs.c:314 ../pidgin/gtkdialogs.c:315 +#: ../pidgin/gtkdialogs.c:316 msgid "Slovak" msgstr "" -#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:315 +#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:317 msgid "Slovenian" msgstr "" -#: ../pidgin/gtkdialogs.c:235 +#: ../pidgin/gtkdialogs.c:237 msgid "Albanian" msgstr "" -#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237 -#: ../pidgin/gtkdialogs.c:316 ../pidgin/gtkdialogs.c:317 +#: ../pidgin/gtkdialogs.c:238 ../pidgin/gtkdialogs.c:239 +#: ../pidgin/gtkdialogs.c:318 ../pidgin/gtkdialogs.c:319 msgid "Serbian" msgstr "" -#: ../pidgin/gtkdialogs.c:238 ../pidgin/gtkdialogs.c:239 +#: ../pidgin/gtkdialogs.c:240 ../pidgin/gtkdialogs.c:241 msgid "Sinhala" msgstr "" -#: ../pidgin/gtkdialogs.c:240 ../pidgin/gtkdialogs.c:318 -#: ../pidgin/gtkdialogs.c:319 +#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:320 +#: ../pidgin/gtkdialogs.c:321 msgid "Swedish" msgstr "" -#: ../pidgin/gtkdialogs.c:241 +#: ../pidgin/gtkdialogs.c:243 msgid "Swahili" msgstr "" -#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243 +#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:245 msgid "Tamil" msgstr "" -#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:320 +#: ../pidgin/gtkdialogs.c:246 ../pidgin/gtkdialogs.c:322 msgid "Telugu" msgstr "" -#: ../pidgin/gtkdialogs.c:245 +#: ../pidgin/gtkdialogs.c:247 msgid "Thai" msgstr "" -#: ../pidgin/gtkdialogs.c:246 ../pidgin/gtkdialogs.c:321 +#: ../pidgin/gtkdialogs.c:248 ../pidgin/gtkdialogs.c:323 msgid "Turkish" msgstr "" -#: ../pidgin/gtkdialogs.c:247 +#: ../pidgin/gtkdialogs.c:249 msgid "Ukranian" msgstr "" -#: ../pidgin/gtkdialogs.c:248 +#: ../pidgin/gtkdialogs.c:250 msgid "Urdu" msgstr "" -#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:322 +#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:324 msgid "Vietnamese" msgstr "" -#: ../pidgin/gtkdialogs.c:250 ../pidgin/gtkdialogs.c:323 -#: ../pidgin/gtkdialogs.c:324 +#: ../pidgin/gtkdialogs.c:252 ../pidgin/gtkdialogs.c:325 +#: ../pidgin/gtkdialogs.c:326 msgid "Simplified Chinese" msgstr "" -#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:252 -#: ../pidgin/gtkdialogs.c:253 +#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254 +#: ../pidgin/gtkdialogs.c:255 msgid "Hong Kong Chinese" msgstr "" -#: ../pidgin/gtkdialogs.c:254 ../pidgin/gtkdialogs.c:255 -#: ../pidgin/gtkdialogs.c:325 +#: ../pidgin/gtkdialogs.c:256 ../pidgin/gtkdialogs.c:257 +#: ../pidgin/gtkdialogs.c:327 msgid "Traditional Chinese" msgstr "" -#: ../pidgin/gtkdialogs.c:261 +#: ../pidgin/gtkdialogs.c:263 msgid "Amharic" msgstr "" -#: ../pidgin/gtkdialogs.c:296 ../pidgin/gtkdialogs.c:297 -#: ../pidgin/gtkdialogs.c:298 +#: ../pidgin/gtkdialogs.c:298 ../pidgin/gtkdialogs.c:299 +#: ../pidgin/gtkdialogs.c:300 msgid "Lithuanian" msgstr "" -#: ../pidgin/gtkdialogs.c:322 +#: ../pidgin/gtkdialogs.c:324 msgid "T.M.Thanh and the Gnome-Vi Team" msgstr "" -#: ../pidgin/gtkdialogs.c:496 +#: ../pidgin/gtkdialogs.c:498 #, c-format msgid "" "%s is a messaging client based on libpurple which is capable of connecting " @@ -16079,7 +16079,7 @@ " There is no warranty for %s.

" msgstr "" -#: ../pidgin/gtkdialogs.c:506 +#: ../pidgin/gtkdialogs.c:508 #, c-format msgid "" "Helpful Resources
\t
" msgstr "" -#: ../pidgin/gtkdialogs.c:513 +#: ../pidgin/gtkdialogs.c:515 #, c-format msgid "" "Help from other Pidgin users is available by " @@ -16101,114 +16101,114 @@ "responses may be less helpful.
" msgstr "" -#: ../pidgin/gtkdialogs.c:523 +#: ../pidgin/gtkdialogs.c:525 #, c-format msgid "About %s" msgstr "" -#: ../pidgin/gtkdialogs.c:545 +#: ../pidgin/gtkdialogs.c:547 msgid "Build Information" msgstr "" #. End of not to be translated section -#: ../pidgin/gtkdialogs.c:714 +#: ../pidgin/gtkdialogs.c:716 #, c-format msgid "%s Build Information" msgstr "" -#: ../pidgin/gtkdialogs.c:735 +#: ../pidgin/gtkdialogs.c:737 msgid "Current Developers" msgstr "" -#: ../pidgin/gtkdialogs.c:741 +#: ../pidgin/gtkdialogs.c:743 msgid "Crazy Patch Writers" msgstr "" -#: ../pidgin/gtkdialogs.c:747 +#: ../pidgin/gtkdialogs.c:749 msgid "Retired Developers" msgstr "" -#: ../pidgin/gtkdialogs.c:753 +#: ../pidgin/gtkdialogs.c:755 msgid "Retired Crazy Patch Writers" msgstr "" -#: ../pidgin/gtkdialogs.c:756 +#: ../pidgin/gtkdialogs.c:758 #, c-format msgid "%s Developer Information" msgstr "" -#: ../pidgin/gtkdialogs.c:777 +#: ../pidgin/gtkdialogs.c:779 msgid "Current Translators" msgstr "" -#: ../pidgin/gtkdialogs.c:783 +#: ../pidgin/gtkdialogs.c:785 msgid "Past Translators" msgstr "" -#: ../pidgin/gtkdialogs.c:786 +#: ../pidgin/gtkdialogs.c:788 #, c-format msgid "%s Translator Information" msgstr "" -#: ../pidgin/gtkdialogs.c:797 +#: ../pidgin/gtkdialogs.c:799 #, c-format msgid "%s Plugin Information" msgstr "" -#: ../pidgin/gtkdialogs.c:806 +#: ../pidgin/gtkdialogs.c:808 msgid "Plugin Information" msgstr "" -#: ../pidgin/gtkdialogs.c:862 ../pidgin/gtkdialogs.c:1001 -#: ../pidgin/gtkdialogs.c:1082 +#: ../pidgin/gtkdialogs.c:864 ../pidgin/gtkdialogs.c:1003 +#: ../pidgin/gtkdialogs.c:1084 msgid "_Name" msgstr "" -#: ../pidgin/gtkdialogs.c:867 ../pidgin/gtkdialogs.c:1006 -#: ../pidgin/gtkdialogs.c:1087 +#: ../pidgin/gtkdialogs.c:869 ../pidgin/gtkdialogs.c:1008 +#: ../pidgin/gtkdialogs.c:1089 msgid "_Account" msgstr "" -#: ../pidgin/gtkdialogs.c:1014 +#: ../pidgin/gtkdialogs.c:1016 msgid "Get User Info" msgstr "" -#: ../pidgin/gtkdialogs.c:1016 +#: ../pidgin/gtkdialogs.c:1018 msgid "" "Please enter the username or alias of the person whose info you would like " "to view." msgstr "" -#: ../pidgin/gtkdialogs.c:1106 +#: ../pidgin/gtkdialogs.c:1108 msgid "View User Log" msgstr "" -#: ../pidgin/gtkdialogs.c:1128 +#: ../pidgin/gtkdialogs.c:1130 msgid "Alias Contact" msgstr "" -#: ../pidgin/gtkdialogs.c:1129 +#: ../pidgin/gtkdialogs.c:1131 msgid "Enter an alias for this contact." msgstr "" -#: ../pidgin/gtkdialogs.c:1151 +#: ../pidgin/gtkdialogs.c:1153 #, c-format msgid "Enter an alias for %s." msgstr "" -#: ../pidgin/gtkdialogs.c:1153 +#: ../pidgin/gtkdialogs.c:1155 msgid "Alias Buddy" msgstr "" -#: ../pidgin/gtkdialogs.c:1174 +#: ../pidgin/gtkdialogs.c:1176 msgid "Alias Chat" msgstr "" -#: ../pidgin/gtkdialogs.c:1175 +#: ../pidgin/gtkdialogs.c:1177 msgid "Enter an alias for this chat." msgstr "" -#: ../pidgin/gtkdialogs.c:1214 +#: ../pidgin/gtkdialogs.c:1216 #, c-format msgid "" "You are about to remove the contact containing %s and %d other buddy from " @@ -16219,70 +16219,70 @@ msgstr[0] "" msgstr[1] "" -#: ../pidgin/gtkdialogs.c:1222 +#: ../pidgin/gtkdialogs.c:1224 msgid "Remove Contact" msgstr "" -#: ../pidgin/gtkdialogs.c:1225 +#: ../pidgin/gtkdialogs.c:1227 msgid "_Remove Contact" msgstr "" -#: ../pidgin/gtkdialogs.c:1256 +#: ../pidgin/gtkdialogs.c:1258 #, 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:1263 +#: ../pidgin/gtkdialogs.c:1265 msgid "Merge Groups" msgstr "" -#: ../pidgin/gtkdialogs.c:1266 +#: ../pidgin/gtkdialogs.c:1268 msgid "_Merge Groups" msgstr "" -#: ../pidgin/gtkdialogs.c:1316 +#: ../pidgin/gtkdialogs.c:1318 #, 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:1319 +#: ../pidgin/gtkdialogs.c:1321 msgid "Remove Group" msgstr "" -#: ../pidgin/gtkdialogs.c:1322 +#: ../pidgin/gtkdialogs.c:1324 msgid "_Remove Group" msgstr "" -#: ../pidgin/gtkdialogs.c:1355 +#: ../pidgin/gtkdialogs.c:1357 #, c-format msgid "" "You are about to remove %s from your buddy list. Do you want to continue?" msgstr "" -#: ../pidgin/gtkdialogs.c:1358 +#: ../pidgin/gtkdialogs.c:1360 msgid "Remove Buddy" msgstr "" -#: ../pidgin/gtkdialogs.c:1361 +#: ../pidgin/gtkdialogs.c:1363 msgid "_Remove Buddy" msgstr "" -#: ../pidgin/gtkdialogs.c:1382 +#: ../pidgin/gtkdialogs.c:1384 #, c-format msgid "" "You are about to remove the chat %s from your buddy list. Do you want to " "continue?" msgstr "" -#: ../pidgin/gtkdialogs.c:1385 +#: ../pidgin/gtkdialogs.c:1387 msgid "Remove Chat" msgstr "" -#: ../pidgin/gtkdialogs.c:1388 +#: ../pidgin/gtkdialogs.c:1390 msgid "_Remove Chat" msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/python-apt.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/python-apt.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/python-apt.po 2012-05-08 22:53:28.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/python-apt.po 2012-08-03 13:45:32.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 03:16+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 12:19+0000\n" +"X-Generator: Launchpad (build 15719)\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -25,327 +25,327 @@ "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Ubuntu.info.in:33 +#: ../data/templates/Ubuntu.info.in:151 msgid "Ubuntu 12.04 'Precise Pangolin'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:40 +#: ../data/templates/Ubuntu.info.in:158 msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:151 +#: ../data/templates/Ubuntu.info.in:269 msgid "Ubuntu 11.10 'Oneiric Ocelot'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:158 +#: ../data/templates/Ubuntu.info.in:276 msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:388 msgid "Ubuntu 11.04 'Natty Narwhal'" msgstr "Ubuntu 11.04 'Natty Narwhal'" #. Description -#: ../data/templates/Ubuntu.info.in:277 +#: ../data/templates/Ubuntu.info.in:395 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:486 msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description -#: ../data/templates/Ubuntu.info.in:388 +#: ../data/templates/Ubuntu.info.in:506 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:400 +#: ../data/templates/Ubuntu.info.in:518 msgid "Canonical Partners" msgstr "Partneriaid Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:402 +#: ../data/templates/Ubuntu.info.in:520 msgid "Software packaged by Canonical for their partners" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:403 +#: ../data/templates/Ubuntu.info.in:521 msgid "This software is not part of Ubuntu." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:410 +#: ../data/templates/Ubuntu.info.in:528 msgid "Independent" msgstr "Annibynnol" #. CompDescription -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:530 msgid "Provided by third-party software developers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:413 +#: ../data/templates/Ubuntu.info.in:531 msgid "Software offered by third party developers." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:451 +#: ../data/templates/Ubuntu.info.in:569 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "Ubuntu 10.04 'Lucid Lynx'" #. Description -#: ../data/templates/Ubuntu.info.in:471 +#: ../data/templates/Ubuntu.info.in:589 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:514 +#: ../data/templates/Ubuntu.info.in:632 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "Ubuntu 9.10 'Karmic Koala'" #. Description -#: ../data/templates/Ubuntu.info.in:534 +#: ../data/templates/Ubuntu.info.in:652 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:695 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Ubuntu 9.04 'Jaunty Jackalope'" #. Description -#: ../data/templates/Ubuntu.info.in:596 +#: ../data/templates/Ubuntu.info.in:714 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "Cryno-ddisg gydag Ubuntu 9.04 'Jaunty Jackalope'" #. Description -#: ../data/templates/Ubuntu.info.in:639 +#: ../data/templates/Ubuntu.info.in:757 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:659 +#: ../data/templates/Ubuntu.info.in:777 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "Crynoddisg gyda Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:703 +#: ../data/templates/Ubuntu.info.in:821 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:723 +#: ../data/templates/Ubuntu.info.in:841 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "Crynoddisg gyda Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:768 +#: ../data/templates/Ubuntu.info.in:886 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:787 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "Crynoddisg gyda Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:832 +#: ../data/templates/Ubuntu.info.in:950 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:851 +#: ../data/templates/Ubuntu.info.in:969 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "Crynoddisg gyda Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:893 +#: ../data/templates/Ubuntu.info.in:1011 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:898 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:904 +#: ../data/templates/Ubuntu.info.in:1022 msgid "Restricted software" msgstr "Meddalwedd cyfyngedig" #. Description -#: ../data/templates/Ubuntu.info.in:912 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Crynoddisg gyda Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:954 +#: ../data/templates/Ubuntu.info.in:1072 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:957 +#: ../data/templates/Ubuntu.info.in:1075 msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:959 +#: ../data/templates/Ubuntu.info.in:1077 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:960 +#: ../data/templates/Ubuntu.info.in:1078 msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:962 +#: ../data/templates/Ubuntu.info.in:1080 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:963 +#: ../data/templates/Ubuntu.info.in:1081 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:965 +#: ../data/templates/Ubuntu.info.in:1083 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:966 +#: ../data/templates/Ubuntu.info.in:1084 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:973 +#: ../data/templates/Ubuntu.info.in:1091 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Crynoddisg gyda Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:989 +#: ../data/templates/Ubuntu.info.in:1107 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:994 +#: ../data/templates/Ubuntu.info.in:1112 ../data/templates/Debian.info.in:26 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:999 +#: ../data/templates/Ubuntu.info.in:1117 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1004 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1015 +#: ../data/templates/Ubuntu.info.in:1133 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:1030 +#: ../data/templates/Ubuntu.info.in:1148 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:1046 +#: ../data/templates/Ubuntu.info.in:1164 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1051 +#: ../data/templates/Ubuntu.info.in:1169 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1056 +#: ../data/templates/Ubuntu.info.in:1174 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1067 +#: ../data/templates/Ubuntu.info.in:1185 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:1082 +#: ../data/templates/Ubuntu.info.in:1200 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Crynoddisg gyda Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1085 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:179 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1098 +#: ../data/templates/Ubuntu.info.in:1216 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1103 +#: ../data/templates/Ubuntu.info.in:1221 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1108 +#: ../data/templates/Ubuntu.info.in:1226 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1114 +#: ../data/templates/Ubuntu.info.in:1232 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1120 +#: ../data/templates/Ubuntu.info.in:1238 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1122 +#: ../data/templates/Ubuntu.info.in:1240 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1129 +#: ../data/templates/Ubuntu.info.in:1247 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Crynoddisg gyda Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1132 +#: ../data/templates/Ubuntu.info.in:1250 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1134 +#: ../data/templates/Ubuntu.info.in:1252 msgid "Restricted copyright" msgstr "Hawlfraint cyfyngedig" #. Description -#: ../data/templates/Ubuntu.info.in:1141 +#: ../data/templates/Ubuntu.info.in:1259 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1146 +#: ../data/templates/Ubuntu.info.in:1264 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1151 +#: ../data/templates/Ubuntu.info.in:1269 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -356,62 +356,62 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/templates/Debian.info.in:8 +#: ../data/templates/Debian.info.in:38 msgid "Debian 6.0 'Squeeze' " msgstr "Debian 6.0 'Squeeze' " #. Description -#: ../data/templates/Debian.info.in:33 +#: ../data/templates/Debian.info.in:63 msgid "Debian 5.0 'Lenny' " msgstr "Debian 5.0 'Lenny' " #. Description -#: ../data/templates/Debian.info.in:58 +#: ../data/templates/Debian.info.in:88 msgid "Debian 4.0 'Etch'" msgstr "Debian 4.0 'Etch'" #. Description -#: ../data/templates/Debian.info.in:83 +#: ../data/templates/Debian.info.in:113 msgid "Debian 3.1 'Sarge'" msgstr "Debian 3.1 'Sarge'" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:124 msgid "Proposed updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:131 msgid "Security updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:138 msgid "Debian current stable release" msgstr "" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:151 msgid "Debian testing" msgstr "Profion Debian" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:177 msgid "Debian 'Sid' (unstable)" msgstr "Debian 'Sid' (ansefydlog)" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:181 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:183 msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:206 ../aptsources/distro.py:434 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:436 #, python-format msgid "Server for %s" msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/screen-resolution-extra.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/screen-resolution-extra.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/screen-resolution-extra.po 2012-05-08 22:53:38.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/screen-resolution-extra.po 2012-08-03 13:45:42.000000000 +0000 @@ -14,10 +14,10 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 06:27+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 16:07+0000\n" +"X-Generator: Launchpad (build 15719)\n" -#: ../ScreenResolution/ui.py:59 +#: ../ScreenResolution/ui.py:60 msgid "" "Monitor Resolution Settings has detected that the virtual resolution must be " "set in your configuration file in order to apply your settings.\n" @@ -30,11 +30,11 @@ "\n" "A hoffech i Gydraniad y Sgrîn osod y rhithgydraniad iddoch chi?" -#: ../ScreenResolution/ui.py:63 +#: ../ScreenResolution/ui.py:64 msgid "Could not connect to Monitor Resolution Settings DBUS service." msgstr "Ni allai gysylltu â gwasanaeth DBUS Gosodiadau Cydraniad y Monitor." -#: ../ScreenResolution/ui.py:65 +#: ../ScreenResolution/ui.py:66 msgid "" "Please log out and log back in again. You will then be able to use Monitor " "Resolution Settings to setup your monitors" @@ -42,11 +42,11 @@ "Logiwch allan ac yn ôl i mewn, os gwelwch yn dda. Byddwch wedyn yn medru " "defnyddio Gosodiadau Cydraniad y Monitor er mwyn gosod eich monitorau i fyny" -#: ../ScreenResolution/ui.py:67 +#: ../ScreenResolution/ui.py:68 msgid "Monitor Resolution Settings can't apply your settings." msgstr "Ni fedra Gosodiadau Cydraniad y Monitor gymhwyso eich gosodiadau." -#: ../ScreenResolution/ui.py:69 +#: ../ScreenResolution/ui.py:70 msgid "Monitor Resolution Settings" msgstr "Gosodiadau Cydraniad y Monitor" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/shared-mime-info.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/shared-mime-info.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/shared-mime-info.po 2012-05-08 22:53:28.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/shared-mime-info.po 2012-08-03 13:45:32.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: shared-mime-info\n" "Report-Msgid-Bugs-To: http://bugzilla.freedesktop.org/\n" -"POT-Creation-Date: 2012-04-13 22:25+0000\n" +"POT-Creation-Date: 2012-05-31 23:48+0000\n" "PO-Revision-Date: 2010-11-18 22:47+0000\n" "Last-Translator: Rhys Jones \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 03:19+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 12:22+0000\n" +"X-Generator: Launchpad (build 15719)\n" "Language: cy\n" #: ../freedesktop.org.xml.in.h:1 diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/software-properties.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/software-properties.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/software-properties.po 2012-05-08 22:53:37.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/software-properties.po 2012-08-03 13:45:40.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: software-properties\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-04-25 20:27+0000\n" -"PO-Revision-Date: 2012-04-25 23:06+0000\n" +"POT-Creation-Date: 2012-07-21 21:23+0000\n" +"PO-Revision-Date: 2012-07-22 00:56+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Welsh \n" "MIME-Version: 1.0\n" @@ -16,10 +16,10 @@ "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-05-08 05:51+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 15:29+0000\n" +"X-Generator: Launchpad (build 15719)\n" -#: ../data/com.ubuntu.softwareproperties.policy.in.h:2 +#: ../data/com.ubuntu.softwareproperties.policy.in.h:1 msgid "Write Configuration" msgstr "" @@ -27,16 +27,16 @@ msgid "To change software repository settings, you need to authenticate." 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/software-properties-gtk.desktop.in.h:1 +#: ../data/software-properties-kde.desktop.in.h:1 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:619 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:639 +#: ../data/gtkbuilder/main.ui.h:14 msgid "Software Sources" msgstr "Cronfeydd Meddalwedd" -#: ../data/software-properties-gtk.desktop.in.h:1 -#: ../data/software-properties-kde.desktop.in.h:1 +#: ../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 "" @@ -63,11 +63,11 @@ msgid "Please check that the PPA name or format is correct." msgstr "" -#: ../add-apt-repository:70 +#: ../add-apt-repository:106 msgid "Error: must run as root" msgstr "" -#: ../add-apt-repository:74 +#: ../add-apt-repository:110 msgid "Error: need a repository as argument" msgstr "" @@ -96,11 +96,11 @@ msgid "You are about to remove the following PPA from your system:" msgstr "" -#: ../add-apt-repository:89 +#: ../add-apt-repository:148 msgid "You are about to add the following PPA to your system:" msgstr "" -#: ../add-apt-repository:92 +#: ../add-apt-repository:150 #, c-format msgid " More info: %s" msgstr " Mwy o wybodaeth: %s" @@ -109,16 +109,16 @@ msgid "Press [ENTER] to continue or ctrl-c to cancel removing it" msgstr "" -#: ../add-apt-repository:95 +#: ../add-apt-repository:156 msgid "Press [ENTER] to continue or ctrl-c to cancel adding it" msgstr "" -#: ../add-apt-repository:106 +#: ../add-apt-repository:170 ../add-apt-repository:174 #, c-format msgid "Error: '%s' doesn't exist in a sourcelist file" msgstr "" -#: ../add-apt-repository:109 +#: ../add-apt-repository:178 #, c-format msgid "Error: '%s' invalid" msgstr "" @@ -186,22 +186,22 @@ msgstr "" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:169 -#: ../data/gtkbuilder/main.ui.h:17 +#: ../data/gtkbuilder/main.ui.h:10 msgid "Every two days" msgstr "Bob dau ddiwrnod" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:170 -#: ../data/gtkbuilder/main.ui.h:35 +#: ../data/gtkbuilder/main.ui.h:11 msgid "Weekly" msgstr "Wythnosol" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:171 -#: ../data/gtkbuilder/main.ui.h:18 +#: ../data/gtkbuilder/main.ui.h:12 msgid "Every two weeks" msgstr "Bob pythefnos" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:178 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:219 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:223 #, python-format msgid "Every %s days" msgstr "" @@ -210,7 +210,7 @@ #. first %s is the description of the component #. second %s is the code name of the comp, eg main, universe #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:243 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:288 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:292 #, python-format msgid "%s (%s)" msgstr "%s (%s)" @@ -218,33 +218,33 @@ #. add a separator and the option to choose another mirror from the list #. #FIXME server_store.append(["sep", None, True]) #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:306 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:407 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:479 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:411 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:492 msgid "Other..." msgstr "" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:676 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:847 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:898 msgid "Import key" msgstr "" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:679 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:860 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:912 msgid "Error importing selected file" msgstr "" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:680 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:861 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:913 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:694 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:873 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:929 msgid "Error removing the key" msgstr "" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:695 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:874 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:930 msgid "" "The key you selected could not be removed. Please report this as a bug." msgstr "" @@ -312,19 +312,19 @@ 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 "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 "Cod Gwreiddiol" -#: ../softwareproperties/SoftwareProperties.py:490 +#: ../softwareproperties/SoftwareProperties.py:494 msgid "(Source Code)" msgstr "(Cod Gwreiddiol )" -#: ../softwareproperties/SoftwareProperties.py:496 +#: ../softwareproperties/SoftwareProperties.py:500 msgid "Source Code" msgstr "Cod Gwreiddiol" @@ -338,35 +338,35 @@ msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:275 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:279 #, python-format msgid "%s Software" msgstr "" -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:593 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:613 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:630 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:650 msgid "Active" msgstr "" -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:673 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:703 msgid "_Add key from paste data" msgstr "" -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:686 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:697 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:716 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:727 msgid "Error importing key" msgstr "" -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:687 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:698 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:717 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:728 msgid "The selected data may not be a GPG key file or it might be corrupt." msgstr "" -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:739 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:773 msgid "Error scanning the CD" msgstr "" -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:740 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:774 msgid "Could not find a suitable CD." msgstr "" @@ -404,11 +404,11 @@ msgid "Ubuntu CD Image Automatic Signing Key " msgstr "" -#: ../data/gtkbuilder/dialog-edit-source.ui.h:8 +#: ../data/gtkbuilder/dialog-edit-source.ui.h:2 msgid "Source" msgstr "" -#: ../data/gtkbuilder/dialog-edit-source.ui.h:7 +#: ../data/gtkbuilder/dialog-edit-source.ui.h:3 msgid "Edit Source" msgstr "" @@ -420,15 +420,15 @@ msgid "URI:" msgstr "" -#: ../data/gtkbuilder/dialog-edit-source.ui.h:3 +#: ../data/gtkbuilder/dialog-edit-source.ui.h:6 msgid "Distribution:" msgstr "" -#: ../data/gtkbuilder/dialog-edit-source.ui.h:2 +#: ../data/gtkbuilder/dialog-edit-source.ui.h:7 msgid "Components:" msgstr "Cydrannau:" -#: ../data/gtkbuilder/dialog-edit-source.ui.h:1 +#: ../data/gtkbuilder/dialog-edit-source.ui.h:8 msgid "Comment:" msgstr "Sylw:" @@ -440,133 +440,133 @@ msgid "Scanning CD-ROM" msgstr "" -#: ../data/gtkbuilder/main.ui.h:11 +#: ../data/gtkbuilder/main.ui.h:1 msgid "Display immediately" msgstr "" -#: ../data/gtkbuilder/main.ui.h:12 +#: ../data/gtkbuilder/main.ui.h:2 msgid "Display weekly" msgstr "" -#: ../data/gtkbuilder/main.ui.h:10 +#: ../data/gtkbuilder/main.ui.h:3 msgid "Display every two weeks" msgstr "" -#: ../data/gtkbuilder/main.ui.h:19 +#: ../data/gtkbuilder/main.ui.h:4 msgid "For any new version" msgstr "" -#: ../data/gtkbuilder/main.ui.h:20 +#: ../data/gtkbuilder/main.ui.h:5 msgid "For long-term support versions" msgstr "" -#: ../data/gtkbuilder/main.ui.h:24 +#: ../data/gtkbuilder/main.ui.h:6 msgid "Never" msgstr "" -#: ../data/gtkbuilder/main.ui.h:14 +#: ../data/gtkbuilder/main.ui.h:7 msgid "Download automatically" msgstr "" -#: ../data/gtkbuilder/main.ui.h:13 +#: ../data/gtkbuilder/main.ui.h:8 msgid "Download and install automatically" msgstr "" -#: ../data/gtkbuilder/main.ui.h:33 +#: ../data/gtkbuilder/main.ui.h:13 msgid "To install from a CD-ROM or DVD, insert the medium into the drive." msgstr "" -#: ../data/gtkbuilder/main.ui.h:15 +#: ../data/gtkbuilder/main.ui.h:16 msgid "Download from:" msgstr "" -#: ../data/gtkbuilder/main.ui.h:2 +#: ../data/gtkbuilder/main.ui.h:17 msgid "Downloadable from the Internet" msgstr "" -#: ../data/gtkbuilder/main.ui.h:3 +#: ../data/gtkbuilder/main.ui.h:18 msgid "Installable from CD-ROM/DVD" msgstr "" -#: ../data/gtkbuilder/main.ui.h:6 +#: ../data/gtkbuilder/main.ui.h:19 msgid "Add..." msgstr "Ychwanegu..." -#: ../data/gtkbuilder/main.ui.h:16 +#: ../data/gtkbuilder/main.ui.h:20 msgid "Edit..." msgstr "Golygu..." -#: ../data/gtkbuilder/main.ui.h:5 +#: ../data/gtkbuilder/main.ui.h:21 msgid "Add Volume..." msgstr "" -#: ../data/gtkbuilder/main.ui.h:26 +#: ../data/gtkbuilder/main.ui.h:22 msgid "Other Software" msgstr "" -#: ../data/gtkbuilder/main.ui.h:22 +#: ../data/gtkbuilder/main.ui.h:23 msgid "Install updates from:" msgstr "" -#: ../data/gtkbuilder/main.ui.h:8 +#: ../data/gtkbuilder/main.ui.h:24 msgid "Automatically check for updates:" msgstr "" -#: ../data/gtkbuilder/main.ui.h:37 +#: ../data/gtkbuilder/main.ui.h:25 msgid "When there are security updates:" msgstr "" -#: ../data/gtkbuilder/main.ui.h:36 +#: ../data/gtkbuilder/main.ui.h:26 msgid "When there are other updates:" msgstr "" -#: ../data/gtkbuilder/main.ui.h:25 +#: ../data/gtkbuilder/main.ui.h:27 msgid "Notify me of a new Ubuntu version:" msgstr "" -#: ../data/gtkbuilder/main.ui.h:34 +#: ../data/gtkbuilder/main.ui.h:28 msgid "Updates" msgstr "" -#: ../data/gtkbuilder/main.ui.h:4 +#: ../data/gtkbuilder/main.ui.h:29 msgid "Trusted software providers" msgstr "" -#: ../data/gtkbuilder/main.ui.h:1 +#: ../data/gtkbuilder/main.ui.h:30 msgid " " msgstr " " -#: ../data/gtkbuilder/main.ui.h:23 +#: ../data/gtkbuilder/main.ui.h:31 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:38 +#: ../data/gtkbuilder/main.ui.h:32 msgid "_Import Key File..." msgstr "" -#: ../data/gtkbuilder/main.ui.h:21 +#: ../data/gtkbuilder/main.ui.h:33 msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/gtkbuilder/main.ui.h:27 +#: ../data/gtkbuilder/main.ui.h:34 msgid "Restore _Defaults" msgstr "" -#: ../data/gtkbuilder/main.ui.h:28 +#: ../data/gtkbuilder/main.ui.h:35 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/gtkbuilder/main.ui.h:7 +#: ../data/gtkbuilder/main.ui.h:36 msgid "Authentication" msgstr "Dilysiad" -#: ../data/gtkbuilder/main.ui.h:32 +#: ../data/gtkbuilder/main.ui.h:37 msgid "Submit statistical information" msgstr "" -#: ../data/gtkbuilder/main.ui.h:31 +#: ../data/gtkbuilder/main.ui.h:38 msgid "Statistics" msgstr "Ystadegau" @@ -575,7 +575,7 @@ msgstr "" #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:1 -#: ../data/gtkbuilder/dialog-mirror.ui.h:1 +#: ../data/gtkbuilder/dialog-mirror.ui.h:6 msgid " " msgstr " " @@ -583,19 +583,19 @@ msgid "_Reload" msgstr "Ail-lwytho" -#: ../data/gtkbuilder/dialog-mirror.ui.h:6 +#: ../data/gtkbuilder/dialog-mirror.ui.h:1 msgid "Choose a Download Server" msgstr "" -#: ../data/gtkbuilder/dialog-mirror.ui.h:8 +#: ../data/gtkbuilder/dialog-mirror.ui.h:2 msgid "Protocol:" msgstr "" -#: ../data/gtkbuilder/dialog-mirror.ui.h:9 +#: ../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 "" @@ -603,7 +603,7 @@ msgid "Choose _Server" msgstr "" -#: ../data/gtkbuilder/dialog-mirror.ui.h:2 +#: ../data/gtkbuilder/dialog-mirror.ui.h:7 msgid "" "Testing download servers\n" "\n" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/system-config-kickstart.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/system-config-kickstart.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/system-config-kickstart.po 2012-05-08 22:53:34.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/system-config-kickstart.po 2012-08-03 13:45:38.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: 2012-05-08 04:51+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 14:24+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ../src/RHELPackageGroupList.py:12 msgid "X Window System" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/tasksel.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/tasksel.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/tasksel.po 2012-05-08 22:53:34.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/tasksel.po 2012-08-03 13:45:38.000000000 +0000 @@ -13,10 +13,10 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 04:51+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 14:24+0000\n" +"X-Generator: Launchpad (build 15719)\n" -#: ../tasksel.pl:433 +#: ../tasksel.pl:494 msgid "" "Usage:\n" "tasksel install \n" @@ -29,6 +29,7 @@ "\t --task-desc returns the description of a task\n" msgstr "" -#: ../tasksel.pl:608 ../tasksel.pl:617 +#: ../tasksel.pl:848 ../tasksel.pl:852 ../tasksel.pl:863 ../tasksel.pl:867 +#: ../tasksel.pl:871 msgid "aptitude failed" msgstr "methodd aptitude" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/ubuntuone-client.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/ubuntuone-client.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/ubuntuone-client.po 2012-05-08 22:53:38.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/ubuntuone-client.po 2012-08-03 13:45:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ubuntuone-client\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-04-12 12:53+0000\n" +"POT-Creation-Date: 2012-07-12 16:03+0000\n" "PO-Revision-Date: 2011-01-15 03:19+0000\n" "Last-Translator: David Jones \n" "Language-Team: Welsh \n" @@ -16,12 +16,11 @@ "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-05-08 06:51+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 16:31+0000\n" +"X-Generator: Launchpad (build 15719)\n" -#: ../ubuntuone/clientdefs.py.in:39 -#: ../ubuntuone/platform/credentials/__init__.py:69 -#: ../libsyncdaemon/syncdaemon-authentication.c:287 +#: ../ubuntuone/clientdefs.py.in:52 +#: ../ubuntuone/platform/credentials/__init__.py:90 msgid "" "Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process " "will allow you to create a new account, if you do not yet have one." @@ -29,28 +28,28 @@ "Mae angen cyfri Ubuntu Single Sign On (SSO) ar Ubuntu One. Bydd y broses hon " "yn rhoi cyfle i ti greu cyfri newydd os nag oes un gen ti." -#: ../ubuntuone/status/aggregator.py:39 +#: ../ubuntuone/status/aggregator.py:51 msgid "Ubuntu One" msgstr "Ubuntu One" -#: ../ubuntuone/status/aggregator.py:40 +#: ../ubuntuone/status/aggregator.py:52 msgid "New cloud folder(s) available" msgstr "Cwmwl plygell(au) newydd ar gael" -#: ../ubuntuone/status/aggregator.py:41 +#: ../ubuntuone/status/aggregator.py:53 msgid "File synchronization completed." msgstr "" -#: ../ubuntuone/status/aggregator.py:43 +#: ../ubuntuone/status/aggregator.py:55 #, python-format msgid "%(percentage_completed)d%% completed." msgstr "" -#: ../ubuntuone/status/aggregator.py:44 +#: ../ubuntuone/status/aggregator.py:56 msgid "File synchronization in progress" msgstr "" -#: ../ubuntuone/status/aggregator.py:47 +#: ../ubuntuone/status/aggregator.py:59 #, python-format msgid "" "There is no available space on the folder:\n" @@ -59,12 +58,12 @@ "Does dim lle'n weddill ar y blygell:\n" "\"%s\" yn cael ei rannu gan %s" -#: ../ubuntuone/status/aggregator.py:61 +#: ../ubuntuone/status/aggregator.py:73 #, python-format msgid "'%(filename)s' is being uploaded to your personal cloud." msgstr "" -#: ../ubuntuone/status/aggregator.py:67 +#: ../ubuntuone/status/aggregator.py:79 #, python-format msgid "" "'%(filename)s' and %(other_files)d other file are being uploaded to your " @@ -75,12 +74,12 @@ msgstr[0] "" msgstr[1] "" -#: ../ubuntuone/status/aggregator.py:78 +#: ../ubuntuone/status/aggregator.py:90 #, python-format msgid "'%(filename)s' is being downloaded to your computer." msgstr "" -#: ../ubuntuone/status/aggregator.py:84 +#: ../ubuntuone/status/aggregator.py:96 #, python-format msgid "" "'%(filename)s' and %(other_files)d other file are being downloaded to your " @@ -91,12 +90,12 @@ msgstr[0] "" msgstr[1] "" -#: ../ubuntuone/status/aggregator.py:95 +#: ../ubuntuone/status/aggregator.py:107 #, python-format msgid "'%(filename)s' was uploaded to your personal cloud." msgstr "" -#: ../ubuntuone/status/aggregator.py:101 +#: ../ubuntuone/status/aggregator.py:113 #, python-format msgid "" "'%(filename)s' and %(other_files)d other file were uploaded to your personal " @@ -107,12 +106,12 @@ msgstr[0] "" msgstr[1] "" -#: ../ubuntuone/status/aggregator.py:112 +#: ../ubuntuone/status/aggregator.py:124 #, python-format msgid "'%(filename)s' was downloaded to your computer." msgstr "" -#: ../ubuntuone/status/aggregator.py:118 +#: ../ubuntuone/status/aggregator.py:130 #, python-format msgid "" "'%(filename)s' and %(other_files)d other file were downloaded to your " @@ -123,52 +122,52 @@ msgstr[0] "" msgstr[1] "" -#: ../ubuntuone/status/aggregator.py:179 +#: ../ubuntuone/status/aggregator.py:191 #, python-format msgid "A file was just made public at %(new_public_url)s" msgstr "" -#: ../ubuntuone/status/aggregator.py:192 +#: ../ubuntuone/status/aggregator.py:204 #, python-format msgid "%(event_count)d file was just made public." msgid_plural "%(event_count)d files were just made public." msgstr[0] "" msgstr[1] "" -#: ../ubuntuone/status/aggregator.py:200 +#: ../ubuntuone/status/aggregator.py:212 msgid "A file is no longer published" msgstr "" -#: ../ubuntuone/status/aggregator.py:208 +#: ../ubuntuone/status/aggregator.py:220 #, python-format msgid "%(event_count)d file is no longer published." msgid_plural "%(event_count)d files are no longer published." msgstr[0] "" msgstr[1] "" -#: ../ubuntuone/status/aggregator.py:223 +#: ../ubuntuone/status/aggregator.py:235 #, python-format msgid "Found %(event_count)d new cloud folder." msgid_plural "Found %(event_count)d new cloud folders." msgstr[0] "" msgstr[1] "" -#: ../ubuntuone/status/aggregator.py:231 +#: ../ubuntuone/status/aggregator.py:243 #, python-format msgid "" "New cloud folder available: '%(folder_name)s' shared by %(other_user_name)s" msgstr "" -#: ../ubuntuone/status/aggregator.py:247 +#: ../ubuntuone/status/aggregator.py:259 #, python-format msgid "New cloud folder available: '%(folder_name)s'" msgstr "Cwmwl plygell newydd ar gael: '%(folder_name)s'" -#: ../ubuntuone/status/aggregator.py:269 +#: ../ubuntuone/status/aggregator.py:281 msgid "The connection to the server was lost." msgstr "" -#: ../ubuntuone/status/aggregator.py:275 +#: ../ubuntuone/status/aggregator.py:287 msgid "The connection to the server was restored." msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/ubuntuone-installer.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/ubuntuone-installer.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/ubuntuone-installer.po 2012-05-08 22:53:45.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/ubuntuone-installer.po 2012-08-03 13:45:48.000000000 +0000 @@ -14,47 +14,47 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 10:32+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 20:23+0000\n" +"X-Generator: Launchpad (build 15719)\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:128 +#: ../ubuntuone/installer/gui.py:129 msgid "Install Ubuntu One" msgstr "Gosod Ubuntu One" -#: ../ubuntuone/installer/gui.py:135 +#: ../ubuntuone/installer/gui.py:136 msgid "Discover your personal cloud" msgstr "" -#: ../ubuntuone/installer/gui.py:182 +#: ../ubuntuone/installer/gui.py:191 msgid "I_nstall" msgstr "" -#: ../ubuntuone/installer/gui.py:192 +#: ../ubuntuone/installer/gui.py:208 msgid "Learn more" msgstr "" -#: ../ubuntuone/installer/gui.py:277 +#: ../ubuntuone/installer/gui.py:292 msgid "" "Store files, photos, and music safely in Ubuntu One and access them on any " "of your devices." msgstr "" -#: ../ubuntuone/installer/gui.py:292 +#: ../ubuntuone/installer/gui.py:307 msgid "" "Upload photos from your mobile instantly, and they're ready to share with " "friends or post online." msgstr "" -#: ../ubuntuone/installer/gui.py:308 +#: ../ubuntuone/installer/gui.py:323 msgid "" "Stream your music collection to all of your devices and listen to any song - " "online or offline." msgstr "" -#: ../ubuntuone/installer/gui.py:329 +#: ../ubuntuone/installer/gui.py:343 msgid "Ubuntu One is installing…" msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/ubuntu-sso-client.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/ubuntu-sso-client.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/ubuntu-sso-client.po 2012-05-08 22:53:39.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/ubuntu-sso-client.po 2012-08-03 13:45:43.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-sso-client\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-04-11 20:37+0000\n" +"POT-Creation-Date: 2012-07-06 18:52+0000\n" "PO-Revision-Date: 2011-01-18 07:47+0000\n" "Last-Translator: David Jones \n" "Language-Team: Welsh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 07:29+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 17:02+0000\n" +"X-Generator: Launchpad (build 15719)\n" #. Undefined variable '_', pylint: disable=E0602 #. all the text that is used in the gui @@ -35,11 +35,11 @@ msgid "Cancel" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:152 +#: ../ubuntu_sso/utils/ui.py:51 msgid "Type the characters above" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:153 +#: ../ubuntu_sso/utils/ui.py:52 msgid "There was a problem getting the captcha, reloading..." msgstr "" @@ -52,7 +52,7 @@ msgid "refresh" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:205 +#: ../ubuntu_sso/utils/ui.py:57 msgid "Reload" msgstr "" @@ -68,25 +68,25 @@ msgid "Congratulations, {app_name} is installed!" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:155 +#: ../ubuntu_sso/utils/ui.py:61 #, python-format msgid "To connect this computer to %(app_name)s enter your details below." msgstr "" -#: ../ubuntu_sso/gtk/gui.py:157 ../ubuntu_sso/gtk/gui.py:169 -#: ../ubuntu_sso/gtk/gui.py:187 +#: ../ubuntu_sso/utils/ui.py:63 ../ubuntu_sso/utils/ui.py:88 +#: ../ubuntu_sso/utils/ui.py:138 msgid "Email address" msgstr "Cyfeiriad ebost" -#: ../ubuntu_sso/gtk/gui.py:158 +#: ../ubuntu_sso/utils/ui.py:64 msgid "Re-type Email address" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:161 +#: ../ubuntu_sso/utils/ui.py:65 msgid "The email must be a valid email address." msgstr "" -#: ../ubuntu_sso/gtk/gui.py:159 +#: ../ubuntu_sso/utils/ui.py:66 msgid "" "The email addresses don't match, please double check and try entering them " "again." @@ -100,7 +100,7 @@ msgid "The email addresses do not match" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:162 +#: ../ubuntu_sso/utils/ui.py:70 msgid "Enter code verification here" msgstr "" @@ -108,7 +108,7 @@ msgid "Please enter your name" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:163 +#: ../ubuntu_sso/utils/ui.py:72 msgid "The process did not finish successfully." msgstr "" @@ -116,15 +116,15 @@ msgid "Sign me in with my existing account" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:164 +#: ../ubuntu_sso/utils/ui.py:75 msgid "This field is required." msgstr "" -#: ../ubuntu_sso/gtk/gui.py:165 +#: ../ubuntu_sso/utils/ui.py:76 msgid "I've forgotten my password" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:185 +#: ../ubuntu_sso/utils/ui.py:77 ../ubuntu_sso/utils/ui.py:125 msgid "Reset password" msgstr "" @@ -142,12 +142,12 @@ msgid "There was a problem accessing the Ubuntu Single Sign On backend." msgstr "" -#: ../ubuntu_sso/gtk/gui.py:166 +#: ../ubuntu_sso/utils/ui.py:84 #, python-format msgid "Create %(app_name)s account" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:167 +#: ../ubuntu_sso/utils/ui.py:85 msgid "Loading..." msgstr "Yn Llwytho..." @@ -155,16 +155,16 @@ msgid "Getting information, please wait..." msgstr "" -#: ../ubuntu_sso/gtk/gui.py:168 +#: ../ubuntu_sso/utils/ui.py:87 msgid "Already have an account? Click here to sign in" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:170 +#: ../ubuntu_sso/utils/ui.py:89 #, python-format msgid "Connect to %(app_name)s" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:171 ../ubuntu_sso/gtk/gui.py:176 +#: ../ubuntu_sso/utils/ui.py:90 ../ubuntu_sso/utils/ui.py:104 msgid "Password" msgstr "Cyfrinair" @@ -172,7 +172,7 @@ msgid "Sign In to {app_name}" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:172 +#: ../ubuntu_sso/utils/ui.py:94 msgid "Name" msgstr "Enw" @@ -180,7 +180,7 @@ msgid "The name must not be empty." msgstr "" -#: ../ubuntu_sso/gtk/gui.py:173 +#: ../ubuntu_sso/utils/ui.py:96 msgid "Next" msgstr "Nesaf" @@ -195,7 +195,7 @@ "connected to set up %(app_name)s" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:174 +#: ../ubuntu_sso/utils/ui.py:100 msgid "One moment please..." msgstr "" @@ -203,7 +203,7 @@ msgid "Create a password" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:175 +#: ../ubuntu_sso/utils/ui.py:102 msgid "Your password was successfully changed." msgstr "" @@ -211,11 +211,11 @@ msgid "At least one number" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:177 +#: ../ubuntu_sso/utils/ui.py:105 msgid "Re-type Password" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:178 +#: ../ubuntu_sso/utils/ui.py:106 msgid "" "The password must have a minimum of 8 characters and include one uppercase " "character and one number." @@ -229,7 +229,7 @@ msgid "Passwords don't match" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:180 +#: ../ubuntu_sso/utils/ui.py:110 msgid "" "The passwords don't match, please double check and try entering them again." msgstr "" @@ -238,7 +238,7 @@ msgid "Your password must contain" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:182 +#: ../ubuntu_sso/utils/ui.py:113 msgid "The password is too weak." msgstr "" @@ -300,7 +300,7 @@ msgid "Retype password" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:183 +#: ../ubuntu_sso/utils/ui.py:130 #, python-format msgid "To reset your %(app_name)s password, enter your email address below:" msgstr "" @@ -316,11 +316,11 @@ msgid "Sorry we did not recognize the email address." msgstr "" -#: ../ubuntu_sso/gtk/gui.py:186 +#: ../ubuntu_sso/utils/ui.py:137 msgid "Reset code" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:188 +#: ../ubuntu_sso/utils/ui.py:140 #, python-format msgid "" "A password reset code has been sent to %(email)s.\n" @@ -423,7 +423,7 @@ msgid "Sign Up to {app_name}" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:192 +#: ../ubuntu_sso/utils/ui.py:174 msgid "Show Terms & Conditions" msgstr "" @@ -442,7 +442,7 @@ msgid "Try again" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:195 +#: ../ubuntu_sso/utils/ui.py:179 msgid "" "There was an error when trying to complete the process. Please check the " "information and try again." @@ -460,16 +460,16 @@ "to complete creating your %(app_name)s account." msgstr "" -#: ../ubuntu_sso/gtk/gui.py:197 +#: ../ubuntu_sso/utils/ui.py:186 msgid "Enter verification code" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:203 +#: ../ubuntu_sso/utils/ui.py:189 #, python-format msgid "I agree with the %(app_name)s terms and conditions" msgstr "" -#: ../ubuntu_sso/gtk/gui.py:204 +#: ../ubuntu_sso/utils/ui.py:190 #, python-format msgid "Yes! Email me %(app_name)s tips and updates." msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/unity-2d.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/unity-2d.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/unity-2d.po 2012-05-08 22:53:39.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/unity-2d.po 2012-08-03 13:45:43.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: 2012-05-08 07:39+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 17:14+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: shell/launcher/LauncherList.qml:90 #, qt-format diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/update-manager.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/update-manager.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/update-manager.po 2012-05-08 22:53:28.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/update-manager.po 2012-08-03 13:45:32.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-26 13:21+0000\n" +"POT-Creation-Date: 2012-07-18 00:22+0000\n" "PO-Revision-Date: 2011-12-06 06:42+0000\n" "Last-Translator: Owen Llywelyn \n" "Language-Team: Welsh \n" @@ -16,11 +16,11 @@ "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-05-08 03:22+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 12:26+0000\n" +"X-Generator: Launchpad (build 15719)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 +#: ../UpdateManager/Core/utils.py:462 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,7 +28,7 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 +#: ../UpdateManager/Core/utils.py:466 #, python-format msgid "%.1f MB" msgstr "%.1f MB" @@ -167,8 +167,7 @@ "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:697 -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:274 msgid "Could not calculate the upgrade" msgstr "Methu cyfrifo'r uwchraddiad" @@ -520,9 +519,8 @@ "Digwyddodd gwall wrth ddiweddaru. Problem rhwydwaith sy'n achosi hyn fel " "arfer. Gwiria dy gysylltiad rhwydwaith a cheisio eto." -#. print "on_button_install_clicked" -#: ../DistUpgrade/DistUpgradeController.py:866 -#: ../UpdateManager/UpdateManager.py:753 +#. print("on_button_install_clicked") +#: ../UpdateManager/UpdatesAvailable.py:545 msgid "Not enough free disk space" msgstr "Dim digon o le disg rhydd" @@ -913,7 +911,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:149 #: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:301 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 #: ../DistUpgrade/DistUpgradeViewKDE.py:221 #: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format @@ -938,20 +936,20 @@ #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:211 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:212 #: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemau dibyniaeth - yn gadael heb ei gyflunio" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:216 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:217 #: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Methu gosod '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:217 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:218 #: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" @@ -963,7 +961,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:234 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:235 #: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" @@ -974,7 +972,7 @@ "'%s'?" #: ../DistUpgrade/DistUpgradeViewGtk.py:232 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:235 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:236 #: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " @@ -984,19 +982,19 @@ "ti'n ei amnewid am fersiwn mwy newydd." #: ../DistUpgrade/DistUpgradeViewGtk.py:250 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:253 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 #: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Methwyd canfod gorchymyn 'diff'" #: ../DistUpgrade/DistUpgradeViewGtk.py:463 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 #: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Digwyddodd gwall marwol" #: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:470 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files " "/var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1009,12 +1007,12 @@ "Cadwyd dy sources.list gwreiddiol yn /etc/apt/sources.list.distUpgrade." #: ../DistUpgrade/DistUpgradeViewGtk.py:481 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:487 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Gwasgwyd Ctrl-c" #: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:488 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1024,42 +1022,42 @@ #. append warning #: ../DistUpgrade/DistUpgradeViewGtk.py:630 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:621 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Cau pob rhaglen a dogfen i osgoi colli data." #: ../DistUpgrade/DistUpgradeViewGtk.py:644 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:635 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Ddim yn derbyn cefnogaeth Canonical bellach (%s)" #: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:636 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Israddio (%s)" #: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:637 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Tynnu (%s)" #: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:638 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Dim angen rhagor (%s)" #: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:639 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Gosod (%s)" #: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:640 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Uwchraddio (%s)" @@ -1344,8 +1342,8 @@ msgid "Removing the packages can take several hours. " msgstr "" -#. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/Dialogs.py:112 ../UpdateManager/Dialogs.py:121 +#: ../UpdateManager/UpdatesAvailable.py:468 msgid "The software on this computer is up to date." msgstr "" @@ -1597,7 +1595,7 @@ msgid "_Report Bug" msgstr "_Adrodd Chwilen" -#: ../DistUpgrade/DistUpgrade.ui.h:12 +#: ../UpdateManager/Dialogs.py:169 msgid "_Continue" msgstr "_Parhau" @@ -1639,11 +1637,11 @@ msgid "Terminal" msgstr "Terfynell" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 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:64 msgid "Update is complete" msgstr "Uwchraddiad wedi cwblhau" @@ -1694,11 +1692,11 @@ msgid "File %s of %s" msgstr "Ffeil %s o %s" -#: ../UpdateManager/ChangelogViewer.py:73 +#: ../UpdateManager/ChangelogViewer.py:79 msgid "Open Link in Browser" msgstr "Agor Dolen Mewn Porwr" -#: ../UpdateManager/ChangelogViewer.py:76 +#: ../UpdateManager/ChangelogViewer.py:83 msgid "Copy Link to Clipboard" msgstr "Copio Dolen i'r Clipfwrdd" @@ -1726,35 +1724,35 @@ msgid "Upgrade information" msgstr "Gwybodaeth diweddaru" -#: ../UpdateManager/UpdateManager.py:229 -#: ../UpdateManagerText/UpdateManagerText.py:32 +#: ../UpdateManager/UpdatesAvailable.py:148 +#: ../UpdateManagerText/UpdateManagerText.py:36 msgid "Install" msgstr "Gosod" -#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManager/UpdatesAvailable.py:151 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:391 +#: ../UpdateManager/UpdatesAvailable.py:247 #, python-format msgid "Version %s: \n" msgstr "Fersiwn %s: \n" -#: ../UpdateManager/UpdateManager.py:448 +#: ../UpdateManager/UpdatesAvailable.py:305 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:456 +#: ../UpdateManager/UpdatesAvailable.py:315 msgid "Downloading list of changes..." msgstr "Lawrlwytho rhestr o newidiadau..." -#: ../UpdateManager/UpdateManager.py:500 +#: ../UpdateManager/UpdatesAvailable.py:360 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdatesAvailable.py:366 msgid "Select _All" msgstr "" @@ -1767,7 +1765,7 @@ msgstr[2] "%(count)s diweddariad wedi eu dewis." msgstr[3] "%(count)s diweddariad wedi eu dewis." -#: ../UpdateManager/UpdateManager.py:570 +#: ../UpdateManager/UpdatesAvailable.py:427 #, python-format msgid "%s will be downloaded." msgstr "Bydd %s yn cael ei lawrlwytho." @@ -1778,7 +1776,7 @@ msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:587 +#: ../UpdateManager/UpdatesAvailable.py:447 msgid "There are no updates to install." msgstr "" @@ -1789,7 +1787,7 @@ msgid "%(count_str)s %(download_str)s" msgstr "%(count_str)s %(download_str)s" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdatesAvailable.py:456 msgid "Unknown download size." msgstr "Maint lawrlwythiad anhysbys." @@ -1867,7 +1865,7 @@ msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:754 +#: ../UpdateManager/UpdatesAvailable.py:546 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1890,19 +1888,19 @@ msgid "Reading package information" msgstr "Darllen gwybodaeth pecynnau" -#: ../UpdateManager/UpdateManager.py:858 +#: ../UpdateManager/UpdatesAvailable.py:572 msgid "Connecting..." msgstr "Cysylltu ..." -#: ../UpdateManager/UpdateManager.py:875 +#: ../UpdateManager/UpdatesAvailable.py:588 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:1003 +#: ../UpdateManager/UpdateManager.py:259 msgid "Could not initialize the package information" msgstr "Methu cychwyn y gwybodaeth pecynnau" -#: ../UpdateManager/UpdateManager.py:1004 +#: ../UpdateManager/UpdateManager.py:260 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1928,22 +1926,22 @@ "Adrodda hwn fel chwilen yn erbyn pecyn 'update-manager' a chynnwys y neges " "gwall canlynol:" -#: ../UpdateManager/UpdateManager.py:1058 +#: ../UpdateManager/UpdatesAvailable.py:715 msgid " (New install)" msgstr " (Gosod o'r newydd)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1065 +#: ../UpdateManager/UpdatesAvailable.py:723 #, python-format msgid "(Size: %s)" msgstr "(Maint: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdatesAvailable.py:728 #, 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:1071 +#: ../UpdateManager/UpdatesAvailable.py:733 #, python-format msgid "Version %s" msgstr "Fersiwn %s" @@ -1971,11 +1969,11 @@ msgstr "Mae fersiwn newydd '%s' o Ubuntu ar gael" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:252 msgid "Software index is broken" msgstr "Mynegai meddalwedd wedi torri" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:253 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 " @@ -1989,23 +1987,23 @@ msgid "Check for Updates" msgstr "" -#: ../UpdateManager/UnitySupport.py:66 +#: ../UpdateManager/UnitySupport.py:70 msgid "Install All Available Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:31 +#: ../UpdateManagerText/UpdateManagerText.py:35 msgid "Cancel" msgstr "Canslo" -#: ../UpdateManagerText/UpdateManagerText.py:34 +#: ../UpdateManagerText/UpdateManagerText.py:38 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:37 +#: ../UpdateManagerText/UpdateManagerText.py:41 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:50 +#: ../UpdateManagerText/UpdateManagerText.py:54 msgid "Building Updates List" msgstr "Creu Rhestr Diweddariadau" @@ -2033,20 +2031,20 @@ " * 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:127 msgid "Downloading changelog" msgstr "Lawrlwytho log newid" -#: ../UpdateManager/Core/MyCache.py:138 +#: ../UpdateManager/Core/MyCache.py:159 #, python-format msgid "Other updates (%s)" msgstr "Diweddariadau eraill (%s)" -#: ../UpdateManager/Core/MyCache.py:316 +#: ../UpdateManager/Core/MyCache.py:346 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 +#: ../UpdateManager/Core/MyCache.py:352 ../UpdateManager/Core/MyCache.py:388 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2054,7 +2052,7 @@ "Methwyd lawrlwytho rhestr newidiadau. \n" "Gwiria dy gysylltiad rhyngrwyd." -#: ../UpdateManager/Core/MyCache.py:329 +#: ../UpdateManager/Core/MyCache.py:359 #, python-format msgid "" "Changes for the versions:\n" @@ -2063,7 +2061,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:339 +#: ../UpdateManager/Core/MyCache.py:374 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2076,7 +2074,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:344 +#: ../UpdateManager/Core/MyCache.py:381 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2089,36 +2087,36 @@ "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:55 msgid "Failed to detect distribution" msgstr "Methwyd canfod fersiwn" -#: ../UpdateManager/Core/UpdateList.py:50 +#: ../UpdateManager/Core/UpdateList.py:56 #, 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:67 msgid "Important security updates" msgstr "Diweddariadau diogelwch pwysig" -#: ../UpdateManager/Core/UpdateList.py:62 +#: ../UpdateManager/Core/UpdateList.py:69 msgid "Recommended updates" msgstr "Diweddariadau sy'n cael eu hargymell" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Proposed updates" msgstr "Diweddariadau a gynigir" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:71 msgid "Backports" msgstr "Ol ddiweddariadau" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:72 msgid "Distribution updates" msgstr "Diweddariadau fersiwn" -#: ../UpdateManager/Core/UpdateList.py:70 +#: ../UpdateManager/Core/UpdateList.py:77 msgid "Other updates" msgstr "Diweddariadau eraill" @@ -2126,7 +2124,7 @@ msgid "Starting Update Manager" msgstr "Cychwyn Rheolwr Diweddariadau" -#: ../data/gtkbuilder/UpdateManager.ui.h:3 +#: ../UpdateManager/Dialogs.py:168 msgid "_Partial Upgrade" msgstr "_Uwchraddiad Rhannol" @@ -2208,11 +2206,11 @@ msgid "U_pgrade" msgstr "Uwchraddio" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 +#: ../data/gtkbuilder/UpdateManager.ui.h:1 msgid "updates" msgstr "diweddariadau" -#: ../data/gtkbuilder/UpdateManager.ui.h:28 +#: ../data/gtkbuilder/UpdateManager.ui.h:6 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2222,7 +2220,7 @@ msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:30 +#: ../data/gtkbuilder/UpdateManager.ui.h:8 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." @@ -2230,11 +2228,11 @@ msgid "_Install Updates" msgstr "_Gosod diweddariadau" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 msgid "Changes" msgstr "Newidiadau" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "Description" msgstr "Disgrifiad" @@ -2242,7 +2240,7 @@ msgid "Description of update" msgstr "Disgrifiad o'r diweddariad" -#: ../data/gtkbuilder/UpdateManager.ui.h:35 +#: ../data/gtkbuilder/UpdateManager.ui.h:9 msgid "_Settings..." msgstr "" @@ -2284,29 +2282,29 @@ msgid "Show and install available updates" msgstr "Dangos a gosod diweddariadau sydd ar gael" -#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 +#: ../update-manager:70 ../update-manager-text:55 msgid "Show version and exit" msgstr "Dangos fersiwn a gadael" -#: ../update-manager:64 +#: ../update-manager:73 msgid "Directory that contains the data files" msgstr "Cyfeiriadur sy'n cynnwys y ffeiliau data" -#: ../update-manager:67 +#: ../update-manager:76 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:49 ../check-new-release-gtk:182 +#: ../update-manager:79 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:83 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:90 msgid "Do not focus on map when starting" msgstr "Peidio canolbwyntio ar map wrth gychwyn" @@ -2314,11 +2312,11 @@ msgid "Try to run a dist-upgrade" msgstr "Ceisio rhedeg dist-upgrade" -#: ../update-manager:87 +#: ../update-manager:93 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:91 ../do-release-upgrade:65 +#: ../update-manager:97 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Profi uwchraddiad gyda throshaeniad blwch tywod aufs" @@ -2326,7 +2324,7 @@ msgid "Running partial upgrade" msgstr "Yn rhedeg uwchraddiad rhannol" -#: ../update-manager-text:54 +#: ../update-manager-text:59 msgid "Show description of the package instead of the changelog" msgstr "" @@ -2395,113 +2393,115 @@ msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:79 +#: ../ubuntu-support-status:91 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:82 +#: ../ubuntu-support-status:94 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:85 +#: ../ubuntu-support-status:97 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:88 +#: ../ubuntu-support-status:100 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:130 +#: ../ubuntu-support-status:142 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:133 +#: ../ubuntu-support-status:145 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:139 +#: ../ubuntu-support-status:151 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:154 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:150 +#: ../ubuntu-support-status:162 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:166 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:157 +#: ../ubuntu-support-status:169 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:174 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:171 +#: ../ubuntu-support-status:183 msgid "Unsupported" msgstr "" -#: ../Janitor/computerjanitor/exc.py:30 +#. Why do we use %s here instead of $strings or {} format placeholders? +#. It's because we don't want to break existing translations. +#: ../janitor/plugincore/exceptions.py:43 #, python-format msgid "Unimplemented method: %s" msgstr "Dull heb ei weithredu: %s" -#: ../Janitor/computerjanitor/file_cruft.py:46 +#: ../janitor/plugincore/core/file_cruft.py:41 msgid "A file on disk" msgstr "Ffeil ar ddisg" -#: ../Janitor/computerjanitor/package_cruft.py:45 +#: ../janitor/plugincore/core/package_cruft.py:50 msgid ".deb package" msgstr "pecyn .deb" -#: ../Janitor/computerjanitor/missing_package_cruft.py:33 +#: ../janitor/plugincore/core/missing_package_cruft.py:40 msgid "Install missing package." msgstr "Gosod pecyn sydd ar goll." -#: ../Janitor/computerjanitor/missing_package_cruft.py:42 +#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. +#: ../janitor/plugincore/core/missing_package_cruft.py:50 #, python-format msgid "Package %s should be installed." msgstr "" -#. pragma: no cover -#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:45 #, python-format msgid "%i obsolete entries in the status file" msgstr "" -#: ../Janitor/plugins/dpkg_status_plugin.py:39 +#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:48 msgid "Obsolete entries in dpkg status" msgstr "" #. pragma: no cover -#: ../Janitor/plugins/dpkg_status_plugin.py:42 +#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:51 msgid "Obsolete dpkg status entries" msgstr "" -#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:50 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:47 #, python-format msgid "%s needs to be marked as manually installed." msgstr "" -#: ../Janitor/plugins/remove_lilo_plugin.py:28 +#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:43 msgid "" "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" diff -Nru language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/zeitgeist-datahub.po language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/zeitgeist-datahub.po --- language-pack-cy-base-12.04+20120508/data/cy/LC_MESSAGES/zeitgeist-datahub.po 2012-05-08 22:53:39.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/data/cy/LC_MESSAGES/zeitgeist-datahub.po 2012-08-03 13:45:43.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 07:36+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2012-08-01 17:09+0000\n" +"X-Generator: Launchpad (build 15719)\n" #: ../src/zeitgeist-datahub.desktop.in.h:1 msgid "Zeitgeist Datahub" Binary files /tmp/b0Z2NgXBby/language-pack-cy-base-12.04+20120508/data/extra.tar and /tmp/o0cKM8JBZP/language-pack-cy-base-12.04+20120801/data/extra.tar differ diff -Nru language-pack-cy-base-12.04+20120508/debian/changelog language-pack-cy-base-12.04+20120801/debian/changelog --- language-pack-cy-base-12.04+20120508/debian/changelog 2012-05-08 22:53:24.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/debian/changelog 2012-08-03 13:45:28.000000000 +0000 @@ -1,6 +1,6 @@ -language-pack-cy-base (1:12.04+20120508) precise-proposed; urgency=low +language-pack-cy-base (1:12.04+20120801) precise-proposed; urgency=low * Initial Release. - -- Ubuntu automatic language-pack builder Tue, 08 May 2012 22:53:24 +0000 + -- Ubuntu automatic language-pack builder Fri, 03 Aug 2012 13:45:28 +0000 diff -Nru language-pack-cy-base-12.04+20120508/debian/control language-pack-cy-base-12.04+20120801/debian/control --- language-pack-cy-base-12.04+20120508/debian/control 2012-05-08 22:53:24.000000000 +0000 +++ language-pack-cy-base-12.04+20120801/debian/control 2012-08-03 13:45:28.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Language pack maintainers Build-Depends-Indep: gettext Build-Depends: debhelper (>= 6) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Package: language-pack-cy-base Architecture: all