Sync translations with transifex

1 files changed, 350 insertions, 601 deletions

diff --git a/po/cy.po b/po/cy.po
index efb85a2..550ccc1 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,22 +1,25 @@
-# MATE Screensaver in Welsh.
-# This file is distributed under the same license as MATE Screensaver.
-# Rhys Jones <[email protected]>, 2006.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Rhys Jones <[email protected]>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-backgrounds\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-08 13:51+0000\n"
-"PO-Revision-Date: 2006-03-08 12:10-0000\n"
-"Last-Translator: Rhys Jones <[email protected]>\n"
-"Language-Team: Welsh <[email protected]>\n"
+"POT-Creation-Date: 2013-10-01 14:02+0200\n"
+"PO-Revision-Date: 2013-10-01 12:07+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/MATE/language/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3;\n"
+"Language: cy\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
 #: ../data/mate-screensaver-preferences.desktop.in.h:1
+#: ../src/mate-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Arbedwr sgrin"
 
@@ -24,681 +27,424 @@ msgstr "Arbedwr sgrin"
 msgid "Set your screensaver preferences"
 msgstr "Gosod eich hoffterau arbedwr sgrin"
 
-#: ../data/mate-screensaver-preferences.glade.h:1
+#: ../data/mate-screensaver-preferences.ui.h:1
 msgid "Screensaver Preferences"
 msgstr "Hoffterau Arbedwr Sgrin"
 
-#: ../data/mate-screensaver-preferences.glade.h:2
-msgid "Set session as _idle after:"
-msgstr "Gosod y sesiwn yn _segur ar ôl:"
-
-#: ../data/mate-screensaver-preferences.glade.h:3
-msgid "_Activate screensaver when session is idle"
-msgstr "_Dechrau'r arbedwr sgrin pan fo'r sesiwn yn segur"
-
-#: ../data/mate-screensaver-preferences.glade.h:4
-msgid "_Lock screen when screensaver is active"
-msgstr "_Cloi'r sgrin pan mae'r arbedwr sgrin ar waith"
-
-#: ../data/mate-screensaver-preferences.glade.h:5
-msgid "_Screensaver"
-msgstr "_Arbedwr Sgrin"
-
-#: ../data/mate-screensaver.directory.in.h:1
-#: ../data/mate-screensaver.schemas.in.h:8
-msgid "Screensaver themes"
-msgstr "Themâu arbedwr sgrin"
-
-#: ../data/mate-screensaver.directory.in.h:2
-msgid "Screensavers"
-msgstr "Arbedwyr Sgrin"
-
-#: ../data/mate-screensaver.schemas.in.h:1
-msgid "Activate when idle"
-msgstr "Rhoi ar waith pan yn segur"
-
-#: ../data/mate-screensaver.schemas.in.h:2
-msgid "Allow logout"
-msgstr "Caniatáu allgofnodi"
-
-#: ../data/mate-screensaver.schemas.in.h:3
-msgid "Allow monitor power management"
-msgstr "Caniatáu rheolaeth pŵer y monitor"
-
-#: ../data/mate-screensaver.schemas.in.h:4
-msgid "Allow user switching"
-msgstr "Caniatáu newid defnyddiwr"
-
-#: ../data/mate-screensaver.schemas.in.h:5
-msgid "Lock on activation"
-msgstr "Cloi wrth roi ar waith"
-
-#: ../data/mate-screensaver.schemas.in.h:6
-msgid "Logout command"
-msgstr "Gorchymyn allgofnodi"
-
-#: ../data/mate-screensaver.schemas.in.h:7
-msgid "Screensaver theme selection mode"
-msgstr "Modd dewis thema arbedwr sgrin"
-
-#: ../data/mate-screensaver.schemas.in.h:9
-msgid "Set this to TRUE to activate the screensaver when the session is idle."
+#: ../data/mate-screensaver-preferences.ui.h:2
+msgid "Power _Management"
 msgstr ""
-"Gosod hyn yn WIR er mwyn rhoi'r arbedwr sgrin ar waith pan fo'r sesiwn yn "
-"segur."
 
-#: ../data/mate-screensaver.schemas.in.h:10
-msgid "Set this to TRUE to allow the screensaver to power down the monitor."
+#: ../data/mate-screensaver-preferences.ui.h:3
+msgid "_Preview"
 msgstr ""
-"Gosod hyn yn WIR er mwyn caniatáu i'r arbedwr sgrin ddiffodd pŵer y monitor."
 
-#: ../data/mate-screensaver.schemas.in.h:11
-msgid "Set this to TRUE to lock the screen when the screensaver goes active."
+#: ../data/mate-screensaver-preferences.ui.h:4
+msgid "_Screensaver theme:"
 msgstr ""
-"Gosod hyn yn WIR i gloi'r sgrin pan fo'r arbedwr sgrin yn cychwyn ar waith."
 
-#: ../data/mate-screensaver.schemas.in.h:12
-msgid ""
-"Set this to TRUE to offer an option in the unlock dialog to switch to a "
-"different user account."
+#: ../data/mate-screensaver-preferences.ui.h:5
+msgid "Regard the computer as _idle after:"
 msgstr ""
-"Gosod hyn yn WIR er mwyn cynnig opsiwn yn y ddeialog datgloi i newid i "
-"gyfrif defnyddiwr gwahanol."
 
-#: ../data/mate-screensaver.schemas.in.h:13
-msgid ""
-"Set this to TRUE to offer an option in unlock dialog to logging out after a "
-"delay. The Delay is specified in the \"logout_delay\" key."
-msgstr ""
-"Gosod hyn yn WIR er mwyn cynnig opsiwn yn y ddeialog datgloi i allgofnodi ar "
-"ôl saib. Penderfynir y saib gan yr allwedd \"logout_delay\"."
-
-#: ../data/mate-screensaver.schemas.in.h:14
-msgid ""
-"The command to invoke when the logout button is clicked. This command should "
-"simply log the user out without any interaction. This key has effect only if "
-"the \"logout_enable\" key is set to TRUE."
+#: ../data/mate-screensaver-preferences.ui.h:6
+msgid "_Activate screensaver when computer is idle"
 msgstr ""
