[Xfce4-commits] <xfce4-settings:master> Rebuild translations.

Nick Schermer noreply at xfce.org
Sat Aug 28 23:10:02 CEST 2010


Updating branch refs/heads/master
         to dad219905d7ba78bc166692b4e685bc9334a404a (commit)
       from 261f0f29b3a81b93afef17653eda1b19bf213bc8 (commit)

commit dad219905d7ba78bc166692b4e685bc9334a404a
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Aug 28 23:09:00 2010 +0200

    Rebuild translations.

 po/ast.po   |  228 ++++++++++----
 po/bn.po    |  228 ++++++++++----
 po/ca.po    |  244 ++++++++++-----
 po/cs.po    |  244 ++++++++++-----
 po/da.po    |  228 ++++++++++----
 po/de.po    |  594 +++++++++++++++++++++++++----------
 po/el.po    |  230 ++++++++++----
 po/es.po    |  245 ++++++++++-----
 po/eu.po    |  229 ++++++++++----
 po/fi.po    |  228 ++++++++++----
 po/fr.po    |  476 ++++++++++++++++++++--------
 po/gl.po    |  228 ++++++++++----
 po/hr.po    |  322 ++++++++++++++-----
 po/hu.po    |  228 ++++++++++----
 po/id.po    |  264 +++++++++++-----
 po/is.po    | 1007 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 po/it.po    |  228 ++++++++++----
 po/ja.po    |  228 ++++++++++----
 po/kk.po    |  455 +++++++++++++++++++--------
 po/lv.po    |  237 ++++++++++----
 po/nb.po    |  228 ++++++++++----
 po/nl.po    |  237 ++++++++++----
 po/pa.po    |  202 +++++++++----
 po/pl.po    |  226 ++++++++++----
 po/pt.po    |  228 ++++++++++----
 po/pt_BR.po |  241 ++++++++++-----
 po/ro.po    |  180 ++++++++----
 po/ru.po    |  450 ++++++++++++++++++++-------
 po/si.po    |  301 +++++++++++++-----
 po/sk.po    |  228 ++++++++++----
 po/sv.po    |  228 ++++++++++----
 po/tr.po    |  244 ++++++++++-----
 po/ug.po    |  266 ++++++++++++-----
 po/uk.po    |  448 ++++++++++++++++++++-------
 po/ur.po    |  226 ++++++++++----
 po/ur_PK.po |  226 ++++++++++----
 po/zh_CN.po |  228 ++++++++++----
 po/zh_TW.po |  334 ++++++++++++++------
 38 files changed, 8136 insertions(+), 2956 deletions(-)

diff --git a/po/ast.po b/po/ast.po
index 6ffcdbb..a2650c5 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3,10 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -209,38 +210,38 @@ msgstr "ID de SOCKET"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Información de versión"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Escribe '%s --help' pa instrucciones d'usu."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "L'equipu de desendolcu de Xfce. Tolos drechos reservaos."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Por favor, informa de fallos a <%s>"
@@ -262,6 +263,7 @@ msgid "Appearance"
 msgstr "Aspeutu"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Dambos"
 
@@ -360,6 +362,7 @@ msgstr "<b>Men
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Dengún"
 
@@ -472,24 +475,48 @@ msgstr "RGB vertical"
 msgid "Vertical BGR"
 msgstr "BGR vertical"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Aplicar cualesquier cambéu y prebar la nueva configuración de pantalla"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Información de versión"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Configura les opciones y la xeometría de la pantalla"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Pantalla"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "R_esolución:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "R_esolución:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Frecuencia de _refrescu:"
@@ -498,93 +525,145 @@ msgstr "Frecuencia de _refrescu:"
 msgid "Ro_tation:"
 msgstr "Ro_tación:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Salida detallada"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Pantalla"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Esquierda"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Invertíu"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Drecha"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Dambos n'horizontal"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "RGB vertical"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Pantalla %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Falta la estensión RandR na pantalla \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"La estensión de redimensionáu y rotación (RandR) nun ta activada nesta "
-"pantalla. Intenta activala y executa'l diálogu de nueves."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Fallu al usar la estensión RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Imposible obtener la versión de la estensión RandR n'usu"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Aplicar cualesquier cambéu y prebar la nueva configuración de pantalla"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Configuración"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Configuración"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "El sistema ta usando RandR %d.%d. Pa que furrule la configuración de "
 "pantalla ye necesaria al menos la versión 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Portátil"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televisión"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Pantalla dixital"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Segundu monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Segunda pantalla dixital"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1163,13 +1242,11 @@ msgstr "El rechazu de tecles ta desactiv
 msgid "Bounce keys"
 msgstr "Rechazu de tecles"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Entamar en mou depuración (nun pasa a segundu planu)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Estaya de trabayu %d"
@@ -1232,6 +1309,31 @@ msgstr ""
 "Preba %s --help pa ver una llista d'opciones de llinia de comandos "
 "disponibles.\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Pantalla %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Falta la estensión RandR na pantalla \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "La estensión de redimensionáu y rotación (RandR) nun ta activada nesta "
+#~ "pantalla. Intenta activala y executa'l diálogu de nueves."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Fallu al usar la estensión RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Segundu monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Segunda pantalla dixital"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "La propiedá \"<b>%s</b>\" nun puede reafitase porque ta bloquiada"
 
diff --git a/po/bn.po b/po/bn.po
index 975d666..069c8c8 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 18:04+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-02-23 16:45+0600\n"
 "Last-Translator: Sadia Afroz <sadia at ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n at googlegroups.com>\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -204,38 +205,38 @@ msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "সংস্করণ তথ্যাবলী"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "ব্যবহারের জন্য '%s --সহায়তা' টাইপ করুন।"
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce ডেভেলপমেন্ট টিম। সকল অধিকার সংরক্ষিত।"
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "অনুগ্রহ করে বাগগুলো <%s>-এ রিপোর্ট করুন।"
@@ -255,6 +256,7 @@ msgid "Appearance"
 msgstr "অবয়ব"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "উভয়"
 
@@ -348,6 +350,7 @@ msgstr "মেনু ও বোতাম"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "কোনটি না"
 
@@ -454,24 +457,48 @@ msgstr "উল্লম্ব RGB"
 msgid "Vertical BGR"
 msgstr "উল্লম্ব BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "যেকোন পরিবর্তন প্রয়োগ করে নতুন প্রদর্শন সেটিংসমূহ পরীক্ষা করুন"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "সংস্করণ তথ্যাবলী"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "পর্দার সেটিংসমূহ ও বহির্বিন্যাস কনফিগার"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "প্রদর্শন"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "রেজল্যুশন: (_e)"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "রেজল্যুশন: (_e)"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "রিফ্রেশ হার: (_r)"
@@ -480,93 +507,145 @@ msgstr "রিফ্রেশ হার: (_r)"
 msgid "Ro_tation:"
 msgstr "আবর্তন: (_t)"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "বাগাড়ম্বর আউটপুট"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "প্রদর্শন"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "সাধারণ"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "বাম"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "উল্টানো"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "ডান"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d হার্জ"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "উভয়ই অনুভূমিক"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "উল্লম্ব RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "স্ক্রীন %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "ডিসপ্লে \"%s\"-তে RandR বর্ধিতাংশ অনুপস্থিত"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"এই ডিসপ্লেতে আকার পরিবর্তন ও আবর্তন বর্ধিতাংশ (RandR) সক্রিয় করা নেই। এটি সক্রিয় "
-"করার চেষ্টা করুন এবং ডায়ালগটি পুনরায় চালান।"
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "RandR বর্ধিতাংশ ব্যবহার করতে ব্যর্থ"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "ব্যবহৃত RandR বর্ধিতাংশের সংস্করণ জিজ্ঞাসা করতে ব্যর্থ"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "যেকোন পরিবর্তন প্রয়োগ করে নতুন প্রদর্শন সেটিংসমূহ পরীক্ষা করুন"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "সেটিংসমূহ"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "সেটিংসমূহ"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "এই সিস্টেমটি RandR %d.%d ব্যবহার করছে। প্রদর্শন সেটিংসমূহের কাজ করার জন্য অন্ততপক্ষে "
 "১.১ সংস্করণ আবশ্যকীয়"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "ল্যাপটপ"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "মনিটর"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "টেলিভিশন"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "ডিজিটাল প্রদর্শন"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "দ্বিতীয় মনিটর"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "দ্বিতীয় ডিজিটাল ডিসপ্লে"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1123,13 +1202,11 @@ msgstr "লাফানো কী নিষ্ক্রিয়"
 msgid "Bounce keys"
 msgstr "লাফানো কী"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "ডিবাগ মোডে আরম্ভ (পটভূমিতে ফর্ক করা হবে না)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "কর্মপরিসর %d"
@@ -1189,3 +1266,28 @@ msgid ""
 msgstr ""
 "%s: %s\n"
 "চেষ্টা করুন %s --সহায়তা বিদ্যমান কমান্ড লাইন অপশনের পূর্ণ তালিকা দেখতে।\n"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d হার্জ"
+
+#~ msgid "Screen %d"
+#~ msgstr "স্ক্রীন %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "ডিসপ্লে \"%s\"-তে RandR বর্ধিতাংশ অনুপস্থিত"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "এই ডিসপ্লেতে আকার পরিবর্তন ও আবর্তন বর্ধিতাংশ (RandR) সক্রিয় করা নেই। এটি "
+#~ "সক্রিয় করার চেষ্টা করুন এবং ডায়ালগটি পুনরায় চালান।"
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "RandR বর্ধিতাংশ ব্যবহার করতে ব্যর্থ"
+
+#~ msgid "Second monitor"
+#~ msgstr "দ্বিতীয় মনিটর"
+
+#~ msgid "Second digital display"
+#~ msgstr "দ্বিতীয় ডিজিটাল ডিসপ্লে"
diff --git a/po/ca.po b/po/ca.po
index 6843c3f..b83bbeb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-23 18:05+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
 "Language-Team: Catalan\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -214,38 +215,38 @@ msgstr "SÃ’COL ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Informació de la versió"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Feu «%s --help» per veure l'ús."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "The Xfce development team. All rights reserved."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Envieu els errors a <%s>."
@@ -266,6 +267,7 @@ msgid "Appearance"
 msgstr "Aparença"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Ambdós"
 
@@ -360,6 +362,7 @@ msgstr "Menús i botons"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Cap"
 
@@ -468,24 +471,49 @@ msgstr "RGB vertical"
 msgid "Vertical BGR"
 msgstr "BGR vertical"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Aplica els canvis i comprova els nous ajustaments de pantalla"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Informació de la versió"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+#, fuzzy
+msgid "Keep this configuration"
+msgstr "Manté l'acció del gestor de finestres"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Configureu els paràmetres i format de la pantalla"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Pantalla"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "R_esolució:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "R_esolució:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "_Ràtio de refresc"
@@ -494,93 +522,145 @@ msgstr "_Ràtio de refresc"
 msgid "Ro_tation:"
 msgstr "Ro_tació:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Empra aquesta acció"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Ajustaments de pantalla"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Esquerra"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Invertit"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Dreta"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Ambdós horitzontals"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "RGB vertical"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Pantalla %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "No hi és l'extensió RandR a la pantalla «%s»"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"L'extensió per canviar la mida i rotar (RandR) no s'ha habilitat en aquesta "
-"pantalla. Intenteu habilitar-la i executeu un altre cop el diàleg."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "No s'ha pogut emprar l'extensió RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "No es pot saber la versió de l'extensió Randr que s'està emprant"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Ajustaments de pantalla de Xfce 4"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Paràmetres"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Paràmetres"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "El sistema està emprant Randr %d.%d. Per a que els ajustaments de pantalla "
 "funcionin cal almenys la versió 1.1."
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Portàtil"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televisió"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Pantalla digital"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Segon monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Segona pantalla digital"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1149,13 +1229,11 @@ msgstr "El rebot de tecles està desactivat"
 msgid "Bounce keys"
 msgstr "Rebot de tecles"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Inicia en mode de depuració (no bifurca el procés al segon pla)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Espai de treball %d"
@@ -1217,6 +1295,34 @@ msgstr ""
 "Feu %s --help per veure la llista complerta d'opcions disponibles \n"
 "de la línia d'ordres.\n"
 
+#~ msgid "Apply any changes and test the new display settings"
+#~ msgstr "Aplica els canvis i comprova els nous ajustaments de pantalla"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Pantalla %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "No hi és l'extensió RandR a la pantalla «%s»"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "L'extensió per canviar la mida i rotar (RandR) no s'ha habilitat en "
+#~ "aquesta pantalla. Intenteu habilitar-la i executeu un altre cop el diàleg."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "No s'ha pogut emprar l'extensió RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Segon monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Segona pantalla digital"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "No es pot reiniciar la propietat «<b>%s</b>», està blocada"
 
@@ -1353,12 +1459,6 @@ msgstr ""
 #~ msgid "Xfce 4 Appearance Settings"
 #~ msgstr "Ajustaments de l'aparença de Xfce 4"
 
-#~ msgid "Display Settings"
-#~ msgstr "Ajustaments de pantalla"
-
-#~ msgid "Xfce 4 Display Settings"
-#~ msgstr "Ajustaments de pantalla de Xfce 4"
-
 #~ msgid "<b>Application Shortcuts</b>"
 #~ msgstr "<b>Dreceres de l'aplicació</b>"
 
@@ -1403,9 +1503,6 @@ msgstr ""
 #~ "La drecera ja s0empra en <b>alguna altra acció del gestor de finestres</"
 #~ "b>. Quina acció voleu emprar?"
 
-#~ msgid "Use this action"
-#~ msgstr "Empra aquesta acció"
-
 #~ msgid "Keep the other one"
 #~ msgstr "Manté l'altre"
 
@@ -1429,9 +1526,6 @@ msgstr ""
 #~ "La drecera ja s'està emprant per l'<b>acció del gestor de finestres</b>. "
 #~ "Quina acció voleu emprar?"
 
-#~ msgid "Keep the window manager action"
-#~ msgstr "Manté l'acció del gestor de finestres"
-
 #~ msgid "Conflicting actions for %s"
 #~ msgstr "Conflicte entre accions degut a %s"
 
diff --git a/po/cs.po b/po/cs.po
index 31c8fbe..5f1a8a8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-19 21:12+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -208,38 +209,38 @@ msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Informace o verzi"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Informace o použití získáte příkazem '%s --help'"
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Vývojářský tým Xfce. Všechna práva vyhrazena."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Prosíme, abyste chyby hlásili na <%s>."
@@ -259,6 +260,7 @@ msgid "Appearance"
 msgstr "Vzhled"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Obojí"
 
@@ -353,6 +355,7 @@ msgstr "Nabídky a tlačítka"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Žádné"
 
@@ -457,24 +460,49 @@ msgstr "Svislé RGB"
 msgid "Vertical BGR"
 msgstr "Svislé BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Použít změny a vyzkoušet nové nastavení displeje"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Informace o verzi"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+#, fuzzy
+msgid "Keep this configuration"
+msgstr "Zachovat akci správce oken"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Konfiguruje nastavení obrazovky a rozložení"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Displej"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "Rozliš_ení:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "Rozliš_ení:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Obnovovací f_rekvence:"
@@ -483,93 +511,145 @@ msgstr "Obnovovací f_rekvence:"
 msgid "Ro_tation:"
 msgstr "O_točení:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Použít tuto akci"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Nastavení displeje"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Běžné"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Doleva"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Otočené"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Doprava"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Obojí vodorovně"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Svislé RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Obrazovka %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Na displeji „%s“ chybí rozšíření RandR"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Rozšíření pro rotaci a změnu velikosti (RandR) není na tomto displeji "
-"povoleno. Povolte jej a spusťte znovu dialogové okno."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Použití rozšíření RandR se nezdařilo"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Nelze zjistit používanou verzi rozšíření RandR"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Nastavení displeje prostředí Xfce 4"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Nastavení"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Nastavení"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Tento systém používá rozšíření RandR ve verzi %d. %d. Pro toto nastavení "
 "displeje je požadována alespoň verze 1. 1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Laptop"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televize"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Digitální displej"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Druhý monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Druhý digitální displej"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1127,13 +1207,11 @@ msgstr "Zdvojené klávesy jsou zakázány"
 msgid "Bounce keys"
 msgstr "Zdvojené klávesy"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Spustit v ladicím režimu (proces nebude spuštěn na pozadí)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Pracovní plocha %d"
@@ -1194,6 +1272,34 @@ msgstr ""
 "%s: %s\n"
 "Úplný seznam voleb příkazové řádky získáte příkazem %s --help.\n"
 
+#~ msgid "Apply any changes and test the new display settings"
+#~ msgstr "Použít změny a vyzkoušet nové nastavení displeje"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Obrazovka %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Na displeji „%s“ chybí rozšíření RandR"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Rozšíření pro rotaci a změnu velikosti (RandR) není na tomto displeji "
+#~ "povoleno. Povolte jej a spusťte znovu dialogové okno."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Použití rozšíření RandR se nezdařilo"
+
+#~ msgid "Second monitor"
+#~ msgstr "Druhý monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Druhý digitální displej"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "Vlastnost „<b>%s</b>“ nelze inicializovat, protože je uzamčena"
 
@@ -1330,12 +1436,6 @@ msgstr ""
 #~ msgid "Xfce 4 Appearance Settings"
 #~ msgstr "Nastavení vzhledu prostředí Xfce 4"
 
-#~ msgid "Display Settings"
-#~ msgstr "Nastavení displeje"
-
-#~ msgid "Xfce 4 Display Settings"
-#~ msgstr "Nastavení displeje prostředí Xfce 4"
-
 #~ msgid "<b>Application Shortcuts</b>"
 #~ msgstr "<b>Klávesové zkratky aplikací</b>"
 
@@ -1380,9 +1480,6 @@ msgstr ""
 #~ "Tato klávesová zkratka se již používá pro <b>jinou akci správce oken</b>. "
 #~ "Kterou akci chcete použít?"
 
-#~ msgid "Use this action"
-#~ msgstr "Použít tuto akci"
-
 #~ msgid "Keep the other one"
 #~ msgstr "Zachovat jinou"
 
@@ -1406,9 +1503,6 @@ msgstr ""
 #~ "Tato klávesová zkratka se již používá pro <b>akci správce oken</b>. "
 #~ "Kterou akci chcete použít?"
 
-#~ msgid "Keep the window manager action"
-#~ msgstr "Zachovat akci správce oken"
-
 #~ msgid "Conflicting actions for %s"
 #~ msgstr "Akce v konfliktu pro %s"
 
diff --git a/po/da.po b/po/da.po
index 0f81332..79b0c10 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings 4.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-19 21:40+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Dansk <dansk at dansk-gruppen.dk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -212,38 +213,38 @@ msgstr "SOKKEL-ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Versionsinformation"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Tast '%s --help' for brug."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce-udviklingsholdet. Alle rettigheder forbeholdes."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Rapportér venligst fejl til <%s>."
@@ -265,6 +266,7 @@ msgid "Appearance"
 msgstr "Udseende"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Begge"
 
@@ -359,6 +361,7 @@ msgstr "Menuer og knapper"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Ingen"
 
@@ -465,24 +468,48 @@ msgstr "Lodret RGB"
 msgid "Vertical BGR"
 msgstr "Lodret BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Anvend enhver ændring og afprøv den nye skærmindstilling"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Versionsinformation"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Konfigurér skærm-indstillinger og -udseende"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Skærm"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "Op_løsning:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "Op_løsning:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Opdaterings_frekvens:"
@@ -491,93 +518,145 @@ msgstr "Opdaterings_frekvens:"
 msgid "Ro_tation:"
 msgstr "Ro_tation:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Uddybende uddata"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Skærm"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Venstre"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Omvendt"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Højre"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Begge vandrette"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Lodret RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Skærm %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "RandR-udvidelsen mangler til skærm \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Ændr størrelse- og rotérudvidelsen (RandR) er ikke slået til på denne skærm. "
-"Prøv at slå den til og kør dialogen igen."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Kunne ikke bruge RandR-udvidelsen"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Kunne ikke forespørge hvilken version af RandR-udvidelsen er ibrug"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Anvend enhver ændring og afprøv den nye skærmindstilling"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Indstillinger"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Indstillinger"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Dette system bruger RandR %d.%d. For at skærmindstillingerne vil virke "
 "kræves mindst version 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Bærbar computer"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Skærm"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Fjernsyn"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Digitalskærm"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Anden skærm"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Anden digitalskærm"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1146,13 +1225,11 @@ msgstr "Rystetaster er ikke aktiveret"
 msgid "Bounce keys"
 msgstr "Rystetaster"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Start i fejlsøgningstilstand (forgren ikke til baggrunden)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbejdsområde %d"
@@ -1213,6 +1290,31 @@ msgstr ""
 "%s: %s\n"
 "Prøv %s --help for at se hele listen over mulige kommandolinjemuligheder.\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Skærm %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "RandR-udvidelsen mangler til skærm \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Ændr størrelse- og rotérudvidelsen (RandR) er ikke slået til på denne "
+#~ "skærm. Prøv at slå den til og kør dialogen igen."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Kunne ikke bruge RandR-udvidelsen"
+
+#~ msgid "Second monitor"
+#~ msgstr "Anden skærm"
+
+#~ msgid "Second digital display"
+#~ msgstr "Anden digitalskærm"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "Egenskab \"<b>%s</b>\" kan ikke nulstilles, da den er låst"
 
diff --git a/po/de.po b/po/de.po
index c56e9a2..91fa963 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,16 +4,18 @@
 # Fabian Nowak <timystery at arcor.de>, 2008, 2009.
 # Jannis Pohlmann <jannis at xfce.org>, 2008.
 # Simon Schneider <simon at schneiderimtal.de>, 2009
-# 
-# 
+#
+#
+#: ../xfsettingsd/main.c:127
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings 0.0.1-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-27 10:06+0000\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-02-19 18:52+0100\n"
 "Last-Translator: Fabian Nowak <timystery at arcor.de>\n"
 "Language-Team: German <xfce-i18n-de at xfce.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -81,8 +83,11 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "Die benötigtete Zeitspanne in Millisekunden zwischen Tastatureingaben"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
-msgstr "Die Zeitdauer in Millisekunden, bis eine Tastatureingabe angenommen wird"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
+msgstr ""
+"Die Zeitdauer in Millisekunden, bis eine Tastatureingabe angenommen wird"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid "The maximum pointer speed after acceleration"
@@ -94,23 +99,37 @@ msgstr "Der Anstieg, über den die Maximalgeschwindigkeit erreicht wird"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
 msgid "The time, in milliseconds, between repeated motion events"
-msgstr "Die Zeitdauer in Millisekunden zwischen wiederholten Bewegungsereignissen"
+msgstr ""
+"Die Zeitdauer in Millisekunden zwischen wiederholten Bewegungsereignissen"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
-msgstr "Die Zeitdauer in Millisekunden zwischen dem anfänglichen Tastendruck und dem ersten wiederholten Bewegungsereignis"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
+msgstr ""
+"Die Zeitdauer in Millisekunden zwischen dem anfänglichen Tastendruck und dem "
+"ersten wiederholten Bewegungsereignis"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid "The time, in milliseconds, to get to maximum speed"
-msgstr "Die Zeitdauer in Millisekunden, bis die volle Geschwindigkeit erreicht ist"
+msgstr ""
+"Die Zeitdauer in Millisekunden, bis die volle Geschwindigkeit erreicht ist"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
-msgstr "Um unerwünschte Eingaben zu vermeiden, ingoriert die Funktion »langsame Tasten« alle Tastendrucke, die eine gewisse Minimalzeit unterschreiten."
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
+msgstr ""
+"Um unerwünschte Eingaben zu vermeiden, ingoriert die Funktion »langsame "
+"Tasten« alle Tastendrucke, die eine gewisse Minimalzeit unterschreiten."
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
-msgstr "Um unerwünschte Mehrfacheingaben zu vermeiden, ignoriert die Funktion »hüpfende Tasten«zu schnelle Wiederholungen eines Tastendrucks."
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
+msgstr ""
+"Um unerwünschte Mehrfacheingaben zu vermeiden, ignoriert die Funktion "
+"»hüpfende Tasten«zu schnelle Wiederholungen eines Tastendrucks."
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
 msgid "Use _bounce keys"
@@ -125,20 +144,40 @@ msgid "Use slow _keys"
 msgstr "_Verlangsamte Tasten verwenden"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
-msgstr "Wenn dies ausgewählt ist, müssen Steuertasten (wie Strg, Alt und die Großschreibetaste) nicht gehalten werden, wenn normalerweise mehrere Tasten gleichzeitig gedrückt werden müssten. Sie können dann gedrückt und wieder losgelassen werden."
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
+msgstr ""
+"Wenn dies ausgewählt ist, müssen Steuertasten (wie Strg, Alt und die "
+"Großschreibetaste) nicht gehalten werden, wenn normalerweise mehrere Tasten "
+"gleichzeitig gedrückt werden müssten. Sie können dann gedrückt und wieder "
+"losgelassen werden."
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
-msgstr "Wenn dies ausgewählt ist, bleiben Steuerungstasten (wie Strg, Alt oder die Großschreibetaste) in der gedrückten Position, nachdem sie losgelassen wurden, bis sie erneut gedrückt werden."
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
+msgstr ""
+"Wenn dies ausgewählt ist, bleiben Steuerungstasten (wie Strg, Alt oder die "
+"Großschreibetaste) in der gedrückten Position, nachdem sie losgelassen "
+"wurden, bis sie erneut gedrückt werden."
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
-msgstr "Bei Aktivierung werden die »haftenden Tasten« deaktiviert, wenn zwei Tasten gleichzeitig gedrückt werden"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
+msgstr ""
+"Bei Aktivierung werden die »haftenden Tasten« deaktiviert, wenn zwei Tasten "
+"gleichzeitig gedrückt werden"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
-msgstr "Wenn dies ausgewählt ist, lässt sich der Mauszeiger mit dem Zahlenblock steuern"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
+msgstr ""
+"Wenn dies ausgewählt ist, lässt sich der Mauszeiger mit dem Zahlenblock "
+"steuern"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
 msgid "_Acceleration delay:"
@@ -178,7 +217,7 @@ msgstr "SOCKET-NUMMER"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
 #: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
@@ -187,17 +226,18 @@ msgstr "Versionsinformation"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
 #: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
-msgstr "Geben Sie »%s --help« ein, um Informationen über die Verwendung zu erhalten."
+msgstr ""
+"Geben Sie »%s --help« ein, um Informationen über die Verwendung zu erhalten."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
 #: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
@@ -206,7 +246,7 @@ msgstr "Das Entwicklungsteam von Xfce. Alle Rechte vorbehalten."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
 #: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
@@ -219,8 +259,11 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr "Erleichtern Sie sich die Verwendung von Tastatur und Maus"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
-msgstr "Anti-Aliasing, oder Kantenglättung, kann die Darstellung von Text auf dem Bildschirm verbessern."
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgstr ""
+"Anti-Aliasing, oder Kantenglättung, kann die Darstellung von Text auf dem "
+"Bildschirm verbessern."
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
@@ -228,6 +271,7 @@ msgid "Appearance"
 msgstr "Erscheinungsbild"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Beides"
 
@@ -270,15 +314,22 @@ msgstr "A_kustische Rückmeldungen aktivieren"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
-msgstr "Ereignisklänge global aktivieren oder deaktivieren (benötigt Unterstützung für »Canberra«)"
+msgstr ""
+"Ereignisklänge global aktivieren oder deaktivieren (benötigt Unterstützung "
+"für »Canberra«)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
 msgid "Event sounds"
 msgstr "Ereignisklänge"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
-msgstr "Falls Sie einen TFT- oder LCD-Monitor haben, können Sie die Darstellungsqualität der Schriften erheblich steigern, indem Sie die korrekte Reihenfolge der Farben innerhalb eines Pixels angeben"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
+msgstr ""
+"Falls Sie einen TFT- oder LCD-Monitor haben, können Sie die "
+"Darstellungsqualität der Schriften erheblich steigern, indem Sie die "
+"korrekte Reihenfolge der Farben innerhalb eines Pixels angeben"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
 msgid "Full"
@@ -289,12 +340,22 @@ msgid "Icons"
 msgstr "Symbole"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
-msgstr "Wenn dies ausgewählt ist, kann die Tastenkombination für Menüeinträge geändert werden, indem man die Maus über den Eintrag hält und die neue Kombination drückt."
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
+msgstr ""
+"Wenn dies ausgewählt ist, kann die Tastenkombination für Menüeinträge "
+"geändert werden, indem man die Maus über den Eintrag hält und die neue "
+"Kombination drückt."
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
-msgstr "Viele Schriftarten enthalten zusätzliche Informationen, wie sie am besten darzustellen sind; Wählen Sie aus, was Ihnen am besten gefällt."
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
+msgstr ""
+"Viele Schriftarten enthalten zusätzliche Informationen, wie sie am besten "
+"darzustellen sind; Wählen Sie aus, was Ihnen am besten gefällt."
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
 msgid "Medium"
@@ -306,12 +367,16 @@ msgstr "Menüs und Schaltflächen"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Keine"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
-msgstr "Stellen Sie die Bildschirmauflösung von Hand ein, falls Zeichen zu groß oder zu klein vorkommen."
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
+msgstr ""
+"Stellen Sie die Bildschirmauflösung von Hand ein, falls Zeichen zu groß oder "
+"zu klein vorkommen."
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
 msgid "Rendering"
@@ -343,11 +408,17 @@ msgstr "Stellen Sie ein, ob Symbole in Menüs angezeigt werden sollen"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:31
 msgid "Specify whether icons should be displayed next to text in buttons"
-msgstr "Stellen Sie ein, ob Symbole neben dem Text in Schaltflächen angezeigt werden sollen"
+msgstr ""
+"Stellen Sie ein, ob Symbole neben dem Text in Schaltflächen angezeigt werden "
+"sollen"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
-msgstr "Stellen Sie ein, ob Mausklicks und andere Eingaben Klänge auslösen können sollen."
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
+msgstr ""
+"Stellen Sie ein, ob Mausklicks und andere Eingaben Klänge auslösen können "
+"sollen."
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
 msgid "St_yle"
@@ -362,8 +433,12 @@ msgid "Text"
 msgstr "Text"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
-msgstr "Diese Schriftart wird als Standardschriftart in grafischen Schnittstellen verwendet"
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
+msgstr ""
+"Diese Schriftart wird als Standardschriftart in grafischen Schnittstellen "
+"verwendet"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
 msgid "_Fonts"
