diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index 88d48bf8f..42e75f966 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -17,8 +17,6 @@ ############################################################ --> - - Add game Add group @@ -124,9 +122,6 @@ # Context menu for main games-list screen ############################################################ --> - - \"%1$s\" actions: @@ -862,10 +857,6 @@ Human player - - Not used yet… - Wordlists @@ -1148,43 +1139,11 @@ # types of supported games, standalone and networked. ############################################################ --> - - New Local-only game - - - Create a new game where all - players will be on this device. To play against a robot and - with your default settings (in %1$s, etc.) just press \"Play - now\". To add players or change game settings, press - \"Configure first\". - - - Play now Configure first - - New Networked game - - - Create a game that will be - played over the network. The \"Invite now\" button starts a - two-device game and helps you invite a friend to join it. Or - press \"Configure first\" to change some of the defaults before - you start your networked game. (You\'ll have a chance to send - invites later.) - - New Bluetooth game - @@ -1245,12 +1200,6 @@ (full link: %1$s ) - - Let\'s play Crosswords! Join this game: - %1$s . - Send invitation via %1$s email - sms @@ -1308,13 +1256,6 @@ Clear history - - Player name - - - Advanced game settings - This game cannot connect without a @@ -1423,13 +1364,6 @@ Wordlist not found - - A wordlist this game is using has - disappeared. (Usually this means it\'s on an external card that - is no longer available.) - Close game @@ -1819,12 +1753,8 @@ First letters - Undo last\u200C - Pick %1$d for me - Tile picker\n(so far: %1$s) - Pick tiles face-up @@ -1905,10 +1835,6 @@ using SMS. One of you may need to upgrade before you can continue. - - Invitation via Bluetooth - - One or more moves has arrived Please check the device @@ -1934,21 +1860,12 @@ Relay Invitation WiFi Direct Invitation - - Bluetooth game name - - Name your game New game name: - %1$s copy - - New SMS Game - SMS Game %1$X - %1$s has invited you to play Import contact @@ -2011,10 +1928,6 @@ Are you sure you want to delete the checked device[s]? - Connection (via SMS/text) - - Connected number[s]: - Game in play with %1$s Are you certain this number is on an @@ -2038,8 +1951,6 @@ Flip board - Zoom in/out - Chat %1$s: @@ -2243,8 +2154,6 @@ Move selected games to: - Wordlist browser - Message from relay Tapping a game opens it.\n\nYou @@ -2273,8 +2182,6 @@ Launch Settings - Tap the receiving device now - @@ -2335,8 +2242,6 @@ Enable local translating Add option to every screen menu - SMS Data is only available on GSM phones. - Filter by: Search for: All @@ -2380,7 +2285,6 @@ Processing wordlist information… Unable to fetch wordlist information from server. - Get info Delete wordlist[s] @@ -2562,15 +2466,12 @@ For debugging You should never need these... Relay host - Invite redirect host Wordlist download URL Enable logging (release builds only) Enable debug features Menuitems etc. (release builds only) - Send SMS as data - (GSM phones only) Network stats Show invites Game network stats @@ -2715,10 +2616,6 @@ I hope you like it. If you don\'t you can disable it below or in App Settings. - - - - Disable side-by-side This change will take effect after you restart Crosswords. diff --git a/xwords4/android/scripts/strings_check.sh b/xwords4/android/scripts/strings_check.sh index 4c0b4e87c..fe1cff048 100755 --- a/xwords4/android/scripts/strings_check.sh +++ b/xwords4/android/scripts/strings_check.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -u -e @@ -66,6 +66,8 @@ if [ -n "$PAIRS_ONLY" ]; then exit 0 fi +rm -f app/src/main/java/org/eehouse/android/xw4/loc/LocIDsData.java + # echo "checking $ENG for ids not in any .java file" for LOC in $LOCS; do for ID in $(list_ids $LOC); do @@ -77,9 +79,9 @@ echo "searching for ${#ENG_IDS[*]} unique string ids" if [ -n "$SEARCH_SOURCE" ]; then IDS="${!ENG_IDS[*]}" for ID in $IDS; do - if grep -qw R.string.$ID $(find . -name '*.java'); then + if grep -qw R.string.$ID $(find app/src/ -name '*.java'); then : - elif grep -qw "@string/$ID" $(find . -name '*.xml'); then + elif grep -qw "@string/$ID" $(find app/src/ -name '*.xml'); then : else echo "$ID appears to be unused"