-"Pa orchymyn i'w redeg pan fo'r botwm allgofnodi yn cael ei glicio. Fe "
-"ddylai'r gorchymyn hwn allgofnodi'r defnyddiwr yn unig, heb unrhyw "
-"ryngweithio. Dim ond os yw'r allwedd \"logout_enable\" yn WIR y daw hwn i "
-"rym."
 
-#: ../data/mate-screensaver.schemas.in.h:15
-msgid ""
-"The number of minutes after screensaver activation before locking the screen."
-msgstr "Sawl munud ar ôl cychwyn yr arbedwr sgrin y dylid cloi'r sgrin."
+#: ../data/mate-screensaver-preferences.ui.h:7
+msgid "_Lock screen when screensaver is active"
+msgstr "_Cloi'r sgrin pan mae'r arbedwr sgrin ar waith"
 
-#: ../data/mate-screensaver.schemas.in.h:16
-msgid ""
-"The number of minutes after the screensaver activation before a logout "
-"option will appear in unlock dialog. This key has effect only if the "
-"\"logout_enable\" key is set to TRUE."
+#: ../data/mate-screensaver-preferences.ui.h:8
+msgid "<b>Warning: the screen will not be locked for the root user.</b>"
 msgstr ""
-"Y nifer o funudau ar ôl cychwyn yr arbedwr sgrin cyn bydd opsiwn i "
-"allgofnodi yn ymddangos yn y ddeialog ddatgloi. Dim ond os yw'r allwedd "
-"\"logout_enable\" yn WIR y daw hyn i rym."
 
-#: ../data/mate-screensaver.schemas.in.h:17
-msgid ""
-"The number of minutes after the screensaver activation until the monitor "
-"goes into standby power mode."
+#: ../data/mate-screensaver-preferences.ui.h:9
+msgid "Screensaver Preview"
 msgstr ""
-"Y nifer o funudau ar ôl cychwyn yr arbedwr sgrin tan i'r monitor fynd i'r "
-"modd pŵer wrth gefn."
 
-#: ../data/mate-screensaver.schemas.in.h:18
-msgid ""
-"The number of minutes after the screensaver activation until the monitor "
-"goes into suspend power mode."
+#: ../data/mate-screensaver-preferences.ui.h:10
+msgid "<b>Screensaver preview</b>"
 msgstr ""
-"Y nifer o funudau ar ôl cychwyn yr arbedwr sgrin tan i'r monitor fynd i'r "
-"modd atal pŵer."
 
-#: ../data/mate-screensaver.schemas.in.h:19
-msgid ""
-"The number of minutes after the screensaver activation until the monitor "
-"powers off."
-msgstr ""
-"Y nifer o funudau ar ôl cychwyn yr arbedwr sgrin tan i'r monitor bweru i "
-"lawr."
+#: ../data/mate-screensaver.directory.in.h:1
+msgid "Screensavers"
+msgstr "Arbedwyr Sgrin"
 
-#: ../data/mate-screensaver.schemas.in.h:20
-msgid ""
-"The number of minutes of inactivity before the session is considered idle."
-msgstr ""
-"Sawl munud sydd raid bod heb weithredu cyn i'r sesiwn gael ei ystyried yn "
-"segur."
+#: ../data/mate-screensaver.directory.in.h:2
+msgid "Screensaver themes"
+msgstr "Themâu arbedwr sgrin"
 
-#: ../data/mate-screensaver.schemas.in.h:21
-msgid "The number of minutes to run before changing the screensaver theme."
-msgstr "Sawl munud i redeg thema arbedwr sgrin cyn newid i un arall."
+#. Translators: This is the name of a desktop background image that shows
+#. outer space images.
+#. You might want to translate it into the equivalent words of your language
+#: ../data/images/cosmos/cosmos.xml.in.in.h:3
+#: ../savers/cosmos-slideshow.desktop.in.in.h:1
+msgid "Cosmos"
+msgstr "Cosmos"
 
-#: ../data/mate-screensaver.schemas.in.h:22
-msgid ""
-"The selection mode used by screensaver. May be \"blank-only\" to enable the "
-"screensaver without using any theme on activation, \"single\" to enable "
-"screensaver using only one theme on activation (specified in \"themes\" "
-"key), and \"random\" to enable the screensaver using a random theme on "
-"activation."
-msgstr ""
-"Y modd dewis a ddefnyddir gan yr arbedwr sgrin. Gall fod yn \"blank-only\" i "
-"alluogi'r arbedwr sgrin heb ddefnyddio unrhyw thema pan gychwynir, \"single"
-"\" i alluogi'r arbedwr sgrin gan ddefnyddio dim ond un thema pan gychwynnir "
-"(penodir hyn yn yr allwedd \"themes\"), a \"random\" i alluogi'r arbedwr "
-"sgrin gyda thema ar hap wrth gychwyn."
-
-#: ../data/mate-screensaver.schemas.in.h:23
-msgid ""
-"This key specifies the list of themes to be used by the screensaver. It's "
-"ignored when \"mode\" key is \"blank-only\", should provide the theme name "
-"when \"mode\" is \"single\", and should provide a list of themes when \"mode"
-"\" is \"random\"."
+#: ../data/lock-dialog-default.ui.h:2
+#, no-c-format
+msgid "<span size=\"x-large\">%R</span>"
 msgstr ""
-"Mae'r allwedd hon yn penodi'r rhestr o themâu i'w defnyddio gan yr arbedwr "
-"sgrin. Fe'i hanwybyddir pan fo'r allwedd \"modd\" yn \"blank-only\", fe "
-"ddylai ddarparu enw'r thema pan fo \"mode\" yn \"single\", ac fe ddylai "
-"ddarparu rhestr o enwau themâu pan fo \"mode\" yn \"random\"."
 