@@ -401,24 +476,50 @@ msgstr "RGB (vertikal)"
 msgid "Vertical BGR"
 msgstr "BGR (vertikal)"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Änderungen anwenden und neue Anzeigeeinstellungen testen"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Versionsinformation"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+#, fuzzy
+msgid "Keep this configuration"
+msgstr "Fenstermanageraktion behalten"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+#, fuzzy
+msgid "Restore the previous configuration"
+msgstr "Die  einstellen"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Stellen Sie Ihre Bildschirme und deren Anordnung ein"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Anzeige"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "_Auflösung:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "_Auflösung:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "_Bildwiederholfrequenz:"
@@ -427,85 +528,145 @@ msgstr "_Bildwiederholfrequenz:"
 msgid "Ro_tation:"
 msgstr "_Drehung:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Diese Aktion verwenden"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Anzeige"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Links"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Invertiert"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Rechts"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Beides (horizontal)"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "RGB (vertikal)"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Anzeige %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Die RandR-Erweiterung fehlt für die Anzeige »%s«."
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
-msgid "The Resize and Rotate extension (RandR) is not enabled on this display. Try to enable it and run the dialog again."
-msgstr "Die RandR-Erweiterung zur Größenanpassung und Drehung ist für diese Anzeige nicht antiviert. Aktivieren Sie sie und rufen Sie diesen Dialog erneut auf."
+#: ../dialogs/display-settings/main.c:653
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Konnte die RandR-Erweiterung nicht verwenden."
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Konnte die verwendete Version der RandR-Erweiterung nicht feststellen."
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Xfce4-Anzeigeeinstellungen"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Einstellungen"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Einstellungen"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+"Dieses System verwendet RandR in der Version %d.%d. Damit die "
+"Anzeigeneinstellungen funktionieren, ist mindestend Version 1.1 erforderlich."
+
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.1 is required at least"
-msgstr "Dieses System verwendet RandR in der Version %d.%d. Damit die Anzeigeneinstellungen funktionieren, ist mindestend Version 1.1 erforderlich."
+msgid "The video driver does not support video outputs"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Laptop"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Bildschirm"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Fernseher"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Digitalanzeige"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Zweiter Bildschirm"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Zweite Digitalanzeige"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -575,7 +736,8 @@ msgstr "Legen Sie Tastenkürzel zum _Starten von Anwendungen fest:"
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1
 msgid "Edit keyboard settings and application shortcuts"
-msgstr "Bearbeiten Sie die Tastatureinstellungen und Tastenkürzel für Anwendungen"
+msgstr ""
+"Bearbeiten Sie die Tastatureinstellungen und Tastenkürzel für Anwendungen"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2
@@ -607,8 +769,12 @@ msgid "Show _blinking"
 msgstr "_Blinken"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
-msgstr "Gibt an, ob die Tastaturbelegung in diesem Einstellungsdialog definiert wird, oder vom X-Server übernommen wird."
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
+msgstr ""
+"Gibt an, ob die Tastaturbelegung in diesem Einstellungsdialog definiert "
+"wird, oder vom X-Server übernommen wird."
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
 msgid "Specify whether or not the text cursor blinks"
@@ -620,7 +786,9 @@ msgstr "Die Zeitdauer in Millisekunden zwischen dem Blinken der Schreibmarke"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
 msgid "The rate at which keystrokes are generated while a key is pressed"
-msgstr "Die Rate, mit der Tastatureingaben erzeugt werden, während eine Taste gedrückt wird"
+msgstr ""
+"Die Rate, mit der Tastatureingaben erzeugt werden, während eine Taste "
+"gedrückt wird"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
 msgid "The time, in milliseconds, before a pressed key begins repeating"
@@ -637,8 +805,12 @@ msgid "Use this area to _test the settings above:"
 msgstr "Benutzen Sie diese _Fläche zum Testen der obigen Einstellungen:"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
-msgstr "Bei Aktivierung gibt eine festgehaltene Taste immer wieder das gleiche Zeichen aus"
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
+msgstr ""
+"Bei Aktivierung gibt eine festgehaltene Taste immer wieder das gleiche "
+"Zeichen aus"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
 msgid "_Enable key repeat"
@@ -703,12 +875,18 @@ msgid "Reset to Defaults"
 msgstr "Standardwerte setzen"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:931
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
-msgstr "Dies setzt alle Tastenkürzel auf ihre Standardwerte zurück. Möchten Sie dies wirklich?"
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
+msgstr ""
+"Dies setzt alle Tastenkürzel auf ihre Standardwerte zurück. Möchten Sie dies "
+"wirklich?"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:996
 msgid "The system defaults will be restored next time you log in."
-msgstr "Die Systemvorgaben werden wiederhergestellt, wenn Sie sich das nächste Mal anmelden."
+msgstr ""
+"Die Systemvorgaben werden wiederhergestellt, wenn Sie sich das nächste Mal "
+"anmelden."
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:998
 msgid "Warning"
@@ -775,8 +953,12 @@ msgid "Re_verse scroll direction"
 msgstr "M_ausrad invertieren"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
-msgid "Set the acceleration and threshold for the selected device to the default values"
-msgstr "Setzt die Werte für Beschleunigung und den Schwellwert für das ausgewählte Gerät zurück auf die Standardwerte"
+msgid ""
+"Set the acceleration and threshold for the selected device to the default "
+"values"
+msgstr ""
+"Setzt die Werte für Beschleunigung und den Schwellwert für das ausgewählte "
+"Gerät zurück auf die Standardwerte"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
 msgid "Size"
@@ -787,32 +969,50 @@ msgid "T_hreshold:"
 msgstr "_Schwellwert:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
-msgstr "Faktor, um den die Zeigergeschwindigkeit ansteigt, wenn die Maus bewegt wird"
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
+msgstr ""
+"Faktor, um den die Zeigergeschwindigkeit ansteigt, wenn die Maus bewegt wird"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
-msgstr "Der Pixelabstand zwischen zwei Mausklicks, bis zu dem sie noch als Doppelklick betrachtet werden"
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
+msgstr ""
+"Der Pixelabstand zwischen zwei Mausklicks, bis zu dem sie noch als "
+"Doppelklick betrachtet werden"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
-msgid "The number of pixels the pointer must move before a drag operation will start"
-msgstr "Die Anzahl an Pixeln, die der Mauszeiger bewegt werden muss, bevor dies als Ziehen interpretiert wird"
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
+msgstr ""
+"Die Anzahl an Pixeln, die der Mauszeiger bewegt werden muss, bevor dies als "
+"Ziehen interpretiert wird"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
-msgstr "Die Anzahl an Pixeln, die der Mauszeiger bewegt werden muss, bevor die Beschleunigung beginnt"
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
+msgstr ""
+"Die Anzahl an Pixeln, die der Mauszeiger bewegt werden muss, bevor die "
+"Beschleunigung beginnt"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
 msgid "Ti_me:"
 msgstr "_Zeit:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
-msgstr "Die Höchstdauer in Millisekunden zwischen zwei Mausklicks, sodass sie noch als Doppelklick erkannt werden"
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
+msgstr ""
+"Die Höchstdauer in Millisekunden zwischen zwei Mausklicks, sodass sie noch "
+"als Doppelklick erkannt werden"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
 msgid "When selected, the scroll wheel will work in the opposite direction"
-msgstr "Bei Aktivierung scrollt das Mausrad in die jeweils entgegengesetzte Richtung"
+msgstr ""
+"Bei Aktivierung scrollt das Mausrad in die jeweils entgegengesetzte Richtung"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
 msgid "_Acceleration:"
@@ -875,7 +1075,9 @@ msgstr "Zurücksetzen"
 
 #: ../xfce4-settings-editor/main_window.c:924
 msgid "Resetting a property will permanently remove those custom settings."
-msgstr "Zurücksetzen der Eigenschaften wird diese benutzerdefinierten Einstellungen löschen."
+msgstr ""
+"Zurücksetzen der Eigenschaften wird diese benutzerdefinierten Einstellungen "
+"löschen."
 
 #: ../xfce4-settings-editor/main_window.c:925
 #, c-format
@@ -894,7 +1096,9 @@ msgstr "Das Stammelement (/) ist kein gültiger Name für eine Eigenschaft"
 
 #: ../xfce4-settings-editor/main_window.c:1004
 #, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
 msgstr ""
 "Eigenschaftsnamen können nur ASCII Zeichen beinhalten.\n"
 "A-Z, a-z, 0-9, '_', '-', '<' und '>', sowie '/' als Trennzeichen"
@@ -915,12 +1119,16 @@ msgstr "_Zurücksetzen"
 
 #: ../xfce4-settings-editor/main_window.c:1077
 msgid "Resetting a channel will permanently remove those custom settings."
-msgstr "Zurücksetzen des Kanals wird diese benutzerdefinierten Einstellungen dauerhaft löschen."
+msgstr ""
+"Zurücksetzen des Kanals wird diese benutzerdefinierten Einstellungen "
+"dauerhaft löschen."
 
 #: ../xfce4-settings-editor/main_window.c:1078
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
-msgstr "Sind Sie sicher, dass Sie die den Kanal »%s« und alle zugehörigen Eigenschaften zurücksetzen möchten?"
+msgstr ""
+"Sind Sie sicher, dass Sie die den Kanal »%s« und alle zugehörigen "
+"Eigenschaften zurücksetzen möchten?"
 
 #: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
 msgid "Graphical settings editor for Xfconf"
@@ -1098,10 +1306,42 @@ msgid ""
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
-"Geben Sie »%s --help« ein, um eine Übersicht über alle verfügbaren  Befehle zu erhalten.\n"
+"Geben Sie »%s --help« ein, um eine Übersicht über alle verfügbaren  Befehle "
+"zu erhalten.\n"
+
+#~ msgid "Apply any changes and test the new display settings"
+#~ msgstr "Änderungen anwenden und neue Anzeigeeinstellungen testen"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Anzeige %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Die RandR-Erweiterung fehlt für die Anzeige »%s«."
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Die RandR-Erweiterung zur Größenanpassung und Drehung ist für diese "
+#~ "Anzeige nicht antiviert. Aktivieren Sie sie und rufen Sie diesen Dialog "
+#~ "erneut auf."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Konnte die RandR-Erweiterung nicht verwenden."
+
+#~ msgid "Second monitor"
+#~ msgstr "Zweiter Bildschirm"
+
+#~ msgid "Second digital display"
+#~ msgstr "Zweite Digitalanzeige"
 
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
-#~ msgstr "Die Eigenschaft »%s« kann nicht zurückgesetzt werden, weil die gesperrt ist."
+#~ msgstr ""
+#~ "Die Eigenschaft »%s« kann nicht zurückgesetzt werden, weil die gesperrt "
+#~ "ist."
 
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>Zurückschnellende Tasten</b>"
@@ -1178,26 +1418,54 @@ msgstr ""
 #~ msgid "D_ebounce time:"
 #~ msgstr "_Rückprallzeit:"
 
-#~ msgid "The amount of time you have to wait before keystrokes are accepted again, in milliseconds"
-#~ msgstr "Die Zeitdauer in Millisekunden, bis wieder Tastendrücke angenommen werden"
-
-#~ msgid "When enabled, the Shift, Ctrl and Alt keys stay \"selected\" until you press them again"
-#~ msgstr "Bei Aktivierung bleiben Shift, Strg und Alt »ausgewählt«, bis sie erneut gedrückt werden"
-
-#~ msgid "When enabled, you can press and release the Shift, Ctrl and Alt keys, and then press another key to get a key combo"
-#~ msgstr "Bei Aktivierung können Shift, Strg und Alt gedrückt und wieder losgelassen werden, bevor eine weitere Taste gedrückt wird, und man erhält trotzdem eine Tastenkombination"
-
-#~ msgid "When enabled, you must hold the key for a specific amount of time before the keystroke will be accepted. This helps prevent accidental key strokes"
-#~ msgstr "Bei Aktivierung müssen die Tasten eine bestimmte Zeitdauer gedrückt werden, bevor die Eingabe als solche akzeptiert wird. Dies beugt versehentlichen Tastendrücken vor"
-
-#~ msgid "When enabled, you must wait a specific amount of time before the next keystroke can be accepted. This prevents accidental multiple key strokes"
-#~ msgstr "Bei Aktivierung muss eine bestimmte Zeit lang gewartet werden, bevor die nächste Eingabe angenommen wird. Dies beugt versehentlichen mehrfachen Tastendrücken vor"
+#~ msgid ""
+#~ "The amount of time you have to wait before keystrokes are accepted again, "
+#~ "in milliseconds"
+#~ msgstr ""
+#~ "Die Zeitdauer in Millisekunden, bis wieder Tastendrücke angenommen werden"
+
+#~ msgid ""
+#~ "When enabled, the Shift, Ctrl and Alt keys stay \"selected\" until you "
+#~ "press them again"
+#~ msgstr ""
+#~ "Bei Aktivierung bleiben Shift, Strg und Alt »ausgewählt«, bis sie erneut "
+#~ "gedrückt werden"
+
+#~ msgid ""
+#~ "When enabled, you can press and release the Shift, Ctrl and Alt keys, and "
+#~ "then press another key to get a key combo"
+#~ msgstr ""
+#~ "Bei Aktivierung können Shift, Strg und Alt gedrückt und wieder "
+#~ "losgelassen werden, bevor eine weitere Taste gedrückt wird, und man "
+#~ "erhält trotzdem eine Tastenkombination"
+
+#~ msgid ""
+#~ "When enabled, you must hold the key for a specific amount of time before "
+#~ "the keystroke will be accepted. This helps prevent accidental key strokes"
+#~ msgstr ""
+#~ "Bei Aktivierung müssen die Tasten eine bestimmte Zeitdauer gedrückt "
+#~ "werden, bevor die Eingabe als solche akzeptiert wird. Dies beugt "
+#~ "versehentlichen Tastendrücken vor"
+
+#~ msgid ""
+#~ "When enabled, you must wait a specific amount of time before the next "
+#~ "keystroke can be accepted. This prevents accidental multiple key strokes"
+#~ msgstr ""
+#~ "Bei Aktivierung muss eine bestimmte Zeit lang gewartet werden, bevor die "
+#~ "nächste Eingabe angenommen wird. Dies beugt versehentlichen mehrfachen "
+#~ "Tastendrücken vor"
 
 #~ msgid "Enable or disable input feedback sounds (i.e. button clicks)"
-#~ msgstr "Akustische Rückmeldungen (z.B. für Mausklicks) aktivieren oder deaktivieren"
+#~ msgstr ""
+#~ "Akustische Rückmeldungen (z.B. für Mausklicks) aktivieren oder "
+#~ "deaktivieren"
 
-#~ msgid "Whether menu accelerators can be changed by pressing a key over the menu item"
-#~ msgstr "Sollen sich Menükürzel ändern lassen, indem eine Taste über einem Menüeintrag gedrückt wird?"
+#~ msgid ""
+#~ "Whether menu accelerators can be changed by pressing a key over the menu "
+#~ "item"
+#~ msgstr ""
+#~ "Sollen sich Menükürzel ändern lassen, indem eine Taste über einem "
+#~ "Menüeintrag gedrückt wird?"
 
 #~ msgid "<b>Application Shortcuts</b>"
 #~ msgstr "<b>Tastenkürzel für Anwendungen</b>"
@@ -1208,8 +1476,13 @@ msgstr ""
 #~ msgid "The length of the cursor blink cycle in milliseconds"
 #~ msgstr "Die Dauer eines Blinkzyklus des Cursors in Millisekunden"
 
-#~ msgid "The pointer will go 'acceleration' times as fast when it travels more than 'threshold' pixels in a short time"
-#~ msgstr "Der Mauszeiger wird sich um ein Vielfaches des Wertes im Feld »Beschleunigung« schneller bewegen, wenn er innerhalb kurzer Zeit um mehr Pixel als im Feld »Schwellwert« angegeben bewegt wird"
+#~ msgid ""
+#~ "The pointer will go 'acceleration' times as fast when it travels more "
+#~ "than 'threshold' pixels in a short time"
+#~ msgstr ""
+#~ "Der Mauszeiger wird sich um ein Vielfaches des Wertes im Feld "
+#~ "»Beschleunigung« schneller bewegen, wenn er innerhalb kurzer Zeit um mehr "
+#~ "Pixel als im Feld »Schwellwert« angegeben bewegt wird"
 
 #~ msgid "_Threshold:"
 #~ msgstr "_Schwellwert:"
@@ -1226,12 +1499,6 @@ msgstr ""
 #~ msgid "Xfce 4 Appearance Settings"
 #~ msgstr "Erscheinungsbild von Xfce 4"
 
-#~ msgid "Display Settings"
-#~ msgstr "Anzeige"
-
-#~ msgid "Xfce 4 Display Settings"
-#~ msgstr "Xfce4-Anzeigeeinstellungen"
-
 #~ msgid "Keyboard Settings"
 #~ msgstr "Tastatur"
 
@@ -1247,8 +1514,12 @@ msgstr ""
 #~ msgid "Xfce 4 Mouse Settings"
 #~ msgstr "Mauseinstellungen für Xfce 4"
 
-#~ msgid "This shortcut is already being used by <b>another window manager action</b>. Which action do you want to use?"
-#~ msgstr "Dieses Tastenkürzel wird bereits für eine <b>andere Fenstermanageraktion</b> verwendet. Welche der beiden Aktionen wollen Sie verwenden?"
+#~ msgid ""
+#~ "This shortcut is already being used by <b>another window manager action</"
+#~ "b>. Which action do you want to use?"
+#~ msgstr ""
+#~ "Dieses Tastenkürzel wird bereits für eine <b>andere Fenstermanageraktion</"
+#~ "b> verwendet. Welche der beiden Aktionen wollen Sie verwenden?"
 
 #~ msgid "Use %s"
 #~ msgstr "»%s« verwenden"
@@ -1256,17 +1527,22 @@ msgstr ""
 #~ msgid "Keep the other one"
 #~ msgstr "Die andere Aktion behalten"
 
-#~ msgid "The shortcut is already being used for the command <b>%s</b>. Which action do you want to use?"
-#~ msgstr "Dieses Tastenkürzel wird schon für den Befehl <b>%s</b> verwendet. Welche Aktion wollen Sie verwenden?"
+#~ msgid ""
+#~ "The shortcut is already being used for the command <b>%s</b>. Which "
+#~ "action do you want to use?"
+#~ msgstr ""
+#~ "Dieses Tastenkürzel wird schon für den Befehl <b>%s</b> verwendet. Welche "
+#~ "Aktion wollen Sie verwenden?"
 
 #~ msgid "Keep %s"
 #~ msgstr "»%s« behalten"
 
-#~ msgid "The shortcut is already being used by a <b>window manager action</b>. Which action do you want to use?"
-#~ msgstr "Dieses Tastenkürzel wird schon für eine <b>Fenstermanageraktion</b> verwendet. Welche Aktion wollen Sie verwenden?"
-
-#~ msgid "Keep the window manager action"
-#~ msgstr "Fenstermanageraktion behalten"
+#~ msgid ""
+#~ "The shortcut is already being used by a <b>window manager action</b>. "
+#~ "Which action do you want to use?"
+#~ msgstr ""
+#~ "Dieses Tastenkürzel wird schon für eine <b>Fenstermanageraktion</b> "
+#~ "verwendet. Welche Aktion wollen Sie verwenden?"
 
 #~ msgid "Conflicting actions for %s"
 #~ msgstr "Konflikt bei dem Tastenkürzel %s"
@@ -1298,11 +1574,12 @@ msgstr ""
 #~ msgid "gtk-revert-to-saved"
 #~ msgstr "gtk-revert-to-saved"
 
-#~ msgid "Use this action"
-#~ msgstr "Diese Aktion verwenden"
-
-#~ msgid "This shortcut is already being used by the window manager action <b>%s</b>. Which action do you want to use?"
-#~ msgstr "Dieses Tastenkürzel wird bereits von der Aktion <b>%s</b> des Fenstermanagers benützt. Welche Aktion soll verwendet werden?"
+#~ msgid ""
+#~ "This shortcut is already being used by the window manager action <b>%s</"
+#~ "b>. Which action do you want to use?"
+#~ msgstr ""
+#~ "Dieses Tastenkürzel wird bereits von der Aktion <b>%s</b> des "
+#~ "Fenstermanagers benützt. Welche Aktion soll verwendet werden?"
 
 #~ msgid "Keep window manager action"
 #~ msgstr "Aktion des Fenstermanagers behalten"
@@ -1328,9 +1605,6 @@ msgstr ""
 #~ msgid "Set shortcut for command:"
 #~ msgstr "Tastenkürzel eingeben für den Befehl:"
 
-#~ msgid "Configure the display settings and configuration"
-#~ msgstr "Die  einstellen"
-
 #~ msgid "<b>Theme</b>"
 #~ msgstr "<b>Themenname</b>"
 
diff --git a/po/el.po b/po/el.po
index 1fb4dd3..ab95567 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-29 21:00+0200\n"
 "Last-Translator: Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -222,38 +223,38 @@ msgstr "ID ΥΠΟΔΟΧΗΣ"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Πληροφορίες έκδοσης"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Πληκτρολόγησε  '%s --help'  για χρήση."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "H ομάδα ανάπτυξης Xfce. Όλα τα δικαιώματα είναι δεσμευμένα."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Παρακαλώ αναφέρετε τα σφάλματα στο <%s>."
@@ -275,6 +276,7 @@ msgid "Appearance"
 msgstr "Εμφάνιση"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Και τα δύο"
 
@@ -370,6 +372,7 @@ msgstr "Εργαλειοθήκες και πλήκτρα"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Κανένα"
 
@@ -481,24 +484,48 @@ msgstr "Κάθετο RGB"
 msgid "Vertical BGR"
 msgstr "Κάθετο BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Εφαρμογή τυχόν αλλαγών και δοκιμή των νέων ρυθμίσεων οθόνης"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Πληροφορίες έκδοσης"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Ρύθμιση επιλογών οθόνης και διάταξης"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Οθόνη"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "Ανάλυση:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "Ανάλυση:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Ρυθμός ανανέωσης:"
@@ -507,95 +534,146 @@ msgstr "Ρυθμός ανανέωσης:"
 msgid "Ro_tation:"
 msgstr "Περιστροφή:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Λεπτομερή έξοδος"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Οθόνη"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Κανονικά"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Αριστερά"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Αντίστροφα"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Δεξιά"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Και τα δύο οριζόντια"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Κάθετο RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Οθόνη %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Η επέκταση RandR λείπει στην οθόνη  \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Η επέκταση αλλαγής μεγέθου και περιστροφής (RandR) δεν είναι ενεργοποιημένη "
-"στην οθόνη. Δοκιμάστε να το ενεργοποιήσετε και τρέξτε αυτό το παράθυρο "
-"διαλόγου ξανά."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Αποτυχία χρήσης της επέκτασης RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr ""
 "Αδυναμία αναζήτησης της έκδοσης της επέκτασης που χρησιμοποιεί το RandR"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Εφαρμογή τυχόν αλλαγών και δοκιμή των νέων ρυθμίσεων οθόνης"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Ρυθμίσεις"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Ρυθμίσεις"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Το σύστημα χρησιμοποιεί RandR %d.%d. Για να δουλέψουν οι ρυθμίσεις οθόνης "
 "χρειάζεται τουλάχιστον η έκδοση 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Φορητός υπολογιστής"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Οθόνη"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Τηλεόραση"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Ψηφιακή οθόνη"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Δεύτερη οθόνη"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Δεύτερη ψηφιακή οθόνη"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1180,14 +1258,12 @@ msgstr "Τα πλήκτρα αναπήδησης είναι απενεργοπο
 msgid "Bounce keys"
 msgstr "Πλήκτρα αναπήδησης"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr ""
 "Εκκίνηση σε κατάσταση αποσφαλμάτωσης (μην το μεταφέρετε στο παρασκήνιο)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Χώρος εργασίας %d"
@@ -1248,3 +1324,29 @@ msgstr ""
 "%s: %s\n"
 "Δοκίμαστε %s --help για να δείτε μία πλήρη λίστα με όλες τις διαθέσιμες "
 "επιλογές της γραμμής εντολών.\n"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Οθόνη %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Η επέκταση RandR λείπει στην οθόνη  \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Η επέκταση αλλαγής μεγέθου και περιστροφής (RandR) δεν είναι "
+#~ "ενεργοποιημένη στην οθόνη. Δοκιμάστε να το ενεργοποιήσετε και τρέξτε αυτό "
+#~ "το παράθυρο διαλόγου ξανά."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Αποτυχία χρήσης της επέκτασης RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Δεύτερη οθόνη"
+
+#~ msgid "Second digital display"
+#~ msgstr "Δεύτερη ψηφιακή οθόνη"
diff --git a/po/es.po b/po/es.po
index a253bab..7f27ff9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-27 05:15-0800\n"
 "Last-Translator: Javier Sánchez <donoban at gmail.com>\n"
 "Language-Team: Spanish/ES <xfce-i18n at xfce.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -212,38 +213,38 @@ msgstr "ID de SOCKET"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Información de versión"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Escriba '%s --help' para instrucciones de uso."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "El equipo de desarrollo de Xfce. Todos los derechos reservados."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Por favor, informe de fallos a <%s>"
@@ -265,6 +266,7 @@ msgid "Appearance"
 msgstr "Apariencia"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Ambos"
 
@@ -360,6 +362,7 @@ msgstr "Menús y botones"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Ninguno"
 
@@ -471,24 +474,49 @@ msgstr "RGB vertical"
 msgid "Vertical BGR"
 msgstr "BGR vertical"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Aplicar cualquier cambio y probar la nueva configuración de pantalla"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Información de versión"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+#, fuzzy
+msgid "Keep this configuration"
+msgstr "Conservar la acción del gestor de ventanas"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Configure las opciones y la geometría de la pantalla"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Pantalla"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "R_esolución:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "R_esolución:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Frecuencia de _refresco:"
@@ -497,93 +525,145 @@ msgstr "Frecuencia de _refresco:"
 msgid "Ro_tation:"
 msgstr "Ro_tación:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Usar esta acción"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Configuración de pantalla"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Izquierda"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Invertido"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Derecha"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Ambos en horizontal"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "RGB vertical"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Pantalla %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Falta la extensión RandR en la pantalla \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"La extensión de redimensionado y rotación (RandR) no está activada en esta "
-"pantalla. Intente activarla y ejecute el diálogo de nuevo."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Fallo al usar la extensión RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Imposible obtener la versión de la extensión RandR en uso"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Configuración de pantalla de Xfce 4"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Configuración"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Configuración"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "El sistema está usando RandR %d.%d. Para que funcione la configuración de "
 "pantalla es necesaria al menos la versión 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Portátil"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televisión"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Pantalla digital"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Segundo monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Segunda pantalla digital"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1161,13 +1241,11 @@ msgstr "El rechazo de teclas está desactivado"
 msgid "Bounce keys"
 msgstr "Rechazo de teclas"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Iniciar en modo depuración (no pasa a segundo plano)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Área de trabajo %d"
@@ -1230,6 +1308,35 @@ msgstr ""
 "Pruebe %s --help para ver una lista de opciones de línea de comando "
 "disponibles.\n"
 
+#~ msgid "Apply any changes and test the new display settings"
+#~ msgstr ""
+#~ "Aplicar cualquier cambio y probar la nueva configuración de pantalla"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Pantalla %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Falta la extensión RandR en la pantalla \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "La extensión de redimensionado y rotación (RandR) no está activada en "
+#~ "esta pantalla. Intente activarla y ejecute el diálogo de nuevo."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Fallo al usar la extensión RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Segundo monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Segunda pantalla digital"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr ""
 #~ "La propiedad \"<b>%s</b>\" no puede restablecerse porque está bloqueada"
@@ -1390,12 +1497,6 @@ msgstr ""
 #~ msgid "Xfce 4 Appearance Settings"
 #~ msgstr "Configuración de apariencia de Xfce 4"
 
-#~ msgid "Display Settings"
-#~ msgstr "Configuración de pantalla"
-
-#~ msgid "Xfce 4 Display Settings"
-#~ msgstr "Configuración de pantalla de Xfce 4"
-
 #~ msgid "Keyboard Settings"
 #~ msgstr "Configuración del teclado"
 
@@ -1412,9 +1513,6 @@ msgstr ""
 #~ "Este atajo ya está siendo usado por <b>otra acción del gestor de "
 #~ "ventanas</b>. ¿Qué acción desea usar?"
 
-#~ msgid "Use this action"
-#~ msgstr "Usar esta acción"
-
 #~ msgid "Keep the other one"
 #~ msgstr "Conservar la otra"
 
@@ -1438,9 +1536,6 @@ msgstr ""
 #~ "El atajo ya está siendo usado por una <b> acción del gestor de ventanas</"
 #~ "b>. ¿Qué acción desea usar?"
 
-#~ msgid "Keep the window manager action"
-#~ msgstr "Conservar la acción del gestor de ventanas"
-
 #~ msgid "Conflicting actions for %s"
 #~ msgstr "Acciones en conflicto para %s"
 
diff --git a/po/eu.po b/po/eu.po
index f78efbd..6ab9f0d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-02-10 22:13+0100\n"
 "Last-Translator: \n"
 "Language-Team: Basque <kde-i18n-doc at kde.org>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
@@ -210,38 +210,38 @@ msgstr "SOCKET IDa"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Bertsio argibideak"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Idatzi '%s --help' erabilerarentzat."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce garapen taldea. Eskubide guztiak erreserbatuta."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Programa-erroreen berri eman <%s>-ra."
@@ -263,6 +263,7 @@ msgid "Appearance"
 msgstr "Itxura"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Bietan"
 
@@ -357,6 +358,7 @@ msgstr "Menuak eta botoiak"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Bat ere ez"
 
@@ -463,24 +465,48 @@ msgstr "RGB bertikala"
 msgid "Vertical BGR"
 msgstr "BGR bertikala"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Aplikatu edozein aldaketa eta probatu pantaila konfigurazio berria"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Bertsio argibideak"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Konfiguratu pantaila ezarpen eta ingurunea"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Bistaratu"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "B_ereizmena:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "B_ereizmena:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Freskatze _tasa:"
@@ -489,93 +515,145 @@ msgstr "Freskatze _tasa:"
 msgid "Ro_tation:"
 msgstr "Birake_ta:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Irteera luzea"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Bistaratu"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normala"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Ezkerrean"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Alderantzikatuta"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Eskuinean"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Biak horizontalki"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "RGB bertikala"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "%d antaila"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "RandR hedapena falta da \"%s\" pantailan"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Tamainaz-aldatu eta biratu hedapena (RandR) ez dago gaiturik pantaila "
