Merge branch 'master' into issue2662-leichtes-klettern

Conflicts:
	.gitignore

1 files changed, 23 insertions, 23 deletions

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 8745ae8..3fb5ff1 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
 		</activity>
 		<activity
 			android:name=".SearchActivity"
-			android:label="@string/app_name"
+			android:label="@string/search"
 			android:launchMode="singleTop"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
@@ -63,49 +63,49 @@
 		</activity>
 		<activity
 			android:name=".AboutActivity"
-			android:label="@string/app_name"
+			android:label="@string/about"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".UsefulAppsActivity"
-			android:label="@string/app_name"
+			android:label="@string/helper"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".twitter.TwitterAuthorizationActivity"
-			android:label="@string/app_name"
+			android:label="@string/auth_twitter"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".EditWaypointActivity"
-			android:label="@string/app_name"
+			android:label="@string/waypoint_edit_title"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".NavigateAnyPointActivity"
-			android:label="@string/app_name"
+			android:label="@string/search_destination"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".AddressListActivity"
-			android:label="@string/app_name"
+			android:label="@string/search_address_result"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".SettingsActivity"
-			android:label="@string/app_name"
+			android:label="@string/settings"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
 			android:name=".cgeocaches"
-			android:label="@string/app_name"
+			android:label="@string/stored_caches_button"
 			android:configChanges="keyboardHidden|orientation|screenSize" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -124,27 +124,27 @@
         </activity>		    		
 		<activity
 			android:name=".maps.google.GoogleMapActivity"
-			android:label="@string/app_name" >
+			android:label="@string/map_map" >
 		</activity>
 		<activity
 			android:name=".maps.mapsforge.MapsforgeMapActivity"
-			android:label="@string/app_name" >
+			android:label="@string/map_map" >
 		</activity>
 		<activity
 			android:name=".maps.mapsforge.v024.MapsforgeMapActivity024"
-			android:label="@string/app_name" >
+			android:label="@string/map_map" >
 		</activity>
 				<activity
 			android:name=".StaticMapsActivity"
-			android:label="@string/app_name" >
+			android:label="@string/map_static_title" >
 		</activity>
 		<activity
 			android:name=".VisitCacheActivity"
-			android:label="@string/app_name">
+			android:label="@string/log_new_log">
 		</activity>
 		<activity
 			android:name=".LogTrackableActivity"
-			android:label="@string/app_name"
+			android:label="@string/trackable_touch"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity
@@ -154,7 +154,7 @@
 		</activity>
 		<activity
 				android:name=".CacheDetailActivity"
-				android:label="@string/app_name"
+				android:label="@string/cache"
 				android:configChanges="keyboardHidden|orientation" >
 			<intent-filter>
 				<action android:name="wikitudeapi.arcallback" />
@@ -181,7 +181,7 @@
 		</activity>
 		<activity
 				android:name="cgeo.geocaching.TrackableActivity"
-				android:label="@string/app_name"
+				android:label="@string/trackable"
 				android:configChanges="keyboardHidden|orientation" >
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
@@ -204,32 +204,32 @@
 		</activity>
 		<activity
 				android:name=".cgeonavigate"
-				android:label="@string/app_name_compass">
+				android:label="@string/compass_title">
 		</activity>
 		<activity
 			android:name=".GpxFileListActivity"
-			android:label="@string/app_name"
+			android:label="@string/gpx_import_title"
 			android:configChanges="keyboardHidden|orientation" >
     	</activity>
 		<activity
 			android:name=".SelectMapfileActivity"
-			android:label="@string/app_name"
+			android:label="@string/map_file_select_title"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<provider android:name=".apps.LocusDataStorageProvider" 
             android:authorities="cgeo.geocaching.apps.locusdatastorageprovider" />
 		<activity android:name="WaypointPopup"
-		    android:label="@string/app_name"
+		    android:label="@string/waypoint"
 			android:windowSoftInputMode="stateHidden"
 			android:theme="@style/popup_dark"
 			android:configChanges="keyboardHidden|orientation" >
 		</activity>
 		<activity android:name=".files.SimpleDirChooser"
-		    android:label="@string/app_name">
+		    android:label="@string/simple_dir_chooser_title">
 		</activity>
 		<activity
 			android:name=".ImageSelectActivity"
-			android:label="@string/app_name">
+			android:label="@string/log_image">
 		</activity>		
 	</application>
 </manifest>