-#: ../data/mate-screensaver.schemas.in.h:24
-msgid "Time before activation"
-msgstr "Amser cyn rhoi ar waith"
-
-#: ../data/mate-screensaver.schemas.in.h:25
-msgid "Time before locking"
-msgstr "Amser cyn cloi"
-
-#: ../data/mate-screensaver.schemas.in.h:26
-msgid "Time before logout option"
-msgstr "Amser cyn opsiwn allgofnodi"
-
-#: ../data/mate-screensaver.schemas.in.h:27
-msgid "Time before power off"
-msgstr "Amser cyn pweru i lawr"
+#: ../data/lock-dialog-default.ui.h:4
+#, no-c-format
+msgid "<span size=\"small\">%U on %h</span>"
+msgstr ""
 
-#: ../data/mate-screensaver.schemas.in.h:28
-msgid "Time before standby"
-msgstr "Amser cyn gorffwys"
+#: ../data/lock-dialog-default.ui.h:5
+msgid "_Leave Message"
+msgstr ""
 
-#: ../data/mate-screensaver.schemas.in.h:29
-msgid "Time before suspend"
-msgstr "Amser cyn crogi"
+#: ../data/lock-dialog-default.ui.h:6
+msgid "_Switch User"
+msgstr ""
 
-#: ../data/mate-screensaver.schemas.in.h:30
-msgid "Time before theme change"
-msgstr "Amser cyn newid thema"
+#: ../data/lock-dialog-default.ui.h:7
+msgid "_Log Out"
+msgstr ""
 
-#: ../savers/footlogo-floaters.desktop.in.in.h:1
-msgid "Bubbles the MATE foot logo around the screen"
-msgstr "Byrlymu logo troed MATE o amgylch y sgrin"
+#: ../data/lock-dialog-default.ui.h:8
+msgid "_Cancel"
+msgstr ""
 
-#: ../savers/footlogo-floaters.desktop.in.in.h:2
-msgid "Floating Feet"
-msgstr "Traed yn Arnofio"
+#: ../data/lock-dialog-default.ui.h:9 ../src/gs-lock-plug.c:1524
+msgid "_Unlock"
+msgstr "_Datgloi"
 
-#: ../savers/cosmos-slideshow.desktop.in.in.h:1
-msgid "Cosmos"
-msgstr "Cosmos"
+#: ../data/lock-dialog-default.ui.h:11
+#, no-c-format
+msgid "<b>Leave a message for %R:</b>"
+msgstr ""
 
 #: ../savers/cosmos-slideshow.desktop.in.in.h:2
 msgid "Display a slideshow of pictures of the cosmos"
 msgstr "Dangos sioe sleidiau o luniau'r cosmos"
 
-#: ../savers/personal-slideshow.desktop.in.h:1
-msgid "Display a slideshow from your Pictures folder"
-msgstr "Dangos sioe sleidiau o'ch plygell Lluniau"
+#: ../savers/footlogo-floaters.desktop.in.in.h:1
+msgid "Floating MATE"
+msgstr ""
+
+#: ../savers/footlogo-floaters.desktop.in.in.h:2
+msgid "Bubbles the MATE logo around the screen"
+msgstr ""
 
-#: ../savers/personal-slideshow.desktop.in.h:2
+#: ../savers/personal-slideshow.desktop.in.in.h:1
 msgid "Pictures folder"
 msgstr "Plygell lluniau"
 
-#: ../savers/popsquares.desktop.in.h:1
-msgid "A pop-art-ish grid of pulsing colors."
-msgstr "Dangos grid o liwiau sy'n pefrio, tebyg i 'pop-art'"
+#: ../savers/personal-slideshow.desktop.in.in.h:2
+msgid "Display a slideshow from your Pictures folder"
+msgstr "Dangos sioe sleidiau o'ch plygell Lluniau"
 
-#: ../savers/popsquares.desktop.in.h:2
+#: ../savers/popsquares.desktop.in.in.h:1
 msgid "Pop art squares"
 msgstr "Sgwariau 'pop art'"
 
-#: ../savers/floaters.c:1165
-msgid "show paths that images follow"
-msgstr "dangos y llwybrau mae delweddau'n eu dilyn"
-
-#: ../savers/floaters.c:1172
-msgid "occasionally rotate images as they move"
-msgstr "cylchdroi delweddau ambell waith, wrth iddyn nhw symud"
-
-#: ../savers/floaters.c:1179
-msgid "print out frame rate and other statistics"
-msgstr "dangos y gyfradd ffrâm ac ystadegau eraill"
-
-#: ../savers/floaters.c:1187
-msgid "the maximum number of images to keep on screen"
-msgstr "uchafswm y delweddau i'w cadw ar y sgrin"
-
-#. translators: this should be translated to be symbolic of a generic
-#. * number.  e.g, "the screen saver should keep N images on the screen"
-#.
-#: ../savers/floaters.c:1191
-msgid "N"
-msgstr "N"
-
-#: ../savers/floaters.c:1198
-msgid "the source image to use"
-msgstr "ffynhonnell y ddelwedd i'w defnyddio"
-
-#: ../savers/floaters.c:1205
-msgid "the initial size and position of window"
-msgstr "maint a lleoliad y ffenestr, ar gychwyn"
-
-#. translators: this is an X geometry spec.  WIDTH, HEIGHT, X, and Y
-#. * can be translated, but the 'x' area indicator and '+' offset indicators
-#. * need to be untranslated and can't be rearranged.
-#.
-#: ../savers/floaters.c:1210
-msgid "WIDTHxHEIGHT+X+Y"
-msgstr "LLEDxTALDRA+X+Y"
-
-#. translators: the word "image" here
-#. * represents a command line argument
-#.
-#: ../savers/floaters.c:1228
-msgid "image - floats images around the screen"
-msgstr "image - yn arnofio delweddau o amgylch y sgrin"
+#: ../savers/popsquares.desktop.in.in.h:2
+msgid "A pop-art-ish grid of pulsing colors."
+msgstr "Dangos grid o liwiau sy'n pefrio, tebyg i 'pop-art'"
 
-#: ../savers/floaters.c:1238
+#: ../savers/popsquares.c:50 ../savers/floaters.c:1217
 #, c-format
 msgid "%s. See --help for usage information.\n"
 msgstr "%s. Gweler --help am wybodaeth am ddefnydd y rhaglen.\n"
 