-"honentzat. SAiatu gaitzen eta elkarrizketa berriz irekitzen."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Huts RandR hedapena erabiltzean"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Ezin da erabiltzen ari den RandR hedapen bertsioa galdezkatu"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Aplikatu edozein aldaketa eta probatu pantaila konfigurazio berria"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Ezarpenak"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Ezarpenak"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Sistema honek RandR %d.%d erabiltzen du. Pantaila ezarpenak funtzionatzeko "
 "behintzat 1.1 bertsioa behar da"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Eramangarria"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitorea"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Telebista"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Pantaila digitala"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Bigarren monitorea"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Bigarren pantaila digitala"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1140,13 +1218,11 @@ msgstr "Tekla errepikapena desgaiturik dago"
 msgid "Bounce keys"
 msgstr "Tekla errepikapena"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Hasi arazpen moduan (ez pasa atzeko-planora)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "%d idazmahaia"
@@ -1207,6 +1283,31 @@ msgstr ""
 "%s: %s\n"
 "Erabili %s --help komando-lerroko komando erabilgarriak ikusteko.\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "%d antaila"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "RandR hedapena falta da \"%s\" pantailan"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Tamainaz-aldatu eta biratu hedapena (RandR) ez dago gaiturik pantaila "
+#~ "honentzat. SAiatu gaitzen eta elkarrizketa berriz irekitzen."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Huts RandR hedapena erabiltzean"
+
+#~ msgid "Second monitor"
+#~ msgstr "Bigarren monitorea"
+
+#~ msgid "Second digital display"
+#~ msgstr "Bigarren pantaila digitala"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr ""
 #~ "\"<b>%s</b>\" propietatea ezin da berrabiarazi blokeaturik dagoelako"
diff --git a/po/fi.po b/po/fi.po
index 142d2a3..83d48f2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-23 13:53+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -205,38 +206,38 @@ msgstr "PISTOKE"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Versiotiedot"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Saat ohjeita komennolla \"%s --help\"."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce:n kehitystiimi. Kaikki oikeudet pidätetään."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Ilmoita virheistä osoitteseen <%s>."
@@ -258,6 +259,7 @@ msgid "Appearance"
 msgstr "Ulkoasu"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Molemmat"
 
@@ -349,6 +351,7 @@ msgstr "Valikot ja painikkeet"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Ei mitään"
 
@@ -452,24 +455,48 @@ msgstr "Pystysuuntainen RGB"
 msgid "Vertical BGR"
 msgstr "Pystysuuntainen BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Hyväksy muutokset ja kokeile uusia näyttöasetuksia"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Versiotiedot"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Muokkaa näyttöasetuksia ja asettelua"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Näyttö"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "_Tarkkuus:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "_Tarkkuus:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "_Virkistystaajuus:"
@@ -478,93 +505,145 @@ msgstr "_Virkistystaajuus:"
 msgid "Ro_tation:"
 msgstr "_Kääntö:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Yksityiskohtainen tulostus"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Näyttö"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Vasen"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Peilikuva"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Oikea"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Molemmat vaakasuunnassa"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Pystysuuntainen RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Ruutu %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "RandR-laajennus puuttuu näytöllä \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Näytön koon muutos- ja kääntölaajennus (RandR) ei ole käytössä tällä "
-"näytöllä. Yritä ottaa se käyttöön ja käynnistää dialogi uudelleen."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "RandR-laajennuksen käyttö epäonnistui"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "RandR-laajennuksen versiota ei voi selvittää"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Hyväksy muutokset ja kokeile uusia näyttöasetuksia"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Asetukset"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Asetukset"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Järjestelmä käyttää RandR-laajennuksen versiota %d.%d. Näytön asetukset "
 "vaativat toimiakseen vähintään version 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Kannettava"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitori"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televisio"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Digitaalinäyttö"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Toinen näyttö"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Toinen digitaalinäyttö"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1124,13 +1203,11 @@ msgstr "Näppäintoiston esto ei käytössä"
 msgid "Bounce keys"
 msgstr "Näppäintoiston esto"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Käynnistä vianetsintätilassa (älä haaroita taustalle)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Työtila %d"
@@ -1190,3 +1267,28 @@ msgid ""
 msgstr ""
 "%s: %s\n"
 "Kirjoittamalla %s --help saat täyden listan komentorivivalitsimista.\n"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Ruutu %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "RandR-laajennus puuttuu näytöllä \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Näytön koon muutos- ja kääntölaajennus (RandR) ei ole käytössä tällä "
+#~ "näytöllä. Yritä ottaa se käyttöön ja käynnistää dialogi uudelleen."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "RandR-laajennuksen käyttö epäonnistui"
+
+#~ msgid "Second monitor"
+#~ msgstr "Toinen näyttö"
+
+#~ msgid "Second digital display"
+#~ msgstr "Toinen digitaalinäyttö"
diff --git a/po/fr.po b/po/fr.po
index c3038db..3ec0866 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,14 +4,16 @@
 # Maximilian Schleiss <maximilian at xfce.org>, 2008.
 # Mike Massonnet <mmassonnet at xfce.org>, 2009.
 #
+#: ../xfsettingsd/main.c:127
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-07-28 07:37+0100\n"
 "Last-Translator: Durand-Favreau Arnaud <biginoz at free.fr>\n"
 "Language-Team: French <i18n-xfce at xfce.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,7 +84,9 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "Le temps, en millisecondes, entre différentes frappes"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
 msgstr "Le temps, en millisecondes, après lequel la touche est acceptée"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
@@ -98,20 +102,32 @@ msgid "The time, in milliseconds, between repeated motion events"
 msgstr "Le temps, en millisecondes, entre différents mouvements"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
-msgstr "Le temps, en millisecondes, entre la première frappe de touche et le premier mouvement"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
+msgstr ""
+"Le temps, en millisecondes, entre la première frappe de touche et le premier "
+"mouvement"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid "The time, in milliseconds, to get to maximum speed"
 msgstr "Le temps, en millisecondes, pour atteindre la vitesse maximum"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
-msgstr "Pour éviter les frappes accidentelles, les touches lentes nécessitent qu'une touche reste enfoncée un certain temps pour qu'elle soit accepté"
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
+msgstr ""
+"Pour éviter les frappes accidentelles, les touches lentes nécessitent qu'une "
+"touche reste enfoncée un certain temps pour qu'elle soit accepté"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
-msgstr "Pour éviter les frappes accidentelles de touches, les touches répétées imposent un délai minimum entre chaque frappe"
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
+msgstr ""
+"Pour éviter les frappes accidentelles de touches, les touches répétées "
+"imposent un délai minimum entre chaque frappe"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
 msgid "Use _bounce keys"
@@ -126,20 +142,36 @@ msgid "Use slow _keys"
 msgstr "Utiliser les touches _lentes"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
-msgstr "Les touches modificatrices (comme Contrôle, Alt ou Maj) n'ont pas besoin d'être maintenues en pression pour créer une combinaison de plusieurs touches"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
+msgstr ""
+"Les touches modificatrices (comme Contrôle, Alt ou Maj) n'ont pas besoin "
+"d'être maintenues en pression pour créer une combinaison de plusieurs touches"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
-msgstr "Les touches modificatrices (comme Contrôle, Alt ou Maj) restent bloquées jusqu'à leur prochaine pression"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
+msgstr ""
+"Les touches modificatrices (comme Contrôle, Alt ou Maj) restent bloquées "
+"jusqu'à leur prochaine pression"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
-msgstr "Une fois sélectionné, les \"touches collantes\" se désactiveront à la pression simultanée de deux touches"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
+msgstr ""
+"Une fois sélectionné, les \"touches collantes\" se désactiveront à la "
+"pression simultanée de deux touches"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
-msgstr "Une fois sélectionné, le pointeur peut être contrôlé avec le pavé numérique"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
+msgstr ""
+"Une fois sélectionné, le pointeur peut être contrôlé avec le pavé numérique"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
 msgid "_Acceleration delay:"
@@ -167,61 +199,50 @@ msgstr "pixels/sec"
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:87
-#: ../dialogs/keyboard-settings/main.c:39
-#: ../dialogs/mouse-settings/main.c:100
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:100
 msgid "Settings manager socket"
 msgstr "Socket du gestionnaire de paramètres"
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:87
-#: ../dialogs/keyboard-settings/main.c:39
-#: ../dialogs/mouse-settings/main.c:100
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:100
 msgid "SOCKET ID"
 msgstr "ID SOCKET"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
-#: ../dialogs/keyboard-settings/main.c:40
-#: ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43
-#: ../xfce4-settings-helper/main.c:78
-#: ../xfce4-settings-manager/main.c:40
-#: ../xfsettingsd/main.c:52
+#: ../dialogs/display-settings/main.c:101
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
+#: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Information sur la version"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
-#: ../dialogs/mouse-settings/main.c:1186
-#: ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188
-#: ../xfce4-settings-manager/main.c:58
+#: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Tapez '%s --help' pour plus d'aide."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
-#: ../dialogs/mouse-settings/main.c:1205
-#: ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206
-#: ../xfce4-settings-manager/main.c:71
+#: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "L'équipe de développement Xfce. Tous droits réservés."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
-#: ../dialogs/mouse-settings/main.c:1206
-#: ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207
-#: ../xfce4-settings-manager/main.c:72
+#: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Veuillez envoyer vos rapports de bogues à <%s>."
@@ -231,8 +252,11 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr "Améliorer l'accessibilité du clavier et de la souris"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
-msgstr "L'anticrénelage ou lissage des polices peut améliorer le rendu du texte à l'écran"
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgstr ""
+"L'anticrénelage ou lissage des polices peut améliorer le rendu du texte à "
+"l'écran"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
@@ -240,6 +264,7 @@ msgid "Appearance"
 msgstr "Apparence"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Les deux"
 
@@ -291,8 +316,12 @@ msgid "Event sounds"
 msgstr "<b>Sons des évènements</b>"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
-msgstr "Vous pouvez améliorer le rendu des polices à l'écran en choisissant l'ordre de sous-pixellisation correct"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
+msgstr ""
+"Vous pouvez améliorer le rendu des polices à l'écran en choisissant l'ordre "
+"de sous-pixellisation correct"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
 msgid "Full"
@@ -303,12 +332,23 @@ msgid "Icons"
 msgstr "Icônes"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
-msgstr "Les raccourcis clavier des options des menus peuvent être modifiés en plaçant le pointeur au dessus de l'élément et en saisissant une nouvelle combinaison de touches"
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
+msgstr ""
+"Les raccourcis clavier des options des menus peuvent être modifiés en "
+"plaçant le pointeur au dessus de l'élément et en saisissant une nouvelle "
+"combinaison de touches"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
-msgstr "Beaucoup de polices contiennent des informations qui fournissent des indications supplémentaires pour un meilleur rendu ; sélectionner le lissage qui vous convient le mieux"
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
+msgstr ""
+"Beaucoup de polices contiennent des informations qui fournissent des "
+"indications supplémentaires pour un meilleur rendu ; sélectionner le lissage "
+"qui vous convient le mieux"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
 msgid "Medium"
@@ -321,12 +361,16 @@ msgstr "<b>Menus et boutons</b>"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Aucune"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
-msgstr "Modifiez la résolution de l'écran si les polices d'écriture apparaissent trop grande ou trop petite"
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
+msgstr ""
+"Modifiez la résolution de l'écran si les polices d'écriture apparaissent "
+"trop grande ou trop petite"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
 #, fuzzy
@@ -362,8 +406,12 @@ msgid "Specify whether icons should be displayed next to text in buttons"
 msgstr "Ajouter l'affichage d'icônes dans les boutons"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
-msgstr "Spécifie si les clics de souris et autres interventions de l'utilisateur causent des événements sonores"
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
+msgstr ""
+"Spécifie si les clics de souris et autres interventions de l'utilisateur "
+"causent des événements sonores"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
 msgid "St_yle"
@@ -378,8 +426,12 @@ msgid "Text"
 msgstr "Texte"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
-msgstr "La police d'écriture utilisée pour afficher les messages de l'interface utilisateur"
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
+msgstr ""
+"La police d'écriture utilisée pour afficher les messages de l'interface "
+"utilisateur"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
 msgid "_Fonts"
@@ -418,24 +470,48 @@ msgstr "RVB vertical"
 msgid "Vertical BGR"
 msgstr "BVR vertical"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Appliquer les changements et tester les nouveaux paramètres d'affichage"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Information sur la version"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Configurer les paramètres de l'écran et la disposition"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Affichage"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "_Résolution :"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "_Résolution :"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Taux de _rafraîchissement :"
@@ -444,85 +520,146 @@ msgstr "Taux de _rafraîchissement :"
 msgid "Ro_tation:"
 msgstr "Ro_tation :"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Sortie bavarde"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Affichage"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Gauche"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Inversé"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Droit"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Les deux horizontalement"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
-#, fuzzy, c-format
-msgid "Screen %d"
-msgstr "Écran"
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "RVB vertical"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Extension RandR manquante de l'écran \"%s\""
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
+#, c-format
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
-msgid "The Resize and Rotate extension (RandR) is not enabled on this display. Try to enable it and run the dialog again."
-msgstr "L'extension (RandR) de rotation et redimensionnement n'est pas active pour cet écran. Activez la et relancez cette fenêtre."
+#: ../dialogs/display-settings/main.c:653
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Échec à l'utilisation de l'extension RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Échec à la vérification de la version de l'extension RandR utilisée"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr ""
+"Appliquer les changements et tester les nouveaux paramètres d'affichage"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Paramétrage"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Paramétrage"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+"Ce système utilise la version %d.%d de RandR. La version 1.1 est nécessaire "
+"au fonctionnement des paramètres de l'écran."
+
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.1 is required at least"
-msgstr "Ce système utilise la version %d.%d de RandR. La version 1.1 est nécessaire au fonctionnement des paramètres de l'écran."
+msgid "The video driver does not support video outputs"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Portable"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Moniteur"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Téléviseur"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Écran digital"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Second moniteur"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Second écran digital"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -627,8 +764,12 @@ msgid "Show _blinking"
 msgstr "Afficher le _clignotement"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
-msgstr "Spécifie qui de X server ou ces paramètres prendra le contrôle de la disposition du clavier"
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
+msgstr ""
+"Spécifie qui de X server ou ces paramètres prendra le contrôle de la "
+"disposition du clavier"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
 msgid "Specify whether or not the text cursor blinks"
@@ -640,7 +781,9 @@ msgstr "Le temps, en millisecondes, entre chaque clignotement du curseur"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
 msgid "The rate at which keystrokes are generated while a key is pressed"
-msgstr "La vitesse à laquelle les frappes sont générées lorsqu'une touche est enfoncée"
+msgstr ""
+"La vitesse à laquelle les frappes sont générées lorsqu'une touche est "
+"enfoncée"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
 msgid "The time, in milliseconds, before a pressed key begins repeating"
@@ -656,7 +799,9 @@ msgid "Use this area to _test the settings above:"
 msgstr "Utilisez cette zone de saisie pour _tester les paramètres :"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
 msgstr "Appuyer et maintenir une touche imprime le même caractère sans arrêt"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
@@ -722,12 +867,18 @@ msgid "Reset to Defaults"
 msgstr "Réinitialiser aux valeurs par défaut"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:931
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
-msgstr "Voulez-vous vraiment réinitialiser tous les raccourcis à leur valeur par défaut ?"
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
+msgstr ""
+"Voulez-vous vraiment réinitialiser tous les raccourcis à leur valeur par "
+"défaut ?"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:996
 msgid "The system defaults will be restored next time you log in."
-msgstr "Les paramètres par défaut du système seront restaurés lors de votre prochaine connexion."
+msgstr ""
+"Les paramètres par défaut du système seront restaurés lors de votre "
+"prochaine connexion."
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:998
 msgid "Warning"
@@ -742,8 +893,7 @@ msgid "DEVICE NAME"
 msgstr "NOM DU PÉRIPHÉRIQUE"
 
 #. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:355
-#: ../dialogs/mouse-settings/main.c:357
+#: ../dialogs/mouse-settings/main.c:355 ../dialogs/mouse-settings/main.c:357
 #: ../dialogs/mouse-settings/main.c:417
 msgid "Default"
 msgstr "Par défaut"
@@ -800,8 +950,12 @@ msgid "Re_verse scroll direction"
 msgstr "In_verser le sens de défilement"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
-msgid "Set the acceleration and threshold for the selected device to the default values"
-msgstr "Remettre les paramètres d'accélération et de seuil à zéro pour le périphérique sélectionné"
+msgid ""
+"Set the acceleration and threshold for the selected device to the default "
+"values"
+msgstr ""
+"Remettre les paramètres d'accélération et de seuil à zéro pour le "
+"périphérique sélectionné"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
 msgid "Size"
@@ -812,28 +966,44 @@ msgid "T_hreshold:"
 msgstr "_Seuil :"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
-msgstr "Le facteur d'accélération du pointeur de la souris en fonction de son mouvement"
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
+msgstr ""
+"Le facteur d'accélération du pointeur de la souris en fonction de son "
+"mouvement"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
-msgstr "La distance maximum parcourue par la souris entre deux clics, en pixels, pour être considérés comme un double clic"
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
+msgstr ""
+"La distance maximum parcourue par la souris entre deux clics, en pixels, "
+"pour être considérés comme un double clic"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
-msgid "The number of pixels the pointer must move before a drag operation will start"
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
 msgstr "Le nombre de pixels le pointeur doit bouger avant de déplacer un objet"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
-msgstr "Le nombre de pixels le pointeur doit bouger dans un court laps de temps avant d'entamer l'accélération"
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
+msgstr ""
+"Le nombre de pixels le pointeur doit bouger dans un court laps de temps "
+"avant d'entamer l'accélération"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
 msgid "Ti_me:"
 msgstr "_Temps :"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
-msgstr "Le temps maximum entre deux clics (en millisecondes) pour être considérés comme un double clic"
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
+msgstr ""
+"Le temps maximum entre deux clics (en millisecondes) pour être considérés "
+"comme un double clic"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
 msgid "When selected, the scroll wheel will work in the opposite direction"
@@ -902,7 +1072,9 @@ msgstr "Réinitialiser"
 #: ../xfce4-settings-editor/main_window.c:924
 #, fuzzy
 msgid "Resetting a property will permanently remove those custom settings."
-msgstr "Réinitialiser la propriété effacera de manière permanente les modifications apportées."
+msgstr ""
+"Réinitialiser la propriété effacera de manière permanente les modifications "
+"apportées."
 
 #: ../xfce4-settings-editor/main_window.c:925
 #, fuzzy, c-format
@@ -921,13 +1093,19 @@ msgstr "L'élément à la racine ('/') n'est pas un nom de propriété valide"
 
 #: ../xfce4-settings-editor/main_window.c:1004
 #, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
-msgstr "Les noms des propriétés ne peuvent contenir que des caractères ASCII parmisA-Z, a-z, 0-9, '_', '-', '<' et '>', ainsi que '/' comme séparateur"
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Les noms des propriétés ne peuvent contenir que des caractères ASCII parmisA-"
+"Z, a-z, 0-9, '_', '-', '<' et '>', ainsi que '/' comme séparateur"
 
 #: ../xfce4-settings-editor/main_window.c:1013
 #, c-format
 msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Les noms de propriétés ne peuvent pas contenir plusieurs caractères '/' consécutifs"
+msgstr ""
+"Les noms de propriétés ne peuvent pas contenir plusieurs caractères '/' "
+"consécutifs"
 
 #: ../xfce4-settings-editor/main_window.c:1024
 #, c-format
@@ -941,7 +1119,9 @@ msgstr "_Réinitialiser"
 #: ../xfce4-settings-editor/main_window.c:1077
 #, fuzzy
 msgid "Resetting a channel will permanently remove those custom settings."
-msgstr "Réinitialiser le canal effacera de manière permanente les modifications apportées."
+msgstr ""
+"Réinitialiser le canal effacera de manière permanente les modifications "
+"apportées."
 
 #: ../xfce4-settings-editor/main_window.c:1078
 #, fuzzy, c-format
@@ -1067,14 +1247,11 @@ msgstr "Les touches répétées sont désactivées"
 msgid "Bounce keys"
 msgstr "Touches répétées"
 
-#: ../xfce4-settings-helper/main.c:79
-#: ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Démarrer en mode débogue (ne pas se mettre en arrière-plan)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Espace de travail %d"
@@ -1134,7 +1311,34 @@ msgid ""
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s : %s\n"
-"Essayez %s --help pour afficher une liste complète des options de ligne de commande.\n"
+"Essayez %s --help pour afficher une liste complète des options de ligne de "
+"commande.\n"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#, fuzzy
+#~ msgid "Screen %d"
+#~ msgstr "Écran"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Extension RandR manquante de l'écran \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "L'extension (RandR) de rotation et redimensionnement n'est pas active "
+#~ "pour cet écran. Activez la et relancez cette fenêtre."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Échec à l'utilisation de l'extension RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Second moniteur"
+
+#~ msgid "Second digital display"
+#~ msgstr "Second écran digital"
 
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr ""
diff --git a/po/gl.po b/po/gl.po
index bb5d210..e915f6b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2009-12-18 12:44+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -219,38 +220,38 @@ msgstr "ID SOCKET"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Información da versión"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Introduza '%s --help' para ver como se usa."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "O equipo de desenvolvemento de Xfce. Tódolos dereitos reservados."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Por favor comuníquelle os erros a <%s>."
@@ -270,6 +271,7 @@ msgid "Appearance"
 msgstr "Aparencia"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Ambos"
 
@@ -360,6 +362,7 @@ msgstr "Menús e botóns"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Ningún"
 
@@ -467,24 +470,48 @@ msgstr "RGB vertical"
 msgid "Vertical BGR"
 msgstr "BGR vertical"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Aplicar os cambios e probar a nova configuración de visualización"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Información da versión"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Configurar as opcións e a disposición da pantalla"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Pantalla"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "R_esolución:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "R_esolución:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "_Frecuencia de actualización:"
@@ -493,94 +520,146 @@ msgstr "_Frecuencia de actualización:"
 msgid "Ro_tation:"
 msgstr "Ro_tación:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Saída detallada"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Pantalla"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Invertido"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Dereita"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Ambos horizontais"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "RGB vertical"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Pantalla %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Falta a extensión RandT na pantalla \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"A extensión Resize and Rotate extension (RandR) non está activada nesta "
-"pantalla. Intente activala e execute o diálogo de novo."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Non se conseguiu usar a extensión RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr ""
 "Non foi posible consultar a versión da extensión RandR que se está a usar"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Aplicar os cambios e probar a nova configuración de visualización"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Configuración"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Configuración"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Este sistema usa RandR %d.%d. Para que funcionen as opcións de pantalla "
 "requírese polo menos a versión 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Portátil"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televisión"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Pantalla dixital"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Segundo monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Segunda pantalla dixital"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1153,14 +1232,12 @@ msgstr ""
 msgid "Bounce keys"
 msgstr ""
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr ""
 "Iniciar en modo depuración (non crear un proceso fillo en segundo plano)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Espazo de traballo %d"
@@ -1222,6 +1299,31 @@ msgstr ""
 "Execute '%s --help' para ver unha lista completa das opcións dispoñibles.\n"
 "\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Pantalla %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Falta a extensión RandT na pantalla \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "A extensión Resize and Rotate extension (RandR) non está activada nesta "
+#~ "pantalla. Intente activala e execute o diálogo de novo."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Non se conseguiu usar a extensión RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Segundo monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Segunda pantalla dixital"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr ""
 #~ "Non se pode restablecer a propiedade \"<b>%s</b>\" porque está bloqueada"
diff --git a/po/hr.po b/po/hr.po
index 1f7b0c4..8a90c03 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,18 +3,21 @@
 # This file is distributed under the same license as the xfce-settings package.
 #  Ivica Kolić<ikoli at yahoo.com>, 2010.
 #  Ivica Kolić<ikoli at yahoo.com> <>, 2010.
+#: ../xfsettingsd/main.c:127
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 22:06+0000\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-06-05 17:46+0200\n"
 "Last-Translator: Ivica Kolić<ikoli at yahoo.com> <>\n"
 "Language-Team: Croatian <>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid "Acceleration _profile:"
@@ -78,8 +81,11 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "Vrijeme,u milisekundama potrebno između pritisaka tipke"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
-msgstr "Vrijeme,u milisekundama,koje mora proći da pritisak tipke bude prihvaćen"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
+msgstr ""
+"Vrijeme,u milisekundama,koje mora proći da pritisak tipke bude prihvaćen"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid "The maximum pointer speed after acceleration"
@@ -94,7 +100,9 @@ msgid "The time, in milliseconds, between repeated motion events"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
@@ -102,11 +110,15 @@ msgid "The time, in milliseconds, to get to maximum speed"
 msgstr "vrijeme,u milisekundama, za postizanje maksimalne brzine"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
@@ -122,19 +134,28 @@ msgid "Use slow _keys"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
@@ -175,38 +196,38 @@ msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Inforemacija o verziji"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce razvojni tim.Sva prava pridržana."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Prijavite probleme u <%s>."
@@ -216,7 +237,8 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr "Poboljšajte pristupačnost tipkovnice i miša"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
@@ -225,6 +247,7 @@ msgid "Appearance"
 msgstr "Izgled"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Oboje"
 
@@ -267,14 +290,18 @@ msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
-msgstr "Omogući ili onemogući zvukove događaja globalno(zahtjeva \"Canberra\" podršku)"
+msgstr ""
+"Omogući ili onemogući zvukove događaja globalno(zahtjeva \"Canberra\" "
+"podršku)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
 msgid "Event sounds"
 msgstr "Zvukovi događaja"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
@@ -286,11 +313,16 @@ msgid "Icons"
 msgstr "Ikone"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
@@ -303,11 +335,13 @@ msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Nijedan"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
@@ -343,7 +377,9 @@ msgid "Specify whether icons should be displayed next to text in buttons"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
@@ -359,7 +395,9 @@ msgid "Text"
 msgstr "Tekst"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
@@ -398,24 +436,48 @@ msgstr "Okomito RGB"
 msgid "Vertical BGR"
 msgstr "Okomito BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Primjeni promjene i testiraj nove postavke zaslona"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Inforemacija o verziji"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Konfigurirajte postavke i raspored ekrana"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Zaslon"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "R_ezolucija"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "R_ezolucija"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr ""
@@ -424,85 +486,142 @@ msgstr ""
 msgid "Ro_tation:"
 msgstr "_Rotacija:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+msgid "_Use this output"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Zaslon"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normalno"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Lijevo"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Obrnuto"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Desno"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Oboje vodoravno"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Okomito RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Ekran %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
+msgid "%.1f Hz"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
-msgid "The Resize and Rotate extension (RandR) is not enabled on this display. Try to enable it and run the dialog again."
+#: ../dialogs/display-settings/main.c:653
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Nisam uspio iskoristiti RandR produženje"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr ""
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Primjeni promjene i testiraj nove postavke zaslona"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Postavke"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Postavke"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, c-format
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.1 is required at least"
+msgid "The video driver does not support video outputs"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Laptop"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televizor"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Digitalni zaslon"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Drugi monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Drugi digitalni zaslon"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -604,7 +723,9 @@ msgid "Show _blinking"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
@@ -632,7 +753,9 @@ msgid "Use this area to _test the settings above:"
 msgstr "Koristite ovo područje za _test gornjih postavki"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
@@ -698,7 +821,9 @@ msgid "Reset to Defaults"
 msgstr "Vrati na zadano"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:931
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:996
@@ -770,7 +895,9 @@ msgid "Re_verse scroll direction"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
-msgid "Set the acceleration and threshold for the selected device to the default values"
+msgid ""
+"Set the acceleration and threshold for the selected device to the default "
+"values"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
@@ -782,19 +909,25 @@ msgid "T_hreshold:"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
-msgid "The number of pixels the pointer must move before a drag operation will start"
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
@@ -802,7 +935,9 @@ msgid "Ti_me:"
 msgstr "Vr_ijeme:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
@@ -889,7 +1024,9 @@ msgstr ""
 
 #: ../xfce4-settings-editor/main_window.c:1004
 #, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
 msgstr ""
 
 #: ../xfce4-settings-editor/main_window.c:1013
@@ -1028,13 +1165,11 @@ msgstr ""
 msgid "Bounce keys"
 msgstr ""
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr ""
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr ""
@@ -1092,3 +1227,18 @@ msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Ekran %d"
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Nisam uspio iskoristiti RandR produženje"
+
+#~ msgid "Second monitor"
+#~ msgstr "Drugi monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Drugi digitalni zaslon"
diff --git a/po/hu.po b/po/hu.po
index c1786b5..cc8a55c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-02-05 22:30+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -212,38 +213,38 @@ msgstr "FOGLALATAZONOSÍTÓ"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Verzióinformációk"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Segítségért adja ki az „%s --help” parancsot."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Az Xfce fejlesztőcsapata. Minden jog fenntartva."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "A hibákat ide jelentse: <%s>."
@@ -263,6 +264,7 @@ msgid "Appearance"
 msgstr "Megjelenés"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Mindkettő"
 
@@ -357,6 +359,7 @@ msgstr "Menük és gombok"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Nincs"
 
@@ -463,24 +466,48 @@ msgstr "Függőleges RGB"
 msgid "Vertical BGR"
 msgstr "Függőleges BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Minden módosítás alkalmazása és az új képernyő-beállítások tesztelése"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Verzióinformációk"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Képernyő-beállítások és -elrendezés megadása"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Képernyő"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "_Felbontás:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "_Felbontás:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "F_rissítési sebesség:"
@@ -489,93 +516,145 @@ msgstr "F_rissítési sebesség:"
 msgid "Ro_tation:"
 msgstr "Elf_orgatás:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Részletes kimenet"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Képernyő"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normál"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Balra"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Fordított"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Jobbra"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Mindkettő vízszintesen"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Függőleges RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "%d. képernyő"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "A RandR kiterjesztés hiányzik ezen a képernyőn: „%s”"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"A forgatás és átméretezés (RandR) kiterjesztés nincs engedélyezve ezen a "
