[Xfce4-commits] <ristretto:master> Update .po files

Stephan Arts noreply at xfce.org
Wed Nov 23 07:02:01 CET 2011


Updating branch refs/heads/master
         to 816b0753513bfd61d26e9936d4c99829c3a0ffb9 (commit)
       from 39f6635cc5f5128b48e6486b8a24356c23ab41ac (commit)

commit 816b0753513bfd61d26e9936d4c99829c3a0ffb9
Author: Stephan Arts <stephan at xfce.org>
Date:   Wed Nov 23 06:58:55 2011 +0100

    Update .po files

 po/ar.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/ast.po   |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/bg.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/ca.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/cs.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/da.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/de.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/el.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/en_GB.po |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/es.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/eu.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/fi.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/fr.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/gl.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/hr.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/hu.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/id.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/it.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/ja.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/lv.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/nb.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/nl.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/pl.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/pt.po    |  233 +++++++++++++++++++++++++++++++++--------------------------
 po/pt_BR.po |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/ro.po    |  234 +++++++++++++++++++++++++++++++++--------------------------
 po/ru.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/sk.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/sl.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/sv.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/tr.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/ug.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/uk.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/ur.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/ur_PK.po |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/vi.po    |  229 ++++++++++++++++++++++++++++++++-------------------------
 po/zh_CN.po |  229 ++++++++++++++++++++++++++++++++-------------------------
 37 files changed, 4741 insertions(+), 3741 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 59b2ecb..bbfdfd5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2011-08-01 16:57-0000\n"
 "Last-Translator: كريم اولاد الشلحة <herr.linux88 at gmail.com>\n"
 "Language-Team: Arabic Xfce Translation Team <doc at arabeyes.org>\n"
@@ -41,307 +41,330 @@ msgstr ""
 "%s: %s\n"
 "جرب %s --help لرأية قائمة كاملة بخيارات سطر الأوامر المتوفرة.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "عارض الصور"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_ملف"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "ا_فتح"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "فتح الصورة"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_حفظ النسخة"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "حفظ نسخة من الصورة"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "أ_غلق"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "أغلق هذه الصورة"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_خروج"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "الخروج من Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_تحرير"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "فتح _بـ..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "ت_صنيف"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_حذف"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "حذف هذه الصورة من القرص"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "حذف المعلومات الخاصة"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "ال_تفضيلات"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_أظهر"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_ملأ الشاشة"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_غادر نمط ملء الشاشة"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_تعيين كخلفية"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "الت_كبير"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "قرّب"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "صغّر_"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "تكب_ير"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_حجم عادي"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "دورا_ن"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "تدوير إلى اليمين"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "تدوير إلى اليسار"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_ذهاب"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "للأ_مام"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "لل_خلف"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "ا_لأول"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "الأ_خير"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_مساعدة"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "الم_حتويات"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "أظهر دليل المستخدم لـ ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_عنْ"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "أظهر معلومات حول ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "موضع"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "المُصغّرات"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "غادر نمط مل_ء الشاشة"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "أ_ظهر ملف شريط الأدواة"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "أظهر متص_فح شريط الأدواة"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "أظ_هر المصغرات"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "رتب حسب الإسم"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "رتب حسب التاريخ"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "يسار"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "يمين"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "أعلى"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "أسفل"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "تش_غيل"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "تشغيل عرض الشرائح"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_إيقاف مؤقت"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "إيقاف مؤقت لعرض الشرائح"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "مستخدمة حدي_ثا"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "مستخدمة حديثا"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "إضغط غلى فتح لإختيار صورة"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "فارغ"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "مطوّر:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristrettoهو عارض صور لسطح مكتب Xfce ."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Karim Oulad Chalha <herr.linux88 at gmail.com>\n"
 "Xfce Transifex Arabic Team"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "فتح صورة"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "صور"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "فشل فتح ملف"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "حفظ نسخة"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "فشل فتح ملف"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "هل أنت متأكد من انك تود حذف الصورة '%s' من القرص?"
@@ -379,31 +402,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr "حذف المعلومات الخاصة"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "عرض"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "لون الخلفية"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "تجاهل لون الخلفية:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "المُصغّرات"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -411,19 +434,19 @@ msgstr ""
 "الشريط المصغر يمكن أن يكون مخفياً تلقائيا\n"
 "عند عرض الصورة بكامل الشاشة."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "إخفاء المصغرات عنذ ملء الشاشة"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "شرائح"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "مهلة"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -431,36 +454,40 @@ msgstr ""
 "فترة العرض يتم عرض صورة فردية خلال العرض\n"
 " (بالثانية)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "تحكم"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "العجلة الدوار"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "السّلوك"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "بدء التشغيل"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "تحجيم نافذة الصورة عنذ بدء التشغيل"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "يلتف حول الصور"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "عارض الصور"
@@ -526,43 +553,43 @@ msgstr "عرض الحد"
 msgid "the border width of the thumbnail-bar"
 msgstr "عرض الحدود شريط تصغيرات"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "الأسلوب:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "السطوع:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "الإشباع:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "تعيين كخلفية"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "آلي"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "مركز"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "تجانب"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "تمديد"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "تحجيم"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "أسرع"
 
diff --git a/po/ast.po b/po/ast.po
index 0f4a150..bfabe36 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2009-10-05 18:16+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
@@ -40,311 +40,334 @@ msgstr ""
 "Preba %s --help pa ver una llista completa d'opciones de llinia de comandu "
 "disponibles.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Visor d'imáxenes"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Ficheru"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Abrir imaxe"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Guardar copia"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Guardar una copia de la imaxe"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "Z_arrar"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Zarrar esta imaxe"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Colar"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Quitar Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Abrir _con..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Axeitar"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Desaniciar"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Zarrar esta imaxe"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Preferencies"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Pantalla completa"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Colar de pantalla completa"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Afitar como fondu d'escritoriu"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Ampliar"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Ampliar"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Amenorgar"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Axustar"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Tamañu normal"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Voltiar"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Voltiar a man_drecha"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Voltiar a man_zorga"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Dir"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Avanzar"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Retroceder"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Primera"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Cabera"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "A_ida"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Conteníos"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Amosar el manual d'usuariu de ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Tocante a"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Amosar información tocante a ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Posición"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Miniatures"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Colar de _pantalla completa"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Amosar _barra de ficheru"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Amosar _barra  de navegación"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Amosar _barra de miniatures"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "axeitar por nome"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "axeitar per data"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Esquierda"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Drecha"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Arriba"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Abaxo"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr ""
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 #, fuzzy
 msgid "Play slideshow"
 msgstr "Entamar diapositives"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr ""
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 #, fuzzy
 msgid "Pause slideshow"
 msgstr "Entamar diapositives"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Usaos recientemente"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 #, fuzzy
 msgid "Recently used"
 msgstr "_Usaos recientemente"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Calca en \"abrir\" pa seleicionar una imaxe"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Ermu"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Desendolcador:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr ""
 "Ristretto ye un visor d'imáxenes rápidu y llixeru pal entornu d'escritoriu "
 "de Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Astur <malditoastur at gmail.com>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Abrir imaxe"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Nun pudo abrise'l ficheru"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Guardar copia"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Nun pudo abrise'l ficheru"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "¿De xuru que quies esborrar la imaxe '%s' del discu?"
@@ -381,31 +404,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Visualizador"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Color de fondu"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Inorar color de fondu:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniatures"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -413,19 +436,19 @@ msgstr ""
 "La barra de miniature puede anubrise automáticamente \n"
 "cuando'l visor d'imáxenes ta a pantalla completa."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Anubrir la barra de miniatures en mou pantalla completa"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Diapositives"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Tiempu d'espiración"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -434,37 +457,41 @@ msgstr ""
 "diapositives\n"
 "(en segundos)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Control"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Rueda de desplazamientu"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Comportamientu"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Aniciu"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Redimensionar la ventana a la imaxe al aniciu"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 #, fuzzy
 msgid "Wrap around images"
 msgstr "Abrir imaxe"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Preferencies del visor d'imáxenes"
@@ -532,48 +559,48 @@ msgstr "Anchor del berbesu"
 msgid "the border width of the thumbnail-bar"
 msgstr "L'anchor del berbesu de la barra de miniatures"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 #, fuzzy
 msgid "Saturation:"
 msgstr "_Voltiar"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 #, fuzzy
 msgid "Set as wallpaper"
 msgstr "_Afitar como fondu d'escritoriu"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 #, fuzzy
 msgid "Auto"
 msgstr "_Tocante a"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 #, fuzzy
 msgid "Tiled"
 msgstr "_Ficheru"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 #, fuzzy
 msgid "Scaled"
 msgstr "Escala"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 92e26b0..664d2c8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto 0.0.15\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2008-01-02 23:03+0200\n"
 "Last-Translator: Plamen Stoev <piros89 at gmail.com>\n"
 "Language-Team: \n"
@@ -47,321 +47,344 @@ msgstr ""
 "Опитайте %s --help за да видите пълен списък с наличните опции на командния "
 "ред.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Програма за преглед на изображения"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Файл"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr ""
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 #, fuzzy
 msgid "Open an image"
 msgstr "Отваряне на изображение"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr ""
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr ""
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 #, fuzzy
 msgid "_Quit"
 msgstr "_Редактиране"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr ""
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 #, fuzzy
 msgid "_Open with..."
 msgstr "Отваряне с..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 #, fuzzy
 msgid "_Sorting"
 msgstr "Мащабиране"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr ""
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr ""
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 #, fuzzy
 msgid "_Preferences"
 msgstr "Предпочитания"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "Преглед"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr ""
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr ""
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr ""
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "Мащабиране"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 #, fuzzy
 msgid "Zoom _In"
 msgstr "Мащабиране"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr ""
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr ""
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 #, fuzzy
 msgid "_Rotation"
 msgstr "Завъртане"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Завъртане надясно"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Завъртане наляво"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "Отиване"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr ""
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr ""
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr ""
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr ""
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "Помощ"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr ""
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr ""
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr ""
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr ""
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr ""
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Визуализатор на умалени изображения"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr ""
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 #, fuzzy
 msgid "Show _File Toolbar"
 msgstr "Показване на лентата с инструменти"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 #, fuzzy
 msgid "Show _Navigation Toolbar"
 msgstr "Показване на лентата с инструменти"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 #, fuzzy
 msgid "Show _Thumbnailbar"
 msgstr "Показване на лентата с инструменти"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr ""
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr ""
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr ""
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr ""
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr ""
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr ""
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr ""
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 #, fuzzy
 msgid "Play slideshow"
 msgstr "Прожекция"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr ""
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 #, fuzzy
 msgid "Pause slideshow"
 msgstr "Прожекция"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "Отваряни наскоро"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 #, fuzzy
 msgid "Recently used"
 msgstr "Отваряни наскоро"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr ""
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr ""
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Разработчик:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 #, fuzzy
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr ""
 "Ristretto е бърза и лека програма за преглед на изображения за работната "
 "среда XFCE"
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Пламен Стоев <piros89 at gmail.com>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Отваряне на изображение"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr ""
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ""
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Файлът не може да бъде отворен"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr ""
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Файлът не може да бъде отворен"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, fuzzy, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr ""
@@ -399,52 +422,52 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Дисплей"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 #, fuzzy
 msgid "Background color"
 msgstr "Цвят на фона"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 #, fuzzy
 msgid "Override background color:"
 msgstr "Замяна на фоновия цвят"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 #, fuzzy
 msgid "Thumbnails"
 msgstr "Визуализатор на умалени изображения"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
 msgstr ""
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr ""
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Прожекция"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Пауза"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -452,36 +475,40 @@ msgstr ""
 "Времето за което се показва едно изображение при прожекция\n"
 "(в секунди)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr ""
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr ""
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr ""
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr ""
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr ""
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 #, fuzzy
 msgid "Wrap around images"
 msgstr "Отваряне на изображение"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Програма за преглед на изображения"
@@ -547,45 +574,45 @@ msgstr ""
 msgid "the border width of the thumbnail-bar"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 #, fuzzy
 msgid "Saturation:"
 msgstr "Завъртане"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 #, fuzzy
 msgid "Tiled"
 msgstr "_Файл"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index d01b6a9..824ee1b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2011-08-11 17:29+0100\n"
 "Last-Translator: Pol Ruzafa <kiari62 at gmail.com>\n"
 "Language-Team: Catalan <xfce-i18n at xfce.org>\n"
@@ -48,307 +48,330 @@ msgstr ""
 "Feu %s --help per veure la llista complerta d'opcions disponibles \n"
 "de la línia d'ordres.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Visor d'imatges"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Fitxer"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Obre"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Obre una imatge"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Desa una còpia"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Desa una còpia de la imatge"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Tanca"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Tanca aquesta finestra"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Surt"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Surt de Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Obre amb…"
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Ordenació"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Esborra"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Esborra aquesta imatge del disc"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Neteja l'informació privada"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Preferències"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Mostra"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Pantalla sencera"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Surt de la pantalla sencera"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Posa com a _fons d'escriptori"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Zoom"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Ampl_ia"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Red_ueix"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Ajusta"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "Mida _normal"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotació"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Vés"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Endavant"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Endarrere"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Primer"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Últim"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Continguts"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Mostra el manual d'usuari de ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Mostra informació referent a ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Posició"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Miniatures"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Surt de la _pantalla sencera"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Mostrar la barra d'eines de _fitxers"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Mostra la barra de _navegació"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Mostra la _barra de miniatures"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "Ordena per nom de fitxer"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "Ordena per data"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Esquerra"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Dreta"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Superior"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Inferior"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Reproduir"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Reprodueix la seqüència d'imatges"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pausa la seqüència d'imatges"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "Emprats _recentment"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Emprats recentment"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Feu clic a Obrir per seleccionar una imatge"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Buit"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Autor:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto és visor d'imatges per l'entorn d'escriptori Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Carles Muñoz Gorriz <carlesmu at internautas.org>, 2008-2010.\n"
 "Harald Servat <redcrash at gmail.com>, 2009."
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Obre una imatge"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Imatges"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "No s'ha pogut obrir el fitxer"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Desa una còpia"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "No s'ha pogut obrir el fitxer"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Voleu suprimir la imatge «%s» del disc?"
@@ -386,31 +409,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr "_Neteja l'informació privada"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Visualització"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Color de fons"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Força el color de fons:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniatures"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -418,19 +441,19 @@ msgstr ""
 "La barra de miniatures es pot amagar automàticament quan \n"
 "el visor d'imatges està funcionant a pantalla sencera."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Amaga la barra de miniatures en pantalla sencera"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Seqüència d'imatges"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Temps esgotat"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -438,36 +461,40 @@ msgstr ""
 "El temps que una imatge en concret es mostra durant la seqüència d'imatges\n"
 "(en segons)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Control"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Roda de navegació"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Comportament"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Inici"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Ajusta la mida de la finestra a la imatge a l'iniciar"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Ajusta al voltant de les imatges"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Preferències del visor d'imatges"
@@ -533,43 +560,43 @@ msgstr "Amplada de la bora"
 msgid "the border width of the thumbnail-bar"
 msgstr "L'amplada de la bora de la barra de miniatures"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Estil:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Brillantor:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Saturació:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Posa com a _fons d'escriptori"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automàtic"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centrat"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Enrajolat"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Estirat"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Escalat"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Ampliat"
 
diff --git a/po/cs.po b/po/cs.po
index be38f19..c116006 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-12-06 22:22+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech\n"
@@ -44,306 +44,329 @@ msgstr ""
 "%s: %s\n"
 "Napište %s --help pro zobrazení seznamu všech dostupných parametrů.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Prohlížeč obrázků"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Načíst obrázek"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Uložit kopii"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Uložit kopii obrázku"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Zavřít tento obrázek"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Ukončit"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Ukončit aplikaci Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Ot_evřít pomocí..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Řazení"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Smazat"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Zavřít tento obrázek"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Předvolby"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Opustit režim celé obrazovky"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Nastavit jako _tapetu"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Přiblížit"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Přiblížit"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Při_blížit"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "O_ddálit"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Běžná velikost"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotace"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Otočit do_prava"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Přejít"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Vpřed"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Zpět"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_První"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Poslední"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Zobrazit uživatelskou příručku aplikace Ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_O aplikaci"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Zobrazit informace o aplikaci Ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Pozice"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Náhledy"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Opustit _režim celé obrazovky"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Zobrazit panel _Soubor"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Zobrazit panel _Navigace"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Zobrazit panel Ná_hledy"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "řadit podle názvu souboru"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "řadit podle data"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Doleva"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Doprava"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Nahoru"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Dolů"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Přehrát"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Spustit promítání"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pozastavit"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pozastavit promítání"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Naposledy otevřené"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Naposledy použité"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Obrázek vyberete stisknutím tlačítka Otevřít"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Prázdný"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Vývojář:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto je prohlížeč obrázků pro desktopové prostředí Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Miro Hrončok <churchyard at gmail.com>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Načíst obrázek"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Nelze otevřít soubor"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Uložit kopii"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Nelze otevřít soubor"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Opravdu chcete smazat obrázek %s z disku?"
@@ -380,31 +403,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Zobrazení"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Barva pozadí"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Vynutit barvu pozadí:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Náhledy"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -412,19 +435,19 @@ msgstr ""
 "Panel náhledů je možné automaticky schovat, \n"
 "pokud je prohlížeč obrázků v režimu celé obrazovky."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Skrýt náhledy v režimu celé obrazovky"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Promítání snímků"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Prodleva"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -432,36 +455,40 @@ msgstr ""
 "Časový interval po který je zobrazen jeden snímek při promítání\n"
 "(v sekundách)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Ovládání"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Kolečko myši"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Chování"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Při spuštění"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Změnit velikost okna na velikost obrázku při spuštění"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Orámování obrázků"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Prohlížeč obrázků"
