Merge branch 'android_branch' into french_xlation

This commit is contained in:
Eric House 2011-08-21 21:56:52 -07:00
commit 609f4be8a6
2 changed files with 2 additions and 1 deletions

View file

@ -72,7 +72,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="true"
android:prompt="@string/title_dicts_list"
android:prompt="@string/dicts_list_promptf"
/>
<CheckBox android:id="@+id/robot_check"

View file

@ -363,6 +363,7 @@
<string name="button_html">Html</string>
<string name="player_label">Name:</string>
<string name="dicts_list_promptf">Installed wordlists (in %s)</string>
<string name="info_title">FYI...</string>
<string name="newbie_title">New user info</string>