-#: ../savers/floaters.c:1247
-msgid "You must specify one image.  See --help for usage information.\n"
-msgstr "Rhaid i chi benodi un ddelwedd.  Gweler --help am wybodaeth defnydd.\n"
-
-#: ../savers/slideshow.c:47
-msgid "Location to get images from"
-msgstr "Y lleoliad i gael delweddau ohoni"
-
-#: ../savers/slideshow.c:47
-msgid "PATH"
-msgstr "LLWYBR"
-
-#: ../src/cut-n-paste/fusa-display.c:119 ../src/cut-n-paste/fusa-user.c:150
-msgid "Manager"
-msgstr "Rheolwr"
-
-#: ../src/cut-n-paste/fusa-display.c:120
-msgid "The manager which owns this object."
-msgstr "Y rheolwr sy'n berchen ar y gwrthrych."
-
-#: ../src/cut-n-paste/fusa-display.c:127
-msgid "Name"
-msgstr "Enw"
-
-#: ../src/cut-n-paste/fusa-display.c:128
-msgid "The name of the X11 display this object refers to."
-msgstr "Enw'r dangosydd X11 mae'r gwrthrych hwn yn cyfeirio ato."
-
-#: ../src/cut-n-paste/fusa-display.c:134
-#: ../src/cut-n-paste/fusa-user-menu-item.c:164
-msgid "User"
-msgstr "Defnyddiwr"
-
-#: ../src/cut-n-paste/fusa-display.c:135
-msgid "The user currently logged in on this virtual terminal."
+#: ../savers/floaters.c:90
+msgid "Show paths that images follow"
 msgstr ""
-"Y defnyddiwr sydd wedi mewngofnodi ar y derfynell rithwir hon ar hyn o bryd."
-
-#: ../src/cut-n-paste/fusa-display.c:141
-msgid "Console"
-msgstr "Consol"
 
-#: ../src/cut-n-paste/fusa-display.c:142
-msgid "The number of the virtual console this display can be found on, or %-1."
+#: ../savers/floaters.c:95
+msgid "Occasionally rotate images as they move"
 msgstr ""
-"Rhif y consol rhithwir lle gellir dod o hyd i'r dangosydd hwn, neu %-1."
-
-#: ../src/cut-n-paste/fusa-display.c:148
-msgid "Nested"
-msgstr "Nythol"
-
-#: ../src/cut-n-paste/fusa-display.c:149
-msgid "Whether or not this display is a windowed (Xnest) display."
-msgstr "A yw'r dangosydd hwn o fewn ffenestr (Xnest)."
-
-#: ../src/cut-n-paste/fusa-manager.c:1263
-msgid "The display manager could not be contacted for unknown reasons."
-msgstr "Methwyd cysylltu â'r rheolwr dangosydd, am resymau anhysbys."
-
-#: ../src/cut-n-paste/fusa-manager.c:1270
-msgid "The display manager is not running or too old."
-msgstr "Nid yw'r rheolwr dangosydd yn rhedeg, neu mae'n rhy hen."
 
-#: ../src/cut-n-paste/fusa-manager.c:1273
-msgid "The configured limit of flexible servers has been reached."
-msgstr "Cyrhaeddwyd y terfyn (sydd wedi'i gyflunio) o weinyddion hyblyg."
-
-#: ../src/cut-n-paste/fusa-manager.c:1276
-msgid "There was an unknown error starting X."
-msgstr "Roedd gwall anhysbys wrth gychwyn X."
-
-#: ../src/cut-n-paste/fusa-manager.c:1279
-msgid "The X server failed to finish starting."
-msgstr "Methodd y gweinydd X â gorffen cychwyn."
-
-#: ../src/cut-n-paste/fusa-manager.c:1282
-msgid "There are too many X sessions running."
-msgstr "Mae gormod o sesiynau X yn rhedeg."
-
-#: ../src/cut-n-paste/fusa-manager.c:1285
-msgid "The nested X server (Xnest) cannot connect to your current X server."
-msgstr "Ni all y gweinydd X nythog (Xnest) gysylltu â'ch gweinydd X presennol."
-
-#: ../src/cut-n-paste/fusa-manager.c:1288
-msgid "The X server in the MDM configuration could not be found."
-msgstr "Methwyd dod o hyd i'r gweinydd X yn y cyfluniad MDM."
-
-#: ../src/cut-n-paste/fusa-manager.c:1291 ../src/cut-n-paste/mdmcomm.c:492
-msgid ""
-"Trying to set an unknown logout action, or trying to set a logout action "
-"which is not available."
+#: ../savers/floaters.c:100
+msgid "Print out frame rate and other statistics"
 msgstr ""
-"Ceisio gosod gweithred allgofnodi anhysbys, neu'n ceisio gosod gweithred "
-"allgofnodi nad yw ar gael."
-
-#: ../src/cut-n-paste/fusa-manager.c:1294 ../src/cut-n-paste/mdmcomm.c:495
-msgid "Virtual terminals not supported."
-msgstr "Ni chynhelir rhith-derfynellau."
-
-#: ../src/cut-n-paste/fusa-manager.c:1297
-msgid "Invalid virtual terminal number."
-msgstr "Rhif terfynell rhithwir annilys."
-
-#: ../src/cut-n-paste/fusa-manager.c:1300 ../src/cut-n-paste/mdmcomm.c:499
-msgid "Trying to update an unsupported configuration key."
-msgstr "Ceisio diweddaru allwedd cyflunio sydd heb ei chynnal."
-
-#: ../src/cut-n-paste/fusa-manager.c:1303
-msgid "~/.Xauthority file badly configured or missing."
-msgstr "Ffeil ~/.Xauthority wedi'i chyflunio'n wael, neu ar goll."
-
-#: ../src/cut-n-paste/fusa-manager.c:1306
-msgid "Too many messages were sent to the display manager, and it hung up."
-msgstr "Anfonwyd gormod o negeseuon at y rheolwr dangosydd, ac fe grogodd."
-
-#: ../src/cut-n-paste/fusa-manager.c:1310
-msgid "The display manager sent an unknown error message."
-msgstr "Cafwyd neges gwall anhysbys o'r rheolwr dangosydd."
-
-#: ../src/cut-n-paste/fusa-user-menu-item.c:165
-msgid "The user this menu item represents."
-msgstr "Y defnyddiwr mae'r opsiwn ddewislen hwn yn ei chynrychioli."
-
-#: ../src/cut-n-paste/fusa-user-menu-item.c:172
-msgid "Icon Size"
-msgstr "Maint Eicon"
-
-#: ../src/cut-n-paste/fusa-user-menu-item.c:173
-msgid "The size of the icon to use."
-msgstr "Pa faint o eicon i'w ddefnyddio."
-
-#: ../src/cut-n-paste/fusa-user.c:151
-msgid "The user manager object this user is controlled by."
-msgstr "Y gwrthrych rheolwr defnyddiwr y rheolir y defnyddiwr hwn ganddo."
 