@@ -527,43 +554,43 @@ msgstr "šířka okraje"
 msgid "the border width of the thumbnail-bar"
 msgstr "šířka okraje panelu s náhledy"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Styl:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Jas:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Sytost:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Nastavit jako tapetu"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automaticky"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Vystředěný"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Dlaždice"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Přizpůsobený"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Přizpůsobený"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Přiblížený"
 
diff --git a/po/da.po b/po/da.po
index f6d6525..522a159 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto 0.0.90\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-01-15 12:00+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -47,275 +47,298 @@ msgstr ""
 "Prøv %s --help for at se en fuld liste over tilgængelige "
 "kommandolinjetilvalg.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Billedfremviser"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Fil"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Åbn"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Åbn et billede"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Gem kopi"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Gem en kopi af billedet"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Egenskaber"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Vil filegenskaber"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Luk"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Luk dette billede"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Afslut Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Redigér"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Åbn med..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sortér"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Slet"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Slet dette billede fra disken"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Ryd private data"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Indstillinger"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Fuldskærm"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Forlad fuldskærm"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Brug som skrivebordsbaggrund"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Zooming"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Zoom _ind"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Zoom _ud"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Tilpas zoom"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotering"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Rotér til høj_re"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Rotér til _venstre"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Gå til"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Fremad"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Tilbage"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "Førs_te"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "S_idste"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Indhold"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Vis Ristretto's brugermanual"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Vis informationer om Ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Placering"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "Miniaturbjælke_position"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Forlad f_uldskærm"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Vis _værktøjslinje"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Vis _værktøjslinje"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Vis _miniaturebjælke"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "sortér efter filnavn"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "sortér efter dato"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Venstre"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Højre"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Top"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Bund"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Afspil"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Afspil et diasshow"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pause diasshow"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Senest brugte"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Senest brugte"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Tryk åbn for at vælge et billede"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Tom"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Udvikler:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto er en billedfremviser til skrivebordsmiljøet Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Per Kongstad\n"
@@ -323,31 +346,31 @@ msgstr ""
 "Dansk-gruppen <dansk at dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Åbn billede"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Billeder"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Kunne ikke åbne fil"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Gem kopi"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 msgid "Could not save file"
 msgstr "Kunne ikke gemme fil"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Er du sikker på, at du vil slette billedet '%s' fra disken?"
@@ -384,31 +407,31 @@ msgstr "Alt"
 msgid "Clear private data"
 msgstr "Slet private data"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Vis"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Baggrundsfarve"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Værktøjsbjælke"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Tilsidesæt baggrundsfarve:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Forén værktøjsbjælker"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniaturer"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -416,19 +439,19 @@ msgstr ""
 "Miniaturebjælken kan skjules automatisk \n"
 "når billedviseren er i fuldskærmtilstand."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Skjul miniaturebjælke ved fuldskærmstilstand"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Diasshow"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Tidsudløb"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -436,35 +459,39 @@ msgstr ""
 "Den tid de enkelte billeder bliver vist under et diasshow\n"
 "(i sekunder)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Kontrol"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Rullehjul"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Spejlvend zoomretning"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Opførsel"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Opstart"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "Maksimér vindue ved opstart når et billede åbnes"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Svøb omkring billeder"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Indstillinger for billedfremviser"
 
@@ -528,43 +555,43 @@ msgstr "kantbredde"
 msgid "the border width of the thumbnail-bar"
 msgstr "bredden af kanten rundt om miniaturebjælken"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Stil:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Lysstyrke:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Mætning:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Brug som skrivebordsbaggrund"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automatisk"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centreret"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Fliselagt"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Udstrukket"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Skaleret"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Forstørret"
 
diff --git a/po/de.po b/po/de.po
index 4fb190f..ef58b5e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-02-18 15:50+0100\n"
 "Last-Translator: Fabian Nowak <timystery at arcor.de>\n"
 "Language-Team: German\n"
@@ -44,307 +44,330 @@ msgstr ""
 "%s: %s\\Geben Sie »%s --help« ein, um eine komplette Liste verfügbarer "
 "Kommandozeilenoptionen zu eralten.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Bildbetrachter"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Bild öffnen"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "Kopie _speichern"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Eine Kopie des Bildes speichern"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Eigenschaften"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Eigenschaften der Datei anzeigen"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Dieses Bild schließen"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Ristretto beenden"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Öffnen _mit…"
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sortierung"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Dieses Bild von der Festplatte löschen"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "Private Daten _löschen"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Vollbildmodus"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Vollbildmodus verlassen"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Al_s Hintergrundbild einstellen"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Zoom"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Ver_größern"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Ver_kleinern"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "Passende Größe"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Normalgröße"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Drehen"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Nach _rechts drehen"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Nach _links drehen"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Gehe zu"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Vor"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Zurück"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Erstes"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Letztes"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "I_nhalt"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Nutzerhandbuch zu Ristretto anzeigen"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Informationen über Ristretto anzeigen"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Position"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "_Position der Miniaturvorschau"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "_Vollbildmodus verlassen"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "_Werkzeugleiste anzeigen"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "_Navigationsleiste anzeigen"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "_Miniaturbilderleiste anzeigen"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "Nach Dateinamen sortieren"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "Nach Datum sortieren"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Links"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Rechts"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Oben"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Unten"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Starten"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Diavorführung starten"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Diavorführung pausieren"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Zuletzt geöffnet"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Zuletzt geöffnet"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Zum Auswählen eines Bildes »Öffnen« drücken"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Leer"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Entwickler:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto ist ein Bildbetrachter für die Arbeitsumgebung Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Christian Dywan <christian at twotoasts.de>\n"
 "Fabian Nowak <timystery at arcor.de>\n"
 "Christoph Wickert <cwickert at fedoraproject.org>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Bild öffnen"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Datei konnte nicht geöffnet werden"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Kopie speichern"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Datei konnte nicht geöffnet werden"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr ""
@@ -382,31 +405,31 @@ msgstr "Alles"
 msgid "Clear private data"
 msgstr "Private Daten löschen"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Anzeige"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Werkzeugleisten"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Hintergrundfarbe ersetzen:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Werkzeugleisten zusammenfassen"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniaturbilder"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -414,19 +437,19 @@ msgstr ""
 "Die Miniaturbilderleiste kann im \n"
 "Vollbildmodus automatisch versteckt werden."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Miniaturbildleiste verbergen"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Diavorführung"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Zeitspanne"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -434,36 +457,40 @@ msgstr ""
 "Die Zeitspanne, die ein Bild angezeigt wird\n"
 "(in Sekunden)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Steuerung"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Mausrad"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Zoomrichtung umkehren"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Verhalten"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Programmstart"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Fenster beim Start maximieren, wenn ein Bild geöffnet wird"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Um Bilder herum packen"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Einstellungen des Bildbetrachters"
 
@@ -528,43 +555,43 @@ msgstr "Randbreite"
 msgid "the border width of the thumbnail-bar"
 msgstr "Randbreite der Vorschaubildleiste"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Stil:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Helligkeit:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Sättigung:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Als Hintergrundbild nutzen"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automatisch"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Zentriert"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Gekachelt"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Gestreckt"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Skaliert"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Vergrößert"
 
diff --git a/po/el.po b/po/el.po
index 10dbefb..9cba2c8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-02-01 08:35+0200\n"
 "Last-Translator: Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -48,307 +48,330 @@ msgstr ""
 "Δοκίμασε %s --help για να δεις μία πλήρη λίστα με τις διαθέσιμες παραμέτρους "
 "στην γραμμή εντολών.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Εφαρμογή προβολής εικόνων"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "Άν_οιγμα"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Άνοιγμα μίας εικόνας"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Αποθήκευση αντιγράφου"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Αποθήκευση ενός αντίγραφου της εικόνας"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Κλείσιμο της εικόνας"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Έξοδος από το ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Άν_οιγμα με..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Ταξινόμηση"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Διαγραφή"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Κλείσιμο της εικόνας"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Προτιμήσεις"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Εμφάνιση"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Πλήρης Οθόνη"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "Έξ_οδος από πλήρη οθόνη"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Ορισμός της επιφάνεια εργασίας"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Mεγέθυνση"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Μεγέ_θυνση"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Σ_μίκρυνση"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Βέλτιστη μεγέθυνση"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "Κανο_νικό μέγεθος"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Περιστροφή"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Δ_εξιά περιστροφή"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Αρ_ιστερή περιστροφή"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Μετάβαση"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Επόμενη"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Προηγούμενη"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Πρώτη"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Τελευταία"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Εμφανίζει την τεκμηρίωση του ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Περί"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Εμφάνιση πληροφοριών σχετικά με το ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Θέση"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Μικρογραφίες"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Επαναφορά από πλ_ήρη οθόνη"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Εμφάνιση εργαλειοθήκης _αρχείο"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Εμφάνιση εργαλειοθήκης _περιήγηση"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Εμφάνιση μπάρας _μικρογραφιών"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "Ταξινόμηση ανά όνομα αρχείου"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "Ταξινόμηση ανά ημερομηνία"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Αριστερά"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Δεξιά"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Πάνω"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Κάτω"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Εκκίνηση"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Εκκίνηση προβολής διαφανειών"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Παύση"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Παύση προβολής διαφανειών"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Χρησιμοποιήθηκε πρόσφατα"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Χρησιμοποιήθηκε πρόσφατα"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Πατήστε άνοιγμα για να επιλέξετε μία εικόνα"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Κενή"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Δημιουργός:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr ""
 "Το ristretto είναι ένα εμφάνισης εικόνων για το γραφικό περιβάλλον xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Evaggelos Balaskas <ebalaskas at ebalaskas.gr> 2008, 2009"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Άνοιγμα εικόνας"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Αποτυχία ανοίγματος εικόνας"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Αποθήκευση αντίγραφου"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Αποτυχία ανοίγματος εικόνας"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε την εικόνα '%s' από το δίσκο;"
@@ -385,31 +408,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Προβολή"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Χρώμα παρασκηνίου"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Αγνόησε το χρώμα παρασκηνίου:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Μικρογραφίες"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -417,19 +440,19 @@ msgstr ""
 "Η μπάρα μικρογραφιών μπορεί να αποκρύβεται αυτόματα\n"
 "όταν η προβολή εικόνων είναι σε πλήρη οθόνη."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Απόκρυψη της μπάρας μικρογραφιών κατά την πλήρη οθόνη"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Διαφάνειες"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Χρονικό όριο"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -438,37 +461,41 @@ msgstr ""
 "διαφάνειες\n"
 "(σε δευτερόλεπτα)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Έλεγχος"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Κύλιση με τη ροδέλα"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Συμπεριφορά"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Εκκίνηση"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr ""
 "Να αλλάζει το μέγεθος του παραθύρου στο μέγεθος της εικόνας κατά την εκκίνηση"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Αναδίπλωση γύρω από τις εικόνες"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Εφαρμογή προβολής εικόνων"
@@ -534,43 +561,43 @@ msgstr "μέγεθος περιγράμματος"
 msgid "the border width of the thumbnail-bar"
 msgstr "Το πλάτος του περιγράμματος της μπάρας των μικρογραφιών"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Στυλ:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Φωτεινότητα:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Περιστροφή:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Ορισμός ως φόντο"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Αυτόματο"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Κεντραρισμένο"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Μικρογραφία"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Τεντωμένο"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Σε κλίμακα"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Μεγενθημένο"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 9f61053..2d975a5 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-01-24 14:08+1100\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: English/GB\n"
@@ -45,306 +45,329 @@ msgstr ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Image Viewer"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_File"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Open"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Open an image"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Save copy"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Save a copy of the image"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Close"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Close this image"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Quit Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Open with..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sorting"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Close this image"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Preferences"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_View"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Fullscreen"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Leave Fullscreen"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Set as Wallpaper"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Zooming"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Zoom _In"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "Zoom _Fit"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotation"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Rotate _Right"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Rotate _Left"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Go"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Back"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_First"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Last"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Help"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Display ristretto user manual"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_About"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Display information about ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Position"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Thumbnails"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Leave _Fullscreen"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Show _File Toolbar"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Show _Navigation Toolbar"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Show _Thumbnailbar"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "sort by filename"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "sort by date"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Left"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Right"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Top"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Bottom"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Play"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Play slideshow"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pause slideshow"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Recently used"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Recently used"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Press open to select an image"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Empty"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Developer:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto is an imageviewer for the Xfce desktop environment."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking at gmail.com>, 2008"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Open image"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Images"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Could not open file"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Save copy"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Could not open file"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Are you sure you want to delete image '%s' from disk?"
@@ -381,31 +404,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Display"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Background colour"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Override background colour:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Thumbnails"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -413,19 +436,19 @@ msgstr ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Hide thumbnailbar when fullscreen"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Slideshow"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -433,36 +456,40 @@ msgstr ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Control"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Scrollwheel"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Behaviour"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Startup"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Resize window to image on startup"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Wrap around images"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Image Viewer"
@@ -528,43 +555,43 @@ msgstr "border width"
 msgid "the border width of the thumbnail-bar"
 msgstr "the border width of the thumbnail-bar"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Style:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Brightness:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Saturation:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Set as wallpaper"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Auto"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centred"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Tiled"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Stretched"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Scaled"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Zoomed"
 
diff --git a/po/es.po b/po/es.po
index b73ff1c..3389ac0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2009-11-06 09:18-0300\n"
 "Last-Translator: elega <elega at elega.com.ar>\n"
 "Language-Team: Spanish <xfce-i18n at xfce.org>\n"
@@ -45,309 +45,332 @@ msgstr ""
 "Pruebe %s --help para ver una lista completa de opciones de línea de comando "
 "disponibles.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Visor de imágenes"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Abrir una imagen"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Guardar copia"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Guardar una copia de la imagen"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Mostrar propiedades del archivo"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Cerrar esta imagen"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Salir de Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Abrir con..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Ordenar"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Borrar esta imagen del disco"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Limpiar datos privados"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Preferencias"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Pantalla completa"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Salir de pantalla completa"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Establecer como fondo de escritorio"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Zoom"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Ampliar"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Ajustar"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Tamaño normal"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotar"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Girar a la _derecha"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Girar a la _izquierda"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Avanzar"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Retroceder"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Primera"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Ultima"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Contenidos"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Mostar el manual de usuario de ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Mostrar información acerca de ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Posición"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Thumbnailbar _Position"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Salir de _pantalla completa"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Mostrar la barra de _archivo"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Mostrar la barra de _navegación"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Mostrar la barra de _miniaturas"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "por nombre"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "por fecha"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Izquierda"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Derecha"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Arriba"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Abajo"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Reproducir diapositivas"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pausar"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pausar diapositivas"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Recientemente usados"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Usados recientemente"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Presione abrir para seleccionar una imagen"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Vacío"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Desarrollador:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr ""
 "Ristretto es un visor de imágenes rápido y ligero para el entorno de "
 "escritorio de Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Abel Martín <abel.martin.ruiz at gmail.com>\n"
 "Elega <elega at elega.com.ar>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Abrir imagen"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "No se pudo abrir el archivo"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Guardar copia"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "No se pudo abrir el archivo"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "¿Está seguro de querer eliminar la imagen  '%s' de su disco?"
@@ -385,31 +408,31 @@ msgstr "Todo"
 msgid "Clear private data"
 msgstr "Borrar datos privados"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Visualizador"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Color de fondo"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Barras de herramientas"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Reemplazar el color de fondo:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Combinar las barras de herramientas"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -417,19 +440,19 @@ msgstr ""
 "La barra de miniaturas se puede ocultar automáticamente \n"
 "cuando el visor de imágenes está a pantalla completa."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Ocultar la barra de miniaturas en modo pantalla completa"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Diapositivas"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Tiempo de expiración"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -438,35 +461,39 @@ msgstr ""
 "de diapositivas\n"
 "(en segundos)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Control"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Rueda de desplazamiento"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Revertir la dirección del zoom"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Comportamiento"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "Maximizar la ventana de inicio al abrir una imagen"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Ajustar alrededor de las imágenes"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Preferencias del visor de imágenes"
@@ -533,43 +560,43 @@ msgstr "ancho del borde"
 msgid "the border width of the thumbnail-bar"
 msgstr "el ancho del borde de la barra de miniaturas"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Estilo:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Brillo:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Saturación:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Establecer como fondo de escritorio"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Auto"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centrado"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Mosaicos"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Estirado"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Escalado"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Ampliado"
 
diff --git a/po/eu.po b/po/eu.po
index 61560ff..5c9f6eb 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2008-12-08 01:19+0100\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -43,304 +43,327 @@ msgstr ""
 "%s: %s\n"
 "Erabili %s --help komando-lerroko komando erabilgarriak ikusteko.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Irudi ikustatzailea"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Fitxategia"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Ireki"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Ireki irudia"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Gorde kopia"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Gorde irudiaren kopia bat"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Propietateak"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Ikusi propietateak"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "It_xi"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Itxi irudi hau"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Amaitu"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Itxi Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Ireki _honekin..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sailkatzen"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Ezabatu"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Ezabatu irudi hau diskotik"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Garbitu datu pribatuak"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Hobespenak"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Pantaila-osoa"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Utzi pantaila-osoa"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "E_zarri idazmahai-irudi gisa"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Zooma gerturatzen"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Zooma _gerturatu"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Zooma _urrutiratu"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "Zooma _egokitu"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "Tamaina normala"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "Bi_ratu"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Biratu eskuine_ra"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Biratu ez_kerrera"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Joan"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Atzera"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Lehenengoa"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "A_zkena"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Edukiak"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Bistarazi ristretto erabiltzaile manuala"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Honi buruz"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Bistarazi ristretto buruzko argibideak"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Kokalekua"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "Argazkitxo-barra _kokalekua"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Utzi _pantaila-osoa"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Ikusi _fitxategi tresna-barra"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Ikusi _nabigazio tresna-barra"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Ikusi _argazkitxo tresna-barra"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "Sailkatu fitxategi-izenez"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "sailkatu dataz"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Ezkerrean"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Eskuinean"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Goian"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Behean"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "Erre_produzitu"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Abiarazi aurkezpena"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pausatu"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pausatu aurkezpena"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "Az_kenak"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Azkenaldian erabilia"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Bat sakatu irudi bat hautatzeko"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Hutsik"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Garatzailea:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto Xfce idazmahai inguruneko irudi-ikustatzailea da."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Piarres Beobide <pi at beobide.net>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Ireki irudia"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Ezin da fitxategia ireki"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Gorde kopia"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Ezin da fitxategia ireki"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Ziur zaude '%s' irudia diskotik ezabatu nahi duzula?"
