[nautilus-actions] Fix sample distributed actions

[Pierre Wieser <pwieser src gnome org>]

commit 7ebafafdb5daf5c3f6cc655ca12dbb3fd8295d0f
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Dec 6 05:32:38 2010 +0100

    Fix sample distributed actions
    
    - Actually disabled actions and menus as stated in the doc and the README;
    - remove character encodings from localizable strings.

 ChangeLog                               |    9 ++++++++-
 data/actions/my-first-na-action.desktop |   16 ++--------------
 data/actions/my-first-na-menu.desktop   |    4 ++++
 data/actions/open-terminal-here.desktop |   28 +++++++++-------------------
 data/actions/show-na-parameters.desktop |   23 ++++++-----------------
 5 files changed, 29 insertions(+), 51 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index abc5109..8c4f4a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2010-12-04 Pierre Wieser <pwieser trychlos org>
+2010-12-06 Pierre Wieser <pwieser trychlos org>
+
+	* data/actions/my-first-na-action.desktop:
+	* data/actions/my-first-na-menu.desktop:
+	* data/actions/open-terminal-here.desktop:
+	* data/actions/show-na-parameters.desktop:
+	- Actually disabled actions and menus as stated in the doc and the README.
+	- Remove character encodings from localizable strings.
 
 2010-12-03 Pierre Wieser <pwieser trychlos org>
 
diff --git a/data/actions/my-first-na-action.desktop b/data/actions/my-first-na-action.desktop
index 193549f..b3dc6b6 100644
--- a/data/actions/my-first-na-action.desktop
+++ b/data/actions/my-first-na-action.desktop
@@ -1,33 +1,21 @@
 
 [Desktop Entry]
 Type=Action
-Icon[en_US.UTF-8]=gtk-about
 Icon[en_US]=gtk-about
-Icon[en.UTF-8]=gtk-about
 Icon[en]=gtk-about
 Icon[C]=gtk-about
-Tooltip[en_US.UTF-8]=This will execute an action with some parameters
 Tooltip[en_US]=This will execute an action with some parameters
-Tooltip[en.UTF-8]=This will execute an action with some parameters
 Tooltip[en]=This will execute an action with some parameters
 Tooltip[C]=This will execute an action with some parameters
-ToolbarLabel[en_US.UTF-8]=My first action
 ToolbarLabel[en_US]=My first action
-ToolbarLabel[en.UTF-8]=My first action
 ToolbarLabel[en]=My first action
 ToolbarLabel[C]=My first action
-Name[en_US.UTF-8]=My first action
 Name[en_US]=My first action
-Name[en.UTF-8]=My first action
 Name[en]=My first action
 Name[C]=My first action
 Profiles=profile-zero;
-
-Name[en_US.utf8]=My first action
-Tooltip[en_US.utf8]=This will execute an action with some parameters
-Icon[en_US.utf8]=gtk-about
-ToolbarLabel[en_US.utf8]=My first action
+Enabled = false
 
 [X-Action-Profile profile-zero]
 Exec=zenity --info --text="%c selected item(s): %f"
-Name[en_US.UTF-8]=Default profile
+Name[en_US]=Default profile
diff --git a/data/actions/my-first-na-menu.desktop b/data/actions/my-first-na-menu.desktop
index 88d2cae..e3adb95 100644
--- a/data/actions/my-first-na-menu.desktop
+++ b/data/actions/my-first-na-menu.desktop
@@ -1,10 +1,14 @@
 
 [Desktop Entry]
 Type=Menu
+Name[en_US]=My First Nautilus-Actions menu
 Name[en]=My First Nautilus-Actions menu
 Name[C]=My First Nautilus-Actions menu
 ItemsList=my-first-na-action;show-na-parameters;open-terminal-here;
+Tooltip[en_US]=Contains some default Nautilus-Actions actions
 Tooltip[en]=Contains some default Nautilus-Actions actions
 Tooltip[C]=Contains some default Nautilus-Actions actions
+Icon[en_US]=/usr/share/icons/hicolor/22x22/mimetypes/application-x-catalog.png
 Icon[en]=/usr/share/icons/hicolor/22x22/mimetypes/application-x-catalog.png
 Icon[C]=/usr/share/icons/hicolor/22x22/mimetypes/application-x-catalog.png
+Enabled = false
diff --git a/data/actions/open-terminal-here.desktop b/data/actions/open-terminal-here.desktop
index 1d145f5..99e7c32 100644
--- a/data/actions/open-terminal-here.desktop
+++ b/data/actions/open-terminal-here.desktop
@@ -2,35 +2,25 @@
 [Desktop Entry]
 Type=Action
 TargetLocation=true
-Icon[en]=/usr/share/icons/gnome/24x24/apps/gnome-terminal.png
-Tooltip[en]=Open a terminal if the current location
-ToolbarLabel[en]=Open a terminal here
-Name[en]=Open a terminal here
-Profiles=profile-zero;
-TargetToolbar=true
-
-ToolbarLabel[en_US.UTF-8]=Open a terminal here
-ToolbarLabel[en_US]=Open a terminal here
-ToolbarLabel[en.UTF-8]=Open a terminal here
-ToolbarLabel[C]=Open a terminal here
-Icon[en_US.UTF-8]=/usr/share/icons/gnome/24x24/apps/gnome-terminal.png
 Icon[en_US]=/usr/share/icons/gnome/24x24/apps/gnome-terminal.png
