* settings-dialogs/Makefile.am, settings-dialogs/frap-shortcuts.{c,h},

	  settings-dialogs/frap-shortcuts-dialog.{c,h},
		settings-dialogs/xfwm4-settings.c: Import utility functions and the
		shortcut dialog from libfrap. Refactor the xfwm4 settings dialog so that
		it makes use of them. The code should now work better and be easier to
		read.

(Old svn revision: 27727)

1 files changed, 150 insertions, 100 deletions

diff --git a/po/lv.po b/po/lv.po
index 3fc549353..36d3fbe56 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-06 16:44+0200\n"
+"POT-Creation-Date: 2008-09-07 18:52+0200\n"
 "PO-Revision-Date: 2008-04-06 22:20+0300\n"
 "Last-Translator: Rihards Prieditis <RPrieditis@gmail.com>\n"
 "Language-Team: Latvian <RPrieditis@gmail.com>\n"
@@ -213,212 +213,307 @@ msgstr "Darbavietu uzstādījumi"
 msgid "Xfce 4 Workspaces Settings"
 msgstr "Xfce 4 darbavietu uzstādījumi"
 
-#: ../settings-dialogs/xfwm4-settings.c:83
-#: ../settings-dialogs/xfwm4-settings.c:113
+#: ../settings-dialogs/frap-shortcuts.c:83
+#, c-format
+msgid ""
+"This shortcut is already being used by the window manager action <b>%s</b>. "
+"Which action do you want to use?"
+msgstr ""
+
+#: ../settings-dialogs/frap-shortcuts.c:84
+#: ../settings-dialogs/frap-shortcuts.c:87
+#: ../settings-dialogs/frap-shortcuts.c:90
+#: ../settings-dialogs/frap-shortcuts.c:93
+#, c-format
+msgid "Use %s"
+msgstr ""
+
+#: ../settings-dialogs/frap-shortcuts.c:84
+#: ../settings-dialogs/frap-shortcuts.c:87
+#: ../settings-dialogs/frap-shortcuts.c:90
+#, c-format
+msgid "Keep %s"
+msgstr ""
+
+#: ../settings-dialogs/frap-shortcuts.c:86
+#: ../settings-dialogs/frap-shortcuts.c:89
+#, fuzzy, c-format
+msgid ""
+"The shortcut is already being used for the command <b>%s</b>. Which action "
+"do you want to use?"
+msgstr ""
+"Īssceļu jau lieto !\n"
+"Esat drošs, ka vēlaties to izmantot ?"
+
+#: ../settings-dialogs/frap-shortcuts.c:92
+#, fuzzy
+msgid ""
+"The shortcut is already being used by a <b>window manager action</b>. Which "
+"action do you want to use?"
+msgstr ""
+"Īssceļu jau lieto !\n"
+"Esat drošs, ka vēlaties to izmantot ?"
+
+#: ../settings-dialogs/frap-shortcuts.c:93
+#, fuzzy
+msgid "Keep window manager action"
+msgstr "Xfce 4 logu pārvaldnieka uzstādījumi"
+
+#: ../settings-dialogs/frap-shortcuts.c:248
+#, c-format
+msgid "%s shortcut conflict"
+msgstr ""
+
+#: ../settings-dialogs/frap-shortcuts.c:256
+msgid "Use this action"
+msgstr ""
+
+#: ../settings-dialogs/frap-shortcuts.c:259
+msgid "Shortcut conflict"
+msgstr ""
+
+#: ../settings-dialogs/frap-shortcuts.c:280
+#, c-format
+msgid "The shortcut '%s' is already being used for something else."
+msgstr ""
+
+#. Set dialog title
+#: ../settings-dialogs/frap-shortcuts-dialog.c:233
+#, fuzzy
+msgid "Set shortcut"
+msgstr "Nav īssceļu"
+
+#: ../settings-dialogs/frap-shortcuts-dialog.c:253
+#, c-format
+msgid ""
+"Set shortcut for action\n"
+"<b>%s</b>"
+msgstr ""
+
+#: ../settings-dialogs/frap-shortcuts-dialog.c:255
+#, c-format
+msgid ""
+"Set shortcut for command\n"
+"<b>%s</b>"
+msgstr ""
+
+#: ../settings-dialogs/frap-shortcuts-dialog.c:257
+#, c-format
+msgid ""
+"Set shortcut for\n"
+"<b>%s</b>"
+msgstr ""
+
+#: ../settings-dialogs/frap-shortcuts-dialog.c:302
+msgid "Could not grab the keyboard."
+msgstr ""
+
+#: ../settings-dialogs/xfwm4-settings.c:86
+#: ../settings-dialogs/xfwm4-settings.c:116
 msgid "Shade window"
 msgstr "Ēnot logu"
 
