* settings-dialogs/frap-shortcuts.c,

	  settings-dialog/frap-shortcuts-dialog.c: Synchronize latest libfrap
	  changes.
	* settings-dialogs/xfwm4-settings.c: Make keyboard tab insensitive.
	  Shortcuts based on xfconf have been postponed to the first beta release
		and won't be available in the alpha.
 	* *.po, xfwm4.pot: Merge strings.

(Old svn revision: 27762)

1 files changed, 47 insertions, 42 deletions

diff --git a/po/ro.po b/po/ro.po
index c28c74e3c..829709348 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-07 18:52+0200\n"
+"POT-Creation-Date: 2008-09-08 22:22+0200\n"
 "PO-Revision-Date: 2007-01-21 01:39+0200\n"
 "Last-Translator: Mişu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -210,30 +210,30 @@ msgstr "Margini şi spaţii de lucru"
 msgid "Xfce 4 Workspaces Settings"
 msgstr "Preferinţe margini şi spaţii de lucru Xfce 4"
 
-#: ../settings-dialogs/frap-shortcuts.c:83
+#: ../settings-dialogs/frap-shortcuts.c:84
 #, 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
+#: ../settings-dialogs/frap-shortcuts.c:85
+#: ../settings-dialogs/frap-shortcuts.c:88
+#: ../settings-dialogs/frap-shortcuts.c:91
+#: ../settings-dialogs/frap-shortcuts.c:94
 #, c-format
 msgid "Use %s"
 msgstr ""
 
-#: ../settings-dialogs/frap-shortcuts.c:84
-#: ../settings-dialogs/frap-shortcuts.c:87
-#: ../settings-dialogs/frap-shortcuts.c:90
+#: ../settings-dialogs/frap-shortcuts.c:85
+#: ../settings-dialogs/frap-shortcuts.c:88
+#: ../settings-dialogs/frap-shortcuts.c:91
 #, c-format
 msgid "Keep %s"
 msgstr ""
 
-#: ../settings-dialogs/frap-shortcuts.c:86
-#: ../settings-dialogs/frap-shortcuts.c:89
+#: ../settings-dialogs/frap-shortcuts.c:87
+#: ../settings-dialogs/frap-shortcuts.c:90
 #, fuzzy, c-format
 msgid ""
 "The shortcut is already being used for the command <b>%s</b>. Which action "
@@ -242,7 +242,7 @@ msgstr ""
 "Combinaţia de taste este deja asignată!\n"
 "Sigur doriţi să o mai asociaţi o dată?"
 
-#: ../settings-dialogs/frap-shortcuts.c:92
+#: ../settings-dialogs/frap-shortcuts.c:93
 #, fuzzy
 msgid ""
 "The shortcut is already being used by a <b>window manager action</b>. Which "
@@ -251,60 +251,68 @@ msgstr ""
 "Combinaţia de taste este deja asignată!\n"
 "Sigur doriţi să o mai asociaţi o dată?"
 
-#: ../settings-dialogs/frap-shortcuts.c:93
+#: ../settings-dialogs/frap-shortcuts.c:94
 #, fuzzy
 msgid "Keep window manager action"
 msgstr "Preferinţe administrator de ferestre Xfce 4"
 
-#: ../settings-dialogs/frap-shortcuts.c:248
+#: ../settings-dialogs/frap-shortcuts.c:249
 #, c-format
 msgid "%s shortcut conflict"
 msgstr ""
 
-#: ../settings-dialogs/frap-shortcuts.c:256
+#: ../settings-dialogs/frap-shortcuts.c:257
 msgid "Use this action"
 msgstr ""
 
-#: ../settings-dialogs/frap-shortcuts.c:259
+#: ../settings-dialogs/frap-shortcuts.c:260
 msgid "Shortcut conflict"
 msgstr ""
 
-#: ../settings-dialogs/frap-shortcuts.c:280
+#: ../settings-dialogs/frap-shortcuts.c:281
 #, c-format
 msgid "The shortcut '%s' is already being used for something else."
 msgstr ""
 
-#. Set dialog title
-#: ../settings-dialogs/frap-shortcuts-dialog.c:233
+#: ../settings-dialogs/frap-shortcuts-dialog.c:236
 #, fuzzy
-msgid "Set shortcut"
-msgstr "Nici o combinaţie"
+msgid "Enter window manager action shortcut"
+msgstr "Preferinţe administrator de ferestre Xfce 4"
 
-#: ../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:237
+#: ../settings-dialogs/frap-shortcuts-dialog.c:247
+#, fuzzy, c-format
+msgid "Action: %s"
+msgstr "Active"
 
-#: ../settings-dialogs/frap-shortcuts-dialog.c:255
-#, c-format
-msgid ""
-"Set shortcut for command\n"
-"<b>%s</b>"
+#: ../settings-dialogs/frap-shortcuts-dialog.c:241
+msgid "Enter command shortcut"
 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:242
+#, fuzzy, c-format
+msgid "Command: %s"
+msgstr "Comandă"
 
-#: ../settings-dialogs/frap-shortcuts-dialog.c:302
+#: ../settings-dialogs/frap-shortcuts-dialog.c:246
+#, fuzzy
+msgid "Enter shortcut"
+msgstr "Nici o combinaţie"
+
+#: ../settings-dialogs/frap-shortcuts-dialog.c:277
+#, fuzzy
+msgid "Shortcut:"
+msgstr "Nici o combinaţie"
+
+#: ../settings-dialogs/frap-shortcuts-dialog.c:321
 msgid "Could not grab the keyboard."
 msgstr ""
 
+#: ../settings-dialogs/frap-shortcuts-dialog.c:342
+#, c-format
+msgid "<span size='large'><b>%s</b></span>"
+msgstr ""
+
 #: ../settings-dialogs/xfwm4-settings.c:86
 #: ../settings-dialogs/xfwm4-settings.c:116
 msgid "Shade window"
@@ -1064,9 +1072,6 @@ msgstr "Stil"
 #~ msgid "Text alignment inside title bar :"
 #~ msgstr "Aliniere text în interiorul barei de titlu:"
 
-#~ msgid "Command"
-#~ msgstr "Comandă"
-
 #~ msgid "Slow"
 #~ msgstr "Mică"