-#: ../src/cut-n-paste/fusa-utils.c:80
-msgid "Show Details"
-msgstr "Dangos Manylion"
-
-#. markup
-#: ../src/cut-n-paste/mdmcomm.c:413
-msgid "MDM (The MATE Display Manager) is not running."
-msgstr "Nid yw MDM (Rheolwr Dangosydd MATE) yn rhedeg."
-
-#: ../src/cut-n-paste/mdmcomm.c:416
-msgid ""
-"You might in fact be using a different display manager, such as KDM (KDE "
-"Display Manager) or xdm."
+#: ../savers/floaters.c:105
+msgid "The maximum number of images to keep on screen"
 msgstr ""
-"Mae'n bosib eich bod chi'n defnyddio rheolwr dangosydd gwahanol, fel KDM "
-"(Rheolwr Dangosydd KDE) neu xdm."
 
-#: ../src/cut-n-paste/mdmcomm.c:419
-msgid ""
-"If you still wish to use this feature, either start MDM yourself or ask your "
-"system administrator to start MDM."
+#: ../savers/floaters.c:105
+msgid "MAX_IMAGES"
 msgstr ""
-"Os hoffech chi ddefnyddio'r nodwedd hon, gallwch naill ai gychwyn MDM eich "
-"hun, neu ofyn i reolwr eich system i gychwyn MDM."
 
-#. markup
-#: ../src/cut-n-paste/mdmcomm.c:441
-msgid "Cannot communicate with MDM (The MATE Display Manager)"
-msgstr "Methu cysylltu â MDM (Rheolwr Dangosydd MATE)"
+#: ../savers/floaters.c:110
+msgid "The initial size and position of window"
+msgstr ""
 
-#: ../src/cut-n-paste/mdmcomm.c:444
-msgid "Perhaps you have an old version of MDM running."
-msgstr "Hwyrach mai hen fersiwn o MDM sy'n rhedeg."
+#: ../savers/floaters.c:110
+msgid "WIDTHxHEIGHT+X+Y"
+msgstr "LLEDxTALDRA+X+Y"
 
-#: ../src/cut-n-paste/mdmcomm.c:463 ../src/cut-n-paste/mdmcomm.c:466
-msgid "Cannot communicate with mdm, perhaps you have an old version running."
-msgstr "Methu cyfathrebu â MDM. Hwyrach fod gennych hen fersiwn yn rhedeg."
+#: ../savers/floaters.c:115
+msgid "The source image to use"
+msgstr ""
 
-#: ../src/cut-n-paste/mdmcomm.c:469
-msgid "The allowed limit of flexible X servers reached."
-msgstr "Cyrhaeddwyd terfyn y nifer o weinyddion hyblyg X a ganiateir."
+#. translators: the word "image" here
+#. * represents a command line argument
+#. 
+#: ../savers/floaters.c:1211
+msgid "image - floats images around the screen"
+msgstr "image - yn arnofio delweddau o amgylch y sgrin"
 
-#: ../src/cut-n-paste/mdmcomm.c:471
-msgid "There were errors trying to start the X server."
-msgstr "Roedd gwallau wrth geisio cychwyn y gweinydd X."
+#: ../savers/floaters.c:1226
+#, c-format
+msgid "You must specify one image.  See --help for usage information.\n"
+msgstr "Rhaid i chi benodi un ddelwedd.  Gweler --help am wybodaeth defnydd.\n"
 
-#: ../src/cut-n-paste/mdmcomm.c:473
-msgid "The X server failed.  Perhaps it is not configured well."
-msgstr "Methodd y gweinydd X.  Hwyrach nad yw wedi ei gyflunio'n dda."
+#: ../savers/slideshow.c:55
+msgid "Location to get images from"
+msgstr "Y lleoliad i gael delweddau ohoni"
 
-#: ../src/cut-n-paste/mdmcomm.c:476
-msgid "Too many X sessions running."
-msgstr "Gormod o sesiynau X yn rhedeg."
+#: ../savers/slideshow.c:55
+msgid "PATH"
+msgstr "LLWYBR"
 
-#: ../src/cut-n-paste/mdmcomm.c:478
-msgid ""
-"The nested X server (Xnest) cannot connect to your current X server.  You "
-"may be missing an X authorization file."
+#: ../savers/slideshow.c:59
+msgid "Color to use for images background"
 msgstr ""
-"Ni all y gweinydd X nythol (Xnest) gysylltu â'ch gweinydd X presennol.  Gall "
-"fod ffeil ddilysiant X ar goll gennych."
 
-#: ../src/cut-n-paste/mdmcomm.c:483
-msgid ""
-"The nested X server (Xnest) is not available, or mdm is badly configured.\n"
-"Please install the Xnest package in order to use the nested login."
+#: ../savers/slideshow.c:59
+msgid "\"#rrggbb\""
 msgstr ""
-"Nid yw'r gweinydd X nythol (Xnest) ar gael, neu mae mdm wedi ei gyflunio'n "
-"wael.\n"
-"Gosodwch y pecyn Xnest er mwyn defnyddio'r mewngofnodiad nythol."
 
