changes left out of previous merge commit for some reason

This commit is contained in:
Eric House 2015-08-13 07:24:49 -07:00
parent 0c39c61725
commit fd55d27a63
4 changed files with 13 additions and 1 deletions

View file

@ -411,6 +411,9 @@ public final class R {
*/
public static final int query_trade_fmt=0x7f07000b;
public static final int resend_finished_fmt=0x7f070007;
/** Shown after "resend messages" menuitem chosen
*/
public static final int resent_msgs_fmt=0x7f07001f;
/** Intro to the paragraph listing all of the tiles remaining
*/
public static final int strd_remains_expl_fmt=0x7f07000a;

View file

@ -2562,5 +2562,4 @@
<string name="not_again_clip_expl_fmt">The \"%1$s\" option copies an
invitation URL to the clipboard. Paste it into the app of your
choice and send it to your friend.</string>
</resources>

View file

@ -2181,6 +2181,11 @@
<string name="not_again_comms_bt">Esu Htooteulb ot yalp tsniaga a
ybraen ecived taht\'s \"deriap\" htiw sruoy.</string>
<string name="str_no_hint_found">Tonnac dnif yna sevom</string>
<!-- Shown after "resend messages" menuitem chosen -->
<plurals name="resent_msgs_fmt">
<item quantity="one">Eno egassem tnes</item>
<item quantity="other">%1$s segassem tnes</item>
</plurals>
<!-- EXPERIMENATL: A choice of how to invite, along with SMS,
Bluetooth, email etc -->
<string name="invite_choice_clip">I\'ll esoohc</string>

View file

@ -2181,6 +2181,11 @@
<string name="not_again_comms_bt">USE BLUETOOTH TO PLAY AGAINST A
NEARBY DEVICE THAT\'S \"PAIRED\" WITH YOURS.</string>
<string name="str_no_hint_found">CANNOT FIND ANY MOVES</string>
<!-- Shown after "resend messages" menuitem chosen -->
<plurals name="resent_msgs_fmt">
<item quantity="one">ONE MESSAGE SENT</item>
<item quantity="other">%1$s MESSAGES SENT</item>
</plurals>
<!-- EXPERIMENATL: A choice of how to invite, along with SMS,
Bluetooth, email etc -->
<string name="invite_choice_clip">I\'LL CHOOSE</string>