-"képernyőn. Próbálja meg engedélyezni és indítsa újra ezt az ablakot."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "A RandR kiterjesztés használata meghiúsult"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Nem kérdezhető le a használt RandR kiterjesztés verziója"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Minden módosítás alkalmazása és az új képernyő-beállítások tesztelése"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Beállítások"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Beállítások"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Ez a rendszer a RandR %d.%d verzióját használja. A képernyő-beállítások "
 "működéséhez legalább az 1.1 verzió szükséges"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Noteszgép"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televízió"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Digitális kijelző"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Második monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Második digitális kijelző"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1139,13 +1218,11 @@ msgstr "A billentyűszűrés letiltva"
 msgid "Bounce keys"
 msgstr "Billentyűszűrés"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Indítás hibakereső módban (ne indítsa a háttérben)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "%d. munkaterület"
@@ -1205,3 +1282,28 @@ msgid ""
 msgstr ""
 "%s: %s\n"
 "Az elérhető kapcsolók listájáért adja ki az %s --help parancsot.\n"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "%d. képernyő"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "A RandR kiterjesztés hiányzik ezen a képernyőn: „%s”"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "A forgatás és átméretezés (RandR) kiterjesztés nincs engedélyezve ezen a "
+#~ "képernyőn. Próbálja meg engedélyezni és indítsa újra ezt az ablakot."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "A RandR kiterjesztés használata meghiúsult"
+
+#~ msgid "Second monitor"
+#~ msgstr "Második monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Második digitális kijelző"
diff --git a/po/id.po b/po/id.po
index 5aba274..2aad210 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-06-26 09:43-0400\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -210,38 +211,38 @@ msgstr "ID SOKET"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Informasi versi"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Ketikkan '%s --help' untuk bantuan."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Tim pengembang Xfce. Hak cipta dilindungi undang-undang."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Silakan laporkan kutu ke <%s>."
@@ -262,6 +263,7 @@ msgid "Appearance"
 msgstr "Tampilan"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Keduanya"
 
@@ -357,6 +359,7 @@ msgstr "Menu dan Tombol"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Tak Ada"
 
@@ -463,24 +466,49 @@ msgstr "RGB Vertikal"
 msgid "Vertical BGR"
 msgstr "BGR Vertikal"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Terapkan perubahan apapun dan uji pengaturan tampilan baru"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Informasi versi"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+#, fuzzy
+msgid "Keep this configuration"
+msgstr "Jaga aksi manajer jendela"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Atur pengaturan layar dan tata letak"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Tampilan"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "R_esolusi"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "R_esolusi"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Kecepatan pen_yegaran:"
@@ -489,93 +517,145 @@ msgstr "Kecepatan pen_yegaran:"
 msgid "Ro_tation:"
 msgstr "Ro_tasi:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Gunakan aksi ini"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Pengaturan Tampilan"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Kiri"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Terbalik"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Kanan"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Keduanya Horisontal"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "RGB Vertikal"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Layar %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Ekstensi RandR hilang pada tampilan \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Ekstensi Resize and Rotate (RandR) tidak diaktifkan pada tampilan ini. Coba "
-"mengaktifkannya dan menjalankan dialog lagi."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Gagal menggunakan ekstensi RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Tak dapat kueri versi dari ekstensi RandR yang digunakan"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Pengaturan Tampilan Xfce 4"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Pengaturan"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Pengaturan"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Sistem ini menggunakan RandR %d.%d. Agar pengaturan tampilan bekerja "
 "setidaknya versi 1.1 diperlukan"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Laptop"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televisi"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Tampilan digital"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Monitor kedua"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Tampilan digital kedua"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -973,8 +1053,8 @@ msgstr "Atur Ulang"
 
 #: ../xfce4-settings-editor/main_window.c:924
 msgid "Resetting a property will permanently remove those custom settings."
-msgstr "Mengatur ulang properti akan secara permanen menghapus pengaturan "
-"suainya."
+msgstr ""
+"Mengatur ulang properti akan secara permanen menghapus pengaturan suainya."
 
 #: ../xfce4-settings-editor/main_window.c:925
 #, c-format
@@ -997,14 +1077,14 @@ msgid ""
 "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
 "'-', '<' and '>', as well as '/' as a separator"
 msgstr ""
-"Nama properti hanya termasuk karakter ASCII A-Z, a-z, 0-9, '_', '-', "
-"'<' dan '>', begitu juga '/' sebagai pemisah"
+"Nama properti hanya termasuk karakter ASCII A-Z, a-z, 0-9, '_', '-', '<' dan "
+"'>', begitu juga '/' sebagai pemisah"
 
 #: ../xfce4-settings-editor/main_window.c:1013
 #, c-format
 msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Nama properti tak dapat berisi dua atau lebih karakter '/' yang "
-"berurutan"
+msgstr ""
+"Nama properti tak dapat berisi dua atau lebih karakter '/' yang berurutan"
 
 #: ../xfce4-settings-editor/main_window.c:1024
 #, c-format
@@ -1017,14 +1097,14 @@ msgstr "_Atur Ulang"
 
 #: ../xfce4-settings-editor/main_window.c:1077
 msgid "Resetting a channel will permanently remove those custom settings."
-msgstr "Mengatur ulang kanal akan secara permanen menghapus pengaturan "
-"suainya."
+msgstr ""
+"Mengatur ulang kanal akan secara permanen menghapus pengaturan suainya."
 
 #: ../xfce4-settings-editor/main_window.c:1078
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
-msgstr "Apakah anda yakin ingin mengatur ulang kanal \"%s\"? dan semua "
-"propertinya?"
+msgstr ""
+"Apakah anda yakin ingin mengatur ulang kanal \"%s\"? dan semua propertinya?"
 
 #: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
 msgid "Graphical settings editor for Xfconf"
@@ -1139,13 +1219,11 @@ msgstr "Tombol pantul dinonaktifkan"
 msgid "Bounce keys"
 msgstr "Tombol pantul"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Mulai dalam mode awakutu (jangan cabangkan di latar belakang)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Ruang kerja %d"
@@ -1207,6 +1285,34 @@ msgstr ""
 "Coba %s --help untuk melihat senarai penuh opsi baris perintah yang "
 "tersedia.\n"
 
+#~ msgid "Apply any changes and test the new display settings"
+#~ msgstr "Terapkan perubahan apapun dan uji pengaturan tampilan baru"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Layar %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Ekstensi RandR hilang pada tampilan \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Ekstensi Resize and Rotate (RandR) tidak diaktifkan pada tampilan ini. "
+#~ "Coba mengaktifkannya dan menjalankan dialog lagi."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Gagal menggunakan ekstensi RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Monitor kedua"
+
+#~ msgid "Second digital display"
+#~ msgstr "Tampilan digital kedua"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "Properti \"<b>%s</b>\" tak dapat diatur ulang karena terkunci"
 
@@ -1343,12 +1449,6 @@ msgstr ""
 #~ msgid "Xfce 4 Appearance Settings"
 #~ msgstr "Pengaturan Tampilan Xfce 4"
 
-#~ msgid "Display Settings"
-#~ msgstr "Pengaturan Tampilan"
-
-#~ msgid "Xfce 4 Display Settings"
-#~ msgstr "Pengaturan Tampilan Xfce 4"
-
 #~ msgid "<b>Application Shortcuts</b>"
 #~ msgstr "<b>Jalan Pintas Aplikasi</b>"
 
@@ -1393,9 +1493,6 @@ msgstr ""
 #~ "Jalan pintas ini telah digunakan oleh <b>aksi manajer jendela lain</b>. "
 #~ "Aksi mana yang ingin anda gunakan?"
 
-#~ msgid "Use this action"
-#~ msgstr "Gunakan aksi ini"
-
 #~ msgid "Keep the other one"
 #~ msgstr "Biarkan yang satunya lagi"
 
@@ -1419,9 +1516,6 @@ msgstr ""
 #~ "Jalan pintas telah digunakan oleh <b>aksi manajer jendela</b>. Aksi mana "
 #~ "yang ingin anda gunakan?"
 
-#~ msgid "Keep the window manager action"
-#~ msgstr "Jaga aksi manajer jendela"
-
 #~ msgid "Conflicting actions for %s"
 #~ msgstr "Aksi konflik untuk %s"
 
diff --git a/po/is.po b/po/is.po
index 428e132..46d2dca 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,81 +1,431 @@
 # translation of xfce4-settings.master.xfce4-settings.po to Icelandic
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
+#: ../xfsettingsd/main.c:127
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings.master.xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-14 23:15+0200\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-05-03 09:54+0000\n"
 "Last-Translator: Sveinn í Felli <sveinki at nett.is>\n"
 "Language-Team: Icelandic <rglug at rglug.org>\n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
+msgid "Acceleration _profile:"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2
+msgid "Acceleration _time:"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:3
+msgid "Acceptance _delay:"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:4
+#: ../dialogs/accessibility-settings/xfce4-accessibility-settings.desktop.in.h:1
+msgid "Accessibility"
+msgstr "Aðgengi"
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:5
+#, fuzzy
+msgid "Bounce Keys"
+msgstr "Skoppandi lyklar"
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:6
+msgid "Configure keyboard and mouse accessibility"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7
+msgid "Disable sticky keys if _two keys are pressed"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
+msgid "K_eystroke delay:"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
+#, fuzzy
+msgid "Keyboa_rd"
+msgstr "Lyklaborð"
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
+msgid "Maximum _speed:"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
+msgid "Mouse Emulation"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
+msgid "R_epeat interval:"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
+#, fuzzy
+msgid "Slow Keys"
+msgstr "Hægir lyklar"
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:14
+#, fuzzy
+msgid "Sticky Keys"
+msgstr "Klístraðir lyklar"
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15
+msgid "The amount of time, in milliseconds, required between keystrokes"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
+msgid "The maximum pointer speed after acceleration"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
+msgid "The ramp used to reach maximum pointer speed"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
+msgid "The time, in milliseconds, between repeated motion events"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
+msgid "The time, in milliseconds, to get to maximum speed"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
+#, fuzzy
+msgid "Use _bounce keys"
+msgstr "Skoppandi lyklar"
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25
+#, fuzzy
+msgid "Use _sticky keys"
+msgstr "Klístraðir lyklar"
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:26
+#, fuzzy
+msgid "Use slow _keys"
+msgstr "Hægir lyklar"
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
+msgid "_Acceleration delay:"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:32
+#, fuzzy
+msgid "_Lock sticky keys"
+msgstr "Klístraðir lyklar"
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:33
+#, fuzzy
+msgid "_Mouse"
+msgstr "Mús"
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:34
+msgid "_Use mouse emulation"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:35
+msgid "msec"
+msgstr ""
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:36
+msgid "pixels/sec"
+msgstr ""
+
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:87
-#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:96
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:100
 msgid "Settings manager socket"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:87
-#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:96
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:100
 msgid "SOCKET ID"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
-#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:97
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:77
+#: ../dialogs/display-settings/main.c:101
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
-#: ../dialogs/mouse-settings/main.c:1182 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:245 ../xfce4-settings-manager/main.c:58
+#: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
-#: ../dialogs/mouse-settings/main.c:1201 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:263 ../xfce4-settings-manager/main.c:71
+#: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
-#: ../dialogs/mouse-settings/main.c:1202 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:264 ../xfce4-settings-manager/main.c:72
+#: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr ""
 
-#: ../dialogs/accessibility-settings/xfce4-accessibility-settings.desktop.in.h:1
-msgid "Accessibility"
-msgstr "Aðgengi"
-
 #: ../dialogs/accessibility-settings/xfce4-accessibility-settings.desktop.in.h:2
 msgid "Improve keyboard and mouse accessibility"
 msgstr ""
 
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
+#: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
+msgid "Appearance"
+msgstr "Útlit"
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
+msgid "Both"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:4
+msgid "Both Horizontal"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:5
+msgid "Custom _DPI setting:"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:6
+#: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:2
+msgid "Customize the look of your desktop"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:7
+msgid "DPI"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:8
+#, fuzzy
+msgid "Default Fon_t"
+msgstr "Sjálfgefið"
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:9
+msgid "Enable _anti-aliasing"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:10
+msgid "Enable _event sounds"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:11
+msgid "Enable e_ditable accelerators"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:12
+msgid "Enable i_nput feedback sounds"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
+msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
+msgid "Event sounds"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
+msgid "Full"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:17
+msgid "Icons"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
+msgid "Medium"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:21
+msgid "Menus and Buttons"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Ekkert"
 
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
+msgid "Rendering"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:25
+msgid "Select a default font"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:26
+msgid "Show images in _menus"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:27
+msgid "Show images on _buttons"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:28
+#, fuzzy
+msgid "Slight"
+msgstr "Hægri"
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:29
+msgid "Specify what should be displayed in toolbar items"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:30
+msgid "Specify whether icons should be displayed next to items in menus"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:31
+msgid "Specify whether icons should be displayed next to text in buttons"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
+msgid "St_yle"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:34
+msgid "Sub-_pixel order:"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:35
+msgid "Text"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
+msgid "_Fonts"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:38
+msgid "_Hinting:"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:39
+msgid "_Icons"
+msgstr ""
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:40
+#, fuzzy
+msgid "_Settings"
+msgstr "Stillingar"
+
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:41
+msgid "_Toolbar Style"
+msgstr ""
+
 #: ../dialogs/appearance-settings/main.c:674
 msgid "RGB"
 msgstr "RGB"
@@ -92,103 +442,190 @@ msgstr "Lóðrétt RGB"
 msgid "Vertical BGR"
 msgstr "Lóðrétt BGR"
 
-#: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
-msgid "Appearance"
-msgstr "Útlit"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:2
-msgid "Customize the look of your desktop"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+msgid "Confirmation"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
+#: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
+msgid "Configure screen settings and layout"
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
+#, fuzzy
+msgid "Display"
+msgstr "Skjár"
+
+#: ../dialogs/display-settings/display-dialog.glade.h:3
+msgid "R_esolution:"
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+msgid "Ref_lection:"
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:5
+msgid "Refresh _rate:"
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:6
+msgid "Ro_tation:"
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+msgid "_Use this output"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Skjár"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Venjulegt"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Vinstri"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Viðsnúið"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Hægri"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+msgid "Horizontal"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Lóðrétt RGB"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Skjár %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
+msgid "%.1f Hz"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
-msgid "The Resize and Rotate extension (RandR) is not enabled on this display. Try to enable it and run the dialog again."
+#: ../dialogs/display-settings/main.c:653
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:716
-msgid "Failed to use the RandR extension"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr ""
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+msgid "Unable to start the Xfce Display Settings"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Stillingar"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Stillingar"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, c-format
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.1 is required at least"
+msgid "The video driver does not support video outputs"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Fartölva"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Skjár"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Sjónvarp"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Stafrænn skjár"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr ""
-
-#: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
-msgid "Configure screen settings and layout"
-msgstr ""
-
-#: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
-#, fuzzy
-msgid "Display"
-msgstr "Skjár"
-
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
 msgid "Shortcut Command"
@@ -239,6 +676,123 @@ msgstr ""
 msgid "Shell Scripts"
 msgstr ""
 
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:1
+msgid "Appli_cation Shortcuts"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:2
+msgid "Be_havior"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:3
+msgid "Blink _delay:"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:4
+msgid "Cursor"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5
+msgid "Define _shortcuts for launching applications:"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1
+msgid "Edit keyboard settings and application shortcuts"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2
+#, fuzzy
+msgid "Keyboard"
+msgstr "Lyklaborð"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Lyklaborð"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
+msgid "Keyboard layout selection"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Lyklaborð"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
+msgid "Repeat _speed:"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
+msgid "Select keyboard layout and variant"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
+msgid "Show _blinking"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
+msgid "Specify whether or not the text cursor blinks"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16
+msgid "The delay, in milliseconds, between successive blinks of the cursor"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
+msgid "The rate at which keystrokes are generated while a key is pressed"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
+msgid "The time, in milliseconds, before a pressed key begins repeating"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
+#, fuzzy
+msgid "Typing Settings"
+msgstr "Stillingar"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
+msgid "Use this area to _test the settings above:"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
+msgid "_Enable key repeat"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23
+#, fuzzy
+msgid "_Layout"
+msgstr "Útlit"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
+msgid "_Repeat delay:"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25
+#, fuzzy
+msgid "_Reset to Defaults"
+msgstr "Endurvekja sjálfgefnar stillingar"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26
+#, fuzzy
+msgid "_Use system defaults"
+msgstr "Endurvekja sjálfgefnar stillingar"
+
 #: ../dialogs/keyboard-settings/main.c:70
 msgid "Unable to initialize GTK+."
 msgstr ""
@@ -262,116 +816,271 @@ msgstr "Skipun"
 msgid "Shortcut"
 msgstr "Flýtilykill"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:359
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:363
 #, fuzzy
 msgid "Active"
 msgstr "Virkt"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:363
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:367
 #, fuzzy
 msgid "Layout"
 msgstr "Útlit"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:364
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:368
 #, fuzzy
 msgid "Variant"
 msgstr "Tilbrigði"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:808
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:822
 msgid "Shortcut command may not be empty."
 msgstr ""
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:915
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:916
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:929
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:930
 #, fuzzy
 msgid "Reset to Defaults"
 msgstr "Endurvekja sjálfgefnar stillingar"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:917
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:931
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
 msgstr ""
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:982
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:996
 msgid "The system defaults will be restored next time you log in."
 msgstr ""
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:984
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:998
 #, fuzzy
 msgid "Warning"
 msgstr "Aðvörun"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1
-msgid "Edit keyboard settings and application shortcuts"
-msgstr ""
-
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2
-#, fuzzy
-msgid "Keyboard"
-msgstr "Lyklaborð"
-
-#: ../dialogs/mouse-settings/main.c:95
+#: ../dialogs/mouse-settings/main.c:99
 msgid "Active device in the dialog"
 msgstr ""
 
-#: ../dialogs/mouse-settings/main.c:95
+#: ../dialogs/mouse-settings/main.c:99
 msgid "DEVICE NAME"
 msgstr ""
 
 #. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:351 ../dialogs/mouse-settings/main.c:353
-#: ../dialogs/mouse-settings/main.c:413
+#: ../dialogs/mouse-settings/main.c:355 ../dialogs/mouse-settings/main.c:357
+#: ../dialogs/mouse-settings/main.c:417
 #, fuzzy
 msgid "Default"
 msgstr "Sjálfgefið"
 
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
+msgid "Button Order"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:1
 msgid "Configure pointer device behavior and appearance"
 msgstr ""
 
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
+msgid "Cursor _Size:"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
+msgid "De_vices"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
+msgid "Double Click"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
+msgid "Drag and Drop"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
+msgid "Feedback"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:2
 #, fuzzy
 msgid "Mouse"
 msgstr "Mús"
 
-#: ../xfce4-settings-editor/main_window.c:122
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
+msgid "Preview"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
+#, fuzzy
+msgid "Re_set to Defaults"
+msgstr "Endurvekja sjálfgefnar stillingar"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
+msgid "Re_verse scroll direction"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
+msgid ""
+"Set the acceleration and threshold for the selected device to the default "
+"values"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
+msgid "Size"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
+msgid "T_hreshold:"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
+msgid "Ti_me:"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
+msgid "When selected, the scroll wheel will work in the opposite direction"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
+msgid "_Acceleration:"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
+msgid "_Behavior"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
+msgid "_Distance:"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
+msgid "_Left handed"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
+msgid "_Right handed"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
+msgid "_Theme"
+msgstr ""
+
+#: ../xfce4-settings-editor/main_window.c:157
 #, fuzzy
 msgid "Channel"
 msgstr "Rás"
 
-#: ../xfce4-settings-editor/main_window.c:132
+#: ../xfce4-settings-editor/main_window.c:170
 #, fuzzy
 msgid "Property"
 msgstr "Eiginleiki"
 
-#: ../xfce4-settings-editor/main_window.c:135
+#: ../xfce4-settings-editor/main_window.c:173
 #, fuzzy
 msgid "Type"
 msgstr "Tegund"
 
-#: ../xfce4-settings-editor/main_window.c:138
+#: ../xfce4-settings-editor/main_window.c:176
 #, fuzzy
 msgid "Locked"
 msgstr "Læst"
 
-#: ../xfce4-settings-editor/main_window.c:141
+#: ../xfce4-settings-editor/main_window.c:179
 #, fuzzy
 msgid "Value"
 msgstr "Gildi"
 
-#: ../xfce4-settings-editor/main_window.c:303
-#: ../xfce4-settings-editor/main_window.c:368
+#: ../xfce4-settings-editor/main_window.c:306
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
 #, fuzzy
 msgid "Empty"
 msgstr "Tómt"
 
-#: ../xfce4-settings-editor/main_window.c:650
+#: ../xfce4-settings-editor/main_window.c:696
+#: ../xfce4-settings-editor/main_window.c:888
+msgid "This property name is not valid."
+msgstr ""
+
+#: ../xfce4-settings-editor/main_window.c:923
+#: ../xfce4-settings-editor/main_window.c:1076
+msgid "Reset"
+msgstr ""
+
+#: ../xfce4-settings-editor/main_window.c:924
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr ""
+
+#: ../xfce4-settings-editor/main_window.c:925
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr ""
+
+#: ../xfce4-settings-editor/main_window.c:981
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr ""
+
+#: ../xfce4-settings-editor/main_window.c:990
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr ""
+
+#: ../xfce4-settings-editor/main_window.c:1004
 #, c-format
-msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+
+#: ../xfce4-settings-editor/main_window.c:1013
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr ""
+
+#: ../xfce4-settings-editor/main_window.c:1024
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr ""
+
+#: ../xfce4-settings-editor/main_window.c:1043
+msgid "_Reset"
+msgstr ""
+
+#: ../xfce4-settings-editor/main_window.c:1077
+msgid "Resetting a channel will permanently remove those custom settings."
 msgstr ""
 
-#: ../xfce4-settings-editor/main_window.c:660
+#: ../xfce4-settings-editor/main_window.c:1078
 #, c-format
-msgid "Are you sure you want to reset property \"<b>%s</b>\"?"
+msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr ""
 
 #: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
@@ -380,9 +1089,85 @@ msgid "Graphical settings editor for Xfconf"
 msgstr "Grafískur stillingastjóri fyrir Xfconf"
 
 #: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
 msgid "Settings Editor"
 msgstr ""
 
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
+msgid "Boolean"
+msgstr ""
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
+#, fuzzy
+msgid "Customize settings stored by Xfconf"
+msgstr "Grafískur stillingastjóri fyrir Xfconf"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
+msgid "Double"
+msgstr ""
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
+#, fuzzy
+msgid "Edit Property"
+msgstr "Eiginleiki"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
+#, fuzzy
+msgid "Edit property"
+msgstr "Eiginleiki"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
+msgid "Enabled"
+msgstr ""
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+msgid "Int"
+msgstr ""
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+msgid "Int64"
+msgstr ""
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
+msgid "Name:"
+msgstr ""
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
+#, fuzzy
+msgid "New property"
+msgstr "Eiginleiki"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
+#, fuzzy
+msgid "Reset property"
+msgstr "Eiginleiki"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
+msgid "String"
+msgstr ""
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
+#, fuzzy
+msgid "Type:"
+msgstr "Tegund"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
+msgid "Unsigned Int"
+msgstr ""
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
+msgid "Unsigned Int64"
+msgstr ""
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
+#, fuzzy
+msgid "Value:"
+msgstr "Gildi"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
+msgid "Xfconf channels"
+msgstr ""
+
 #: ../xfce4-settings-helper/accessibility.c:356
 msgid "Sticky keys are enabled"
 msgstr ""
@@ -422,14 +1207,12 @@ msgstr ""
 msgid "Bounce keys"
 msgstr "Skoppandi lyklar"
 
-#: ../xfce4-settings-helper/main.c:78 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr ""
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
-#, c-format, fuzzy
+#: ../xfce4-settings-helper/workspaces.c:355
+#, fuzzy, c-format
 msgid "Workspace %d"
 msgstr "Vinnusvæði %d"
 
@@ -487,3 +1270,9 @@ msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Skjár %d"
diff --git a/po/it.po b/po/it.po
index dad32a0..b57fd2a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,11 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-31 10:45+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
 "Language-Team: Italian Translation Team <xfce-it-translators at googlegroups."
 "com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -241,38 +242,38 @@ msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Informazioni di versione"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Digitare \"%s --help\" per le modalità d'uso"
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Il gruppo di sviluppo di Xfce. Tutti i diritti riservati."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Segnalare i problemi a <%s>."
@@ -295,6 +296,7 @@ msgid "Appearance"
 msgstr "Aspetto"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Entrambi"
 
@@ -394,6 +396,7 @@ msgstr "Menu e pulsanti"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Nessuno"
 
@@ -511,24 +514,48 @@ msgstr "RGB verticale"
 msgid "Vertical BGR"
 msgstr "BGR verticale"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Applica i cambiamenti e prova le nuove impostazioni dello schermo"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Informazioni di versione"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Configurazione delle impostazioni e della disposizione dello schermo"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Schermo"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "Risoluzion_e:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "Risoluzion_e:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "F_requenza di aggiornamento:"
@@ -537,95 +564,147 @@ msgstr "F_requenza di aggiornamento:"
 msgid "Ro_tation:"
 msgstr "Ro_tazione:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Output prolisso"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Schermo"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normale"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Sinistra"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Invertito"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Destra"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Entrambi orizzontali"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "RGB verticale"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Schermo %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Manca l'estensione RandR sullo schermo \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"L'estensione RandR (ridimensiona e ruota) non è abilitato su questo schermo. "
-"Abilitarla e riavviare di nuovo questa finestra."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Impossibile utilizzare l'estensione RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr ""
 "Impossibile reperire la versione dell'estensione RandR che si sta per "
 "utilizzare"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Applica i cambiamenti e prova le nuove impostazioni dello schermo"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Impostazioni"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Impostazioni"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Il sistema utilizza RandR %d.%d. Affinché le impostazioni dello schermo "
 "funzionino, è necessaria almeno la versione 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Portatile"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televisione"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Schermo digitale"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Monitor secondario"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Schermo digitale secondario"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1213,13 +1292,11 @@ msgstr "I tasti elastici sono disabilitati"
 msgid "Bounce keys"
 msgstr "Tasti elastici"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Avvia in modalità debug (non eseguire il fork in background)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Spazio di lavoro %d"
@@ -1281,6 +1358,31 @@ msgstr ""
 "Digitare %s --help per consultare l'elenco completo delle opzioni da riga di "
 "comando.\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Schermo %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Manca l'estensione RandR sullo schermo \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "L'estensione RandR (ridimensiona e ruota) non è abilitato su questo "
+#~ "schermo. Abilitarla e riavviare di nuovo questa finestra."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Impossibile utilizzare l'estensione RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Monitor secondario"
+
+#~ msgid "Second digital display"
+#~ msgstr "Schermo digitale secondario"
+
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>Tasti elastici</b>"
 
diff --git a/po/ja.po b/po/ja.po
index 35b9f67..1e51443 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings 4.5.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-20 20:21+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -207,38 +208,38 @@ msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "バージョン情報を表示する"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "'%s --help' と入力すると使用方法が表示されます。"
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "The Xfce development team. All rights reserved."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "バグの報告は <%s> までお願いします。"
@@ -260,6 +261,7 @@ msgid "Appearance"
 msgstr "外観"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "アイコンと文字"
 
@@ -353,6 +355,7 @@ msgstr "メニューとボタン"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "なし"
 
@@ -461,24 +464,48 @@ msgstr "åž‚ç›´ RGB"
 msgid "Vertical BGR"
 msgstr "åž‚ç›´ GBR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "変更を適用し新しいディスプレイ設定をテストします"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "バージョン情報を表示する"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "画面の解像度とレイアウトを設定します"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "ディスプレイ"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "解像度(_E):"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "解像度(_E):"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "周波数(_R):"
@@ -487,95 +514,147 @@ msgstr "周波数(_R):"
 msgid "Ro_tation:"
 msgstr "回転(_T):"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "詳細出力"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "ディスプレイ"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "通常"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "å·¦"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "反転"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "右"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "アイコンと文字 (横方向)"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "åž‚ç›´ RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Screen %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "ディスプレイ \"%s\" の RandR エクステンションが見当たりません"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"サイズ変更および回転エクステンション (RandR) はこのディスプレイでは有効になっ"
-"ていません。有効にしてからこの設定ダイアログを起動してみてください。"
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "RandR エクステンションの使用に失敗しました"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr ""
 "使用されている RandR エクステンションのバージョンを問い合わせることができませ"
 "ã‚“"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "変更を適用し新しいディスプレイ設定をテストします"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "設定マネージャ"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "設定マネージャ"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "このシステムでは RandR %d.%d を使用しています。ディスプレイ設定を機能させるた"
 "めには バージョン 1.1 以降が必要です。"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "ラップトップ"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "モニタ"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "テレビ"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "デジタルディスプレイ"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "2つめのモニタ"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "2つめのデジタルディスプレイ"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1131,13 +1210,11 @@ msgstr "バウンスキーが無効になりました"
 msgid "Bounce keys"
 msgstr "バウンスキー"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "デバッグモードで起動する (バックグラウンドで fork しません)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "ワークスペース %d"
@@ -1199,6 +1276,31 @@ msgstr ""
 "%s --help と入力すると利用可能な全てのコマンドラインオプションが表示されま"
 "す。\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Screen %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "ディスプレイ \"%s\" の RandR エクステンションが見当たりません"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "サイズ変更および回転エクステンション (RandR) はこのディスプレイでは有効に"
+#~ "なっていません。有効にしてからこの設定ダイアログを起動してみてください。"
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "RandR エクステンションの使用に失敗しました"
+
+#~ msgid "Second monitor"
+#~ msgstr "2つめのモニタ"
+
+#~ msgid "Second digital display"
+#~ msgstr "2つめのデジタルディスプレイ"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "プロパティ \"<b>%s</b>\" はロックされているためリセットできません"
 
diff --git a/po/kk.po b/po/kk.po
index fe78289..b65d794 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Baurzhan Muftakhidinov <baurthefirst at gmail.com>, 2009.
 #
+#: ../xfsettingsd/main.c:127
 msgid ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-11 06:05+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-08-03 10:14+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -78,7 +80,9 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "Екі қатар басылған перне арасындағы керек уақыт аралығы, мсек"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
 msgstr "Перне басылымы қабылдану үшін өту керек уақыты аралығы, мсек"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
@@ -94,20 +98,32 @@ msgid "The time, in milliseconds, between repeated motion events"
 msgstr "Қайталанулардың арасындағы уақыт аралығы, мсек"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
-msgstr "Бірінші басылу мен қайталанудың біріншісі арасындағы өту керек уақыт аралығы, мсек"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
+msgstr ""
+"Бірінші басылу мен қайталанудың біріншісі арасындағы өту керек уақыт "
+"аралығы, мсек"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid "The time, in milliseconds, to get to maximum speed"
 msgstr "Максималды жылдамдыққа жету үшін керек уақыт аралығы, мсек"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