-#: ../src/cut-n-paste/mdmcomm.c:488
-msgid ""
-"The X server is not available, it is likely that mdm is badly configured."
+#: ../savers/slideshow.c:63
+msgid "Do not randomize pictures from location"
 msgstr ""
-"Nid yw'r gweinydd X ar gael, mae'n debyg fod mdm wedi ei gyflunio'n wael"
 
-#: ../src/cut-n-paste/mdmcomm.c:497
-msgid "Trying to change to an invalid virtual terminal number."
-msgstr "Ceisio newid i rif terfynell rhithwir annilys."
-
-#: ../src/cut-n-paste/mdmcomm.c:501
-msgid ""
-"You do not seem to have authentication needed be for this operation.  "
-"Perhaps your .Xauthority file is not set up correctly."
+#: ../savers/slideshow.c:67
+msgid "Do not try to stretch images on screen"
 msgstr ""
-"Mae'n ymddangos nad oes gennych y dilysiant angenrheidiol ar gyfer y "
-"weithred hon.  Hwyrach nad yw'ch ffeil .Xauthority wedi ei gosod yn gywir."
-
-#: ../src/cut-n-paste/mdmcomm.c:505
-msgid "Too many messages were sent to mdm and it hung upon us."
-msgstr "Anfonwyd gormod o negeseuon at mdm ac fe grogodd."
-
-#: ../src/cut-n-paste/mdmcomm.c:508
-msgid "Unknown error occured."
-msgstr "Digwyddodd gwall anhysbys."
-
-#: ../src/file-transfer-dialog.c:94
-#, c-format
-msgid "Copying file: %u of %u"
-msgstr "Copïo ffeil: %u o %u"
-
-#: ../src/file-transfer-dialog.c:122
-#, c-format
-msgid "Copying '%s'"
-msgstr "Copïo '%s'"
-
-#: ../src/file-transfer-dialog.c:193
-msgid "From URI"
-msgstr "O'r URI"
-
-#: ../src/file-transfer-dialog.c:194
-msgid "URI currently transferring from"
-msgstr "URI y trosglwyddir ohono ar hyn o bryd"
 
-#: ../src/file-transfer-dialog.c:201
-msgid "To URI"
-msgstr "I'r URI"
-
-#: ../src/file-transfer-dialog.c:202
-msgid "URI currently transferring to"
-msgstr "URI y trosglwyddir ato ar hyn o bryd"
-
-#: ../src/file-transfer-dialog.c:209
-msgid "Fraction completed"
-msgstr "Ffracsiwn ar ben"
-
-#: ../src/file-transfer-dialog.c:210
-msgid "Fraction of transfer currently completed"
-msgstr "Ffracsiwn o'r trosglwyddo sydd wedi'i gwblhau"
-
-#: ../src/file-transfer-dialog.c:217
-msgid "Current URI index"
-msgstr "Cynnwys yr URI presennol"
-
-#: ../src/file-transfer-dialog.c:218
-msgid "Current URI index - starts from 1"
-msgstr "Mynegrif yr URI presennol - cychwyn o 1"
-
-#: ../src/file-transfer-dialog.c:225
-msgid "Total URIs"
-msgstr "Cyfanswm URIau"
-
-#: ../src/file-transfer-dialog.c:226
-msgid "Total number of URIs"
-msgstr "Nifer yr URIau"
-
-#: ../src/file-transfer-dialog.c:327 ../src/file-transfer-dialog.c:369
+#: ../src/copy-theme-dialog.c:212
 msgid "Copying files"
 msgstr "Copïo ffeiliau"
 
-#: ../src/file-transfer-dialog.c:345
+#: ../src/copy-theme-dialog.c:230
 msgid "From:"
 msgstr "O:"
 
-#: ../src/file-transfer-dialog.c:349
+#: ../src/copy-theme-dialog.c:234
 msgid "To:"
 msgstr "I:"
 
-#: ../src/file-transfer-dialog.c:448
-msgid "Connecting..."
-msgstr "Wrthi'n cysylltu..."
+#: ../src/copy-theme-dialog.c:254
+msgid "Copying themes"
+msgstr ""
+
+#: ../src/copy-theme-dialog.c:298
+msgid "Invalid screensaver theme"
+msgstr "Enw thema arbedwr sgrin annilys"
+
+#: ../src/copy-theme-dialog.c:301
+#, c-format
+msgid "%s does not appear to be a valid screensaver theme."
+msgstr ""
+
+#: ../src/copy-theme-dialog.c:481
+#, c-format
+msgid "Copying file: %u of %u"
+msgstr "Copïo ffeil: %u o %u"
 
-#: ../src/mate-screensaver-command.c:59
+#: ../src/mate-screensaver-command.c:64
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Achosi i'r arbedwr sgrin orffen yn daclus"
 
-#: ../src/mate-screensaver-command.c:61
+#: ../src/mate-screensaver-command.c:68
 msgid "Query the state of the screensaver"
 msgstr "Holi cyflwr yr arbedwr sgrin"
 
-#: ../src/mate-screensaver-command.c:63
+#: ../src/mate-screensaver-command.c:72
+msgid "Query the length of time the screensaver has been active"
+msgstr ""
+
+#: ../src/mate-screensaver-command.c:76
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr "Gorchymyn i'r broses arbedwr sgrin sy'n rhedeg i gloi'r sgrin yn syth"
 
-#: ../src/mate-screensaver-command.c:65
+#: ../src/mate-screensaver-command.c:80
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Os yw'r arbedwr sgrin ar waith, newid i ddemo graffeg gwahanol"
 
-#: ../src/mate-screensaver-command.c:67
+#: ../src/mate-screensaver-command.c:84
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Troi'r arbedwr sgrin ymlaen (clirio'r sgrin)"
 
-#: ../src/mate-screensaver-command.c:69
+#: ../src/mate-screensaver-command.c:88
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr "Os yw'r arbedwr sgrin ar waith, ei ddi-ysgogi (dad-glirio'r sgrin)"
 