@@ -377,31 +400,31 @@ msgstr "Dena"
 msgid "Clear private data"
 msgstr "Garbitu datu pribatuak"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Bistaratu"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Atzeko planoaren kolorea"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Tresna-barrak"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Gainidatzi atzeko planoa kolorea:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Bilatu tresna-barrak"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Argazkitxoak"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -409,19 +432,19 @@ msgstr ""
 "Argazkitxo-barra automatikoki ezkutatu daiteke irudi-ikustatzailea pantaila-"
 "osoa moduan dagoenean."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "E_zkutatu argazkitxo-barra pantaila-osoan"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Aurkezpena"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Denboraz-kanpo"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -429,35 +452,39 @@ msgstr ""
 "Aurkezpenean irudi bakoitza ikusten den denbora tartea\n"
 "(segundutan)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Kontrola"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Sagu-gurpila"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Aldatu zoom norantza"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Portaera"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Hasiera"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "Leiho-tamaina argazkira doitu abiaraztean"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Bildu inguruko irudiak"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Irudi ikustatzaile hobespenak"
 
@@ -521,43 +548,43 @@ msgstr "Ertz zabalera"
 msgid "the border width of the thumbnail-bar"
 msgstr "Argazkitxo-barraren ertzaren zabalera"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Estiloa"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Distira:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Saturazioa:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "E_zarri idazmahai-irudi gisa"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automatikoa"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Erdiratua"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Mosaikoa"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Txikitua"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Eskalatua"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Gerturatua"
 
diff --git a/po/fi.po b/po/fi.po
index 0ae1679..621485d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto 0.0.90-gio\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-11-17 13:08+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish <xfce-i18n at xfce.org>\n"
@@ -43,306 +43,329 @@ msgstr ""
 "%s: %s\n"
 "Näet listan komentorivivalitsimista kirjoittamalla %s --help.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Kuvakatselin"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Avaa kuva"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "Tallenna k_opio"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Tallenna kopio kuvasta"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Sulje kuva"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Sulje Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Avaa _sovelluksessa..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "Jä_rjestä"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Sulje kuva"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Asetukset"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "Koko_ruutu"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "P_oistu kokoruudusta"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Aseta taustakuvaksi"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "S_uurennus"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Suurenna"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Pienennä"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "So_vita"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Täysi koko"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Käännä"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Käännä _oikeaan"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Käännä _vasempaan"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Siirry"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "Seu_raava"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Edellinen"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "E_nsimmäinen"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Viimeinen"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Ohje"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Näytä Ristretton käyttöopas"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Näytä tietoja Ristrettosta"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Sijainti"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Pienoiskuvat"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Jätä _Kokoruutuun"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Näytä tie_dostopainikkeet"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Näytä _navigointipalkki"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Näytä _pienoiskuvapalkki"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "tiedostonimen mukaan"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "päivämäärän mukaan"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Oikealla"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Alhaalla"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Toista"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Aloita diaesitys"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Keskeytä"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pysäytä diaesitys"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Viimeaikaiset"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Viimeksi avatut"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Avaa kuva työkalupalkin painikkeella"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Tyhjä"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Kehittäjä:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto on kuvakatselin Xfce-työpöydälle."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Jari Rahkonen <jari.rahkonen at pp1.inet.fi>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Avaa kuva"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Tiedoston avaus epäonnistui"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Tallenna kopio"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Tiedoston avaus epäonnistui"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Haluatko varmasti poistaa kuvan \"%s\" levyltä?"
@@ -379,31 +402,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Näyttö"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Korvaa taustaväri:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Pienoiskuvat"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -411,54 +434,58 @@ msgstr ""
 "Pienoiskuvapalkin voi piilottaa automaattisesti kuvakatselimen \n"
 "ollessa kokoruututilassa."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Piilota pienoiskuvapalkki kokoruudussa"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Diaesitys"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Esitysaika"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
 msgstr "Montako sekuntia yksittäistä kuvaa esitetään diaesityksessä?"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Ohjaus"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Hiiren rulla"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Käytös"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Käynnistys"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Sovita ikkuna kuvaan käynnistäessä"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Kierrätä kuvia"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Kuvakatselin"
@@ -524,43 +551,43 @@ msgstr "Reunuksen leveys"
 msgid "the border width of the thumbnail-bar"
 msgstr "Pienoiskuvapalkin reunuksen leveys"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Tyyli:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Kirkkaus:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Värikylläisyys:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Aseta taustakuvaksi"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Keskitetty"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Rinnakkain"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Venytetty"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Skaalattu"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Suurennettu"
 
diff --git a/po/fr.po b/po/fr.po
index ba5cc5f..1e2ce6f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-02-11 15:32+0100\n"
 "Last-Translator: Douart Patrick <patrick.2 at laposte.net>\n"
 "Language-Team: French\n"
@@ -46,308 +46,331 @@ msgstr ""
 "Essayez %s --help pour voir une liste complète des options en ligne de "
 "commande.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Visualiseur d’images"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Ouvrir une image"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Enregistrer une copie"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Enregistrer une copie de l'image"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Propriétés"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Afficher les propriétés du fichier"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Fermer cette image"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Quitter Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Éditer"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Ouvrir avec..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Trier par"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Effacer"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Supprimer cette image du disque"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Nettoyer les données personnelles"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Préférences"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Afficher"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Plein écran"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Quitter le plein écran"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Utiliser en tant que fond d'écran"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Zoom"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Zoom _Avant"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Zoom _Avant"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "Zoom au _Mieux"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Taille Normale"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotation"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Tourner vers la _Droite"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Tourner vers la _Gauche"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "A_ller à"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Suivante"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Précédente"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "Pre_mière"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Dernière"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "A_ide"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Contenu"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Afficher le manuel de ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_À propos"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Afficher les informations à propos de ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Position"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "_Position de la barre de miniatures"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Quitter le _plein écran"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Montrer la Barre de _Fichiers"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Montrer la Barre de _Navigation"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Montrer la Barre de _Miniatures"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "Trier par nom de fichier"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "Trier par date"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Gauche"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Droite"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Haut"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Bas"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Jouer"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Démarrer le diaporama"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Mettre le diaporama en pause"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Récemment ouvert"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Utilisé récemment"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Cliquez sur ouvrir pour sélectionner une image"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Vide"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Développeur :"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr ""
 "Ristretto est une visionneuse d’images légère et rapide pour l’environnement "
 "de bureau Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Mike Massonnet <mmassonnet at xfce.org>\n"
 "Steve Dodier <sidnioulz at gmail.com>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Ouvrir une image"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Images"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Impossible d’ouvrir le fichier"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Sauvegarder une copie"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Impossible d’ouvrir le fichier"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Désirez-vous vraiment supprimer l'image '%s' du disque ?"
@@ -384,31 +407,31 @@ msgstr "Tout"
 msgid "Clear private data"
 msgstr "Nettoyer les données personnelles"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Affichage"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Couleur d'arrière plan"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Barres d'outils"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "_Passer outre la couleur d’arrière plan :"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Fusionner les barres d'outils"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniatures"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -416,19 +439,19 @@ msgstr ""
 "La barre de miniatures peut être cachée automatiquement \n"
 "lorsque la visionneuse d'images est en plein écran."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Cacher les miniatures en plein écran"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Diaporama"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Durée"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -436,35 +459,39 @@ msgstr ""
 "La durée d’affichage d’une image individuelle durant le diaporama\n"
 "(en secondes)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Contrôles"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Défilement de la molette"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Inverser la direction du zoom"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Comportement"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Démarrage"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "Maximiser le fenêtre à l'ouverture d'une image"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Adapter autour de l'image"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Préférences du visualiseur d’images"
 
@@ -528,43 +555,43 @@ msgstr "Largeur des bordures"
 msgid "the border width of the thumbnail-bar"
 msgstr "Largeur de la barre des miniatures"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Style :"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Luminosité :"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Saturation :"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Utiliser en tant que fond d'écran"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Auto"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centré"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Chevauchement"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Etendu"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Mise à l'échelle"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Zoomé"
 
diff --git a/po/gl.po b/po/gl.po
index 5de658c..29db43b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-10-20 09:48+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -49,309 +49,332 @@ msgstr ""
 "Execute %s --help para ver unha lista completa das opcións de liña de ordes "
 "dispoñibles.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Visor de imaxes"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Abrir unha imaxe"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "Gar_dar unha copia"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Gardar unha copia da imaxe"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Pechar esta imaxe"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Saír de Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Abrir con..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Ordenación"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Pechar esta imaxe"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Preferencias"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Pantalla completa"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Saír do modo de pantalla completa"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Definir como _fondo de escritorio"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Ampliación"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Aumentar"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Encaixar"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotación"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Rotar á _dereita"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Rotar á _esqueda"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Seguinte"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Atrás"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Primeira"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "Ú_ltima"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Contido"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Mostrar o manual de usuario de Ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Mostrar información acerca de Ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Posición"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Miniaturas"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "_Saír do modo de pantalla completa"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Mostrar a barra de ferramentas de _ficheiro"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Mostrar a barra de ferramentas de _navegación"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Mos_trar a barra de miniaturas"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "ordenar por nome de ficheiro"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "ordenar por data"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Dereita"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Superior"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Inferior"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Iniciar"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Iniciar a presentación"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pausar"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pausar a presentación"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "Usados _recentemente"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Usados recentemente"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Prema abrir para seleccionar unha imaxe"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Baleiro"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Desenvolvedor:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto é un visor de imaxes para o ambiente de escritorio Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Leandro Regueiro <leandro.regueiro at gmail.com>, 2008, 2009, 2010\n"
 "\n"
 "Proxecto Trasno http://trasno.net"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Abrir imaxe"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Non se puido abrir o ficheiro"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Gardar unha copia"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Non se puido abrir o ficheiro"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Está seguro de que desexa eliminar a imaxe \"%s\" do disco?"
@@ -388,31 +411,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Pantalla"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Cor de fondo"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Substituír a cor de fondo:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -421,19 +444,19 @@ msgstr ""
 "miniaturas cando o visor de imaxes está a\n"
 "pantalla completa."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Ocultar a barra de miniaturas cando se estea a pantalla completa"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Presentación"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Tempo de espera"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -441,36 +464,40 @@ msgstr ""
 "O período de tempo que se mostra cada imaxe durante unha\n"
 "presentación (en segundos)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Control"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Roda do rato"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Comportamento"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Redimensionar a xanela ao tamaño da imaxe ao iniciar"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Envoltorio arredor das imaxes"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Visor de imaxes"
@@ -536,45 +563,45 @@ msgstr "Ancho do bordo"
 msgid "the border width of the thumbnail-bar"
 msgstr "O ancho do bordo da barra de miniaturas"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Estilo:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Brillo:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Saturación:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Definir como fondo de escritorio"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automático"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centrado"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Mosaico"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Estirada"
 
 # expandir escalar redimensionar
 # MIRAR EN XFDESKTOP
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Escalada"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Ampliada"
 
diff --git a/po/hr.po b/po/hr.po
index 76d94f1..3e51133 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-06-11 19:40+0200\n"
 "Last-Translator: Ivica Kolić<ikoli at yahoo.com> <>\n"
 "Language-Team: Croatian <>\n"
@@ -46,303 +46,326 @@ msgstr ""
 "Try %s --help da biste vidjeli cijelu listu dostupnih opcija naredbenog "
 "retka\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Preglednik slika"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Otvori sliku"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Spremi kopiju"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Spremi kopiju slike"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Svojstva"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Prikaži svojstva datoteke"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Zatvori ovu sliku"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Isključi"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Isključi Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Otvori pomoću"
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sortiranje"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Izbriši"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Izbriši ovu sliku sa diska"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Očisti privatne podatke"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Osobitosti"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Cijeli zaslon"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Napusti cijeli zaslon"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr ""
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Zumiranje"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr ""
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr ""
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Normalna veličina"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotacija"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Rotiraj _desno"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Rotiraj _lijevo"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Idi"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Naprijed"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Nazad"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Prvo"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Zadnje"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Prikaži ristretto korisnički priručnik"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Prikaži informaciju o ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Pozicija"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr ""
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Napusti _cijeli zaslon"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Pokaži _alatnu traku datoteke"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Pokaži _ navigacijsku alatnu traku"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Pokaži _traku sličica"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "posloži po imenu"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "posloži po datumu"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Lijevo"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Desno"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Vrh"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Dno"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr ""
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Pokreni klizni prikaz"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pauza"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pauziraj klizni prikaz"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Nedavno korišteno"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Nedavno korišteno"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Pritisnite otvori za odabir slike"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Prazno"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr ""
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto je preglednik slika za  Xfce radno okruženje"
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Ivica Kolić (zvacet) <ikoli at yahoo.com>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Otvori sliku"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ". Jp (e) g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Ne mogu otvoriti datotewku"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Spremi kopiju"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 msgid "Could not save file"
 msgstr "Ne mogu spremiti datoteku"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "jeste li sigurni da želite izbrisati sliku '%s sa diska?"
@@ -379,31 +402,31 @@ msgstr "Sve"
 msgid "Clear private data"
 msgstr "Očisti privatne podatke"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Zaslon"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Pozadinska boja"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Alatne trake"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr ""
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Spoji alatne trake"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Sličice"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -411,19 +434,19 @@ msgstr ""
 "Traka sličica može biti automatski skrivena \n"
 "kada je preglednik slika u punom zaslonu."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Sakrij sličice kad je cijeli zaslon"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Klizni prikaz"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr ""
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -431,35 +454,39 @@ msgstr ""
 "Vremensko razdoblje u kojem je prikazana jedna slika u kliznom prikazu\n"
 "(u sekundama)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Kontrola"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr ""
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Ponašanje"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Pokretanje"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr ""
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Omotaj oko skika"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Osobitosti preglednika slika"
 
@@ -523,43 +550,43 @@ msgstr "širina ruba"
 msgid "the border width of the thumbnail-bar"
 msgstr "Širina ruba trake sličica"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Stil"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Osvijetljenost"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Zasićenost"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centrirano"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Rastegnuto"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Skalirano"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Zumirano"
 
diff --git a/po/hu.po b/po/hu.po
index 7ce47c8..786980b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-02-05 16:48+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
@@ -46,306 +46,329 @@ msgstr ""
 "%s: %s\n"
 "Az elérhető kapcsolók listájáért adja ki az %s --help parancsot.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Képmegjelenítő"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Fájl"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Megnyitás"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Kép megnyitása"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "Más_olat mentése"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "A kép másolatának mentése"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Bezárás"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Kép bezárása"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Kilépés a Ristrettoból"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Megnyitás e_zzel…"
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "Ren_dezés"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Törlés"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Kép bezárása"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Beállítások"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Teljes képernyő"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "T_eljes képernyő elhagyása"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Beállítás _háttérképként"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Nagyítás"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Nagyítás"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Kicsinyítés"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Igazítás az ablakhoz"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Normál méret"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Forgatás"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Forgatás _jobbra"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Forgatás _balra"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Ugrás"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Előre"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Vissza"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Első"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Utolsó"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Tartalom"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "A Ristretto felhasználói kézikönyvének megjelenítése"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Információk megjelenítése a Ristrettoról"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Pozíció"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Bélyegképek"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "T_eljes képernyő elhagyása"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "_Fájl eszköztár megjelenítése"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "_Navigáció eszköztár megjelenítése"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "_Bélyegképsor megjelenítése"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "rendezés fájlnév szerint"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "rendezés dátum szerint"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Balra"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Jobbra"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Fent"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Lent"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Lejátszás"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Diavetítés lejátszása"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "S_zünet"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Diavetítés szüneteltetése"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Nemrég használt"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Nemrég használt"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Kép kiválasztásához nyomja meg a Megnyitás gombot"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Üres"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Fejlesztő:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "A Ristretto egy képmegjelenítő az Xfce asztali környezethez."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Kelemen Gábor <kelemeng at gnome.hu>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Kép megnyitása"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Képek"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Nem lehet megnyitni a fájlt"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Másolat mentése"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Nem lehet megnyitni a fájlt"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Biztosan törli a(z) „%s” képet a lemezről?"
@@ -382,31 +405,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Megjelenítés"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Háttérszín"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Háttérszín felülbírálása:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Bélyegképek"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -414,54 +437,58 @@ msgstr ""
 "A bélyegképsáv automatikusan elrejthető\n"
 "ha a képmegjelenítő teljes képernyőn van."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Bélyegképsáv elrejtése teljes képernyőn"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Diavetítés"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Időtúllépés"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
 msgstr "Egyes képek megjelenítése ennyi ideig diavetítés során (másodperc)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Vezérlés"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Egérgörgő"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Viselkedés"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Indítás"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Ablak átméretezése a képhez indításkor"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Képek körbefuttatása"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Képmegjelenítő"
@@ -527,43 +554,43 @@ msgstr "Szegély szélessége"
 msgid "the border width of the thumbnail-bar"
 msgstr "A bélyegképsáv szegélyének szélessége"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Stílus:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Fényerő:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Telítettség:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Beállítás háttérképként"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automatikus"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Középre helyezett"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Mozaik"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Nyújtott"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Kifeszített"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Nagyított"
 
