Merge branch 'android_branch' into french_xlation

Conflicts:
	xwords4/android/XWords4/res/values/strings.xml

xwords4/android/XWords4/res/layout/new_game.xml

@@ -28,12 +28,23 @@
               android:textAppearance="?android:attr/textAppearanceMedium"
               android:text="@string/newgame_local_header"
               />
+    <LinearLayout android:orientation="horizontal"
+                  android:layout_width="fill_parent" 
+                  android:layout_height="wrap_content"
+                  android:layout_marginTop="10dip"
+                  android:layout_marginBottom="10dip"
+                  >
+      <ImageView android:src="@drawable/sologame"
+                 android:layout_width="wrap_content"
+	             android:layout_height="wrap_content"
+                 android:layout_weight="0"
+                 android:layout_gravity="center_vertical|center_horizontal"
+                 />
+      <TextView android:id="@+id/newgame_local_desc"
+                style="@style/relay_explain"
+                />
+    </LinearLayout>
 
-    <TextView android:id="@+id/newgame_local_desc"
-              android:layout_marginTop="10dip"
-              android:layout_marginBottom="10dip"
-              style="@style/relay_explain"
-              />
     <LinearLayout android:orientation="horizontal"
                   android:layout_width="fill_parent" 
                   android:layout_height="wrap_content"
@@ -52,17 +63,28 @@
               />
     </LinearLayout>
 
-
     <TextView style="@style/config_separator"
               android:layout_marginTop="10dip"
               android:textAppearance="?android:attr/textAppearanceMedium"
               android:text="@string/newgame_networked_header"
               />
-    <TextView android:text="@string/newgame_networked_desc"
+
-              android:layout_marginTop="10dip"
+    <LinearLayout android:orientation="horizontal"
-              android:layout_marginBottom="10dip"
+                  android:layout_width="fill_parent" 
-              style="@style/relay_explain"
+                  android:layout_height="wrap_content"
-              />
+                  android:layout_marginTop="10dip"
+                  android:layout_marginBottom="10dip"
+                  >
+      <ImageView android:src="@drawable/relaygame"
+                 android:layout_width="wrap_content"
+	             android:layout_height="wrap_content"
+                 android:layout_weight="0"
+                 android:layout_gravity="center_vertical|center_horizontal"
+                 />
+      <TextView android:text="@string/newgame_networked_desc"
+                style="@style/relay_explain"
+                />
+    </LinearLayout>
 
     <LinearLayout android:orientation="horizontal"
                   android:layout_width="fill_parent" 

xwords4/android/XWords4/res/values/common_rsrc.xml

@@ -32,7 +32,7 @@
   <string name="key_relay_port">key_relay_port2</string>
   <string name="key_proxy_port">key_proxy_port</string>
   <string name="key_sms_port">key_sms_port</string>
-  <string name="key_dict_host">key_dict_host2</string>
+  <string name="key_dict_host">key_dict_host3</string>
   <string name="key_logging_on">key_logging_on</string>
   <string name="key_init_hintsallowed">key_init_hintsallowed</string>
   <string name="key_init_autojuggle">key_init_autojuggle</string>
@@ -77,7 +77,7 @@
   <string name="default_host">eehouse.org</string>
 
   <!-- <string name="default_host">10.0.2.2</string> -->
-  <string name="dict_url">http://eehouse.org/and_dicts_hh</string>
+  <string name="dict_url">http://eehouse.org/and_wordlists</string>
   <string name="app_version">4.4 beta 33</string>
   <string name="game_url_pathf">//%1$s/redir.php</string>
 
@@ -86,7 +86,7 @@
   <string name="advanced_summary">You should never need these...</string>
   <string name="relay_host">Relay host</string>
   <string name="redir_host">Invite redirect host</string>
-  <string name="dict_host">Dictionary download URL</string>
+  <string name="dict_host">Wordlist download URL</string>
   <string name="logging_on">Enable logging</string>
   <string name="relay_port">Relay game port</string>
   <string name="proxy_port">Relay device port</string>

xwords4/android/XWords4/res/values/strings.xml

@@ -307,7 +307,7 @@
     <string name="network_behavior">Network game settings</string>
     <string name="network_behavior_summary">Settings that apply to
         networked games</string>
-    <string name="connect_frequency">Move check frequency</string>
+    <string name="connect_frequency">Background move check</string>
 	<string name="notify_sound">Play sound</string>
 	<string name="notify_vibrate">Vibrate</string>
 	<string name="notify_other_summary">When opponent moves arrive</string>
