Merged to head

This commit is contained in:
Rodrigo Damazio
2011-11-14 23:27:04 -02:00
parent a4ae9e8fd5
commit c3cda97692
193 changed files with 8457 additions and 11274 deletions
+11 -6
View File
@@ -31,12 +31,12 @@ limitations under the License.
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/app_name"
android:text="@string/my_tracks_app_name"
android:textSize="30sp" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_copyright_message"
android:text="@string/about_copyright_notice"
android:textSize="15sp" />
</LinearLayout>
</TableRow>
@@ -67,6 +67,11 @@ limitations under the License.
android:layout_width="wrap_content"
android:text="@string/about_dylan"
android:textSize="20sp" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_jimmy"
android:textSize="20sp" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -75,7 +80,7 @@ limitations under the License.
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_rdamazio"
android:text="@string/about_rodrigo"
android:textSize="20sp" />
<TextView
android:layout_height="wrap_content"
@@ -100,7 +105,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:id="@+id/about_version_register"
android:layout_width="wrap_content"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textSize="20sp" />
</TableRow>
@@ -119,7 +124,7 @@ limitations under the License.
android:autoLink="web"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_weburl"
android:text="@string/my_tracks_web_url"
android:textSize="18sp" />
</TableRow>
@@ -138,7 +143,7 @@ limitations under the License.
android:autoLink="web"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_privacy_weburl"
android:text="@string/my_tracks_privacy_url"
android:textSize="18sp" />
</TableRow>