diff --git a/po/id.po b/po/id.po
index fe83e99..1312a33 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2008-12-19 22:32+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\n"
@@ -44,305 +44,328 @@ msgstr ""
 "Coba %s --help untuk melihat senarai penuh dari opsi baris perintah yang "
 "tersedia.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Penilik Gambar"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Berkas"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Buka"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Buka sebuah gambar"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Simpan salinan"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Simpan sebuah salinan gambar"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Tutup"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Tutup gambar ini"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Keluar Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Buka dengan..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Pengurutan"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Hapus"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Hapus gambar ini dari cakram"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Hapus data pribadi"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Pengaturan"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Tampilan"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Layar Penuh"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Tinggalkan Layar Penuh"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Atur sebagai Gambar Latar"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Pembesaran"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Pembesaran"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "P_engecilan"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "Pe_ngepasan"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Ukuran Normal"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotasi"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Rotasi ke Ka_nan"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Rotasi ke Ki_ri"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Ke"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Maju"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "M_undur"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "Per_tama"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "Te_rakhir"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "Ban_tuan"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Isi"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Tampilkan manual pengguna ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Tentang"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Tampilkan informasi tentang ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Posisi"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Miniatur"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Tinggalkan _Layar Penuh"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Tampi_lkan Batang Alat Berkas"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Tampi_lkan Batang Alat Navigasi"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Tampi_lkan Batang Alat Miniatur"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "urutkan berdasarkan nama berkas"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "urutkan berdasarkan tanggal"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Kiri"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Kanan"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Atas"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Bawah"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Putar"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Putar salindia"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Jeda"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Jeda salindia"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "Bar_u digunakan"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Baru digunakan"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Tekan buka untuk memilih gambar"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Kosong"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Pengembang:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto adalah penilik gambar untuk lingkungan desktop Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Andhika Padmawan <andhika.padmawan at gmail.com>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Buka gambar"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Gambar"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Tak dapat membuka berkas"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Simpan salinan"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Tak dapat membuka berkas"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Anda yakin ingin menghapus gambar '%s' dari cakram?"
@@ -379,32 +402,32 @@ msgstr "Semua"
 msgid "Clear private data"
 msgstr "Hapus data pribadi"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Tampilan"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Warna latar belakang"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Timpa warna latar belakang:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 #, fuzzy
 msgid "Merge toolbars"
 msgstr "Rentang waktu:"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniatur"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -412,19 +435,19 @@ msgstr ""
 "Batang alat miniatur dapat secara otomatis bersembunyi \n"
 "ketika penilik gambar sedang dalam layar penuh"
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Sembunyikan batang alat miniatur ketika layar penuh"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Tampil Salindia"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Waktu Jeda"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -432,36 +455,40 @@ msgstr ""
 "Waktu membatasi gambar individu yang ditayangkan ketika tampil salindia\n"
 "(dalam detik)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Kontrol"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Roda gulung"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Perilaku"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Mulai"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Atur ulang jendela untuk gambar saat mulai"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Gulung sekeliling gambar"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Penilik Gambar"
@@ -527,43 +554,43 @@ msgstr "lebar batas"
 msgid "the border width of the thumbnail-bar"
 msgstr "Lebar batas batang gambar miniatur"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Gaya:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Kecerahan:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Saturasi:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Atur sebagai gambar latar"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Otomatis"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Dipusatkan"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Diubinkan"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Direntangkan"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Diskalakan"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Dibesarkan"
 
diff --git a/po/it.po b/po/it.po
index 1f8e3e0..9ad27a9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2009-12-10 19:43+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
 "Language-Team: Italian Translation Team <xfce-it-translators at googlegroups."
@@ -47,305 +47,328 @@ msgstr ""
 "Utilizzare il comando %s --help per visualizzare la lista completa delle "
 "opzioni da linea di comando.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Visualizzatore di immagini"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_File"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Apri"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Apre una immagine"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Salva copia"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Salva una copia dell'immagine"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Proprietà"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Mostra le proprietà del file"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Chiude questa immagine"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Esce da Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Apri con..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Ordinamento"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Cancella"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Elimina questa immagine dal disco"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Cancella dati privati"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Preferenze"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "A schermo inter_o"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Lascia a schermo intero"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Imposta come _sfondo"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Ingrandimento"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Ingrandisci"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Rimpicciolisci"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Adatta"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Dimensione normale"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotazione"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Ruota a _destra"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Ruota a _sinistra"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "V_ai"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Avanti"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Indietro"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "P_rima"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Ultima"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "A_iuto"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Visualizza il manuale dell'utente di Ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Informazioni"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Visualizza delle informazioni relative a Ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Posizione"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "_Posizione barra miniature"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Lascia a schermo i_ntero"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Mostra la barra degli strumenti _file"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Mostra la barra degli strumenti di _navigazione"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Mostra la barra delle minia_ture"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "ordina per nome file"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "ordina per data"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Sinistra"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Destra"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Alto"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Basso"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Avvia"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Avvia presentazione"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pausa presentazione"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "Apri _recenti"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Usati di recente"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Premere «Apri» per selezionare un'immagine"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Vuota"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Sviluppatore:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto è un visualizzatore di immagini per l'ambiente grafico Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Fabio Vergnani <monghitri at aruba.it> 2007\n"
 "Cristian Marchi <cri.penta at gmail.com> 2009"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Apri immagine"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Impossibile aprire il file"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Salva una copia"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 msgid "Could not save file"
 msgstr "Impossibile salvare il file"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Cancellare davvero l'immagine «%s» dal disco?"
@@ -382,31 +405,31 @@ msgstr "Tutto"
 msgid "Clear private data"
 msgstr "Cancella i dati privati"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Visualizzazione"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Colore dello sfondo"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Barre degli strumenti"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Cambia il colore dello sfondo:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Unisci barre degli strumenti"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniature"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -414,19 +437,19 @@ msgstr ""
 "La barra delle miniature può essere nascosta automaticamente \n"
 "quando la visualizzazione è a schermo intero."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Nascondi la barra delle miniature quando a schermo intero"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Presentazione"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Durata"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -434,35 +457,39 @@ msgstr ""
 "Il tempo per cui viene visualizzata un'immagine durante una presentazione\n"
 "(in secondi)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Controlli"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Rotella del mouse"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Inverti la direzione dello zoom"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Comportamento"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Avvio"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "Massimizza la finestra all'avvio quando viene aperta un'immagine"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Scorrimento continuo delle immagini"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Preferenze del visualizzatore di immagini"
 
@@ -526,43 +553,43 @@ msgstr "larghezza del bordo"
 msgid "the border width of the thumbnail-bar"
 msgstr "la larghezza del bordo della barra delle miniature"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Stile:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Luminosità:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Saturazione:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Imposta come sfondo"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automatico"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centrata"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Affiancata"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Stirata"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Scalata"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Ingrandita"
 
diff --git a/po/ja.po b/po/ja.po
index 2e3a979..b5b54f3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.18\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2011-11-20 19:32+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -47,305 +47,328 @@ msgstr ""
 "%s --help で使用可能なすべてのコマンドライン\n"
 "オプションが表示されます。\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "画像ビューア"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "画像を開きます"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "コピーを保存(_S)"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "画像のコピーを保存します"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "プロパティ(_P)"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "ファイルのプロパティを表示します"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "画像を閉じます"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Ristretto を終了します"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "アプリケーションで開く(_O)..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "並び替え(_S)"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "この画像をディスクから削除します"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "プライベートデータをクリア(_C)"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "設定(_P)"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "全画面化(_F)"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "元に戻す(_L)"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "壁紙に設定(_S)"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "拡大/縮小(_Z)"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "拡大(_I)"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "縮小(_O)"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "ウィンドウに合わせる(_F)"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "標準サイズ(_N)"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "回転(_R)"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "右回転(_R)"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "左回転(_L)"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "移動(_G)"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "進む(_F)"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "戻る(_B)"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "先頭(_F)"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "最後(_L)"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "目次(_C)"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Ristretto ユーザマニュアルを表示します"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "情報(_A)"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Ristretto についての情報を表示します"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "位置(_P)"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "サムネイルバーの位置(_P)"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "元に戻す(_F)"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "ファイルツールバー(_F)"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "ナビゲーションツールバー(_N)"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "サムネイルバー(_T)"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "ファイル名順"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "日付順"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "左"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "右"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "上"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "下"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "再生(_P)"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "スライドショーを開始します"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "一時停止(_P)"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "スライドショーを一時停止します"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "最近開いたファイル(_R)"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "最近開いたファイル"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "画像を選ぶには開くボタンを押してください。"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "空"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "開発者:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr ""
 "Ristretto は Xfce デスクトップ環境向けの\n"
 "画像ビューアです。"
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Masato Hashimoto <hashimo at xfce.org>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "画像を開く"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "画像"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "ファイルを開けませんでした"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "コピーを保存"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 msgid "Could not save file"
 msgstr "ファイルを保存できませんでした"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "画像 '%s' をドライブから削除してもよろしいですか?"
@@ -382,31 +405,31 @@ msgstr "すべて"
 msgid "Clear private data"
 msgstr "プライベートデータのクリア"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "表示"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "背景色"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "ツールバー"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "背景色を変更する:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "ツールバーを統合する"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "サムネイル"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -414,54 +437,58 @@ msgstr ""
 "イメージビューアが全画面化されたときにサムネイルバーを自動的に隠すことができ"
 "ます。"
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "全画面時サムネイルを表示しない"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "スライドショー"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "タイムアウト"
 
 # In ja translation, It's unnecessary to break the line.
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
 msgstr "スライドショー中に各画像を表示する時間 (秒)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "制御"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "スクロールホイール"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "ズームの方向を反転する"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "振る舞い"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "起動"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "画像を開いて起動する時にウィンドウを最大化する"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "最後の画像に来たら先頭に戻る"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "画像ビューア設定"
 
@@ -525,43 +552,43 @@ msgstr "境界線幅"
 msgid "the border width of the thumbnail-bar"
 msgstr "サムネイルバーの境界線幅"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "スタイル:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "明度:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "彩度:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "壁紙に設定"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "自動"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "中央揃え"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "タイル状"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "縦横比を維持せず全画面化"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "長辺を画面に合わせる"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "短辺を画面に合わせる"
 
diff --git a/po/lv.po b/po/lv.po
index 6a4f1cd..9539d56 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto 0.0.1-svn-r02537\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-03-25 21:52+0100\n"
 "Last-Translator: Rihards Priedītis <rprieditis at gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
@@ -47,309 +47,332 @@ msgstr ""
 "%s: %s\n"
 "Mēģiniet %s --help , lai redzētu pilnu pieejamo komandu sarakstu.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Attēlu Skatītājs"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Fails"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Atvērt"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Atvērt attēlu"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Saglabāt kopiju"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Saglabāt attēla kopiju"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "Ai_zvērt"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Aizvērt attēlu"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Iziet"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Iziet no Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Rediģēt"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Atvērt ar..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Kārtot"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Dzēst"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Aizvērt attēlu"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Uzstādījumi"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Skats"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Pilnekrāns"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Iziet no pilnekrāna"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Uzstādīt, kā darbavirsmas fonu"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Mērogot"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Tuv_ināt"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "A_ttālināt"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "I_etilpināt"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Parastais izmērs"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotācija"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Rotēt pa _labi"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Rotēt pa _kreisi"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Doties"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Uz priekšu"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Atpakaļ"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Pirmais"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Pēdējais"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Palīdzība"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Saturs"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Attēlot ristretto lietošanas pamācību"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Par"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Attēlot informāciju par ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Pozīcija"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Sīktēli"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Iziet no _pilnekrāna"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Rādīt _failu rīkjoslu"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Rādīt _navigācijas rīkjoslu"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Rādīt _sīktēljoslu"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "kārtot pēc faila nosaukuma"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "kārtot pēc datuma"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Pa kreisi"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Pa labi"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Augšā"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Apakšā"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr ""
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 #, fuzzy
 msgid "Play slideshow"
 msgstr "Sākt slīdrādi"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr ""
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 #, fuzzy
 msgid "Pause slideshow"
 msgstr "Sākt slīdrādi"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Nesenie"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 #, fuzzy
 msgid "Recently used"
 msgstr "_Nesenie"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Nospiediet atvērt, lai atlasītu attēlu"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Tukšs"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Izstrādātājs:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto ir attēlu skatītājs priekš Xfce darbvirsmas vides."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Rihards Priedītis"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Atvērt attēlu"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Attēli"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Nevarēju atvērt failu"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Saglabāt kopiju"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Nevarēju atvērt failu"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Esat drošs, ka vēlaties dzēst attēlu \"%s\" no diska?"
@@ -386,31 +409,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Rādīt"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Fona krāsa"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Pārstatīt fona krāsu:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Sīktēli"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -418,19 +441,19 @@ msgstr ""
 "Siktēljosla var automātiski tikt paslēpta\n"
 "kad attēlu skatītājs ir pilnekrāna režīmā."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Slēpt sīktēljoslu pilnekrana režīmā"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Slīdrāde"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Noildze"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -438,36 +461,40 @@ msgstr ""
 "Noildze viena attēla rādīšanai slīdrādē\n"
 "(sekundēs)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Kontroļi"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Ritināšana"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Uzvedība"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Palaišanās"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Mainīt loga izmēru uz attēla palaišanos"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Aplauzt gar attēliem"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Attēlu Skatītājs"
@@ -533,43 +560,43 @@ msgstr "robežas platums"
 msgid "the border width of the thumbnail-bar"
 msgstr "sīktēlu-joslas film-rindas robežas platums"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Stils:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Spilgtums:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Piesātinājums:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Uzstādīt, kā darbavirsmas fonu"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automātiski"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centrēts"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Sakrauti"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Izstiepts"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Mērogots"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Pietuvināts"
 
diff --git a/po/nb.po b/po/nb.po
index bdc55da..92495c9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2007-08-29 21:12+0200\n"
 "Last-Translator: Terje Uriansrud <terje at uriansrud.net>\n"
 "Language-Team: Norwegian Bokmal\n"
@@ -45,306 +45,329 @@ msgstr ""
 "%s: %s\n"
 "Prøv %s --help for full liste over tilgjengelige kommandolinje opsjoner.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Bildefremviser"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Fil"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "Å_pne"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Åpne bilde"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Lagre kopi"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Lagre en kpi av bildet"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Lukk dette bildet"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Avslutt Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Å_pne med..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sorter"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "S_lett"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Lukk dette bildet"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "Innstillinger"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Fullskjerm"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Avslutt fullskjerm"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Bruk _som bakgrunnsbilde"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Skalere"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Forstørre"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Forminske"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "Til_pass"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Vanlig størrelse"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Roter"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Roter _høyre"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Roter _venstre"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Gå"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Neste"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Forrige"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Første"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Siste"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Vis Ristretto brukermanual"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Vis informasjon om Ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Posisjon"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Miniatyrbilder"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Avslutt _fullskjerm"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Vis _filverktøylinje"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Vis _navigasjonsverktøylinje"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Vis _miniatyrlinje"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "sorter etter filnavn"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "sorter etter dato"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Venstre"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Høyre"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Topp"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Bunn"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Start"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Start lysbildefremvisning"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pause lysbildefremvisning"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "Nylig _brukt"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Nylig brukt"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Trykk åpne for å velge et bilde"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Tom"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Utvikler:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto er en bildefremviser for Xfce skrivebordsmiljøet"
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Terje Uriansrud <terje at uriansrud.net>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Åpne bilde"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Klarte ikke åpne fil"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Lagre kopi"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Klarte ikke åpne fil"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Er du sikker på at du vil slette bildet '%s' fra disken?"
@@ -381,31 +404,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Skjerm"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Bakgrunnsfarge"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Overstyr bakgrunnsfarge"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniatyrbilder"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -413,19 +436,19 @@ msgstr ""
 "Miniatyrlinjen kan skjules automatisk \n"
 "når fullskjermvisning er på"
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Skjul miniatyrlinje ved fullskjermvisning"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Lysbildefremvisning"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Tidsgrense"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -433,36 +456,40 @@ msgstr ""
 "Tidsperiode ett bilde vises under lysbildefremvisning\n"
 "(i sekunder)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Kontroll"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Rullehjul"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Oppførsel"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Oppstart"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Endre størrelse på vindu etter bildet ved oppstart"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Linjebryt bilder"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Bildefremviser"
@@ -528,43 +555,43 @@ msgstr "bredde på ramme"
 msgid "the border width of the thumbnail-bar"
 msgstr "bredde på miniatyrbildelinjen"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Stil:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Lys:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Metning:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Bruk som bakgrunnsbilde"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Auto"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Sentrert"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Flislagt"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Strukket"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Skalert"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Zoomet"
 
diff --git a/po/nl.po b/po/nl.po
index 6d2100f..5f806fb 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2011-09-08 00:48+0200\n"
 "Last-Translator: Pjotr\n"
 "Language-Team: Dutch (Flemish)\n"
