merge heads

MyTracks/res/layout/mytracks_layout.xml

@@ -41,7 +41,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/wait_for_fix"
+      android:text="@string/status_wait_for_gps_fix"
       android:layout_weight="0"/>
     </LinearLayout>
     <LinearLayout android:id="@+id/busypane"

MyTracks/res/layout/send_to_google_result.xml

@@ -31,7 +31,7 @@ services.
   <TextView
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/status_track_upload_status"
+      android:text="@string/sending_to_google_upload_status"
       style="?android:attr/textAppearanceLarge"/>
   <TableLayout
       android:layout_width="wrap_content"
@@ -52,7 +52,7 @@ services.
       android:id="@+id/send_to_google_result_comment"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/status_mymap_info"
+      android:text="@string/sending_to_google_additional_info"
       android:visibility="gone"
       style="?android:attr/textAppearanceSmall"/>
   <TextView