-#: ../settings-dialogs/xfwm4-settings.c:84
-#: ../settings-dialogs/xfwm4-settings.c:110
+#: ../settings-dialogs/xfwm4-settings.c:87
+#: ../settings-dialogs/xfwm4-settings.c:113
 msgid "Hide window"
 msgstr "Slēpt logu"
 
-#: ../settings-dialogs/xfwm4-settings.c:85
-#: ../settings-dialogs/xfwm4-settings.c:109
+#: ../settings-dialogs/xfwm4-settings.c:88
+#: ../settings-dialogs/xfwm4-settings.c:112
 msgid "Maximize window"
 msgstr "Maksimizēt logu"
 
-#: ../settings-dialogs/xfwm4-settings.c:86
-#: ../settings-dialogs/xfwm4-settings.c:117
+#: ../settings-dialogs/xfwm4-settings.c:89
+#: ../settings-dialogs/xfwm4-settings.c:120
 msgid "Fill window"
 msgstr "Aizpildīt logu"
 
-#: ../settings-dialogs/xfwm4-settings.c:87
+#: ../settings-dialogs/xfwm4-settings.c:90
 msgid "Nothing"
 msgstr "Nekas"
 
-#: ../settings-dialogs/xfwm4-settings.c:92
-#: ../settings-dialogs/xfwm4-settings.c:102
+#: ../settings-dialogs/xfwm4-settings.c:95
+#: ../settings-dialogs/xfwm4-settings.c:105
 msgid "Left"
 msgstr "Pa kreisi"
 
-#: ../settings-dialogs/xfwm4-settings.c:93
+#: ../settings-dialogs/xfwm4-settings.c:96
 msgid "Center"
 msgstr "Centrēti"
 
-#: ../settings-dialogs/xfwm4-settings.c:94
-#: ../settings-dialogs/xfwm4-settings.c:103
+#: ../settings-dialogs/xfwm4-settings.c:97
+#: ../settings-dialogs/xfwm4-settings.c:106
 msgid "Right"
 msgstr "Pa labi"
 
-#: ../settings-dialogs/xfwm4-settings.c:99
+#: ../settings-dialogs/xfwm4-settings.c:102
 msgid "Window operations menu"
 msgstr "Loga operāciju izvēlne"
 
-#: ../settings-dialogs/xfwm4-settings.c:100
+#: ../settings-dialogs/xfwm4-settings.c:103
 msgid "Up"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-settings.c:101
+#: ../settings-dialogs/xfwm4-settings.c:104
 msgid "Down"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-settings.c:104
+#: ../settings-dialogs/xfwm4-settings.c:107
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../settings-dialogs/xfwm4-settings.c:105
+#: ../settings-dialogs/xfwm4-settings.c:108
 msgid "Cycle windows"
 msgstr "Ciklot starp logiem"
 
-#: ../settings-dialogs/xfwm4-settings.c:106
+#: ../settings-dialogs/xfwm4-settings.c:109
 msgid "Close window"
 msgstr "Aizvērt logu"
 
-#: ../settings-dialogs/xfwm4-settings.c:107
+#: ../settings-dialogs/xfwm4-settings.c:110
 msgid "Maximize window horizontally"
 msgstr "Maksimizēt logu horizontāli"
 
-#: ../settings-dialogs/xfwm4-settings.c:108
+#: ../settings-dialogs/xfwm4-settings.c:111
 msgid "Maximize window vertically"
 msgstr "Maksimizēt logu vertikāli"
 