-msgstr "Күтпеген басылуларға жол бермеу үшін, баяу пернелер басылу қабылданғанға дейін перне басылулы күйінде тұру керек ең аз уақытын анықтайды"
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
+msgstr ""
+"Күтпеген басылуларға жол бермеу үшін, баяу пернелер басылу қабылданғанға "
+"дейін перне басылулы күйінде тұру керек ең аз уақытын анықтайды"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
-msgstr "Күтпеген басылуларға жол бермеу үшін, қайталанатын пернелер қабылдануға дейін басылулар арасындағы минимал бөгеуді анықтайды"
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
+msgstr ""
+"Күтпеген басылуларға жол бермеу үшін, қайталанатын пернелер қабылдануға "
+"дейін басылулар арасындағы минимал бөгеуді анықтайды"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
 msgid "Use _bounce keys"
@@ -122,20 +138,38 @@ msgid "Use slow _keys"
 msgstr "Ба_яу пернелер"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
-msgstr "Таңдаулы тұрса, бір уақытта бірнеше перне басылу керек болса, түрлендіргіш пернелерін (Control, Alt, пен Shift сияқты) басылулы ұстау керек емес (оларды бір рет басу мен жіберу жеткілікті)"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
+msgstr ""
+"Таңдаулы тұрса, бір уақытта бірнеше перне басылу керек болса, түрлендіргіш "
+"пернелерін (Control, Alt, пен Shift сияқты) басылулы ұстау керек емес "
+"(оларды бір рет басу мен жіберу жеткілікті)"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
-msgstr "Таңдаулы тұрса, түрлендіргіш пернелер (Control, Alt, пен Shift сияқты) қайта басылғанға дейін басылулы күйінде тұрады"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
+msgstr ""
+"Таңдаулы тұрса, түрлендіргіш пернелер (Control, Alt, пен Shift сияқты) қайта "
+"басылғанға дейін басылулы күйінде тұрады"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
-msgstr "Таңдаулы тұрса, екі перне басылса, \"жабысқақ пернелер\" мүмкіндігі сөндіріледі"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
+msgstr ""
+"Таңдаулы тұрса, екі перне басылса, \"жабысқақ пернелер\" мүмкіндігі "
+"сөндіріледі"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
-msgstr "Таңдаулы тұрса, тышқан курсорын пернетақтаның сандық бөлігінен басқаруға болады"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
+msgstr ""
+"Таңдаулы тұрса, тышқан курсорын пернетақтаның сандық бөлігінен басқаруға "
+"болады"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
 msgid "_Acceleration delay:"
@@ -163,61 +197,50 @@ msgstr "пиксель/сек"
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:87
-#: ../dialogs/keyboard-settings/main.c:39
-#: ../dialogs/mouse-settings/main.c:100
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:100
 msgid "Settings manager socket"
 msgstr "Баптаулар басқарушы сокеті"
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:87
-#: ../dialogs/keyboard-settings/main.c:39
-#: ../dialogs/mouse-settings/main.c:100
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:100
 msgid "SOCKET ID"
 msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
-#: ../dialogs/keyboard-settings/main.c:40
-#: ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43
-#: ../xfce4-settings-helper/main.c:78
-#: ../xfce4-settings-manager/main.c:40
-#: ../xfsettingsd/main.c:52
+#: ../dialogs/display-settings/main.c:101
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
+#: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Нұсқа ақпараты"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
-#: ../dialogs/mouse-settings/main.c:1186
-#: ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188
-#: ../xfce4-settings-manager/main.c:58
+#: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Көмек үшін '%s --help' енгізіңіз."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
-#: ../dialogs/mouse-settings/main.c:1205
-#: ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206
-#: ../xfce4-settings-manager/main.c:71
+#: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce өндіру тобы. Барлық құқықтары қорғалған."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
-#: ../dialogs/mouse-settings/main.c:1206
-#: ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207
-#: ../xfce4-settings-manager/main.c:72
+#: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Ақаулықтар жөнінде хабарласыңыз: <%s>."
@@ -227,8 +250,11 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr "Пернетақта мен тышқан қолжетерлілігін жақсарту"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
-msgstr "Анти-алиасинг, не қаріптерді тегістеу, экрандағы мәтіннің түрін жақсарта алады"
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgstr ""
+"Анти-алиасинг, не қаріптерді тегістеу, экрандағы мәтіннің түрін жақсарта "
+"алады"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
@@ -236,6 +262,7 @@ msgid "Appearance"
 msgstr "Сыртқы түрі"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Екеуі де"
 
@@ -278,15 +305,20 @@ msgstr "Теру кезіндегі _кері байланыс дыбыстар
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
-msgstr "Оқиғалар дыбыстарын глобалды қосады не сөндіреді (\"Canberra\" қолдауы керек)"
+msgstr ""
+"Оқиғалар дыбыстарын глобалды қосады не сөндіреді (\"Canberra\" қолдауы керек)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
 msgid "Event sounds"
 msgstr "Оқиғалар дыбыстары"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
-msgstr "TFT не LCD экрандарда дұрыс суб-пиксель ретін таңдау арқылы қаріп сапасын көп есе жақсартуға болады"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
+msgstr ""
+"TFT не LCD экрандарда дұрыс суб-пиксель ретін таңдау арқылы қаріп сапасын "
+"көп есе жақсартуға болады"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
 msgid "Full"
@@ -297,12 +329,21 @@ msgid "Icons"
 msgstr "Таңбашалар"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
-msgstr "Таңдаулы тұрса, мәзір элементтері үшін пернетақта жарлықтарын ол элемент үстінде курсорды ұстап, жаңа перне жарлығын енгізу арқылы өзгертуге болады"
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
+msgstr ""
+"Таңдаулы тұрса, мәзір элементтері үшін пернетақта жарлықтарын ол элемент "
+"үстінде курсорды ұстап, жаңа перне жарлығын енгізу арқылы өзгертуге болады"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
-msgstr "Қаріптердің көбінде оларды қалай тегістеу керек туралы ақпарат бар; өзіңіз үшін жақсысын таңдаңыз"
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
+msgstr ""
+"Қаріптердің көбінде оларды қалай тегістеу керек туралы ақпарат бар; өзіңіз "
+"үшін жақсысын таңдаңыз"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
 msgid "Medium"
@@ -314,12 +355,16 @@ msgstr "Мәзірлер мен батырмалар"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Ешнәрсе"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
-msgstr "Монитордың анықталған кеңейтуін алмастырады, егер қаріптер тым үлкен не кіші боп көрінсе"
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
+msgstr ""
+"Монитордың анықталған кеңейтуін алмастырады, егер қаріптер тым үлкен не кіші "
+"боп көрінсе"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
 msgid "Rendering"
@@ -354,8 +399,12 @@ msgid "Specify whether icons should be displayed next to text in buttons"
 msgstr "Батырмаларда мәтін қасында суреттің көрсетілуін анықтайды"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
-msgstr "Тышқан шертулері мен басқа да пайдаланушы әрекеттері дыбыстарды туғызуын анықтайды"
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
+msgstr ""
+"Тышқан шертулері мен басқа да пайдаланушы әрекеттері дыбыстарды туғызуын "
+"анықтайды"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
 msgid "St_yle"
@@ -370,8 +419,11 @@ msgid "Text"
 msgstr "Мәтін"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
-msgstr "Бұл қаріп пайдаланушы интерфейсін жасауда негізгі қаріп ретінде қолданылады"
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
+msgstr ""
+"Бұл қаріп пайдаланушы интерфейсін жасауда негізгі қаріп ретінде қолданылады"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
 msgid "_Fonts"
@@ -409,24 +461,48 @@ msgstr "Вертикалды RGB"
 msgid "Vertical BGR"
 msgstr "Вертикалды BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Өзгерістерді іске асырып, дисплейдің жаңа баптауларын сынау"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Нұсқа ақпараты"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Экран баптауларын мен жаймасын баптау"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Дисплей"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "Кең_ейтілуі:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "Кең_ейтілуі:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Жаңарту ж_иілігі:"
@@ -435,85 +511,145 @@ msgstr "Жаңарту ж_иілігі:"
 msgid "Ro_tation:"
 msgstr "Бұ_рылуы:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Кеңейтілген шығыс"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Дисплей"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Қалыпты"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Сол жақ"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Теріс"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Оң жақ"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Гц"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Екеуі де жатық"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Вертикалды RGB"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Экран %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "\"%s\" дисплейінде RandR кеңейтілуі жоқ"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
-msgid "The Resize and Rotate extension (RandR) is not enabled on this display. Try to enable it and run the dialog again."
-msgstr "Өлшемін өзгерту мен айналдыру кеңейтуі (RandR) бұл дисплейде іске қосылмаған. Оны қосып, сұхбат терезесін қайтадан ашыңыз."
+#: ../dialogs/display-settings/main.c:653
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "RandR кеңейтуін қолдану сәтсіз аяқталды"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Қолданулы тұрған RandR кеңейтуінің нұсқасын анықтау мүмкін емес"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Өзгерістерді іске асырып, дисплейдің жаңа баптауларын сынау"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Баптаулар"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Баптаулар"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+"Жүйеңіздегі RandR нұсқасы %d.%d. Дисплей баптауларының жұмысы үшін кем "
+"дегенде 1.1 нұсқасы керек"
+
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.1 is required at least"
-msgstr "Жүйеңіздегі RandR нұсқасы %d.%d. Дисплей баптауларының жұмысы үшін кем дегенде 1.1 нұсқасы керек"
+msgid "The video driver does not support video outputs"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Ноутбук"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Монитор"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Теледидар"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Цифрлық дисплей"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Екінші монитор"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Екінші цифрлық дисплей"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -615,8 +751,11 @@ msgid "Show _blinking"
 msgstr "Жыпылықтауды көр_сету"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
-msgstr "Пернетақта жаймасы осы баптаулармен не X серверімен басқарылуын анықтайды"
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
+msgstr ""
+"Пернетақта жаймасы осы баптаулармен не X серверімен басқарылуын анықтайды"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
 msgid "Specify whether or not the text cursor blinks"
@@ -643,8 +782,12 @@ msgid "Use this area to _test the settings above:"
 msgstr "Жоғарыдағы б_аптауларды сынау өрісі:"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
-msgstr "Таңдаулы тұрса, пернені басып, ұстау оның таңбасын қайта-қайта енгізуді туғызады"
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
+msgstr ""
+"Таңдаулы тұрса, пернені басып, ұстау оның таңбасын қайта-қайта енгізуді "
+"туғызады"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
 msgid "_Enable key repeat"
@@ -709,12 +852,17 @@ msgid "Reset to Defaults"
 msgstr "Бастапқы түріне келтіру"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:931
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
-msgstr "Бұл әрекет барлық жарлықтарды бастапқы түріне келтіреді. Осыны шынымен қалайсыз ба?"
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
+msgstr ""
+"Бұл әрекет барлық жарлықтарды бастапқы түріне келтіреді. Осыны шынымен "
+"қалайсыз ба?"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:996
 msgid "The system defaults will be restored next time you log in."
-msgstr "Жүйенің бастапқы баптаулары сіз келесі рет жүйеге кіргенде іске қосылады."
+msgstr ""
+"Жүйенің бастапқы баптаулары сіз келесі рет жүйеге кіргенде іске қосылады."
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:998
 msgid "Warning"
@@ -729,8 +877,7 @@ msgid "DEVICE NAME"
 msgstr "DEVICE NAME"
 
 #. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:355
-#: ../dialogs/mouse-settings/main.c:357
+#: ../dialogs/mouse-settings/main.c:355 ../dialogs/mouse-settings/main.c:357
 #: ../dialogs/mouse-settings/main.c:417
 msgid "Default"
 msgstr "Бастапқы"
@@ -782,8 +929,11 @@ msgid "Re_verse scroll direction"
 msgstr "Ты_шқан дөңгелегін айналдыруды терістеу"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
-msgid "Set the acceleration and threshold for the selected device to the default values"
-msgstr "Таңдалған құрылғы үшін үшін үдету мен шек мәнін бастапқы мәндеріне тастау"
+msgid ""
+"Set the acceleration and threshold for the selected device to the default "
+"values"
+msgstr ""
+"Таңдалған құрылғы үшін үшін үдету мен шек мәнін бастапқы мәндеріне тастау"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
 msgid "Size"
@@ -794,28 +944,41 @@ msgid "T_hreshold:"
 msgstr "_Шегі:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
 msgstr "Тышқан жылжытылған кезде курсор жылдамдығы еселену реті"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
-msgstr "Қос шерту ретінде санау үшін бірінші шертуден кейін курсорды осы пиксель санынан үлкен емес санға жылжытуға рұқсат етілген"
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
+msgstr ""
+"Қос шерту ретінде санау үшін бірінші шертуден кейін курсорды осы пиксель "
+"санынан үлкен емес санға жылжытуға рұқсат етілген"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
-msgid "The number of pixels the pointer must move before a drag operation will start"
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
 msgstr "Ұстап апару әрекетін бастау үшін курсор өту керек пиксельдер саны"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
-msgstr "Курсорды үдетуді бастау үшін курсор қысқа уақытта өту керек пиксельдер саны"
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
+msgstr ""
+"Курсорды үдетуді бастау үшін курсор қысқа уақытта өту керек пиксельдер саны"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
 msgid "Ti_me:"
 msgstr "У_ақыт:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
-msgstr "Қос шерту ретінде санау үшін, екі қатар тышқан шертулер арасындағы ең үлкен уақыт аралығы, мсек"
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
+msgstr ""
+"Қос шерту ретінде санау үшін, екі қатар тышқан шертулер арасындағы ең үлкен "
+"уақыт аралығы, мсек"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
 msgid "When selected, the scroll wheel will work in the opposite direction"
@@ -901,13 +1064,19 @@ msgstr "Түбірлік ('/') элементі дұрыс қасиет аты 
 
 #: ../xfce4-settings-editor/main_window.c:1004
 #, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
-msgstr "Қасиеттің атында тек ASCII-дің таңбалары A-Z, a-z, 0-9, '_', '-', '<' және '>', оған қоса ажыратқыш ретінде '/' таңбасы болуы керек"
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Қасиеттің атында тек ASCII-дің таңбалары A-Z, a-z, 0-9, '_', '-', '<' және "
+"'>', оған қоса ажыратқыш ретінде '/' таңбасы болуы керек"
 
 #: ../xfce4-settings-editor/main_window.c:1013
 #, c-format
 msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Қасиет аттарында қатар тұрған екі немесе одан да көп '/' таңбалары болмауы керек"
+msgstr ""
+"Қасиет аттарында қатар тұрған екі немесе одан да көп '/' таңбалары болмауы "
+"керек"
 
 #: ../xfce4-settings-editor/main_window.c:1024
 #, c-format
@@ -1040,14 +1209,11 @@ msgstr "Қайталанатын пернелер сөндірулі тұр"
 msgid "Bounce keys"
 msgstr "Қайталанатын пернелер"
 
-#: ../xfce4-settings-helper/main.c:79
-#: ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Жөндеу режимінде қосылу (фонға өтпеу)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Жұмыс орны %d"
@@ -1108,5 +1274,30 @@ msgstr ""
 "%s: %s\n"
 "Командалық жолдың бар опцияларын қарап шығу үшін, %s --help енгізіңз.\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Гц"
+
+#~ msgid "Screen %d"
+#~ msgstr "Экран %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "\"%s\" дисплейінде RandR кеңейтілуі жоқ"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Өлшемін өзгерту мен айналдыру кеңейтуі (RandR) бұл дисплейде іске "
+#~ "қосылмаған. Оны қосып, сұхбат терезесін қайтадан ашыңыз."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "RandR кеңейтуін қолдану сәтсіз аяқталды"
+
+#~ msgid "Second monitor"
+#~ msgstr "Екінші монитор"
+
+#~ msgid "Second digital display"
+#~ msgstr "Екінші цифрлық дисплей"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "\"<b>%s</b>\" қасиетін тастау мүмкін емес, өйткені ол құпталған"
diff --git a/po/lv.po b/po/lv.po
index c7845dd..62c03a0 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2009-09-18 18:16+0100\n"
 "Last-Translator: Rihards Prieditis <rprieditis at gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -216,38 +217,38 @@ msgstr "SOKETA ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Versijas informācija"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Ievadiet \"%s --help\", lai iegūtu lietošanas informāciju"
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce izstrādes komanda. Visas tiesības paturētas."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Lūdzu ziņojiet par kļūdām uz <%s>."
@@ -269,6 +270,7 @@ msgid "Appearance"
 msgstr "Izskats"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Abi"
 
@@ -366,6 +368,7 @@ msgstr "<b>Izvēlnes un pogas</b>"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Nekas"
 
@@ -474,24 +477,48 @@ msgstr "Vertikālais RGB"
 msgid "Vertical BGR"
 msgstr "Vertikālais BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Uzstādīt izmaiņas un pārbaudīt jauno displeja uzstādījumus"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Versijas informācija"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Konfigurēt ekrāna uzstādījumus un izkārtojumu"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Displejs:"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "I_zšķirtspēja:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "I_zšķirtspēja:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Atsvaidzināšanas āt_rums:"
@@ -500,93 +527,145 @@ msgstr "Atsvaidzināšanas āt_rums:"
 msgid "Ro_tation:"
 msgstr "Ro_tācija:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Detalizētais izvads"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Displeja uzstādījumi"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Parasts"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Pa kreisi"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Invertēts"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Pa labi"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Abi horizontāli"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Vertikālais RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Ekrāns %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "RandR paplašinājums trūkst displejam \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Mērogot un Rotēt paplašinājums (RandR) nav ieslēgts uz šī displeja. Mēģiniet "
-"to ieslēgt un palaist šo dialogu atkal."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Neizdevās izmantot RandR paplašinājumu"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Neizdevās vaicāt izmantoto versiju RandR paplašinājumam"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Xfce 4 displeja uzstādījumi"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Uzstādījumi"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Uzstādījumi"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Sistēma izmanto RandR %d.%d. Displeja uzstādījumiem nepieciešama vismaz "
 "versija 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Klēpjdators"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitors"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televizors"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Digitāls displejs"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Otrs monitors"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Otrs digitāls displejs"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1160,13 +1239,11 @@ msgstr "Lecošie taustiņi ir ieslēgti"
 msgid "Bounce keys"
 msgstr "Lecošie taustiņi"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Sākt atkļūdošanas režīmā (ne zaroties fonā)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Darbavieta %d"
@@ -1227,6 +1304,34 @@ msgstr ""
 "%s: %s\n"
 "Mēģiniet %s --help, lai redzētu pieejamās komandlīnijas opcijas.\n"
 
+#~ msgid "Apply any changes and test the new display settings"
+#~ msgstr "Uzstādīt izmaiņas un pārbaudīt jauno displeja uzstādījumus"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Ekrāns %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "RandR paplašinājums trūkst displejam \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Mērogot un Rotēt paplašinājums (RandR) nav ieslēgts uz šī displeja. "
+#~ "Mēģiniet to ieslēgt un palaist šo dialogu atkal."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Neizdevās izmantot RandR paplašinājumu"
+
+#~ msgid "Second monitor"
+#~ msgstr "Otrs monitors"
+
+#~ msgid "Second digital display"
+#~ msgstr "Otrs digitāls displejs"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "Īpašība \"<b>%s</b>\" nevar tikt atstatīt, jo ir slēgta"
 
@@ -1625,12 +1730,6 @@ msgstr ""
 #~ "Jūs esat izmainījis fonta attēlošanas uzstādījumus. Šie uzstādījumi "
 #~ "stāsies spēkā, tikai jauni palaistām lietotnēm."
 
-#~ msgid "Display Settings"
-#~ msgstr "Displeja uzstādījumi"
-
-#~ msgid "Xfce 4 Display Settings"
-#~ msgstr "Xfce 4 displeja uzstādījumi"
-
 #~ msgid "Xfce 4 Keyboard Settings"
 #~ msgstr "Xfce 4 klaviatūras uzstādījumi"
 
diff --git a/po/nb.po b/po/nb.po
index 6628be2..6d1008e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings 4.5.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2008-11-23 20:56+0100\n"
 "Last-Translator: Terje Uriansrud <terje at uriansrud.net>\n"
 "Language-Team: Norwegian Bokmal\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -206,38 +207,38 @@ msgstr "SOKKEL-ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Versjonsinformasjon"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Skriv '%s --help' for bruksinstruksjoner."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce utviklingsteam. Alle rettigheter reservert."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Rapporter feil til <%s>."
@@ -257,6 +258,7 @@ msgid "Appearance"
 msgstr "Utseende"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Begge"
 
@@ -348,6 +350,7 @@ msgstr "Menyer og knapper"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Ingen"
 
@@ -453,24 +456,48 @@ msgstr "Loddrett RGB"
 msgid "Vertical BGR"
 msgstr "Loddrett BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Bruk endringene og test de nye innstillingene"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Versjonsinformasjon"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Sett opp skjerminnstillinger"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Skjerm"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "O_ppløsning:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "O_ppløsning:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Oppfrisknings_rate:"
@@ -479,93 +506,145 @@ msgstr "Oppfrisknings_rate:"
 msgid "Ro_tation:"
 msgstr "Orien_tering:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Komplett logg"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Skjerm"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Venstre"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Invertert"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Høyre"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Begge vannrett"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Loddrett RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Skjerm %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "RandR utvidelse mangler på skjerm «%s»"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Utvidelse for å endre størrelse og rotere (RandR) er ikke slått på på. Prøv "
-"å skru den på og kjør dialogvinduet på nytt."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Klarte ikke ta i bruk RandR utvidelse"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Klarte ikke finne versjonen av RandR utvidlesen som benyttes"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Bruk endringene og test de nye innstillingene"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Innstillinger"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Innstillinger"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Systemet bruker RandR %d, %d. For at skjerminnstillinger skal fungere kreves "
 "minimum versjon 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Bærbar"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Skjerm"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "TV"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Digital skjerm"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Sekundær skjerm"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Sekunder digital skjerm"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1123,13 +1202,11 @@ msgstr "Filtertaster er slått av"
 msgid "Bounce keys"
 msgstr "Filtertaster"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Start i feilsøkingsmodus (ikke legg prosess i bakgrunnen)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"
@@ -1191,5 +1268,30 @@ msgstr ""
 "Prøv «%s --help» for å se komplett liste over tilgjengelige "
 "kommandolinjevalg.\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Skjerm %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "RandR utvidelse mangler på skjerm «%s»"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Utvidelse for å endre størrelse og rotere (RandR) er ikke slått på på. "
+#~ "Prøv å skru den på og kjør dialogvinduet på nytt."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Klarte ikke ta i bruk RandR utvidelse"
+
+#~ msgid "Second monitor"
+#~ msgstr "Sekundær skjerm"
+
+#~ msgid "Second digital display"
+#~ msgstr "Sekunder digital skjerm"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "Egenskap «<b>%s</b>» kan ikke nullstilles fordi den er låst"
diff --git a/po/nl.po b/po/nl.po
index 891d852..3cea531 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-19 22:32+0100\n"
 "Last-Translator: Vincent Tunru <projects at vinnl.nl>\n"
 "Language-Team: Nederlands <nl_NL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -214,38 +215,38 @@ msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Versie-informatie"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Type '%s -- help' voor gebruikaanwijzingen."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "De Xfce-ontwikkelaars. Alle rechten voorbehouden."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Rapporteer fouten op <%s>."
@@ -267,6 +268,7 @@ msgid "Appearance"
 msgstr "Weergave"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Beide"
 
@@ -362,6 +364,7 @@ msgstr "Menu's en knoppen"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Geen"
 
@@ -469,24 +472,48 @@ msgstr "Verticaal RGB"
 msgid "Vertical BGR"
 msgstr "Verticaal BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Voer de aanpassingen uit en test de nieuwe instellingen"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Versie-informatie"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Scherminstellingen en -lay-out bewerken"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Beeldscherm"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "R_esolutie:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "R_esolutie:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Verversingsf_requentie:"
@@ -495,93 +522,145 @@ msgstr "Verversingsf_requentie:"
 msgid "Ro_tation:"
 msgstr "Ro_tatie:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Gedetailleerde uitvoer"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Beeldscherm-instellingen"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normaal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Linksom"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Omgekeerd"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Rechtsom"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Beide horizontaal"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Verticaal RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Scherm %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "RandR-uitbreiding ontbreekt op scherm \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"De Resize and Rotate-uitbreiding (RandR) is niet ingeschakeld op dit scherm. "
-"Probeer het aan te zetten en voer dan het programma weer uit."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Kon de RandR-uitbreiding niet gebruiken"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Kan de versie van de uitbreiding van RandR niet bepalen"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Xfce 4 Beeldscherm-instellingen"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Instellingen"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Instellingen"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Dit systeem maakt gebruik van RandR % d.% d. Voor het bewerken van de "
 "weergave-instellingen is minstens versie 1.1 vereist"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Laptop"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televisie"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Digitaal beeldscherm"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Tweede monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Tweede digitale beeldscherm"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1151,13 +1230,11 @@ msgstr "Kaatstoetsen zijn uitgeschakeld"
 msgid "Bounce keys"
 msgstr "Kaatstoetsen"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Opstarten in debug-modus (niet naar de achtergrond verplaatsen)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Werkblad %d"
@@ -1219,6 +1296,34 @@ msgstr ""
 "Probeer %s --help om een complete lijst van beschikbare commandoregel-\n"
 "opties te zien.\n"
 
+#~ msgid "Apply any changes and test the new display settings"
+#~ msgstr "Voer de aanpassingen uit en test de nieuwe instellingen"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Scherm %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "RandR-uitbreiding ontbreekt op scherm \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "De Resize and Rotate-uitbreiding (RandR) is niet ingeschakeld op dit "
+#~ "scherm. Probeer het aan te zetten en voer dan het programma weer uit."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Kon de RandR-uitbreiding niet gebruiken"
+
+#~ msgid "Second monitor"
+#~ msgstr "Tweede monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Tweede digitale beeldscherm"
+
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>Kaatstoetsen</b>"
 
@@ -1306,12 +1411,6 @@ msgstr ""
 #~ msgid "Xfce 4 Appearance Settings"
 #~ msgstr "Xfce 4 Weergave-instellingen"
 
-#~ msgid "Display Settings"
-#~ msgstr "Beeldscherm-instellingen"
-
-#~ msgid "Xfce 4 Display Settings"
-#~ msgstr "Xfce 4 Beeldscherm-instellingen"
-
 #~ msgid "<b>Application Shortcuts</b>"
 #~ msgstr "<b>Typ-instellingen</b>"
 
diff --git a/po/pa.po b/po/pa.po
index 8345ece..c8d8f64 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2009-08-28 23:51+0530\n"
 "Last-Translator: A S Alam <aalam at users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users at lists.sf.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -195,38 +196,38 @@ msgstr "ਸਾਕਟ ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "ਵਰਜਨ ਜਾਣਕਾਰੀ"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "<%s> ਲਈ ਬੱਗ ਰਿਪੋਰਟ ਦਿਓ ਜੀ।"
@@ -246,6 +247,7 @@ msgid "Appearance"
 msgstr "ਦਿੱਖ"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr ""
 
@@ -332,6 +334,7 @@ msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
@@ -434,24 +437,47 @@ msgstr "ਵਰਟੀਕਲ RGB"
 msgid "Vertical BGR"
 msgstr "ਵਰਟੀਕਲ BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
 msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "ਵਰਜਨ ਜਾਣਕਾਰੀ"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "ਸਕਰੀਨ ਸੈਟਿੰਗ ਅਤੇ ਲੇਆਉਟ ਸੰਰਚਨਾ"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "ਡਿਸਪਲੇਅ"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr ""
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+msgid "Ref_lection:"
+msgstr ""
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr ""
@@ -460,89 +486,141 @@ msgstr ""
 msgid "Ro_tation:"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "ਵਰਬੋਸ ਆਉਟਪੁੱਟ"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "ਡਿਸਪਲੇਅ"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "ਖੱਬੇ"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "ਉਲਟ"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "ਸੱਜੇ"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+msgid "Horizontal"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "ਵਰਟੀਕਲ RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "ਸਕਰੀਨ %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
+msgid "%.1f Hz"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr ""
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+msgid "Unable to start the Xfce Display Settings"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "ਸੈਟਿੰਗ"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "ਸੈਟਿੰਗ"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
 #, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
+msgstr ""
+
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "ਲੈਪਟਾਪ"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "ਮਾਨੀਟਰ"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "ਟੈਲੀਵੀਜ਼ਿਨ"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "ਡਿਜ਼ਿਟਲ ਡਿਸਪਲੇਅ"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "ਦੂਜਾ ਮਾਨੀਟਰ"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "ਦੂਜਾ ਡਿਜ਼ਿਟਲ ਡਿਸਪਲੇਅ"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1101,13 +1179,11 @@ msgstr ""
 msgid "Bounce keys"
 msgstr ""
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr ""
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "ਵਰਕਸਪੇਸ %d"
@@ -1165,3 +1241,15 @@ msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "ਸਕਰੀਨ %d"
+
+#~ msgid "Second monitor"
+#~ msgstr "ਦੂਜਾ ਮਾਨੀਟਰ"
+
+#~ msgid "Second digital display"
+#~ msgstr "ਦੂਜਾ ਡਿਜ਼ਿਟਲ ਡਿਸਪਲੇਅ"
diff --git a/po/pl.po b/po/pl.po
index ccaa0c5..96adeef 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings 4.5.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2009-07-15 21:25+0100\n"
 "Last-Translator: Piotr Sokół <piotr.sokol at 10g.pl>\n"
 "Language-Team: Polish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -219,38 +220,38 @@ msgstr "ID GNIAZDA"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Wypisuje informacje o wersji i kończy"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Proszę wpisać „%s --help” aby wypisać komunikat pomocy."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Zespół twórców środowiska Xfce. Wszystkie prawa zastrzeżone."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Proszę zgłaszać błędy na adres <%s>."
@@ -271,6 +272,7 @@ msgid "Appearance"
 msgstr "WyglÄ…d"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Etykiety poniżej ikon"
 
@@ -363,6 +365,7 @@ msgstr "<b>Menu i przyciski</b>"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Brak"
 
@@ -471,24 +474,48 @@ msgstr "Pionowy RGB"
 msgid "Vertical BGR"
 msgstr "Pionowy BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Wprowadza zmiany i testuje nowe ustawienia monitora"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Wypisuje informacje o wersji i kończy"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Konfiguruje ustawienia obrazu"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "_Rozdzielczość:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "_Rozdzielczość:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Częstotliwość _odświeżania:"
