Update AndroidManifest.xml versionCode and versionName

for the next release.

.hgignore

@@ -2,4 +2,10 @@ syntax:glob
 
 */bin
 */gen/**
+*/proguard/**
 .metadata
+MyTracksTest/annotations.log
+**/*.pyc
+**/*.pyo
+syntax: glob
+MyTracksTest/hs_err_pid*.log

MyTracks/.classpath

@@ -1,10 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
-	<classpathentry kind="lib" path="libs/google-common.jar"/>
-	<classpathentry kind="lib" path="libs/accounts.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
+	<classpathentry kind="lib" path="libs/google-common.jar"/>
+	<classpathentry kind="lib" path="libs/libGoogleAnalytics.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/commons-codec-1.3.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/google-api-client-1.5.0-beta.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/google-http-client-1.5.0-beta.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/google-oauth-client-1.5.0-beta.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/gson-1.6.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/guava-r09.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/jackson-core-asl-1.6.7.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/jsr305-1.3.9.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
+	<classpathentry kind="src" path="MyTracksLib_src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

MyTracks/.project

@@ -1,33 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>MyTracks</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>MyTracks</name>
+	<comment></comment>
+	<projects>
+		<project>MyTracksLib</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>MyTracksLib_src</name>
+			<type>2</type>
+			<locationURI>_android_MyTracksLib_e2802071/src</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>

MyTracks/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Thu Aug 12 18:54:52 BRT 2010
+#Thu Jul 21 03:01:59 BRT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -7,6 +7,343 @@ org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=48
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=48
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=2
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

MyTracks/.settings/org.eclipse.jdt.ui.prefs

@@ -0,0 +1,61 @@
+#Thu Jul 21 03:04:13 BRT 2011
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_MyTracks
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=com;android;java;javax;org;
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

MyTracks/AndroidManifest.xml

@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.maps.mytracks"
-          android:versionCode="18"
-          android:versionName="1.0.17">
+          android:installLocation="auto"
+          android:versionCode="33"
+          android:versionName="1.1.10">
   <application android:icon="@drawable/arrow_icon"
                android:label="@string/app_name"
+               android:name="com.google.android.apps.mytracks.MyTracksApplication"
                android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">
     <uses-library android:name="com.google.android.maps" />
 
@@ -12,8 +29,10 @@
                android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
 
     <provider android:name="com.google.android.apps.mytracks.content.MyTracksProvider"
-              android:multiprocess="true"
-              android:authorities="com.google.android.maps.mytracks" />
+              android:authorities="com.google.android.maps.mytracks"
+              android:exported="true"
+              android:readPermission="com.google.android.apps.mytracks.READ_TRACK_DATA"
+              android:writePermission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
 
     <activity android:name="com.google.android.apps.mytracks.MyTracks"
               android:label="My Tracks"
@@ -26,6 +45,120 @@
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
+      </intent-filter>
+    </activity>
+
+    <activity android:name="com.google.android.apps.mytracks.MapActivity"
+              android:label="MyTracks"
+              android:exported="false">
+      <intent-filter>
+        <category android:name="android.intent.category.TAB" />
+      </intent-filter>
+    </activity>
+
+    <activity android:name="com.google.android.apps.mytracks.MyMapsList"
+              android:label="@string/map_list_title"
+              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
+              android:exported="false" />
+
+    <!-- TODO: VIEW and PICK for track cursor dir -->
+    <activity android:name="com.google.android.apps.mytracks.TrackList"
+              android:label="Recorded Tracks" />
+
+    <!-- TODO: VIEW and PICK for waypoint cursor dir -->
+    <activity android:name="com.google.android.apps.mytracks.WaypointsList"
+              android:label="Recorded Waypoints" />
+
+    <activity android:name="com.google.android.apps.mytracks.TrackDetails"
+              android:label="@string/trackdetails_title">
+      <intent-filter>
+        <action android:name="android.intent.action.EDIT" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
+      </intent-filter>
+    </activity>
+
+    <activity android:name="com.google.android.apps.mytracks.DeleteTrack"
+              android:label="@string/deletetrack_title"
+              android:theme="@android:style/Theme.Translucent.NoTitleBar"
+              android:noHistory="true">
+      <intent-filter>
+        <action android:name="android.intent.action.DELETE" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
+      </intent-filter>
+    </activity>
+
+    <activity android:name="com.google.android.apps.mytracks.WaypointDetails"
+              android:label="@string/waypointdetails_title">
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <action android:name="android.intent.action.EDIT" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.waypoint" />
+      </intent-filter>
+    </activity>
+
+    <activity android:name="com.google.android.apps.mytracks.SettingsActivity"
+              android:label="@string/mytracks_settings" >
+      <intent-filter>
+        <category android:name="android.intent.category.PREFERENCE" />
+      </intent-filter>
+    </activity>
+
+    <activity android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
+              android:label="@string/aggregated_stats" />
+
+    <activity android:name="com.google.android.apps.mytracks.StatsActivity"
+              android:label="@string/statistics"
+              android:exported="false">
+      <intent-filter>
+        <category android:name="android.intent.category.TAB" />
+      </intent-filter>
+    </activity>
+
+    <activity android:name="com.google.android.apps.mytracks.SensorStateActivity"
+              android:label="@string/sensor_state" />
+
+    <activity android:name="com.google.android.apps.mytracks.ChartActivity"
+              android:label="@string/elevation_label"
+              android:exported="false">
+      <intent-filter>
+        <category android:name="android.intent.category.TAB" />
+      </intent-filter>
+    </activity>
+
+    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.SendActivity"
+              android:label="@string/sendtogoogle_title"
+              android:theme="@android:style/Theme.Translucent.NoTitleBar">
+      <intent-filter>
+        <action android:name="android.intent.action.SEND" />
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
+      </intent-filter>
+    </activity>
+
+    <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
+              android:label="@string/tracklist_write_to_sd"
+              android:theme="@android:style/Theme.Translucent.NoTitleBar"
+              android:noHistory="true">
+      <intent-filter>
+        <action android:name="android.intent.action.SAVE" />
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
+      </intent-filter>
+    </activity>
+
+    <activity android:name="com.google.android.apps.mytracks.io.file.ImportActivity"
+              android:label="@string/import_title"
+              android:theme="@android:style/Theme.Translucent.NoTitleBar"
+              android:noHistory="true">
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <action android:name="android.intent.action.ATTACH_DATA" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
         <data android:scheme="file" />
         <data android:mimeType="application/gpx+xml" />
         <data android:mimeType="application/gpx" />
@@ -34,67 +167,117 @@
       </intent-filter>
     </activity>
 
-    <activity android:name="com.google.android.apps.mytracks.MyTracksMap"
-              android:label="MyTracks" />
-
-    <activity android:name="com.google.android.apps.mymaps.MyMapsList"
-              android:label="@string/map_list_title"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale" />
-
-    <activity android:name="com.google.android.apps.mytracks.MyTracksList"
-              android:label="Recorded Tracks" />
-
-    <activity android:name="com.google.android.apps.mytracks.MyTracksWaypointsList"
-              android:label="Recorded Waypoints" />
-
-    <activity android:name="com.google.android.apps.mytracks.MyTracksDetails"
-              android:label="@string/trackdetails_title" />
-
-    <activity android:name="com.google.android.apps.mytracks.MyTracksWaypointDetails"
-              android:label="@string/waypointdetails_title" />
-
-    <activity android:name="com.google.android.apps.mytracks.MyTracksSettings"
-              android:label="@string/mytracks_settings" />
-
-    <activity android:name="com.google.android.apps.mytracks.StatsActivity"
-              android:label="@string/statistics"/>
-
-    <activity android:name="com.google.android.apps.mytracks.ChartActivity"
-              android:label="@string/elevation_label"/>
-
     <activity android:name="com.google.android.apps.mytracks.WelcomeActivity"
-              android:label="@string/welcome"/>
+              android:label="@string/welcome"
+              android:exported="false" />
 
     <service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
-             android:process=":trackrecord"
              android:label="Track Recording Service"
              android:icon="@drawable/arrow_320"
              android:enabled="true"
-             android:exported="true" />
+             android:exported="true"
+             android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
 
+    <service android:name="com.google.android.apps.mytracks.services.ControlRecordingService"
+             android:exported="false" />
+             
+    <receiver android:name="com.google.android.apps.mytracks.BootReceiver">
+      <intent-filter>
+        <action android:name="android.intent.action.BOOT_COMPLETED" />
+      </intent-filter>
+    </receiver>
+
+    <receiver android:name="com.google.android.apps.mytracks.widgets.TrackWidgetProvider">
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+        <action android:name="com.google.android.apps.mytracks.TRACK_STARTED" />
+        <action android:name="com.google.android.apps.mytracks.TRACK_STOPPED" />
+      </intent-filter>
+      <meta-data android:name="android.appwidget.provider"
+                 android:resource="@xml/track_widget_info" />
+    </receiver>
   </application>
 
+  <!-- Permissions to initialize service -->
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
   <!-- Permissions for recording tracks and showing maps -->
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
+  <uses-permission android:name="android.permission.BLUETOOTH" />
+  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+  <uses-permission android:name="com.dsi.ant.permission.ANT" />
+  <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
 
   <!-- Permissions for uploading tracks -->
   <uses-permission android:name="android.permission.GET_ACCOUNTS" />
   <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
   <uses-permission android:name="android.permission.USE_CREDENTIALS" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
+  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.fusiontables" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.local" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
   <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
 
+  <!-- Permissions for misc services -->
+  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+  <!-- Exported permissions (for other apps to use our features) -->
+  <!-- Permission to get track start/end broadcasts -->
+  <permission android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS"
+              android:permissionGroup="android.permission-group.LOCATION"
+              android:label="@string/notification_permission_label"
+              android:description="@string/notification_permission_description"
+              android:protectionLevel="dangerous" />
+  <!-- Permission to read raw track data (points, etc.) -->
+  <permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA"
+              android:permissionGroup="android.permission-group.LOCATION"
+              android:label="@string/read_tracks_permission_label"
+              android:description="@string/read_tracks_permission_description"
+              android:protectionLevel="dangerous" />
+  <!-- Permission to write track data, either raw or by making service calls -->
+  <permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
+              android:permissionGroup="android.permission-group.LOCATION"
+              android:label="@string/write_tracks_permission_label"
+              android:description="@string/write_tracks_permission_description"
+              android:protectionLevel="dangerous" />
+
+  <!-- Permission to get MyTracks broadcasts. For internal MyTracks communication. -->
+  <permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
+              android:permissionGroup="android.permission-group.LOCATION"
+              android:label="@string/mytracks_notifications_permission_label"
+              android:description="@string/mytracks_notifications_permission_description"
+              android:protectionLevel="signature" />
+
+  <!-- We read and write raw track data, obviously. -->
+  <uses-permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA" />
+  <uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
+  <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
+
+  <!-- Features required -->
+  <uses-feature android:name="android.hardware.location" android:required="true"/>
+  <uses-feature android:name="android.hardware.location.gps" android:required="true"/>
+
+  <!-- Features optional -->
+  <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+  <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
+  <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+  <uses-feature android:name="android.hardware.sensor.compass" android:required="false"/>
+  <uses-feature android:name="android.hardware.telephony" android:required="false"/>
+  <uses-feature android:name="android.hardware.telephony.gsm" android:required="false"/>
+  <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+  <uses-feature android:name="android.hardware.touchscreen.multitouch" android:required="false"/>
+
   <uses-sdk android:minSdkVersion="3"/>
   <supports-screens
+          android:xlargeScreens="true"
           android:largeScreens="true"
           android:normalScreens="true"
           android:smallScreens="true"
           android:anyDensity="true" />
 </manifest>
-

MyTracks/MyTracks.launch

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <launchConfiguration type="com.android.ide.eclipse.adt.debug.LaunchConfigType">
 <intAttribute key="com.android.ide.eclipse.adt.action" value="0"/>
 <stringAttribute key="com.android.ide.eclipse.adt.commandline" value=""/>
@@ -9,13 +9,15 @@
 <booleanAttribute key="com.android.ide.eclipse.adt.wipedata" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/MyTracks"/>
+<listEntry value="/MyTracks/AndroidManifest.xml"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
+<listEntry value="1"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MyTracks"/>

MyTracks/default.properties

@@ -10,4 +10,8 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:13
+android.library.reference.1=../MyTracksLib/
+
+# Enable proguard.
+proguard.config=proguard.cfg

MyTracks/libs/README.txt

@@ -0,0 +1,22 @@
+The libraries contained here in binary format are licensed according to their
+own licenses, which allow their usage for the My Tracks application. Any other
+applications that wish to use these files should consult the appropriate
+licenses or the JAR's authors.
+
+google-api-client/
+- see http://code.google.com/p/google-api-java-client/.
+- contains Google API client library, google-api-client-1.5.0-beta.jar, and its
+  dependencies.
+- google-api-client-1.5.0-beta.jar depends on protobuf-java-2.2.0.jar, however,
+  MyTracksLib already includes protobuf-java.2.3.0-lite.jar. Thus using the
+  newer version, protobuf-java.2.3.0-lite.jar.
+- google-api-client-1.5.0-beta.jar also depends on xpp3-1.1.4c.jar, however,
+  some of its classes are already included in the android framework, thus not
+  including xpp3-1.1.4c.jar.
+
+google-common.jar
+
+googleloginclient-helper.jar
+
+libGoogleAnalytics.jar
+- see http://code.google.com/mobile/analytics/docs/.

MyTracks/proguard.cfg

@@ -0,0 +1,69 @@
+-target 6
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+# Add the libraries, but ignore warnings about them
+-libraryjars libs
+-libraryjars ../MyTracksLib/libs
+-dontwarn com.google.android.googleapps.**
+-dontwarn com.android.common.**
+-dontwarn com.google.android.gsf.**
+-dontwarn org.codehaus.**
+-dontwarn com.google.appengine.**
+-dontwarn org.apache.avalon.framework.logger.**
+-dontwarn org.apache.log.**
+-dontwarn org.apache.log4j.**
+-dontwarn javax.servlet.**
+
+# Make our stack traces useful
+# Line numbers will be correct, file names will be replaced by "MT" since the
+# class name is enough to get the file name.
+-renamesourcefileattribute MT
+-keepattributes SourceFile,LineNumberTable
+
+# Keep everything android references from XMLs
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.app.backup.BackupAgent
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keepclasseswithmembernames class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembernames class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
+# Needed by google-api-client to keep generic types and @Key annotations accessed via reflection
+
+-keepclassmembers class * {
+  @com.google.api.client.util.Key <fields>;
+}
+
+-keepattributes Signature,RuntimeVisibleAnnotations,AnnotationDefault
+
+# Needed by Guava
+
+-dontwarn sun.misc.Unsafe

MyTracks/res/drawable/left_arrow_chart_stateful.xml

@@ -17,11 +17,11 @@ limitations under the License.
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
   <item android:state_window_focused="false"
-      android:drawable="@drawable/btn_arrow_left_default" />
+        android:drawable="@drawable/left_arrow_chart" />
 
   <item android:state_pressed="true"
-      android:drawable="@drawable/btn_arrow_left_press" />
+        android:drawable="@drawable/left_arrow_chart_press" />
 
-  <item android:drawable="@drawable/btn_arrow_left_default" />
+  <item android:drawable="@drawable/left_arrow_chart" />
 
 </selector>

MyTracks/res/drawable/left_arrow_stats_stateful.xml

@@ -17,11 +17,11 @@ limitations under the License.
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
   <item android:state_window_focused="false"
-      android:drawable="@drawable/btn_arrow_right_default" />
+        android:drawable="@drawable/left_arrow_stats" />
 
   <item android:state_pressed="true"
-      android:drawable="@drawable/btn_arrow_right_press" />
+        android:drawable="@drawable/left_arrow_stats_press" />
 
-  <item android:drawable="@drawable/btn_arrow_right_default" />
+  <item android:drawable="@drawable/left_arrow_stats" />
 
 </selector>

MyTracks/res/drawable/left_arrow_track_stateful.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/left_arrow_track" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/left_arrow_track_press" />
+
+  <item android:drawable="@drawable/left_arrow_track" />
+
+</selector>

MyTracks/res/drawable/right_arrow_chart_stateful.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/right_arrow_chart" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/right_arrow_chart_press" />
+
+  <item android:drawable="@drawable/right_arrow_chart" />
+
+</selector>

MyTracks/res/drawable/right_arrow_stats_stateful.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/right_arrow_stats" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/right_arrow_stats_press" />
+
+  <item android:drawable="@drawable/right_arrow_stats" />
+
+</selector>

MyTracks/res/drawable/right_arrow_track_stateful.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/right_arrow_track" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/right_arrow_track_press" />
+
+  <item android:drawable="@drawable/right_arrow_track" />
+
+</selector>

MyTracks/res/layout/about.xml

@@ -41,8 +41,7 @@ limitations under the License.
     </LinearLayout>
   </TableRow>
 
-  <View
-    android:layout_height="2dip" />
+  <View android:layout_height="2dip" />
 
   <TableRow>
     <TextView
@@ -58,6 +57,11 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:orientation="vertical">
+      <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_bart"
+        android:textSize="20sp" />
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
@@ -81,8 +85,7 @@ limitations under the License.
     </LinearLayout>
   </TableRow>
 
-  <View
-    android:layout_height="2dip" />
+  <View android:layout_height="2dip" />
 
   <TableRow>
     <TextView
@@ -101,8 +104,7 @@ limitations under the License.
       android:textSize="20sp" />
   </TableRow>
 
-  <View
-    android:layout_height="2dip" />
+  <View android:layout_height="2dip" />
 
   <TableRow>
     <TextView
@@ -121,7 +123,25 @@ limitations under the License.
       android:textSize="18sp" />
   </TableRow>
 
-  <View
-    android:layout_height="4dip" />
+  <View android:layout_height="2dip" />
+  
+  <TableRow>
+    <TextView
+      android:paddingLeft="10dip"
+      android:paddingRight="10dip"
+      android:layout_column="1"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/about_privacy"
+      android:textSize="20sp" />
+    <TextView
+      android:autoLink="web"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/about_privacy_weburl"
+      android:textSize="18sp" />
+  </TableRow>
+  
+  <View android:layout_height="4dip" />
 
 </TableLayout>

MyTracks/res/layout/chart_settings.xml

@@ -103,6 +103,21 @@ limitations under the License.
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:text="@string/speed"/>
+          <CheckBox android:id="@+id/chart_settings_power"
+            android:checked="true"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/power"/>
+          <CheckBox android:id="@+id/chart_settings_cadence"
+            android:checked="true"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/cadence"/>
+          <CheckBox android:id="@+id/chart_settings_heart_rate"
+            android:checked="true"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/heart_rate"/>
         </LinearLayout>
       </TableRow>
     </TableLayout>

MyTracks/res/layout/mytracks_charts.xml

@@ -30,13 +30,15 @@ limitations under the License.
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:padding="10dip"
     android:layout_weight="0">
     <ZoomControls android:id="@+id/elevation_zoom"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
       android:layout_alignParentBottom="true"
-      android:layout_centerHorizontal="true"/>
+      android:layout_centerHorizontal="true"
+      android:layout_alignParentRight="true"/>
   </RelativeLayout>
   <LinearLayout android:id="@+id/elevation_busypane"
     android:orientation="vertical"

MyTracks/res/layout/mytracks_detail.xml

@@ -40,7 +40,9 @@ limitations under the License.
       android:singleLine="true"
       android:autoText="true"
       android:capitalize="words"
-      android:selectAllOnFocus="true"/>
+      android:selectAllOnFocus="true"
+      android:hint="@string/trackdetails_name_hint"
+      android:imeOptions="actionNext"/>
   </LinearLayout>
   <TextView android:text="@string/trackdetails_category"
     android:layout_width="fill_parent"
@@ -48,7 +50,9 @@ limitations under the License.
   <AutoCompleteTextView android:id="@+id/trackdetails_category"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:singleLine="true"/>
+    android:singleLine="true"
+    android:hint="@string/trackdetails_category_hint"
+    android:imeOptions="actionNext"/>
   <TextView android:text="@string/trackdetails_description"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"/>
@@ -61,7 +65,9 @@ limitations under the License.
     android:selectAllOnFocus="true"
     android:maxLines="50"
     android:gravity="top"
-    android:layout_weight="1"/>
+    android:layout_weight="1"
+    android:hint="@string/trackdetails_description_hint"
+    android:imeOptions="actionDone"/>
     <LinearLayout
       android:orientation="horizontal"
       android:layout_width="fill_parent"

MyTracks/res/layout/mytracks_list.xml

@@ -50,6 +50,12 @@ limitations under the License.
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_weight="1"/>
+    <Button android:id="@+id/tracklist_btn_import_all"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/tracklist_btn_import_all"
+      android:textSize="14dip"/>
     <Button android:id="@+id/tracklist_btn_export_all"
       android:layout_width="wrap_content"
       android:layout_height="48dip"

MyTracks/res/layout/mytracks_send_to_google.xml

@@ -41,6 +41,8 @@ limitations under the License.
       android:stretchColumns="1"
       android:layout_marginTop="5dip"
       android:layout_marginLeft="5dip">
+      
+      <!-- My Maps -->
       <TableRow>
         <ImageView android:src="@drawable/mymaps_icon"
           android:layout_width="wrap_content"
@@ -70,6 +72,27 @@ limitations under the License.
           </RadioGroup>
         </LinearLayout>
       </TableRow>
+
+      <!-- Fusion Tables -->
+      <TableRow>
+        <ImageView android:src="@drawable/googledocs_icon"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+        <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical"
+          android:layout_marginLeft="10dip">
+          <CheckBox android:id="@+id/sendtogoogle_google_fusiontables"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/sendtogoogle_google_fusiontables"
+            android:textSize="20dip"
+            android:checked="true"/>
+        </LinearLayout>
+      </TableRow>
+
+      <!-- Google Docs -->
       <TableRow>
         <ImageView android:src="@drawable/googledocs_icon"
           android:layout_width="wrap_content"
@@ -104,26 +127,24 @@ limitations under the License.
     </TableLayout>
   </ScrollView>
   <LinearLayout
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
     android:background="@drawable/list_bar"
-    android:padding="3dip">
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="horizontal"
+    android:paddingLeft="2dip"
+    android:paddingRight="2dip"    
+    android:paddingTop="4dip">
+    <!-- left spacer -->
+    <LinearLayout style="@style/DialogButtonSpacer"/>
     <Button android:id="@+id/sendtogoogle_cancel"
-      android:layout_width="wrap_content"
-      android:layout_height="48dip"
-      android:layout_gravity="right"
+      android:layout_gravity="left"
       android:text="@string/cancel"
-      android:textSize="14dip"/>
-    <TextView
-      android:layout_width="0dip"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"/>
+      style="@style/DialogButton"/>
     <Button android:id="@+id/sendtogoogle_send_now"
-      android:layout_width="wrap_content"
-      android:layout_height="48dip"
       android:layout_gravity="right"
       android:text="@string/sendtogoogle_send_now"
-      android:textSize="14dip"/>
+      style="@style/DialogButton"/>
+    <!--  right spacer -->
+    <LinearLayout style="@style/DialogButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>

MyTracks/res/layout/mytracks_waypoint_details.xml

@@ -50,7 +50,9 @@ limitations under the License.
          android:singleLine="true"
          android:autoText="true"
          android:capitalize="words"
-         android:selectAllOnFocus="true"/>
+         android:selectAllOnFocus="true"
+         android:hint="@string/waypointdetails_name_hint"
+         android:imeOptions="actionNext"/>
       </LinearLayout>
       <LinearLayout android:id="@+id/waypointdetails_description_layout"
         android:orientation="vertical"
@@ -65,7 +67,9 @@ limitations under the License.
         <AutoCompleteTextView android:id="@+id/waypointdetails_category"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
-          android:singleLine="true"/>
+          android:singleLine="true"
+          android:hint="@string/waypointdetails_category_hint"
+          android:imeOptions="actionNext"/>
         <TextView android:text="@string/waypointdetails_description"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"/>
@@ -79,7 +83,9 @@ limitations under the License.
           android:minLines="5"
           android:maxLines="50"
           android:gravity="top"
-          android:layout_weight="1"/>
+          android:layout_weight="1"
+          android:hint="@string/waypointdetails_description_hint"
+          android:imeOptions="actionDone"/>
       </LinearLayout>
 
       <TableLayout android:id="@+id/waypoint_stats"

MyTracks/res/layout/send_to_google_result.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2011 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!--
+This layout is used as the content view for the send-to-Google result dialog.
+It is used to summarize the results of uploading track data to one or more
+services.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="5dip"
+    android:paddingBottom="5dip"
+    android:paddingLeft="14dip"
+    android:paddingRight="14dip"
+    android:orientation="vertical">
+  <TextView
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/status_track_upload_status"
+      style="?android:attr/textAppearanceLarge"/>
+  <TableLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:gravity="center_horizontal">
+    <!-- We don't want a divider, so we set its color to transparent. -->
+    <!-- We do this explicitly, rather than with a color resource, because -->
+    <!-- an apparent bug causes the divider to be wildly misrendered on -->
+    <!-- a Mini X10 running 2.1. -->
+    <ListView
+        android:id="@+id/send_to_google_result_list"
+        android:clickable="false"
+        android:paddingTop="10dip"
+        android:paddingBottom="10dip"
+        android:divider="#00000000"/>
+  </TableLayout>
+  <TextView
+      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:visibility="gone"
+      style="?android:attr/textAppearanceSmall"/>
+  <TextView
+      android:id="@+id/send_to_google_result_error"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/error_please_try_again_later"
+      android:visibility="gone"
+      style="?android:attr/textAppearanceLarge"/>
+</LinearLayout>

MyTracks/res/layout/send_to_google_result_list_item.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2011 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!--
+This layout represents the result of sending track data to a single service.
+It will be instantiated by a custom ListAdapter - once for each service to
+which track data was uploaded.
+-->
+<TableRow
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+  <ImageView
+      android:id="@+id/send_to_google_result_icon"
+      android:src="@drawable/success"
+      android:layout_width="wrap_content"
+      android:layout_height="fill_parent"
+      android:layout_gravity="top"/>
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
+    <TextView
+        android:id="@+id/send_to_google_result_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Google Docs"
+        style="?android:attr/textAppearanceMedium"/>
+    <TextView
+        android:id="@+id/send_to_google_result_url"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="http://google.com"
+        style="?android:attr/textAppearanceSmall"/>
+  </LinearLayout>
+</TableRow>

MyTracks/res/layout/sensor_state.xml

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal"
+  android:layout_width="fill_parent">
+
+  <ScrollView
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent">
+
+    <LinearLayout
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent">
+
+      <TableLayout
+        android:layout_height="wrap_content"
+        android:stretchColumns="1,4"
+        android:layout_width="fill_parent">
+
+        <!--  Layout the sensor state on one line.  -->
+        <TableRow>
+          <TextView
+            android:layout_span="5"
+            android:text="@string/sensor_state" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            android:id="@+id/sensor_state_register"
+            android:layout_column="1"
+            android:layout_span="5"
+            style="@style/StatsRegister" />
+        </TableRow>
+
+        <!--  Layout the sensor data age on one line. -->
+        <TableRow>
+          <TextView
+            android:layout_span="5"
+            android:text="@string/sensor_data_time" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            android:id="@+id/sensor_data_time_register"
+            android:layout_column="1"
+            android:layout_span="5"
+            style="@style/StatsRegister" />
+        </TableRow>
+
+        <!-- Power meter -->
+        <TableRow
+          android:padding="1dip">
+          <TextView
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/power" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            style="@style/StatsRegister.Big"
+            android:id="@+id/power_state_register"
+            android:layout_column="1"
+            android:layout_span="4" />
+          <TextView
+            style="@style/StatsUnitSolo" />
+            android:layout_column="5"
+            android:text="@string/watts" />
+        </TableRow>
+        
+        <!-- Cadence -->
+        <TableRow
+          android:padding="1dip">
+          <TextView
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/cadence" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            style="@style/StatsRegister.Big"
+            android:id="@+id/cadence_state_register"
+            android:layout_column="4" />
+          <TextView
+            style="@style/StatsUnitSolo" />
+            android:layout_column="2"
+            android:text="@string/revolutions_per_minute" />
+        </TableRow>
+
+        <!-- Heart Rate -->
+        <TableRow
+          android:padding="1dip">
+          <TextView
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/heart_rate" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            style="@style/StatsRegister.Big"
+            android:id="@+id/heart_rate_register"
+            android:layout_column="1"
+            android:layout_span="4" />
+          <TextView
+            style="@style/StatsUnitSolo"
+            android:layout_column="5"
+            android:text="@string/bpm" />
+        </TableRow>
+
+        <!-- Battery Level -->
+        <TableRow
+          android:padding="1dip">
+          <TextView
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/battery_level" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            style="@style/StatsRegister.Big"
+            android:id="@+id/battery_level_register"
+            android:layout_column="1"
+            android:layout_span="4" />
+          <TextView
+            style="@style/StatsUnitSolo"
+            android:layout_column="5"
+            android:text="@string/percent" />
+        </TableRow>
+
+      </TableLayout>
+    </LinearLayout>
+  </ScrollView>
+</RelativeLayout>

MyTracks/res/layout/stats.xml

@@ -42,15 +42,10 @@ limitations under the License.
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
-          android:gravity="right"
+          style="@style/StatsRegister.Big"
           android:id="@+id/speed_register"
           android:layout_column="1"
-          android:layout_marginBottom="-13dip"
-          android:layout_marginTop="-13dip"
-          android:layout_span="4"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="50sp" />
+          android:layout_span="4"/>
         <LinearLayout
           android:gravity="bottom"
           android:layout_column="5"
@@ -62,24 +57,12 @@ limitations under the License.
             android:layout_width="fill_parent" />
           <TextView
             android:id="@+id/speed_unit_label_top"
-            android:gravity="bottom"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="2dip"
-            android:layout_marginTop="2dip"
-            android:layout_width="wrap_content"
-            android:textColor="@color/stat_label_text" />
+	          style="@style/StatsUnit" />
           <TextView
-            android:background="@color/black"
-            android:layout_height="3dip"
-            android:layout_width="fill_parent" />
+	          style="@style/StatsDivider" />
           <TextView
             android:id="@+id/speed_unit_label_bottom"
-            android:gravity="bottom"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="2dip"
-            android:layout_marginTop="2dip"
-            android:layout_width="wrap_content"
-            android:textColor="@color/stat_label_text" />
+	          style="@style/StatsUnit" />
         </LinearLayout>
       </TableRow>
 
@@ -100,43 +83,25 @@ limitations under the License.
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
-          android:gravity="right"
+          style="@style/StatsRegister"
           android:id="@+id/total_distance_register"
-          android:layout_column="1"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          android:layout_column="1" />
         <TextView
-          android:gravity="left"
           android:id="@+id/total_distance_unit_label"
           android:layout_column="2"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/mile"
-          android:textColor="@color/stat_label_text" />
+	        style="@style/StatsUnitSolo" />
         <!-- TODO 4/08/2009
         The following is a bad hack to get a spacer the same size as the
         text.  Ideally this should just be a View, however I don't know how to
         set the view height properly.  fill_parent on this element causes as
         NullPointerException. This same filler is repeated on each line.-->
         <TextView
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
         <TextView
-          android:gravity="right"
           android:id="@+id/max_speed_register"
-          android:layout_column="4"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister"
+          android:layout_column="4" />
         <LinearLayout
           android:gravity="bottom"
           android:layout_column="5"
@@ -145,24 +110,12 @@ limitations under the License.
           android:orientation="vertical">
           <TextView
             android:id="@+id/max_speed_unit_label_top"
-            android:gravity="bottom"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="-1dip"
-            android:layout_marginTop="-1dip"
-            android:layout_width="wrap_content"
-            android:textColor="@color/stat_label_text" />
+            style="@style/StatsUnit" />
           <TextView
-            android:background="@color/black"
-            android:layout_height="3dip"
-            android:layout_width="fill_parent" />
+	          style="@style/StatsDivider" />
           <TextView
             android:id="@+id/max_speed_unit_label_bottom"
-            android:gravity="bottom"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="-1dip"
-            android:layout_marginTop="-1dip"
-            android:layout_width="wrap_content"
-            android:textColor="@color/stat_label_text" />
+            style="@style/StatsUnit" />
         </LinearLayout>
       </TableRow>
 
@@ -182,33 +135,19 @@ limitations under the License.
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
-          android:gravity="right"
           android:id="@+id/total_time_register"
           android:layout_column="1"
           android:layout_height="wrap_content"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
           android:layout_span="2"
           android:layout_width="fill_parent"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
         <TextView
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
         <TextView
-          android:gravity="right"
           android:id="@+id/average_speed_register"
           android:layout_column="4"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
         <LinearLayout
           android:gravity="bottom"
           android:layout_column="5"
@@ -217,24 +156,12 @@ limitations under the License.
           android:orientation="vertical">
           <TextView
             android:id="@+id/average_speed_unit_label_top"
-            android:gravity="bottom"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="-1dip"
-            android:layout_marginTop="-1dip"
-            android:layout_width="wrap_content"
-            android:textColor="@color/stat_label_text" />
+            style="@style/StatsUnit" />
           <TextView
-            android:background="@color/black"
-            android:layout_height="3dip"
-            android:layout_width="fill_parent" />
+	          style="@style/StatsDivider" />
           <TextView
             android:id="@+id/average_speed_unit_label_bottom"
-            android:gravity="bottom"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="-1dip"
-            android:layout_marginTop="-1dip"
-            android:layout_width="wrap_content"
-            android:textColor="@color/stat_label_text" />
+            style="@style/StatsUnit" />
         </LinearLayout>
       </TableRow>
 
@@ -254,33 +181,18 @@ limitations under the License.
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
-          android:gravity="right"
           android:id="@+id/moving_time_register"
           android:layout_column="1"
           android:layout_height="wrap_content"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
           android:layout_span="2"
           android:layout_width="fill_parent"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
         <TextView
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
         <TextView
-          android:gravity="right"
           android:id="@+id/average_moving_speed_register"
-          android:layout_column="4"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
         <LinearLayout
           android:gravity="bottom"
           android:layout_column="5"
@@ -289,24 +201,14 @@ limitations under the License.
           android:orientation="vertical">
           <TextView
             android:id="@+id/average_moving_speed_unit_label_top"
-            android:gravity="bottom"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="-1dip"
-            android:layout_marginTop="-1dip"
-            android:layout_width="wrap_content"
-            android:textColor="@color/stat_label_text" />
+            style="@style/StatsUnit" />
           <TextView
-            android:background="@color/black"
+	          style="@style/StatsDivider" />
             android:layout_height="3dip"
             android:layout_width="fill_parent" />
           <TextView
             android:id="@+id/average_moving_speed_unit_label_bottom"
-            android:gravity="bottom"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="-1dip"
-            android:layout_marginTop="-1dip"
-            android:layout_width="wrap_content"
-            android:textColor="@color/stat_label_text" />
+            style="@style/StatsUnit" />
         </LinearLayout>
       </TableRow>
 
@@ -326,46 +228,24 @@ limitations under the License.
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
-          android:gravity="right"
           android:id="@+id/elevation_register"
           android:layout_column="1"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
         <TextView
-          android:gravity="left"
           android:id="@+id/elevation_unit_label"
           android:layout_column="2"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/feet"
-          android:textColor="@color/stat_label_text"/>
+          style="@style/StatsUnitSolo" />
         <TextView
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
         <TextView
-          android:gravity="right"
           android:id="@+id/elevation_gain_register"
           android:layout_column="4"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
         <TextView
-          android:gravity="right"
           android:id="@+id/elevation_gain_unit_label"
           android:layout_column="5"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/feet"
-          android:textColor="@color/stat_label_text" />
+          style="@style/StatsUnitSolo" />
       </TableRow>
 
       <!-- Min and max elevation -->
@@ -384,46 +264,24 @@ limitations under the License.
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
-          android:gravity="right"
           android:id="@+id/min_elevation_register"
           android:layout_column="1"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
         <TextView
-          android:gravity="left"
           android:id="@+id/min_elevation_unit_label"
           android:layout_column="2"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/feet"
-          android:textColor="@color/stat_label_text" />
+          style="@style/StatsUnitSolo" />
         <TextView
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
         <TextView
-          android:gravity="right"
           android:id="@+id/max_elevation_register"
           android:layout_column="4"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
         <TextView
-          android:gravity="right"
           android:id="@+id/max_elevation_unit_label"
           android:layout_column="5"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/feet"
-          android:textColor="@color/stat_label_text" />
+          style="@style/StatsUnitSolo" />
       </TableRow>
 
       <!-- Min and max grade -->
@@ -442,36 +300,18 @@ limitations under the License.
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
-          android:gravity="right"
           android:id="@+id/min_grade_register"
           android:layout_column="1"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="fill_parent"
           android:layout_span="2"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
         <TextView
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
         <TextView
-          android:gravity="right"
           android:id="@+id/max_grade_register"
           android:layout_column="4"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="fill_parent"
           android:layout_span="2"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
       </TableRow>
 
       <!-- Latitude and Longitude -->
@@ -488,36 +328,19 @@ limitations under the License.
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
-          android:gravity="right"
           android:id="@+id/latitude_register"
           android:layout_column="1"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="-5dip"
-          android:layout_marginTop="-5dip"
-          android:layout_width="fill_parent"
           android:layout_span="2"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="25sp" />
+          style="@style/StatsRegister.Small" />
         <TextView
-          android:background="@color/black"
+          style="@style/StatsSpacer"
           android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
           android:textSize="25sp" />
         <TextView
-          android:gravity="right"
           android:id="@+id/longitude_register"
           android:layout_column="4"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="-5dip"
-          android:layout_marginTop="-5dip"
-          android:layout_width="fill_parent"
           android:layout_span="2"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="25sp" />
+          style="@style/StatsRegister.Small" />
       </TableRow>
 
     </TableLayout>

MyTracks/res/layout/track_widget.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2011 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:paddingLeft="10px"
+  android:paddingRight="10px"
+  android:paddingTop="5px"
+  android:paddingBottom="5px">
+  <LinearLayout
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent"
+    android:background="@drawable/appwidget_background">
+    <ImageButton
+      android:id="@+id/appwidget_button"
+      android:layout_height="fill_parent"
+      android:layout_width="wrap_content"
+      android:background="@android:color/transparent"
+      android:paddingLeft="10px"
+      android:paddingRight="10px"
+      android:src="@drawable/appwidget_button_disabled" />
+    <LinearLayout
+      android:id="@+id/appwidget_track_statistics"
+      android:layout_height="fill_parent"
+      android:layout_width="fill_parent"
+      android:layout_weight="1"
+      android:clickable="true"
+      android:orientation="vertical"
+      android:paddingLeft="15px">
+      <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:orientation="horizontal">
+        <TextView
+          style="@style/WidgetText.Register"
+          android:id="@+id/appwidget_distance_text" />
+        <TextView
+          style="@style/WidgetText"
+          android:text="@string/total_distance_label" />
+      </LinearLayout>
+      <ImageView
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:background="@color/appwidget_hr" />
+      <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:orientation="horizontal"
+        android:paddingBottom="2px">
+        <TextView
+          style="@style/WidgetText.Register"
+          android:id="@+id/appwidget_time_text" />
+        <TextView
+          style="@style/WidgetText"
+          android:text="@string/moving_time_label" />
+      </LinearLayout>
+      <ImageView
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:background="@color/appwidget_hr" />
+      <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:orientation="horizontal">
+        <TextView
+          style="@style/WidgetText.Register"
+          android:id="@+id/appwidget_speed_text" />
+        <TextView
+          style="@style/WidgetText"
+          android:text="@string/speed" />
+      </LinearLayout>
+    </LinearLayout>
+  </LinearLayout>
+</LinearLayout>

MyTracks/res/menu/main.xml

@@ -1,29 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:id="@+id/menu_start_recording"
-    android:icon="@drawable/menu_record"
+    android:icon="@drawable/ic_menu_recordtrack"
     android:title="@string/start_recording"/>
 
   <item android:id="@+id/menu_stop_recording"
-    android:icon="@drawable/menu_stop"
+    android:icon="@drawable/ic_menu_stoprecording"
     android:title="@string/stop_recording"/>
 
   <item android:id="@+id/menu_list_tracks"
-    android:icon="@drawable/menu_list_tracks"
+    android:icon="@drawable/ic_menu_tracklist"
     android:title="@string/list_tracks"/>
 
   <item android:id="@+id/menu_list_markers"
-    android:icon="@drawable/menu_marker"
+    android:icon="@drawable/ic_menu_waypoints"
     android:title="@string/list_markers"/>
 
   <item android:id="@+id/menu_settings"
     android:icon="@android:drawable/ic_menu_preferences"
     android:orderInCategory="1001"
     android:title="@string/settings"/>
+    
+  <item android:id="@+id/menu_aggregated_stats"
+    android:orderInCategory="1002"
+    android:title="@string/aggregated_stats"/>
 
+  <item android:id="@+id/menu_sensor_state"
+    android:icon="@drawable/ic_menu_sensorstatus"
+    android:orderInCategory="1000"
+    android:title="@string/sensor_state"/>
+    
   <item android:id="@+id/menu_help"
     android:icon="@android:drawable/ic_menu_info_details"
-    android:orderInCategory="1002"
+    android:orderInCategory="1003"
     android:title="@string/help"/>
 
 </menu>

MyTracks/res/values-ca/arrays.xml

@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Inactiu</item>
+    <item>1 min</item>
+    <item>2 min</item>
+    <item>5 min</item>
+    <item>10 min</item>
+    <item>15 min</item>
+    <item>30 min</item>
+    <item>60 min</item>
+  </string-array>
+
+  <!-- Minimum recording distance -->
+  <string-array name="min_recording_distance_options">
+    <item>1 m</item>
+    <item>2 m</item>
+    <item>3 m</item>
+    <item>4 m</item>
+    <item>5 m (recomanat)</item>
+    <item>10 m</item>
+    <item>100 m</item>
+  </string-array>
+
+  <string-array name="min_recording_distance_options_ft">
+    <item>3 ft</item>
+    <item>6 ft</item>
+    <item>10 ft</item>
+    <item>13 ft</item>
+    <item>16 ft (recomanat)</item>
+    <item>33 ft</item>
+    <item>328 ft</item>
+  </string-array>
+
+  <!-- Maximum recording distance -->
+  <string-array name="max_recording_distance_options">
+    <item>50 m</item>
+    <item>100 m</item>
+    <item>200 m (recomanat)</item>
+    <item>500 m</item>
+    <item>1000 m</item>
+    <item>5000 m</item>
+  </string-array>
+
+  <string-array name="max_recording_distance_options_ft">
+    <item>164 ft</item>
+    <item>328 ft</item>
+    <item>656 ft (recomanat)</item>
+    <item>1640 ft</item>
+    <item>0.6 miles</item>
+    <item>3.1 miles</item>
+  </string-array>
+
+  <!-- Minimum recording interval -->
+  <string-array name="min_recording_interval_options">
+    <item>poca precisió (adaptable)</item>
+    <item>gran precisió (adaptable)</item>
+    <item>el millor (recomanat)</item>
+    <item>2 s</item>
+    <item>3 s</item>
+    <item>4 s</item>
+    <item>5 s</item>
+    <item>10 s</item>
+    <item>20 s</item>
+    <item>30 s</item>
+    <item>1 min</item>
+    <item>2 min</item>
+    <item>5 min</item>
+    <item>10 min</item>
+    <item>15 min</item>
+    <item>30 min</item>
+  </string-array>
+
+  <!-- Minimum required accuracy -->
+  <string-array name="min_required_accuracy_options">
+    <item>10 m (senyal GPS excel·lent)</item>
+    <item>20 m</item>
+    <item>50 m</item>
+    <item>100 m</item>
+    <item>200 m (recomanat)</item>
+    <item>500 m</item>
+    <item>1000 m</item>
+    <item>2000 m</item>
+    <item>5000 m (senyal GPS pobre)</item>
+  </string-array>
+
+  <string-array name="min_required_accuracy_options_ft">
+    <item>33 ft (senyal GPS excel·lent)</item>
+    <item>66 ft</item>
+    <item>165 ft</item>
+    <item>328 ft</item>
+    <item>656 ft (recomanat)</item>
+    <item>1640 ft</item>
+    <item>0.6 miles</item>
+    <item>1.2 miles</item>
+    <item>3.1 miles (senyal GPS pobre)</item>
+  </string-array>
+
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Inactiu</item>
+    <item>100 km</item>
+    <item>50 km</item>
+    <item>25 km</item>
+    <item>10 km</item>
+    <item>5 km</item>
+    <item>1 km</item>
+    <item>60 min</item>
+    <item>30 min</item>
+    <item>15 min</item>
+    <item>10 min</item>
+    <item>5 min</item>
+    <item>2 min</item>
+    <item>1 min</item>
+  </string-array>
+
+  <string-array name="task_frequency_options_ft">
+    <item>Inactiu</item>
+    <item>100 mi</item>
+    <item>50 mi</item>
+    <item>25 mi</item>
+    <item>10 mi</item>
+    <item>5 mi</item>
+    <item>1 mi</item>
+    <item>60 min</item>
+    <item>30 min</item>
+    <item>15 min</item>
+    <item>10 min</item>
+    <item>5 min</item>
+    <item>2 min</item>
+    <item>1 min</item>
+  </string-array>
+
+  <!-- Auto-resume track timeout -->
+  <string-array name="auto_resume_track_timeout_options">
+    <item>Mai</item>
+    <item>5 min</item>
+    <item>10 min</item>
+    <item>15 min</item>
+    <item>Always</item>
+  </string-array>
+
+  <!-- Other non-preference arrays -->
+  <array name="activity_types">
+    <item>desconegut</item>
+    <item>tipus barrejats</item>
+    <item>altre</item>
+
+    <item>córrer</item>
+    <item>córrer al carrer</item>
+    <item>pista d\'atletisme</item>
+    <item>córrer en ruta</item>
+    <item>a peu</item>
+    <item>caminar de presa</item>
+    <item>senderisme</item>
+    <item>ruta de senderisme</item>
+    <item>senderisme fora de ruta</item>
+    <item>escalada</item>
+
+    <item>ciclisme</item>
+    <item>bici al carrer</item>
+    <item>bici de muntanya</item>
+    <item>ruta de bici</item>
+
+    <item>patinatge</item>
+    <item>patinatge en línia</item>
+    <item>skate</item>
+
+    <item>snow shoeing</item>
+    <item>skiing</item>
+    <item>snow boarding</item>
+    <item>sled</item>
+    <item>ice sailing</item>
+
+    <item>pesca</item>
+    <item>rem</item>
+    <item>caiac</item>
+    <item>rem</item>
+    <item>llanxa motora</item>
+    <item>ferry</item>
+    <item>RC boat</item>
+    <item>surf</item>
+    <item>windsurf</item>
+    <item>kitesurf</item>
+    <item>esquí aquàtic</item>
+    <item>wakeboard</item>
+
+    <item>avió</item>
+    <item>hidroavió</item>
+    <item>avió comercial</item>
+    <item>helicòpter</item>
+    <item>globus aerostàtic</item>
+    <item>dirigible</item>
+    <item>avió RC</item>
+    <item>helicòpter RC</item>
+    <item>salt d\'esquí</item>
+    <item>vol sense motor</item>
+    <item>ala delta</item>
+    <item>parapent</item>
+
+    <item>riding</item>
+    <item>horse back riding</item>
+    <item>donkey back riding</item>
+
+    <item>conducció d\'automòbil</item>
+    <item>conducció de bus</item>
+    <item>tren</item>
+    <item>moto</item>
+    <item>dirtbike</item>
+    <item>ATV</item>
+
+    <item>landsailing</item>
+    <item>frisbee</item>
+    <item>ultimate frisbee</item>
+  </array>
+
+  <array name="waypoint_types">
+    <item>ATM</item>
+    <item>banc</item>
+    <item>bar</item>
+    <item>barbeque</item>
+    <item>edifici</item>
+    <item>parada de bús</item>
+    <item>cafeteria</item>
+    <item>acampada</item>
+    <item>càmping</item>
+    <item>església</item>
+    <item>cafeteria</item>
+    <item>botiga de conveniència</item>
+    <item>aigua potable</item>
+    <item>caiguda de roques</item>
+    <item>ferry</item>
+    <item>llar de foc</item>
+    <item>estació de bombers</item>
+    <item>pesca</item>
+    <item>benzinera</item>
+    <item>camp de golf</item>
+    <item>botiga de queviures</item>
+    <item>perruqueria</item>
+    <item>port</item>
+    <item>ruta de senderisme</item>
+    <item>hotel</item>
+    <item>casa</item>
+    <item>informació</item>
+    <item>intersecció</item>
+    <item>bústia</item>
+    <item>mercat</item>
+    <item>punt de trobada</item>
+    <item>opera</item>
+    <item>parking</item>
+    <item>oficina de correus</item>
+    <item>sot</item>
+    <item>comissaria dels mossos</item>
+    <item>encreuament ferroviari</item>
+    <item>restaurant</item>
+    <item>compres</item>
+    <item>vista</item>
+    <item>magatzem</item>
+    <item>piscina</item>
+    <item>telèfon</item>
+    <item>teatre</item>
+    <item>serveis</item>
+    <item>informació turística</item>
+    <item>túnel</item>
+    <item>arbre</item>
+    <item>cascada</item>
+    <item>font d\'aigua</item>
+    <item>punt de referència</item>
+  </array>
+
+</resources>

MyTracks/res/values-ca/strings.xml

@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+  <!-- Used by the Menu -->
+  <string name="start_recording">Enregistra la ruta</string>
+  <string name="stop_recording">Atura l\'enregistrament</string>
+  <string name="switch_to_sat">Mode de satèl·lit</string>
+  <string name="switch_to_map">Mode de mapa</string>
+  <string name="mylocation">La meva ubicació</string>
+  <string name="list_tracks">Rutes</string>
+  <string name="list_markers">Marcadors</string>
+  <string name="delete_all_tracks">Elimina totes les rutes</string>
+  <string name="settings">Paràmetres</string>
+  <string name="elevation">Elevació</string>
+  <string name="choose_track_message">Seleccioneu la ruta que es visualitzarà</string>
+  <string name="current_track">Ruta actual</string>
+  <string name="current_segment">Darrer segment</string>
+  <string name="sensor_state">Estat del sensor</string>
+  <string name="aggregated_stats">Estadístiques agregades</string>
+
+  <!-- Error messages -->
+  <string name="error_no_location_manager">No s\'ha trobat cap gestor d\'ubicacions en aquest dispositiu.</string>
+  <string name="error_no_gps_location_provider">No s\'ha trobat cap proveïdor d\'ubicació GPS en aquest dispositiu.</string>
+  <string name="error_sending_to_fusiontables">S\'ha produït un error quan s\'enviava la ruta a Google Fusion Tables. Proveu més tard.</string>
+  <string name="error_sending_to_docs">S\'ha prdouït un error quan s\'enviava la ruta a Google Docs. Proveu més tard.</string>
+  <string name="error_unable_to_start_recording">No es pot iniciar l\'enregistrament. Proveu de nou.</string>
+  <string name="error_unable_to_stop_recording">No es pot aturar l\'enregistrament. Proveu de nou.</string>
+  <string name="error_unable_to_read_file">No es pot llegir des del fitxer.</string>
+  <string name="error_invalid_gpx_format">El fitxer no conté un format GPX vàlid.</string>
+  <string name="error_generic">S\'ha produït un error. Proveu de nou.</string>
+  <string name="error_track_does_not_exist">No existeix la ruta.</string>
+  <string name="error_out_of_memory">Aquest fitxer és massa gran (ha d\'ésser inferior a 500KB. S\'està cancel·lant.</string>
+  <string name="error_unable_to_insert_marker">No es pot inserir un marcador. No hi ha cap ubicació fixa disponible.</string>
+
+  <!-- Status messages -->
+  <string name="wait_for_fix">S\'està esperant per tenir una posició GPS fixa. Assegureu-vos que el cel és visible.</string>
+  <string name="status_now_recording">Ara s\'està enregistrant una ruta nova.</string>
+  <string name="status_stopped_recording">S\'ha aturat l\'enregistrament de la ruta.</string>
+  <string name="status_new_fusiontable_has_been_created">S\'ha creat un Google Fusion Table nou a google.com/fusiontables.</string>
+  <string name="status_tracks_have_been_uploaded">S\'ha enviat la ruta a maps.google.com.</string>
+  <string name="status_tracks_have_been_uploaded_to_new_doc">S\'ha enviat la ruta a un full de càlcul a docs.google.com.</string>
+  <string name="status_tracks_have_been_uploaded_to_docs">S\'ha enviat la ruta a docs.google.com.</string>
+  <string name="status_enable_gps">Toqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar.</string>
+  <string name="status_approximate_location">Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques.</string>
+  <string name="status_no_location">No es pot determinar la ubicació. Habiliteu més fonts d\'ubicació (vegeu els paràmetres de seguretat i ubicació) i assegureu-vos que el cel és visible. Proveu de nou més tard.</string>
+  <string name="status_waypoint_inserted">S\'ha inserit un marcader de punt de ruta.</string>
+  <string name="status_statistics_inserted">S\'ha inserit un marcador d\'estadístiques.</string>
+
+  <!-- Progress dialog -->
+  <string name="progress_title">Espereu...</string>
+  <string name="progress_message">S\'està enviant la ruta a Google.</string>
+  <string name="progress_message_reading_track">S\'està llegint la ruta...</string>
+  <string name="progress_message_preparing_track">S\'està preparant la ruta...</string>
+  <string name="progress_message_authenticating_fusiontables">S\'està  to Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_docs">S\'està autenticant a Google Docs...</string>
+  <string name="progress_message_sending_docs">S\'està enviant la ruta a Google Docs...</string>
+  <string name="progress_message_sending_fusiontables">S\'està enviant a Google Fusion Tables...</string>
+  <string name="progress_message_creating_fusiontable">S\'està creant un Fusion Table nou...</string>
+  <string name="import_progress_message">S\'està imporant una ruta GPS. Això pot trigar una estona.</string>
+  <string name="write_progress_message">S\'està escrivint a la targeta SD. Això pot trigar una estona.</string>
+  <string name="progress_message_updating_track">S\'estan actualitzant les estadístiques de la ruta...</string>
+
+  <!-- Used by DeleteAllDataHandler -->
+  <string name="are_you_sure_question">Esteu segur?</string>
+  <string name="all_data_will_be_permanently_deleted">Tots els marcadors i rutes s\'eliminaran d\'aquest telèfon.</string>
+  <string name="track_will_be_permanently_deleted">La ruta i els seus marcadors s\'eliminaran de forma permanent d\'aquest telèfon.</string>
+  <string name="marker_will_be_permanently_deleted">El marcador s\'eliminarà de forma permanent d\'aquest telèfon.</string>
+
+  <!-- Text and links when uploading to Google My Maps -->
+  <string name="new_map_description">Creat per My Tracks a l\'Android.</string>
+  <string name="fusiontable_link">Creat per &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; a l\'Android.</string>
+
+  <!-- Formatting of track and marker descriptions -->
+  <string name="points">Punts</string>
+  <string name="recorded_date">Enregistrat</string>
+  <string name="category">Tipus d\'activitat</string>
+  <string name="waypoint_category">Tipus de marcador</string>
+  <string name="part">(Part %d)</string>
+
+  <!-- Used by the track recording service -->
+  <string name="recording_your_track">S\'està enregistrant la ruta...</string>
+  <string name="new_track">Ruta %d</string>
+
+  <!-- Common -->
+  <string name="no">No</string>
+  <string name="yes">Sí</string>
+  <string name="ok">D\'acord</string>
+  <string name="error">Error</string>
+  <string name="success">Fet</string>
+  <string name="waypoint">Punt de referència</string>
+  <string name="cancel">Cancel·la</string>
+  <string name="close">Tanca</string>
+  <string name="edit">Edita</string>
+  <string name="save">Desa</string>
+
+  <!-- Placemark labels for start and end of track -->
+  <string name="start">(Inici)</string>
+  <string name="end">(Fi)</string>
+
+  <!--  TrackList -->
+  <string name="tracklist_show_track">Mostra</string>
+  <string name="tracklist_send_to_fusiontables">Envia a Google Fusion Tables</string>
+  <string name="tracklist_send_to_new_fusiontable">Envia a un Google Fusion Table nou</string>
+  <string name="tracklist_send_to_docs">Envia a Google Docs</string>
+  <string name="tracklist_send_to_google">Envia a Google...</string>
+  <string name="tracklist_delete_track">Elimina del telèfon...</string>
+  <string name="tracklist_edit_track">Edita els detalls</string>
+  <string name="tracklist_write_to_sd">Escriu a la targeta SD...</string>
+  <string name="tracklist_save_as_gpx">Anomena i desa com un fitxer GPX</string>
+  <string name="tracklist_save_as_kml">Anomena i desa com un fitxer KML</string>
+  <string name="tracklist_save_as_csv">Anomena i desa com un fitxer CSV</string>
+  <string name="tracklist_save_as_tcx">Anomena i desa com un fitxer TCX</string>
+  <string name="tracklist_btn_send_all_to_fusiontables">Envia a Google Fusion Tables</string>
+  <string name="tracklist_btn_delete_all">Elimina totes les rutes</string>
+  <!-- Export All -->
+  <string name="tracklist_btn_export_all">Exporta totes les rutes</string>
+  <string name="export_done">Exporta les finalitzades</string>
+  <string name="tracklist_pick_one">Seleccioneu una ruta. Mantingueu el dit per veure més opcions.</string>
+  <string name="tracklist_all_tracks">Totes les rutes:</string>
+  <string name="tracklist_this_track">Aquesta ruta</string>
+  <string name="tracklist_share_track">Comparteix amb amics...</string>
+  <string name="tracklist_share_gpx_file">Un fitxer GPX</string>
+  <string name="tracklist_share_kml_file">Un fitxer KML</string>
+  <string name="tracklist_share_csv_file">Un fitxer CSV</string>
+  <string name="tracklist_share_tcx_file">Un fitxer TCX</string>
+  <string name="tracklist_clear_map">Neteja el mapa</string>
+
+  <!-- Waypoints list -->
+  <string name="waypointslist_btn_delete_all">Elimina tots els marcadors</string>
+  <string name="waypointslist_this_waypoint">Aquest marcador</string>
+  <string name="waypointslist_delete_waypoint">Elimina</string>
+  <string name="waypointslist_edit_waypoint">Edita els detalls</string>
+  <string name="waypointslist_show_waypoint">Mostra al mapa</string>
+  <string name="waypointslist_btn_insert_waypoint">Insereix un punt de referència</string>
+  <string name="waypointslist_btn_insert_statistics">Insereix estadístiques</string>
+  <string name="waypointslist_pick_one">Seleccioneu un marcador. Mantingueu el dit per veure més opcions.</string>
+
+  <!-- MyTracks Details -->
+  <string name="trackdetails_title">Detalls de la ruta</string>
+  <string name="trackdetails_name">Nom de la ruta</string>
+  <string name="trackdetails_name_hint">Nom de la ruta</string>
+  <string name="trackdetails_description">Descripció de la ruta</string>
+  <string name="trackdetails_description_hint">Descripció de la ruta</string>
+  <string name="trackdetails_category">Tipus d\'activitat (p.e. senderisme, bicicleta, còrrer, escalada...)</string>
+  <string name="trackdetails_category_hint">Tipus d\'activitat</string>
+
+  <!-- MyTracks Waypoint Details -->
+  <string name="waypointdetails_title">Detalls del marcador</string>
+  <string name="waypointdetails_name">Nom del marcador</string>
+  <string name="waypointdetails_name_hint">Nom del marcador</string>
+  <string name="waypointdetails_description">Descripció del marcador</string>
+  <string name="waypointdetails_description_hint">Descripció del marcador</string>
+  <string name="waypointdetails_category">Tipus de marcador (e.g. edifici, sot, vista...)</string>
+  <string name="waypointdetails_category_hint">Tipus de marcador</string>
+
+  <!-- MyTracks Settings -->
+  <string name="mytracks_settings">Paràmetres de My Tracks</string>
+  <string name="settings_display">Visualització</string>
+  <string name="settings_recording">Enregistrament</string>
+  <string name="settings_sharing">Compartició</string>
+
+  <string name="settings_not_available_summary">No es troba disponible a la vostra versió de l\'Android</string>
+
+  <string name="settings_announcement_frequency">Freqüència d\'avís</string>
+  <string name="settings_announcement_frequency_summary">Temps mínim entre dos avisos de veu</string>
+
+  <string name="settings_min_recording_distance">Distància mínima entre punts</string>
+  <string name="settings_min_recording_distance_summary">La distància més petita entre dos punts enregistrats de la vostra posició</string>
+
+  <string name="settings_max_recording_distance">Distància màxima entre punts</string>
+  <string name="settings_max_recording_distance_summary">Si dos punts estan més lluny d\'això, es dividirà la ruta</string>
+
+  <string name="settings_min_recording_interval">Temps mínim entre punts</string>
+  <string name="settings_min_recording_interval_summary">Interval de temps mínim entre dos enregistraments de la vostra posició</string>
+
+  <string name="settings_min_required_accuracy">Precisió mínima</string>
+  <string name="settings_min_required_accuracy_summary">S\'aturarà l\'enregistrament si la vostra posició no és així de precisa com a mínim</string>
+
+  <string name="settings_metric_units">Fes servir unitats mètriques</string>
+  <string name="settings_metric_units_summary_on">Totes les distàncies es mostraran en unitats mètriques</string>
+  <string name="settings_metric_units_summary_off">Totes les distàncies es mostraran en unitats imperials</string>
+
+  <string name="settings_map_public">Fes el mapa públic</string>
+  <string name="settings_map_public_summary_on">Els mapes pujats seran visibles per tothom a maps.google.com</string>
+  <string name="settings_map_public_summary_off">Els mapes pujats no es llistaran públicament a maps.google.com</string>
+
+  <string name="settings_report_speed_or_pace">Mostra la velocitat</string>
+  <string name="settings_report_speed_or_pace_summary_on">Es mostrarà la velocitat</string>
+  <string name="settings_report_speed_or_pace_summary_off">Es mostrarà el ritme de pas</string>
+
+  <string name="settings_share_url_only">Comparteix només l\'URL</string>
+  <string name="settings_share_url_only_summary_on">Només s\'enviarà l\'URL del mapa quan es comparteixi</string>
+  <string name="settings_share_url_only_summary_off">També s\'inclouran els continguts de la ruta quan es comparteixi</string>
+
+  <string name="settings_split_frequency">Freqüència de divisió</string>
+  <string name="settings_split_frequency_summary">Temps o distància màxima a partir de la qual s\'insertarà un marcador de divisió nou</string>
+
+  <string name="settings_auto_resume_track_timeout">Temps d\'espera per reprende la ruta</string>
+  <string name="settings_auto_resume_track_timeout_summary">Temps màxim en minuts a partir del qual l\'anterior ruta enregistrada no es reprendrà en actualitzar el telèfon</string>
+
+  <string name="settings_timestamp_track_name">Data i hora com a nom de la ruta</string>
+  <string name="settings_timestamp_track_name_summary_on">El nom per defecte de la ruta serà la data i hora en que s\'ha iniciat.</string>
+  <string name="settings_timestamp_track_name_summary_off">Els noms de les rutes seran números que s\'incrementaran per a cada nova ruta.</string>
+
+  <string name="pace_label">Ritme de pas</string>
+
+  <string name="eclair_required">Suportat només en Android 2.0 i superior</string>
+  <string name="settings_sensor_type">Tipus de sensor</string>
+  <string name="settings_sensor_type_summary">El tipus de sensor al qual es connecta.</string>
+  <string name="bluetooth_sensor_title">Sensor bluetooth</string>
+  <string name="bluetooth_sensor_summary">El sensor bluetooth al qual es connecta.</string>
+  <string name="settings_modular_stats_display_title">Pantalla d\'estadístiques modulars</string>
+
+  <string name="settings_backup">Còpia de seguretat (BETA)</string>
+  <string name="settings_sd_backup">Còpia de seguretat a la targeta SD</string>
+  <string name="settings_backup_to_sd">Fes la còpia ara</string>
+  <string name="settings_backup_to_sd_summary">Escriu una còpia completa de totes les rutes i els paràmetres a la targeta SD</string>
+  <string name="settings_restore_from_sd">Restaura ara</string>
+  <string name="settings_restore_from_sd_summary">Restaura totes les rutes i els paràmetres des de la targeta SD.</string>
+
+  <!-- Backups -->
+  <string name="restore_overwrites_warning">La restauració d\'una còpia de seguretat des de la targeta SD sobreescriurà totes les rutes i paràmetres. Esteu segur?</string>
+  <string name="select_backup_to_restore">Seleccioneu la còpia que es restaurarà</string>
+  <string name="no_backups">No s\'ha trobat cap còpia de seguretat.</string>
+  <string name="backup_write_progress_message">S\'estan escrivint totes les rutes i els paràmetres a la targeta SD. Això pot trigar una estona...</string>
+  <string name="backup_import_progress_message">S\'estan llegint totes les rutes i els paràmetres de la targeta SD. Això pot trigar una estona...</string>
+
+  <!-- MyTracksSky -->
+  <string name="mytracks_sky">Satèl·lits GPS</string>
+
+  <!-- Sharing -->
+  <string name="share_map_subject">M\'agradaria compartir un mapa amb tu</string>
+  <string name="share_map_body_format">Em sembla que estaràs interessat en aquest mapa:
+
+      %s</string>
+  <string name="send_track_subject">M\'agradaria compartir una ruta amb tu</string>
+  <string name="send_track_body_format">Em sembla que estaràs interessat en aquesta ruta.
+
+    Per veure aquesta ruta fes servir Google Earth o altre programari de mapes.</string>
+  <string name="share_track">Comparteix la ruta amb amics</string>
+
+  <!-- Visibility -->
+  <string name="public_map">Públic</string>
+  <string name="unlisted_map">No llistat</string>
+  <string name="mapslist_no_maps_available">Encara no teniu cap mapa.</string>
+
+  <!-- Statistics View -->
+  <!-- Average Moving -->
+  <string name="average_moving_speed_label">Velocitat mitjana en moviment</string>
+  <string name="average_moving_pace_label">Ritme mitjà en moviment</string>
+
+  <!-- Average -->
+  <string name="average_speed_label">Velocitat mitjana</string>
+  <string name="average_pace_label">Ritme de pas mitjà</string>
+
+  <string name="elevation_chart_name">Gràfic d\'elevació</string>
+  <string name="elevation_gain_label">Guany d\'elevació</string>
+  <string name="elevation_label">Elevació</string>
+  <string name="latitude_label">Latitud</string>
+  <string name="longitude_label">Longitud</string>
+
+  <!-- Min -->
+  <string name="min_elevation_label">Elevació mínima</string>
+  <string name="min_grade_label">Grau mínim</string>
+  <string name="min_pace_label">Ritme de pas mínima</string>
+
+  <!-- Max -->
+  <string name="max_elevation_label">Elevació màxima</string>
+  <string name="max_grade_label">Grau màxim</string>
+  <string name="max_speed_label">Velocitat màxima</string>
+
+  <string name="loading_track">S\'està carregant la ruta...</string>
+
+  <!-- Chart Settings -->
+  <string name="chart_settings">Configuració del gràfic</string>
+  <!-- X Axis -->
+  <string name="x_axis">Eix X</string>
+  <string name="by_distance">Per distància</string>
+  <string name="by_time">Per temps</string>
+
+  <!-- Y Axis -->
+  <string name="y_axis">Eix Y</string>
+
+  <!-- Units -->
+  <!-- Time  -->
+  <string name="hour">hora</string>
+  <string name="hours">hores</string>
+  <string name="minute">minut</string>
+  <string name="minutes">minuts</string>
+  <string name="second">segon</string>
+  <string name="seconds">segons</string>
+
+  <!-- Distance -->
+  <string name="kilometers_long">kilòmetres</string>
+  <string name="miles_long">milles</string>
+
+  <!-- Speed and Pace -->
+  <string name="kilometer_per_hour_long">kilòmetres per hora</string>
+  <string name="per_kilometer">per kilòmetre</string>
+  <string name="mile_per_hour_long">milles per hora</string>
+  <string name="per_mile">per milla</string>
+
+  <!-- Stats Labels -->
+  <string name="moving_time_label">Temps en moviment</string>
+  <string name="total_time_label">Temps total</string>
+  <string name="time_label">Temps</string>
+  <string name="sd_unavail">La targeta SD no està disponible</string>
+  <string name="speed">Velocitat</string>
+  <string name="start_trip">Heu d\'iniciar la marxa.</string>
+  <string name="statistics">Estadístiques</string>
+  <string name="total_distance_label">Distància total</string>
+  <string name="distance_label">Distància</string>
+  <string name="power">Energia</string>
+  <string name="cadence">Cadència</string>
+  <string name="heart_rate">Freqüència cardíaca</string>
+  <string name="max_heart_rate">Freqüència cardíaca màxima</string>
+  <string name="waiting">S\'està esperant...</string>
+
+  <!-- End User License Agreement -->
+  <string name="eula_title">Acord de llicencia d\'usuari final</string>
+  <string name="accept">Accepta</string>
+  <string name="decline">Rebutja</string>
+
+  <!-- About -->
+  <string name="about">Quant a</string>
+  <string name="help">Ajuda</string>
+  <string name="about_team">Equip:</string>
+  <string name="about_version">Versió:</string>
+  <string name="about_support">Assistència:</string>
+
+  <!-- Send to Google -->
+  <string name="sendtogoogle_title">Envia a...</string>
+  <string name="sendtogoogle_send_now">Envia ara</string>
+  <string name="sendtogoogle_send_stats">Envia les estadístiques de la ruta</string>
+  <string name="sendtogoogle_send_stats_and_points">Envia les estadístiques i els punts</string>
+
+  <!-- Getting the account to upload to. -->
+  <string name="no_account_found_title">No s\'ha trobat cap compte</string>
+  <string name="no_account_found">No s\'ha trobat cap compte on pujar les rutes.</string>
+  <string name="choose_account_title">Trieu un compte</string>
+
+  <!-- SD card -->
+  <string name="io_no_external_storage_found">No s\'ha trobat cap dispositiu d\'emmagatzematge extern. Assegureu-vos que la targeta SD està inserida i que el telèfon no està connectat a un ordinador.</string>
+  <string name="io_write_failed">No es pot escriure a un fitxer.</string>
+  <string name="io_read_failed">No es pot llegir des del fitxer.</string>
+  <string name="io_create_dir_failed">No es pot crear el directori a la targeta SD.</string>
+  <string name="io_write_finished">S\'ha finalitzat l\'escriptura a la targeta SD.</string>
+  <string name="io_read_finished">S\'ha finalitzat la lectura a la targeta SD.</string>
+
+  <!-- VersionChecker -->
+  <string name="version_check_title">Comprovació d\'actualitzacions</string>
+  <string name="version_check_upgrade_button">Actualitza ara</string>
+  <string name="version_check_continue_button">Continua sense actualitzar</string>
+  <string name="upgrade_required">La vostra versió de %1$s podria no funcionar correctament a partir d\'ara i no està suportada. Actualitzeu per continuar fent servir %1$s.</string>
+  <string name="upgrade_recommended">La vostra versió de %1$s podria no funcionar correctament a partir d\'ara. Heu d\'actualitzar-la ara o continuar fent-la servir pel vostre compte. Algunes funcionalitats com la sincronització podrien no funcionar fins que no actualitzeu.</string>
+  <string name="upgrade_available">Hi ha una nova versió disponible de %1$s. Podeu continuar fent servir la vostra versió sense cap problema, però no aconseguireu les darreres funcionalitats fins que no actualitzeu.</string>
+
+  <!-- Welcome -->
+  <string name="welcome">Benvingut</string>
+  <string name="welcome_read_later">D\'acord</string>
+  <string name="welcome_about">Quant a My Tracks</string>
+
+  <!-- Announcement -->
+  <string name="announce_no_distance">Sense distància My Tracks</string>
+  <!-- Format:
+  $1 : Distance label
+  $2 : Distance value (5)
+  $3 : Distance units (mi, km)
+  $4 : Time description (10 minutes 5 seconds)
+  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
+  $6 : Speed units (mph) : Pace units (per mile)
+  -->
+  <string name="announce_template">My Tracks %1$s %2$.2f %3$s en %4$s at %5$s %6$s</string>
+
+  <!-- Check Units -->
+  <string name="check_units_title">Avís de les unitats de mesura</string>
+  <string name="check_units_message">Les unitats són mètriques per defecte. Voleu canviar aquest paràmetre?</string>
+
+  <!-- Fake preference keys - never saved, but show options in the preferences screen -->
+  <string name="bluetooth_options">Opcions del Bluetooth</string>
+  <string name="bluetooth_pairing">Associació de dispositius</string>
+  <string name="bluetooth_pairing_summary">Obriu els paràmetres de bluetooth de l\'Android per associar un dispositiu</string>
+  <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
+  <string name="sensor_options">Opcions del sensor</string>
+
+  <!-- Bluetooth Sensor -->
+  <string name="bluetooth_connected">Connectat a %s</string>
+  <string name="bluetooth_connecting">Connexió del sensor bluetooth...</string>
+  <string name="bluetooth_not_connected">El sensor bluetooth no està connectat</string>
+
+  <!-- Sensor State -->
+  <string name="sensor_data_time">Dades del sensor de temps</string>
+  <string name="power_meter_enabled">S\'ha habilitat el mesurador de potència</string>
+  <string name="heart_rate_monitor_enabled">S\'ha habilitat el monitor de la freqüència cardíaca</string>
+  <string name="no_sensor_manager">Cap gestor de sensors</string>
+  <string name="enabled">Habilitat</string>
+  <string name="connecting">S\'està connectant</string>
+  <string name="connected">S\'ha connectat</string>
+  <string name="disconnected">S\'ha desconnectat</string>
+  <string name="no_sensor_service">Cap servei de sensor</string>
+  <string name="searching">S\'està cercant</string>
+  <string name="sending">S\'està enviant</string>
+
+  <!-- Sensor Type Options -->
+  <string name="no_sensor_option">Cap</string>
+</resources>

MyTracks/res/values-de/arrays.xml

@@ -17,7 +17,7 @@ limitations under the License.
 <resources>
   <!-- Task frequency -->
   <string-array name="task_frequency_options">
-    <item>Off</item>
+    <item>Aus</item>
     <item>1 min</item>
     <item>2 min</item>
     <item>5 min</item>
@@ -48,7 +48,6 @@ limitations under the License.
     <item>328 Fuß</item>
   </string-array>
 
-
   <!-- Maximum recording distance -->
   <string-array name="max_recording_distance_options">
     <item>50 m</item>
@@ -70,8 +69,8 @@ limitations under the License.
 
   <!-- Minimum recording interval -->
   <string-array name="min_recording_interval_options">
-    <item>batterie sparend (adaptiv)</item>
-    <item>hohe genauigkeit (adaptiv)</item>
+    <item>batteriesparend (adaptiv)</item>
+    <item>hohe Genauigkeit (adaptiv)</item>
     <item>maximal (empfohlen)</item>
     <item>2 s</item>
     <item>3 s</item>
@@ -113,9 +112,9 @@ limitations under the License.
     <item>3,1 Meilen (sehr schlechtes GPS-Signal)</item>
   </string-array>
 
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>Nicht zerteilen</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Aus</item>
     <item>100 km</item>
     <item>50 km</item>
     <item>25 km</item>
@@ -132,13 +131,13 @@ limitations under the License.
   </string-array>
 
   <string-array name="split_frequency_options_ft">
-    <item>Nicht zerteilen</item>
-    <item>100 meilen</item>
-    <item>50 meilen</item>
-    <item>25 meilen</item>
-    <item>10 meilen</item>
-    <item>5 meilen</item>
-    <item>1 meile</item>
+    <item>Aus</item>
+    <item>100 Meilen</item>
+    <item>50 Meilen</item>
+    <item>25 Meilen</item>
+    <item>10 Meilen</item>
+    <item>5 Meilen</item>
+    <item>1 Meile</item>
     <item>60 min</item>
     <item>30 min</item>
     <item>15 min</item>
@@ -159,7 +158,7 @@ limitations under the License.
     <item>Laufbahn</item>
     <item>Geländelauf</item>
     <item>Gehen</item>
-    <item>Schnelles Gehen</item>
+    <item>Gehen (Sport)</item>
     <item>Wandern</item>
     <item>Bergwandern</item>
     <item>Bergsteigen</item>
@@ -181,11 +180,11 @@ limitations under the License.
     <item>Eissegeln</item>
 
     <item>Segeln</item>
-    <item>Kanadierfahren</item>
-    <item>Kajakfahren</item>
+    <item>Paddeln</item>
+    <item>Kajak fahren</item>
     <item>Kanuwandern</item>
     <item>Rudern</item>
-    <item>Motorbootfahren</item>
+    <item>Motorboot fahren</item>
     <item>Fähre</item>
     <item>Ferngesteuertes Boot</item>
     <item>Surfen</item>
@@ -229,13 +228,14 @@ limitations under the License.
     <item>Bank</item>
     <item>Kneipe</item>
     <item>Grill</item>
+    <item>Imbiss</item>
     <item>Gebäude</item>
     <item>Bushaltestelle</item>
     <item>Straßenbahnhaltestelle</item>
     <item>Bahnhof</item>
     <item>S-Bahnhof</item>
     <item>Café</item>
-    <item>Lagerfeuer</item>
+    <item>Feuerstelle</item>
     <item>Campingplatz</item>
     <item>Zeltplatz</item>
     <item>Kirche</item>
@@ -278,6 +278,7 @@ limitations under the License.
     <item>Tunnel</item>
     <item>Baum</item>
     <item>Wasserfall</item>
+    <item>Springbrunnen</item>
     <item>Wegpunkt</item>
   </array>
 

MyTracks/res/values-de/strings.xml

@@ -15,63 +15,64 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-
   <!-- Used by the Menu -->
   <string name="start_recording">Track aufzeichnen</string>
   <string name="stop_recording">Aufzeichnung anhalten</string>
   <string name="switch_to_sat">Satellitenansicht</string>
   <string name="switch_to_map">Kartenansicht</string>
   <string name="mylocation">Mein Aufenthaltsort</string>
+  <!--string name="list_tracks">Tracks</string-->
   <string name="list_markers">Wegpunkte</string>
   <string name="delete_all_tracks">Alle Tracks löschen</string>
   <string name="settings">Einstellungen</string>
   <string name="elevation">Höhe</string>
-  <string name="choose_track_message">Bitte wählen Sie einen Track zur Ansicht aus</string>
+  <string name="choose_track_message">Bitte wähle einen Track zur Ansicht aus</string>
   <string name="current_track">Aktueller Track</string>
   <string name="current_segment">Letztes Segment</string>
+  <string name="sensor_state">Sensorstatus</string>
+  <string name="aggregated_stats">Aggregierte Statistiken</string>
 
   <!-- Error messages -->
-  <string name="error_no_location_manager">Es wurde kein \'Location Manager\' auf diesem Gerät gefunden.</string>
-  <string name="error_no_gps_location_provider">Konnte keinen GPS-Empfänger auf diesem Gerät finden.</string>
-  <string name="error_sending_to_mymap">Beim Senden Ihres Tracks an Google My Maps ist ein Fehler aufgetreten. Bitte versuchen Sie es später nochmal.</string>
-  <string name="error_sending_to_docs">Beim Senden Ihres Tracks an Google Docs ist ein Fehler aufgetreten. Bitte versuchen Sie es später nochmal.</string>
-  <string name="error_unable_to_start_recording">Aufzeichnen fehlgeschlagen. Bitte versuchen Sie es nochmal.</string>
-  <string name="error_unable_to_stop_recording">Anhalten unmöglich. Bitte versuchen Sie es nochmal.</string>
-  <string name="error_unable_to_read_file">Datei nicht lesbar.</string>
+  <string name="error_no_location_manager">Es wurde kein Dienst zur Positionsermittlung auf diesem Gerät gefunden.</string>
+  <string name="error_no_gps_location_provider">Es wurde kein GPS-Empfänger auf diesem Gerät gefunden.</string>
+  <string name="error_sending_to_fusiontables">Beim Senden des Tracks an Google Fusion Tables ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
+  <string name="error_sending_to_docs">Beim Senden des Tracks an Google Text &amp; Tabellen ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
+  <string name="error_unable_to_start_recording">Start der Aufzeichnung fehlgeschlagen. Bitte versuche es noch einmal.</string>
+  <string name="error_unable_to_stop_recording">Anhalten unmöglich. Bitte versuche es noch einmal.</string>
+  <string name="error_unable_to_read_file">Konnte Datei nicht lesen.</string>
   <string name="error_invalid_gpx_format">Datei ist nicht im GPX-Format.</string>
-  <string name="error_generic">Ein Fehler ist aufgetreten. Bitte versuchen Sie es nochmal.</string>
+  <string name="error_generic">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
   <string name="error_track_does_not_exist">Track existiert nicht.</string>
-  <string name="error_out_of_memory">Die Datei ist zu groß (Obergrenze sind 500 KB). Operation abgebrochen.</string>
+  <string name="error_out_of_memory">Die Datei ist zu groß (maximal 500 KB). Operation abgebrochen.</string>
   <string name="error_unable_to_insert_marker">Der Wegpunkt kann nicht einfügt werden. Keine Positionsbestimmung möglich.</string>
 
   <!-- Status messages -->
-  <string name="wait_for_fix">Warten auf ein besseres GPS-Signal. Bitte stellen Sie sicher, dass der Himmel sichtbar ist.</string>
+  <string name="wait_for_fix">Warte auf ein besseres GPS-Signal. Bitte stelle sicher, dass der Himmel sichtbar ist.</string>
   <string name="status_now_recording">Ein neuer Track wird aufgezeichnet.</string>
-  <string name="status_stopped_recording">Die Aufzeichnung wurde beendet.</string>
-  <string name="status_new_mymap_has_been_created">Eine neue Karte wurde auf maps.google.com erstellt.</string>
-  <string name="status_tracks_have_been_uploaded">Ihr Track wurde auf maps.google.com gespeichert.</string>
-  <string name="status_tracks_have_been_uploaded_to_new_doc">Ihr Track wurde in einer neuen Tabelle bei docs.google.com gespeichert.</string>
-  <string name="status_tracks_have_been_uploaded_to_docs">Ihr Track wurde an docs.google.com gesendet.</string>
-  <string name="status_mymap_info">Manchmal dauert es ein paar Minuten, bis neue Tracks bei maps.google.com erscheinen.</string>
-  <string name="status_enable_gps">Berühren Sie hier um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücken Sie dann den Zurück-Knopf um zurückzukehren.</string>
-  <string name="status_approximate_location">Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Funktürmen und WiFi-Netzwerken.</string>
-  <string name="status_no_location">Ihre Position kann derzeit nicht bestimmt werden. Aktivieren Sie mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stellen Sie sicher, dass der Himmel sichtbar ist.</string>
+  <string name="status_stopped_recording">Die Aufzeichnung wurde angehalten.</string>
+  <string name="status_new_fusiontable_has_been_created">Eine neue Tabelle wurde auf google.com/fusiontables erstellt.</string>
+  <string name="status_tracks_have_been_uploaded">Dein Track wurde auf maps.google.com gespeichert.</string>
+  <string name="status_tracks_have_been_uploaded_to_new_doc">Dein Track wurde in einer neuen Tabelle bei docs.google.com gespeichert.</string>
+  <string name="status_tracks_have_been_uploaded_to_docs">Dein Track wurde an docs.google.com gesendet.</string>
+  <string name="status_enable_gps">Hier berühren, um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücke dann den Zurück-Knopf, um hierher zurückzukehren.</string>
+  <string name="status_approximate_location">Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Mobilfunkstationen und WiFi-Netzwerken.</string>
+  <string name="status_no_location">Die Position kann derzeit nicht bestimmt werden. Aktiviere mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stelle sicher, dass der Himmel sichtbar ist.</string>
   <string name="status_waypoint_inserted">Ein Wegpunkt wurde eingefügt.</string>
   <string name="status_statistics_inserted">Ein Statistikwegpunkt wurde eingefügt.</string>
 
   <!-- Progress dialog -->
   <string name="progress_title">Bitte warten…</string>
-  <string name="progress_message">Ihr GPS-Track wird an Google gesendet.</string>
-  <string name="progress_message_reading_track">Lese Track</string>
-  <string name="progress_message_preparing_track">Bereite Track vor</string>
-  <string name="progress_message_authenticating_mymaps">Anmelden bei Google Maps</string>
-  <string name="progress_message_authenticating_docs">Anmelden bei Google Docs</string>
-  <string name="progress_message_sending_docs">Track an Google Docs senden</string>
-  <string name="progress_message_sending_mymaps">Track an Google Maps senden</string>
-  <string name="progress_message_creating_map">Neue \'Meine Karte\' erstellen</string>
-  <string name="import_progress_message">Importiere GPS-Track. Das dauert ein wenig.</string>
-  <string name="write_progress_message">Schreibe Datei auf SD-Karte. Das dauert ein wenig.</string>
-  <string name="progress_message_updating_track">Aktualisiere Trackstatistik</string>
+  <string name="progress_message">Dein Track wird an Google gesendet...</string>
+  <string name="progress_message_reading_track">Lese Track...</string>
+  <string name="progress_message_preparing_track">Bereite Track vor...</string>
+  <string name="progress_message_authenticating_fusiontables">Anmeldung bei Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_docs">Anmeldung bei Google Text &amp; Tabellen...</string>
+  <string name="progress_message_sending_docs">Track wird an Google Text &amp; Tabellen gesendet...</string>
+  <string name="progress_message_sending_fusiontables">Track wird an Google Fusion Tables gesendet...</string>
+  <string name="progress_message_creating_fusiontable">Neue \'Fusion Tabelle\' wird erstellt...</string>
+  <string name="import_progress_message">Importiere GPS-Track. Das kann ein wenig dauern.</string>
+  <string name="write_progress_message">Schreibe Datei auf SD-Karte. Das kann ein wenig dauern.</string>
+  <string name="progress_message_updating_track">Aktualisiere Trackstatistik...</string>
 
   <!-- Used by DeleteAllDataHandler -->
   <string name="are_you_sure_question">Bist Du Dir wirklich sicher?</string>
@@ -79,50 +80,65 @@ limitations under the License.
   <string name="track_will_be_permanently_deleted">Dieser Track und seine Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
   <string name="marker_will_be_permanently_deleted">Dieser Wegpunkt wird endgültig von diesem Gerät gelöscht.</string>
 
-  <!-- Text and links when uploading to Google MyMaps -->
-  <string name="new_map_title">Neue Karte</string>
+  <!-- Text and links when uploading to Google Fusion Tables -->
+  <string name="new_map_description">Erstellt von My Tracks für Android.</string>
+  <string name="fusiontable_link">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Punkte</string>
   <string name="recorded_date">Aufgezeichnet am</string>
-  <string name="category">"Aktivität"</string>
-  <string name="waypoint_category">"Art des Wegpunktes"</string>
-  <string name="part">"(Teil %d)"</string>
+  <string name="category">Aktivität</string>
+  <string name="waypoint_category">Art des Wegpunktes</string>
+  <string name="part">(Teil %d)</string>
 
   <!-- Used by the track recording service -->
-  <string name="recording_your_track">"Ihr Track wird aufgezeichnet…"</string>
+  <string name="recording_your_track">Dein Track wird aufgezeichnet…</string>
+  <!--string name="new_track">Track %d</string-->
 
   <!-- Common -->
   <string name="no">Nein</string>
   <string name="yes">Ja</string>
+  <!--string name="ok">OK</string-->
   <string name="error">Fehler</string>
   <string name="success">Erfolgreich</string>
   <string name="waypoint">Wegpunkt</string>
+  <string name="license">Lizenz</string>
+  <string name="cancel">Abbrechen</string>
+  <string name="close">Schließen</string>
+  <string name="edit">Bearbeiten</string>
+  <string name="save">Sichern</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(Anfang)</string>
+  <!--string name="start">(Start)</string-->
   <string name="end">(Ende)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Anzeigen</string>
-  <string name="tracklist_send_to_mymaps">An eine Google MyMaps-Karte senden</string>
-  <string name="tracklist_send_to_new_mymap">An eine neue Google MyMaps-Karte senden</string>
-  <string name="tracklist_send_to_docs">An Google Docs senden</string>
+  <string name="tracklist_send_to_fusiontables">An eine Google Fusion Tables-Karte senden</string>
+  <string name="tracklist_send_to_new_fusiontable">An eine neue Google Fusion Tables-Karte senden</string>
+  <string name="tracklist_send_to_docs">An Google Text &amp; Tabellen senden</string>
   <string name="tracklist_send_to_google">An Google senden…</string>
   <string name="tracklist_delete_track">Vom Gerät löschen…</string>
   <string name="tracklist_edit_track">Bearbeiten</string>
   <string name="tracklist_write_to_sd">Auf SD-Karte speichern…</string>
   <string name="tracklist_save_as_gpx">GPX-Datei exportieren</string>
   <string name="tracklist_save_as_kml">KML-Datei exportieren</string>
-  <string name="tracklist_btn_send_all_to_mymaps">An Google MyMaps senden</string>
+  <string name="tracklist_save_as_csv">CSV-Datei exportieren</string>
+  <string name="tracklist_save_as_tcx">TCX-Datei exportieren</string>
+  <string name="tracklist_btn_send_all_to_fusiontables">An Google Fusion Tables senden</string>
   <string name="tracklist_btn_delete_all">Alle Tracks löschen</string>
-  <string name="tracklist_pick_one">Eine Track auswählen. Lange berühren für mehr Optionen.</string>
-  <string name="tracklist_all_tracks">Alle Tracks:</string>
+  <!-- Export All -->
+  <string name="tracklist_btn_export_all">Alle Tracks exportieren</string>
+  <string name="export_done">Exportieren beendet</string>
+  <string name="tracklist_pick_one">Einen Track auswählen. Lange berühren für mehr Optionen.</string>
+  <string name="tracklist_all_tracks">Alle Tracks</string>
   <string name="tracklist_this_track">Dieser Track</string>
   <string name="tracklist_share_track">Mit Freunden teilen…</string>
-  <string name="tracklist_share_link">Ein Link zur Google MyMaps-Karte</string>
+  <string name="tracklist_share_linkfusion">Ein Link zur Google Fusion Tables-Karte</string>
   <string name="tracklist_share_gpx_file">Eine GPX-Datei</string>
   <string name="tracklist_share_kml_file">Eine KML-Datei</string>
+  <string name="tracklist_share_csv_file">Eine CSV-Datei</string>
+  <string name="tracklist_share_tcx_file">Eine TCX-Datei</string>
   <string name="tracklist_clear_map">Karte zurücksetzen.</string>
 
   <!-- Waypoints list -->
@@ -138,86 +154,104 @@ limitations under the License.
   <!-- MyTracks Details -->
   <string name="trackdetails_title">Trackdetails</string>
   <string name="trackdetails_name">Name</string>
+  <string name="trackdetails_name_hint">Name</string>
   <string name="trackdetails_description">Beschreibung</string>
+  <string name="trackdetails_description_hint">Beschreibung</string>
   <string name="trackdetails_category">Aktivität (z. B. Wandern, Fahrradfahren, Laufen, Klettern…)</string>
+  <string name="trackdetails_category_hint">Aktivität</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="waypointdetails_title">Wegpunktdetails</string>
   <string name="waypointdetails_name">Wegpunktname</string>
+  <string name="waypointdetails_name_hint">Wegpunktname</string>
   <string name="waypointdetails_description">Wegpunktbeschreibung</string>
+  <string name="waypointdetails_description_hint">Wegpunktbeschreibung</string>
   <string name="waypointdetails_category">Art des Wegpunktes (z. B. Gebäude, Schlagloch, Sehenswürdigkeit…)</string>
+  <string name="waypointdetails_category_hint">Art des Wegpunktes</string>
 
   <!-- MyTracks Settings -->
   <string name="mytracks_settings">Einstellungen für My Tracks</string>
   <string name="settings_display">Anzeige</string>
-  <string name="settings_recording">Aufzeichnen</string>
-  <string name="settings_sharing">Mit Freunden Teilen</string>
+  <string name="settings_recording">Aufzeichnung</string>
+  <string name="settings_sharing">Mit Freunden teilen</string>
 
-  <string name="settings_announcement_frequency">Dauer zwischen Ansagen:</string>
-  <string name="settings_announcement_frequency_summary">Kürzeste Zeit zwichen zwei Ansagen</string>
-  <string name="settings_announcement_not_available_summary">Gesprochene Ansagen sind mit Ihrer Version von Android nicht verfügbar.</string>
+  <string name="settings_not_available_summary">In dieser Android-Version nicht verfügbar</string>
 
-  <string name="settings_min_recording_distance">Kleinste Entfernung zwischen Punkten:</string>
+  <string name="settings_announcement_frequency">Dauer zwischen Ansagen</string>
+  <string name="settings_announcement_frequency_summary">Kürzeste Zeit zwischen zwei Ansagen</string>
+
+  <string name="settings_min_recording_distance">Kleinste Entfernung zwischen Punkten</string>
   <string name="settings_min_recording_distance_summary">Kleinste Entfernung zwischen zwei Positionsaufzeichnungen</string>
 
-  <string name="settings_max_recording_distance">Neues Segment wenn Punkte weiter entfernt als:</string>
-  <string name="settings_max_recording_distance_summary">Der Track wird in Zwei geteilt wenn zwei folgende Punkte weiter entfernt sind als hier angegeben.</string>
+  <string name="settings_max_recording_distance">Neues Segment, wenn Punkte weiter entfernt als</string>
+  <string name="settings_max_recording_distance_summary">Der Track wird in zwei geteilt, wenn zwei folgende Punkte weiter entfernt sind als hier angegeben.</string>
 
-  <string name="settings_min_recording_interval">Aufzeichnungsfrequenz:</string>
-  <string name="settings_min_recording_interval_summary">Kürzeste Zeit zwischen zwei Positionsaufzeichnungen.</string>
+  <string name="settings_min_recording_interval">Aufzeichnungsfrequenz</string>
+  <string name="settings_min_recording_interval_summary">Kürzeste Zeit zwischen zwei Positionsaufzeichnungen</string>
 
-  <string name="settings_min_required_accuracy">Aufzeichnung pausieren wenn Genauigkeit kleiner als:</string>
-  <string name="settings_min_required_accuracy_summary">Die Aufzeichnung wird kurzfristig angehalten, wenn Ihre Position nicht genauer als hier angegeben ermittelt werden kann.</string>
+  <string name="settings_min_required_accuracy">Aufzeichnung pausieren, wenn Genauigkeit kleiner als</string>
+  <string name="settings_min_required_accuracy_summary">Die Aufzeichnung wird kurzfristig angehalten, wenn Deine Position nicht genauer als hier angegeben ermittelt werden kann.</string>
 
   <string name="settings_metric_units">Entfernungen in metrischen Einheiten anzeigen</string>
   <string name="settings_metric_units_summary_on">Alle Entfernungen werden in metrischen Einheiten angezeigt.</string>
-  <string name="settings_metric_units_summary_off">Alle Entfernungen werden in britischen Längeneinheiten angezeigt.</string>
+  <string name="settings_metric_units_summary_off">Alle Entfernungen werden in imperialen Längeneinheiten angezeigt.</string>
 
   <string name="settings_map_public">Karten auf maps.google.com veröffentlichen</string>
   <string name="settings_map_public_summary_on">Hochgeladene Karten auf maps.google.com sind für alle sichtbar.</string>
   <string name="settings_map_public_summary_off">Hochgeladene Karten auf maps.google.com werden nicht öffentlich sichtbar aufgelistet.</string>
 
-  <string name="settings_report_speed_or_pace">Geschwindigkeitsanzeige:</string> 
+  <string name="settings_report_speed_or_pace">Geschwindigkeitsanzeige</string>
   <string name="settings_report_speed_or_pace_summary_on">Geschwindigkeit wird angezeigt.</string>
-  <string name="settings_report_speed_or_pace_summary_off">Gangart wird angezeigt.</string>
+  <string name="settings_report_speed_or_pace_summary_off">Pace wird angezeigt.</string>
 
   <string name="settings_share_url_only">Nur URL als Einladung zum Teilen senden</string>
-  <string name="settings_share_url_only_summary_on">Beim teilen mit Freunden wird nur die Karten URL gesendet.</string>
-  <string name="settings_share_url_only_summary_off">Beim teilen mit Freunden wird der GPS Track selbst gesendet.</string>
+  <string name="settings_share_url_only_summary_on">Beim Teilen mit Freunden wird nur die Karten-URL gesendet.</string>
+  <string name="settings_share_url_only_summary_off">Beim Teilen mit Freunden wird der GPS-Track selbst gesendet.</string>
 
-  <string name="settings_signal_sampling_frequency">Empfangsstärke Aufzeichnungsfrequenz</string>
-  <string name="settings_signal_sampling_frequency_summary">Dauer zwischen zwei Aufzeichnungen der Telefonempfangsstärke.</string>
+  <string name="settings_split_frequency">Zerteilungsfrequenz</string>
+  <string name="settings_split_frequency_summary">Längste Dauer oder Entfernung, nach der automatisch ein Marker eingefügt wird.</string>
 
-  <string name="settings_split_frequency">Zerteilungs Frequenz</string>
-  <string name="settings_split_frequency_summary">Längste Dauer oder Entfernung nach der automatisch ein Marker eingefügt wird.</string>
-  <string name="pace_label">Tempo</string>
+   <string name="settings_auto_resume_track_timeout">Zeitbegrenzung der Auto-Wiederaufnahme</string>
+  <string name="settings_auto_resume_track_timeout_summary">Maximale Zeit in Minuten, nach der eine abgebrochene Aufzeichnung nach einem Telefonneustart wiederaufgenommen wird.</string>
+
+  <string name="settings_timestamp_track_name">Zeitstempel als Trackname</string>
+  <string name="settings_timestamp_track_name_summary_on">Der Trackname wird aus Datum und Zeit zum Aufzeichnungsbeginn zusammengesetzt.</string>
+  <string name="settings_timestamp_track_name_summary_off">Tracknamen erhalten eine fortlaufende Nummer.</string>
+
+  <string name="pace_label">Pace</string>
+
+  <string name="eclair_required">Wird nur unter Android 2.0 oder höher unterstützt</string>
+  <string name="settings_sensor_type">Sensortyp</string>
+  <string name="settings_sensor_type_summary">Der Typ des zu verbindenden Sensors</string>
+  <string name="settings_heart_rate_ant_sensor_id">Verbindung mit ANT Herzqrequenzmesser aufheben</string>
+  <string name="settings_power_ant_sensor_id">Verbindung mit ANT Kraftmesser aufheben</string>
+  <string name="settings_srm_bridge_ant_sensor_id">Verbindung mit ANT srm bridge aufheben</string>
+  <string name="settings_ant_not_paired">ANT-Sensor nicht verbunden</string>
+  <string name="settings_ant_paired">ANT-Sensor verbunden mit: %d</string>
+  <string name="bluetooth_sensor_title">Bluetooth-Sensor</string>
+  <string name="bluetooth_sensor_summary">Der zu verbindende Bluetoothsensor</string>
+  <string name="settings_modular_stats_display_title">Art der Datenanzeige</string>
+
+  <!-- Backups -->
+  <string name="settings_backup">Datensicherung (BETA)</string>
+  <string name="settings_sd_backup">SD-Karten-Sicherung</string>
+  <string name="settings_backup_to_sd">Jetzt sichern</string>
+  <string name="settings_backup_to_sd_summary">Eine Kopie aller Deiner Tracks und Einstellungen auf die SD-Karte schreiben</string>
+  <string name="settings_restore_from_sd">Jetzt wiederherstellen</string>
+  <string name="settings_restore_from_sd_summary">Alle Tracks und Einstellungen von der SD-Karte holen.</string>
+  <string name="settings_no_backup_while_recording">Während ein Track aufgezeichnet wird, kann nicht mit der Datensicherung gearbeitet werden.</string>
+
+  <string name="restore_overwrites_warning">Eine Wiederherstellung von der SD-Karte ÜBERSCHREIBT alle vorhandenen Tracks und Einstellungen. Willst Du das wirklich?</string>
+  <string name="select_backup_to_restore">Wähle die wiederherzustellende Datensicherung aus</string>
+  <string name="no_backups">Keine Datensicherungen gefunden.</string>
+  <string name="backup_write_progress_message">Schreibe alle Tracks und Einstellungen auf die SD-Karte. Dies kann eine Weile dauern...</string>
+  <string name="backup_import_progress_message">Lese alle Tracks und Einstellungen von der SD-Karte. Dies kann eine Weile dauern...</string>
 
   <!-- MyTracksSky -->
   <string name="mytracks_sky">GPS-Satelliten</string>
 
-  <!-- MyMaps -->
-  <string name="select_map_message">Wähle eine Karte von Deinem Konto aus:</string>
-  <string name="create_new_map">Neue Karte erstellen…</string>
-  <string name="map_list_title">An Google My Maps senden</string>
-  <string name="maps_list_loading">Karten werden geladen…</string>
-  <string name="maps_list_failed">Ihre Karten konnten im Augenblick nicht geladen werden!</string>
-  <string name="open_map">Diese Karte auswählen</string>
-  <string name="edit_map_details">Kartendetails bearbeiten</string>
-  <string name="share_map">Karte mit Freunden teilen</string>
-  <string name="share_track">Track mit Freunden teilen</string>
-  <string name="delete_map">Karte vom Konto löschen</string>
-  <string name="map_title">Kartentitel:</string>
-  <string name="map_description">Trackbeschreibung:</string>
-  <string name="map_searchable_edit">Diese Karte und Ihren Inhalt in Suchergebnissen sichtbar machen.</string>
-  <string name="map_not_searchable_edit">Diese Karte und Ihren Inhalt nicht in Suchergebnissen sichtbar machen.</string>
-  <string name="map_searchable">Diese Karte und Ihr Inhalt sind in Suchergebnissen sichtbar.</string>
-  <string name="map_not_searchable">Weder diese Karte noch Ihr Inhalt sind in Suchergebnissen sichtbar, allerdings können Sie trotzdem von anderen durch einen direkten Link angezeigt werden.</string>
-  <string name="close">Schließen</string>
-  <string name="edit">Bearbeiten</string>
-  <string name="cancel">Abbrechen</string>
-  <string name="save">Sichern</string>
-
   <!-- Sharing -->
+  <string name="share_map">Karte mit Freunden teilen</string>
   <string name="share_map_subject">Ich möchte gerne eine Karte mit Dir teilen.</string>
   <string name="share_map_body_format">Vielleicht interessierst Du Dich für diese Karte:
 
@@ -225,7 +259,10 @@ limitations under the License.
   <string name="send_track_subject">Ich möchte einen GPS-Track mit Dir teilen</string>
   <string name="send_track_body_format">Vielleicht interessierst Du Dich für diese Track:
 
-      %s.</string>
+      Der Track kann mit Google Earth oder anderer Karten-Software visualisiert werden.</string>
+  <string name="share_track">Track mit Freunden teilen</string>
+
+  <!-- Visibility -->
   <string name="public_map">Öffentlich</string>
   <string name="unlisted_map">Nicht in Suchergebnissen enthalten.</string>
   <string name="mapslist_no_maps_available">Du hast noch keine Karten.</string>
@@ -233,11 +270,11 @@ limitations under the License.
   <!-- Statistics View -->
   <!-- Average Moving -->
   <string name="average_moving_speed_label">Durchschnitt in Bew.</string>
-  <string name="average_moving_pace_label">Durchschnitt in Bew.</string>
+  <string name="average_moving_pace_label">Pace in Bew.</string>
 
   <!-- Average -->
   <string name="average_speed_label">Durchschnittsgeschw.</string>
-  <string name="average_pace_label">Durchschnittstempo</string>
+  <string name="average_pace_label">Durchschnitts-Pace</string>
 
   <string name="elevation_chart_name">Höhenprofil</string>
   <string name="elevation_gain_label">Höhengewinn</string>
@@ -248,7 +285,7 @@ limitations under the License.
   <!-- Min -->
   <string name="min_elevation_label">Niedrigste Höhenlage</string>
   <string name="min_grade_label">Minimale Steigung</string>
-  <string name="min_pace_label">Schnellstes Tempo</string>
+  <string name="min_pace_label">Minimaler Pace</string>
 
   <!-- Max -->
   <string name="max_elevation_label">Höchste Höhenlage</string>
@@ -258,35 +295,51 @@ limitations under the License.
   <string name="loading_track">Lade Track…</string>
 
   <!-- Chart Settings -->
-  <string name="chart_settings">Diagram Einstellungen</string>
+  <string name="chart_settings">Diagramm-Einstellungen</string>
   <!-- X Axis -->
-  <string name="x_axis">X Achse</string>
+  <string name="x_axis">X-Achse</string>
   <string name="by_distance">Nach Entfernung</string>
   <string name="by_time">Nach Zeit</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Y Achse</string>
+  <string name="y_axis">Y-Achse</string>
 
   <!-- Units -->
   <!-- Time  -->
   <string name="hour">Stunde</string>
   <string name="hours">Stunden</string>
   <string name="hr">Std</string>
+  <string name="min">Min</string>
   <string name="minute">Minute</string>
   <string name="minutes">Minuten</string>
   <string name="second">Sekunde</string>
   <string name="seconds">Sekunden</string>
+  <!--string name="milliseconds">ms</string-->
 
   <!-- Distance -->
-  <string name="feet">Fuß</string>
+  <!--string name="meter">m</string-->
+  <!--string name="kilometer">km</string-->
   <string name="kilometers_long">Kilometer</string>
+  <string name="feet">Fuß</string>
+  <!--string name="mile">mi</string-->
   <string name="miles_long">Meilen</string>
 
   <!-- Speed and Pace -->
+  <!--string name="kilometer_per_hour">km/h</string-->
   <string name="kilometer_per_hour_long">Kilometer pro Stunde</string>
+  <!--string name="min_per_kilometer">min/km</string-->
   <string name="per_kilometer">pro Kilometer</string>
+  <!--string name="mile_per_hour">mi/h</string-->
   <string name="mile_per_hour_long">Meilen pro Stunde</string>
-  <string name="per_mile">pro meile</string>
+  <!--string name="min_per_mile">min/mi</string-->
+  <string name="per_mile">pro Meile</string>
+
+  <!-- Sensors -->
+  <!--string name="watts">W</string-->
+
+  <!--string name="revolutions_per_minute">rpm</string-->
+  <!--string name="bpm">bpm</string-->
+  <string name="battery_level">Akkukapazität</string>
 
   <!-- Stats Labels -->
   <string name="moving_time_label">Zeit in Bewegung</string>
@@ -294,10 +347,15 @@ limitations under the License.
   <string name="time_label">Zeit</string>
   <string name="sd_unavail">SD-Karte nicht verfügbar</string>
   <string name="speed">Geschwindigkeit</string>
-  <string name="start_trip">Sie müssen erst eine Strecke zurücklegen.</string>
+  <string name="start_trip">Du musst erst eine Aufzeichnung beginnen.</string>
   <string name="statistics">Statistik</string>
   <string name="total_distance_label">Gesamtentfernung</string>
   <string name="distance_label">Entfernung</string>
+  <string name="power">Kraft</string>
+  <string name="cadence">Kadenz</string>
+  <string name="heart_rate">Herzfrequenz</string>
+  <string name="max_heart_rate">Höchste Herzfrequenz</string>
+  <!--string name="unknown">-</string-->
   <string name="waiting">Bitte warten…</string>
 
   <!-- End User License Agreement -->
@@ -308,37 +366,43 @@ limitations under the License.
   <!-- About -->
   <string name="about">Über</string>
   <string name="help">Hilfe</string>
-  <string name="about_email">Unterstützung</string>
+  <!--string name="about_team">Team:</string-->
+  <!--string name="about_version">Version:</string-->
+  <string name="about_support">Unterstützung:</string>
+  <string name="about_privacy">Datenschutz:</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Senden an…</string>
+  <!--string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string-->
+  <string name="sendtogoogle_google_docs">Google Text &amp; Tabellen</string>
   <string name="sendtogoogle_send_now">Jetzt senden</string>
-  <string name="sendtogoogle_create_new_map">Neue Karte erstellen</string>
-  <string name="sendtogoogle_pick_existing_map">Eine Karte auswählen</string>
   <string name="sendtogoogle_send_stats">Trackstatistik senden</string>
   <string name="sendtogoogle_send_stats_and_points">Statistik und Punkte senden</string>
 
   <!-- Getting the account to upload to. -->
   <string name="no_account_found_title">Kein Konto vorhanden</string>
-  <string name="no_account_found">Kein Konto gefunden um Tracks zu versenden.</string>
-  <string name="choose_account_title">Wählen Sei ein Konto</string>
+  <string name="no_account_found">Kein Konto gefunden, um Tracks zu versenden.</string>
+  <string name="choose_account_title">Wähle ein Konto</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">Keine externes Speichermedium verfügbar. Stellen Sie sicher, dass eine SD-Karte vorhanden ist und nicht bereits von einem Computer darauf zugegriffen wird.</string>
+  <string name="io_no_external_storage_found">Keine externes Speichermedium verfügbar. Stelle sicher, dass eine SD-Karte vorhanden ist und nicht bereits von einem Computer darauf zugegriffen wird.</string>
   <string name="io_write_failed">Die Datei kann nicht geschrieben werden.</string>
+  <string name="io_read_failed">Die Datei konnte nicht gelesen werden.</string>
   <string name="io_create_dir_failed">Das Verzeichnis auf der SD-Karte kann nicht erstellt werden.</string>
   <string name="io_write_finished">Der Track wurde auf die SD-Karte geschrieben.</string>
+  <string name="io_read_finished">Lesen von der SD-Karte beendet.</string>
 
   <!-- VersionChecker -->
   <string name="version_check_title">Suche nach neuer Version</string>
   <string name="version_check_upgrade_button">Jetzt aktualisieren</string>
-  <string name="version_check_continue_button">Fortfahren ohne zu aktualisieren</string>
-  <string name="upgrade_required">Ihre Version von %1$s funktioniert möglicherweise nicht mehr richtig und wird nicht mehr unterstützt. Bitte aktualisieren Sie %1$s.</string>
-  <string name="upgrade_recommended">Ihre Version von %1$s funktioniert möglicherweise nicht mehr richtig. Sie können sie jetzt aktualisieren, oder auf sie auf eigene Gefahr weiterverwenden. Einige Funktionen wie Datenaustausch mit Google-Diensten wird möglicherweise nicht mehr funktionieren, solange Sie die Software nicht aktualisieren.</string>
-  <string name="upgrade_available">Eine neue Version von %1$s ist jetzt verfügbar. Sie können Ihre aktuelle Version ohne Probleme weiterverwenden, aber um die neuesten Funktionen in Anspruch nehmen zu können, müssen sie die Software aktualisieren.</string>
+  <string name="version_check_continue_button">Fortfahren, ohne zu aktualisieren</string>
+  <string name="upgrade_required">Deine Version von %1$s funktioniert möglicherweise nicht mehr richtig und wird nicht mehr unterstützt. Bitte aktualisiere %1$s.</string>
+  <string name="upgrade_recommended">Deine Version von %1$s funktioniert möglicherweise nicht mehr richtig. Du kannst sie jetzt aktualisieren, oder auf sie auf eigene Gefahr weiterverwenden. Einige Funktionen wie Datenaustausch mit Google-Diensten werden möglicherweise nicht mehr funktionieren, solange Du die Software nicht aktualisierst.</string>
+  <string name="upgrade_available">Eine neue Version von %1$s ist jetzt verfügbar. Du kannst Deine installierte Version ohne Probleme weiterverwenden, aber um die neuesten Funktionen in Anspruch nehmen zu können, musst Du die Software aktualisieren.</string>
 
   <!-- Welcome -->
   <string name="welcome">Willkommen</string>
+  <string name="welcome_read_later">OK</string>
   <string name="welcome_about">Über My Tracks</string>
 
   <!-- Announcement -->
@@ -352,4 +416,42 @@ limitations under the License.
   $6 : Speed units (mph) : Pace units (per mile)
   -->
   <string name="announce_template">My Tracks %1$s %2$.2f %3$s in %4$s mit %5$s %6$s</string>
+
+  <!-- Check Units -->
+  <string name="check_units_title">Einheitenbenachrichtigung</string>
+  <string name="check_units_message">Voreingestellt sind metrische Einheiten. Willst Du diese Einstellung ändern?</string>
+
+  <!-- Fake preference keys - never saved, but show options in the preferences screen -->
+  <string name="method_bluetooth">Bluetooth</string>
+  <string name="bluetooth_options">Bluetooth-Einstellungen</string>
+  <string name="bluetooth_pairing">Geräteverbindung</string>
+  <string name="bluetooth_pairing_summary">Öffnet Androids Bluetooth-Einstellungen, um Geräte zu verbinden.</string>
+  <!--string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string-->
+  <string name="sensor_options">Sensor-Einstellungen</string>
+
+  <!-- Bluetooth Sensor -->
+  <string name="bluetooth_connected">Verbunden mit %s</string>
+  <string name="bluetooth_connecting">Verbinde mit Bluetooth-Sensor ...</string>
+  <string name="bluetooth_not_connected">Bluetooth-Sensor nicht verbunden.</string>
+
+  <!-- Sensor State -->
+  <string name="sensor_data_time">Uhrzeit</string>
+  <string name="power_meter_enabled">Kraftmesser aktiviert</string>
+  <string name="heart_rate_monitor_enabled">Herzfrequenzmessung aktiviert</string>
+  <string name="no_sensor_manager">Keine Sensoren verfügbar</string>
+  <string name="enabled">Aktiviert</string>
+  <string name="connecting">Verbinde...</string>
+  <string name="connected">Verbunden</string>
+  <string name="disconnected">Getrennt</string>
+  <string name="no_sensor_service">Kein Sensor-Dienst</string>
+  <string name="searching">Suche...</string>
+  <string name="sending">Sende...</string>
+
+  <!-- Manifest description (not seen inside the app) -->
+  <string name="notification_permission_label">Track-Aufzeichnungs-Benachrichtigungen empfangen</string>
+  <string name="read_tracks_permission_label">Aufgezeichnete Trackdaten lesen</string>
+  <string name="write_tracks_permission_label">Aufgezeichnete Trackdaten schreiben, Starten/Anhalten des Aufzeichnens von Tracks</string>
+  <string name="notification_permission_description">Werde benachrichtigt, wenn die Aufzeichnung eines Tracks beginnt oder anhält.</string>
+  <string name="read_tracks_permission_description">Ermöglicht das Lesen von Trackdaten wie Messpunkten oder Wegpunkten.</string>
+  <string name="write_tracks_permission_description">Ermöglicht das Schreiben von Trackdaten wie beim Starten der Aufzeichnung oder beim Hinzufügen von Wegpunkten.</string>
 </resources>

MyTracks/res/values-es-rES/arrays.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+  <!-- Other non-preference arrays -->
+  <array name="activity_types">
+    <item>desconocido</item>
+    <item>tipo mixto</item>
+    <item>otro</item>
+
+    <item>correr</item>
+    <item>correr en calle</item>
+    <item>correr en pista</item>
+    <item>correr en senda</item>
+    <item>caminar</item>
+    <item>caminar rápido</item>
+    <item>excursión</item>
+    <item>excursión por sendas</item>
+    <item>excursión campo a través</item>
+    <item>escalando</item>
+
+    <item>bicicleta</item>
+    <item>bicicleta de carreras</item>
+    <item>bicicleta de montaña</item>
+    <item>bicicleta de pista</item>
+
+    <item>patinando</item>
+    <item>patinando inline</item>
+    <item>skate boarding</item>
+
+    <item>caminata sobre nieve</item>
+    <item>esquiando</item>
+    <item>snow boarding</item>
+    <item>trineo</item>
+    <item>navegando sobre hielo</item>
+
+    <item>navegando</item>
+    <item>en canoa</item>
+    <item>en kayak</item>
+    <item>remo</item>
+    <item>bote de motor</item>
+    <item>transbordador</item>
+    <item>barco teledirigido</item>
+    <item>surfeando</item>
+    <item>wind surfing</item>
+    <item>kite surfing</item>
+    <item>esquí aquático</item>
+    <item>wake boarding</item>
+
+    <item>avión</item>
+    <item>hidroavión</item>
+    <item>avión comercial</item>
+    <item>helicóptero</item>
+    <item>globo aerostático</item>
+    <item>dirigible</item>
+    <item>avión teledirigido</item>
+    <item>helicóptero teledirigido</item>
+    <item>paracaidismo</item>
+    <item>planeador</item>
+    <item>hang gliding</item>
+    <item>para gliding</item>
+
+    <item>montando</item>
+    <item>montando caballo</item>
+    <item>montando burro</item>
+
+    <item>conduciendo coche</item>
+    <item>conduciendo autobús</item>
+    <item>tren</item>
+    <item>moto</item>
+    <item>moto cross</item>
+    <item>ATV</item>
+
+    <item>navegando sobre tierra</item>
+    <item>frisbee</item>
+    <item>ultimate frisbee</item>
+  </array>
+
+  <array name="waypoint_types">
+    <item>cajero automático</item>
+    <item>banco</item>
+    <item>bar</item>
+    <item>barbacoa</item>
+    <item>edificio</item>
+    <item>parada de autobús</item>
+    <item>café</item>
+    <item>fogata</item>
+    <item>campamento</item>
+    <item>iglesia</item>
+    <item>café</item>
+    <item>tienda de abarrotes</item>
+    <item>agua potable</item>
+    <item>derrumbamiento</item>
+    <item>transbordador</item>
+    <item>chimenea</item>
+    <item>estación de bomberos</item>
+    <item>pesca</item>
+    <item>gasolinera</item>
+    <item>campo de golf</item>
+    <item>tienda de abarrotes</item>
+    <item>salon de belleza</item>
+    <item>puerto</item>
+    <item>senda</item>
+    <item>hotel</item>
+    <item>casa</item>
+    <item>información</item>
+    <item>intersección</item>
+    <item>buzón de correos</item>
+    <item>mercado</item>
+    <item>punto de encuentro</item>
+    <item>ópera</item>
+    <item>aparcamiento</item>
+    <item>oficina de correos</item>
+    <item>bache</item>
+    <item>comisaría de policía</item>
+    <item>cruce de vía de tren</item>
+    <item>restaurante</item>
+    <item>mall</item>
+    <item>lugar de interés</item>
+    <item>tienda</item>
+    <item>piscina</item>
+    <item>teléfono</item>
+    <item>teatro</item>
+    <item>baño</item>
+    <item>información turística</item>
+    <item>túnel</item>
+    <item>árbol</item>
+    <item>cascada</item>
+    <item>fuente de agua</item>
+    <item>camino</item>
+  </array>
+
+</resources>

MyTracks/res/values-es-rES/strings.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+  <!-- Used by the Menu -->
+  <string name="list_markers">Señales</string>
+
+  <!-- Error messages -->
+
+  <!-- Status messages -->
+
+  <!-- Progress dialog -->
+
+  <!-- Used by DeleteAllDataHandler -->
+
+  <!-- Text and links when uploading to Google Fusion Tables -->
+
+  <!-- Formatting of track and marker descriptions -->
+
+  <!-- Used by the track recording service -->
+
+  <!-- Common -->
+  <string name="license">Licencia</string>
+  <string name="close">Cerrar</string>
+  <string name="edit">Editar</string>
+  <string name="save">Guardar</string>
+
+  <!-- Placemark labels for start and end of track -->
+
+  <!--  TrackList -->
+  <string name="tracklist_send_to_fusiontables">Enviar a Google Fusion Tables</string>
+  <string name="tracklist_send_to_new_fusiontable">Enviar a nueva Google Fusion Table</string>
+  <string name="tracklist_save_as_csv">Guardar en archivo CSV</string>
+  <string name="tracklist_save_as_tcx">Guardar en archivo TCX</string>
+  <string name="tracklist_btn_send_all_to_fusiontables">Enviar a Google Fusion Tables</string>
+  <!-- Export All -->
+  <string name="tracklist_share_csv_file">Un archivo CSV</string>
+  <string name="tracklist_share_tcx_file">Un archivo TCX</string>
+
+  <!-- Waypoints list -->
+
+  <!-- MyTracks Details -->
+
+  <!-- MyTracks Waypoint Details -->
+
+  <!-- MyTracks Settings -->
+  <string name="settings_not_available_summary">No está disponible en su versión de Android</string>
+
+
+  <string name="settings_report_speed_or_pace">Mostrar velocidad</string>
+
+  <!-- Backups -->
+
+  <!-- MyTracksSky -->
+
+  <!-- Sharing -->
+
+  <!-- Visibility -->
+
+  <!-- Statistics View -->
+  <!-- Average Moving -->
+
+  <!-- Average -->
+
+  <!-- Min -->
+
+  <!-- Max -->
+
+  <!-- Chart Settings -->
+  <!-- X Axis -->
+
+  <!-- Y Axis -->
+
+  <!-- Units -->
+  <!-- Time  -->
+
+  <!-- Distance -->
+
+  <!-- Speed and Pace -->
+
+  <!-- Sensors -->
+
+  <!-- Stats Labels -->
+
+  <!-- End User License Agreement -->
+
+  <!-- About -->
+  <string name="about_version">Versión:</string>
+  <string name="about_support">Soporte:</string>
+  <string name="about_privacy">Privacidad:</string>
+
+  <!-- Send to Google -->
+
+  <!-- Getting the account to upload to. -->
+  <string name="no_account_found_title">No se ha encontrado la cuenta</string>
+  <string name="no_account_found">No se ha encontrado la cuenta a la que subir los recorridos.</string>
+  <string name="choose_account_title">Elegir cuenta</string>
+
+  <!-- SD card -->
+  <string name="io_read_failed">No es posible leer del fichero.</string>
+  <string name="io_write_finished">Grabación a tarjeta SD terminada.</string>
+  <string name="io_read_finished">Lectura de tarjeta SD terminada.</string>
+
+  <!-- VersionChecker -->
+
+  <!-- Welcome -->
+
+  <!-- Announcement -->
+  <!-- Format:
+  $1 : Distance label
+  $2 : Distance value (5)
+  $3 : Distance units (mi, km)
+  $4 : Time description (10 minutes 5 seconds)
+  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
+  $6 : Speed units (mph) : Pace units (per mile)
+  -->
+
+  <!-- Sensor Type Options -->
+  <string name="no_sensor_option">Ninguna</string>
+  <string name="ant_sensor_option">ANT+ Sensores</string>
+  <string name="ant_bridge_sensor_option">SRM ANT+ Puente</string>
+</resources>