-#: ../settings-dialogs/xfwm4-settings.c:111
+#: ../settings-dialogs/xfwm4-settings.c:114
 #, fuzzy
 msgid "Move window"
 msgstr "Pārvietot logu uz augšu"
 
-#: ../settings-dialogs/xfwm4-settings.c:112
+#: ../settings-dialogs/xfwm4-settings.c:115
 #, fuzzy
 msgid "Resize window"
 msgstr "Mainīt izmēru uz augšu"
 
-#: ../settings-dialogs/xfwm4-settings.c:114
+#: ../settings-dialogs/xfwm4-settings.c:117
 msgid "Stick window"
 msgstr "Pielipināt logu"
 
-#: ../settings-dialogs/xfwm4-settings.c:115
+#: ../settings-dialogs/xfwm4-settings.c:118
 msgid "Raise window"
 msgstr "Pacelt logu"
 
-#: ../settings-dialogs/xfwm4-settings.c:116
+#: ../settings-dialogs/xfwm4-settings.c:119
 msgid "Lower window"
 msgstr "Nocelt logu"
 
-#: ../settings-dialogs/xfwm4-settings.c:118
+#: ../settings-dialogs/xfwm4-settings.c:121
 msgid "Fill window horizontally"
 msgstr "Aizpildīt logu horizontāli"
 
-#: ../settings-dialogs/xfwm4-settings.c:119
+#: ../settings-dialogs/xfwm4-settings.c:122
 msgid "Fill window vertically"
 msgstr "Aizpildīt logu vertikāli"
 
-#: ../settings-dialogs/xfwm4-settings.c:120
+#: ../settings-dialogs/xfwm4-settings.c:123
 msgid "Toggle above"
 msgstr "Pārslēgt uz augšu"
 
-#: ../settings-dialogs/xfwm4-settings.c:121
+#: ../settings-dialogs/xfwm4-settings.c:124
 msgid "Toggle fullscreen"
 msgstr "Pārslēgt uz pilnekrānu režīmu"
 
-#: ../settings-dialogs/xfwm4-settings.c:122
+#: ../settings-dialogs/xfwm4-settings.c:125
 msgid "Move window to upper workspace"
 msgstr "Pārvietot logu uz augšējo darbavietu"
 
-#: ../settings-dialogs/xfwm4-settings.c:123
+#: ../settings-dialogs/xfwm4-settings.c:126
 msgid "Move window to bottom workspace"
 msgstr "Pārvietot logu uz apakšējo darbavietu"
 
-#: ../settings-dialogs/xfwm4-settings.c:124
+#: ../settings-dialogs/xfwm4-settings.c:127
 msgid "Move window to left workspace"
 msgstr "Pārvietot logu uz kreiso darbavietu"
 
-#: ../settings-dialogs/xfwm4-settings.c:125
+#: ../settings-dialogs/xfwm4-settings.c:128
 msgid "Move window to right workspace"
 msgstr "Pārvietot logu uz labo darbavietu"
 
-#: ../settings-dialogs/xfwm4-settings.c:126
+#: ../settings-dialogs/xfwm4-settings.c:129
 msgid "Move window to previous workspace"
 msgstr "Pārvietot logu uz iepriekšējo darbavietu"
 
-#: ../settings-dialogs/xfwm4-settings.c:127
+#: ../settings-dialogs/xfwm4-settings.c:130
 msgid "Move window to next workspace"
 msgstr "Pārvietot logu uz nākamo darbavietu"
 
-#: ../settings-dialogs/xfwm4-settings.c:128
+#: ../settings-dialogs/xfwm4-settings.c:131
 msgid "Show desktop"
 msgstr "Rādīt darbavirsmu"
 
-#: ../settings-dialogs/xfwm4-settings.c:129
+#: ../settings-dialogs/xfwm4-settings.c:132
 msgid "Upper workspace"
 msgstr "Augšējā darbavieta"
 
-#: ../settings-dialogs/xfwm4-settings.c:130
+#: ../settings-dialogs/xfwm4-settings.c:133
 msgid "Bottom workspace"
 msgstr "Apakšējā darbavieta"
 
-#: ../settings-dialogs/xfwm4-settings.c:131
+#: ../settings-dialogs/xfwm4-settings.c:134
 msgid "Left workspace"
 msgstr "Kreisā darbavieta"
 