@@ -497,93 +524,145 @@ msgstr "Częstotliwość _odświeżania:"
 msgid "Ro_tation:"
 msgstr "_Orientacja:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Wypisuje bardziej szczegółowe komunikaty"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Monitor"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normalna"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Lewo"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Odwrócona"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Prawo"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Etykiety obok ikon"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Pionowy RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
 msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
-#, fuzzy, c-format
-msgid "Screen %d"
-msgstr "Ekran"
+#: ../dialogs/display-settings/main.c:173
+#, c-format
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Brak rozszerzenia RandR na monitorze „%s”"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Rozszerzenie RandR nie zostało włączone na bieżącyn monitorze. Proszę je "
-"włączyć i uruchomić ponownie okno dialogowe."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Nie udało się użyć rozszerzenia RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Nie można uzyskać wersji używanego rozszerzenia RandR"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Wprowadza zmiany i testuje nowe ustawienia monitora"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Ustawienia"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Ustawienia"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Ten system używa RandR %d.%d. Ustawienia moniotra wymagają do pracy co "
 "najmniej wersji 1.1."
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Laptop"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Wyświetlacz cyfrowy"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Drugi monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Drugi wyświetlacz cyfrowy"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1158,13 +1237,11 @@ msgstr "Odskakujące klawisze zostały wyłączone"
 msgid "Bounce keys"
 msgstr "OdskakujÄ…ce klawisze"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Uruchamia w trybie debugowania (nie przechodzi w tło)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Obszar roboczy %d"
@@ -1226,6 +1303,29 @@ msgstr ""
 "%s: %s\n"
 "Proszę wpisać „%s --help” aby wypisać pełną listę opcji wiersza poleceń.\n"
 
+#, fuzzy
+#~ msgid "Screen %d"
+#~ msgstr "Ekran"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Brak rozszerzenia RandR na monitorze „%s”"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Rozszerzenie RandR nie zostało włączone na bieżącyn monitorze. Proszę je "
+#~ "włączyć i uruchomić ponownie okno dialogowe."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Nie udało się użyć rozszerzenia RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Drugi monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Drugi wyświetlacz cyfrowy"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr ""
 #~ "Nie można przywrócić właściwości „%s”, ponieważ jest ona zablokowana"
diff --git a/po/pt.po b/po/pt.po
index 4ccc879..1e95641 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-20 19:38+0100\n"
 "Last-Translator: Nuno Miguel <nunis at netcabo.pt>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -215,38 +216,38 @@ msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Informações da versão"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Digite '%s --help' para informações de uso."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "A equipa de desenvolvimento do Xfce. Todos os direitos reservados."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Por favor, relate os erros para <%s>."
@@ -268,6 +269,7 @@ msgid "Appearance"
 msgstr "Aparência"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Ambos"
 
@@ -362,6 +364,7 @@ msgstr "Menus e botões"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Nenhum"
 
@@ -470,24 +473,48 @@ msgstr "RGB vertical"
 msgid "Vertical BGR"
 msgstr "BGR vertical"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Aplicar as alterações e testar as novas definições do monitor"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Informações da versão"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Configurar definições e disposição do monitor"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Ecrã"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "R_esolução:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "R_esolução:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Ta_xa de actualização:"
@@ -496,93 +523,145 @@ msgstr "Ta_xa de actualização:"
 msgid "Ro_tation:"
 msgstr "Ro_tação:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Saída detalhada"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Ecrã"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Invertido"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Direita"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Ambos na Horizontal"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "RGB vertical"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Ecrã %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Extensão RandR não encontrada no ecrã \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"A extensão Redimensionar e Rodar (RandR) não está activada neste ecrã. Tente "
-"activa-la e execute o diálogo novamente."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Falhou ao usar a extensão RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Incapaz de consultar a versão da extensão do RandR em utilização"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Aplicar as alterações e testar as novas definições do monitor"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Definições"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Definições"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Este sistema está a usar o RandR %d.%d. Para que as definições de ecrã "
 "funcionem, precisa da versão 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Portátil"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televisão"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Ecrã digital"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Segundo monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Segundo ecrã digital"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1156,13 +1235,11 @@ msgstr "Teclas saltitantes estão inactivas"
 msgid "Bounce keys"
 msgstr "Teclas saltitantes"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Iniciar no modo de depuração (não deslocar para segundo plano)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Área de Trabalho %d"
@@ -1223,6 +1300,31 @@ msgstr ""
 "%s: %s\n"
 "Tente %s --help para ver uma lista completa de opções de linha de comandos.\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Ecrã %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Extensão RandR não encontrada no ecrã \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "A extensão Redimensionar e Rodar (RandR) não está activada neste ecrã. "
+#~ "Tente activa-la e execute o diálogo novamente."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Falhou ao usar a extensão RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Segundo monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Segundo ecrã digital"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr ""
 #~ "A propriedade \"<b>%s</b>\" não pode ser reiniciada porque está bloqueada"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3d23726..5e5e512 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-02-06 13:30-0200\n"
 "Last-Translator: Vladimir Melo <vmelo at gnome.org>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -218,38 +219,38 @@ msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Informações da versão"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Digite \"%s --help\" para informações de uso."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "A equipe de desenvolvimento do Xfce. Todos os direitos reservados."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Por favor relate os erros para <%s>."
@@ -271,6 +272,7 @@ msgid "Appearance"
 msgstr "Aparência"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Ambos"
 
@@ -366,6 +368,7 @@ msgstr "Menus e botões"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Nenhum"
 
@@ -472,24 +475,49 @@ msgstr "RGB vertical"
 msgid "Vertical BGR"
 msgstr "BGR vertical"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Aplica quaisquer alterações e testa as novas configurações de vídeo"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Informações da versão"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+#, fuzzy
+msgid "Keep this configuration"
+msgstr "Manter a ação do gerenciador de janelas"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Defina as configurações e a disposição da tela"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Vídeo"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "R_esolução:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "R_esolução:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Ta_xa de atualização:"
@@ -498,93 +526,145 @@ msgstr "Ta_xa de atualização:"
 msgid "Ro_tation:"
 msgstr "Ro_tação:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Saída detalhada"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Configurações do Monitor"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Invertido"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Direita"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Ambos horizontais"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "RGB vertical"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Tela %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Extensão do RandR não encontrada no vídeo \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"A extensão Redimensionar e Rotacionar (RandR) não está habilitada neste "
-"vídeo. Tente habilitá-la e execute o diálogo novamente."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Falha ao usar a extensão RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Não foi possível consultar a versão da extensão do RandR sendo usada"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Configurações de Tela do Xfce 4"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Configurações"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Configurações"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Este sistema está usando o RandR %d.%d. Para que a configuração de vídeo "
 "funcione é necessário pelo menos a versão 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Laptop"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televisão"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Vídeo digital"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Segundo monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Segundo vídeo digital"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1160,13 +1240,11 @@ msgstr "Teclas de repercussão estão desabilitadas"
 msgid "Bounce keys"
 msgstr "Teclas de repercussão"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Iniciar no modo de depuração (não bifurcar para o plano de fundo)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Espaço de trabalho %d"
@@ -1228,6 +1306,34 @@ msgstr ""
 "Tente %s --help para ver uma lista completa dos comandos de linha de comando "
 "disponíveis.\n"
 
+#~ msgid "Apply any changes and test the new display settings"
+#~ msgstr "Aplica quaisquer alterações e testa as novas configurações de vídeo"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Tela %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Extensão do RandR não encontrada no vídeo \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "A extensão Redimensionar e Rotacionar (RandR) não está habilitada neste "
+#~ "vídeo. Tente habilitá-la e execute o diálogo novamente."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Falha ao usar a extensão RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Segundo monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Segundo vídeo digital"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr ""
 #~ "A propriedade \"<b>%s</b>\" não pode ser reiniciada porque está bloqueada"
@@ -1371,12 +1477,6 @@ msgstr ""
 #~ msgid "Xfce 4 Appearance Settings"
 #~ msgstr "Configurações da Aparência do Xfce 4"
 
-#~ msgid "Display Settings"
-#~ msgstr "Configurações do Monitor"
-
-#~ msgid "Xfce 4 Display Settings"
-#~ msgstr "Configurações de Tela do Xfce 4"
-
 #~ msgid "<b>Application Shortcuts</b>"
 #~ msgstr "<b>Atalhos de aplicativos</b>"
 
@@ -1441,9 +1541,6 @@ msgstr ""
 #~ "O atalho já está em uso por uma <b>ação do gerenciador de janelas</b>. "
 #~ "Qual ação você deseja usar?"
 
-#~ msgid "Keep the window manager action"
-#~ msgstr "Manter a ação do gerenciador de janelas"
-
 #~ msgid "Conflicting actions for %s"
 #~ msgstr "Ações em conflito para %s"
 
diff --git a/po/ro.po b/po/ro.po
index db8b9c4..fb88fe6 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings 4.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2009-05-30 15:32+0300\n"
 "Last-Translator: Mișu Moldovan <dumol at xfce.org>\n"
 "Language-Team: Romanian <xfce-i18n at xfce.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -195,38 +196,38 @@ msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr ""
@@ -246,6 +247,7 @@ msgid "Appearance"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr ""
 
@@ -331,6 +333,7 @@ msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr ""
 
@@ -432,24 +435,46 @@ msgstr ""
 msgid "Vertical BGR"
 msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
 msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+msgid "Confirmation"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr ""
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+msgid "Ref_lection:"
+msgstr ""
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr ""
@@ -458,88 +483,137 @@ msgstr ""
 msgid "Ro_tation:"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+msgid "_Use this output"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+msgid "Display settings"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr ""
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+msgid "Horizontal"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:81
+msgid "Vertical"
 msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
+msgid "%.1f Hz"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr ""
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+msgid "Unable to start the Xfce Display Settings"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Manager de opțiuni"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Manager de opțiuni"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
 #, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr ""
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
 msgstr ""
 
 #. Set dialog title and icon
@@ -1084,13 +1158,11 @@ msgstr ""
 msgid "Bounce keys"
 msgstr ""
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr ""
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index b7dd854..27a6cad 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,19 +3,22 @@
 # This file is distributed under the same license as the xfce-settings package.
 # Ilya <yast4ik at yahoo.com>, 2009.
 # Denis Koryavov <dkoryavov at yandex.ru>, 2009
-# 
+#
+#: ../xfsettingsd/main.c:127
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 04:05+0000\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2009-01-31 17:18+0300\n"
 "Last-Translator: Ilya Shestopalov <yast4ik at yahoo.com>\n"
 "Language-Team: Russian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
@@ -81,8 +84,11 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "Время, в миллисекундах, между нажатиями клавиш"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
-msgstr "Время, в миллисекундах, которое должно пройти перед принятием нажатия клавиши"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
+msgstr ""
+"Время, в миллисекундах, которое должно пройти перед принятием нажатия клавиши"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid "The maximum pointer speed after acceleration"
@@ -90,27 +96,42 @@ msgstr "Максимальная скорость курсора после ус
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
 msgid "The ramp used to reach maximum pointer speed"
-msgstr "Расстояние, которое необходимо пройти указателю для достижения максимальной скорости"
+msgstr ""
+"Расстояние, которое необходимо пройти указателю для достижения максимальной "
+"скорости"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
 msgid "The time, in milliseconds, between repeated motion events"
 msgstr "Время, в миллисекундах, между повторившимися движениями"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
-msgstr "Время, в миллисекундах, между началом нажатия клавиши и началом движения"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
+msgstr ""
+"Время, в миллисекундах, между началом нажатия клавиши и началом движения"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid "The time, in milliseconds, to get to maximum speed"
 msgstr "Время, в миллисекундах, для достижения максимальной скорости"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
-msgstr "Чтобы помочь предотвратить случайные нажатия клавиш, медленные клавиши требуют нажатия клавиши определённого минимального времени перед его принятием."
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
+msgstr ""
+"Чтобы помочь предотвратить случайные нажатия клавиш, медленные клавиши "
+"требуют нажатия клавиши определённого минимального времени перед его "
+"принятием."
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
-msgstr "Чтобы помочь предотвратить множественные случайные нажатия клавиш, повторяющиеся клавиши устанавливают минимальную задержку между нажатием клавиш."
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
+msgstr ""
+"Чтобы помочь предотвратить множественные случайные нажатия клавиш, "
+"повторяющиеся клавиши устанавливают минимальную задержку между нажатием "
+"клавиш."
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
 msgid "Use _bounce keys"
@@ -125,20 +146,38 @@ msgid "Use slow _keys"
 msgstr "Использовать медленные _клавиши"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
-msgstr "Когда выбрано, клавиши-модификаторы (такие как Control, Alt и Shift), не нужно держать нажатыми (они могут быть нажаты и затем отпущены), в то время как обычно несколько клавиш нужно было бы нажать одновременно."
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
+msgstr ""
+"Когда выбрано, клавиши-модификаторы (такие как Control, Alt и Shift), не "
+"нужно держать нажатыми (они могут быть нажаты и затем отпущены), в то время "
+"как обычно несколько клавиш нужно было бы нажать одновременно."
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
-msgstr "Когда выбрано, клавиши-модификаторы (такие как Control, Alt и Shift), останутся нажатыми до тех пор, пока их не нажать снова"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
+msgstr ""
+"Когда выбрано, клавиши-модификаторы (такие как Control, Alt и Shift), "
+"останутся нажатыми до тех пор, пока их не нажать снова"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
-msgstr "Когда выбрано, функция \"залипающие клавиши\" будет отключена, если две клавиши нажаты одновременно"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
+msgstr ""
+"Когда выбрано, функция \"залипающие клавиши\" будет отключена, если две "
+"клавиши нажаты одновременно"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
-msgstr "Когда выбрано, курсор мыши может контролироваться с цифровой панели клавиатуры"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
+msgstr ""
+"Когда выбрано, курсор мыши может контролироваться с цифровой панели "
+"клавиатуры"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
 msgid "_Acceleration delay:"
@@ -178,38 +217,38 @@ msgstr "ID сокета"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Версия"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Наберите '%s --help' для использования."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Команда разработчиков Xfce. Все права защищены."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Пожалуйста сообщите об ошибке в <%s>."
@@ -219,7 +258,8 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr "Улучшение доступности клавиатуры и мыши"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
 msgstr "Сглаживание шрифта может улучшить вид текста на экране"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
@@ -228,6 +268,7 @@ msgid "Appearance"
 msgstr "Внешний вид"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Иконки и текст"
 
@@ -270,15 +311,21 @@ msgstr "Включить вх_одящие звуки обратной связ
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
-msgstr "Включить или выключить звуки событий глобально (требуется поддержка \"Canberra\")"
+msgstr ""
+"Включить или выключить звуки событий глобально (требуется поддержка "
+"\"Canberra\")"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
 msgid "Event sounds"
 msgstr "Звуки событий"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
-msgstr "Качество шрифтов на TFT или LCD дисплее может быть улучшено выбором правильного суб-пиксельного параметра экрана"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
+msgstr ""
+"Качество шрифтов на TFT или LCD дисплее может быть улучшено выбором "
+"правильного суб-пиксельного параметра экрана"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
 msgid "Full"
@@ -289,12 +336,21 @@ msgid "Icons"
 msgstr "Иконки"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
-msgstr "Если выбрано, горячие клавиши для пунктов меню могут быть изменены путем наведения мыши на них и нажатием новой комбинации клавишь"
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
+msgstr ""
+"Если выбрано, горячие клавиши для пунктов меню могут быть изменены путем "
+"наведения мыши на них и нажатием новой комбинации клавишь"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
-msgstr "Многие шрифты содержат информацию, предоставляющую подсказки по лучшей отрисовке шрифта; выберите то, что смотрится лучше"
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
+msgstr ""
+"Многие шрифты содержат информацию, предоставляющую подсказки по лучшей "
+"отрисовке шрифта; выберите то, что смотрится лучше"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
 msgid "Medium"
@@ -306,12 +362,16 @@ msgstr "Меню и кнопки"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Отсутствует"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
-msgstr "Не использовать обнаруженное разрешение дисплея если шрифты выглядят слишком большими или маленькими"
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
+msgstr ""
+"Не использовать обнаруженное разрешение дисплея если шрифты выглядят слишком "
+"большими или маленькими"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
 msgid "Rendering"
@@ -346,8 +406,12 @@ msgid "Specify whether icons should be displayed next to text in buttons"
 msgstr "Указать, должны ли иконки отображаться после текста на кнопках"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
-msgstr "Определить будут ли клики и другие устройства ввода приводить к проигрыванию звука события"
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
+msgstr ""
+"Определить будут ли клики и другие устройства ввода приводить к проигрыванию "
+"звука события"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
 msgid "St_yle"
@@ -362,8 +426,12 @@ msgid "Text"
 msgstr "Текст"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
-msgstr "Этот шрифт будет использован в качестве стандартного для отрисовки текста интерфейса"
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
+msgstr ""
+"Этот шрифт будет использован в качестве стандартного для отрисовки текста "
+"интерфейса"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
 msgid "_Fonts"
@@ -401,24 +469,48 @@ msgstr "Вертикальный RGB"
 msgid "Vertical BGR"
 msgstr "Вертикальный BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Применить любые изменения и протестировать новые настройки дисплея"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Версия"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Настроить дисплей"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Дисплей"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "Раз_решение"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "Раз_решение"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Частота _обновления:"
@@ -427,85 +519,145 @@ msgstr "Частота _обновления:"
 msgid "Ro_tation:"
 msgstr "Пов_орот"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Подробный вывод"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Дисплей"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Нормально"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Слева"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Инвертированный"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Справа"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Гц"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Иконки и текст горизонтально"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Вертикальный RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Экран %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Расширение RandR отсутствует на дисплее \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
-msgid "The Resize and Rotate extension (RandR) is not enabled on this display. Try to enable it and run the dialog again."
-msgstr "Расширение изменения размера и поворота (RandR) не включено для этого дисплея. Попытайтесь включить его и открыть"
+#: ../dialogs/display-settings/main.c:653
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Не найдено расширение RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Невозможно запросить используемую версию расширения RandR"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Применить любые изменения и протестировать новые настройки дисплея"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Настройки"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Настройки"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+"Эта система использует RandR %d.%d. Для работы настроек дисплея необходима "
+"версия 1.1 или выше"
+
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.1 is required at least"
-msgstr "Эта система использует RandR %d.%d. Для работы настроек дисплея необходима версия 1.1 или выше"
+msgid "The video driver does not support video outputs"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Ноутбук"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Монитор"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Телевидение"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Цифровой дисплей"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Второй монитор"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Второй цифровой дисплей"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -607,8 +759,12 @@ msgid "Show _blinking"
 msgstr "Показывать мигание"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
-msgstr "Указать, должна ли раскладка клавиатуры контролироваться через меню настроек или через X сервер"
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
+msgstr ""
+"Указать, должна ли раскладка клавиатуры контролироваться через меню настроек "
+"или через X сервер"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
 msgid "Specify whether or not the text cursor blinks"
@@ -635,8 +791,12 @@ msgid "Use this area to _test the settings above:"
 msgstr "Используйте это поле для _тестирования настроек, указанных выше"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
-msgstr "Когда выбрано, нажатые и удерживаемые клавиши печатают тот же символ снова и снова"
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
+msgstr ""
+"Когда выбрано, нажатые и удерживаемые клавиши печатают тот же символ снова и "
+"снова"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
 msgid "_Enable key repeat"
@@ -701,12 +861,18 @@ msgid "Reset to Defaults"
 msgstr "Сбросить на стандартные настройки"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:931
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
-msgstr "Это действие сбросит все настройки горячих клавиш на их стандартное значение. Вы действительно хотите сделать это?"
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
+msgstr ""
+"Это действие сбросит все настройки горячих клавиш на их стандартное "
+"значение. Вы действительно хотите сделать это?"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:996
 msgid "The system defaults will be restored next time you log in."
-msgstr "Настройки по умолчанию будут восстановлены во время следующего входа в систему"
+msgstr ""
+"Настройки по умолчанию будут восстановлены во время следующего входа в "
+"систему"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:998
 msgid "Warning"
@@ -773,7 +939,9 @@ msgid "Re_verse scroll direction"
 msgstr "Об_ратное направление скроллинга"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
-msgid "Set the acceleration and threshold for the selected device to the default values"
+msgid ""
+"Set the acceleration and threshold for the selected device to the default "
+"values"
 msgstr "Сбросить ускорение и порог для выбранного устройства на стандартные"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
@@ -785,28 +953,45 @@ msgid "T_hreshold:"
 msgstr "П_орог"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
-msgstr "Коэффициент, на который будет умножена скорость курсора, когда мышь сдвинется"
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
+msgstr ""
+"Коэффициент, на который будет умножена скорость курсора, когда мышь сдвинется"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
-msgstr "Курсор мыши не может двигаться больше, чем расстояние между двумя произведёнными кликами для того, чтобы это считалось двойным кликом"
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
+msgstr ""
+"Курсор мыши не может двигаться больше, чем расстояние между двумя "
+"произведёнными кликами для того, чтобы это считалось двойным кликом"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
-msgid "The number of pixels the pointer must move before a drag operation will start"
-msgstr "Количество пикселей, которые должен пройти курсор перед началом перемещения объекта"
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
+msgstr ""
+"Количество пикселей, которые должен пройти курсор перед началом перемещения "
+"объекта"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
-msgstr "Количество пикселей, которое должен быстро пройти курсор перед началом ускорения"
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
+msgstr ""
+"Количество пикселей, которое должен быстро пройти курсор перед началом "
+"ускорения"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
 msgid "Ti_me:"
 msgstr "Вр_емя:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
-msgstr "Два клика мышью через меньшее, чем это время (в миллисекундах) будут считаться двойным кликом."
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
+msgstr ""
+"Два клика мышью через меньшее, чем это время (в миллисекундах) будут "
+"считаться двойным кликом."
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
 msgid "When selected, the scroll wheel will work in the opposite direction"
@@ -892,8 +1077,12 @@ msgstr "Корневой элемент ('/') не является верным
 
 #: ../xfce4-settings-editor/main_window.c:1004
 #, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
-msgstr "Имена свойств могут содержать только символы латиницы A-Z, a-z, 0-9, '_', '-', '<' и '>', а так же элемент '/' как разделитель"
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Имена свойств могут содержать только символы латиницы A-Z, a-z, 0-9, '_', "
+"'-', '<' и '>', а так же элемент '/' как разделитель"
 
 #: ../xfce4-settings-editor/main_window.c:1013
 #, c-format
@@ -911,7 +1100,9 @@ msgstr "_Сбросить"
 
 #: ../xfce4-settings-editor/main_window.c:1077
 msgid "Resetting a channel will permanently remove those custom settings."
-msgstr "Возврат значения канала к первоначальному состоянию уничтожит его текущие настройки. "
+msgstr ""
+"Возврат значения канала к первоначальному состоянию уничтожит его текущие "
+"настройки. "
 
 #: ../xfce4-settings-editor/main_window.c:1078
 #, c-format
@@ -1031,13 +1222,11 @@ msgstr "Повторяющиеся клавиши запрещены"
 msgid "Bounce keys"
 msgstr "Повторяющиеся клавиши"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Запустить в режиме отладки (не оставлять на фоне)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Рабочее место %d"
@@ -1096,7 +1285,33 @@ msgid ""
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
-"Попробуйте %s --help, чтобы увидеть список всех доступных опций командной строки.\n"
+"Попробуйте %s --help, чтобы увидеть список всех доступных опций командной "
+"строки.\n"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Гц"
+
+#~ msgid "Screen %d"
+#~ msgstr "Экран %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Расширение RandR отсутствует на дисплее \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Расширение изменения размера и поворота (RandR) не включено для этого "
+#~ "дисплея. Попытайтесь включить его и открыть"
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Не найдено расширение RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Второй монитор"
+
+#~ msgid "Second digital display"
+#~ msgstr "Второй цифровой дисплей"
 
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>Повторяющиеся клавиши</b>"
@@ -1117,7 +1332,8 @@ msgstr ""
 #~ msgstr "<b>Размер</b>"
 
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
-#~ msgstr "Свойство \"<b>%s</b>\" не может быть сброшено, потому что заблокировано"
+#~ msgstr ""
+#~ "Свойство \"<b>%s</b>\" не может быть сброшено, потому что заблокировано"
 
 #~ msgid "Select a channel and property"
 #~ msgstr "Выбрать канал и свойство"
diff --git a/po/si.po b/po/si.po
index 6aaacf3..62f812b 100644
--- a/po/si.po
+++ b/po/si.po
@@ -1,15 +1,17 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Danishka Navin, 2010.
+#: ../xfsettingsd/main.c:127
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-14 00:05+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-03-10 09:30+0530\n"
 "Last-Translator: Danishka Navin\n"
 "Language-Team: American English <kde-i18n-doc at kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,7 +84,9 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "යතුරු පහර දෙකක් අතර අවැසි කාලය, මිලි තත්පර"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
@@ -98,7 +102,9 @@ msgid "The time, in milliseconds, between repeated motion events"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
@@ -106,11 +112,15 @@ msgid "The time, in milliseconds, to get to maximum speed"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
@@ -126,19 +136,28 @@ msgid "Use slow _keys"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
@@ -182,38 +201,38 @@ msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "අනුවාද තොරතුරු"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr " Xfce සංවර්ධක කණ්ඩායම. සියලු හිමිකම් ඇවරිණි."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "කරුණාකර දෝෂ <%s> වෙත වාර්තා කරන්න"
@@ -223,7 +242,8 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
@@ -233,6 +253,7 @@ msgid "Appearance"
 msgstr "පෙනුම"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "දෙකම"
 
@@ -282,7 +303,9 @@ msgid "Event sounds"
 msgstr "සිද්ධි ශබ්ද"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
@@ -294,11 +317,16 @@ msgid "Icons"
 msgstr "නිරූපක"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
@@ -312,11 +340,13 @@ msgstr "මෙනු සහ බොත්තම්"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "කිසිවක් නැත"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
@@ -353,7 +383,9 @@ msgid "Specify whether icons should be displayed next to text in buttons"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
@@ -369,7 +401,9 @@ msgid "Text"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
@@ -408,24 +442,48 @@ msgstr "සිරස් RGB"
 msgid "Vertical BGR"
 msgstr "සිරස් BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
 msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "අනුවාද තොරතුරු"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "සංදර්ශකය"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "විභේදනය (_e): "
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "විභේදනය (_e): "
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr ""
@@ -434,86 +492,142 @@ msgstr ""
 msgid "Ro_tation:"
 msgstr "පෙරළුම (_t):"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+msgid "_Use this output"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "සංදර්ශකය"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 #, fuzzy
 msgid "Normal"
 msgstr "සාමාන්‍ය"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "වම්"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "යටිකුරු"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "දකුණු"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "දෙකම තිරස්ව"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "සිරස් RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
+msgid "%.1f Hz"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
-msgid "The Resize and Rotate extension (RandR) is not enabled on this display. Try to enable it and run the dialog again."
+#: ../dialogs/display-settings/main.c:653
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr ""
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+msgid "Unable to start the Xfce Display Settings"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "සැකසුම්"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "සැකසුම්"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, c-format
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.1 is required at least"
+msgid "The video driver does not support video outputs"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "ඩිජිටල් සංදර්ශකය"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "ද්විතීය මොනිටරය"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "ද්විතීය ඩිජිටල් සංදර්ශකය"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -617,7 +731,9 @@ msgid "Show _blinking"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
@@ -645,7 +761,9 @@ msgid "Use this area to _test the settings above:"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
@@ -711,7 +829,9 @@ msgid "Reset to Defaults"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:931
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:996
@@ -783,7 +903,9 @@ msgid "Re_verse scroll direction"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
-msgid "Set the acceleration and threshold for the selected device to the default values"
+msgid ""
+"Set the acceleration and threshold for the selected device to the default "
+"values"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
@@ -795,19 +917,25 @@ msgid "T_hreshold:"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
-msgid "The number of pixels the pointer must move before a drag operation will start"
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
@@ -815,7 +943,9 @@ msgid "Ti_me:"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
@@ -902,7 +1032,9 @@ msgstr ""
 
 #: ../xfce4-settings-editor/main_window.c:1004
 #, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
 msgstr ""
 
 #: ../xfce4-settings-editor/main_window.c:1013
@@ -1041,13 +1173,11 @@ msgstr ""
 msgid "Bounce keys"
 msgstr "පොළා පැනීම් යතුරු"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr ""
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "වැඩ අවකාශය %d"
@@ -1105,3 +1235,12 @@ msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Second monitor"
+#~ msgstr "ද්විතීය මොනිටරය"
+
+#~ msgid "Second digital display"
+#~ msgstr "ද්විතීය ඩිජිටල් සංදර්ශකය"
diff --git a/po/sk.po b/po/sk.po
index 36fc6ec..2cae9dd 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: i 18n.xfce.org\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-23 20:55+0100\n"
 "Last-Translator: Robert Hartl <hartl.robert at gmail.com>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -208,38 +209,38 @@ msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Informácie o verzii"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Informácie o použití získate stlačením '%s --help'"
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Vývojársky tým Xfce. Všetky práva vyhradené."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Prosíme, nahláste chyby na <%s>."
@@ -259,6 +260,7 @@ msgid "Appearance"
 msgstr "Vzhľad"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Oboje"
 
@@ -352,6 +354,7 @@ msgstr "Ponuky a tlačidlá"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Žiadne"
 
@@ -456,24 +459,48 @@ msgstr "Zvislé RGB"
 msgid "Vertical BGR"
 msgstr "Zvislé BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Použiť všetky zmeny a vyskúšať nové nastavenia displeja"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Informácie o verzii"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Nastavenia konfigurácie obrazovky a rozloženia"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "_Rozlíšenie"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "_Rozlíšenie"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Obnovovacia _frekvencia:"
@@ -482,93 +509,145 @@ msgstr "Obnovovacia _frekvencia:"
 msgid "Ro_tation:"
 msgstr "O_točenie:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Podrobný výstup"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Monitor"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normálne"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Vľavo"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Obrátené"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Vprávo"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Oboje horizontálne"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Zvislé RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Obrazovka %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Na displeji „%s“ chýba rozšírenie RandR"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Rozšírenie pre rotáciu a zmenu veľkosti (RandR) nie je na tomto displeji "
