Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-22 07:28:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

rearrange config options; move strings for translation

Browse source
This commit is contained in:
Eric House 2024-02-23 19:55:49 -08:00
parent f2d7ce3daa
commit aca125bc23
5 changed files with 43 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/android/app/src/main/res/layout/game_config.xml
View file

@ -176,11 +176,6 @@
android:layout_height="wrap_content"
android:text="@string/hints_allowed"
/>
<CheckBox android:id="@+id/trade_sub_seven"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sub_seven_allowed"
/>
<org.eehouse.android.xw4.LabeledSpinner
android:id="@+id/smart_robot"
@ -234,6 +229,12 @@
/>
</org.eehouse.android.xw4.LabeledSpinner>
<CheckBox android:id="@+id/trade_sub_seven"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sub_seven_allowed"
/>
<CheckBox android:id="@+id/pick_faceup"
android:layout_width="fill_parent"
android:layout_height="wrap_content"

18
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -734,9 +734,9 @@
in this file) -->
<string name="hints_allowed_sum">Enable the hint feature</string>
<!-- clarification on hints_allowed, whether new NETWORKED games
will default to having the hint feature enabled(string
will default to having the hint feature enabled (string
elsewhere in this file) -->
<string name="nethints_allowed_sum">Enable hints for two-device games</string>
<string name="nethints_allowed_sum">Enable hints for multi-device games</string>
<!-- Will new games, on default, randomly rearrange the start
order of players. -->
<string name="init_autojuggle">Juggle players</string>
@ -2810,4 +2810,18 @@
their most recent game started instead of by name -->
<string name="sort_by_date_label">Sort by date</string>
<!-- In Peer Status (Debug builds only) results, if my own device
comes back (as it should) and it isn't assigned a name in Known
Players, use this. -->
<string name="selfName">This device</string>
<!-- Game-config option to let you trade tiles when fewer than 7 are
left in the pool. This is common among Spanish and maybe German
players. -->
<string name="sub_seven_allowed">Allow trades below seven tiles left</string>
<string name="sub_seven_allowed_sum">This lets you trade tiles when
as few as 1 are left in the pool, as is common in Spanish
play.</string>
</resources>

8
xwords4/android/app/src/main/res/values/tmpstrings.xml
View file

@ -5,16 +5,8 @@
<string name="dup_allscores_fmt">All scores: %1$s</string>
<!-- In Peer Status results, if my own device comes back (as it
should) and it isn't assigned a name in Known Players, use
this. -->
<string name="selfName">This device</string>
<!-- Debug-only: menu to remove quashed marking from a game (in case
the quashing was accidental) -->
<string name="menu_unquash">Unquash</string>
<string name="sub_seven_allowed">Allow trades below seven tiles left</string>
<string name="sub_seven_allowed_sum">Common in Spanish play, this
lets you trade tiles when as few as 1 are left in the pool.</string>
</resources>

24
xwords4/android/app/src/main/res/xml/prefs_dflts.xml
View file

@ -41,18 +41,6 @@
android:defaultValue="true"
/>
<CheckBoxPreference android:key="@string/key_init_tradeSub7"
android:title="@string/sub_seven_allowed"
android:summary="@string/sub_seven_allowed_sum"
android:defaultValue="false"
/>
<CheckBoxPreference android:key="@string/key_init_dupmodeon"
android:title="@string/offerdupmode_title"
android:summary="@string/offerdupmode_sum"
android:defaultValue="false"
/>
<CheckBoxPreference android:key="@string/key_init_autojuggle"
android:title="@string/init_autojuggle"
android:summary="@string/init_autojuggle_sum"
@ -94,5 +82,17 @@
android:defaultValue="15x15"
/>
<CheckBoxPreference android:key="@string/key_init_tradeSub7"
android:title="@string/sub_seven_allowed"
android:summary="@string/sub_seven_allowed_sum"
android:defaultValue="false"
/>
<CheckBoxPreference android:key="@string/key_init_dupmodeon"
android:title="@string/offerdupmode_title"
android:summary="@string/offerdupmode_sum"
android:defaultValue="false"
/>
</PreferenceCategory>
</PreferenceScreen>

10
xwords4/android/res_src/values-de/strings.xml
View file

@ -1149,4 +1149,12 @@
<string name="sort_by_date_label">Nach Datum sortieren</string>
<string name="no_peers_info">Peer-Informationen nicht verfügbar</string>
<string name="button_refresh">Aktualisieren</string>
</resources>
<string name="sub_seven_allowed">Buchstabenwechsel auch bei
weniger als 7 Restbuchstaben im Säckchen erlauben.</string>
<string name="sub_seven_allowed_sum">Lässt den Buchstabentausch
zu, bis mindestens ein Buchstabenstein im Säckchen übrig ist. In
Spanien eine übliche Regel.</string>
</resources>