-Icon[en.UTF-8]=/usr/share/icons/gnome/24x24/apps/gnome-terminal.png
+Icon[en]=/usr/share/icons/gnome/24x24/apps/gnome-terminal.png
 Icon[C]=/usr/share/icons/gnome/24x24/apps/gnome-terminal.png
-Tooltip[en_US.UTF-8]=Open a terminal if the current location
 Tooltip[en_US]=Open a terminal if the current location
-Tooltip[en.UTF-8]=Open a terminal if the current location
+Tooltip[en]=Open a terminal if the current location
 Tooltip[C]=Open a terminal if the current location
-Name[en_US.UTF-8]=Open a terminal here
+ToolbarLabel[en_US]=Open a terminal here
+ToolbarLabel[en]=Open a terminal here
+ToolbarLabel[C]=Open a terminal here
 Name[en_US]=Open a terminal here
-Name[en.UTF-8]=Open a terminal here
+Name[en]=Open a terminal here
 Name[C]=Open a terminal here
+Profiles=profile-zero;
+TargetToolbar=true
+Enabled = false
 
 [X-Action-Profile profile-zero]
 Exec=gnome-terminal --working-directory=%f
-Name[en_US.UTF-8]=Default profile
 MimeTypes=inode/directory;
 Name[en_US]=Default profile
-Name[en.UTF-8]=Default profile
 Name[en]=Default profile
 Name[C]=Default profile
diff --git a/data/actions/show-na-parameters.desktop b/data/actions/show-na-parameters.desktop
index 1f16061..e36ddf2 100644
--- a/data/actions/show-na-parameters.desktop
+++ b/data/actions/show-na-parameters.desktop
@@ -2,35 +2,24 @@
 [Desktop Entry]
 Type=Action
 Profiles=profile-pre-v2;
-Enabled=false
+Name[en_US]=Display Nautilus-Actions Parameters
 Name[en]=Display Nautilus-Actions Parameters
 Name[C]=Display Nautilus-Actions Parameters
+Icon[en_US]=/usr/share/icons/hicolor/16x16/apps/nautilus-actions.png
 Icon[en]=/usr/share/icons/hicolor/16x16/apps/nautilus-actions.png
 Icon[C]=/usr/share/icons/hicolor/16x16/apps/nautilus-actions.png
+ToolbarLabel[en_US]=Display Nautilus-Actions Parameters
 ToolbarLabel[en]=Display Nautilus-Actions Parameters
 ToolbarLabel[C]=Display Nautilus-Actions Parameters
+Tooltip[en_US]=Display the Nautilus-Actions parameters
 Tooltip[en]=Display the Nautilus-Actions parameters
 Tooltip[C]=Display the Nautilus-Actions parameters
 TargetLocation=true
 TargetToolbar=true
-
-ToolbarLabel[en_US.UTF-8]=Display Nautilus-Actions Parameters
-ToolbarLabel[en_US]=Display Nautilus-Actions Parameters
-ToolbarLabel[en.UTF-8]=Display Nautilus-Actions Parameters
-Icon[en_US.UTF-8]=/usr/share/icons/hicolor/16x16/apps/nautilus-actions.png
-Icon[en_US]=/usr/share/icons/hicolor/16x16/apps/nautilus-actions.png
-Icon[en.UTF-8]=/usr/share/icons/hicolor/16x16/apps/nautilus-actions.png
-Tooltip[en_US.UTF-8]=Display the Nautilus-Actions parameters
-Tooltip[en_US]=Display the Nautilus-Actions parameters
-Tooltip[en.UTF-8]=Display the Nautilus-Actions parameters
-Name[en_US.UTF-8]=Display Nautilus-Actions Parameters
-Name[en_US]=Display Nautilus-Actions Parameters
-Name[en.UTF-8]=Display Nautilus-Actions Parameters
+Enabled = false
 
 [X-Action-Profile profile-pre-v2]
 Exec=zenity --list --text="Nautilus-Actions parameters for the selected items:" --column="Parameter" --column="Token" --column="Value" "space-separated list of basenames" %%B "%B" "(first) basename" %%b "%b" "count selection" %%c "%c" "(first) base directory" %%d "%d" "space-separated list of base directories" %%D "%D" "(first) filename" %%f "%f" "space-separated list of filenames" %%F "%F" "hostname" %%h "%h" "(first) mimetype" %%m "%m" "space-separated list of mimetypes" %%M "%M" "username" %%n "%n" "port number" %%p "%p" "scheme" %%s "%s" "(first) URI" %%u "%u" "space-separated list of URIs" %%U "%U" "(first) basename without extension" %%w "%w" "space-separated list of basenames w/o extension" %%W "%W" "(first) extension" %%x "%x" "space-separated list of extensions" %%X "%X" --height=370 --width=768 --print-column=ALL
+Name[en_US]=Profile automatically created from pre-v2 action
 Name[en]=Profile automatically created from pre-v2 action
 Name[C]=Profile automatically created from pre-v2 action
-Name[en_US.UTF-8]=Profile automatically created from pre-v2 action
-Name[en_US]=Profile automatically created from pre-v2 action
-Name[en.UTF-8]=Profile automatically created from pre-v2 action