-#: ../settings-dialogs/xfwm4-settings.c:132
+#: ../settings-dialogs/xfwm4-settings.c:135
 msgid "Right workspace"
 msgstr "Labā darbavieta"
 
-#: ../settings-dialogs/xfwm4-settings.c:133
+#: ../settings-dialogs/xfwm4-settings.c:136
 msgid "Previous workspace"
 msgstr "Iepriekšējā darbavieta"
 
-#: ../settings-dialogs/xfwm4-settings.c:134
+#: ../settings-dialogs/xfwm4-settings.c:137
 msgid "Next workspace"
 msgstr "Nākamā darbavieta"
 
-#: ../settings-dialogs/xfwm4-settings.c:135
+#: ../settings-dialogs/xfwm4-settings.c:138
 msgid "Add workspace"
 msgstr "Pievienot darbavietu"
 
-#: ../settings-dialogs/xfwm4-settings.c:136
+#: ../settings-dialogs/xfwm4-settings.c:139
 #, fuzzy
 msgid "Add adjacent workspace"
 msgstr "Pievienot darbavietu"
 
-#: ../settings-dialogs/xfwm4-settings.c:137
+#: ../settings-dialogs/xfwm4-settings.c:140
 #, fuzzy
 msgid "Delete last workspace"
 msgstr "Dzēst darbavietu"
 
-#: ../settings-dialogs/xfwm4-settings.c:138
+#: ../settings-dialogs/xfwm4-settings.c:141
 #, fuzzy
 msgid "Delete active workspace"
 msgstr "Dzēst darbavietu"
 
-#: ../settings-dialogs/xfwm4-settings.c:470
+#: ../settings-dialogs/xfwm4-settings.c:475
 msgid "Theme"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-settings.c:484
+#: ../settings-dialogs/xfwm4-settings.c:489
 #, fuzzy
 msgid "Action"
 msgstr "Aktīvs"
 
-#: ../settings-dialogs/xfwm4-settings.c:486
+#: ../settings-dialogs/xfwm4-settings.c:491
 #, fuzzy
 msgid "Shortcut"
 msgstr "Nav īssceļu"
 
-#: ../settings-dialogs/xfwm4-settings.c:544
+#: ../settings-dialogs/xfwm4-settings.c:551
 #: ../settings-dialogs/tweaks-settings.c:338
 #: ../settings-dialogs/workspace-settings.c:67
 msgid "Version information"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-settings.c:563
+#: ../settings-dialogs/xfwm4-settings.c:570
 #: ../settings-dialogs/tweaks-settings.c:357
 #: ../settings-dialogs/workspace-settings.c:87
 msgid "."
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-settings.c:567
+#: ../settings-dialogs/xfwm4-settings.c:574
 #: ../settings-dialogs/tweaks-settings.c:361
 #: ../settings-dialogs/workspace-settings.c:91
 #, c-format
@@ -427,51 +522,6 @@ msgid ""
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../settings-dialogs/xfwm4-settings.c:1119
-#, c-format
-msgid "%s shortcut conflict"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-settings.c:1126
-#, c-format
-msgid ""
-"This shortcut is already being used by the window manager action <b>%s</b>. "
-"Which action do you want to use?"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-settings.c:1133
-#, fuzzy, c-format
-msgid ""
-"The shortcut is already being used for the command <b>%s</b>. Which action "
-"do you want to use?"
-msgstr ""
-"Īssceļu jau lieto !\n"
-"Esat drošs, ka vēlaties to izmantot ?"
-
-#: ../settings-dialogs/xfwm4-settings.c:1138
-#, c-format
-msgid "Use %s"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-settings.c:1139
-#, c-format
-msgid "Keep %s"
-msgstr ""
-
-#. Ask the user what to do
-#: ../settings-dialogs/xfwm4-settings.c:1142
-msgid "Shortcut conflict"
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-settings.c:1161
-#, c-format
-msgid "The shortcut '%s' is already being used for something else."
-msgstr ""
-
-#: ../settings-dialogs/xfwm4-settings.c:1208
-msgid "This action"
-msgstr ""
-
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "<i>Large</i>"
 msgstr ""