Merge branch 'origin/android_branch' into Weblate.

xwords4/android/app/src/main/res/values/strings.xml

@@ -1498,7 +1498,7 @@
     <string name="about_devid_fmt">Device ID: %1$s</string>
     <!-- string to display device's bluetooth Mac address, if
          known. Shown only on debug builds -->
-    <string name="about_btaddr_fmt">BT Mac Addr: %1$s</string>
+    <string name="about_btaddr_fmt">BT MAC Addr: %1$s</string>
     <!-- copyright info -->
     <string name="about_copyright">CrossWords for Android \nCopyright
     (C) 1998-2021 by Eric House. This free/open source software is
@@ -2621,11 +2621,9 @@
     the person’s name is listed, just select it and an invitation will
     be sent immediately.
     </string>
-
     <!-- Default title of notification sent via FCM from
          relay. Currently I use this only for testing.  -->
     <string name="remote_msg_title">Remote message</string>
-
     <!-- MQTT stuff. May not see the light of day -->
     <string name="invite_choice_mqtt">Internet/MQTT</string>
     <string name="mqtt_invite_title">MQTT Invitation</string>
@@ -2656,7 +2654,6 @@
          happen because the name is in use) -->
     <string name="knowns_dup_name_fmt">Unable to change name from
     “%1$s” to “%2$s”. Is “%2$s” already in use?</string>
-
     <!-- Quick-start new game explanations and buttons -->
     <string name="choose_expl_default">Start a solo game using the
     current defaults</string>
@@ -2666,18 +2663,14 @@
     played before, no invitation required</string>
     <string name="choose_expl_config">OR start a game after configuring
     it, e.g. to change the language or number of players</string>
-
     <string name="newgame_radio_known">Invite Known Player</string>
     <string name="newgame_radio_unknown">Invite New Player</string>
-
     <!-- Button text depending on the radio button chosen.  -->
     <string name="newgame_open_game">Start game</string>
     <string name="newgame_invite_fmt">Start game with %1$s</string>
     <string name="newgame_configure_game">Configure game</string>
-
     <!-- Text of second of two buttons for new standalone games.
          Tap this and you'll get taken to the "Game configure"
          screen -->
     <string name="newgame_configure_first">Configure first</string>
-
 </resources>

xwords4/android/res_src/values-nb-rNO/strings.xml

@@ -1014,4 +1014,20 @@
     <string name="invite_msg_extra_rematch">Med omkamper, vil alle nødvendige invitasjoner sendes automatisk. Du kan alltids sende nye hvis motstanderen ikke svarer.</string>
     <string name="invite_msg_extra">Du vil se denne meldingen til alle forventede spillere har koblet til. Hvis du allerede har sendt en invitasjon og antar at den har gått tapt, er det ingen skade i å sende en ny.</string>
     <string name="use_duptimer">Skru på tidsur for hvert trekk</string>
+    <string name="name_concat_dup">" og "</string>
+    <string name="game_paused_title">Spill på pause</string>
+    <string name="game_unpaused_title">Spillpause opphevet</string>
+    <string name="no_tiles_exist">Kan ikke skrive «%1$s» med %2$s flis.</string>
+    <string name="newgame_configure_game">Sett opp spill</string>
+    <string name="newgame_invite_fmt">Start spill med %1$s</string>
+    <string name="newgame_open_game">Start spill</string>
+    <string name="newgame_radio_unknown">Inviter ny spiller</string>
+    <string name="newgame_radio_known">Inviter kjent spiller</string>
+    <string name="knowns_ts_fmt">Nyeste spill:</string>
+    <string name="servicedesc">For overføring av CrossWords-trekk</string>
+    <string name="list_item_markbad">Marker som skadet</string>
+    <string name="enable_pending_count_title">Vis ventende meldinger</string>
+    <string name="dict_avail_fmt">Trykk for å laste ned ordlisten «%1$s»</string>
+    <string name="button_disable_bt">Skru av Blåtannsspilling</string>
+    <string name="filter_progress_fmt">Behandler %1$d ord</string>
 </resources>