Update screenshots (oops, conflict)

(Old svn revision: 12140)

34 files changed, 42 insertions, 28 deletions

diff --git a/doc/C/images/Makefile.am b/doc/C/images/Makefile.am
index 5de6d4384..9690cc474 100644
--- a/doc/C/images/Makefile.am
+++ b/doc/C/images/Makefile.am
@@ -5,7 +5,7 @@ images_DATA = \
 	focus.png	\
 	keyboard_shortcuts.png	\
 	misc_wm_prefs.png	\
-	titlebar.png	\
+	titlebar.png		\
 	workspace_margins.png	\
 	xfwm_workspaces.png
 
diff --git a/doc/C/images/Makefile.in b/doc/C/images/Makefile.in
index b07ae14f9..62316dd14 100644
--- a/doc/C/images/Makefile.in
+++ b/doc/C/images/Makefile.in
@@ -222,7 +222,7 @@ images_DATA = \
 	focus.png	\
 	keyboard_shortcuts.png	\
 	misc_wm_prefs.png	\
-	titlebar.png	\
+	titlebar.png		\
 	workspace_margins.png	\
 	xfwm_workspaces.png
 
diff --git a/doc/C/images/compose_shortcut.png b/doc/C/images/compose_shortcut.png
index 0d3c95bca..6cc72982b 100644
--- a/doc/C/images/compose_shortcut.png
+++ b/doc/C/images/compose_shortcut.png
diff --git a/doc/C/images/decoration_style.png b/doc/C/images/decoration_style.png
index e89427aa5..867c58d8b 100644
--- a/doc/C/images/decoration_style.png
+++ b/doc/C/images/decoration_style.png
diff --git a/doc/C/images/focus.png b/doc/C/images/focus.png
index a33388034..37c9e96f4 100644
--- a/doc/C/images/focus.png
+++ b/doc/C/images/focus.png
diff --git a/doc/C/images/keyboard_shortcuts.png b/doc/C/images/keyboard_shortcuts.png
index 43cba7dbe..6260e75e6 100644
--- a/doc/C/images/keyboard_shortcuts.png
+++ b/doc/C/images/keyboard_shortcuts.png
diff --git a/doc/C/images/misc_wm_prefs.png b/doc/C/images/misc_wm_prefs.png
index f764e218a..e23082d10 100644
--- a/doc/C/images/misc_wm_prefs.png
+++ b/doc/C/images/misc_wm_prefs.png
diff --git a/doc/C/images/workspace_margins.png b/doc/C/images/workspace_margins.png
index 4dfce042a..4b50fa797 100644
--- a/doc/C/images/workspace_margins.png
+++ b/doc/C/images/workspace_margins.png
diff --git a/doc/C/images/xfwm_workspaces.png b/doc/C/images/xfwm_workspaces.png
index d2edb0ee1..549c1196c 100644
--- a/doc/C/images/xfwm_workspaces.png
+++ b/doc/C/images/xfwm_workspaces.png
diff --git a/doc/fr/images/Makefile.am b/doc/fr/images/Makefile.am
index 3d4be40ee..2fed8c209 100644
--- a/doc/fr/images/Makefile.am
+++ b/doc/fr/images/Makefile.am
@@ -1,11 +1,14 @@
 imagesdir = $(datadir)/xfce4/doc/fr/images
 images_DATA = \
-	decoration_style.png \
-	keyboard_and_focus.png \
-	misc_wm_prefs.png \
-	titlebar.png \
-	xfwm_workspaces.png \
-	workspace_margins.png
+	compose_shortcut.png	\
+	decoration_style.png	\
+	focus.png		\
+	keyboard_and_focus.png	\
+	keyboard_shortcuts.png	\
+	misc_wm_prefs.png	\
+	titlebar.png		\
+	workspace_margins.png	\
+	xfwm_workspaces.png
 
 EXTRA_DIST = $(images_DATA)
 
diff --git a/doc/fr/images/Makefile.in b/doc/fr/images/Makefile.in
index fc536f024..78524bbd2 100644
--- a/doc/fr/images/Makefile.in
+++ b/doc/fr/images/Makefile.in
@@ -217,12 +217,15 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 imagesdir = $(datadir)/xfce4/doc/fr/images
 images_DATA = \