@@ -45,306 +45,329 @@ msgstr ""
 "%s: %s\n"
 "Probeer %s --help voor een lijst van beschikbare opdrachtregelopties.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Afbeeldingkijker"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Open"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Afbeelding openen"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "Kopie op_slaan"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Sla een kopie van de afbeelding op"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "Eigenschappen"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Toon bestandeigenschappen"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Sluit deze afbeelding"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Ristretto sluiten"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Openen met..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sorteren"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Verwijder deze afbeelding van de schijf"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "Verwijder privégegevens"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Voorkeuren"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "Beel_d"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Volledig scherm"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Volledig scherm sluiten"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "In_stellen als bureaubladachtergrond"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Zoomen"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Inzoomen"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Uitzoomen"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Passend maken"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Normale grootte"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Draaiing"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "_Rechtsom draaien"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "_Linksom draaien"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Ga"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Volgende"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Vorige"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Eerste"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Laatste"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Inhoud"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Laat Ristretto-handleiding zien"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Over"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Laat informatie over Ristretto zien"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Positie"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "Positie van miniaturenbalk"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Verlaat _schermvullende modus"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Toon _bestandenwerkbalk"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Toon _navigatiewerkbalk"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Toon _miniaturenbalk"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "sorteren op bestandnaam"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "sorteren op datum"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Links"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Rechts"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Bovenkant"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Onderkant"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "Afs_pelen"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Speel een diapresentatie af"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pauzeer"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pauzeer diapresentatie"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Recent geopend"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Recent gebruikt"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Druk op openen om een afbeelding te selecteren"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Leeg"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Ontwikkelaar:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto is een afbeeldingkijker voor de Xfce-werkomgeving."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Timo Verbeek <timoverbeek10 at hotmail.com>\n"
 "Stephan Arts<stephan at xfce.org>\n"
 "Pjotr"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Afbeelding openen"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ". jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Kon bestand niet openen"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Bewaar kopie"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 msgid "Could not save file"
 msgstr "Kon bestand niet opslaan"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Weet u zeker dat u afbeelding '%s' van de schijf wil verwijderen?"
@@ -381,31 +404,31 @@ msgstr "Alles"
 msgid "Clear private data"
 msgstr "Verwijder privégegevens"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Weergave"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Achtergrondkleur"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Werkbalken"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Achtergrondkleur wijzigen:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Werkbalken samenvoegen"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniaturen"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -413,19 +436,19 @@ msgstr ""
 "De miniaturenbalk kan automatisch worden verborgen \n"
 "wanneer de afbeeldingkijker in schermvullende modus is."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Miniaturenbalk verbergen bij schermvullende modus"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Diavertoning"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Pauze"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -433,36 +456,40 @@ msgstr ""
 "De periode dat een enkele afbeelding wordt weergegeven gedurende een\n"
 "diaweergave (in seconden)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Control"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Bladerwieltje"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Draai zoomrichting om"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Gedrag"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Opstarten"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr ""
 "Venstergrootte maximaliseren bij opstarten, bij het openen van een afbeelding"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Om afbeeldingen heen vouwen"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Voorkeuren van Afbeeldingkijker"
 
@@ -526,43 +553,43 @@ msgstr "randbreedte"
 msgid "the border width of the thumbnail-bar"
 msgstr "de randbreedte van de miniaturenbalk"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Stijl:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Helderheid:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Verzadiging:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Instellen als bureaubladachtergrond"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automatisch"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Gecentreerd"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Naast elkaar"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Uitgerekt"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Geschaald"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Ingezoomd"
 
diff --git a/po/pl.po b/po/pl.po
index fb66e2f..3425f2a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ristretto 0.0.21\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-22 16:42+0000\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2011-11-22 19:22+0100\n"
 "Last-Translator: Piotr Sokół <psokol at jabster.pl>\n"
 "Language-Team: polski <>\n"
@@ -50,305 +50,328 @@ msgstr ""
 "Proszę wprowadzić „%s --help”, aby wypisać pełną listę opcji wiersza "
 "poleceń.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Przeglądarka obrazów"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Plik"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Otwórz"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Wybór pliku"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Zapisz kopię"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Zapisuje kopię obrazu"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Właściwości"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Wyświetla właściwości pliku"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "Za_mknij"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Zamyka bieżący plik"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Kończy działanie programu"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Otwórz za pomocą..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sortowanie"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Usuń"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Trwale usuwa plik obrazu"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Wyczyść prywatne dane"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "P_referencje"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Widok"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Pełny ekran"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Opuść pełny ekran"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Ustaw jako tapetę"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Skalowanie"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Po_większ"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Po_mniejsz"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Dopasuj"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Zwykły rozmiar"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Obracanie"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "W p_rawo"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "W _lewo"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "P_rzejdź"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Naprzód"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Wstecz"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Pierwszy"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Ostatni"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Spis treści"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Otwiera podręcznik użytkownika programu"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_O programie"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Wyświetla informacje o programie"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Położenie"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "_Położenie miniatur"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Opuść p_ełny ekran"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "_Pasek poleceń pliku"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "_Pasek poleceń nawigacji"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "_Miniatury"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "Według nazwy pliku"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "Według daty"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Lewo"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Prawo"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Góra"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Dół"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Rozpocznij pokaz"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Rozpoczyna pokaz obrazów"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Wstrzymaj pokaz"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Wstrzymuje pokaz obrazów"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "O_statnio otwarte"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Wyświetla ostatnio otwarte pliki"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Proszę otworzyć obraz za pomocą polecenia Otwórz."
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Pusty"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Twórca:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Przeglądarka obrazów dla środowiska Xfce"
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Łukasz Romanowicz <lukasz210 at gmail.com>\n"
 "Piotr Sokół <psokol at jabster.pl>, 2010, 2011"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Wybór pliku"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Wszystkie obrazy"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr "Obrazy w formacie JPEG"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Nie można otworzyć pliku"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Wybór pliku"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 msgid "Could not save file"
 msgstr "Nie można zapisać pliku"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Usunąć plik „%s”?"
@@ -385,31 +408,31 @@ msgstr "Wszystkie"
 msgid "Clear private data"
 msgstr "Czyszczenie prywatnych danych"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Wygląd"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Kolor tła"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Paski narzędziowe"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Własny:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Połączenie pasków narzędziowych"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniatury"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -417,53 +440,57 @@ msgstr ""
 "Pasek miniatur może być automatycznie ukrywany\n"
 "podczas pracy w trybie pełnoekranowym."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Ukrywanie miniatur na pełnym ekranie"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Pokaz slajdów"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Czas"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
 msgstr "Czas wyświetlania pojedynczego obrazu (s):"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Sterowanie"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Kółko myszy"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Odwrócenie kierunku powiększania obrazu"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Zachowanie"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Uruchamianie"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "Maksymalizowanie okna podczas uruchamiania programu"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Przechodzenie pomiędzy początkiem i końcem katalogu"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Preferencje"
 
@@ -527,43 +554,43 @@ msgstr "szerokość krawędzi"
 msgid "the border width of the thumbnail-bar"
 msgstr "szerokość krawędzi paska miniatur"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Styl:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Jasność:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Nasycenie:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Ustawia obraz w tle pulpitu"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automatycznie"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Wyśrodkowane"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Kafelkowane"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Rozciągnięte"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Skalowane"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Zbliżone"
 
diff --git a/po/pt.po b/po/pt.po
index c86905f..ec035e5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Nuno Miguel <nunis at netcabo.pt>, 2007
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ristretto 0.0.22\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-22 16:42+0000\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-01-15 14:16-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt at gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: PORTUGAL\n"
@@ -47,303 +47,326 @@ msgstr ""
 "Tente %s --help para ver uma lista completa de opções em linha de comandos "
 "disponíveis.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Visualizador de imagens"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Abrir uma imagem"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Gravar cópia"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Gravar uma cópia da imagem"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Mostrar propriedades do ficheiro"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "Fe_char"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Fechar esta imagem"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Sair do Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Abrir c_om..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Ordenação"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Apagar"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Apagar esta imagem do disco"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Limpar dados privados"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Preferências"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Ecrã completo"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "Sair do ecrã comp_leto"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Definir como papel de parede"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Tamanho"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "A_mpliar"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Redu_zir"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "Aju_star tamanho"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "Tamanho _normal"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotação"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Rodar à _direita"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Rodar à _esquerda"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Avançar"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Voltar"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Primeira"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "Últi_ma"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Mostrar o manual de utilizador do ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Mostrar informações do ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Posição"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "_Posição das miniaturas"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Sair de _ecrã completo"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Mostrar barra de _ficheiro"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Mostrar barra de _navegação"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Mostrar _barra de miniaturas"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "ordenar por nome"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "ordenar por data"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Direita"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Superior"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Inferior"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Reproduzir"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Iniciar apresentação"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pausar"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pausar apresentação"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Recentes"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Recentes"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Prima abrir para seleccionar uma imagem"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Vazio"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Programador:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "O Ristretto é um visualizador de imagens para o Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Nuno Miguel <nunis at netcabo.pt>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Abrir imagem"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Incapaz de abrir ficheiro"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Gravar cópia"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 msgid "Could not save file"
 msgstr "Incapaz de gravar ficheiro"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Tem a certeza que quer apagar do disco a imagem \"%s\"?"
@@ -380,31 +403,31 @@ msgstr "Tudo"
 msgid "Clear private data"
 msgstr "Limpar dados privados"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Exibição"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Cor de fundo"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Barras de ferramentas"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Substituir cor de fundo:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Unir barras de ferramentas"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -412,19 +435,19 @@ msgstr ""
 "A barra de miniaturas pode ser automaticamente ocultada\n"
 "se o visualizador estiver em ecrã completo."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Ocultar barra de miniaturas se em ecrã completo"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Apresentação"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Tempo de espera"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -432,35 +455,39 @@ msgstr ""
 "A duração da exibição de uma imagem durante uma apresentação\n"
 "(em segundos)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Controlo"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Roda de deslocamento"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Reverter orientação"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Comportamento"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Início"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "Ao abrir uma imagem, maximizar a janela"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Contorno em redor das imagens"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Preferências do visualizador de imagens"
 
@@ -524,43 +551,43 @@ msgstr "largura do contorno"
 msgid "the border width of the thumbnail-bar"
 msgstr "a largura do contorno da barra de miniaturas"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Estilo:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Brilho:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Saturação:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Definir como papel de parede"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automático"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centrada"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Mosaico"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Esticada"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "À escala"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Ampliada"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5b1f90c..fc2f4f2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.10\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2011-10-02 23:57-0300\n"
 "Last-Translator: Frederico Schardong <frede_sch at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -47,309 +47,332 @@ msgstr ""
 "Tente %s --help para ver uma lista completa das opções de linha de comando "
 "disponíveis.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Visualizador de imagens"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Abre uma imagem"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Salvar cópia"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Salva uma cópia da imagem"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Mostrar propriedades do arquivo"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Fechar"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Fecha esta imagem"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Sair do Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Abrir com..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Ordenação"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Excluir"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Exclui esta imagem do disco"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Limpar dados privados"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Preferências"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "Tela _cheia"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "Sair do modo te_la cheia"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "D_efinir como papel de parede"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Ampliação"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Ampliar"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Reduzir"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "A_justar tamanho à tela"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Tamanho normal"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Girar"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Girar para _direita"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Girar para _esquerda"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Avançar"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Voltar"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Primeiro"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "Ul_timo"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Mostrar o manual de usuário do ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Mostrar informações sobre o ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Posição"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "_Posição das miniaturas"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Sair do modo de _tela Cheia"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Mostrar _barra de ferramentas do arquivo"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Mostrar barra de _ferramentas de navegação"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Mostrar _miniaturas"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "ordenar por nome do arquivo"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "ordenar por data"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Direita"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Topo"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Fundo"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Reproduzir"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Iniciar apresentação de slides"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pausar"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pausar apresentação de slides"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "Usado _recentemente"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Usado recentemente"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Pressione abrir para selecionar uma imagem"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Vazio"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Desenvolvedor:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr ""
 "O Ristretto é um visualizador de imagens rápido e leve para o ambiente de "
 "trabalho Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Og Maciel <ogmaciel at gnome.org>,\n"
 "Fábio Nogueira <deb-user-ba at ubuntu.com>,\n"
 "Frederico Schardong <frede_sch at gmail.com>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Abrir imagem"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Não foi possível abrir arquivo"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Salvar uma cópia"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Não foi possível abrir arquivo"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Você tem certeza que quer excluir a imagem \"%s\" do disco?"
@@ -386,31 +409,31 @@ msgstr "Tudo"
 msgid "Clear private data"
 msgstr "Limpar dados privados"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Exibir"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Cor de fundo"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Barra de Ferramentas"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Sobrescrever cor de fundo:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Barra de fusão"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -418,19 +441,19 @@ msgstr ""
 "A barra de miniaturas pode ser automaticamente escondida \n"
 "quando o visualizador de imagens estiver em modo de tela cheia."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Ocultar barra de miniaturas quando estiver em tela cheia"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Apresentação de slides"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Tempo de espera"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -439,35 +462,39 @@ msgstr ""
 "slides\n"
 "(em segundos)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Controle"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Roda do mouse"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Reverter direção do zoom"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Comportamento"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Iniciar"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "Maximizar a janela ao iniciar quando abrindo uma imagem"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Quebrar imagens ao redor"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Visualizador de imagens"
@@ -533,43 +560,43 @@ msgstr "Largura da borda"
 msgid "the border width of the thumbnail-bar"
 msgstr "A largura da borda da barra de miniatura"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Estilo:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Brilho:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Saturação:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Definir como papel de parede"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automático"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centralizado"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Lado-a-lado"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Esticado"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Escalar"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Ampliado"
 
diff --git a/po/ro.po b/po/ro.po
index b9c706b..7bb56e4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-22 11:58+0000\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-11-21 19:12+0300\n"
 "Last-Translator: Mișu Moldovan <dumol at xfce.org>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);;\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
 
 #: ../src/main.c:61
 msgid "Version information"
@@ -45,305 +46,328 @@ msgstr ""
 "Încercați %s --help pentru a vedea lista completă cu opțiunile disponibile "
 "în linie de comandă.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Vizualizare de imagini"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Fișier"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Deschide"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Deschide o imagine"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Salvează o copie"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Salvează o copie a mesajului"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Proprietăți"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Arată proprietățile fișierului"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "În_chide"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Închide această imagine"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Ieșire"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Închidere Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Editare"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Deschide c_u..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sortare"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "Șt_erge"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Șterge această imagine de pe disc"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "Șterge _datele private"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Preferințe"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Vizualizare"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Pe tot ecranul"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Ecran normal"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Utilizează ca fundal"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Zoom"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Ap_ropie"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Depăr_tează"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Potrivește"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "Mărime _originală"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotire"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Rotește la _dreapta"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Rotește la _stânga"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Navigare"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "Înaint_e"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "Înap_oi"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Prima"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Ultima"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Conținut"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Deschide manualul utilizatorului"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Despre"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Arată detalii despre Ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Poziție"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "_Poziția miniaturilor"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "_Ecran normal"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Arată bara _fișierelor"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Arată bara de _navigare"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Arată bara cu _miniaturi"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "sortare după numele fișierelor"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "sortare după dată"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Stânga"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Dreapta"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Sus"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Jos"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Redare"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Pornește o prezentare"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pauză"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pune pauză prezentării"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Recent utilizate"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Recent utilizate"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Deschideți pentru a selecta o imagine"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Gol"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Programator:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto este un vizualizator de imagini pentru mediul desktop Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Ionuț Ovejanu <ovejanu at yahoo.com>\n"
 "Mișu Moldovan <dumol at xfce.org>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Deschide imaginea"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Imagini"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Nu s-a putut deschide fișierul"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Salvează o copie"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 msgid "Could not save file"
 msgstr "Nu s-a putut salva fișierul"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Sigur doriți să ștergeți imaginea „%s” de pe disc?"
@@ -380,31 +404,31 @@ msgstr "Dintotdeauna"
 msgid "Clear private data"
 msgstr "Șterge datele private"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Afișare"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Culoare de fundal"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Bare cu unelte"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Substituie culoarea de fundal:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Combină barele cu unelte"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniaturi"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -412,19 +436,19 @@ msgstr ""
 "Bara miniaturilor poate fi ascunsă automat \n"
 "când Ristretto este pe tot ecranul."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Ascunde bara miniaturilor la afișarea pe tot ecranul"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Prezentare"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -432,35 +456,39 @@ msgstr ""
 "Timpul de afișare a unei imagini individuale în timpul unei\n"
 "prezentări (în secunde)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Control"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Rotița de derulare"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Schimbă direcția zoomului"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Comportament"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Pornire"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "Maximizează la pornire fereastra când se deschide o image"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Reia de la început imaginile"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Preferințe pentru vizualizarea de imagini"
 
@@ -524,43 +552,43 @@ msgstr "lățime contur"
 msgid "the border width of the thumbnail-bar"
 msgstr "lățimea conturului barei cu miniaturi"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Stil:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Luminozitate:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Saturație:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Utilizează ca fundal"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automat"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centrată"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Mozaicată"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Întinsă"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Redimensionată"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Mărită"
 
diff --git a/po/ru.po b/po/ru.po
index a3b7c6c..c698cfe 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2011-09-10 03:49+0700\n"
 "Last-Translator: Urmas <davian818 at gmail.com>\n"
 "Language-Team: Russian\n"
