Merge branch 'android_branch' into relay_proxy

This commit is contained in:
eehouse@eehouse.org 2010-11-06 15:06:08 -07:00 committed by Andy2
commit 58317afb28

View file

@ -206,9 +206,9 @@
<string name="show_arrow">Show board arrow</string>
<string name="show_arrow_summary">Tapped rack tiles land on this
arrow when it is visible</string>
<string name="explain_robot">Explain robot moves</string>
<string name="explain_robot">Explain other moves</string>
<string name="explain_robot_summary">Display score summary after
every robot turn</string>
every robot or remote turn</string>
<string name="skip_confirm_turn">Skip confirming turn</string>
<string name="skip_confirm_turn_summary">Do NOT display score
summary after every human turn</string>