-	decoration_style.png \
-	keyboard_and_focus.png \
-	misc_wm_prefs.png \
-	titlebar.png \
-	xfwm_workspaces.png \
-	workspace_margins.png
+	compose_shortcut.png	\
+	decoration_style.png	\
+	focus.png		\
+	keyboard_and_focus.png	\
+	keyboard_shortcuts.png	\
+	misc_wm_prefs.png	\
+	titlebar.png		\
+	workspace_margins.png	\
+	xfwm_workspaces.png
 
 EXTRA_DIST = $(images_DATA)
 all: all-am
diff --git a/doc/fr/images/compose_shortcut.png b/doc/fr/images/compose_shortcut.png
new file mode 100644
index 000000000..5bb990ce6
--- /dev/null
+++ b/doc/fr/images/compose_shortcut.png
diff --git a/doc/fr/images/decoration_style.png b/doc/fr/images/decoration_style.png
index 3f74513dc..7a6dda827 100644
--- a/doc/fr/images/decoration_style.png
+++ b/doc/fr/images/decoration_style.png
diff --git a/doc/fr/images/focus.png b/doc/fr/images/focus.png
new file mode 100644
index 000000000..7637350e4
--- /dev/null
+++ b/doc/fr/images/focus.png
diff --git a/doc/fr/images/keyboard_and_focus.png b/doc/fr/images/keyboard_and_focus.png
index 2e217c5d5..97427fea3 100644
--- a/doc/fr/images/keyboard_and_focus.png
+++ b/doc/fr/images/keyboard_and_focus.png
diff --git a/doc/fr/images/keyboard_shortcuts.png b/doc/fr/images/keyboard_shortcuts.png
new file mode 100644
index 000000000..97427fea3
--- /dev/null
+++ b/doc/fr/images/keyboard_shortcuts.png
diff --git a/doc/fr/images/misc_wm_prefs.png b/doc/fr/images/misc_wm_prefs.png
index 8ee8153b1..5a5b02149 100644
--- a/doc/fr/images/misc_wm_prefs.png
+++ b/doc/fr/images/misc_wm_prefs.png
diff --git a/doc/fr/images/titlebar.png b/doc/fr/images/titlebar.png
index dc5e8231c..9d1a53b42 100644
--- a/doc/fr/images/titlebar.png
+++ b/doc/fr/images/titlebar.png
diff --git a/doc/fr/images/workspace_margins.png b/doc/fr/images/workspace_margins.png
index e5a299370..6fcb4c38d 100644
--- a/doc/fr/images/workspace_margins.png
+++ b/doc/fr/images/workspace_margins.png
diff --git a/doc/fr/images/xfwm_workspaces.png b/doc/fr/images/xfwm_workspaces.png
index 1d2874942..847b235f3 100644
--- a/doc/fr/images/xfwm_workspaces.png
+++ b/doc/fr/images/xfwm_workspaces.png
diff --git a/doc/it/images/Makefile.am b/doc/it/images/Makefile.am
index f3e8bd853..33a9e4ed6 100644
--- a/doc/it/images/Makefile.am
+++ b/doc/it/images/Makefile.am
@@ -1,11 +1,14 @@
 imagesdir = $(datadir)/xfce4/doc/it/images
 images_DATA = \
-	decoration_style.png \
-	keyboard_and_focus.png \
-	misc_wm_prefs.png \
-	titlebar.png \
-	xfwm_workspaces.png \
-	workspace_margins.png
+	compose_shortcut.png	\
+	decoration_style.png	\
+	focus.png		\
+	keyboard_and_focus.png	\
+	keyboard_shortcuts.png	\
+	misc_wm_prefs.png	\
+	titlebar.png		\
+	workspace_margins.png	\
+	xfwm_workspaces.png
 
 EXTRA_DIST = $(images_DATA)
 