@@ -45,306 +45,329 @@ msgstr ""
 "Попробуйте %s --help для просмотра полного списка параметров командной "
 "строки.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Просмотр изображений"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Файл"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Открыть"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Открыть изображение"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Сохранить как"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Сохранить копию изображения"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "С_войства"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Показать свойства файла"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Закрыть это изображение"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Выйти"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Выйти из программы"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Открыть в"
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Сортировать"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Удалить"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Удалить изображение с диска"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "О_чистить журнал"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Настройки"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Просмотр"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Полноэкранный режим"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Выйти из полноэкранного режима"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "_Сделать фоном рабочего стола"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Масштаб"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Приблизить"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Отдалить"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "Вписать в _окно"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Нормальный размер"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Повернуть"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Повернуть в_право"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Повернуть в_лево"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "П_ереход"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Вперед"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Назад"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Первый"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Последний"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "Помо_щь"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Комментарии"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Показать руководство пользователя"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_О программе"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Показать информацию о программе"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Позиция"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "По_ложение панели эскизов"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Выйти из полноэкранного режима"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Показать панель _файлов"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Показать панель _навигации"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Показать панель _эскизов"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "сортировать по имени файла"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "сортировать по дате"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Слева"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Справа"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Вверху"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Внизу"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "Н_ачать слайд-шоу"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Начать слайд-шоу"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "Пауза"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Остановить слайд-шоу"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Недавно просмотренные"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Недавно просмотренные"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Нажмите открыть для выбора изображения"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Пусто"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Разработчик:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr ""
 "Ristretto - быстрый и легковесный просмотрщик изображений для рабочего "
 "окружения Xfce"
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Urmas <davian818 at gmail.com>, 2011"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Открыть изображение"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Невозможно открыть файл"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Сохранить копию"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Невозможно открыть файл"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Удалить изображение '%s' с диска?"
@@ -381,31 +404,31 @@ msgstr "Всё время"
 msgid "Clear private data"
 msgstr "Очистка личных данных"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Отображение"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Цвет фона"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Панели инструментов"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Переопределить цвет фона:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Объединить панели инструментов"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Эскизы"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -413,19 +436,19 @@ msgstr ""
 "Панель эскизов будет спрятана\n"
 "при переходе в полноэкранный режим"
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Спрятать панель эскизов в полноэкранном режиме"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Слайдшоу"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Тайм-аут"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -433,35 +456,39 @@ msgstr ""
 "Время, отображения изображений в режиме слайдшоу\n"
 "(в секундах)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Управление"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Колесо мыши"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Изменить направление масштабирования"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Поведение"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Запуск"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "При открытии изображения развертывать окно во весь экран"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Циклический просмотр изображений"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Настройки программы"
 
@@ -525,43 +552,43 @@ msgstr "Ширина рамки"
 msgid "the border width of the thumbnail-bar"
 msgstr "Ширина рамки панели эскизов"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Стиль:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Яркость:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Контраст:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Установить как обои"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Автоматически"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Центровать"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Сжать"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Замостить"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Растянуть"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Приближенно"
 
diff --git a/po/sk.po b/po/sk.po
index 74594a6..6ae1bcc 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ristretto 0.0.20\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2011-10-05 11:54+0200\n"
 "Last-Translator: Tomáš Vadina <kyberdev at gmail.com>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -46,307 +46,330 @@ msgstr ""
 "%s: %s\n"
 "Skúste %s --help pre kompletné zobrazenie zoznamu dostupných volieb.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Prehliadač obrázkov"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Súbor"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Otvoriť obrázok"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Uložiť kópiu"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Uložiť kópiu obrázku"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Vlastnosti"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Zobraziť vlastnosti súboru"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Zavrieť"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Zavrieť tento obrázok"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Ukončiť Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Otvoriť pomocou..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Radenie"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Zmazať"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Zmazať tento obrázok z disku"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Vymazať súkromné dáta"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Predvoľby"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Zobraziť"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Opustiť celú obrazovku"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Nastaviť ako _tapetu"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Lupa"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Priblížiť"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Vzdialiť"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Prispôsobiť"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Normálna veľkosť"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Otočenie"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Otočiť v_pravo"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Otočiť Vľa_vo"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Prejsť"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "Ď_alej"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Späť"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Prvý"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Posledný"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "P_omocník"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Zobraziť užívateľský manuál ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_O programe"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Zobraziť informácie o programe ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Umiestnenie"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "_Pozícia panelu náhľadov"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "_Opustiť zobrazenie na celú obrazovku"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Zobraziť _panel nástrojov"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Zobraziť _navigačný panel"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Zobraziť panel náhľadov"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "usporiadať podľa názvu súboru"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "usporiadať podľa dátumu"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Vľavo"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Vpravo"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Vrch"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Spodok"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Spustiť"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Spustiť prezentáciu "
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Pozastaviť"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pozastaviť prezentáciu "
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Nedávno použité"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "_Nedávno použité"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Stlačte tlačidlo Otvoriť pre výber obrázka"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Prázdne"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Vývojár:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto je prehliadač obrázkov pre pracovné prostredie Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Štefan Miklošovič <miklosovic at gmail.com>\n"
 "Robert Hartl <hartl.robert at gmail.com>, 2009\n"
 "Tomáš Vadina <kyberdev at gmail.com>, 2011"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Otvoriť obrázok"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Nemôžem otvoriť súbor"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Uložiť kópiu"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Nemôžem otvoriť súbor"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Naozaj chcete zmazať obrázok '%s' z disku?"
@@ -383,31 +406,31 @@ msgstr "Všetko"
 msgid "Clear private data"
 msgstr "Vymazať súkromné dáta"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Zobrazenie"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Farba pozadia"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Panely nástrojov"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Určiť farbu pozadia:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Zlúčiť panely nástrojov"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Náhľady"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -415,19 +438,19 @@ msgstr ""
 "Panel s náhľadmi môže byť automatický skrytý, \n"
 "ak je prehliadač obrázkov zobrazený v režime celej obrazovky."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Skryť panel náhľadov pri zobrazení na celú obrazovku"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Premietanie snímkov"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -435,35 +458,39 @@ msgstr ""
 "Časový interval počas ktorého je zobrazený jeden snímok pri premietaní\n"
 "(v sekundách)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Ovládanie"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Koliesko myši"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Obrátiť smer priblíženia"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Správanie"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Pri spustení"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "Maximalizovať okno pri spustení počas otvárania obrázka"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Obrázky točiť dookola"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Predvoľby prehliadača obrázkov"
 
@@ -528,43 +555,43 @@ msgstr "Šírka okraja"
 msgid "the border width of the thumbnail-bar"
 msgstr "Šírka okraja panela s náhľadmi"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Štýl:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Jas:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Sýtosť:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Nastaviť ako tapetu"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Automatický"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Na stred"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Dlaždice"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Roztiahnutý"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Prispôsobený"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Zväčšený"
 
diff --git a/po/sl.po b/po/sl.po
index 72f42c8..f08e20d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto 0.0.93-dev\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2011-06-18 22:39+0200\n"
 "Last-Translator: <gasper at gmx.com>\n"
 "Language-Team: Slovenian\n"
@@ -48,309 +48,332 @@ msgstr ""
 "%s: %s\n"
 "Uporabi %s --help za celoten seznam razpoložljivih možnosti.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Pregledovalnik Slik"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Odpri"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Odpri sliko"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Shrani kopijo"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Shrani kopijo slike"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Zapri"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Zapre sliko"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Izhod"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Izhod iz Ristretta"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Za odprianje uporabi..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Razvrščanje"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Izbriši"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Zapre sliko"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Nastavitve"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Celozaslonski način"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Zapusti Celozaslonski način"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Nastavi kot _Ozadje"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Povečava"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Povečaj"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Pomanjšaj"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Prilagodi"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Originalna velikost"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "Vrten_je"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Zavrti _Desno"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Zavrti _Levo"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "Poj_di"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Naprej"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Nazaj"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Prvi"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Zadnji"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "Po_moč"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Vsebina"
 
 # Pokaže?
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Odpri ristretto uporabniški priročnik"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Pokaži informacije o programu ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Položaj"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Sličice"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Zapusti _Celozaslonski način"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Pokaži _Datotečno Orodno vrstico"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Pokaži _Navigacijsko Orodno vrstico"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Pokaži _Vrstico s sličicami"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "razvrsti po imenu datoteke"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "razvrsti po datumu"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Leva"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Desna"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Vrh"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Dno"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Zaženi"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Zaženi diaprojekcijo"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Ustavi"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Ustavi diaprojekcijo"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Nedavno uporabljene"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Nedavno uporabljene"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Klikni odpri za izbiro slike"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Prazno"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Razvijalec:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto je pregledovalnik slik za Xfce okolje."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Prevedel:\n"
 "Gašper <gasper at gmx.com>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Odpri sliko"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Ne morem odpreti slike"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Shrani kopijo"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Ne morem odpreti slike"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Ali ste prepričani, da želite izbrisati sliko '%s' z diska?"
@@ -387,31 +410,31 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Prikaz"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Barva ozadja"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Zamenjaj barvo ozadja:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Sličice"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -419,19 +442,19 @@ msgstr ""
 "Vrstica s sličicami se lahko samodejno skirje, ko je pregledovalnik slik v "
 "celozaslonskem načinu."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "V celozaslonskem načinu skrij vrstico s sličicami"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Diaprojekcija"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Časovna omejitev"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -439,36 +462,40 @@ msgstr ""
 "Časovna perioda v kateri je prikazana posamezna slika med diaprojekcijo (v "
 "skundah)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Nadzor"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Miškin kolešček"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Obnašanje"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Zagon"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Ob zagonu razširi okno na velikost slike"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Ovij okoli slik"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Pregledovalnik Slik"
@@ -534,43 +561,43 @@ msgstr "širina roba"
 msgid "the border width of the thumbnail-bar"
 msgstr "širina roba vrstice s sličicami"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Slog:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Svetlost:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Nasičenost:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Nastavi kot ozadje"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Samodejno"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centrirano"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Raztegnjeno"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Povečano"
 
diff --git a/po/sv.po b/po/sv.po
index ce7ebc6..4464d82 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2009-12-16 18:28+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -44,280 +44,303 @@ msgstr ""
 "Prova %s --help för att se en komplett lista över tillgängliga "
 "kommandoradsflaggor.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Bildvisare"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Öppna"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Öppna en bild"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Spara en kopia"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Spara en kopia av bilden"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "S_täng"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Stäng denna bild"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "A_vsluta"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Avsluta Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Öppna med..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sortering"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Stäng denna bild"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "I_nställningar"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Visa"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Helskärm"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Lämna helskärmsläge"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Ange som s_krivbordsbakgrund"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Zoom"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Zooma _in"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "Zooma _ut"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr ""
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Normal storlek"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Rotering"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Rotera åt _höger"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Rotera åt _vänster"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Gå"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Framåt"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Bakåt"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Första"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Sista"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Visa användarhandboken för ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Visa information om ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Position"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Miniatyrbilder"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Lämna _helskärmsläge"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 #, fuzzy
 msgid "Show _File Toolbar"
 msgstr "Visa _verktygsrad"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 #, fuzzy
 msgid "Show _Navigation Toolbar"
 msgstr "Visa _verktygsrad"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 #, fuzzy
 msgid "Show _Thumbnailbar"
 msgstr "Visa _verktygsrad"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "sortera efter filnamn"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "sortera efter datum"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Vänster"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Höger"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Överkant"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Nederkant"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "Spela _upp"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Starta bildspel"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Paus"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Pausa bildspelet"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Tidigare använda"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Tidigare använda"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Tryck Öppna för att välja en bild"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Tom"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Utvecklare:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto är en bildvisare för skrivbordsmiljön Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po at danielnylander.se>\n"
@@ -325,32 +348,32 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv at listor.tp-sv.se>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Öppna bild"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Kunde inte öppna filen"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Spara en kopia"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Kunde inte öppna filen"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Är du säker på att du vill ta bort bilden \"%s\" från disken?"
@@ -387,49 +410,49 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Visning"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Bakgrundsfärg"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Åsidosätt bakgrundsfärg:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Miniatyrbilder"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
 msgstr ""
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Dölj miniatyrbildsraden i helskärmsläge"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Bildspel"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Tidsgräns"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -437,36 +460,40 @@ msgstr ""
 "Tidsperioden som en individuell bild visas under ett bildspel\n"
 "(i sekunder)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr ""
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Mushjul"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Beteende"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Uppstart"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr ""
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 #, fuzzy
 msgid "Wrap around images"
 msgstr "Öppna bild"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Bildvisare"
@@ -532,43 +559,43 @@ msgstr "rambredd"
 msgid "the border width of the thumbnail-bar"
 msgstr "rambredden för miniatyrbildsraden"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Stil:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Ljusstyrka:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Färgmättnad:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Ange som skrivbordsbakgrund"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Auto"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Centrerad"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Sida vid sida"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Utsträckt"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Skalad"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Zoomad"
 
diff --git a/po/tr.po b/po/tr.po
index afafa4c..8228b26 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2008-11-16 02:31+0200\n"
 "Last-Translator: Gökmen Görgen <gkmngrgn at gmail.com>\n"
 "Language-Team: Turkish\n"
@@ -47,307 +47,330 @@ msgstr ""
 "%s: %s\n"
 "Komutsatırı parametrelerini görmek için %s --help komutunu kullanınız.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Resim Gösterici"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Dosya"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Aç"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Bir resim aç"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "Kopyayı _kaydet"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Resmin bir kopyasını kaydet"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Kapat"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Bu resi kapat"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "_Çık"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Ristretto'dan Çık"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "Dü_zenle"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Birlikte _aç..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sıralama"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Sil"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Bu resim diskten sil"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "Tercihler"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Görünüm"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "_Tam ekran"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Tam ekranı kapat"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Duvar Kağıdı olarak _belirle"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Yakınlaşma"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Yakınlaş"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Uzaklaş"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "Uygun yaklaştır"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Normal Boyut"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "Döndü_r"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Sa_ğa Döndür"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "So_la Döndür"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "Gi_t"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_İleri"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Geri"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_İlk"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Son"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_İçindekiler"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Ristretto kullanıcı klavuzunu görüntüle"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Hakkında"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Ristretto hakkında bilgi görüntüle"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Konum"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Küçük resimler"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Tam Ekranı _Kapat"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "_Dosya Araç Çubuğunu Göster"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "_Dolaşma Araç Çubuğunu Göster"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "_Küçük resim çubuğunu göster"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "dosya adına göre sırala"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "tarihe göre sırala"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Sol"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Sağ"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Üst"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Alt"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Oynat"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Slayt gösterisini başlat"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Dur"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Slayt gösterisini durdur"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Son kullanılanlar"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "_Son kullanılanlar"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Bir resim seçmek için aça basın"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Boş"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Geliştirici:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto, Xfce masaüstü ortamı için bir resim göstericidir."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "Onur Küçük <onur at pardus.org.tr>\n"
 "Gökmen Görgen <gkmngrgn at gmail.com>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Dosya aç"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Resimler"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Dosya açılamadı"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Kopyayı kaydet"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Dosya açılamadı"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Diskinizden '%s' resmini silmek istediğinizden emin misiniz?"
@@ -384,31 +407,31 @@ msgstr "Herşey"
 msgid "Clear private data"
 msgstr "Özel veriyi temizle"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Görüntü"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Arkaplan rengi"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Arkaplan rengini zorla:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Küçük resimler"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -416,19 +439,19 @@ msgstr ""
 "Resim gösterici tam ekran olduğuna \n"
 " küçük resim çubuğu otomatik olarak gizlenir."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Tam ekrandayken küçük resimleri gizle"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Sırayla Göster"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Kalan süre"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -436,36 +459,40 @@ msgstr ""
 "Sırayla gösterim sırasında resim başına gösterim süresi\n"
 "(saniye cinsinden)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Kontrol"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Kaydırma tekerleği"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Davranış"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Başlangıç"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Açılırken resim için pencereyi yeniden boyutlandır"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Resimlerin etrafını çerçevele"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Resim Gösterici"
@@ -531,43 +558,43 @@ msgstr "kenar genişliği"
 msgid "the border width of the thumbnail-bar"
 msgstr "küçük resim çubuğunun kenar genişliği"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Stil:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Parlaklık:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Doygunluk:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Duvar kağıdı olarak belirle"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Otomatik"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Merkezle"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Bölünmüş"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Uzatıldı"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Ölçeklendi"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Yakınlaştı"
 
diff --git a/po/ug.po b/po/ug.po
index 84930ea..bc5caa8 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.18\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2009-10-12 15:32+0900\n"
 "Last-Translator: Gheyret T.Kenji <gheyret at gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ at yahoogroups.com>\n"