@@ -619,14 +619,13 @@
     <string name="changes_title">Recent changes</string>
     <string name="changes_button">Recent changes</string>
 
-	<string name="connect_thirty_seconds">60 seconds</string>
+	<string name="connect_never">Never check</string>
-	<string name="connect_five_mins">5 minutes</string>
+	<string name="connect_five_mins">Every 5 minutes</string>
-	<string name="connect_fifteen_mins">15 minutes</string>
+	<string name="connect_fifteen_mins">Every 15 minutes</string>
-	<string name="connect_thirty_mins">30 minutes</string>
+	<string name="connect_thirty_mins">Every 30 minutes</string>
-	<string name="connect_one_hour">Hourly</string>
+	<string name="connect_one_hour">Every hour</string>
 	<string name="connect_six_hours">Every six hours</string>
 	<string name="connect_daily">Once every day</string>
-	<string name="connect_never">Never check</string>
 
 
     <string name="public_names_progress">Fetching public rooms for

xwords4/common/mscore.c

@@ -339,6 +339,7 @@ modelIsEmptyAt( const ModelCtxt* model, XP_U16 col, XP_U16 row )
 static XP_Bool
 isLegalMove( ModelCtxt* model, MoveInfo* mInfo, XP_Bool silent )
 {
+    XP_Bool result = XP_TRUE;
     XP_S16 high, low;
     XP_S16 col, row;
     XP_S16* incr;
@@ -376,11 +377,12 @@ isLegalMove( ModelCtxt* model, MoveInfo* mInfo, XP_Bool silent )
                 if ( !silent ) {
                     util_userError( model->vol.util, ERR_NO_EMPTIES_IN_TURN );
                 }
-                return XP_FALSE;
+                result = XP_FALSE;
+                goto exit;
             }
         }
         XP_ASSERT( newTile == &moves[nTiles] );
-        return XP_TRUE;
+        goto exit;
 
         /* else we're looking at 2b: make sure there's some contact UNLESS
            this is the first move */
@@ -389,13 +391,13 @@ isLegalMove( ModelCtxt* model, MoveInfo* mInfo, XP_Bool silent )
         if ( low != 0 ) {
             *incr = low - 1;
             if ( !modelIsEmptyAt( model, col, row ) ) {
-                return XP_TRUE;
+                goto exit;
             }
         }
         if ( high != MAX_ROWS-1 ) {
             *incr = high+1;
             if ( !modelIsEmptyAt( model, col, row ) ) {
-                return XP_TRUE;
+                goto exit;
             }
         }
         /* now the neighbors above... */
@@ -403,7 +405,7 @@ isLegalMove( ModelCtxt* model, MoveInfo* mInfo, XP_Bool silent )
             --*commonP; /* decrement whatever's not being looped over */
             for ( *incr = low; *incr <= high; ++*incr ) {
                 if ( !modelIsEmptyAt( model, col, row ) ) {
-                    return XP_TRUE;
+                    goto exit;
                 }
             }
             ++*commonP;/* undo the decrement */
@@ -413,7 +415,7 @@ isLegalMove( ModelCtxt* model, MoveInfo* mInfo, XP_Bool silent )
             ++*commonP;
             for ( *incr = low; *incr <= high; ++*incr ) {
                 if ( !modelIsEmptyAt( model, col, row ) ) {
-                    return XP_TRUE;
+                    goto exit;
                 }
             }
             --*commonP;
@@ -424,22 +426,25 @@ isLegalMove( ModelCtxt* model, MoveInfo* mInfo, XP_Bool silent )
         if ( ( commonCoord == star_row) && 
              ( low <= star_row) && ( high >= star_row ) ) {
             if ( nTiles > 1 ) {
-                return XP_TRUE;
+                goto exit;
             } else {
                 if ( !silent ) {
                     util_userError(model->vol.util, ERR_TWO_TILES_FIRST_MOVE);
                 }
-                return XP_FALSE;
+                result = XP_FALSE;
+                goto exit;
             }
         } else {
             if ( !silent ) {
                 util_userError( model->vol.util, ERR_TILES_MUST_CONTACT );
             }
-            return XP_FALSE;
+            result = XP_FALSE;
+            goto exit;
         }
     }
-    XP_ASSERT( XP_FALSE );
+    XP_ASSERT( XP_FALSE );      /* should not get here */
-    return XP_FALSE; /* keep compiler happy */
+ exit:
+    return result;
 } /* isLegalMove */
 
 XP_U16