Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch

Conflicts:
	xwords4/android/scripts/strings_check.sh
This commit is contained in:
Andy2 2011-09-14 06:51:10 -07:00
commit 8cb49ad8a3

View file

@ -22,10 +22,9 @@ list_ids() {
list_pairs() {
XML_FILE=$1
#xmlstarlet sel -t -m "//string" -v @name -o ':' -v . -n $XML_FILE | tr -d '\n' | sed 's, *, ,g'
for NAME in $(list_ids $XML_FILE); do
xmlstarlet sel -t -m "//string[@name='$NAME']" -v @name -o ':' -v . $XML_FILE \
| tr -d '\n' | sed 's, *, ,g'
xmlstarlet sel -t -m "//string[@name='$NAME']" -v @name -o ':' \
-v . $XML_FILE | tr -d '\n' | sed 's, *, ,g'
echo ""
done
}