@@ -45,308 +45,331 @@ msgstr ""
 "%s --help نى كىرگۈزسە، بۇيرۇق قۇرىدا ئىشلەتكىلى بولىدىغان بارلىق تاللانمىلار "
 "كۆرسىتىلىدۇ.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "سۈرەت كۆرگۈ"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "ھۆججەت(_F)"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "ئاچ(_O)"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "سۈرەت ئاچىدۇ"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "كۆچۈرمىسىنى ساقلا(_S)"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "رەسىمنىڭ كۆچۈرمىسىنى ساقلايدۇ"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "تاقا(_C)"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "سۈرەتنى تاقايدۇ"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "ئاخىرلاشتۇر(_Q)"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Ristretto نى ئاخىرلاشتۇرىدۇ"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "تەھرىر(_E)"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "پروگراممىدا ئاچ(_O)..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "تەرتىپلە(_S)"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "ئۆچۈر(_D)"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "سۈرەتنى تاقايدۇ"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "مايىللىق(_P)"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "كۆرۈنۈش(_V)"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "تولۇق ئېكران(_F)"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "تولۇق ئېكران ھالىتىدىن چىق(_L)"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Wallpaper بېكىت(_S)"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "چوڭايتىش ياكى كىچىكلىتىش(_Z)"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "چوڭايت(_I)"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "كىچىكلەت(_O)"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "دەل كەلتۈر(_F)"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "نورمال چوڭلۇق(_N)"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "چۆرگىلەت(_R)"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "ئوڭغا چۆرگىلەت(_R)"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "سولغا چۆرگىلەت(_L)"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "يۆتكەل(_G)"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "ئالدىغا(_F)"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "كەينىگە(_B)"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "بىرىنچىسى(_F)"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "ئەڭ ئاخىرقىسى(_L)"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "مەزمۇن(_C)"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "ristretto نىڭ قوللانمىسىنى كۆرسىتىدۇ"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "ھەققىدە(_A)"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "ristretto ھەققىدىكى ئۇچۇرنى كۆرسىتىدۇ"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "ئورۇن(_P)"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "كىچىك سۈرەت"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "تولۇق ئېكران ھالىتىدىن چىق(_F)"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "ھۆججەت قورال تاياقچىسى كۆرسەت(_F)"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Navigation قورال تاياقچىسى كۆرسەت(_N)"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Thumbnailbar نى كۆرسەت(_T)"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "ئاتىنى تەرتىپلە"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "چېسلانى تەرتىپلە"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "سول"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "ئوڭ"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "ئۇستى"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "ئاستى"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr ""
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 #, fuzzy
 msgid "Play slideshow"
 msgstr "slideshow نى قوزغىتىش"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr ""
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 #, fuzzy
 msgid "Pause slideshow"
 msgstr "slideshow نى قوزغىتىش"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr ""
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr ""
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "تاللانغان سۈرەتنى ئېچىش ئۈچۈن چېكىڭ"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "قۇرۇق"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "ئىجادىيەتچى"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto بولسا Xfce ئۇستەليۈزى مۇھىتىدىكى سۈرەت كۆرگۈدۇر"
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Gheyret T.Kenji <gheyret at gmail.com> 2010"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "سۈرەت ئېچىش"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "سۈرەتلەر"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "ھۆججەتنى ئاچقىلى بولمىدى"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "كۆچۈرمىسىنى ساقلاش"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "ھۆججەتنى ئاچقىلى بولمىدى"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "دىسكىدىكى '%s' دېگەن سۈرەتنى ئۆچۈرەمسىز؟"
@@ -383,85 +406,89 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "كۆرسەت"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "تەگلىك رەڭگى"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "قاپلايدىغان تەگلىك رەڭگى:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "كىچىك سۈرەت"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
 msgstr ""
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "تولۇق ئېكران ھالىتىدە thumbnailbar نى يوشۇرسۇن"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Slideshow"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "ۋاقىت ئېچىپ كەتتى"
 
 # In ja translation, It's unnecessary to break the line.
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
 msgstr "slideshow قىلىنغاندا، سۈرەتنىڭ كۆرسىتىلىش ۋاقتى(مىللىي سېكۇنت)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "كونترول"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "غالتەك"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "قىلمىش"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "قوزغىلىش"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "قوزغالغاندا كۆزنەكنى سۈرەت بىلەن ئوخشاش قىلسۇن"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr ""
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "سۈرەت كۆرگۈ"
@@ -527,43 +554,43 @@ msgstr "گىرۋەك كەڭلىكى"
 msgid "the border width of the thumbnail-bar"
 msgstr "thumbnail-تاياقچىسىنىڭ گىرۋىكىنىڭ كەڭلىكى"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "ئۇسلۇب:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "يورۇقلۇق:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "wallpaper قىلىپ بەلگىلە"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "ئاپتوماتىك"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "ئوتتۇرىدا"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "سوزۇلغان"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "چوڭايتىلغان ياكى كىچىكلىتىلگەن"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 7331aa7..d36c32b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2008-11-17 11:15+0200\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
 "Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
@@ -44,303 +44,326 @@ msgstr ""
 "Спробуйте %s --help для перегляду повного списку параметрів командної "
 "стрічки.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Переглядач зображень"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Файл"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Відкрити"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Відкрити зображення"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "Зберегти коп_ію"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Зберегти копію малюнка"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "_Властивості"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "Показати властивості файлу"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "_Закрити"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Закрити малюнок"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "Ви_йти"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Вийти з Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Редагувати"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "_Відкрити з..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Сортування"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Видалити"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "Вилучити малюнок з диску"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "_Очистити приватні дані"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "_Налаштування"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Перегляд"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "Повний екр_ан"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "Покинути повний ек_ран"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Встановити як шпа_лери"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Масштабування"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "Збіль_шити"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "З_меншити"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "Вмістити у вікн_о"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Нормальний розмір"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Обертання"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Повернути в_право"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Повернути в_ліво"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "П_ерейти"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Вперед"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Назад"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Перший"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Останній"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "Дов_ідка"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "_Вміст"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Показати посібник користувача ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "_Про"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Показати інформацію про ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "По_зиція"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "Позиція _панелі мініатюр"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Залишити повноекр_анний режим"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Показати п_анель файлів"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Показа_ти навігаційну панель"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Показати пан_ель мініатюр"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "сортувати за назвою"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "сортувати за датою"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Зліва"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Справа"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Згори"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Внизу"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Програвати"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Програти слайд-шоу"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "_Пауза"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Призупинити слайд-шоу"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_Нещодавно використані"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Нещодавно використані"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Натисніть відкрити для вибору малюнка"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Пустий"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Розробник:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto - переглядач зображень для робочого середовища Xfce."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Dmitry Nikitin <luckas_fb at mail.ru>"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Відкрити зображення"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Малюнки"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Неможливо відкрити файл"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Зберегти копію"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 msgid "Could not save file"
 msgstr "Неможливо зберегти файл"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Ви впевнені, що бажаєте видалити малюнок '%s' з диску?"
@@ -377,31 +400,31 @@ msgstr "Усе"
 msgid "Clear private data"
 msgstr "Очистити приватні дані"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Відображення"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Колір тла"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "Панелі інструментів"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "Замінити колір тла:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "Об'єднати панелі"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Мініатюри"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
@@ -409,19 +432,19 @@ msgstr ""
 "Панель мініатюр може автоматично ховатись,   \n"
 "коли переглядач зображень перебуває в повноекранному режимі."
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Приховувати панель мініатюр в повноекранному режимі"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Слайд-шоу"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Затримка"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -429,35 +452,39 @@ msgstr ""
 "Тривалість показу окремого зображення в слайд-шоу\n"
 "(в секундах)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Контроль"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Прокрутка"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "Повернути напрямок збільшення"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Поведінка"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Початок"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "Максимізувати розмір вікна під час запуску коли відкривається малюнок"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Обернутись навколо зображень"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "Уподобання переглядача зображень"
 
@@ -521,43 +548,43 @@ msgstr "ширина рамки"
 msgid "the border width of the thumbnail-bar"
 msgstr "ширина рамки панелі мініатюр"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Стиль:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Яскравість:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Гамма:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Встановити як шпалери"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "Автоматично"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Центрувати"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "Плиткою"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Розмножити"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Масштабувати"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Розтягнути"
 
diff --git a/po/ur.po b/po/ur.po
index 98e94c1..0545f5c 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2009-05-14 02:36+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -47,323 +47,346 @@ msgstr ""
 "%s: %s\n"
 "دستیاب کمانڈ لائن اختیارات کی مکمل فہرست کے لیے %s --help لکھیں\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "تصاویر منظر کار"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_فائل"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr ""
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 #, fuzzy
 msgid "Open an image"
 msgstr "تصویر کھولیں"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr ""
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 #, fuzzy
 msgid "_Close"
 msgstr "_سب بند کریں"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr ""
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 #, fuzzy
 msgid "_Quit"
 msgstr "_تدوین"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 #, fuzzy
 msgid "Quit Ristretto"
 msgstr "ریسٹریٹو"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_تدوین"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 #, fuzzy
 msgid "_Open with..."
 msgstr "کھولیں بذریعہ..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 #, fuzzy
 msgid "_Sorting"
 msgstr "_زومنگ"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr ""
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr ""
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 #, fuzzy
 msgid "_Preferences"
 msgstr "تصویر منظر کار ترجیحات"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_منظر"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr ""
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr ""
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 #, fuzzy
 msgid "_Set as Wallpaper"
 msgstr "بطور وال پیپر _مرتب کریں"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_زومنگ"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 #, fuzzy
 msgid "Zoom _In"
 msgstr "_زومنگ"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr ""
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr ""
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 #, fuzzy
 msgid "_Rotation"
 msgstr "_گھمائیں"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "_دائیں گھمائیں"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "_بائیں گھمائیں"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_جائیں"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr ""
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr ""
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr ""
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr ""
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_ہدایات"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr ""
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr ""
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr ""
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr ""
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr ""
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "تصویرچہ"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr ""
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 #, fuzzy
 msgid "Show _File Toolbar"
 msgstr "_اوزار پٹی دکھائیں"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 #, fuzzy
 msgid "Show _Navigation Toolbar"
 msgstr "_اوزار پٹی دکھائیں"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 #, fuzzy
 msgid "Show _Thumbnailbar"
 msgstr "_اوزار پٹی دکھائیں"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr ""
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr ""
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr ""
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr ""
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr ""
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr ""
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr ""
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 #, fuzzy
 msgid "Play slideshow"
 msgstr "سلائیڈ شو شروع کریں"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr ""
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 #, fuzzy
 msgid "Pause slideshow"
 msgstr "سلائیڈ شو شروع کریں"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_حالیہ استعمال کردہ"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 #, fuzzy
 msgid "Recently used"
 msgstr "_حالیہ استعمال کردہ"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr ""
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr ""
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "ڈویلپر:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 #, fuzzy
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr ""
 "ریسٹریٹو ایکسفس ڈیسک ٹاپ ماحول کے لیے ایک ہلکا پھلکا تصاویر منظرکار ہے."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "ترجمہ-کریڈٹ"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "تصویر کھولیں"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr ""
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ""
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "فائل نہیں کھولی جاسکتی"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr ""
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "فائل نہیں کھولی جاسکتی"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, fuzzy, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr ""
@@ -401,53 +424,53 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "ڈسپلے"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 #, fuzzy
 msgid "Background color"
 msgstr "پس منظر رنگ"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 #, fuzzy
 msgid "Override background color:"
 msgstr "پس منظر رنگ ت_جاوز:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 #, fuzzy
 msgid "Thumbnails"
 msgstr "تصویرچہ"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
 msgstr ""
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 #, fuzzy
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "تصویرچے _چھپائیں"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "سلائیڈ شو"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "ٹائم آؤٹ"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -455,36 +478,40 @@ msgstr ""
 "سلائیڈ شو کے دوران فی تصویر کو دکھانے کا وقت\n"
 "(سیکنڈ میں)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr ""
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr ""
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "سلوک"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr ""
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr ""
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 #, fuzzy
 msgid "Wrap around images"
 msgstr "تصویر کھولیں"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "تصاویر منظر کار"
@@ -552,47 +579,47 @@ msgstr "بارڈر کی چوڑائی"
 msgid "the border width of the thumbnail-bar"
 msgstr "تصویرچہ-پٹی کے بارڈر کی چوڑائی"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 #, fuzzy
 msgid "Saturation:"
 msgstr "_گھمائیں"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 #, fuzzy
 msgid "Set as wallpaper"
 msgstr "بطور وال پیپر _مرتب کریں"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 #, fuzzy
 msgid "Tiled"
 msgstr "_فائل"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 #, fuzzy
 msgid "Scaled"
 msgstr "قیاس"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr ""
 
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 98e94c1..0545f5c 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2009-05-14 02:36+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -47,323 +47,346 @@ msgstr ""
 "%s: %s\n"
 "دستیاب کمانڈ لائن اختیارات کی مکمل فہرست کے لیے %s --help لکھیں\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "تصاویر منظر کار"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_فائل"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr ""
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 #, fuzzy
 msgid "Open an image"
 msgstr "تصویر کھولیں"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr ""
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 #, fuzzy
 msgid "_Close"
 msgstr "_سب بند کریں"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr ""
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 #, fuzzy
 msgid "_Quit"
 msgstr "_تدوین"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 #, fuzzy
 msgid "Quit Ristretto"
 msgstr "ریسٹریٹو"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_تدوین"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 #, fuzzy
 msgid "_Open with..."
 msgstr "کھولیں بذریعہ..."
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 #, fuzzy
 msgid "_Sorting"
 msgstr "_زومنگ"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr ""
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr ""
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 #, fuzzy
 msgid "_Preferences"
 msgstr "تصویر منظر کار ترجیحات"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_منظر"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr ""
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr ""
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 #, fuzzy
 msgid "_Set as Wallpaper"
 msgstr "بطور وال پیپر _مرتب کریں"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_زومنگ"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 #, fuzzy
 msgid "Zoom _In"
 msgstr "_زومنگ"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr ""
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr ""
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 #, fuzzy
 msgid "_Rotation"
 msgstr "_گھمائیں"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "_دائیں گھمائیں"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "_بائیں گھمائیں"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_جائیں"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr ""
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr ""
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr ""
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr ""
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_ہدایات"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr ""
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr ""
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr ""
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr ""
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr ""
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "تصویرچہ"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr ""
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 #, fuzzy
 msgid "Show _File Toolbar"
 msgstr "_اوزار پٹی دکھائیں"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 #, fuzzy
 msgid "Show _Navigation Toolbar"
 msgstr "_اوزار پٹی دکھائیں"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 #, fuzzy
 msgid "Show _Thumbnailbar"
 msgstr "_اوزار پٹی دکھائیں"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr ""
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr ""
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr ""
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr ""
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr ""
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr ""
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr ""
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 #, fuzzy
 msgid "Play slideshow"
 msgstr "سلائیڈ شو شروع کریں"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr ""
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 #, fuzzy
 msgid "Pause slideshow"
 msgstr "سلائیڈ شو شروع کریں"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "_حالیہ استعمال کردہ"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 #, fuzzy
 msgid "Recently used"
 msgstr "_حالیہ استعمال کردہ"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr ""
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr ""
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "ڈویلپر:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 #, fuzzy
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr ""
 "ریسٹریٹو ایکسفس ڈیسک ٹاپ ماحول کے لیے ایک ہلکا پھلکا تصاویر منظرکار ہے."
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "ترجمہ-کریڈٹ"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "تصویر کھولیں"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr ""
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ""
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "فائل نہیں کھولی جاسکتی"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr ""
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "فائل نہیں کھولی جاسکتی"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, fuzzy, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr ""
@@ -401,53 +424,53 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "ڈسپلے"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 #, fuzzy
 msgid "Background color"
 msgstr "پس منظر رنگ"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 #, fuzzy
 msgid "Override background color:"
 msgstr "پس منظر رنگ ت_جاوز:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 #, fuzzy
 msgid "Thumbnails"
 msgstr "تصویرچہ"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
 msgstr ""
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 #, fuzzy
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "تصویرچے _چھپائیں"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "سلائیڈ شو"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "ٹائم آؤٹ"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -455,36 +478,40 @@ msgstr ""
 "سلائیڈ شو کے دوران فی تصویر کو دکھانے کا وقت\n"
 "(سیکنڈ میں)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr ""
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr ""
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "سلوک"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr ""
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr ""
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 #, fuzzy
 msgid "Wrap around images"
 msgstr "تصویر کھولیں"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "تصاویر منظر کار"
@@ -552,47 +579,47 @@ msgstr "بارڈر کی چوڑائی"
 msgid "the border width of the thumbnail-bar"
 msgstr "تصویرچہ-پٹی کے بارڈر کی چوڑائی"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 #, fuzzy
 msgid "Saturation:"
 msgstr "_گھمائیں"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 #, fuzzy
 msgid "Set as wallpaper"
 msgstr "بطور وال پیپر _مرتب کریں"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 #, fuzzy
 msgid "Tiled"
 msgstr "_فائل"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr ""
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 #, fuzzy
 msgid "Scaled"
 msgstr "قیاس"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index d3ee5ed..e56d63b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2009-9-9 16:MI+ZONE\n"
 "Last-Translator: Nguyễn Quốc Vinh <kureikain at gmail.com>\n"
 "Language-Team: Vietnamese <kureikain at gmail.com>\n"
@@ -43,307 +43,330 @@ msgstr ""
 "%s: %s\n"
 "Dùng %s --help để xem toàn bộ tham số dòng lệnh.\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Trình xem ảnh"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "_Tập tin"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "_Mở"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "Mở ảnh"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "_Nhân bản ảnh này"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "Lưu một phiên bản của ảnh này"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr ""
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr ""
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "Đóng lại"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "Đóng ảnh này lại"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "Th_oát"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "Thoát Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "_Sửa"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "Mở _với chương trình khác"
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "_Sắp xếp"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "_Xóa"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 #, fuzzy
 msgid "Delete this image from disk"
 msgstr "Đóng ảnh này lại"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr ""
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "Thiết lập"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "_Xem"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "Đầy màn _hình"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "_Thoát chế độ đầy màn hình"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "Dùng _làm ảnh nền "
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "_Phóng to / Thu nhỏ"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "_Phóng to"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "_Thu nhỏ"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "_Khít màn hình"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "_Kích thước bình thường"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "_Quay ảnh"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "Quay _phải"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "Quay _trái"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "_Đi"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "_Tiếp"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "_Trước"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "_Đầu"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "_Cuối cùng"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "_Trợ giúp"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "Nội _dung"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "Xem sổ tay sử dụng ristretto"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "Thông t_in"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "Thông tin về ristretto"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "_Vị trí"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 #, fuzzy
 msgid "Thumbnailbar _Position"
 msgstr "Ảnh thu nhỏ"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "Thoát chế độ đầy _màn hình"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "Hiển thị thanh cô_ng cụ"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "Hiển thị thanh điều _hướng"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "Hiển thị ảnh nhỏ"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "sắp xếp theo tên ảnh"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "sắp xếp theo ngày"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "Trái"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "Phải"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "Trên"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "Dưới"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "_Chạy"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "Chạy show trình diễn"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "Tạm _dừng"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "Tạm dừng trình diễn"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "Tập tin mở gần đây"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "Mở gần đây"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "Nhấn nút mở để chọn ảnh"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "Trống"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "Người phát triển"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr ""
 "Ristretto là một chương trình xem ảnh nhỏ gọn cho môi trường màn hình Xfce"
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr "Công trạng người dịch"
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "Mở ảnh"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "Ảnh"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "Không mở tập tin được"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "Lưu một bản khác"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 #, fuzzy
 msgid "Could not save file"
 msgstr "Không mở tập tin được"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "Chắc chắn muốn xóa ảnh '%s\" khỏi đĩa?"
