i'm not too sure how i feel about this yet, since it's kinda hacky. add a

check button "Allow Xfce to manage the desktop" to the backdrop settings panel.
this is mainly here to let people easily restore xfdesktop when it dies
because of nautilus or some other reason.  unfortunately, there's no way to
pull it out of the session entirely, because xfce4-session needs to save the
session on logout, which depends on the user actually doing that.  i suppose
adding an MCS setting for this option could work too, and xfdesktop could
check it on startup, and quit if it's set.  not too sure about that yet, though.


(Old svn revision: 14631)

1 files changed, 129 insertions, 51 deletions

diff --git a/po/et.po b/po/et.po
index a26696bf..055efe56 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-12-09 01:41+0300\n"
 "Last-Translator: Mart Tõnso <mart.tonso@ttu.ee>\n"
 "Language-Team: \n"
@@ -315,42 +315,83 @@ msgstr "Varjatud"
 msgid "/Other"
 msgstr "/Muu"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce menüü"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Vali ikoon"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Vali menüüfail"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Kõik failid"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Pildi failid"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Menüüfailid"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "_Menüüfail"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Ei õnnestu käivitada xfce4-menüüredaktorit: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Nupu ikoon:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_Nupu ikoon:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Menüüfailid"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Muuda töölaua menüüd"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Ava menüü fail"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menüü"
+
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Ikoon:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_Nupu ikoon:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Näita menüüs ikoone"
 
@@ -405,8 +446,8 @@ msgid "Edit backdrop list"
 msgstr "Muuda tausta nimistut"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Töölaud"
 
@@ -454,92 +495,116 @@ msgstr "Automaatne"
 msgid "Adjust _Brightness:"
 msgstr "Kohenda _heledust:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignoreeri muudatusi"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Töölaua seaded"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Taustad"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Värv"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "_Värvi stiil:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Ühtlane värv"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Horisontaalne muutus"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Vertikaalne muutus"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Es_imene värv:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Teine värv:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Kasuta ainult värvi"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Pilt"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Näita _Pilti"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Fail:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Ära sea tausta"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Taust"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Ekraan %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Ekraan %d, Kuvar %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menüü"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Ei õnnestu käivitada xfce4-menüüredaktorit: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Akende nimekiri"
@@ -568,28 +633,32 @@ msgstr "Näita _programmide ikoone"
 msgid "_Edit desktop menu"
 msgstr "_Muuda töölaua menüüd"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: tundmatu valik: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Valikud on:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -reload      Lae kõik seaded uuesti, uuenda piltide nimekirja\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Näita menüüd (hiire jooksvas asukohas)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  Näita akende nimekirja (hiire jooksvas asukohas)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -634,6 +703,15 @@ msgstr "Xfce 4 töölaua tausta seaded"
 msgid "Xfce 4 Desktop Settings"
 msgstr "Xfce 4 töölaua tausta seaded"
 
+#~ msgid "Set color _only"
+#~ msgstr "Kasuta ainult värvi"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Ära sea tausta"
+
+#~ msgid "_Menu file:"
+#~ msgstr "_Menüüfail"
+
 #~ msgid "Title:"
 #~ msgstr "Pealkiri:"