diff --git a/doc/it/images/Makefile.in b/doc/it/images/Makefile.in
index 7cb1bdf3a..1719f9a66 100644
--- a/doc/it/images/Makefile.in
+++ b/doc/it/images/Makefile.in
@@ -217,12 +217,15 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 imagesdir = $(datadir)/xfce4/doc/it/images
 images_DATA = \
-	decoration_style.png \
-	keyboard_and_focus.png \
-	misc_wm_prefs.png \
-	titlebar.png \
-	xfwm_workspaces.png \
-	workspace_margins.png
+	compose_shortcut.png	\
+	decoration_style.png	\
+	focus.png		\
+	keyboard_and_focus.png	\
+	keyboard_shortcuts.png	\
+	misc_wm_prefs.png	\
+	titlebar.png		\
+	workspace_margins.png	\
+	xfwm_workspaces.png
 
 EXTRA_DIST = $(images_DATA)
 all: all-am
diff --git a/doc/it/images/compose_shortcut.png b/doc/it/images/compose_shortcut.png
new file mode 100644
index 000000000..408a57b41
--- /dev/null
+++ b/doc/it/images/compose_shortcut.png
diff --git a/doc/it/images/decoration_style.png b/doc/it/images/decoration_style.png
index de1982d4c..7341c3693 100644
--- a/doc/it/images/decoration_style.png
+++ b/doc/it/images/decoration_style.png
diff --git a/doc/it/images/focus.png b/doc/it/images/focus.png
new file mode 100644
index 000000000..ac9d0ebca
--- /dev/null
+++ b/doc/it/images/focus.png
diff --git a/doc/it/images/keyboard_and_focus.png b/doc/it/images/keyboard_and_focus.png
index 574f0809a..957326a50 100644
--- a/doc/it/images/keyboard_and_focus.png
+++ b/doc/it/images/keyboard_and_focus.png
diff --git a/doc/it/images/keyboard_shortcuts.png b/doc/it/images/keyboard_shortcuts.png
new file mode 100644
index 000000000..957326a50
--- /dev/null
+++ b/doc/it/images/keyboard_shortcuts.png
diff --git a/doc/it/images/misc_wm_prefs.png b/doc/it/images/misc_wm_prefs.png
index 4a2d500c2..d1c7a9e0e 100644
--- a/doc/it/images/misc_wm_prefs.png
+++ b/doc/it/images/misc_wm_prefs.png
diff --git a/doc/it/images/titlebar.png b/doc/it/images/titlebar.png
index 3f6dddc62..0575cbf63 100644
--- a/doc/it/images/titlebar.png
+++ b/doc/it/images/titlebar.png
diff --git a/doc/it/images/workspace_margins.png b/doc/it/images/workspace_margins.png
index 622fb9c46..dc9f023e5 100644
--- a/doc/it/images/workspace_margins.png
+++ b/doc/it/images/workspace_margins.png
diff --git a/doc/it/images/xfwm_workspaces.png b/doc/it/images/xfwm_workspaces.png
index 0f049f179..8d3841fca 100644
--- a/doc/it/images/xfwm_workspaces.png
+++ b/doc/it/images/xfwm_workspaces.png
diff --git a/ltmain.sh b/ltmain.sh
index c13e957f7..23f82e3b7 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -33,6 +33,9 @@ basename="s,^.*/,,g"
 # function.
 progpath="$0"
 
+# RH: define SED for historic ltconfig's generated by Libtool 1.3
+[ -z "$SED" ] && SED=sed
+
 # The name of this program:
 progname=`echo "$progpath" | $SED $basename`
 modename="$progname"
diff --git a/po/fr.gmo b/po/fr.gmo
index f34823f6a..137c14dc3 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 55951b43f..2ac2c19c8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -597,9 +597,8 @@ msgstr "Composer le raccourci"
 
 #: mcs-plugin/xfwm4_shortcuteditor.c:1272
 #: mcs-plugin/xfwm4_shortcuteditor.c:1500
-#, fuzzy
 msgid "No shortcut"
-msgstr "Composer le raccourci"
+msgstr "Pas de raccourci"
 
 #. Create dialog
 #: mcs-plugin/xfwm4_shortcuteditor.c:1394