Merge to head

2012-01-25 21:01:57 -02:00
parent 8c17c6b2d9
commit 11972297b0
92 changed files with 4842 additions and 4388 deletions
@@ -130,10 +130,10 @@ limitations under the License.
        android:text="@string/welcome_delete_all_answer"
        style="@style/WelcomeTextView"/>     
      <TextView
-        android:text="@string/welcome_my_maps_sharing_question"
+        android:text="@string/welcome_maps_sharing_question"
        style="@style/WelcomeTextView.Question"/>
      <TextView
-        android:text="@string/welcome_my_maps_sharing_answer"
+        android:text="@string/welcome_maps_sharing_answer"
        style="@style/WelcomeTextView"/>    
    </LinearLayout>
  </ScrollView>