Fix a bunch of messages
* Find and rename/remove duplicate string variable names
* Add missing string variables to en language file
* Fix display of some strings missing @ in front of variable name
* Fix several %s --> {1}
* Be consistent in usage of cancelled vs. canceled (both spellings
acceptable)
Tip for finding strings missing from language files:
1) Find all messages:
egrep -hr "gui_msg.+=" > /tmp/msgs.txt
2) Regex replace to trim them down
WHAT: ^\s+gui_msg(?:[^"]+)"([a-zA-Z0-9_]+)=([^"]+).+
WITH: $1
Note that $2 can be used to retain the message
3) Find missing strings:
for i in $(cat /tmp/msgs.txt); do
if ! grep -q $i gui/theme/common/languages/en.xml; then
echo $i;
fi
done
Change-Id: Ic193162e4b5468bf027472928a370be39840ea1d
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 6ed0b83..7f951bc 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -643,7 +643,7 @@
<text style="text_m">
<placement x="%col1_x_left%" y="%row1_header_y%"/>
- <text>{@installing_zip=Installing Zip: %tw_file%}</text>
+ <text>{@installing_zip_xml=Installing Zip: %tw_file%}</text>
</text>
<template name="console"/>
@@ -737,7 +737,7 @@
<text style="text_m">
<placement x="%col1_x_left%" y="%row1_header_y%"/>
- <text>{@install_image_hdr=Install Image} > {install_sel_target=Select Target Partition}</text>
+ <text>{@install_image_hdr=Install Image} > {@install_sel_target=Select Target Partition}</text>
</text>
<partitionlist style="partitionlist_headerless_rb">
@@ -2922,7 +2922,7 @@
<condition var1="tw_operation_state" var2="1"/>
<actions>
<action function="set">tw_back=restore</action>
- <action function="set">tw_complete_text1={@restore_completed=Restore Complete}</action>
+ <action function="set">tw_complete_text1={@restore_complete=Restore Complete}</action>
<action function="set">tw_show_reboot=1</action>
<action function="page">action_complete</action>
</actions>
@@ -3074,7 +3074,7 @@
<text style="text_m">
<placement x="%col1_x_left%" y="%row1_header_y%"/>
- <text>{@mount_hdr=Mount} > {usb_storage_hdr=USB Storage}</text>
+ <text>{@mount_hdr=Mount} > {@usb_storage_hdr=USB Storage}</text>
</text>
<text style="text_m_accent">
@@ -3144,7 +3144,7 @@
<text style="text_m">
<placement x="%col1_x_left%" y="%row1_header_y%"/>
- <text>{@reboot_hdr=Reboot Menu}</text>
+ <text>{@reboot_hdr=Reboot}</text>
</text>
<button style="main_button">