-"povolené. Povolte ho a znovu spustite dialógové okno."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Použitie rozšírenia RandR zlyhalo"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Nie je možné zistiť používanú verziu rozšírenia RandR"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Použiť všetky zmeny a vyskúšať nové nastavenia displeja"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Nastavenia"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Nastavenia"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Tento systém používa RandR %d.%d. Pre toto nastavenie displeja je požadovaná "
 "verzia aspoň verzie 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Laptop"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televízor"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Digitálny displej"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Druhý monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Druhý digitálny displej"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1126,13 +1205,11 @@ msgstr "Zdvojené klávesy sú zakázané"
 msgid "Bounce keys"
 msgstr "Zdvojené klávesy"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Spustiť vo ladiacom režime (proces nebude spustený na pozadí)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Pracovná plocha %d"
@@ -1193,6 +1270,31 @@ msgstr ""
 "%s: %s\n"
 "Úplný zoznam volieb príkazového riadku získate príkazom %s --help.\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Obrazovka %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Na displeji „%s“ chýba rozšírenie RandR"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Rozšírenie pre rotáciu a zmenu veľkosti (RandR) nie je na tomto displeji "
+#~ "povolené. Povolte ho a znovu spustite dialógové okno."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Použitie rozšírenia RandR zlyhalo"
+
+#~ msgid "Second monitor"
+#~ msgstr "Druhý monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "Druhý digitálny displej"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "Vlastnosť <b>%s</b>“ nemôže byť obnovená pretože je uzamknutá"
 
diff --git a/po/sv.po b/po/sv.po
index ef9a10b..d20e0bd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2009-12-16 17:17+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -215,38 +216,38 @@ msgstr "UTTAGS-ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Versionsinformation"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Ange \"%s --help\" för användningsinformation."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "The Xfce development team. Alla rättigheter är reserverade."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Rapportera fel till <%s>."
@@ -268,6 +269,7 @@ msgid "Appearance"
 msgstr "Utseende"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "BÃ¥da"
 
@@ -364,6 +366,7 @@ msgstr "<b>Menyer och knappar</b>"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Ingen"
 
@@ -471,24 +474,48 @@ msgstr "Vertikal RGB"
 msgid "Vertical BGR"
 msgstr "Vertikal BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Verkställ ändringar och testa de nya visningsinställningarna"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Versionsinformation"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Konfigurera skärminställningar och -layout"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Skärm"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "U_pplösning:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "U_pplösning:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Uppdaterings_frekvens:"
@@ -497,93 +524,145 @@ msgstr "Uppdaterings_frekvens:"
 msgid "Ro_tation:"
 msgstr "Ro_tation:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Informativ utmatning"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Skärm"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Vänster"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Inverterad"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Höger"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "BÃ¥da horisontellt"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Vertikal RGB"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Skärm %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "RandR-utökningen saknas på display \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Utökningen Resize and Rotate (RandR) är inte aktiverad på denna display. "
-"Prova att aktivera den och kör dialogrutan igen."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Misslyckades med att använda RandR-utökningen"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Kunde inte fråga efter vilken version av RandR-utökningen som används"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Verkställ ändringar och testa de nya visningsinställningarna"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Inställningar"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Inställningar"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Detta system använder RandR %d.%d. För att skärminställningarna ska fungera "
 "krävs minst version 1.1"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Bärbar dator"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Television"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Digital skärm"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Sekundär skärm"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Sekundär digital skärm"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1156,13 +1235,11 @@ msgstr "Studsande tangenter är inaktiverat"
 msgid "Bounce keys"
 msgstr "Studsande tangenter"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Starta i felsökningsläge (grena inte processen till bakgrunden)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbetsyta %d"
@@ -1224,6 +1301,31 @@ msgstr ""
 "Prova %s --help för att se en komplett lista över tillgängliga "
 "kommandoradsflaggor.\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "Skärm %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "RandR-utökningen saknas på display \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Utökningen Resize and Rotate (RandR) är inte aktiverad på denna display. "
+#~ "Prova att aktivera den och kör dialogrutan igen."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Misslyckades med att använda RandR-utökningen"
+
+#~ msgid "Second monitor"
+#~ msgstr "Sekundär skärm"
+
+#~ msgid "Second digital display"
+#~ msgstr "Sekundär digital skärm"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr ""
 #~ "Egenskapen \"<b>%s</b>\" kan inte återställas därför att den är låst"
diff --git a/po/tr.po b/po/tr.po
index a2423c8..4fd8dd1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings 0.0.1-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2009-01-30 20:57+0200\n"
 "Last-Translator: Gökmen Görgen <gkmngrgn at gmail.com>\n"
 "Language-Team: Turkish <turkce at pardus.org.tr>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -214,38 +215,38 @@ msgstr "SOKET KİMLİĞİ"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Sürüm bilgisi"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Kullanım kılavuzu için \"%s --help\" yazın."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce geliştirici takımı. Tüm hakları saklıdır."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Lütfen hatayı bize bildirin: <%s>."
@@ -267,6 +268,7 @@ msgid "Appearance"
 msgstr "Görünüm"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Her Ä°kisi"
 
@@ -364,6 +366,7 @@ msgstr "<b>Menüler ve Butonlar</b>"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -475,24 +478,49 @@ msgstr "Dikey RGB"
 msgid "Vertical BGR"
 msgstr "Dikey BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Değişiklikleri uygula ve yeni görüntü ayarlarını dene"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Sürüm bilgisi"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+#, fuzzy
+msgid "Keep this configuration"
+msgstr "Pencere yöneticisi eylemini sakla"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Ekran ayarlarını ve yerleşimini yapılandırın"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Görüntü"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "Çözünür_lük:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "Çözünür_lük:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Tazeleme _oranı:"
@@ -501,93 +529,145 @@ msgstr "Tazeleme _oranı:"
 msgid "Ro_tation:"
 msgstr "Dön_dürme:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Bu eylemi kullan"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Görüntü Ayarları"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Sol"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Ters çevrilmiş"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "SaÄŸ"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Her Ä°kisi Yatay"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Dikey RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
 msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
-#, fuzzy, c-format
-msgid "Screen %d"
-msgstr "Ekran"
+#: ../dialogs/display-settings/main.c:173
+#, c-format
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "\"%s\" ekranında RandR eklentisi eksik"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"Yeniden boyutlandırma ve döndürme eklentisi (RandR) bu ekranda etkin değil. "
-"Onu etkinleştirip bu pencereyi tekrar çalıştırmayı deneyin."
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "RandR eklentisi kullanılamadı"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Kullanılan RandR eklentisinin sürüm numarası bilinmiyor"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Xfce 4 Görüntü Ayarları"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Ayarlar"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Ayarlar"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "Bu sistem, RandR %d.%d kullanıyor. Ayarları görüntülemek için, en az 1.1 "
 "sürümü gereklidir."
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Laptop"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Ekran"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Televizyon"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Sayısal görüntü"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Ä°kinci ekran"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "İkinci sayısal görüntü"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1156,13 +1236,11 @@ msgstr "Tutuklu tuÅŸlar etkin deÄŸil"
 msgid "Bounce keys"
 msgstr "Tutuklu tuÅŸlar"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Hata ayıklayıcı modunda başlat (Artalana çatallanma)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Çalışma Alanı %d"
@@ -1224,6 +1302,32 @@ msgstr ""
 "%s: %s\n"
 "Komut satırı seçeneklerinin tüm listesini görmek için, %s --help yazın.\n"
 
+#~ msgid "Apply any changes and test the new display settings"
+#~ msgstr "Değişiklikleri uygula ve yeni görüntü ayarlarını dene"
+
+#, fuzzy
+#~ msgid "Screen %d"
+#~ msgstr "Ekran"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "\"%s\" ekranında RandR eklentisi eksik"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Yeniden boyutlandırma ve döndürme eklentisi (RandR) bu ekranda etkin "
+#~ "değil. Onu etkinleştirip bu pencereyi tekrar çalıştırmayı deneyin."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "RandR eklentisi kullanılamadı"
+
+#~ msgid "Second monitor"
+#~ msgstr "Ä°kinci ekran"
+
+#~ msgid "Second digital display"
+#~ msgstr "İkinci sayısal görüntü"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "\"<b>%s</b>\" özelliği sıfırlanamaz; çünkü kilitli"
 
@@ -1361,12 +1465,6 @@ msgstr ""
 #~ msgid "Xfce 4 Appearance Settings"
 #~ msgstr "Xfce 4 Görünüm Ayarları"
 
-#~ msgid "Display Settings"
-#~ msgstr "Görüntü Ayarları"
-
-#~ msgid "Xfce 4 Display Settings"
-#~ msgstr "Xfce 4 Görüntü Ayarları"
-
 #~ msgid "Keyboard Settings"
 #~ msgstr "Klavye Ayarları"
 
@@ -1389,9 +1487,6 @@ msgstr ""
 #~ "Bu kısayol zaten <b>başka bir pencere yöneticisi eylemi</b> tarafından "
 #~ "kullanılıyor. Hangi eylemi kullanmak istersiniz?"
 
-#~ msgid "Use this action"
-#~ msgstr "Bu eylemi kullan"
-
 #~ msgid "Keep the other one"
 #~ msgstr "DiÄŸerini sakla"
 
@@ -1415,9 +1510,6 @@ msgstr ""
 #~ "Kısayol zaten bir <b>pencere yöneticisi eylemi</b> tarafından "
 #~ "kullanılıyor. Hangi eylemi kullanmak istersiniz?"
 
-#~ msgid "Keep the window manager action"
-#~ msgstr "Pencere yöneticisi eylemini sakla"
-
 #~ msgid "Conflicting actions for %s"
 #~ msgstr "%s için çelişen eylemler"
 
@@ -1478,4 +1570,4 @@ msgstr ""
 #~ msgstr "Çelişen kısayol"
 
 #~ msgid "The shortcut '%s' is already being used for something else."
-#~ msgstr "'%s' kısayolu zaten başka bir şey için kullanılıyor."
\ No newline at end of file
+#~ msgstr "'%s' kısayolu zaten başka bir şey için kullanılıyor."
diff --git a/po/ug.po b/po/ug.po
index 95b2ef9..bde4943 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings 4.5.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-20 20:21+0900\n"
 "Last-Translator: Gheyret T.Kenji <gheyret at gmail.com>\n"
 "Language-Team:Uyghur Computer Science Association <UKIJ at yahoogroups.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -193,38 +194,38 @@ msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "نەشر ئۇچۇرى"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "'%s --help' كىرگۈزسە ئىشلىتىش ئۇسۇلىنى كۆرگىلى بولىدۇ"
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce ئىجادىيەت گۇرۇپپىسى. All rights reserved."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "كەمتۈكنى <%s> غا دوكلات قىلىڭ."
@@ -244,6 +245,7 @@ msgid "Appearance"
 msgstr "كۆرۈنۈشى"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "ئىككىلىسى"
 
@@ -317,7 +319,9 @@ msgstr ""
 msgid ""
 "Many fonts contain information that provides extra hints as to how best draw "
 "the font; pick whichever looks best according to personal preference"
-msgstr "نۇرغۇن فونتلاردا hints ئۇچۇرلىرى بار بولۇپ، بۇ فونتنى تېخىمۇ چىرايلىق كۆرسىتىش رولىنى ئوينايدۇ. قايسى ئەڭ چىرايلىق كۆرۈنگەن بولسا شۇنى تاللاڭ"
+msgstr ""
+"نۇرغۇن فونتلاردا hints ئۇچۇرلىرى بار بولۇپ، بۇ فونتنى تېخىمۇ چىرايلىق "
+"كۆرسىتىش رولىنى ئوينايدۇ. قايسى ئەڭ چىرايلىق كۆرۈنگەن بولسا شۇنى تاللاڭ"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
 msgid "Medium"
@@ -329,13 +333,16 @@ msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "يوق"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
 msgid ""
 "Override the detected monitor resolution if fonts look too large or too small"
-msgstr "فونت بەك چوڭ ياكى بەك كىچىك بولۇپ قالغاندا مۇشۇ تاللانما ئارىلىق ياخشىلاشقا بولىدۇ. بۇ ئېكراننىڭ ئېنىقلىقىدىنمۇ ئاۋۋال نەزەرگە ئېلىنىدۇ."
+msgstr ""
+"فونت بەك چوڭ ياكى بەك كىچىك بولۇپ قالغاندا مۇشۇ تاللانما ئارىلىق ياخشىلاشقا "
+"بولىدۇ. بۇ ئېكراننىڭ ئېنىقلىقىدىنمۇ ئاۋۋال نەزەرگە ئېلىنىدۇ."
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
 msgid "Rendering"
@@ -373,7 +380,9 @@ msgstr "بۇ تاللانما تاللانسا توپچا تېكىستنىڭ ي
 msgid ""
 "Specify whether mouse clicks and other user input will cause event sounds to "
 "play"
-msgstr "چاشقىنەك چېكىلگەندە ۋە باشقا كىرگۈزۈش مەشغۇلاتى بولغاندا ئاۋاز چىقىرىش چىقارماسلىقنى بەلگىلەيدۇ"
+msgstr ""
+"چاشقىنەك چېكىلگەندە ۋە باشقا كىرگۈزۈش مەشغۇلاتى بولغاندا ئاۋاز چىقىرىش "
+"چىقارماسلىقنى بەلگىلەيدۇ"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
 msgid "St_yle"
@@ -429,24 +438,48 @@ msgstr "ۋېرتىكال RGB"
 msgid "Vertical BGR"
 msgstr "ۋېرتىكال GBR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "ئۆزگىرىشلەرنى قوللىنىش ۋە يېڭى تەڭشەكنى ئىشلىتىپ سىناش"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "نەشر ئۇچۇرى"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "ئېكراننىڭ ئورۇنلاشتۇرۇلۇشى ۋە ئېنىقلىقىنى تەڭشەش"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "كۆرسەت"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "ئېنىقلىق(_E):"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "ئېنىقلىق(_E):"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "چاستوتىسى(_R):"
@@ -455,89 +488,143 @@ msgstr "چاستوتىسى(_R):"
 msgid "Ro_tation:"
 msgstr "ئايلاندۇرۇش(_T):"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+msgid "_Use this output"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "كۆرسەت"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "نورمال"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "سول"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "تەتۈر قىلىش"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "ئوڭ"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "ئىككىلىسى (گورىزونتال)"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "ۋېرتىكال RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
 msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "ئېكران %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "ئېكران \"%s\" نىڭ RandR كېڭەيتىلمىسى يوق ئىكەن"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
-msgstr "چوڭلۇقىنى ئۆزگەرتىش ۋە ئايلاندۇرۇش كېڭەيتىلمىسى (RandR) چەكلىنىپتۇ. ئۇنىڭ چەكلىمىسى يوق قىلىپ ئاندىن بۇ دىئالوگنى قايتا ئىجرا قىلىڭ"
+"The last active output must not be disabled, the system would be unusable."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "RandR كېڭەيتىلمىسىنى ئىشلىتىش مەغلۇپ بولدى"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "ئىشلىتىلىۋاتقان RandR كېڭەيتىلمىسىنىڭ نەشرىنى سۈرۈشتۈرگىلى بولمىدى"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "ئۆزگىرىشلەرنى قوللىنىش ۋە يېڭى تەڭشەكنى ئىشلىتىپ سىناش"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "تەڭشەكلەر"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "تەڭشەكلەر"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
-msgstr "سىستېمىدا RandR %d.%d ئىشلىتىلىۋېتىپتۇ.  نەشر چوقۇم 1.1 دىن چوڭ بولۇشى كېرەك."
+"1.2 is required at least"
+msgstr ""
+"سىستېمىدا RandR %d.%d ئىشلىتىلىۋېتىپتۇ.  نەشر چوقۇم 1.1 دىن چوڭ بولۇشى كېرەك."
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Laptop"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "تېلېۋىزور"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "رەقەملىك ئېكران"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "ئىككىنچى monitor"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "ئىككىنچى رەقەملىك ئېكران"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -740,11 +827,15 @@ msgstr "كۆڭۈلدىكىگە قايتۇر"
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
-msgstr "بۇ بارلىق تېزلەتمىلەرنىڭ كۆڭۈلدىكى قىممەتلىرىنى ئەسلىگە كەلتۈرۈۋاتىدۇ. بۇنى قىلسۇنمۇ؟"
+msgstr ""
+"بۇ بارلىق تېزلەتمىلەرنىڭ كۆڭۈلدىكى قىممەتلىرىنى ئەسلىگە كەلتۈرۈۋاتىدۇ. بۇنى "
+"قىلسۇنمۇ؟"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:996
 msgid "The system defaults will be restored next time you log in."
-msgstr "سىستېمىنىڭ كۆڭۈلدىكى قىممەتلىرى كېيىنكى قېتىم سىستېمىغا كىرگەندە ئەسلىگە قايتىدۇ."
+msgstr ""
+"سىستېمىنىڭ كۆڭۈلدىكى قىممەتلىرى كېيىنكى قېتىم سىستېمىغا كىرگەندە ئەسلىگە "
+"قايتىدۇ."
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:998
 msgid "Warning"
@@ -814,7 +905,8 @@ msgstr ""
 msgid ""
 "Set the acceleration and threshold for the selected device to the default "
 "values"
-msgstr "تاللانغان ئۈسكىنىنىڭ تېزلەتكۈچى ۋە بوسۇغا قىممىتىنى كۆڭۈلدىكى قىممەتكە تەڭشە"
+msgstr ""
+"تاللانغان ئۈسكىنىنىڭ تېزلەتكۈچى ۋە بوسۇغا قىممىتىنى كۆڭۈلدىكى قىممەتكە تەڭشە"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
 msgid "Size"
@@ -854,7 +946,9 @@ msgstr "ۋاقىت(_M):"
 msgid ""
 "Two mouse clicks in less than this length of time (in milliseconds) will be "
 "considered a double click"
-msgstr "2 قېتىملىق چاشقىنەك كۇنۇپكىسىنىڭ چېكىلىش ئارىلىقى(ms) بۇنىڭدىن كىچىك بولۇپ قالسا قوش چېكىلىش دەپ قارالسۇن"
+msgstr ""
+"2 قېتىملىق چاشقىنەك كۇنۇپكىسىنىڭ چېكىلىش ئارىلىقى(ms) بۇنىڭدىن كىچىك بولۇپ "
+"قالسا قوش چېكىلىش دەپ قارالسۇن"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
 msgid "When selected, the scroll wheel will work in the opposite direction"
@@ -943,12 +1037,16 @@ msgstr "root ئېلېمېنت (\"/\") ئىناۋەتلىك خاسلىق ئاتى
 msgid ""
 "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
 "'-', '<' and '>', as well as '/' as a separator"
-msgstr "خاسلىق ئاتىدا پەقەتلا ASCII دىكى A-Z، a-z، 0-9، \"_\"، \"-\"، \"<\" ۋە  \">\" ھەرپلىرىنى، بۆلگۈچ قىلىپ \"/\" نىلا ئىشلەتكىلى بولىدۇ"
+msgstr ""
+"خاسلىق ئاتىدا پەقەتلا ASCII دىكى A-Z، a-z، 0-9، \"_\"، \"-\"، \"<\" ۋە  \">"
+"\" ھەرپلىرىنى، بۆلگۈچ قىلىپ \"/\" نىلا ئىشلەتكىلى بولىدۇ"
 
 #: ../xfce4-settings-editor/main_window.c:1013
 #, c-format
 msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "خاسلىق ئاتىغا ئارقىمۇ-ئارقا كەلگەن ئىككىدىن ياكى ئۇنىڭدىن ئارتۇق \"/\" نى ئىشلىتىشكە بولمايدۇ"
+msgstr ""
+"خاسلىق ئاتىغا ئارقىمۇ-ئارقا كەلگەن ئىككىدىن ياكى ئۇنىڭدىن ئارتۇق \"/\" نى "
+"ئىشلىتىشكە بولمايدۇ"
 
 #: ../xfce4-settings-editor/main_window.c:1024
 #, c-format
@@ -1081,13 +1179,11 @@ msgstr "Bounce كۇنۇپكىلارنى ئىشلەتكىلى بولمايدۇ"
 msgid "Bounce keys"
 msgstr "Bounce كۇنۇپكىلار"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "debug ھالىتىدە قوزغات (don't fork to the background)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Workspace %d"
@@ -1144,8 +1240,32 @@ msgstr "ئىجرا قىلىنىۋاتقان xsettings daemon (بار بولسا)
 msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
-msgstr "%s: %s\n"
-"%s --help نى كىرگۈزسە، بۇيرۇق قۇرىدا ئىشلەتكىلى بولىدىغان بارلىق تاللانمىلار كۆرسىتىلىدۇ.\n"
+msgstr ""
+"%s: %s\n"
+"%s --help نى كىرگۈزسە، بۇيرۇق قۇرىدا ئىشلەتكىلى بولىدىغان بارلىق تاللانمىلار "
+"كۆرسىتىلىدۇ.\n"
+
+#~ msgid "Screen %d"
+#~ msgstr "ئېكران %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "ئېكران \"%s\" نىڭ RandR كېڭەيتىلمىسى يوق ئىكەن"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "چوڭلۇقىنى ئۆزگەرتىش ۋە ئايلاندۇرۇش كېڭەيتىلمىسى (RandR) چەكلىنىپتۇ. ئۇنىڭ "
+#~ "چەكلىمىسى يوق قىلىپ ئاندىن بۇ دىئالوگنى قايتا ئىجرا قىلىڭ"
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "RandR كېڭەيتىلمىسىنى ئىشلىتىش مەغلۇپ بولدى"
+
+#~ msgid "Second monitor"
+#~ msgstr "ئىككىنچى monitor"
+
+#~ msgid "Second digital display"
+#~ msgstr "ئىككىنچى رەقەملىك ئېكران"
 
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "プロパティ \"<b>%s</b>\" はロックされているためリセットできません"
diff --git a/po/uk.po b/po/uk.po
index a3ef00b..11bbb1c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,18 +2,21 @@
 # Copyright (C) 2008 Dmitry Nikitin
 # This file is distributed under the same license as the xfce4-settings package.
 # Dmitry Nikitin <luckas_fb at mail.ru>, 2008.
+#: ../xfsettingsd/main.c:127
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-05 12:05+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2009-01-26 16:20+0200\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
 "Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
@@ -78,8 +81,12 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "Кількість часу, в мілісекундах, необхідного між повторами клавіатури"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
-msgstr "Кількість часу в мілісекундах, що має минути до натискання клавіші, що буде прийнята"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
+msgstr ""
+"Кількість часу в мілісекундах, що має минути до натискання клавіші, що буде "
+"прийнята"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid "The maximum pointer speed after acceleration"
@@ -87,27 +94,41 @@ msgstr "Максимальна швидкість вказівника післ
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
 msgid "The ramp used to reach maximum pointer speed"
-msgstr "Поріг що використовується для досягнення максимальної швидкості вказівника"
+msgstr ""
+"Поріг що використовується для досягнення максимальної швидкості вказівника"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
 msgid "The time, in milliseconds, between repeated motion events"
 msgstr "Час в мілісекундах, між повторюваними подіями переміщення"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
-msgstr "Час в мілісекундах, між початковим натисненням клавіші і першою подією переміщення"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
+msgstr ""
+"Час в мілісекундах, між початковим натисненням клавіші і першою подією "
+"переміщення"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid "The time, in milliseconds, to get to maximum speed"
 msgstr "Час в мілісекундах, до отримання максимальної швидкості"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
-msgstr "Для попередження випадкового натиснення клавіш, повільні клавіші потребують щоб була натиснута клавіша протягом деякого часу перед тим, як комбінація клавіш буде прийнята"
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
+msgstr ""
+"Для попередження випадкового натиснення клавіш, повільні клавіші потребують "
+"щоб була натиснута клавіша протягом деякого часу перед тим, як комбінація "
+"клавіш буде прийнята"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
-msgstr "Для попередження випадкового натиснення кількох комбінацій клавіш,спеціальні клавіші потребують мінімальної затримки між комбінаціями"
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
+msgstr ""
+"Для попередження випадкового натиснення кількох комбінацій клавіш,спеціальні "
+"клавіші потребують мінімальної затримки між комбінаціями"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
 msgid "Use _bounce keys"
@@ -122,20 +143,38 @@ msgid "Use slow _keys"
 msgstr "Використовувати пові_льні клавіші"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
-msgstr "Коли вибрано, модифікатори клавіш (такі як Control, Alt, і Shift) не потрібно затискати (вони можуть бути натиснуті і відпущені) коли кілька клавіш необхідно було б натиснути в той самий час"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
+msgstr ""
+"Коли вибрано, модифікатори клавіш (такі як Control, Alt, і Shift) не "
+"потрібно затискати (вони можуть бути натиснуті і відпущені) коли кілька "
+"клавіш необхідно було б натиснути в той самий час"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
-msgstr "Коли вибрано, модифікатори клавіш (такі як Control, Alt, і Shift) будуть тимчасово зафіксовані в натиснутому стані, доки не будуть натиснуті знову"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
+msgstr ""
+"Коли вибрано, модифікатори клавіш (такі як Control, Alt, і Shift) будуть "
+"тимчасово зафіксовані в натиснутому стані, доки не будуть натиснуті знову"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
-msgstr "Коли вибрано, властивість \"липкі клавіші\" буде вимкнуто, якщо дві клавіші будуть натиснуті одночасно"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
+msgstr ""
+"Коли вибрано, властивість \"липкі клавіші\" буде вимкнуто, якщо дві клавіші "
+"будуть натиснуті одночасно"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
-msgstr "Коли вибрано, вказівник миші може контролюватись з допомогою цифрової клавіатури"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
+msgstr ""
+"Коли вибрано, вказівник миші може контролюватись з допомогою цифрової "
+"клавіатури"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
 msgid "_Acceleration delay:"
@@ -175,38 +214,38 @@ msgstr "ID сокета"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "Інформація про версію"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Наберіть '%s --help' для використання."
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Команда розробників Xfce. Всі права застережено."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Звіти про помилки для <%s>."
@@ -216,8 +255,11 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr "Покращення доступності миші і клавіатури"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
-msgstr "Anti-aliasing, або згладжування шрифту, це може поліпшити зовнішній вигляд тексту на екрані"
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgstr ""
+"Anti-aliasing, або згладжування шрифту, це може поліпшити зовнішній вигляд "
+"тексту на екрані"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
@@ -225,6 +267,7 @@ msgid "Appearance"
 msgstr "Зовнішній вигляд"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Значки та текст"
 
@@ -267,15 +310,20 @@ msgstr "Увімкну_ти вхідні фонові звуки"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
-msgstr "Увімкнути чи вимкнути звуки подій глобально (потребує підтримки \"Canberra\")"
+msgstr ""
+"Увімкнути чи вимкнути звуки подій глобально (потребує підтримки \"Canberra\")"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
 msgid "Event sounds"
 msgstr "Звуки подій"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
-msgstr "Якість шрифту на TFT або LCD екранах можна значно покращити за рахунок вибору правильного вибору суб-піксельного параметру екрану"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
+msgstr ""
+"Якість шрифту на TFT або LCD екранах можна значно покращити за рахунок "
+"вибору правильного вибору суб-піксельного параметру екрану"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
 msgid "Full"
@@ -286,12 +334,23 @@ msgid "Icons"
 msgstr "Значки"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
-msgstr "Якщо вибрано, комбінації клавіш для пунктів меню можуть бути змінені шляхом зависання вказівника миші над пунктом меню і натисканням нової комбінації клавіш швидкого доступу"
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
+msgstr ""
+"Якщо вибрано, комбінації клавіш для пунктів меню можуть бути змінені шляхом "
+"зависання вказівника миші над пунктом меню і натисканням нової комбінації "
+"клавіш швидкого доступу"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
-msgstr "Багато шрифтів мають інформацію, що забезпечує додаткові можливості, такі як краще відображати шрифт; підібрати найкращий вигляд відповідно до особистих вподобань"
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
+msgstr ""
+"Багато шрифтів мають інформацію, що забезпечує додаткові можливості, такі як "
+"краще відображати шрифт; підібрати найкращий вигляд відповідно до особистих "
+"вподобань"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
 msgid "Medium"
@@ -303,12 +362,16 @@ msgstr "Меню і кнопки"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Нічого"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
-msgstr "Замінити визначену роздільну здатність монітора, якщо шрифти виглядають надто великими або маленькими"
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
+msgstr ""
+"Замінити визначену роздільну здатність монітора, якщо шрифти виглядають "
+"надто великими або маленькими"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
 msgid "Rendering"
@@ -343,7 +406,9 @@ msgid "Specify whether icons should be displayed next to text in buttons"
 msgstr "Визначитись чи відображати значки разом з текстом на кнопках"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
 msgstr "Визначитись чи програвати звуки при клацанні миші та інших подіях"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
@@ -359,8 +424,12 @@ msgid "Text"
 msgstr "Текст"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
-msgstr "Цей шрифт буде використовуватись як типовий шрифт для відображення тексту в інтерфейсі користувача"
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
+msgstr ""
+"Цей шрифт буде використовуватись як типовий шрифт для відображення тексту в "
+"інтерфейсі користувача"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
 msgid "_Fonts"
@@ -398,24 +467,48 @@ msgstr "Вертикальний RGB"
 msgid "Vertical BGR"
 msgstr "Вертикальний BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "Застосувати будь-які зміни і протестувати нові параметри дисплею"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "Інформація про версію"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "Налаштувати параметри екрану та клавіатури"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "Дисплей"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "Р_оздільна здатність:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "Р_оздільна здатність:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "Часто_та оновлення:"
@@ -424,85 +517,145 @@ msgstr "Часто_та оновлення:"
 msgid "Ro_tation:"
 msgstr "Об_ертання:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "Докладний вивід"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "Дисплей"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Звичайний"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Вліво"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Перевернути"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Вправо"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Гц"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "Обидва горизонтально"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "Вертикальний RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "Екран %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "Розширення RandR відсутнє для дисплею \"%s\""
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
-msgid "The Resize and Rotate extension (RandR) is not enabled on this display. Try to enable it and run the dialog again."
-msgstr "Розширення Зміна розміру та обертання (RandR) не дозволена для цього дисплею. Спробуй увімкнути його і запустити діалог знову."
+#: ../dialogs/display-settings/main.c:653
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "Не вдалось використати розширення RandR"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Неможливо запитати версію розширення RandR, що зараз використовується"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "Застосувати будь-які зміни і протестувати нові параметри дисплею"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "Параметри"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "Параметри"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+"Ця система використовує RandR %d.%d. Щоб побачити властивості роботи, "
+"необхідна версія 1.1 або вище"
+
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.1 is required at least"
-msgstr "Ця система використовує RandR %d.%d. Щоб побачити властивості роботи, необхідна версія 1.1 або вище"
+msgid "The video driver does not support video outputs"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "Ноутбук"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "Монітор"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "Телевізор"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "Цифровий дисплей"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "Другий монітор"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "Другий цифровий дисплей"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -604,8 +757,12 @@ msgid "Show _blinking"
 msgstr "Показувати бл_имання"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