@@ -380,49 +403,49 @@ msgstr ""
 msgid "Clear private data"
 msgstr ""
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "Hiển thị"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "Màu nền"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "_Ghi đè màu nền"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr ""
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "Ảnh thu nhỏ"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
 msgstr "Ảnh thu nhỏ có thể tự động ẩn đi khi kích hoạt chế độ đầy màn _hình"
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "Ẩn _ảnh thu nhỏ khi hiển thị đầy màn hình"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "Trình diễn"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "Hết giờ"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
@@ -430,36 +453,40 @@ msgstr ""
 "Khoảng thời gian một ảnh riêng lẽ được hiển thị trong quá trình trình diễn\n"
 "(tính bằng giây)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "Điều khiển"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "Cuộn chuột"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr ""
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "Hành vi"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "Khởi động"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 #, fuzzy
 msgid "Maximize window on startup when opening an image"
 msgstr "Đổi kích thước cửa sổ bằng ảnh khi khởi động"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "Bao bọc xung quanh ảnh"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 #, fuzzy
 msgid "Image Viewer Preferences"
 msgstr "Trình xem ảnh"
@@ -525,43 +552,43 @@ msgstr "cỡ đường viền"
 msgid "the border width of the thumbnail-bar"
 msgstr "Cỡ đường viền của ảnh thu nhỏ"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "Kiểu:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "Độ sáng:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "Độ sẩm:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "Thiết lập màn hình nền"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "_Tự động"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "Giữa"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "_Xếp lớp"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "Kéo _giãn"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "Xếp liên tục"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "Phóng to"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cf4e001..d8c0ded 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i18n at xfce.org\n"
-"POT-Creation-Date: 2011-11-21 07:42+0100\n"
+"POT-Creation-Date: 2011-11-23 06:58+0100\n"
 "PO-Revision-Date: 2010-11-23 23:34+0800\n"
 "Last-Translator: Chipong Luo <chipong_l at yahoo.com>\n"
 "Language-Team: Chinese (simplified) <xfce-i18n at xfce.org>\n"
@@ -46,306 +46,329 @@ msgstr ""
 "试试 %s --help 查看\n"
 "全部可用命令行选项。\n"
 
-#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1
+#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "图片查看器"
 
 #. File Menu
-#: ../src/main_window.c:264
+#: ../src/main_window.c:271
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../src/main_window.c:265
+#: ../src/main_window.c:272
 msgid "Open an image"
 msgstr "打开图片"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "_Save copy"
 msgstr "保存副本(_S)"
 
-#: ../src/main_window.c:266
+#: ../src/main_window.c:273
 msgid "Save a copy of the image"
 msgstr "保存一份此图片的副本"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "_Properties"
 msgstr "属性"
 
-#: ../src/main_window.c:267
+#: ../src/main_window.c:274
 msgid "Show file properties"
 msgstr "显示文件属性"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../src/main_window.c:268
+#: ../src/main_window.c:275
 msgid "Close this image"
 msgstr "关闭此图片"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/main_window.c:269
+#: ../src/main_window.c:276
 msgid "Quit Ristretto"
 msgstr "退出 Ristretto"
 
 #. Edit Menu
-#: ../src/main_window.c:271
+#: ../src/main_window.c:278
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/main_window.c:272
+#: ../src/main_window.c:279
 msgid "_Open with..."
 msgstr "打开方式(_O)"
 
-#: ../src/main_window.c:273
+#: ../src/main_window.c:280
 msgid "_Sorting"
 msgstr "排列(_S)"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../src/main_window.c:274
+#: ../src/main_window.c:281
 msgid "Delete this image from disk"
 msgstr "从磁盘中删除此图片"
 
-#: ../src/main_window.c:275
+#: ../src/main_window.c:282
 msgid "_Clear private data"
 msgstr "清除隐私数据(_C)"
 
-#: ../src/main_window.c:276
+#: ../src/main_window.c:283
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
 #. View Menu
-#: ../src/main_window.c:278
+#: ../src/main_window.c:285
 msgid "_View"
 msgstr "视图(_V)"
 
-#: ../src/main_window.c:279
+#: ../src/main_window.c:286
 msgid "_Fullscreen"
 msgstr "全屏(_F)"
 
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
 msgid "_Leave Fullscreen"
 msgstr "离开全屏(_L)"
 
-#: ../src/main_window.c:281
+#: ../src/main_window.c:288
 msgid "_Set as Wallpaper"
 msgstr "设置为壁纸(_S)"
 
 #. Zoom submenu
-#: ../src/main_window.c:283
+#: ../src/main_window.c:290
 msgid "_Zooming"
 msgstr "缩放(_Z)"
 
-#: ../src/main_window.c:284
+#: ../src/main_window.c:291
 msgid "Zoom _In"
 msgstr "放大(_I)"
 
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
 msgid "Zoom _Out"
 msgstr "缩小(_O)"
 
-#: ../src/main_window.c:286
+#: ../src/main_window.c:293
 msgid "Zoom _Fit"
 msgstr "合适大小(_F)"
 
-#: ../src/main_window.c:287
+#: ../src/main_window.c:294
 msgid "_Normal Size"
 msgstr "原始大小(_N)"
 
 #. Rotation submenu
-#: ../src/main_window.c:289
+#: ../src/main_window.c:296
 msgid "_Rotation"
 msgstr "旋转(_R)"
 
-#: ../src/main_window.c:290
+#: ../src/main_window.c:297
 msgid "Rotate _Right"
 msgstr "顺时针旋转(_R)"
 
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
 msgid "Rotate _Left"
 msgstr "逆时针旋转(_L)"
 
 #. Go Menu
-#: ../src/main_window.c:293
+#: ../src/main_window.c:300
 msgid "_Go"
 msgstr "执行(_G)"
 
-#: ../src/main_window.c:294
+#: ../src/main_window.c:301
 msgid "_Forward"
 msgstr "前进(_F)"
 
-#: ../src/main_window.c:295
+#: ../src/main_window.c:302
 msgid "_Back"
 msgstr "后退(_B)"
 
-#: ../src/main_window.c:296
+#: ../src/main_window.c:303
 msgid "_First"
 msgstr "第一个(_F)"
 
-#: ../src/main_window.c:297
+#: ../src/main_window.c:304
 msgid "_Last"
 msgstr "最后一个(_L)"
 
 #. Help Menu
-#: ../src/main_window.c:299
+#: ../src/main_window.c:306
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/main_window.c:301
+#: ../src/main_window.c:308
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../src/main_window.c:303
+#: ../src/main_window.c:310
 msgid "Display ristretto user manual"
 msgstr "显示 ristretto 用户手册"
 
-#: ../src/main_window.c:306
+#: ../src/main_window.c:313
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/main_window.c:308
+#: ../src/main_window.c:315
 msgid "Display information about ristretto"
 msgstr "显示 ristretto 的相关信息"
 
 #. Position Menu
-#: ../src/main_window.c:311
+#: ../src/main_window.c:318
 msgid "_Position"
 msgstr "位置(_P)"
 
-#: ../src/main_window.c:312
+#: ../src/main_window.c:319
 msgid "Thumbnailbar _Position"
 msgstr "缩略图工具栏位置"
 
 #. Misc
-#: ../src/main_window.c:314
+#: ../src/main_window.c:321
 msgid "Leave _Fullscreen"
 msgstr "离开全屏(_F)"
 
 #. Toggle visibility of the main file toolbar
-#: ../src/main_window.c:322
+#: ../src/main_window.c:329
 msgid "Show _File Toolbar"
 msgstr "显示文件工具栏(_F)"
 
 #. Toggle visibility of the main navigation toolbar
-#: ../src/main_window.c:324
+#: ../src/main_window.c:331
 msgid "Show _Navigation Toolbar"
 msgstr "显示导航工具栏(_N)"
 
 #. Toggle visibility of the thumbnailbar
-#: ../src/main_window.c:326
+#: ../src/main_window.c:333
 msgid "Show _Thumbnailbar"
 msgstr "显示缩略图工具栏(_T)"
 
 #. Sort by Filename
-#: ../src/main_window.c:333
+#: ../src/main_window.c:340
 msgid "sort by filename"
 msgstr "以文件名排列"
 
 #. Sort by Date
-#: ../src/main_window.c:335
+#: ../src/main_window.c:342
 msgid "sort by date"
 msgstr "以日期排列"
 
-#: ../src/main_window.c:341
+#: ../src/main_window.c:348
 msgid "Left"
 msgstr "左边"
 
-#: ../src/main_window.c:342
+#: ../src/main_window.c:349
 msgid "Right"
 msgstr "右边"
 
-#: ../src/main_window.c:343
+#: ../src/main_window.c:350
 msgid "Top"
 msgstr "顶部"
 
-#: ../src/main_window.c:344
+#: ../src/main_window.c:351
 msgid "Bottom"
 msgstr "底部"
 
 #. Create Play/Pause Slideshow actions
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: ../src/main_window.c:476
+#: ../src/main_window.c:488
 msgid "Play slideshow"
 msgstr "播放幻灯片"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "_Pause"
 msgstr "暂停(_P)"
 
-#: ../src/main_window.c:477
+#: ../src/main_window.c:489
 msgid "Pause slideshow"
 msgstr "暂停幻灯片"
 
 #. Create Recently used items Action
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "_Recently used"
 msgstr "最近使用(_R)"
 
-#: ../src/main_window.c:480
+#: ../src/main_window.c:492
 msgid "Recently used"
 msgstr "最近使用"
 
-#: ../src/main_window.c:580 ../src/main_window.c:949
+#: ../src/main_window.c:592 ../src/main_window.c:966
 msgid "Press open to select an image"
 msgstr "点击打开选择图片"
 
-#: ../src/main_window.c:935 ../src/main_window.c:941
+#: ../src/main_window.c:952 ../src/main_window.c:958
 msgid "Empty"
 msgstr "空"
 
-#: ../src/main_window.c:2176
+#: ../src/main_window.c:1778
+msgid "Choose 'set wallpaper' method"
+msgstr ""
+
+#: ../src/main_window.c:1793 ../src/preferences_dialog.c:349
+msgid ""
+"Configure which system is currently managing your desktop.\n"
+"This setting determines the method <i>Ristretto</i> will use\n"
+"to configure the desktop wallpaper."
+msgstr ""
+
+#: ../src/main_window.c:1818 ../src/preferences_dialog.c:373
+msgid "None"
+msgstr ""
+
+#: ../src/main_window.c:1822 ../src/preferences_dialog.c:377
+msgid "Xfce"
+msgstr ""
+
+#: ../src/main_window.c:1826 ../src/preferences_dialog.c:381
+msgid "GNOME"
+msgstr ""
+
+#: ../src/main_window.c:2333
 msgid "Developer:"
 msgstr "开发者:"
 
-#: ../src/main_window.c:2185
+#: ../src/main_window.c:2342
 msgid "Ristretto is an imageviewer for the Xfce desktop environment."
 msgstr "Ristretto 是 Xfce 桌面环境的一个图片查看器。"
 
-#: ../src/main_window.c:2193
+#: ../src/main_window.c:2350
 msgid "translator-credits"
 msgstr ""
 "WuLi <wurisky at gmail.com>, 2008.\n"
 "Hunt Xu <mhuntxu at gmail.com>, 2008, 2009, 2010.\n"
 "Chipong Luo <chipong_l at yahoo.com>, 2011."
 
-#: ../src/main_window.c:2471
+#: ../src/main_window.c:2628
 msgid "Open image"
 msgstr "打开图片"
 
-#: ../src/main_window.c:2490
+#: ../src/main_window.c:2647
 msgid "Images"
 msgstr "图片"
 
-#: ../src/main_window.c:2495
+#: ../src/main_window.c:2652
 msgid ".jp(e)g"
 msgstr ".jp(e)g"
 
-#: ../src/main_window.c:2519 ../src/main_window.c:2613
+#: ../src/main_window.c:2676 ../src/main_window.c:2770
 msgid "Could not open file"
 msgstr "无法打开文件"
 
-#: ../src/main_window.c:2646
+#: ../src/main_window.c:2803
 msgid "Save copy"
 msgstr "保存副本"
 
-#: ../src/main_window.c:2672
+#: ../src/main_window.c:2829
 msgid "Could not save file"
 msgstr "未能保存文件"
 
-#: ../src/main_window.c:2773
+#: ../src/main_window.c:2930
 #, c-format
 msgid "Are you sure you want to delete image '%s' from disk?"
 msgstr "您确定要从磁盘上删除图片 ‘%s’ 吗?"
@@ -382,83 +405,87 @@ msgstr "一切"
 msgid "Clear private data"
 msgstr "清除隐私数据"
 
-#: ../src/preferences_dialog.c:187
+#: ../src/preferences_dialog.c:196
 msgid "Display"
 msgstr "显示"
 
-#: ../src/preferences_dialog.c:193
+#: ../src/preferences_dialog.c:202
 msgid "Background color"
 msgstr "背景颜色"
 
-#: ../src/preferences_dialog.c:195
+#: ../src/preferences_dialog.c:204
 msgid "Toolbars"
 msgstr "工具栏"
 
-#: ../src/preferences_dialog.c:200
+#: ../src/preferences_dialog.c:209
 msgid "Override background color:"
 msgstr "覆盖背景颜色:"
 
-#: ../src/preferences_dialog.c:211
+#: ../src/preferences_dialog.c:220
 msgid "Merge toolbars"
 msgstr "合并工具栏"
 
-#: ../src/preferences_dialog.c:216
+#: ../src/preferences_dialog.c:225
 msgid "Thumbnails"
 msgstr "缩略图"
 
-#: ../src/preferences_dialog.c:219
+#: ../src/preferences_dialog.c:228
 msgid ""
 "The thumbnailbar can be automatically hidden \n"
 "when the image-viewer is fullscreen."
 msgstr "缩略图工具栏在图片查看器全屏显示时会自动隐藏。"
 
-#: ../src/preferences_dialog.c:221
+#: ../src/preferences_dialog.c:230
 msgid "Hide thumbnailbar when fullscreen"
 msgstr "全屏时隐藏缩略图工具栏"
 
-#: ../src/preferences_dialog.c:257
+#: ../src/preferences_dialog.c:266
 msgid "Slideshow"
 msgstr "幻灯片"
 
-#: ../src/preferences_dialog.c:261
+#: ../src/preferences_dialog.c:270
 msgid "Timeout"
 msgstr "超时"
 
-#: ../src/preferences_dialog.c:264
+#: ../src/preferences_dialog.c:273
 msgid ""
 "The time period an individual image is displayed during a slideshow\n"
 "(in seconds)"
 msgstr "幻灯片播放时单个图片持续显示的时间(以秒计)"
 
-#: ../src/preferences_dialog.c:280
+#: ../src/preferences_dialog.c:289
 msgid "Control"
 msgstr "控制"
 
-#: ../src/preferences_dialog.c:284
+#: ../src/preferences_dialog.c:293
 msgid "Scrollwheel"
 msgstr "滚轮"
 
-#: ../src/preferences_dialog.c:287
+#: ../src/preferences_dialog.c:296
 msgid "Revert zoom direction"
 msgstr "重置缩放方向"
 
-#: ../src/preferences_dialog.c:296
+#: ../src/preferences_dialog.c:306
 msgid "Behaviour"
 msgstr "行为"
 
-#: ../src/preferences_dialog.c:301
+#: ../src/preferences_dialog.c:311
 msgid "Startup"
 msgstr "启动"
 
-#: ../src/preferences_dialog.c:303
+#: ../src/preferences_dialog.c:313
 msgid "Maximize window on startup when opening an image"
 msgstr "在打开图片时最小化启动窗口"
 
-#: ../src/preferences_dialog.c:309
+#: ../src/preferences_dialog.c:319
 msgid "Wrap around images"
 msgstr "环绕图片"
 
-#: ../src/preferences_dialog.c:364
+#: ../src/preferences_dialog.c:338
+msgid "Desktop"
+msgstr ""
+
+#: ../src/preferences_dialog.c:460
 msgid "Image Viewer Preferences"
 msgstr "图片查看器首选项"
 
@@ -522,43 +549,43 @@ msgstr "边框宽度"
 msgid "the border width of the thumbnail-bar"
 msgstr "缩略图工具栏的边框宽度"
 
-#: ../src/xfce_wallpaper_manager.c:347
+#: ../src/xfce_wallpaper_manager.c:339
 msgid "Style:"
 msgstr "样式:"
 
-#: ../src/xfce_wallpaper_manager.c:348
+#: ../src/xfce_wallpaper_manager.c:340
 msgid "Brightness:"
 msgstr "亮度:"
 
-#: ../src/xfce_wallpaper_manager.c:349
+#: ../src/xfce_wallpaper_manager.c:341
 msgid "Saturation:"
 msgstr "饱和度:"
 
-#: ../src/xfce_wallpaper_manager.c:366
+#: ../src/xfce_wallpaper_manager.c:358 ../src/gnome_wallpaper_manager.c:174
 msgid "Set as wallpaper"
 msgstr "设置为壁纸"
 
-#: ../src/xfce_wallpaper_manager.c:524
+#: ../src/xfce_wallpaper_manager.c:511
 msgid "Auto"
 msgstr "自动"
 
-#: ../src/xfce_wallpaper_manager.c:527
+#: ../src/xfce_wallpaper_manager.c:514
 msgid "Centered"
 msgstr "居中"
 
-#: ../src/xfce_wallpaper_manager.c:530
+#: ../src/xfce_wallpaper_manager.c:517
 msgid "Tiled"
 msgstr "平铺"
 
-#: ../src/xfce_wallpaper_manager.c:533
+#: ../src/xfce_wallpaper_manager.c:520
 msgid "Stretched"
 msgstr "拉伸"
 
-#: ../src/xfce_wallpaper_manager.c:536
+#: ../src/xfce_wallpaper_manager.c:523
 msgid "Scaled"
 msgstr "伸缩"
 
-#: ../src/xfce_wallpaper_manager.c:539
+#: ../src/xfce_wallpaper_manager.c:526
 msgid "Zoomed"
 msgstr "缩放"
 


More information about the Xfce4-commits mailing list