-#: ../src/mate-screensaver-command.c:71
-msgid "Disable running graphical themes while blanked"
+#: ../src/mate-screensaver-command.c:92
+msgid "Poke the running screensaver to simulate user activity"
+msgstr "Procio'r arbedwr sgrin sy'n rhedeg, i ddynwared gweithred defnyddiwr"
+
+#: ../src/mate-screensaver-command.c:96
+msgid ""
+"Inhibit the screensaver from activating.  Command blocks while inhibit is "
+"active."
 msgstr ""
-"Pan fo'r sgrin wedi'i chlirio, analluogi'r themâu graffigol sy'n rhedeg"
 
-#: ../src/mate-screensaver-command.c:73
-msgid "Enable running graphical themes while blanked (if applicable)"
+#: ../src/mate-screensaver-command.c:100
+msgid "The calling application that is inhibiting the screensaver"
 msgstr ""
-"Pan fo'r sgrin wedi'i chlirio, galluogi'r themâu graffigol sy'n rhedeg (os "
-"yn berthnasol)"
 
-#: ../src/mate-screensaver-command.c:75
-msgid "Poke the running screensaver to simulate user activity"
-msgstr "Procio'r arbedwr sgrin sy'n rhedeg, i ddynwared gweithred defnyddiwr"
+#: ../src/mate-screensaver-command.c:104
+msgid "The reason for inhibiting the screensaver"
+msgstr ""
 
-#: ../src/mate-screensaver-command.c:77 ../src/mate-screensaver-dialog.c:110
-#: ../src/mate-screensaver.c:56
+#: ../src/mate-screensaver-command.c:108 ../src/mate-screensaver-dialog.c:57
+#: ../src/mate-screensaver.c:55
 msgid "Version of this application"
 msgstr "Fersiwn y rhaglen"
 
-#: ../src/mate-screensaver-command.c:202
+#: ../src/mate-screensaver-command.c:357
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Yr arbedwr sgrin yw %s\n"
 
-#: ../src/mate-screensaver-command.c:202
+#: ../src/mate-screensaver-command.c:357
 msgid "active"
 msgstr "ar waith"
 
-#: ../src/mate-screensaver-command.c:202
+#: ../src/mate-screensaver-command.c:357
 msgid "inactive"
 msgstr "ddim ar waith"
 
-#: ../src/mate-screensaver-dialog.c:108
+#: ../src/mate-screensaver-command.c:373
+#, c-format
+msgid "The screensaver is not inhibited\n"
+msgstr ""
+
+#: ../src/mate-screensaver-command.c:381
+#, c-format
+msgid "The screensaver is being inhibited by:\n"
+msgstr ""
+
+#: ../src/mate-screensaver-command.c:416
+#, c-format
+msgid "The screensaver has been active for %d seconds.\n"
+msgstr ""
+
+#: ../src/mate-screensaver-command.c:422
+#, c-format
+msgid "The screensaver is not currently active.\n"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:56
 msgid "Show debugging output"
 msgstr "Dangos allbwn datnamu"
 
-#: ../src/mate-screensaver-dialog.c:112
+#: ../src/mate-screensaver-dialog.c:58
 msgid "Show the logout button"
 msgstr "Dangos y botwm allgofnodi"
 
-#: ../src/mate-screensaver-dialog.c:114
+#: ../src/mate-screensaver-dialog.c:59
 msgid "Command to invoke from the logout button"
 msgstr "Y gorchymyn i'w redeg o'r botwm allgofnodi"
 
-#: ../src/mate-screensaver-dialog.c:116
+#: ../src/mate-screensaver-dialog.c:60
 msgid "Show the switch user button"
 msgstr "Dangos y botwm i newid defnyddwyr"
 
-#: ../src/mate-screensaver-preferences.c:427
+#: ../src/mate-screensaver-dialog.c:61
+msgid "Message to show in the dialog"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:61 ../src/mate-screensaver-dialog.c:62
+msgid "MESSAGE"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:62
+msgid "Not used"
+msgstr ""
+
+#. login: is whacked always translate to Username:
+#: ../src/mate-screensaver-dialog.c:164 ../src/mate-screensaver-dialog.c:165
+#: ../src/mate-screensaver-dialog.c:166 ../src/gs-auth-pam.c:756
+msgid "Username:"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:167 ../src/mate-screensaver-dialog.c:168
+#: ../src/gs-auth-pam.c:171
+msgid "Password:"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:169
+msgid "You are required to change your password immediately (password aged)"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:170
+msgid "You are required to change your password immediately (root enforced)"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:171
+msgid "Your account has expired; please contact your system administrator"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:172
+msgid "No password supplied"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:173
+msgid "Password unchanged"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:174
+msgid "Can not get username"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:175
+msgid "Retype new UNIX password:"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:176
+msgid "Enter new UNIX password:"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:177
+msgid "(current) UNIX password:"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:178
+msgid "Error while changing NIS password."
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:179
+msgid "You must choose a longer password"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:180
+msgid "Password has been already used. Choose another."
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:181
+msgid "You must wait longer to change your password"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:182
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:253
+msgid "Checking..."
+msgstr ""
+
+#: ../src/mate-screensaver-dialog.c:299 ../src/gs-auth-pam.c:495
+msgid "Authentication failed."
+msgstr ""
+
+#: ../src/mate-screensaver-preferences.c:476
 msgid "Blank screen"
 msgstr "Clirio'r sgrin"
 
-#: ../src/mate-screensaver-preferences.c:433
+#: ../src/mate-screensaver-preferences.c:482
 msgid "Random"
 msgstr "Ar hap"
 
-#: ../src/mate-screensaver-preferences.c:723
-msgid "Invalid screensaver theme"
-msgstr "Enw thema arbedwr sgrin annilys"
-
-#: ../src/mate-screensaver-preferences.c:726
-msgid "This file does not appear to be a valid screensaver theme."
-msgstr "Mae'n ymddangos nad yw'r ffeil hon yn thema arbedwr sgrin ddilys."
-
-#: ../src/mate-screensaver-preferences.c:843
+#: ../src/mate-screensaver-preferences.c:968
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -707,7 +453,7 @@ msgstr[1] "%d awr"
 msgstr[2] "%d awr"
 msgstr[3] "%d awr"
 
