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

Merge branch 'android_branch' into french_xlation

Browse source
This commit is contained in:
eehouse@eehouse.org 2011-08-21 15:03:57 -07:00 • committed by Andy2
commit abe270d45c
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/android/XWords4/res/values/strings.xml
View file

@ -455,10 +455,11 @@
<string name="players_label_host">Players (%1$d local, %2$d
off-device)</string>
<string name="dicts_item_move">Move wordlist</string>
<string name="dicts_item_move">Change storage location</string>
<string name="dicts_item_select">Make default</string>
<string name="dicts_item_details">Details</string>
<string name="move_dictf">Move wordlist %1$s from %2$s to %3$s?</string>
<string name="move_dictf">Move wordlist %1$s from %2$s to %3$s
storage?</string>
<string name="set_default_messagef">For what players should this
wordlist be the default for new games? (The language %s will be
the default for both.)</string>

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -678,6 +678,7 @@ public class GameUtils {
public static void deleteDict( Context context, String name )
{
name = addDictExtn( name );
deleteDict( context, name, getDictLoc( context, name ) );
}
@ -798,7 +799,8 @@ public class GameUtils {
fos.close();
success = true;
} catch ( java.io.FileNotFoundException fnf ) {
Utils.logf( "saveDict: FileNotFoundException: %s", fnf.toString() );
Utils.logf( "saveDict: FileNotFoundException: %s",
fnf.toString() );
} catch ( java.io.IOException ioe ) {
Utils.logf( "saveDict: IOException: %s", ioe.toString() );
deleteDict( context, name );