[nautilus-actions] Fix localizable strings

[Pierre Wieser <pwieser src gnome org>]

commit 8cb3d5d67dcae29972fd96667d5c434e852e93f4
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Jan 9 13:26:43 2011 +0100

    Fix localizable strings
    
    Add src/io-desktop/nadp-formats.c to po/POTFILES.in
    Remove %o/%O parameters from description of version 2.0 in src/core/na-object-profile-factory.c
    Fix tools/check-po.sh to correctly check glade files.

 ChangeLog                            |   10 ++++++++++
 po/POTFILES.in                       |    1 +
 src/core/na-object-profile-factory.c |    8 +++-----
 tools/check-po.sh                    |   11 +++--------
 4 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 04e92f2..9131678 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-09 Pierre Wieser <pwieser trychlos org>
+
+	* po/POTFILES.in: Add src/io-desktop/nadp-formats.c file.
+
+	* src/core/na-object-profile-factory.c:
+	Remove %o/%O parameters from description of version 2.0.
+	Add a missing line feed.
+
+	* tools/check-po.sh: Adapt to glade files.
+
 2011-01-08 Pierre Wieser <pwieser trychlos org>
 
 	* src/utils/nautilus-actions-new.c (init_options):
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e653804..41e6b45 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,6 +16,7 @@ src/core/na-object-profile-factory.c
 src/core/na-selected-info.c
 src/core/na-tokens.c
 src/io-desktop/nadp-desktop-provider.c
+src/io-desktop/nadp-formats.c
 src/io-gconf/nagp-gconf-provider.c
 src/io-xml/naxml-reader.c
 src/io-xml/naxml-formats.c
diff --git a/src/core/na-object-profile-factory.c b/src/core/na-object-profile-factory.c
index 5f1232d..8b2c373 100644
--- a/src/core/na-object-profile-factory.c
+++ b/src/core/na-object-profile-factory.c
@@ -131,21 +131,19 @@ static NADataDef data_def_profile [] = {
 					"item in the file manager context menu or in the toolbar.\n" \
 					"The parameters may contain some special tokens which are replaced by the " \
 					"informations provided by the file manager before starting the command:\n" \
-					"- up to version \"2.0\":\n" \
+					"- up to version 2.0:\n" \
 					"  %d: base folder of the selected file(s)\n" \
 					"  %f: the name of the selected file or the first one if several are selected\n" \
 					"  %h: hostname of the URI\n" \
 					"  %m: space-separated list of the basenames of the selected file(s)/folder(s)\n" \
 					"  %M: space-separated list of the selected file(s)/folder(s), with their full paths\n" \
-					"  %o: no-op operator which forces a singular form of execution\n" \
-					"  %O: no-op operator which forces a plural form of execution\n" \
 					"  %p: port number of the first URI\n" \
 					"  %R: space-separated list of selected URIs\n" \
 					"  %s: scheme of the URI\n" \
 					"  %u: URI\n" \
 					"  %U: username of the URI\n" \
-					"  %%: a percent sign." \
-					"- starting from version '3':\n" \
+					"  %%: a percent sign.\n" \
+					"- starting from version 3:\n" \
 					"  %b: (first) basename\n" \
 					"  %B: space-separated list of the basenames of the selected file(s)/folder(s)\n" \
 					"  %c: count the selected file(s)/folder(s)\n" \
diff --git a/tools/check-po.sh b/tools/check-po.sh
index 030fab3..2200856 100755
--- a/tools/check-po.sh
+++ b/tools/check-po.sh
@@ -12,14 +12,13 @@ if [ ! -r ${PO} ]; then
 fi
 
 # first, check that all .ui are in po/POTFILE.in
-
 total=0
 count=0
 errs=0
 echo ""
 echo "checking that all .ui are in ${PO}..."
-for f in $(find src -name '*.ui' | sed 's?^\./??'); do
-	if [ "$(grep -x ${f} ${PO})" != "${f}" ]; then
+for f in $(git ls-files *.ui); do
+	if [ "$(grep -xe "\[type:\s*gettext/glade]\s*${f}" ${PO})" = "" ]; then
 		echo "	${f} should be added to ${PO}"
 		let errs+=1
 	fi
@@ -29,12 +28,11 @@ echo "pass 1/5: count=${count} error(s)=${errs}"
 let total+=${errs}
 
 # second, check that all .ui in PO exist
-
 count=0
 errs=0
 echo ""
 echo "checking that all .ui from ${PO} actually exist..."
-for f in $(grep -E '\.ui$' ${PO}); do
+for f in $(grep -e '\.ui$' ${PO} | sed 's,\[type:\s*gettext/glade]\s*,,'); do
 	if [ ! -r ${f} ]; then
 		echo "	${f} should be removed from ${PO}"
 		let errs+=1
@@ -45,7 +43,6 @@ echo "pass 2/5: count=${count} error(s)=${errs}"
 let total+=${errs}
 
 # third, check that all files which use _( construct are in PO
-
 count=0
 errs=0
 echo ""
@@ -64,7 +61,6 @@ echo "pass 3/5: count=${count} error(s)=${errs}"
 let total+=${errs}
 
 # fourth, check that all files in PO actually use the _( construct
-
 count=0
 errs=0
 echo ""
@@ -81,7 +77,6 @@ echo "pass 4/5: count=${count} error(s)=${errs}"
 let total+=${errs}
 
 # last, check that all files which include gi18n.h are relevant
-
 count=0
 errs=0
 echo ""