-#: ../src/mate-screensaver-preferences.c:846
+#: ../src/mate-screensaver-preferences.c:971
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -716,7 +462,7 @@ msgstr[1] "%d funud"
 msgstr[2] "%d munud"
 msgstr[3] "%d munud"
 
-#: ../src/mate-screensaver-preferences.c:849
+#: ../src/mate-screensaver-preferences.c:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -726,15 +472,15 @@ msgstr[2] "%d eiliad"
 msgstr[3] "%d eiliad"
 
 #. hour:minutes:seconds
-#: ../src/mate-screensaver-preferences.c:855
+#: ../src/mate-screensaver-preferences.c:982
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/mate-screensaver-preferences.c:858
-#: ../src/mate-screensaver-preferences.c:866
+#: ../src/mate-screensaver-preferences.c:987
+#: ../src/mate-screensaver-preferences.c:1000
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -742,90 +488,93 @@ msgstr "%s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/mate-screensaver-preferences.c:861
-#: ../src/mate-screensaver-preferences.c:869
-#: ../src/mate-screensaver-preferences.c:873
+#: ../src/mate-screensaver-preferences.c:992
+#: ../src/mate-screensaver-preferences.c:1005
+#: ../src/mate-screensaver-preferences.c:1011
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#. 0 seconds
-#: ../src/mate-screensaver-preferences.c:876
-msgid "0 seconds"
-msgstr "0 eiliad"
-
-#: ../src/mate-screensaver-preferences.c:891
+#: ../src/mate-screensaver-preferences.c:1026
+#, c-format
 msgid "Never"
 msgstr "Byth"
 
-#: ../src/mate-screensaver-preferences.c:1047
+#: ../src/mate-screensaver-preferences.c:1451
 msgid "Could not load the main interface"
 msgstr "Methu llwytho'r prif ryngwyneb"
 
-#: ../src/mate-screensaver-preferences.c:1049
+#: ../src/mate-screensaver-preferences.c:1453
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Gwnewch yn siŵr fod yr arbedwr sgrin wedi'i osod yn gywir"
 
-#: ../src/mate-screensaver.c:57
+#: ../src/mate-screensaver.c:56
 msgid "Don't become a daemon"
 msgstr "Peidio â throi'n ellyll"
 
-#: ../src/mate-screensaver.c:58
+#: ../src/mate-screensaver.c:57
 msgid "Enable debugging code"
 msgstr "Galluogi cod datnamu"
 
-#: ../src/gs-listener-dbus.c:1219
+#: ../src/mate-screensaver.desktop.in.in.h:2
+msgid "Launch screen saver and locker program"
+msgstr ""
+
+#: ../src/gs-auth-pam.c:425
+#, c-format
+msgid "Unable to establish service %s: %s\n"
+msgstr ""
+
+#: ../src/gs-auth-pam.c:455
+#, c-format
+msgid "Can't set PAM_TTY=%s"
+msgstr ""
+
+#: ../src/gs-auth-pam.c:491
+msgid "Incorrect password."
+msgstr ""
+
+#: ../src/gs-auth-pam.c:511
+msgid "Not permitted to gain access at this time."
+msgstr ""
+
+#: ../src/gs-auth-pam.c:519
+msgid "No longer permitted to access the system."
+msgstr ""
+
+#: ../src/gs-listener-dbus.c:2219
 msgid "failed to register with the message bus"
 msgstr "methwyd cofrestru gyda'r bws negeseuon"
 
-#: ../src/gs-listener-dbus.c:1229
+#: ../src/gs-listener-dbus.c:2230
 msgid "not connected to the message bus"
 msgstr "heb gysylltu â'r bws negeseuon"
 
-#: ../src/gs-listener-dbus.c:1238
+#: ../src/gs-listener-dbus.c:2240 ../src/gs-listener-dbus.c:2272
 msgid "screensaver already running in this session"
 msgstr "arbedwr sgrin eisoes yn rhedeg o fewn y sesiwn hwn"
 
-#: ../src/gs-lock-plug.c:351
-msgid "Checking password..."
-msgstr "Gwirio'r cyfrinair..."
-
-#: ../src/gs-lock-plug.c:394
+#: ../src/gs-lock-plug.c:355
 msgid "Time has expired."
 msgstr "Amser ar ben."
 
-#: ../src/gs-lock-plug.c:420
+#: ../src/gs-lock-plug.c:386
 msgid "You have the Caps Lock key on."
 msgstr "Mae'r fysell Caps Lock ymlaen gennych."
 
-#: ../src/gs-lock-plug.c:707
-msgid "That password was incorrect."
-msgstr "Roedd y cyfrinair hwnnw'n anghywir."
-
-#: ../src/gs-lock-plug.c:733 ../src/gs-lock-plug.c:766
-msgid "_Unlock"
-msgstr "_Datgloi"
+#: ../src/gs-lock-plug.c:1504
+msgid "S_witch User..."
+msgstr ""
 
-#: ../src/gs-lock-plug.c:736 ../src/gs-lock-plug.c:763
-msgid "_Switch User..."
-msgstr "_Newid Defnyddiwr..."
+#: ../src/gs-lock-plug.c:1513
+msgid "Log _Out"
+msgstr "_Allgofnodi"
 
-#. Translators: this is "username on hostname".  You
-#. can translate this to "%s@%s" if it is otherwise tricky
-#. for your language.
-#: ../src/gs-lock-plug.c:1366
-#, c-format
-msgid "%s on %s"
-msgstr "%s ar %s"
+#. To translators: This expands to USERNAME on HOSTNAME
+#: ../src/gs-lock-plug.c:1705
+msgid "%U on %h"
+msgstr ""
 
-#: ../src/gs-lock-plug.c:1517
+#: ../src/gs-lock-plug.c:1719
 msgid "_Password:"
 msgstr "_Cyfrinair:"
-
-#: ../src/gs-lock-plug.c:1590
-msgid "S_witch to user:"
-msgstr "_Newid i'r defnyddiwr:"
-
-#: ../src/gs-lock-plug.c:1637
-msgid "Log _Out"
-msgstr "_Allgofnodi"