-msgstr "Визначитись чи розкладки клавіатури будуть контролюватись через діалог властивостей, чи через X сервер"
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
+msgstr ""
+"Визначитись чи розкладки клавіатури будуть контролюватись через діалог "
+"властивостей, чи через X сервер"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
 msgid "Specify whether or not the text cursor blinks"
@@ -632,8 +789,12 @@ msgid "Use this area to _test the settings above:"
 msgstr "Використовуйте це поле для т_естування призначених вище властивостей:"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
-msgstr "Коли вибрано, натискання і утримування клавіші імітує той самий символ знову і знову"
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
+msgstr ""
+"Коли вибрано, натискання і утримування клавіші імітує той самий символ знову "
+"і знову"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
 msgid "_Enable key repeat"
@@ -698,12 +859,17 @@ msgid "Reset to Defaults"
 msgstr "Відновити типові"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:931
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
-msgstr "Цим можна скинути всі ярлики запуску до їх типових значень.Ви дійсно хочете це зробити?"
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
+msgstr ""
+"Цим можна скинути всі ярлики запуску до їх типових значень.Ви дійсно хочете "
+"це зробити?"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:996
 msgid "The system defaults will be restored next time you log in."
-msgstr "Типові системні установки будуть відновлені після наступного вашого входу."
+msgstr ""
+"Типові системні установки будуть відновлені після наступного вашого входу."
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:998
 msgid "Warning"
@@ -770,8 +936,11 @@ msgid "Re_verse scroll direction"
 msgstr "Інвертувати напря_м прокрутки"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
-msgid "Set the acceleration and threshold for the selected device to the default values"
-msgstr "Встановити прискорення і поріг для вибраного пристрою на типові значення"
+msgid ""
+"Set the acceleration and threshold for the selected device to the default "
+"values"
+msgstr ""
+"Встановити прискорення і поріг для вибраного пристрою на типові значення"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
 msgid "Size"
@@ -782,28 +951,45 @@ msgid "T_hreshold:"
 msgstr "По_ріг:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
-msgstr "Фактор, що впливає на збільшення швидкості вказівника при його переміщенні"
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
+msgstr ""
+"Фактор, що впливає на збільшення швидкості вказівника при його переміщенні"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
-msgstr "Вказівник миші не зможе переміститись вище цієї відстані ніж між два клацання для нього будуть означати подвійне клацання"
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
+msgstr ""
+"Вказівник миші не зможе переміститись вище цієї відстані ніж між два "
+"клацання для нього будуть означати подвійне клацання"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
-msgid "The number of pixels the pointer must move before a drag operation will start"
-msgstr "Кількість пікселів на які мусить зміститись вказівник, перш ніж почнеться операція пересування"
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
+msgstr ""
+"Кількість пікселів на які мусить зміститись вказівник, перш ніж почнеться "
+"операція пересування"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
-msgstr "Кількість пікселів на які мусить зміститись вказівник за короткий період, перш ніж почнеться прискорення"
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
+msgstr ""
+"Кількість пікселів на які мусить зміститись вказівник за короткий період, "
+"перш ніж почнеться прискорення"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
 msgid "Ti_me:"
 msgstr "Ч_ас:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
-msgstr "Два клацання миші за короткий період часу (в мілісекундах) яке буде вважатись за подвійне клацання"
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
+msgstr ""
+"Два клацання миші за короткий період часу (в мілісекундах) яке буде "
+"вважатись за подвійне клацання"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
 msgid "When selected, the scroll wheel will work in the opposite direction"
@@ -870,7 +1056,8 @@ msgstr "Відновити"
 
 #: ../xfce4-settings-editor/main_window.c:924
 msgid "Resetting a property will permanently remove those custom settings."
-msgstr "відновити властивості дозволить повністю видалити встановлені параметри."
+msgstr ""
+"відновити властивості дозволить повністю видалити встановлені параметри."
 
 #: ../xfce4-settings-editor/main_window.c:925
 #, c-format
@@ -889,13 +1076,19 @@ msgstr "Основний елемент ('/') не є правильною на
 
 #: ../xfce4-settings-editor/main_window.c:1004
 #, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
-msgstr "Назви властивостей можуть включати тільки символи ASCII A-Z, a-z, 0-9, '_', '-', '<' і '>', розділені символом '/'"
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Назви властивостей можуть включати тільки символи ASCII A-Z, a-z, 0-9, '_', "
+"'-', '<' і '>', розділені символом '/'"
 
 #: ../xfce4-settings-editor/main_window.c:1013
 #, c-format
 msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Назви властивостей не можуть включати дві або більше продовжуваних символів '/'"
+msgstr ""
+"Назви властивостей не можуть включати дві або більше продовжуваних символів "
+"'/'"
 
 #: ../xfce4-settings-editor/main_window.c:1024
 #, c-format
@@ -1028,13 +1221,11 @@ msgstr "Спеціальні клавіші вимкнуто"
 msgid "Bounce keys"
 msgstr "Спеціальні клавіші"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "Старт в режимі відлагодження (не йти у фоновий режим)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "Робоча область %d"
@@ -1095,6 +1286,31 @@ msgstr ""
 "%s: %s\n"
 "Спробуйте %s --help щоб переглянути повний список доступних опцій. \n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Гц"
+
+#~ msgid "Screen %d"
+#~ msgstr "Екран %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "Розширення RandR відсутнє для дисплею \"%s\""
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Розширення Зміна розміру та обертання (RandR) не дозволена для цього "
+#~ "дисплею. Спробуй увімкнути його і запустити діалог знову."
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "Не вдалось використати розширення RandR"
+
+#~ msgid "Second monitor"
+#~ msgstr "Другий монітор"
+
+#~ msgid "Second digital display"
+#~ msgstr "Другий цифровий дисплей"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "Властивість \"<b>%s</b>\" не може бути скинуто бо її заблоковано"
 
diff --git a/po/ur.po b/po/ur.po
index 5f4ce53..b662a88 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2009-05-14 02:29+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -215,38 +216,38 @@ msgstr "ساکٹ آئی ڈی"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "ورژن معلومات"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "ہدایات کے لیے '%s --help' لکھیں"
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "ایکسفس ترقی ٹیم. تمام حقوق محفوظ ہیں."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "براہ مہربانی غلطیوں کی رپورٹ <%s> پر کریں."
@@ -266,6 +267,7 @@ msgid "Appearance"
 msgstr "مظہر"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "دونوں"
 
@@ -363,6 +365,7 @@ msgstr "<b>مینیو اور بٹن</b>"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "کچھ نہیں"
 
@@ -471,24 +474,48 @@ msgstr "عمودی RGB"
 msgid "Vertical BGR"
 msgstr "عمودی BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "تبدیلیاں لاگو کریں اور نئی ڈسپلے ترتیبات کا تجربہ کریں"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "ورژن معلومات"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "سکرین کی ترتیبات اور خاکہ مرتب کریں"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "ڈسپلے"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "ریزیلوش_ن:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "ریزیلوش_ن:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "تازگی _ریٹ:"
@@ -497,93 +524,145 @@ msgstr "تازگی _ریٹ:"
 msgid "Ro_tation:"
 msgstr "_گھماؤ:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "پریشان کن ماحاصل"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "ڈسپلے"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "سادہ"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "بائیں"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "معکوس"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "دائیں"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "دونوں افقی"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "عمودی RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
 msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
-#, fuzzy, c-format
-msgid "Screen %d"
-msgstr "سکرین"
+#: ../dialogs/display-settings/main.c:173
+#, c-format
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "ڈسپلے \"%s\" پر رینڈر ایکسٹینشن مفقود ہے"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"جسامت کی تبدیلی (ری سائز) اور گھمانے کا دخیلہ (RandR) اس ڈسپلے پر فعال نہیں "
-"ہے۔ اسے فعال کرنے کی کوشش کریں اور اس مکالمے کو دوبارہ چلائیں۔"
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "رینڈر ایکسٹینشن استعمال کرنے میں ناکامی"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "استعمال ہو رہے رینڈر ایکسٹینشن کا ورژن پہچان میں نہیں آرہا"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "تبدیلیاں لاگو کریں اور نئی ڈسپلے ترتیبات کا تجربہ کریں"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "ترتیبات"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "ترتیبات"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "یہ سسٹم RandR %d %d استعمال کررہا ہے۔ ڈسپلے ترتیبات کو کام کرنے کے لئے کم از "
 "کم اس کا نسخہ 1.1 درکار ہے"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "لیپ ٹاپ"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "مانیٹر"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "ٹیلی ویژن"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "رقمی ڈسپلے"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "دوسرا مانیٹر"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "دوسرا رقمی ڈسپلے"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1151,13 +1230,11 @@ msgstr "باؤنس بٹن معطل ہیں"
 msgid "Bounce keys"
 msgstr "باؤنس بٹن"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "ڈی بگ موڈ میں چلائیں (پس منظر پر فورک مت کریں)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "مقام کار %d"
@@ -1219,6 +1296,29 @@ msgstr ""
 "%s: %s\n"
 "دستیاب کمانڈ لائن اختیارات کی مکمل فہرست کے لیے %s --help لکھیں.\n"
 
+#, fuzzy
+#~ msgid "Screen %d"
+#~ msgstr "سکرین"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "ڈسپلے \"%s\" پر رینڈر ایکسٹینشن مفقود ہے"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "جسامت کی تبدیلی (ری سائز) اور گھمانے کا دخیلہ (RandR) اس ڈسپلے پر فعال "
+#~ "نہیں ہے۔ اسے فعال کرنے کی کوشش کریں اور اس مکالمے کو دوبارہ چلائیں۔"
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "رینڈر ایکسٹینشن استعمال کرنے میں ناکامی"
+
+#~ msgid "Second monitor"
+#~ msgstr "دوسرا مانیٹر"
+
+#~ msgid "Second digital display"
+#~ msgstr "دوسرا رقمی ڈسپلے"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "خصوصیت \"<b>%s</b>\" مقفل نہیں کی جاسکتی کیونکہ یہ مقفل ہے"
 
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 5f4ce53..b662a88 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2009-05-14 02:29+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -215,38 +216,38 @@ msgstr "ساکٹ آئی ڈی"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "ورژن معلومات"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "ہدایات کے لیے '%s --help' لکھیں"
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "ایکسفس ترقی ٹیم. تمام حقوق محفوظ ہیں."
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "براہ مہربانی غلطیوں کی رپورٹ <%s> پر کریں."
@@ -266,6 +267,7 @@ msgid "Appearance"
 msgstr "مظہر"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "دونوں"
 
@@ -363,6 +365,7 @@ msgstr "<b>مینیو اور بٹن</b>"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "کچھ نہیں"
 
@@ -471,24 +474,48 @@ msgstr "عمودی RGB"
 msgid "Vertical BGR"
 msgstr "عمودی BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "تبدیلیاں لاگو کریں اور نئی ڈسپلے ترتیبات کا تجربہ کریں"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "ورژن معلومات"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "سکرین کی ترتیبات اور خاکہ مرتب کریں"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "ڈسپلے"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "ریزیلوش_ن:"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "ریزیلوش_ن:"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "تازگی _ریٹ:"
@@ -497,93 +524,145 @@ msgstr "تازگی _ریٹ:"
 msgid "Ro_tation:"
 msgstr "_گھماؤ:"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "پریشان کن ماحاصل"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "ڈسپلے"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "سادہ"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "بائیں"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "معکوس"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "دائیں"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "دونوں افقی"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "عمودی RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
 msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
-#, fuzzy, c-format
-msgid "Screen %d"
-msgstr "سکرین"
+#: ../dialogs/display-settings/main.c:173
+#, c-format
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "ڈسپلے \"%s\" پر رینڈر ایکسٹینشن مفقود ہے"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"جسامت کی تبدیلی (ری سائز) اور گھمانے کا دخیلہ (RandR) اس ڈسپلے پر فعال نہیں "
-"ہے۔ اسے فعال کرنے کی کوشش کریں اور اس مکالمے کو دوبارہ چلائیں۔"
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "رینڈر ایکسٹینشن استعمال کرنے میں ناکامی"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "استعمال ہو رہے رینڈر ایکسٹینشن کا ورژن پہچان میں نہیں آرہا"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "تبدیلیاں لاگو کریں اور نئی ڈسپلے ترتیبات کا تجربہ کریں"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "ترتیبات"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "ترتیبات"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr ""
 "یہ سسٹم RandR %d %d استعمال کررہا ہے۔ ڈسپلے ترتیبات کو کام کرنے کے لئے کم از "
 "کم اس کا نسخہ 1.1 درکار ہے"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "لیپ ٹاپ"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "مانیٹر"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "ٹیلی ویژن"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "رقمی ڈسپلے"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "دوسرا مانیٹر"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "دوسرا رقمی ڈسپلے"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1151,13 +1230,11 @@ msgstr "باؤنس بٹن معطل ہیں"
 msgid "Bounce keys"
 msgstr "باؤنس بٹن"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "ڈی بگ موڈ میں چلائیں (پس منظر پر فورک مت کریں)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "مقام کار %d"
@@ -1219,6 +1296,29 @@ msgstr ""
 "%s: %s\n"
 "دستیاب کمانڈ لائن اختیارات کی مکمل فہرست کے لیے %s --help لکھیں.\n"
 
+#, fuzzy
+#~ msgid "Screen %d"
+#~ msgstr "سکرین"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "ڈسپلے \"%s\" پر رینڈر ایکسٹینشن مفقود ہے"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "جسامت کی تبدیلی (ری سائز) اور گھمانے کا دخیلہ (RandR) اس ڈسپلے پر فعال "
+#~ "نہیں ہے۔ اسے فعال کرنے کی کوشش کریں اور اس مکالمے کو دوبارہ چلائیں۔"
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "رینڈر ایکسٹینشن استعمال کرنے میں ناکامی"
+
+#~ msgid "Second monitor"
+#~ msgstr "دوسرا مانیٹر"
+
+#~ msgid "Second digital display"
+#~ msgstr "دوسرا رقمی ڈسپلے"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "خصوصیت \"<b>%s</b>\" مقفل نہیں کی جاسکتی کیونکہ یہ مقفل ہے"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e9d5c08..57e47d1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-27 16:15+0100\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-01-20 05:16+0800\n"
 "Last-Translator: Hunt Xu <huntxu at live.cn>\n"
 "Language-Team: Simplified Chinese <i18n-xfce at xfce.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -197,38 +198,38 @@ msgstr "套接字 ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:101
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:78
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
 #: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "版本信息"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
 #: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188 ../xfce4-settings-manager/main.c:58
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "“%s --help”显示使用说明"
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
 #: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206 ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce 开发团队,版权所有"
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207 ../xfce4-settings-manager/main.c:72
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "请向 <%s> 报告程序漏洞。"
@@ -248,6 +249,7 @@ msgid "Appearance"
 msgstr "外观"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "都用"
 
@@ -335,6 +337,7 @@ msgstr "菜单和按钮"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "æ— "
 
@@ -435,24 +438,48 @@ msgstr "ç«–ç›´ RGB"
 msgid "Vertical BGR"
 msgstr "ç«–ç›´ BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "应用所有的信设置并测试显示设置"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "版本信息"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "设置屏幕参数及布局"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "显示"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "分辨率(_E):"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "分辨率(_E):"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "刷新频率(_R):"
@@ -461,91 +488,143 @@ msgstr "刷新频率(_R):"
 msgid "Ro_tation:"
 msgstr "旋转(_T):"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+#, fuzzy
+msgid "_Use this output"
+msgstr "输出详细信息"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "显示"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "正常"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "å·¦"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "翻转"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "右"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+#, fuzzy
+msgid "Horizontal"
+msgstr "都用(水平摆放)"
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "ç«–ç›´ RGB"
+
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "屏幕 %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
-msgstr "显示终端“%s”没有 RandR 扩展模块"
+msgid "%.1f Hz"
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
+#: ../dialogs/display-settings/main.c:653
 msgid ""
-"The Resize and Rotate extension (RandR) is not enabled on this display. Try "
-"to enable it and run the dialog again."
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
-"没有启用当前显示终端的旋转及尺寸变化模块(RandR),\n"
-"请先启用该模块再运行本对话框。"
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
-msgstr "无法使用 RandR 扩展模块。"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
+msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "无法取得 RandR 扩展模块的版本号"
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
-#, c-format
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "应用所有的信设置并测试显示设置"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "设置"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "设置"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, fuzzy, c-format
 msgid ""
 "This system is using RandR %d.%d. For the display settings to work version "
-"1.1 is required at least"
+"1.2 is required at least"
 msgstr "您的系统使用的是 RandR %d.%d。显示设置需要至少1.1版"
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
+#, c-format
+msgid "The video driver does not support video outputs"
+msgstr ""
+
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "笔记本电脑"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "显示器"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "电视"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "电子显示板"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "副显示器"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "副电子显示板"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -1095,13 +1174,11 @@ msgstr "反弹按键已取消"
 msgid "Bounce keys"
 msgstr "反弹按键"
 
-#: ../xfce4-settings-helper/main.c:79 ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr "启动到差错模式(不分叉到后台线程)"
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr "工作区 %d"
@@ -1162,6 +1239,31 @@ msgstr ""
 "%s: %s\n"
 "%s --help 将列出完整的可选命令行参数\n"
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "屏幕 %d"
+
+#~ msgid "RandR extension missing on display \"%s\""
+#~ msgstr "显示终端“%s”没有 RandR 扩展模块"
+
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "没有启用当前显示终端的旋转及尺寸变化模块(RandR),\n"
+#~ "请先启用该模块再运行本对话框。"
+
+#~ msgid "Failed to use the RandR extension"
+#~ msgstr "无法使用 RandR 扩展模块。"
+
+#~ msgid "Second monitor"
+#~ msgstr "副显示器"
+
+#~ msgid "Second digital display"
+#~ msgstr "副电子显示板"
+
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
 #~ msgstr "属性“<b>%s</b>”被锁定,不能重设"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 14cd4ea..e8bd227 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the xfce4-settings package.
 # Cheng-Chia Tseng <pswo10680 at gmail.com>, 2010.
 #
+#: ../xfsettingsd/main.c:127
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 10:06+0000\n"
+"POT-Creation-Date: 2010-08-28 23:05+0200\n"
 "PO-Revision-Date: 2010-07-13 20:52+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
 "Language-Team: chinese-l10n <chinese-l10n at googlegroups.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -78,7 +80,9 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
@@ -94,7 +98,9 @@ msgid "The time, in milliseconds, between repeated motion events"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
@@ -102,11 +108,15 @@ msgid "The time, in milliseconds, to get to maximum speed"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
@@ -122,19 +132,28 @@ msgid "Use slow _keys"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
@@ -163,61 +182,50 @@ msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:87
-#: ../dialogs/keyboard-settings/main.c:39
-#: ../dialogs/mouse-settings/main.c:100
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:100
 msgid "Settings manager socket"
 msgstr "設定值管理員 socket"
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:87
-#: ../dialogs/keyboard-settings/main.c:39
-#: ../dialogs/mouse-settings/main.c:100
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:100
 msgid "SOCKET ID"
 msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:45
 #: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:82
-#: ../dialogs/keyboard-settings/main.c:40
-#: ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43
-#: ../xfce4-settings-helper/main.c:78
-#: ../xfce4-settings-manager/main.c:40
-#: ../xfsettingsd/main.c:52
+#: ../dialogs/display-settings/main.c:101
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
+#: ../xfce4-settings-editor/main.c:43 ../xfce4-settings-helper/main.c:74
+#: ../xfce4-settings-manager/main.c:40 ../xfsettingsd/main.c:52
 msgid "Version information"
 msgstr "版本資訊"
 
 #: ../dialogs/accessibility-settings/main.c:143
 #: ../dialogs/appearance-settings/main.c:773
-#: ../dialogs/display-settings/main.c:642
+#: ../dialogs/display-settings/main.c:1045
 #: ../dialogs/keyboard-settings/main.c:64
-#: ../dialogs/mouse-settings/main.c:1186
-#: ../xfce4-settings-editor/main.c:63
-#: ../xfce4-settings-helper/main.c:188
-#: ../xfce4-settings-manager/main.c:58
+#: ../dialogs/mouse-settings/main.c:1186 ../xfce4-settings-editor/main.c:63
+#: ../xfce4-settings-helper/main.c:160 ../xfce4-settings-manager/main.c:58
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "輸入 '%s --help' 以了解用法。"
 
 #: ../dialogs/accessibility-settings/main.c:162
 #: ../dialogs/appearance-settings/main.c:792
-#: ../dialogs/display-settings/main.c:661
+#: ../dialogs/display-settings/main.c:1064
 #: ../dialogs/keyboard-settings/main.c:80
-#: ../dialogs/mouse-settings/main.c:1205
-#: ../xfce4-settings-editor/main.c:82
-#: ../xfce4-settings-helper/main.c:206
-#: ../xfce4-settings-manager/main.c:71
+#: ../dialogs/mouse-settings/main.c:1205 ../xfce4-settings-editor/main.c:82
+#: ../xfce4-settings-helper/main.c:176 ../xfce4-settings-manager/main.c:71
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce 開發團隊。保留所有權利。"
 
 #: ../dialogs/accessibility-settings/main.c:163
 #: ../dialogs/appearance-settings/main.c:793
-#: ../dialogs/display-settings/main.c:662
+#: ../dialogs/display-settings/main.c:1065
 #: ../dialogs/keyboard-settings/main.c:81
-#: ../dialogs/mouse-settings/main.c:1206
-#: ../xfce4-settings-editor/main.c:83
-#: ../xfce4-settings-helper/main.c:207
-#: ../xfce4-settings-manager/main.c:72
+#: ../dialogs/mouse-settings/main.c:1206 ../xfce4-settings-editor/main.c:83
+#: ../xfce4-settings-helper/main.c:177 ../xfce4-settings-manager/main.c:72
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr ""
@@ -227,7 +235,8 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
@@ -236,6 +245,7 @@ msgid "Appearance"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr ""
 
@@ -287,7 +297,9 @@ msgstr "事件音效"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
 #, fuzzy
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
 msgstr "字型品質"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
@@ -299,11 +311,16 @@ msgid "Icons"
 msgstr "圖示"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
@@ -316,11 +333,13 @@ msgstr "選單與按鈕"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:670
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "ç„¡"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
@@ -356,7 +375,9 @@ msgid "Specify whether icons should be displayed next to text in buttons"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
@@ -372,7 +393,9 @@ msgid "Text"
 msgstr "文字"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
@@ -411,24 +434,48 @@ msgstr "åž‚ç›´ RGB"
 msgid "Vertical BGR"
 msgstr "åž‚ç›´ BGR"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:1
-msgid "Apply any changes and test the new display settings"
-msgstr "套用任何變更並且測試新的顯示設定值"
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:1
+msgid "<big><b>Would you like to keep this configuration?</b></big>"
+msgstr ""
 
-#: ../dialogs/display-settings/display-dialog.glade.h:2
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:2
+#, fuzzy
+msgid "Confirmation"
+msgstr "版本資訊"
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:3
+msgid "Keep this configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:4
+msgid "Restore the previous configuration"
+msgstr ""
+
+#: ../dialogs/display-settings/confirmation-dialog.glade.h:5
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+
+#: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid "Configure screen settings and layout"
 msgstr "調整螢幕設定值與配置"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:3
+#: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
 msgstr "螢幕顯示"
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
 msgstr "解析度(_E):"
 
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+#, fuzzy
+msgid "Ref_lection:"
+msgstr "解析度(_E):"
+
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
 msgstr "更新頻率(_R):"
@@ -437,85 +484,141 @@ msgstr "更新頻率(_R):"
 msgid "Ro_tation:"
 msgstr "旋轉(_T):"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/display-dialog.glade.h:7
+msgid "_Use this output"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
+msgid "Both displays cloned"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:2
+#, fuzzy
+msgid "Display settings"
+msgstr "螢幕顯示"
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
+msgid "Several displays are available. Use:\n"
+msgstr ""
+
+#: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
+msgid "Use both displays to show the same contents"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "正常"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "å·¦"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "反轉"
 
-#: ../dialogs/display-settings/main.c:73
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "右"
 
-#. insert in the combo box
-#. insert
-#: ../dialogs/display-settings/main.c:257
-#: ../dialogs/display-settings/main.c:288
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../dialogs/display-settings/main.c:80
+msgid "Horizontal"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:81
+#, fuzzy
+msgid "Vertical"
+msgstr "åž‚ç›´ RGB"
 
-#. create name
-#: ../dialogs/display-settings/main.c:494
+#: ../dialogs/display-settings/main.c:104
+msgid "Minimal interface to set up an external output"
+msgstr ""
+
+#: ../dialogs/display-settings/main.c:173
 #, c-format
-msgid "Screen %d"
-msgstr "螢幕 %d"
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
 
-#: ../dialogs/display-settings/main.c:675
+#. Insert the mode
+#: ../dialogs/display-settings/main.c:507
 #, c-format
-msgid "RandR extension missing on display \"%s\""
+msgid "%.1f Hz"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:678
-msgid "The Resize and Rotate extension (RandR) is not enabled on this display. Try to enable it and run the dialog again."
+#: ../dialogs/display-settings/main.c:653
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:717
-msgid "Failed to use the RandR extension"
+#: ../dialogs/display-settings/main.c:655
+msgid "Selected output not disabled"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:55
-#: ../dialogs/display-settings/xfce-randr-legacy.c:58
+#: ../dialogs/display-settings/main.c:1077
+#: ../dialogs/display-settings/xfce-randr.c:259
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr ""
 
-#. 1.1 (not 1.2) is required because of the legacy code in xfce-randr-legacy.c
-#: ../dialogs/display-settings/xfce-randr.c:63
-#: ../dialogs/display-settings/xfce-randr-legacy.c:65
+#: ../dialogs/display-settings/main.c:1078
+#: ../dialogs/display-settings/main.c:1122
+#, fuzzy
+msgid "Unable to start the Xfce Display Settings"
+msgstr "套用任何變更並且測試新的顯示設定值"
+
+#: ../dialogs/display-settings/main.c:1108
+#, fuzzy
+msgid "NVIDIA Settings"
+msgstr "設定值(_S)"
+
+#: ../dialogs/display-settings/main.c:1116
+#, fuzzy
+msgid "ATI Settings"
+msgstr "設定值(_S)"
+
+#: ../dialogs/display-settings/main.c:1132
+msgid "Unable to launch the proprietary driver settings"
+msgstr ""
+
+#. 1.2 is required
+#: ../dialogs/display-settings/xfce-randr.c:267
+#, c-format
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+
+#. set error
+#: ../dialogs/display-settings/xfce-randr.c:292
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.1 is required at least"
+msgid "The video driver does not support video outputs"
 msgstr ""
 
-#: ../dialogs/display-settings/xfce-randr.c:343
+#: ../dialogs/display-settings/xfce-randr.c:556
 msgid "Laptop"
 msgstr "膝上型電腦"
 
-#: ../dialogs/display-settings/xfce-randr.c:347
+#: ../dialogs/display-settings/xfce-randr.c:577
 msgid "Monitor"
 msgstr "顯示器"
 
-#: ../dialogs/display-settings/xfce-randr.c:351
+#: ../dialogs/display-settings/xfce-randr.c:580
 msgid "Television"
 msgstr "電視"
 
-#: ../dialogs/display-settings/xfce-randr.c:358
+#: ../dialogs/display-settings/xfce-randr.c:584
 msgid "Digital display"
 msgstr "數位顯示"
 
-#: ../dialogs/display-settings/xfce-randr.c:362
-msgid "Second monitor"
-msgstr "第二台顯示器"
-
-#: ../dialogs/display-settings/xfce-randr.c:368
-msgid "Second digital display"
-msgstr "第二台數位顯示"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../dialogs/display-settings/display-name.c:269
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr ""
 
 #. Set dialog title and icon
 #: ../dialogs/keyboard-settings/command-dialog.c:126
@@ -617,7 +720,9 @@ msgid "Show _blinking"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
@@ -645,7 +750,9 @@ msgid "Use this area to _test the settings above:"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
@@ -711,7 +818,9 @@ msgid "Reset to Defaults"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:931
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:996
@@ -731,8 +840,7 @@ msgid "DEVICE NAME"
 msgstr ""
 
 #. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:355
-#: ../dialogs/mouse-settings/main.c:357
+#: ../dialogs/mouse-settings/main.c:355 ../dialogs/mouse-settings/main.c:357
 #: ../dialogs/mouse-settings/main.c:417
 msgid "Default"
 msgstr ""
@@ -784,7 +892,9 @@ msgid "Re_verse scroll direction"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
-msgid "Set the acceleration and threshold for the selected device to the default values"
+msgid ""
+"Set the acceleration and threshold for the selected device to the default "
+"values"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
@@ -796,19 +906,25 @@ msgid "T_hreshold:"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
-msgid "The number of pixels the pointer must move before a drag operation will start"
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
@@ -816,7 +932,9 @@ msgid "Ti_me:"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
@@ -903,7 +1021,9 @@ msgstr ""
 
 #: ../xfce4-settings-editor/main_window.c:1004
 #, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
 msgstr ""
 
 #: ../xfce4-settings-editor/main_window.c:1013
@@ -1042,14 +1162,11 @@ msgstr ""
 msgid "Bounce keys"
 msgstr ""
 
-#: ../xfce4-settings-helper/main.c:79
-#: ../xfsettingsd/main.c:64
+#: ../xfce4-settings-helper/main.c:75 ../xfsettingsd/main.c:64
 msgid "Start in debug mode (don't fork to the background)"
 msgstr ""
 
-#. some of them may not have been set in xfconf
-#: ../xfce4-settings-helper/workspaces.c:114
-#: ../xfce4-settings-helper/workspaces.c:241
+#: ../xfce4-settings-helper/workspaces.c:355
 #, c-format
 msgid "Workspace %d"
 msgstr ""
@@ -1108,3 +1225,14 @@ msgid ""
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Screen %d"
+#~ msgstr "螢幕 %d"
+
+#~ msgid "Second monitor"
+#~ msgstr "第二台顯示器"
+
+#~ msgid "Second digital display"
+#~ msgstr "第二台數位顯示"



More information about the Xfce4-commits mailing list