Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/osmandapp/Osmand

Browse source 
Conflicts:
	OsmAnd/res/values-ru/phrases.xml
	OsmAnd/res/values/phrases.xml
This commit is contained in:
xmd5a 2015-11-16 14:35:05 +03:00
commit 22a83b97ff
144 changed files with 4018 additions and 2383 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd-java/src/net/osmand/data/LatLon.java
View file

@ -1,5 +1,7 @@
package net.osmand.data; package net.osmand.data;
import net.osmand.FloatMath;
import java.io.Serializable; import java.io.Serializable;
public class LatLon implements Serializable { public class LatLon implements Serializable {
@ -32,10 +34,17 @@ public class LatLon implements Serializable {
if (getClass() != obj.getClass()) if (getClass() != obj.getClass())
return false; return false;
LatLon other = (LatLon) obj; LatLon other = (LatLon) obj;
if (Float.floatToIntBits((float) latitude) != Float.floatToIntBits((float) other.latitude))
return false;
if (Float.floatToIntBits((float) longitude) != Float.floatToIntBits((float) other.longitude))
return false;
/*
if (Double.doubleToLongBits(latitude) != Double.doubleToLongBits(other.latitude)) if (Double.doubleToLongBits(latitude) != Double.doubleToLongBits(other.latitude))
return false; return false;
if (Double.doubleToLongBits(longitude) != Double.doubleToLongBits(other.longitude)) if (Double.doubleToLongBits(longitude) != Double.doubleToLongBits(other.longitude))
return false; return false;
*/
return true; return true;
} }

22
OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java
View file

@ -359,6 +359,12 @@ public class GeoPointParserUtil {
actual = GeoPointParserUtil.parse(url); actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z)); assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
// http://www.google.com/maps/?q=loc:34.99393,-106.61568&z=11
url = "http://www.google.com/maps/?q=loc:" + dlat + "," + dlon + " (" + name +") ";
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, name));
// https://www.google.com/maps/preview#!q=paris&data=!4m15!2m14!1m13!1s0x47e66e1f06e2b70f%3A0x40b82c3688c9460!3m8!1m3!1d24383582!2d-95.677068!3d37.0625!3m2!1i1222!2i718!4f13.1!4m2!3d48.856614!4d2.3522219 // https://www.google.com/maps/preview#!q=paris&data=!4m15!2m14!1m13!1s0x47e66e1f06e2b70f%3A0x40b82c3688c9460!3m8!1m3!1d24383582!2d-95.677068!3d37.0625!3m2!1i1222!2i718!4f13.1!4m2!3d48.856614!4d2.3522219
url = "https://www.google.com/maps/preview#!q=paris&data=!4m15!2m14!1m13!1s0x47e66e1f06e2b70f%3A0x40b82c3688c9460!3m8!1m3!1d24383582!2d-95.677068!3d37.0625!3m2!1i1222!2i718!4f13.1!4m2!3d48.856614!4d2.3522219"; url = "https://www.google.com/maps/preview#!q=paris&data=!4m15!2m14!1m13!1s0x47e66e1f06e2b70f%3A0x40b82c3688c9460!3m8!1m3!1d24383582!2d-95.677068!3d37.0625!3m2!1i1222!2i718!4f13.1!4m2!3d48.856614!4d2.3522219";
System.out.println("url: " + url); System.out.println("url: " + url);
@ -397,7 +403,6 @@ public class GeoPointParserUtil {
actual = GeoPointParserUtil.parse(url); actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z)); assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
// TODO this URL does not work, where is it used?
// whatsapp // whatsapp
// https://maps.google.com/maps?q=loc:34.99393,-106.61568 (You) // https://maps.google.com/maps?q=loc:34.99393,-106.61568 (You)
z = GeoParsedPoint.NO_ZOOM; z = GeoParsedPoint.NO_ZOOM;
@ -406,6 +411,14 @@ public class GeoPointParserUtil {
actual = GeoPointParserUtil.parse(url); actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z)); assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
// whatsapp
// https://maps.google.com/maps?q=loc:34.99393,-106.61568 (USERNAME)
z = GeoParsedPoint.NO_ZOOM;
url = "https://maps.google.com/maps?q=loc:" + dlat + "," + dlon + " (USER NAME)";
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
// http://www.google.com/maps/search/food/34,-106,14z // http://www.google.com/maps/search/food/34,-106,14z
url = "http://www.google.com/maps/search/food/" + ilat + "," + ilon + "," + z + "z"; url = "http://www.google.com/maps/search/food/" + ilat + "," + ilon + "," + z + "z";
System.out.println("url: " + url); System.out.println("url: " + url);
@ -947,10 +960,9 @@ public class GeoPointParserUtil {
if(opath.contains(pref)) { if(opath.contains(pref)) {
opath = opath.substring(opath.lastIndexOf(pref) + pref.length()); opath = opath.substring(opath.lastIndexOf(pref) + pref.length());
} }
final String postf = " (You)"; final String postf = "\\s\\((\\p{IsAlphabetic}|\\s)*\\)$";
if (opath.contains(postf)) { opath = opath.replaceAll(postf, "");
opath = opath.substring(0, opath.indexOf(postf)); System.out.println("opath=" + opath);
}
return parseGoogleMapsPath(opath, params); return parseGoogleMapsPath(opath, params);
} }
if (fragment != null) { if (fragment != null) {

403
OsmAnd/AndroidManifest.xml
View file

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.osmand.plus"
android:installLocation="auto" android:installLocation="auto"
android:versionName="@string/app_version"
android:versionCode="231" android:versionCode="231"
android:versionName="@string/app_version" > package="net.osmand.plus">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="21" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <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_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.STORAGE" /> <uses-permission android:name="android.permission.STORAGE" />
@ -22,96 +22,42 @@
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="com.android.vending.BILLING" /> <uses-permission android:name="com.android.vending.BILLING" />
<uses-feature
android:name="android.hardware.camera"
android:required="false" />
<uses-feature
android:name="android.hardware.camera.autofocus"
android:required="false" />
<uses-feature
android:name="android.hardware.microphone"
android:required="false" />
<uses-feature
android:name="android.hardware.wifi"
android:required="false" />
<uses-feature
android:name="android.hardware.location"
android:required="false" />
<uses-feature
android:name="android.hardware.location.network"
android:required="false" />
<uses-feature
android:name="android.hardware.location.gps"
android:required="false" />
<uses-feature
android:name="android.hardware.sensor.light"
android:required="false" />
<uses-feature
android:name="android.hardware.sensor.compass"
android:required="false" />
<uses-feature
android:name="android.hardware.sensor.accelerometer"
android:required="false" />
<uses-feature
android:name="android.hardware.sensor.gyroscope"
android:required="false" />
<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />
<supports-screens
android:anyDensity="true"
android:largeScreens="true"
android:normalScreens="true"
android:resizeable="true"
android:smallScreens="true"
android:xlargeScreens="true" />
<android:uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-feature android:name="android.hardware.camera" android:required="false" />
<android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- android:theme="@style/OsmandLightDarkActionBarTheme" --> <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
<application <uses-feature android:name="android.hardware.microphone" android:required="false" />
android:name=".OsmandApplication" <uses-feature android:name="android.hardware.wifi" android:required="false" />
android:allowBackup="true" <uses-feature android:name="android.hardware.location" android:required="false" />
android:backupAgent=".OsmandBackupAgent" <uses-feature android:name="android.hardware.location.network" android:required="false" />
android:configChanges="locale" <uses-feature android:name="android.hardware.location.gps" android:required="false" />
android:icon="@drawable/icon" <uses-feature android:name="android.hardware.sensor.light" android:required="false" />
android:label="@string/app_name" <uses-feature android:name="android.hardware.sensor.compass" android:required="false" />
android:largeHeap="true" <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="false" />
android:restoreAnyVersion="true" <uses-feature android:name="android.hardware.sensor.gyroscope" android:required="false" />
android:theme="@style/OsmandDarkTheme" > <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<meta-data
android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIqF3tNGT66etVBn_vgzpfAY1wmIzKV1Ss6Ku-2A" />
<meta-data
android:name="com.sec.android.support.multiwindow"
android:value="true" />
<meta-data
android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W"
android:resource="@dimen/app_defaultsize_w"
android:value="" />
<meta-data
android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H"
android:resource="@dimen/app_defaultsize_h"
android:value="" />
<meta-data
android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W"
android:resource="@dimen/app_minimumsize_w"
android:value="" />
<meta-data
android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H"
android:resource="@dimen/app_minimumsize_h"
android:value="" />
<meta-data
android:name="com.sec.minimode.icon.portrait.normal"
android:resource="@drawable/icon"
android:value="" />
<meta-data
android:name="com.sec.minimode.icon.landscape.normal"
android:resource="@drawable/icon"
android:value="" />
<activity android:name=".activities.HelpActivity" />
<activity android:name=".activities.ExitActivity" /> <supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
android:xlargeScreens="true" android:anyDensity="true" />
<!-- android:theme="@style/OsmandLightDarkActionBarTheme" -->
<application android:allowBackup="true" android:backupAgent="net.osmand.plus.OsmandBackupAgent"
android:icon="@drawable/icon" android:label="@string/app_name"
android:name="net.osmand.plus.OsmandApplication" android:configChanges="locale"
android:theme="@style/OsmandDarkTheme" android:restoreAnyVersion="true" android:largeHeap="true">
<meta-data android:name="com.google.android.backup.api_key" android:value="AEdPqrEAAAAIqF3tNGT66etVBn_vgzpfAY1wmIzKV1Ss6Ku-2A" />
<meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:resource="@dimen/app_defaultsize_w" android:value="" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:resource="@dimen/app_defaultsize_h" android:value="" />
<meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:resource="@dimen/app_minimumsize_w" android:value="" />
<meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:resource="@dimen/app_minimumsize_h" android:value="" />
<meta-data android:name="com.sec.minimode.icon.portrait.normal" android:resource="@drawable/icon" android:value="" />
<meta-data android:name="com.sec.minimode.icon.landscape.normal" android:resource="@drawable/icon" android:value="" />
<activity android:name="net.osmand.plus.activities.HelpActivity" />
<activity android:name="net.osmand.plus.activities.ExitActivity" />
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="android.support.v4.content.FileProvider"
@ -123,39 +69,27 @@
android:resource="@xml/paths" /> android:resource="@xml/paths" />
</provider> </provider>
<activity <activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name"
android:name=".activities.MapActivity" android:screenOrientation="unspecified" android:launchMode="singleTop">
android:label="@string/app_name"
android:launchMode="singleTop"
android:screenOrientation="unspecified" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="content" android:host="*" android:mimeType="binary/octet-stream" />
<data <data android:scheme="content" android:host="*" android:mimeType="application/octet-stream" />
android:host="*"
android:mimeType="binary/octet-stream"
android:scheme="content" />
<data
android:host="*"
android:mimeType="application/octet-stream"
android:scheme="content" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" /> <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data android:scheme="http" /> <data android:scheme="http" />
<data android:host="osmand.net" /> <data android:host="osmand.net" />
<data android:pathPrefix="/go" /> <data android:pathPrefix="/go" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.APP_MAPS" /> <category android:name="android.intent.category.APP_MAPS" />
@ -163,13 +97,12 @@
<category android:name="android.intent.category.CAR_DOCK" /> <category android:name="android.intent.category.CAR_DOCK" />
<category android:name="android.intent.category.DESK_DOCK" /> <category android:name="android.intent.category.DESK_DOCK" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data android:scheme="https" /> <data android:scheme="https" />
<data android:host="osmand.net" /> <data android:host="osmand.net" />
<data android:pathPrefix="/go" /> <data android:pathPrefix="/go" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.APP_MAPS" /> <category android:name="android.intent.category.APP_MAPS" />
@ -178,178 +111,92 @@
<category android:name="android.intent.category.DESK_DOCK" /> <category android:name="android.intent.category.DESK_DOCK" />
</intent-filter> </intent-filter>
<!-- android matches non-greedy : http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i--> <!-- android matches non-greedy : http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i-->
<!-- mimeType&host are both needed or you will either have unwanted matching or no match when needed --> <!-- mimeType&host are both needed or you will either have unwanted matching or no match when needed -->
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.gpx" />
<data <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.gpx" />
android:host="*" <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.gpx" />
android:mimeType="*/*" <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
android:pathPattern=".*\\.gpx" <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
android:scheme="file" /> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.kml" />
<data <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.kml" />
android:host="*" <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.kml" />
android:mimeType="*/*" <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.kml" />
android:pathPattern=".*\\..*\\.gpx" <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml" />
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\.gpx"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\..*\\.gpx"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.kml"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\.kml"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\.kml"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\..*\\.kml"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml"
android:scheme="file" />
</intent-filter> </intent-filter>
<!-- google navigation intent --> <!-- google navigation intent -->
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="google.navigation" /> <data android:scheme="google.navigation" />
<data android:scheme="osmand.navigation" /> <data android:scheme="osmand.navigation" />
</intent-filter> </intent-filter>
</activity> </activity>
<receiver android:name=".audionotes.MediaRemoteControlReceiver" > <receiver android:name="net.osmand.plus.audionotes.MediaRemoteControlReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.CAMERA_BUTTON" /> <action android:name="android.intent.action.CAMERA_BUTTON" />
<action android:name="android.intent.action.MEDIA_BUTTON" /> <action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<activity <activity android:name="net.osmand.plus.activities.SettingsActivity" android:label="@string/shared_string_settings" android:configChanges="keyboardHidden|orientation" />
android:name=".activities.SettingsActivity" <activity android:name="net.osmand.plus.activities.SettingsGeneralActivity" android:configChanges="keyboardHidden|orientation" />
android:configChanges="keyboardHidden|orientation" <activity android:name="net.osmand.plus.activities.SettingsNavigationActivity" android:configChanges="keyboardHidden|orientation" />
android:label="@string/shared_string_settings" /> <activity android:name="net.osmand.plus.monitoring.SettingsMonitoringActivity" android:configChanges="keyboardHidden|orientation" />
<activity <activity android:name="net.osmand.plus.rastermaps.SettingsRasterMapsActivity" android:configChanges="keyboardHidden|orientation" />
android:name=".activities.SettingsGeneralActivity" <activity android:name="net.osmand.plus.routepointsnavigation.RoutePointsActivity" />
android:configChanges="keyboardHidden|orientation" />
<activity <activity android:name="net.osmand.plus.osmedit.SettingsOsmEditingActivity" android:configChanges="keyboardHidden|orientation" />
android:name=".activities.SettingsNavigationActivity" <activity android:name="net.osmand.plus.development.SettingsDevelopmentActivity" android:configChanges="keyboardHidden|orientation" />
android:configChanges="keyboardHidden|orientation" /> <activity android:name="net.osmand.plus.audionotes.SettingsAudioVideoActivity" android:configChanges="keyboardHidden|orientation" />
<activity <activity android:name="net.osmand.access.SettingsAccessibilityActivity" android:configChanges="keyboardHidden|orientation" />
android:name=".monitoring.SettingsMonitoringActivity"
android:configChanges="keyboardHidden|orientation" /> <activity android:name="net.osmand.plus.activities.search.SearchActivity" android:label="@string/search_activity" />
<activity <activity android:name="net.osmand.plus.activities.ShowRouteInfoActivity" android:label="@string/show_route" />
android:name=".rastermaps.SettingsRasterMapsActivity" <activity android:name="net.osmand.plus.activities.FavoritesListActivity" android:label="@string/favourites_list_activity" />
android:configChanges="keyboardHidden|orientation" /> <activity android:name=".myplaces.FavoritesActivity" android:windowSoftInputMode="adjustPan" />
<activity android:name=".routepointsnavigation.RoutePointsActivity" /> <activity android:name="net.osmand.plus.activities.TrackActivity"/>
<activity <activity android:name="net.osmand.plus.activities.PluginsActivity" />
android:name=".osmedit.SettingsOsmEditingActivity" <activity android:name="net.osmand.plus.activities.PluginActivity" />
android:configChanges="keyboardHidden|orientation" /> <activity android:name="net.osmand.plus.activities.ContributionVersionActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/contribution_activity" />
<activity
android:name=".development.SettingsDevelopmentActivity"
android:configChanges="keyboardHidden|orientation" /> <activity android:name="net.osmand.plus.osmo.SettingsOsMoActivity" android:configChanges="keyboardHidden|orientation" />
<activity <activity android:name="net.osmand.plus.osmo.OsMoGroupsActivity">
android:name=".audionotes.SettingsAudioVideoActivity"
android:configChanges="keyboardHidden|orientation" />
<activity
android:name="net.osmand.access.SettingsAccessibilityActivity"
android:configChanges="keyboardHidden|orientation" />
<activity
android:name=".activities.search.SearchActivity"
android:label="@string/search_activity" />
<activity
android:name=".activities.ShowRouteInfoActivity"
android:label="@string/show_route" />
<activity
android:name=".activities.FavoritesListActivity"
android:label="@string/favourites_list_activity" />
<activity
android:name=".myplaces.FavoritesActivity"
android:windowSoftInputMode="adjustPan" />
<activity android:name=".activities.TrackActivity" />
<activity android:name=".activities.PluginsActivity" />
<activity android:name=".activities.PluginActivity" />
<activity
android:name=".activities.ContributionVersionActivity"
android:configChanges="keyboardHidden|orientation"
android:label="@string/contribution_activity" />
<activity
android:name=".osmo.SettingsOsMoActivity"
android:configChanges="keyboardHidden|orientation" />
<activity android:name=".osmo.OsMoGroupsActivity" >
<intent-filter> <intent-filter>
<data <data android:scheme="http" android:host="z.osmo.mobi" />
android:host="z.osmo.mobi"
android:scheme="http" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name=".activities.search.SearchPOIActivity" <activity android:name="net.osmand.plus.activities.search.SearchPOIActivity" android:label="@string/searchpoi_activity" />
android:label="@string/searchpoi_activity" /> <activity android:name="net.osmand.plus.activities.search.SearchAddressActivity" android:label="@string/select_address_activity" />
<activity <activity android:name="net.osmand.plus.activities.search.SearchCityByNameActivity" />
android:name=".activities.search.SearchAddressActivity" <activity android:name="net.osmand.plus.activities.search.SearchRegionByNameActivity" />
android:label="@string/select_address_activity" /> <activity android:name="net.osmand.plus.activities.search.SearchStreetByNameActivity" />
<activity android:name=".activities.search.SearchCityByNameActivity" /> <activity android:name="net.osmand.plus.activities.search.SearchStreet2ByNameActivity" />
<activity android:name=".activities.search.SearchRegionByNameActivity" /> <activity android:name="net.osmand.plus.activities.search.SearchBuildingByNameActivity" />
<activity android:name=".activities.search.SearchStreetByNameActivity" /> <activity android:name="net.osmand.plus.sherpafy.TourViewActivity" android:exported="true"
<activity android:name=".activities.search.SearchStreet2ByNameActivity" /> android:launchMode= "singleInstance" android:label="Sherpafy" />
<activity android:name=".activities.search.SearchBuildingByNameActivity" /> <activity android:name="net.osmand.plus.activities.EditPOIFilterActivity" />
<activity
android:name=".sherpafy.TourViewActivity" <activity android:name="net.osmand.plus.activities.search.GeoIntentActivity" android:label="@string/app_name">
android:exported="true"
android:label="Sherpafy"
android:launchMode="singleInstance" />
<activity android:name=".activities.EditPOIFilterActivity" />
<activity
android:name=".activities.search.GeoIntentActivity"
android:label="@string/app_name" >
<intent-filter> <intent-filter>
<data android:scheme="osmand.geo" /> <data android:scheme="osmand.geo" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data android:scheme="geo" /> <data android:scheme="geo" />
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/> <category android:name="android.intent.category.BROWSABLE"/>
</intent-filter> </intent-filter>
@ -372,54 +219,28 @@
<data android:host="map.wap.qq.com" /> <data android:host="map.wap.qq.com" />
<data android:host="map.qq.com" /> <data android:host="map.qq.com" />
<data android:host="maps.apple.com" /> <data android:host="maps.apple.com" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data <data android:scheme="http" android:host="www.google.com" android:pathPrefix="/maps" />
android:host="www.google.com" <data android:scheme="https" android:host="www.google.com" android:pathPrefix="/maps" />
android:pathPrefix="/maps"
android:scheme="http" />
<data
android:host="www.google.com"
android:pathPrefix="/maps"
android:scheme="https" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data <data android:scheme="http" android:host="openstreetmap.de" android:pathPrefix="/karte" />
android:host="openstreetmap.de" <data android:scheme="https" android:host="openstreetmap.de" android:pathPrefix="/karte" />
android:pathPrefix="/karte"
android:scheme="http" />
<data
android:host="openstreetmap.de"
android:pathPrefix="/karte"
android:scheme="https" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data <data android:scheme="http" android:host="download.osmand.net" android:pathPrefix="/go" />
android:host="download.osmand.net" <data android:scheme="http" android:host="download.osmand.net" android:pathPrefix="go" />
android:pathPrefix="/go"
android:scheme="http" />
<data
android:host="download.osmand.net"
android:pathPrefix="go"
android:scheme="http" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.APP_MAPS" /> <category android:name="android.intent.category.APP_MAPS" />
@ -436,28 +257,26 @@
</intent-filter> </intent-filter>
--> -->
</activity> </activity>
<activity android:name=".development.TestVoiceActivity" />
<activity <activity android:name="net.osmand.plus.development.TestVoiceActivity" />
android:name=".download.DownloadActivity" <activity android:name="net.osmand.plus.download.DownloadActivity" android:label="" />
android:label="" />
<!-- keep android:process on a separate line !! --> <!-- keep android:process on a separate line !! -->
<service <service
android:name=".NavigationService"
android:label="@string/process_navigation_service"
android:process="net.osmand.plus" android:process="net.osmand.plus"
android:label="@string/process_navigation_service"
android:name="net.osmand.plus.NavigationService"
android:stopWithTask="false"> android:stopWithTask="false">
<intent-filter> <intent-filter>
<action android:name="net.osmand.plus.NavigationService" /> <action android:name="net.osmand.plus.NavigationService" />
</intent-filter> </intent-filter>
</service> </service>
<receiver android:name=".OnNavigationServiceAlarmReceiver" /> <receiver android:name="net.osmand.plus.OnNavigationServiceAlarmReceiver" />
<activity android:name="net.osmand.plus.activities.PrintDialogActivity" />
<activity android:name=".activities.PrintDialogActivity" />
<receiver <receiver
android:name=".DeviceAdminRecv" android:name="net.osmand.plus.DeviceAdminRecv"
android:label="@string/app_name" android:label="@string/app_name"
android:permission="android.permission.BIND_DEVICE_ADMIN" > android:permission="android.permission.BIND_DEVICE_ADMIN" >
<meta-data <meta-data
@ -469,9 +288,5 @@
<action android:name="android.app.action.DEVICE_ADMIN_DISABLED" /> <action android:name="android.app.action.DEVICE_ADMIN_DISABLED" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<activity android:name=".activities.AppCompatPreferenceActivity" >
</activity>
</application> </application>
</manifest> </manifest>

9
OsmAnd/no_translate.xml
View file

@ -11,15 +11,6 @@
--> -->
<!-- Not translatable --> <!-- Not translatable -->
<string name="release_2_2">
\u2022 New context-sensitive UI for tapping locations on the map and on other screens\n\n
\u2022 Choice between Dashboard or Menu as primary app control\n\n
\u2022 New Wikipedia data, now downloads per country, and with much more complete data\n\n
\u2022 Better route recalculation (after repeated attempts engine now suggests a different route)\n\n
\u2022 POI Search now supports more specific queries\n\n
\u2022 Map data download structure and interface reworked\n\n
and more...
</string>
<string name="ga_api_key">UA-28342846-2</string> <string name="ga_api_key">UA-28342846-2</string>
<string name="ga_dispatchPeriod">10</string> <string name="ga_dispatchPeriod">10</string>
<string name="ga_debug">true</string> <string name="ga_debug">true</string>

7
OsmAnd/res/layout/gpx_item_list_item.xml
View file

@ -32,7 +32,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:maxLines="2" android:maxLines="2"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:text="@string/lorem_ipsum" /> tools:text="@string/lorem_ipsum" />
</FrameLayout> </FrameLayout>
@ -54,7 +54,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size" /> android:textSize="@dimen/default_desc_text_size"
tools:text="Hellow world"/>
</LinearLayout> </LinearLayout>

93
OsmAnd/res/layout/map_context_menu_fragment.xml
View file

@ -2,10 +2,10 @@
<FrameLayout <FrameLayout
android:id="@+id/context_menu_layout" android:id="@+id/context_menu_layout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@android:color/transparent" android:background="@android:color/transparent">
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout <LinearLayout
android:id="@+id/context_menu_main" android:id="@+id/context_menu_main"
@ -32,8 +32,8 @@
android:id="@+id/context_menu_top_view" android:id="@+id/context_menu_top_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="false"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
@ -74,6 +74,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/search_address_building" android:text="@string/search_address_building"
android:maxLines="6"
android:ellipsize="end"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size_large"/> android:textSize="@dimen/default_list_text_size_large"/>
@ -106,7 +108,35 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="30dp" android:layout_marginLeft="30dp"
android:layout_marginTop="4dp"> android:layout_marginTop="4dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:id="@+id/context_menu_line2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/amenity_type_finance"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"/>
</LinearLayout>
<LinearLayout
android:id="@+id/compass_layout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:minWidth="66dp"
android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/direction" android:id="@+id/direction"
@ -118,21 +148,16 @@
android:id="@+id/distance" android:id="@+id/distance"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="2dp" android:layout_marginLeft="2dp"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:layout_gravity="center_vertical"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:text="100500 km"/> tools:text="100500 km"/>
<TextView </LinearLayout>
android:id="@+id/context_menu_line2"
android:layout_width="wrap_content" </LinearLayout>
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/other_location"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"/>
</LinearLayout> </LinearLayout>
@ -144,14 +169,14 @@
android:id="@+id/title_button_container" android:id="@+id/title_button_container"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="62dp"
android:paddingRight="2dp"
android:layout_marginTop="-16dp" android:layout_marginTop="-16dp"
android:paddingBottom="4dp"
android:clickable="true" android:clickable="true"
android:orientation="horizontal" android:orientation="horizontal"
tools:visibility="visible" android:paddingBottom="4dp"
android:visibility="gone"> android:paddingLeft="62dp"
android:paddingRight="2dp"
android:visibility="gone"
tools:visibility="visible">
<Button <Button
android:id="@+id/title_button" android:id="@+id/title_button"
@ -169,22 +194,22 @@
android:id="@+id/title_button_right_text" android:id="@+id/title_button_right_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"
android:clickable="true"
android:layout_marginLeft="-4dp" android:layout_marginLeft="-4dp"
android:clickable="true"
android:gravity="center_vertical"
android:text="— 00:26"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"/>
android:text="— 00:26"/>
<Button <Button
android:id="@+id/title_button_right" android:id="@+id/title_button_right"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:drawableLeft="@drawable/ic_action_delete_dark"
android:gravity="center" android:gravity="center"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:drawableLeft="@drawable/ic_action_delete_dark"
android:text="@string/shared_string_delete" android:text="@string/shared_string_delete"
android:textColor="?attr/contextMenuButtonColor" android:textColor="?attr/contextMenuButtonColor"
android:textSize="@dimen/default_desc_text_size"/> android:textSize="@dimen/default_desc_text_size"/>
@ -195,16 +220,16 @@
android:id="@+id/title_progress_container" android:id="@+id/title_progress_container"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-16dp"
android:clickable="true"
android:gravity="center_vertical"
android:minHeight="52dp"
android:orientation="horizontal"
android:paddingBottom="4dp"
android:paddingLeft="72dp" android:paddingLeft="72dp"
android:paddingRight="2dp" android:paddingRight="2dp"
android:minHeight="52dp" android:visibility="gone"
android:gravity="center_vertical" tools:visibility="visible">
android:layout_marginTop="-16dp"
android:paddingBottom="4dp"
android:clickable="true"
android:orientation="horizontal"
tools:visibility="visible"
android:visibility="gone">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -214,10 +239,10 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:orientation="vertical" android:layout_marginRight="12dp"
android:layout_marginRight="12dp"> android:layout_weight="1"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/progressTitle" android:id="@+id/progressTitle"

6
OsmAnd/res/layout/menu_obj_list_item.xml
View file

@ -19,7 +19,7 @@
android:layout_height="@dimen/standard_icon_size" android:layout_height="@dimen/standard_icon_size"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginTop="18dp" android:layout_marginTop="17dp"
android:src="@drawable/ic_action_building_number"/> android:src="@drawable/ic_action_building_number"/>
</LinearLayout> </LinearLayout>
@ -28,7 +28,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_marginTop="15dp" android:layout_marginTop="14dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
@ -39,6 +39,8 @@
android:layout_marginLeft="12dp" android:layout_marginLeft="12dp"
android:layout_marginRight="12dp" android:layout_marginRight="12dp"
android:text="@string/search_address_building" android:text="@string/search_address_building"
android:maxLines="3"
android:ellipsize="end"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size_large"/> android:textSize="@dimen/default_list_text_size_large"/>

3
OsmAnd/res/layout/open_bug.xml
View file

@ -22,6 +22,8 @@
<TextView <TextView
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:id="@+id/userNameEditTextLabel"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:text="@string/osb_comment_dialog_author" /> android:text="@string/osb_comment_dialog_author" />
@ -38,6 +40,7 @@
<TextView <TextView
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/passwordEditTextLabel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:text="@string/osb_author_dialog_password" /> android:text="@string/osb_author_dialog_password" />

2
OsmAnd/res/layout/plan_route_info.xml
View file

@ -39,7 +39,7 @@
android:layout_height="@dimen/list_item_height" android:layout_height="@dimen/list_item_height"
android:background="?attr/dashboard_button" android:background="?attr/dashboard_button"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_action_flag_dark" /> android:src="@drawable/map_action_waypoints" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

1
OsmAnd/res/layout/send_poi_dialog.xml
View file

@ -8,6 +8,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:id="@+id/messageEditTextLabel"
android:text="@string/osb_comment_dialog_message"/> android:text="@string/osb_comment_dialog_message"/>
<EditText <EditText

28
OsmAnd/res/values-af/strings.xml
View file

@ -527,7 +527,7 @@
<string name="vector_data">Aflyn vektor kaarte</string> <string name="vector_data">Aflyn vektor kaarte</string>
<string name="transport_context_menu">Soek vervoer by stop</string> <string name="transport_context_menu">Soek vervoer by stop</string>
<string name="osb_bug_name">Programfout</string>
<string name="poi_context_menu_modify">verander interessante plek</string> <string name="poi_context_menu_modify">verander interessante plek</string>
<string name="poi_context_menu_delete">verwyder interessante plek</string> <string name="poi_context_menu_delete">verwyder interessante plek</string>
<string name="rotate_map_compass_opt">Volgens kompas</string> <string name="rotate_map_compass_opt">Volgens kompas</string>
@ -796,7 +796,7 @@
<string name="search_tabs_location">Ligging</string> <string name="search_tabs_location">Ligging</string>
<string name="context_menu_item_update_map">opgradeer kaart</string> <string name="context_menu_item_update_map">opgradeer kaart</string>
<string name="context_menu_item_open_bug">Open OSM fout</string>
<string name="context_menu_item_create_poi">skep interessante plek</string> <string name="context_menu_item_create_poi">skep interessante plek</string>
<string name="shared_string_yes">Ja</string> <string name="shared_string_yes">Ja</string>
<string name="shared_string_cancel">Kanseleer</string> <string name="shared_string_cancel">Kanseleer</string>
@ -810,21 +810,21 @@
<string name="favourites_context_menu_delete">verwyder gunsteling</string> <string name="favourites_context_menu_delete">verwyder gunsteling</string>
<string name="favourites_remove_dialog_msg">Verwyder gunsteling punt \'%s\'?</string> <string name="favourites_remove_dialog_msg">Verwyder gunsteling punt \'%s\'?</string>
<string name="favourites_remove_dialog_success">Gunsteling punt {0} is suksesvol verwyder.</string> <string name="favourites_remove_dialog_success">Gunsteling punt {0} is suksesvol verwyder.</string>
<string name="osb_add_dialog_title">Tik fout teks in</string>
<string name="osb_add_dialog_success">fout suksesvol geskep</string>
<string name="osb_add_dialog_error">Uitsondering voorgekom: fout is nie geskep nie</string>
<string name="osb_comment_menu_item">voeg kommentaar by</string>
<string name="osb_comment_dialog_message">Boodskap</string> <string name="osb_comment_dialog_message">Boodskap</string>
<string name="osb_comment_dialog_author">naam van die skrywer</string> <string name="osb_comment_dialog_author">naam van die skrywer</string>
<string name="osb_comment_dialog_title">Om kommentaar tot fout te voeg</string>
<string name="osb_comment_dialog_add_button">voeg kommentaar by</string>
<string name="osb_comment_dialog_success">Kommentaar is bygevoeg</string> <string name="osb_comment_dialog_success">Kommentaar is bygevoeg</string>
<string name="osb_comment_dialog_error">Uitsondering voorgekom: kommentaar is nie bygevoeg nie</string> <string name="osb_comment_dialog_error">Uitsondering voorgekom: kommentaar is nie bygevoeg nie</string>
<string name="osb_close_menu_item">Sluit fout</string>
<string name="osb_close_dialog_title">sluiting van fout</string>
<string name="osb_close_dialog_close_button">Sluit fout</string>
<string name="osb_close_dialog_success">Probleem is suksesvol gesluit</string>
<string name="osb_close_dialog_error">Uitsondering voorgekom: fout is nie gesluit nie</string>
<string name="poi_edit_title">Verander interessante plek</string> <string name="poi_edit_title">Verander interessante plek</string>
<string name="poi_create_title">skep interessante plek</string> <string name="poi_create_title">skep interessante plek</string>
<string name="poi_error_poi_not_found">Node kan nie gevind word nie of gerief is nie \'n enkele node</string> <string name="poi_error_poi_not_found">Node kan nie gevind word nie of gerief is nie \'n enkele node</string>
@ -1133,7 +1133,7 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass
<string name="please_select_address">Kies eers die stad of straat</string> <string name="please_select_address">Kies eers die stad of straat</string>
<string name="search_street_in_neighborhood_cities">Soek straat in nabygeleë stede</string> <string name="search_street_in_neighborhood_cities">Soek straat in nabygeleë stede</string>
<string name="intermediate_items_sort_return">Tussen-punte is hergesorteer om die volgorde op pad na die bestemming te optimaliseer.</string> <string name="intermediate_items_sort_return">Tussen-punte is hergesorteer om die volgorde op pad na die bestemming te optimaliseer.</string>
<string name="intermediate_items_sort_by_distance">Sorteer (deur-tot-deur)</string> <string name="intermediate_items_sort_by_distance">Sorteer deur-tot-deur</string>
<string name="local_osm_changes_backup_failed">Berg van OSM veranderings het gefaal</string> <string name="local_osm_changes_backup_failed">Berg van OSM veranderings het gefaal</string>
<string name="local_osm_changes_backup">Berg as OSM verandering</string> <string name="local_osm_changes_backup">Berg as OSM verandering</string>
<string name="use_distance_measurement_help">* Tik om punt te merk.\n * Tik en hou op die kaart om vorige punt te verwyder.\n * Tik en hou op punt om beskrywing te sien of verander.\n * Tik op meting widget om meer aksies te sien.</string> <string name="use_distance_measurement_help">* Tik om punt te merk.\n * Tik en hou op die kaart om vorige punt te verwyder.\n * Tik en hou op punt om beskrywing te sien of verander.\n * Tik op meting widget om meer aksies te sien.</string>

18
OsmAnd/res/values-ar/strings.xml
View file

@ -21,7 +21,7 @@
<string name="shared_string_delete">حذف</string> <string name="shared_string_delete">حذف</string>
<string name="poi_remove_title">حذف POI</string> <string name="poi_remove_title">حذف POI</string>
<string name="poi_create_title">إنشاء POI</string> <string name="poi_create_title">إنشاء POI</string>
<string name="osb_close_dialog_success">تم إغلاق بنجاح الشوائب</string>
<string name="osb_comment_dialog_message">رسالة</string> <string name="osb_comment_dialog_message">رسالة</string>
<string name="map_widget_gps_info">معلومات GPS</string> <string name="map_widget_gps_info">معلومات GPS</string>
<string name="access_arrival_time">وقت الوصول</string> <string name="access_arrival_time">وقت الوصول</string>
@ -260,12 +260,12 @@
<string name="poi_dialog_comment">تعليق</string> <string name="poi_dialog_comment">تعليق</string>
<string name="poi_action_change">تغيير</string> <string name="poi_action_change">تغيير</string>
<string name="osb_comment_dialog_author">اسم الكاتب</string> <string name="osb_comment_dialog_author">اسم الكاتب</string>
<string name="osb_comment_dialog_add_button">إضافة تعليق</string>
<string name="osb_comment_dialog_title">إضافة تعليق على علة</string>
<string name="osb_comment_menu_item">إضافة تعليق</string>
<string name="osb_add_dialog_title">إدخال نص علة</string>
<string name="osb_add_dialog_success">علة خلق بنجاح</string>
<string name="osb_add_dialog_error">حدث استثناء: لم يتم إنشاء خطأ</string>
<string name="osb_author_dialog_password">OSM كلمة المرور (اختياري)</string> <string name="osb_author_dialog_password">OSM كلمة المرور (اختياري)</string>
<string name="add_favorite_dialog_default_favourite_name">مفضلة</string> <string name="add_favorite_dialog_default_favourite_name">مفضلة</string>
<string name="shared_string_apply">تطبق</string> <string name="shared_string_apply">تطبق</string>
@ -284,7 +284,7 @@
<string name="search_address_street_option">المتقاطعة الشارع</string> <string name="search_address_street_option">المتقاطعة الشارع</string>
<string name="search_tabs_location">موقع</string> <string name="search_tabs_location">موقع</string>
<string name="context_menu_item_open_bug">فتح OSM علة</string>
<string name="context_menu_item_create_poi">إنشاء POI</string> <string name="context_menu_item_create_poi">إنشاء POI</string>
<string name="shared_string_show_on_map">عرض على الخريطة</string> <string name="shared_string_show_on_map">عرض على الخريطة</string>
<string name="navigate_point_latitude">خط العرض</string> <string name="navigate_point_latitude">خط العرض</string>
@ -336,7 +336,7 @@
<string name="route_descr_map_location">الخريطة: </string> <string name="route_descr_map_location">الخريطة: </string>
<string name="destination_point">الوجهة %1$s</string> <string name="destination_point">الوجهة %1$s</string>
<string name="search_street_in_neighborhood_cities">البحث عن الشارع في المدن المجاورة</string> <string name="search_street_in_neighborhood_cities">البحث عن الشارع في المدن المجاورة</string>
<string name="intermediate_items_sort_by_distance">فرز (باب لـ باب )</string> <string name="intermediate_items_sort_by_distance">فرز باب لـ باب </string>
<string name="wait_current_task_finished">الرجاء الانتظار حتى انتهاء المهمة الحالية</string> <string name="wait_current_task_finished">الرجاء الانتظار حتى انتهاء المهمة الحالية</string>
<string name="available_downloads_left">توفر %1$d ملفات للتنزيل</string> <string name="available_downloads_left">توفر %1$d ملفات للتنزيل</string>
<string name="cancel_route">ألغ المسار</string> <string name="cancel_route">ألغ المسار</string>

26
OsmAnd/res/values-be-rBY/strings.xml
View file

@ -1287,7 +1287,7 @@
<string name="vector_data">Lakaĺnyja viektarnyja mapy</string> <string name="vector_data">Lakaĺnyja viektarnyja mapy</string>
<string name="transport_context_menu">Pošuk transpartu na prypynku</string> <string name="transport_context_menu">Pošuk transpartu na prypynku</string>
<string name="osb_bug_name">Pamylka</string>
<string name="poi_context_menu_modify">Źmianіć cіkavostku</string> <string name="poi_context_menu_modify">Źmianіć cіkavostku</string>
<string name="poi_context_menu_delete">Vydalіć cіkavostku</string> <string name="poi_context_menu_delete">Vydalіć cіkavostku</string>
<string name="rotate_map_compass_opt">Pa kompasie</string> <string name="rotate_map_compass_opt">Pa kompasie</string>
@ -1540,7 +1540,7 @@
<string name="search_tabs_location">Miesca</string> <string name="search_tabs_location">Miesca</string>
<string name="context_menu_item_update_map">Abnavіć mapu</string> <string name="context_menu_item_update_map">Abnavіć mapu</string>
<string name="context_menu_item_open_bug">Paviedamіć pra pamylku na mapie</string>
<string name="context_menu_item_create_poi">Stvaryć cіkavostku</string> <string name="context_menu_item_create_poi">Stvaryć cіkavostku</string>
<string name="shared_string_yes">Tak</string> <string name="shared_string_yes">Tak</string>
<string name="shared_string_cancel">Skasavać</string> <string name="shared_string_cancel">Skasavać</string>
@ -1554,22 +1554,22 @@
<string name="favourites_context_menu_delete">Vydalіć upadabanaje</string> <string name="favourites_context_menu_delete">Vydalіć upadabanaje</string>
<string name="favourites_remove_dialog_msg">Vy sapraŭdy chočacie vydalіć kropku s z zakladak?</string> <string name="favourites_remove_dialog_msg">Vy sapraŭdy chočacie vydalіć kropku s z zakladak?</string>
<string name="favourites_remove_dialog_success">Kropka {0} byla paspiachova vydalienaja z zakladak.</string> <string name="favourites_remove_dialog_success">Kropka {0} byla paspiachova vydalienaja z zakladak.</string>
<string name="osb_add_dialog_title">Uviadzіcie tekst pamylkі</string>
<string name="osb_add_dialog_success">Pamylka paśpiachova stvorana</string>
<string name="osb_add_dialog_error">Vykliučnaja sіtuacyja: zaŭvaha nie byla stvorana</string>
<string name="osb_author_dialog_password">OSM paroĺ (nieabaviazkovy)</string> <string name="osb_author_dialog_password">OSM paroĺ (nieabaviazkovy)</string>
<string name="osb_comment_menu_item">Dadać kamentar</string>
<string name="osb_comment_dialog_message">Paviedamlieńnie</string> <string name="osb_comment_dialog_message">Paviedamlieńnie</string>
<string name="osb_comment_dialog_author">Іmia aŭtara</string> <string name="osb_comment_dialog_author">Іmia aŭtara</string>
<string name="osb_comment_dialog_title">Dadańnie kamientara da pamylkі</string>
<string name="osb_comment_dialog_add_button">Dadać kamentar</string>
<string name="osb_comment_dialog_success">Hety kamientar byŭ paśpiachova dadadzieny</string> <string name="osb_comment_dialog_success">Hety kamientar byŭ paśpiachova dadadzieny</string>
<string name="osb_comment_dialog_error">Vykliučnaja sіtuacyja: kamientar nie byŭ dadadzieny</string> <string name="osb_comment_dialog_error">Vykliučnaja sіtuacyja: kamientar nie byŭ dadadzieny</string>
<string name="osb_close_menu_item">Začynіć pamylku</string>
<string name="osb_close_dialog_title">Zakryćcio pamylkі</string>
<string name="osb_close_dialog_close_button">Začynіć pamylku</string>
<string name="osb_close_dialog_success">Pamylka byla paśpiachova začyniena</string>
<string name="osb_close_dialog_error">Vykliučnaja sіtuacyja: pamylka nie byla začyniena</string>
<string name="poi_edit_title">Redahavać cіkavostku</string> <string name="poi_edit_title">Redahavać cіkavostku</string>
<string name="poi_create_title">Stvaryć cіkavostku</string> <string name="poi_create_title">Stvaryć cіkavostku</string>
<string name="poi_error_poi_not_found">POI nie znojdziena abo nie źjaŭliajecca kropkaj</string> <string name="poi_error_poi_not_found">POI nie znojdziena abo nie źjaŭliajecca kropkaj</string>

73
OsmAnd/res/values-be/phrases.xml
View file

@ -35,7 +35,7 @@
<string name="poi_gift">Падарункі, сувеніры</string> <string name="poi_gift">Падарункі, сувеніры</string>
<string name="poi_baby_goods">Тавары для дзяцей</string> <string name="poi_baby_goods">Тавары для дзяцей</string>
<string name="poi_bathroom_furnishing">Сантэхніка, ванныя</string> <string name="poi_bathroom_furnishing">Сантэхніка, ванныя</string>
<string name="poi_bed">Усё для спальні</string> <string name="poi_bed">Крама пасьцельнай бялізны</string>
<string name="poi_boutique">Буцік</string> <string name="poi_boutique">Буцік</string>
<string name="poi_chemist">Аптэка</string> <string name="poi_chemist">Аптэка</string>
<string name="poi_clothes">Крама адзеньня</string> <string name="poi_clothes">Крама адзеньня</string>
@ -750,7 +750,7 @@
<string name="poi_fuel_e10">E10</string> <string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string> <string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string> <string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string> <string name="poi_fuel_biogas">Біягаз</string>
<string name="poi_fuel_lh2">Вадкі вадарод</string> <string name="poi_fuel_lh2">Вадкі вадарод</string>
<string name="poi_fuel_electricity">Электрычнасьць</string> <string name="poi_fuel_electricity">Электрычнасьць</string>
<string name="poi_farmyard">Падворак</string> <string name="poi_farmyard">Падворак</string>
@ -838,7 +838,7 @@
<string name="poi_wiki_lang_uk">Украінская Вікі</string> <string name="poi_wiki_lang_uk">Украінская Вікі</string>
<string name="poi_wiki_lang_vi">В\'етнамская Вікі</string> <string name="poi_wiki_lang_vi">В\'етнамская Вікі</string>
<string name="poi_wiki_lang_sw">Суахільская Вікі</string> <string name="poi_wiki_lang_sw">Суахільская Вікі</string>
<string name="poi_barrier_entrance">Уваход</string> <string name="poi_barrier_entrance">Праход у сьцяне ці плоце</string>
<string name="poi_entrance_main">Асноўны ўваход</string> <string name="poi_entrance_main">Асноўны ўваход</string>
<string name="poi_entrance">Уваход</string> <string name="poi_entrance">Уваход</string>
<string name="poi_entrance_exit">Выхад</string> <string name="poi_entrance_exit">Выхад</string>
@ -1039,8 +1039,8 @@
<string name="poi_recycling_cars">Аўтамабілі</string> <string name="poi_recycling_cars">Аўтамабілі</string>
<string name="poi_recycling_bicycles">Ровары</string> <string name="poi_recycling_bicycles">Ровары</string>
<string name="poi_drinking_water_yes">Пітная вада</string> <string name="poi_drinking_water_yes">Пітная вада: так</string>
<string name="poi_drinking_water_no">Непрыдатная для піцьця вада</string> <string name="poi_drinking_water_no">Пітная вада: не</string>
<string name="poi_supervised_yes">Кантралюемы аб\'ект</string> <string name="poi_supervised_yes">Кантралюемы аб\'ект</string>
<string name="poi_supervised_no">Некантралюемы аб\'ект</string> <string name="poi_supervised_no">Некантралюемы аб\'ект</string>
<string name="poi_seasonal_yes">Сэзонны аб\'ект</string> <string name="poi_seasonal_yes">Сэзонны аб\'ект</string>
@ -1369,4 +1369,67 @@
<string name="poi_wheelchair_limited">Інвалідныя крэслы: абмежавана</string> <string name="poi_wheelchair_limited">Інвалідныя крэслы: абмежавана</string>
<string name="poi_wholesale">Опт</string> <string name="poi_wholesale">Опт</string>
<string name="poi_traffic_calming_island">Астравок (перашкода)</string>
<string name="poi_tourism_yes">Турыстычны аб\'ект</string>
<string name="poi_religion_unitarian_universalist">Унітарны ўніверсалізм</string>
<string name="poi_religion_multifaith">Шматканфесійнасьць</string>
<string name="poi_religion_jain">Джайнізм</string>
<string name="poi_religion_scientologist">Саенталёгія</string>
<string name="poi_denomination_jehovahs_witness">Сьведкі Іеговы</string>
<string name="poi_denomination_united_reformed">Аб\'яднаная рэфармаваная царква</string>
<string name="poi_denomination_mennonite">Мэнаніцтва</string>
<string name="poi_denomination_assemblies_of_god">Асамблеі Бога</string>
<string name="poi_denomination_nazarene">Назаране</string>
<string name="poi_denomination_united_methodist">Аб\'яднаная метадысцкая царква</string>
<string name="poi_denomination_congregational">Кангрэгацыйная царква</string>
<string name="poi_denomination_dutch_reformed">Нідэрляндзкая рэфармацкая царква</string>
<string name="poi_denomination_apostolic">Апостальская царква</string>
<string name="poi_denomination_latter_day_saints">Рух сьвятых апошніх дзён</string>
<string name="poi_denomination_scientist">Саентызм</string>
<string name="poi_denomination_ethiopian_orthodox_tewahedo">Эфіёпская (абісінская) праваслаўная царква</string>
<string name="poi_denomination_unitarian">Унітарыянства</string>
<string name="poi_denomination_wesleyan">Вэсліянская царква</string>
<string name="poi_denomination_shaktism">Шактызм</string>
<string name="poi_denomination_shingon_shu">Сінгон</string>
<string name="poi_denomination_maronite">Мараніцкая каталіцкая царква</string>
<string name="poi_denomination_mahayana">Махаяна</string>
<string name="poi_debris">Рэшткі</string>
<string name="poi_jersey_barrier">Бар\'ерная агароджа</string>
<string name="poi_artwork_type_installation">Тып: інсталяцыя</string>
<string name="poi_artwork_type_mosaic">Тып: мазайка</string>
<string name="poi_artwork_type_relief">Тып: барэльеф</string>
<string name="poi_artwork_type_graffiti">Тып: графіці</string>
<string name="poi_artwork_type_stele">Тып: стэла</string>
<string name="poi_artwork_type_fountain">Тып: фантан</string>
<string name="poi_width">Шырыня</string>
<string name="poi_architect_name">Архітэктар</string>
<string name="poi_architecture_modern">Архітэктурны стыль: мадэрнізм</string>
<string name="poi_architecture_stalinist_neoclassicism">Архітэктурны стыль: сталінскі нэаклясіцызм</string>
<string name="poi_architecture_eclectic">Архітэктурны стыль: эклектыка</string>
<string name="poi_architecture_new_objectivity">Архітэктурны стыль: новая рэчыўнасць</string>
<string name="poi_architecture_contemporary">Архітэктурны стыль: сучасны</string>
<string name="poi_architecture_constructivism">Архітэктурны стыль: канструктывізм</string>
<string name="poi_architecture_timber_frame">Архітэктурны стыль: фахвэрк</string>
<string name="poi_architecture_art_nouveau">Архітэктурны стыль: мадэрн</string>
<string name="poi_architecture_neoclassicism">Архітэктурны стыль: нэаклясіцызм</string>
<string name="poi_architecture_victorian">Архітэктурны стыль: віктарыянскі</string>
<string name="poi_architecture_brutalism">Архітэктурны стыль: бруталізм</string>
<string name="poi_architecture_classicism">Архітэктурны стыль: клясіцызм</string>
<string name="poi_architecture_gothic">Архітэктурны стыль: готыка</string>
<string name="poi_architecture_oldrussian">Архітэктурны стыль: рускі (сярэднія вякі)</string>
<string name="poi_architecture_baroque">Архітэктурны стыль: барока</string>
<string name="poi_architecture_renaissance">Архітэктурны стыль: рэнесанс</string>
<string name="poi_architecture_romanesque">Архітэктурны стыль: раманскі</string>
<string name="poi_tunnel_waterway">Водны тунэль</string>
<string name="poi_tunnel_car">Тунэль для аўтамабіляў</string>
<string name="poi_tunnel_pedestrian">Тунэль для пешаходаў</string>
<string name="poi_tunnel_railway">Чыгуначны тунэль</string>
<string name="poi_bridge_car">Аўтамабільны мост</string>
<string name="poi_craft_electronics">Рамонт электронікі</string>
</resources> </resources>

37
OsmAnd/res/values-be/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
<resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
<string name="auto_zoom_close">Буйней</string> <string name="auto_zoom_close">Буйней</string>
<string name="auto_zoom_far">Для сярэдняга маштаба</string> <string name="auto_zoom_far">Для сярэдняга маштаба</string>
<string name="auto_zoom_farthest">Драбней</string> <string name="auto_zoom_farthest">Драбней</string>
@ -825,7 +824,7 @@
<string name="vector_data">Лакальныя вектарныя мапы</string> <string name="vector_data">Лакальныя вектарныя мапы</string>
<string name="transport_context_menu">Шукаць транспарт на прыпынку</string> <string name="transport_context_menu">Шукаць транспарт на прыпынку</string>
<string name="osb_bug_name">Памылка</string>
<string name="poi_context_menu_modify">Правіць POI</string> <string name="poi_context_menu_modify">Правіць POI</string>
<string name="poi_context_menu_delete">Выдаліць POI</string> <string name="poi_context_menu_delete">Выдаліць POI</string>
<string name="rotate_map_compass_opt">Па компасе</string> <string name="rotate_map_compass_opt">Па компасе</string>
@ -1072,7 +1071,7 @@
<string name="search_tabs_location">Каардынаты</string> <string name="search_tabs_location">Каардынаты</string>
<string name="context_menu_item_update_map">Абнавіць мапу</string> <string name="context_menu_item_update_map">Абнавіць мапу</string>
<string name="context_menu_item_open_bug">Паведаміць пра памылку на мапе</string>
<string name="context_menu_item_create_poi">Стварыць POI</string> <string name="context_menu_item_create_poi">Стварыць POI</string>
<string name="add_favorite_dialog_top_text">Калі ласка, увядзіце імя пункту</string> <string name="add_favorite_dialog_top_text">Калі ласка, увядзіце імя пункту</string>
<string name="add_favorite_dialog_default_favourite_name">Упадабанае</string> <string name="add_favorite_dialog_default_favourite_name">Упадабанае</string>
@ -1081,22 +1080,22 @@
<string name="favourites_context_menu_delete">Выдаліць упадабанае</string> <string name="favourites_context_menu_delete">Выдаліць упадабанае</string>
<string name="favourites_remove_dialog_msg">Вы сапраўды хочаце выдаліць кропку \'%s\' з закладак?</string> <string name="favourites_remove_dialog_msg">Вы сапраўды хочаце выдаліць кропку \'%s\' з закладак?</string>
<string name="favourites_remove_dialog_success">Кропка {0} была паспяхова выдаленая з закладак.</string> <string name="favourites_remove_dialog_success">Кропка {0} была паспяхова выдаленая з закладак.</string>
<string name="osb_add_dialog_title">Увядзіце тэкст памылкі</string>
<string name="osb_add_dialog_success">Памылка пасьпяхова створана</string>
<string name="osb_add_dialog_error">Выключная сітуацыя: заўвага не была створана</string>
<string name="osb_author_dialog_password">OSM пароль (неабавязковы)</string> <string name="osb_author_dialog_password">OSM пароль (неабавязковы)</string>
<string name="osb_comment_menu_item">Дадаць камэнтар</string>
<string name="osb_comment_dialog_message">Паведамленьне</string> <string name="osb_comment_dialog_message">Паведамленьне</string>
<string name="osb_comment_dialog_author">Імя аўтара</string> <string name="osb_comment_dialog_author">Імя аўтара</string>
<string name="osb_comment_dialog_title">Даданьне каментара да памылкі</string>
<string name="osb_comment_dialog_add_button">Дадаць камэнтар</string>
<string name="osb_comment_dialog_success">Гэты камэнтар быў пасьпяхова дададзены</string> <string name="osb_comment_dialog_success">Гэты камэнтар быў пасьпяхова дададзены</string>
<string name="osb_comment_dialog_error">Выключная сітуацыя: каментар не быў дададзены</string> <string name="osb_comment_dialog_error">Выключная сітуацыя: каментар не быў дададзены</string>
<string name="osb_close_menu_item">Зачыніць памылку</string>
<string name="osb_close_dialog_title">Закрыцьцё памылкі</string>
<string name="osb_close_dialog_close_button">Зачыніць памылку</string>
<string name="osb_close_dialog_success">Памылка была пасьпяхова зачынена</string>
<string name="osb_close_dialog_error">Выключная сітуацыя: памылка не была зачынена</string>
<string name="poi_edit_title">Правіць POI</string> <string name="poi_edit_title">Правіць POI</string>
<string name="poi_create_title">Стварыць POI</string> <string name="poi_create_title">Стварыць POI</string>
<string name="poi_error_poi_not_found">POI не знойдзена або не зьяўляецца кропкай</string> <string name="poi_error_poi_not_found">POI не знойдзена або не зьяўляецца кропкай</string>
@ -1974,7 +1973,7 @@
<string name="shared_string_upload">Адаслаць</string> <string name="shared_string_upload">Адаслаць</string>
<string name="osm_edit_created_poi">Створана OSM POI</string> <string name="osm_edit_created_poi">Створана OSM POI</string>
<string name="osm_edit_created_bug">Створана OSM памылка</string>
<string name="go_to_map">Перайсьці да мапы</string> <string name="go_to_map">Перайсьці да мапы</string>
@ -2006,4 +2005,10 @@
<string name="whats_new">Што новага ў</string> <string name="whats_new">Што новага ў</string>
<string name="rendering_attr_hideProposed_name">Схаваць плануемыя аб\'екты</string> <string name="rendering_attr_hideProposed_name">Схаваць плануемыя аб\'екты</string>
<string name="lang_mk">македонская</string> <string name="lang_mk">македонская</string>
<string name="lang_nds">ніжненямецкая</string>
<string name="lang_fy">заходнефрыская</string>
<string name="lang_als">альбанская (тоская)</string>
<string name="save_poi_without_poi_type_message">Вы сапраўды хочаце захаваць POI бяз тыпу?</string>
<string name="share_osm_edits_subject">Рэдагаваньні OSM апублікаваныя праз OsmAnd</string>
<string name="shared_string_location">Месцазнаходжаньне</string>
</resources> </resources>

33
OsmAnd/res/values-bg/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="osb_author_or_password_not_specified">Моля, въведете потребителско име и парола за сайта на OSM</string> <string name="osb_author_or_password_not_specified">Моля, въведете потребителско име и парола за сайта на OSM</string>
<string name="clear_intermediate_points">Изчистване на междинните точки</string> <string name="clear_intermediate_points">Изчистване на междинните точки</string>
<string name="keep_intermediate_points">Запази междинните точки</string> <string name="keep_intermediate_points">Запази междинните точки</string>
@ -26,7 +25,7 @@
<string name="search_street_in_neighborhood_cities">Търси улицата в съседни градове</string> <string name="search_street_in_neighborhood_cities">Търси улицата в съседни градове</string>
<string name="intermediate_items_sort_return">Междинните точки са подредени с цел оптимизиране на пътя до крайната цел.</string> <string name="intermediate_items_sort_return">Междинните точки са подредени с цел оптимизиране на пътя до крайната цел.</string>
<string name="intermediate_items_sort_by_distance">Сортиране (врата-до-врата)</string> <string name="intermediate_items_sort_by_distance">Сортиране врата-до-врата</string>
<string name="local_osm_changes_backup_successful">Успешно създаден OSM файл с промени %1$s</string> <string name="local_osm_changes_backup_successful">Успешно създаден OSM файл с промени %1$s</string>
<string name="local_osm_changes_backup_failed">Бекъп на промените в OSM не беше успешен</string> <string name="local_osm_changes_backup_failed">Бекъп на промените в OSM не беше успешен</string>
<string name="local_osm_changes_backup">Запишете като промени в OSM</string> <string name="local_osm_changes_backup">Запишете като промени в OSM</string>
@ -1019,7 +1018,7 @@ OsmAnd е с отворен код и активно да се развива.
<string name="vector_data">Офлайн векторни карти</string> <string name="vector_data">Офлайн векторни карти</string>
<string name="transport_context_menu">Търсене за общ. транспорт на тази спирка</string> <string name="transport_context_menu">Търсене за общ. транспорт на тази спирка</string>
<string name="osb_bug_name">Неточност (bug)</string>
<string name="poi_context_menu_modify">Промяна на POI</string> <string name="poi_context_menu_modify">Промяна на POI</string>
<string name="poi_context_menu_delete">Изтриване на POI</string> <string name="poi_context_menu_delete">Изтриване на POI</string>
<string name="rotate_map_compass_opt">По компаса</string> <string name="rotate_map_compass_opt">По компаса</string>
@ -1279,7 +1278,7 @@ OsmAnd е с отворен код и активно да се развива.
<string name="search_tabs_location">Коорд.</string> <string name="search_tabs_location">Коорд.</string>
<string name="context_menu_item_update_map">Обнови картата</string> <string name="context_menu_item_update_map">Обнови картата</string>
<string name="context_menu_item_open_bug">Докладвай за неточност в OSM</string>
<string name="context_menu_item_create_poi">Създай POI</string> <string name="context_menu_item_create_poi">Създай POI</string>
<string name="shared_string_yes">Да</string> <string name="shared_string_yes">Да</string>
<string name="shared_string_cancel">Откажи</string> <string name="shared_string_cancel">Откажи</string>
@ -1293,21 +1292,21 @@ OsmAnd е с отворен код и активно да се развива.
<string name="favourites_context_menu_delete">Изтриване от любими</string> <string name="favourites_context_menu_delete">Изтриване от любими</string>
<string name="favourites_remove_dialog_msg">Да се изтрие ли \'%s\' от любими места?</string> <string name="favourites_remove_dialog_msg">Да се изтрие ли \'%s\' от любими места?</string>
<string name="favourites_remove_dialog_success">Точката {0} беше успешно изтрита от любими места.</string> <string name="favourites_remove_dialog_success">Точката {0} беше успешно изтрита от любими места.</string>
<string name="osb_add_dialog_title">Въведете описание на проблема</string>
<string name="osb_add_dialog_success">Успешно беше създаден доклад за проблема</string>
<string name="osb_add_dialog_error">Възникна грешка: доклад за проблема не беше създаден</string>
<string name="osb_comment_menu_item">Добавяне на коментар</string>
<string name="osb_comment_dialog_message">Съобщение</string> <string name="osb_comment_dialog_message">Съобщение</string>
<string name="osb_comment_dialog_author">Име на автора</string> <string name="osb_comment_dialog_author">Име на автора</string>
<string name="osb_comment_dialog_title">Добавяне на коментар към проблема</string>
<string name="osb_comment_dialog_add_button">Добави коментар</string>
<string name="osb_comment_dialog_success">Коментарът беше успешно добавен</string> <string name="osb_comment_dialog_success">Коментарът беше успешно добавен</string>
<string name="osb_comment_dialog_error">Възникна грешка: коментарът не е записан</string> <string name="osb_comment_dialog_error">Възникна грешка: коментарът не е записан</string>
<string name="osb_close_menu_item">Затвори неточността</string>
<string name="osb_close_dialog_title">Затваряне на доклада</string>
<string name="osb_close_dialog_close_button">Затвори</string>
<string name="osb_close_dialog_success">Докладът беше успешно затворен</string>
<string name="osb_close_dialog_error">Възникна грешка: докладът за неточност не беше затворен успешно</string>
<string name="poi_edit_title">Редактиране на POI</string> <string name="poi_edit_title">Редактиране на POI</string>
<string name="poi_create_title">Създай POI</string> <string name="poi_create_title">Създай POI</string>
<string name="poi_error_poi_not_found">Точката не може да бъде намерена или избраното съдържа повече от една точка</string> <string name="poi_error_poi_not_found">Точката не може да бъде намерена или избраното съдържа повече от една точка</string>
@ -1978,7 +1977,7 @@ OsmAnd е с отворен код и активно да се развива.
<string name="shared_string_update">Актуализация</string> <string name="shared_string_update">Актуализация</string>
<string name="shared_string_upload">Качване</string> <string name="shared_string_upload">Качване</string>
<string name="osm_edit_created_poi">Създаден OSM POI</string> <string name="osm_edit_created_poi">Създаден OSM POI</string>
<string name="osm_edit_created_bug">Създаден OSM бъг</string>
<string name="world_map_download_descr">Световната базова карта (покриваща целия свят в при малък мащаб) липсва или е остаряла. Моля, помислите за изтеглянето й .</string> <string name="world_map_download_descr">Световната базова карта (покриваща целия свят в при малък мащаб) липсва или е остаряла. Моля, помислите за изтеглянето й .</string>
<string name="shared_string_qr_code">QR код</string> <string name="shared_string_qr_code">QR код</string>
<string name="map_downloaded">Картата е изтеглена</string> <string name="map_downloaded">Картата е изтеглена</string>

40
OsmAnd/res/values-ca/phrases.xml
View file

@ -1769,4 +1769,44 @@
<string name="poi_automated_yes">Automatitzat</string> <string name="poi_automated_yes">Automatitzat</string>
<string name="poi_automated_no">No automatitzat</string> <string name="poi_automated_no">No automatitzat</string>
<string name="poi_full_service_yes">Servei integral</string> <string name="poi_full_service_yes">Servei integral</string>
<string name="poi_brushless_yes">Rentacotxes de raspall</string>
<string name="poi_brushless_no">Rentacotxes de raspall: no</string>
<string name="poi_car_wash_no">Rentacotxes: no</string>
<string name="poi_male_yes">Homes</string>
<string name="poi_male_no">Prohibit pels homes</string>
<string name="poi_female_yes">Dones</string>
<string name="poi_female_no">Prohibit per dones</string>
<string name="poi_public_bath">Bany públic</string>
<string name="poi_indoor_yes">Cobert</string>
<string name="poi_indoor_no">Exterior</string>
<string name="poi_toilets_yes">Amb lavabos</string>
<string name="poi_toilets_no">Sense lavabos</string>
<string name="poi_toilets_wheelchair_yes">Accés al bany per cadira de rodes: sí</string>
<string name="poi_toilets_wheelchair_no">Accés al bany per cadira de rodes: no</string>
<string name="poi_toilets_access_customers">Accés al lavabo: clients</string>
<string name="poi_toilets_access_permissive">Accés al lavabo: tolerant</string>
<string name="poi_toilets_access_community">Accés al lavabo: públic</string>
<string name="poi_resource_gravel">Grava</string>
<string name="poi_resource_gypsum">Guix</string>
<string name="poi_resource_mineral_oil">Oli mineral</string>
<string name="poi_resource_slate_iron_ore_copper">Pissarra, mineral de ferro i coure</string>
<string name="poi_wetland_wet_meadow">Prat humit</string>
<string name="poi_historic_quarry">Pedrera històrica</string>
<string name="poi_resource_aggregate">Àrid</string>
<string name="poi_resource_antimony">Antimoni</string>
<string name="poi_resource_asbestos">Asbest</string>
<string name="poi_resource_barite">Baritina</string>
<string name="poi_resource_basalt">Basalt</string>
<string name="poi_resource_bauxite">Bauxita</string>
<string name="poi_resource_beryl">Beril</string>
<string name="poi_resource_bismuth">Bismut</string>
<string name="poi_resource_cereal">Cereals</string>
<string name="poi_resource_chromite">Cromita</string>
<string name="poi_resource_clay">Argila</string>
<string name="poi_resource_coal">Carbó</string>
<string name="poi_resource_copper">Coure</string>
<string name="poi_resource_diamond">Diamants</string>
</resources> </resources>

40
OsmAnd/res/values-ca/strings.xml
View file

@ -378,13 +378,13 @@
<string name="poi_action_add">afegeix</string> <string name="poi_action_add">afegeix</string>
<string name="poi_action_change">canvia</string> <string name="poi_action_change">canvia</string>
<string name="shared_string_delete">Suprimeix</string> <string name="shared_string_delete">Suprimeix</string>
<string name="osb_close_dialog_close_button">Tanca l\'error</string>
<string name="osb_close_dialog_title">S\'està tancant l\'error</string>
<string name="osb_comment_dialog_add_button">Afegeix un comentari</string>
<string name="osb_comment_dialog_message">Missatge</string> <string name="osb_comment_dialog_message">Missatge</string>
<string name="osb_close_menu_item">Tanca l\'error</string>
<string name="osb_comment_dialog_author">Nom de l\'autor</string> <string name="osb_comment_dialog_author">Nom de l\'autor</string>
<string name="osb_add_dialog_success">L\'error s\'ha creat amb èxit</string>
<string name="shared_string_yes">Sí</string> <string name="shared_string_yes">Sí</string>
<string name="shared_string_no">No</string> <string name="shared_string_no">No</string>
<string name="shared_string_add">Afegeix</string> <string name="shared_string_add">Afegeix</string>
@ -459,7 +459,7 @@
<string name="download_type_to_filter">Tipus de filtre</string> <string name="download_type_to_filter">Tipus de filtre</string>
<string name="website">Lloc web</string> <string name="website">Lloc web</string>
<string name="poi_context_menu_call">Mostra el telèfon del PDI</string> <string name="poi_context_menu_call">Mostra el telèfon del PDI</string>
<string name="osb_bug_name">Error</string>
<string name="rotate_map_to_bearing">Orientació del mapa</string> <string name="rotate_map_to_bearing">Orientació del mapa</string>
<string name="shared_string_import">Importa</string> <string name="shared_string_import">Importa</string>
<string name="any_poi">Algun</string> <string name="any_poi">Algun</string>
@ -600,9 +600,9 @@
<string name="search_address_top_text">Selecció de l\'adreça</string> <string name="search_address_top_text">Selecció de l\'adreça</string>
<string name="favourites_context_menu_edit">Edita el preferit</string> <string name="favourites_context_menu_edit">Edita el preferit</string>
<string name="favourites_context_menu_delete">Elimina el preferit</string> <string name="favourites_context_menu_delete">Elimina el preferit</string>
<string name="osb_add_dialog_title">Entra un text d\'error</string>
<string name="osb_close_dialog_success">L\'error s\'ha tancat correctament</string>
<string name="osb_comment_dialog_title">S\'està afegint el comentari a l\'error</string>
<string name="poi_edit_title">Edita el PDI</string> <string name="poi_edit_title">Edita el PDI</string>
<string name="poi_remove_title">Elimina el PDI</string> <string name="poi_remove_title">Elimina el PDI</string>
<string name="poi_create_title">Crea un PDI</string> <string name="poi_create_title">Crea un PDI</string>
@ -688,7 +688,7 @@
<string name="osmand_rastermaps_plugin_description">"Amb aquest connector podeu accedir a diferents tipus de mapa (anomenats mosaic o ràster), des de les tessel·les predefinides d\'OpenStreetMap (com Mapnik) a imatges de satèl·lit i capes específiques com mapes meteorològics, climàtics, geològics, de relleu, etc.\n\nQualsevol d\'aquests mapes es pot utilitzar sigui com principal (base) per veure\'s a la vista del mapa de l\'OsmAnd, o com una superposició o sots-posició d\'un altre mapa base (com els mapes d\'OsmAnd habituals en desconnexió). Per fer més visible qualsevol mapa en sots-posició, es pot amagar fàcilment determinats elements dels mapes vectorials de l\'OsmAnd via el menú «Configuració del mapa» a voluntat.\n\nEls mapes de tessel·les es poden obtenir directament de proveïdors en línia, o es poden preparar per un ús fora de línia (cal copiar-los manualment al directori de l\'OsmAnd) com una base de dades sqlite construïda per diferents eines de preparació de mapes de tercers. "</string> <string name="osmand_rastermaps_plugin_description">"Amb aquest connector podeu accedir a diferents tipus de mapa (anomenats mosaic o ràster), des de les tessel·les predefinides d\'OpenStreetMap (com Mapnik) a imatges de satèl·lit i capes específiques com mapes meteorològics, climàtics, geològics, de relleu, etc.\n\nQualsevol d\'aquests mapes es pot utilitzar sigui com principal (base) per veure\'s a la vista del mapa de l\'OsmAnd, o com una superposició o sots-posició d\'un altre mapa base (com els mapes d\'OsmAnd habituals en desconnexió). Per fer més visible qualsevol mapa en sots-posició, es pot amagar fàcilment determinats elements dels mapes vectorials de l\'OsmAnd via el menú «Configuració del mapa» a voluntat.\n\nEls mapes de tessel·les es poden obtenir directament de proveïdors en línia, o es poden preparar per un ús fora de línia (cal copiar-los manualment al directori de l\'OsmAnd) com una base de dades sqlite construïda per diferents eines de preparació de mapes de tercers. "</string>
<string name="choose_audio_stream_descr">Escolliu el canal per reproduir el guiat per veu (depenent del sistema)</string> <string name="choose_audio_stream_descr">Escolliu el canal per reproduir el guiat per veu (depenent del sistema)</string>
<string name="renderers">Renderització dels vectors</string> <string name="renderers">Renderització dels vectors</string>
<string name="context_menu_item_open_bug">Obre un error d\'OSM</string>
<string name="add_tag">Afegeix una etiqueta</string> <string name="add_tag">Afegeix una etiqueta</string>
<string name="poi_filter_entertainment">Entreteniment</string> <string name="poi_filter_entertainment">Entreteniment</string>
<string name="context_menu_item_first_intermediate_point">Defineix el primer punt objectiu</string> <string name="context_menu_item_first_intermediate_point">Defineix el primer punt objectiu</string>
@ -775,7 +775,7 @@
<string name="add_favorite_dialog_top_text">Introducció del nom del preferit</string> <string name="add_favorite_dialog_top_text">Introducció del nom del preferit</string>
<string name="add_favorite_dialog_default_favourite_name">Preferit</string> <string name="add_favorite_dialog_default_favourite_name">Preferit</string>
<string name="add_favorite_dialog_favourite_added_template">El punt preferit «{0}» s\'ha afegit correctament.</string> <string name="add_favorite_dialog_favourite_added_template">El punt preferit «{0}» s\'ha afegit correctament.</string>
<string name="osb_comment_menu_item">Afegeix un comentari</string>
<string name="osb_comment_dialog_success">El comentari s\'ha afegit correctament</string> <string name="osb_comment_dialog_success">El comentari s\'ha afegit correctament</string>
<string name="poi_remove_success">El PDI s\'ha eliminat correctament</string> <string name="poi_remove_success">El PDI s\'ha eliminat correctament</string>
<string name="shared_string_clear">Neteja</string> <string name="shared_string_clear">Neteja</string>
@ -901,7 +901,7 @@
<string name="sd_dir_not_accessible">La carpeta d\'emmagatzematge a la targeta SD no és accessible!</string> <string name="sd_dir_not_accessible">La carpeta d\'emmagatzematge a la targeta SD no és accessible!</string>
<string name="please_select_address">Seleccioneu primer un municipi o carrer</string> <string name="please_select_address">Seleccioneu primer un municipi o carrer</string>
<string name="search_street_in_neighborhood_cities">Cerca el carrer en els municipis propers</string> <string name="search_street_in_neighborhood_cities">Cerca el carrer en els municipis propers</string>
<string name="intermediate_items_sort_by_distance">Ordre (porta a porta)</string> <string name="intermediate_items_sort_by_distance">Ordre porta a porta</string>
<string name="delete_point">Suprimeix el punt</string> <string name="delete_point">Suprimeix el punt</string>
<string name="plugin_distance_point_time">hora</string> <string name="plugin_distance_point_time">hora</string>
<string name="plugin_distance_point_hdop">precisió</string> <string name="plugin_distance_point_hdop">precisió</string>
@ -974,7 +974,7 @@
<string name="incremental_search_building">Cerca progressiva d\'edificis</string> <string name="incremental_search_building">Cerca progressiva d\'edificis</string>
<string name="Closest_Amenities">Instal·lacions més properes</string> <string name="Closest_Amenities">Instal·lacions més properes</string>
<string name="position_on_map_bottom">Part inferior</string> <string name="position_on_map_bottom">Part inferior</string>
<string name="osb_add_dialog_error">S\'ha produït una excepció: no s\'ha creat l\'error</string>
<string name="poi_error_poi_not_found">No s\'ha trobat el node o la instal·lació no és un node únic</string> <string name="poi_error_poi_not_found">No s\'ha trobat el node o la instal·lació no és un node únic</string>
<string name="poi_error_io_error_template">S\'ha produït un error d\'E/S durant l\'acció {0}.</string> <string name="poi_error_io_error_template">S\'ha produït un error d\'E/S durant l\'acció {0}.</string>
<string name="announce_gpx_waypoints">Fites GPX</string> <string name="announce_gpx_waypoints">Fites GPX</string>
@ -1092,7 +1092,7 @@
<string name="av_camera_focus_descr">Trieu el tipus d\'enfocament de la càmera</string> <string name="av_camera_focus_descr">Trieu el tipus d\'enfocament de la càmera</string>
<string name="av_camera_focus">Tipus d\'enfocament</string> <string name="av_camera_focus">Tipus d\'enfocament</string>
<string name="poi_error_unexpected_template">S\'ha produït un error inesperat en fer l\'acció {0}.</string> <string name="poi_error_unexpected_template">S\'ha produït un error inesperat en fer l\'acció {0}.</string>
<string name="osb_close_dialog_error">S\'ha produït una excepció: no s\'ha tancat l\'error</string>
<string name="map_tile_source_descr">Trieu l\'origen de les tessel·les, en línia o de la memòria cau</string> <string name="map_tile_source_descr">Trieu l\'origen de les tessel·les, en línia o de la memòria cau</string>
<string name="previous_run_crashed">La darrera execució de l\'OsmAnd ha fallat. El fitxer log és a {0}. Si us plau informeu del problema i adjunteu el fitxer log.</string> <string name="previous_run_crashed">La darrera execució de l\'OsmAnd ha fallat. El fitxer log és a {0}. Si us plau informeu del problema i adjunteu el fitxer log.</string>
<string name="transport_stop_to_go_out">Trieu aturada per sortir</string> <string name="transport_stop_to_go_out">Trieu aturada per sortir</string>
@ -1790,7 +1790,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="enter_country_name">Indiqueu el nom del país</string> <string name="enter_country_name">Indiqueu el nom del país</string>
<string name="shared_string_upload">Pujada</string> <string name="shared_string_upload">Pujada</string>
<string name="osm_edit_created_poi">S\'ha creat un PDI a OSM</string> <string name="osm_edit_created_poi">S\'ha creat un PDI a OSM</string>
<string name="osm_edit_created_bug">S\'ha obert un nou error a OSM</string>
<string name="new_version">Versió nova</string> <string name="new_version">Versió nova</string>
<string name="begin_with_osmand_menu_group">Primeres passes a OsmAnd</string> <string name="begin_with_osmand_menu_group">Primeres passes a OsmAnd</string>
<string name="features_menu_group">Característiques</string> <string name="features_menu_group">Característiques</string>
@ -1816,4 +1816,14 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="read_more">Llegiu-ne més</string> <string name="read_more">Llegiu-ne més</string>
<string name="whats_new">Què hi ha de nou a</string> <string name="whats_new">Què hi ha de nou a</string>
<string name="share_osm_edits_subject">Edicions OSM compartides via OsmAnd</string>
<string name="lang_nds">Baix alemany</string>
<string name="lang_mk">Macedònic</string>
<string name="lang_fy">Frisó</string>
<string name="lang_als">Albanès (Tosc)</string>
<string name="save_poi_without_poi_type_message">Confirmeu desar el PDI sense indicar el tipus?</string>
<string name="context_menu_item_delete_waypoint">Voleu suprimir la fita GPX?</string>
<string name="context_menu_item_edit_waypoint">Edita la fita GPX</string>
<string name="shared_string_location">Localització</string>
<string name="poi_context_menu_modify_osm_change">Modifica el canvi OSM</string>
</resources> </resources>

39
OsmAnd/res/values-cs/strings.xml
View file

@ -374,7 +374,7 @@
<string name="error_reading_gpx">Chyba při načítání dat GPX</string> <string name="error_reading_gpx">Chyba při načítání dat GPX</string>
<string name="vector_data">Vektorové mapy OSM</string> <string name="vector_data">Vektorové mapy OSM</string>
<string name="transport_context_menu">Hledat dopravu ze zastávky</string> <string name="transport_context_menu">Hledat dopravu ze zastávky</string>
<string name="osb_bug_name">Chyba</string>
<string name="poi_context_menu_modify">Upravit POI</string> <string name="poi_context_menu_modify">Upravit POI</string>
<string name="poi_context_menu_delete">Smazat POI</string> <string name="poi_context_menu_delete">Smazat POI</string>
<string name="rotate_map_compass_opt">Podle kompasu</string> <string name="rotate_map_compass_opt">Podle kompasu</string>
@ -614,7 +614,7 @@
<string name="search_address_street_option">Protínající ulice</string> <string name="search_address_street_option">Protínající ulice</string>
<string name="search_tabs_location">Poloha</string> <string name="search_tabs_location">Poloha</string>
<string name="context_menu_item_update_map">Aktualizovat mapu</string> <string name="context_menu_item_update_map">Aktualizovat mapu</string>
<string name="context_menu_item_open_bug">Otevřít chybu OSM</string>
<string name="context_menu_item_create_poi">Vytvořit POI</string> <string name="context_menu_item_create_poi">Vytvořit POI</string>
<string name="shared_string_yes">Ano</string> <string name="shared_string_yes">Ano</string>
<string name="shared_string_cancel">Zrušit</string> <string name="shared_string_cancel">Zrušit</string>
@ -628,21 +628,21 @@
<string name="favourites_context_menu_delete">Smazat oblíbené</string> <string name="favourites_context_menu_delete">Smazat oblíbené</string>
<string name="favourites_remove_dialog_msg">Opravdu chcete odstranit oblíbené místo \'%s\'?</string> <string name="favourites_remove_dialog_msg">Opravdu chcete odstranit oblíbené místo \'%s\'?</string>
<string name="favourites_remove_dialog_success">Oblíbené místo {0} bylo vymazáno.</string> <string name="favourites_remove_dialog_success">Oblíbené místo {0} bylo vymazáno.</string>
<string name="osb_add_dialog_title">Vložte text chyby</string>
<string name="osb_add_dialog_success">Chyba úspěšně vytvořena</string>
<string name="osb_add_dialog_error">Došlo k výjimce: chyba nebyla vytvořena</string>
<string name="osb_comment_menu_item">Přidat komentář</string>
<string name="osb_comment_dialog_message">Hlášení</string> <string name="osb_comment_dialog_message">Hlášení</string>
<string name="osb_comment_dialog_author">Jméno autora</string> <string name="osb_comment_dialog_author">Jméno autora</string>
<string name="osb_comment_dialog_title">Přidat komentář k chybě</string>
<string name="osb_comment_dialog_add_button">Přidat komentář</string>
<string name="osb_comment_dialog_success">Komentář byl úspěšně přidán</string> <string name="osb_comment_dialog_success">Komentář byl úspěšně přidán</string>
<string name="osb_comment_dialog_error">Došlo k výjimce: komentář nebyl přidán</string> <string name="osb_comment_dialog_error">Došlo k výjimce: komentář nebyl přidán</string>
<string name="osb_close_menu_item">Uzavřít chybu</string>
<string name="osb_close_dialog_title">Uzavírám chybu</string>
<string name="osb_close_dialog_close_button">Uzavřít chybu</string>
<string name="osb_close_dialog_success">Chyba byla úspěšně uzavřena</string>
<string name="osb_close_dialog_error">Došlo k výjimce: Chyba nebyla uzavřena</string>
<string name="poi_edit_title">Upravit POI</string> <string name="poi_edit_title">Upravit POI</string>
<string name="poi_create_title">Vytvořit POI</string> <string name="poi_create_title">Vytvořit POI</string>
<string name="poi_error_poi_not_found">Bod nelze najít nebo hledaný objekt není samostatným bodem</string> <string name="poi_error_poi_not_found">Bod nelze najít nebo hledaný objekt není samostatným bodem</string>
@ -993,7 +993,7 @@
<string name="please_select_address">Zvolte nejprve město nebo ulici</string> <string name="please_select_address">Zvolte nejprve město nebo ulici</string>
<string name="search_street_in_neighborhood_cities">Hledat ulice v okolních obcích</string> <string name="search_street_in_neighborhood_cities">Hledat ulice v okolních obcích</string>
<string name="intermediate_items_sort_return">Pořadí mezicílů bylo utříděno, aby měly optimální pořadí na cestě z aktuálního místa do místa určení .</string> <string name="intermediate_items_sort_return">Pořadí mezicílů bylo utříděno, aby měly optimální pořadí na cestě z aktuálního místa do místa určení .</string>
<string name="intermediate_items_sort_by_distance">Utřídit (ode dveří ke dveřím)</string> <string name="intermediate_items_sort_by_distance">Utřídit ode dveří ke dveřím</string>
<string name="osb_author_or_password_not_specified">Prosím zadejte v Nastaveních uživatelské jméno a heslo pro vstup do OSM</string> <string name="osb_author_or_password_not_specified">Prosím zadejte v Nastaveních uživatelské jméno a heslo pro vstup do OSM</string>
<string name="clear_intermediate_points">Smazat cíle</string> <string name="clear_intermediate_points">Smazat cíle</string>
<string name="keep_intermediate_points">Zachovat cíle</string> <string name="keep_intermediate_points">Zachovat cíle</string>
@ -1797,7 +1797,7 @@
<string name="first_usage_item_description">Jak stahovat mapy, provést základní nastavení</string> <string name="first_usage_item_description">Jak stahovat mapy, provést základní nastavení</string>
<string name="navigation_item_description">Nastavení navigace</string> <string name="navigation_item_description">Nastavení navigace</string>
<string name="faq_item">Často kladené dotazy</string> <string name="faq_item">Často kladené dotazy</string>
<string name="faq_item_description">Jak použít moduly</string> <string name="faq_item_description">Často kladené otázky</string>
<string name="map_viewing_item">Prohlížení mapy</string> <string name="map_viewing_item">Prohlížení mapy</string>
<string name="search_on_the_map_item">Hledání na mapě</string> <string name="search_on_the_map_item">Hledání na mapě</string>
<string name="planning_trip_item">Plánování cesty</string> <string name="planning_trip_item">Plánování cesty</string>
@ -1807,11 +1807,18 @@
<string name="feedback">Anketa</string> <string name="feedback">Anketa</string>
<string name="contact_us">Kontaktujte nás</string> <string name="contact_us">Kontaktujte nás</string>
<string name="osm_edit_created_poi">Vytvořen OSM POI</string> <string name="osm_edit_created_poi">Vytvořen OSM POI</string>
<string name="osm_edit_created_bug">Vytvořena OSM chyba</string>
<string name="map_legend">Legenda mapy</string> <string name="map_legend">Legenda mapy</string>
<string name="shared_string_update">Aktualizovat</string> <string name="shared_string_update">Aktualizovat</string>
<string name="shared_string_upload">Odeslat</string> <string name="shared_string_upload">Odeslat</string>
<string name="rendering_attr_hideProposed_name">Skrýt plánované objekty</string> <string name="rendering_attr_hideProposed_name">Skrýt plánované objekty</string>
<string name="whats_new">Novinky ve</string> <string name="whats_new">Novinky ve</string>
<string name="share_osm_edits_subject">Úpravy OSM sdílené přes OsmAnd</string>
<string name="lang_nds">Dolní němčina</string>
<string name="lang_mk">Makedónsky</string>
<string name="lang_fy">Frínsky</string>
<string name="lang_als">Albánsky (Tosk)</string>
<string name="read_more">Číst více</string>
<string name="save_poi_without_poi_type_message">Opravdu chcete uložit bod POI bez uvedení typu?</string>
</resources> </resources>

70
OsmAnd/res/values-da/phrases.xml
View file

@ -2448,35 +2448,67 @@
<string name="poi_hackerspace">Hacklab</string> <string name="poi_hackerspace">Hacklab</string>
<string name="poi_wiki_lang_af">Afrikaans wiki</string> <string name="poi_wiki_lang_af">Afrikaans wiki</string>
<string name="poi_wiki_lang_als">Alsace wiki</string> <string name="poi_wiki_lang_als">Elsassisk wiki</string>
<string name="poi_wiki_lang_az">Aserbajdsjanske wiki</string> <string name="poi_wiki_lang_az">Aserbajdsjansk wiki</string>
<string name="poi_wiki_lang_bn">Bengalsk wiki</string> <string name="poi_wiki_lang_bn">Bengalsk wiki</string>
<string name="poi_wiki_lang_bpy">Bishnupriya wiki</string> <string name="poi_wiki_lang_bpy">Bishnupriya manipur wiki</string>
<string name="poi_wiki_lang_br">Bretagnes wiki</string> <string name="poi_wiki_lang_br">Bretonsk wiki</string>
<string name="poi_wiki_lang_cy">Walisisk wiki</string> <string name="poi_wiki_lang_cy">Walisisk wiki</string>
<string name="poi_wiki_lang_eo">Esperanto wiki</string> <string name="poi_wiki_lang_eo">Esperanto wiki</string>
<string name="poi_wiki_lang_eu">Baskiske wiki</string> <string name="poi_wiki_lang_eu">Baskisk wiki</string>
<string name="poi_wiki_lang_fa">Farsi wiki</string> <string name="poi_wiki_lang_fa">Farsi wiki</string>
<string name="poi_wiki_lang_fy">Vestfrisisk</string> <string name="poi_wiki_lang_fy">Vestfrisisk wiki</string>
<string name="poi_wiki_lang_hy">Armenske wiki</string> <string name="poi_wiki_lang_hy">Armensk wiki</string>
<string name="poi_wiki_lang_is">Islandsk wiki</string> <string name="poi_wiki_lang_is">Islandsk wiki</string>
<string name="poi_wiki_lang_ka">Georgiske wiki</string> <string name="poi_wiki_lang_ka">Georgisk wiki</string>
<string name="poi_wiki_lang_ku">Kurdiske wiki</string> <string name="poi_wiki_lang_ku">Kurdisk wiki</string>
<string name="poi_wiki_lang_la">Latin wiki</string> <string name="poi_wiki_lang_la">Latinsk wiki</string>
<string name="poi_wiki_lang_lb">Luxembourgsk wiki</string> <string name="poi_wiki_lang_lb">Luxembourgsk wiki</string>
<string name="poi_wiki_lang_mk">Makedonsk-wiki</string> <string name="poi_wiki_lang_mk">Makedonsk wiki</string>
<string name="poi_wiki_lang_ml">Malayalam wiki</string> <string name="poi_wiki_lang_ml">Malayalam wiki</string>
<string name="poi_wiki_lang_mr">Marathi wiki</string> <string name="poi_wiki_lang_mr">Marathi wiki</string>
<string name="poi_wiki_lang_nds">Plattysk wiki</string> <string name="poi_wiki_lang_nds">Niedersachsen wiki</string>
<string name="poi_wiki_lang_nv">Navajo wiki</string> <string name="poi_wiki_lang_nv">Navajo wiki</string>
<string name="poi_wiki_lang_os">Ossetiske wiki</string> <string name="poi_wiki_lang_os">Ossetisk wiki</string>
<string name="poi_wiki_lang_pms">Piemontesiske wiki</string> <string name="poi_wiki_lang_pms">Piemontesisk wiki</string>
<string name="poi_wiki_lang_sc">Sardiske wiki</string> <string name="poi_wiki_lang_sc">Sardisk wiki</string>
<string name="poi_wiki_lang_sh">Serbokroatisk wiki</string> <string name="poi_wiki_lang_sh">Serbokroatisk wiki</string>
<string name="poi_wiki_lang_sq">Albansk-wiki</string> <string name="poi_wiki_lang_sq">Albansk wiki</string>
<string name="poi_wiki_lang_ta">Tamil wiki</string> <string name="poi_wiki_lang_ta">Tamilsk wiki</string>
<string name="poi_wiki_lang_tl">Filippinsk-wiki</string> <string name="poi_wiki_lang_tl">Filippinsk wiki</string>
<string name="poi_wiki_lang_bs">Bosnisk wiki</string> <string name="poi_wiki_lang_bs">Bosnisk wiki</string>
<string name="poi_wiki_lang_ga">Irske wiki</string> <string name="poi_wiki_lang_ga">Irsk wiki</string>
<string name="poi_wiki_lang_war">Waray-waray wiki</string>
<string name="poi_wiki_lang_min">Minangkabau wiki</string>
<string name="poi_wiki_lang_kk">Kasakhisk wiki</string>
<string name="poi_wiki_lang_uz">Usbekisk wiki</string>
<string name="poi_wiki_lang_ce">Tjetjensk wiki</string>
<string name="poi_wiki_lang_ur">Urdu wiki</string>
<string name="poi_wiki_lang_oc">Occitansk wiki</string>
<string name="poi_wiki_lang_zhminnan">Minnan wiki</string>
<string name="poi_wiki_lang_mg">Malagassisk wiki</string>
<string name="poi_wiki_lang_tt">Tatarisk wiki</string>
<string name="poi_wiki_lang_jv">Javanesisk wiki</string>
<string name="poi_wiki_lang_ky">Kirgisisk wiki</string>
<string name="poi_wiki_lang_zhyue">Kantonesisk wiki</string>
<string name="poi_wiki_lang_ast">Asturleonesisk wiki</string>
<string name="poi_wiki_lang_tg">Tadjikisk wiki</string>
<string name="poi_wiki_lang_ba">Bashkir</string>
<string name="poi_wiki_lang_sco">Skotsk wiki</string>
<string name="poi_wiki_lang_pnb">Punjabi wiki</string>
<string name="poi_wiki_lang_cv">Tsjuvasjisk wiki</string>
<string name="poi_wiki_lang_lmo">Lombardisk wiki</string>
<string name="poi_wiki_lang_my">Burmesisk wiki</string>
<string name="poi_wiki_lang_yo">Yoruba wiki</string>
<string name="poi_wiki_lang_an">Aragonsk wiki</string>
<string name="poi_wiki_lang_ne">Nepalesisk wiki</string>
<string name="poi_wiki_lang_gu">Gujarati wiki</string>
<string name="poi_wiki_lang_scn">Siciliansk wiki</string>
<string name="poi_wiki_lang_bar">Bayersk wiki</string>
<string name="poi_wiki_lang_mn">Mongolsk wiki</string>
<string name="poi_wiki_lang_nap">Napolitansk wiki</string>
<string name="poi_craft_electronics">Reparation af elektronik</string>
</resources> </resources>

62
OsmAnd/res/values-da/strings.xml
View file

File diff suppressed because one or more lines are too long

6
OsmAnd/res/values-de/phrases.xml
View file

@ -360,7 +360,7 @@
<string name="poi_physiotherapist">Physiotherapeut</string> <string name="poi_physiotherapist">Physiotherapeut</string>
<string name="poi_picnic_site">Picknick</string> <string name="poi_picnic_site">Picknick</string>
<string name="poi_pier">Pier</string> <string name="poi_pier">Pier</string>
<string name="poi_pitch">Stellplatz</string> <string name="poi_pitch">Sportplatz</string>
<string name="poi_place_allotments">Kleingartensiedlung</string> <string name="poi_place_allotments">Kleingartensiedlung</string>
<string name="poi_place_farm">Farm</string> <string name="poi_place_farm">Farm</string>
<string name="poi_place_of_worship">Kultstätte</string> <string name="poi_place_of_worship">Kultstätte</string>
@ -585,7 +585,7 @@
<string name="poi_windmill">Windmühle</string> <string name="poi_windmill">Windmühle</string>
<string name="poi_window_blind">Rollvorhang</string> <string name="poi_window_blind">Rollvorhang</string>
<string name="poi_craft_window_construction">Fensterbau</string> <string name="poi_craft_window_construction">Fensterbau</string>
<string name="poi_works">Anlage</string> <string name="poi_works">Produktionsstätte</string>
<string name="poi_wreck">Schiffswrack</string> <string name="poi_wreck">Schiffswrack</string>
<string name="poi_zoo">Zoo</string> <string name="poi_zoo">Zoo</string>
<string name="poi_american_football">Amerik. Football</string> <string name="poi_american_football">Amerik. Football</string>
@ -1027,4 +1027,6 @@
<string name="poi_office_religion">Büro einer Glaubensgemeinschaft</string> <string name="poi_office_religion">Büro einer Glaubensgemeinschaft</string>
<string name="poi_financial">Finanzverwaltung</string> <string name="poi_financial">Finanzverwaltung</string>
<string name="poi_highway_steps">Treppe</string>
<string name="poi_historic_milestone">Meilenstein</string>
</resources> </resources>

38
OsmAnd/res/values-de/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="regions">Regionen</string> <string name="regions">Regionen</string>
<string name="region_maps">Regionsweite Karten</string> <string name="region_maps">Regionsweite Karten</string>
<string name="world_maps">Weltweite Karten</string> <string name="world_maps">Weltweite Karten</string>
@ -641,7 +640,7 @@
<string name="vector_data">Offline-Vektor-Karten</string> <string name="vector_data">Offline-Vektor-Karten</string>
<string name="transport_context_menu">Suche nach Verbindung an Haltestelle</string> <string name="transport_context_menu">Suche nach Verbindung an Haltestelle</string>
<string name="osb_bug_name">OSM-Fehler</string>
<string name="poi_context_menu_modify">Bearbeite POI</string> <string name="poi_context_menu_modify">Bearbeite POI</string>
<string name="poi_context_menu_delete">Lösche POI</string> <string name="poi_context_menu_delete">Lösche POI</string>
<string name="rotate_map_compass_opt">Nach Kompass</string> <string name="rotate_map_compass_opt">Nach Kompass</string>
@ -899,7 +898,7 @@
<string name="search_tabs_location">Position</string> <string name="search_tabs_location">Position</string>
<string name="context_menu_item_update_map">Karte aktualisieren</string> <string name="context_menu_item_update_map">Karte aktualisieren</string>
<string name="context_menu_item_open_bug">OSM Fehlerbericht einsenden</string>
<string name="context_menu_item_create_poi">POI einsenden</string> <string name="context_menu_item_create_poi">POI einsenden</string>
<string name="shared_string_yes">Ja</string> <string name="shared_string_yes">Ja</string>
<string name="shared_string_cancel">Abbrechen</string> <string name="shared_string_cancel">Abbrechen</string>
@ -913,21 +912,21 @@
<string name="favourites_context_menu_delete">Favorit löschen</string> <string name="favourites_context_menu_delete">Favorit löschen</string>
<string name="favourites_remove_dialog_msg">Wollen Sie den Punkt \'%s\' wirklich löschen?</string> <string name="favourites_remove_dialog_msg">Wollen Sie den Punkt \'%s\' wirklich löschen?</string>
<string name="favourites_remove_dialog_success">Der Punkt {0} wurde erfolgreich gelöscht.</string> <string name="favourites_remove_dialog_success">Der Punkt {0} wurde erfolgreich gelöscht.</string>
<string name="osb_add_dialog_title">Eingabetext des Fehlers</string>
<string name="osb_add_dialog_success">OSM-Fehlerbericht erfolgreich erstellt</string>
<string name="osb_add_dialog_error">Fehler: Fehlerbericht wurde nicht erstellt</string>
<string name="osb_comment_menu_item">Kommentar hinzufügen</string>
<string name="osb_comment_dialog_message">Nachricht</string> <string name="osb_comment_dialog_message">Nachricht</string>
<string name="osb_comment_dialog_author">Autor</string> <string name="osb_comment_dialog_author">Autor</string>
<string name="osb_comment_dialog_title">Kommentar dem OSM-Fehlerbericht hinzufügen</string>
<string name="osb_comment_dialog_add_button">Kommentar hinzufügen</string>
<string name="osb_comment_dialog_success">Kommentar wurde erfolgreich hinzugefügt</string> <string name="osb_comment_dialog_success">Kommentar wurde erfolgreich hinzugefügt</string>
<string name="osb_comment_dialog_error">Fehler: Kommentar wurde nicht hinzugefügt</string> <string name="osb_comment_dialog_error">Fehler: Kommentar wurde nicht hinzugefügt</string>
<string name="osb_close_menu_item">OSM-Fehlerbericht schließen</string>
<string name="osb_close_dialog_title">OSM-Fehlerbericht schließen</string>
<string name="osb_close_dialog_close_button">Schließen</string>
<string name="osb_close_dialog_success">OSM-Fehlerbericht wurde hinzugefügt</string>
<string name="osb_close_dialog_error">Fehler: OSM-Fehlerbericht wurde nicht erstellt</string>
<string name="poi_edit_title">POI bearbeiten</string> <string name="poi_edit_title">POI bearbeiten</string>
<string name="poi_create_title">POI erstellen</string> <string name="poi_create_title">POI erstellen</string>
<string name="poi_error_poi_not_found">POI wurde nicht gefunden oder die Einrichtung ist kein einzelner Knoten</string> <string name="poi_error_poi_not_found">POI wurde nicht gefunden oder die Einrichtung ist kein einzelner Knoten</string>
@ -1210,7 +1209,7 @@
<string name="distance_measurement_load_gpx">Vorhandene GPX-Datei öffnen</string> <string name="distance_measurement_load_gpx">Vorhandene GPX-Datei öffnen</string>
<string name="search_street_in_neighborhood_cities">Straßenname in weiteren Orten suchen</string> <string name="search_street_in_neighborhood_cities">Straßenname in weiteren Orten suchen</string>
<string name="intermediate_items_sort_by_distance">Sortieren (Tür-zu-Tür)</string> <string name="intermediate_items_sort_by_distance">Tür-zu-Tür sortieren</string>
<string name="use_distance_measurement_help">* Tippen, um einen Punkt zu setzen.\n * Lange auf die Karte tippen, um einen vorigen Punkt zu löschen.\n * Lange auf einen Punkt tippen, um eine Beschreibung zu lesen oder hinzuzufügen.\n * Mehr Aktionen durch Tippen auf das Entfernungsmesser-Widget.</string> <string name="use_distance_measurement_help">* Tippen, um einen Punkt zu setzen.\n * Lange auf die Karte tippen, um einen vorigen Punkt zu löschen.\n * Lange auf einen Punkt tippen, um eine Beschreibung zu lesen oder hinzuzufügen.\n * Mehr Aktionen durch Tippen auf das Entfernungsmesser-Widget.</string>
<string name="distance_measurement_start_editing">Messung beginnen</string> <string name="distance_measurement_start_editing">Messung beginnen</string>
<string name="distance_measurement_finish_editing">Messung beenden</string> <string name="distance_measurement_finish_editing">Messung beenden</string>
@ -1801,6 +1800,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="dash_download_new_one">Neue Karte herunterladen</string> <string name="dash_download_new_one">Neue Karte herunterladen</string>
<string name="dash_download_manage">Karten verwalten</string> <string name="dash_download_manage">Karten verwalten</string>
<string name="rendering_attr_roadStyle_name">Straßendarstellung</string> <string name="rendering_attr_roadStyle_name">Straßendarstellung</string>
<string name="rendering_attr_roadStyle_description">Straßendarstellung</string>
<string name="rendering_value__name">Standard</string> <string name="rendering_value__name">Standard</string>
<string name="rendering_value_default_name">Standard</string> <string name="rendering_value_default_name">Standard</string>
<string name="rendering_value_orange_name">Orange</string> <string name="rendering_value_orange_name">Orange</string>
@ -1992,7 +1992,9 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="rendering_value_default13_name">Standard (13)</string> <string name="rendering_value_default13_name">Standard (13)</string>
<string name="rendering_value_defaultTranslucentCyan_name">Standard (transparentes Cyan)</string> <string name="rendering_value_defaultTranslucentCyan_name">Standard (transparentes Cyan)</string>
<string name="rendering_attr_currentTrackColor_name">GPX-Farbe</string> <string name="rendering_attr_currentTrackColor_name">GPX-Farbe</string>
<string name="rendering_attr_currentTrackColor_description">GPX-Farbe</string>
<string name="rendering_attr_currentTrackWidth_name">GPX-Breite</string> <string name="rendering_attr_currentTrackWidth_name">GPX-Breite</string>
<string name="rendering_attr_currentTrackWidth_description">GPX-Breite</string>
<string name="rendering_value_red_name">Rot</string> <string name="rendering_value_red_name">Rot</string>
<string name="rendering_value_translucent_red_name">Transparentes Rot</string> <string name="rendering_value_translucent_red_name">Transparentes Rot</string>
<string name="rendering_value_translucent_orange_name">Transparentes Orange</string> <string name="rendering_value_translucent_orange_name">Transparentes Orange</string>
@ -2073,7 +2075,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="rendering_attr_hideProposed_name">Vorgeschlagene Objekte ausblenden</string> <string name="rendering_attr_hideProposed_name">Vorgeschlagene Objekte ausblenden</string>
<string name="shared_string_update">Aktualisieren</string> <string name="shared_string_update">Aktualisieren</string>
<string name="rec_video_description">Video %1$s</string>
<string name="shared_string_upload">Hochladen</string> <string name="shared_string_upload">Hochladen</string>
<string name="shared_string_qr_code">QR-Code</string> <string name="shared_string_qr_code">QR-Code</string>
<string name="map_downloaded">Karte heruntergeladen</string> <string name="map_downloaded">Karte heruntergeladen</string>
@ -2084,7 +2086,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="read_more">Weiter lesen</string> <string name="read_more">Weiter lesen</string>
<string name="whats_new">Neuerungen in</string> <string name="whats_new">Neuerungen in</string>
<string name="osm_edit_created_poi">OSM POI erstellt</string> <string name="osm_edit_created_poi">OSM POI erstellt</string>
<string name="osm_edit_created_bug">OSM Note erstellt</string>
<string name="world_map_download_descr">Die Basis-Weltkarte (Abdeckung für den ganzen Planeten bei kleinen Zoomstufen) ist nicht vorhanden oder veraltet. Für eine korrekte Darstellung sollte die Basis-Weltkarte heruntergeladen werden.</string> <string name="world_map_download_descr">Die Basis-Weltkarte (Abdeckung für den ganzen Planeten bei kleinen Zoomstufen) ist nicht vorhanden oder veraltet. Für eine korrekte Darstellung sollte die Basis-Weltkarte heruntergeladen werden.</string>
<string name="simulate_initial_startup_descr">Setzt das Flag zum erstmaligen App-Start. Alle anderen Einstellungen bleiben unverändert.</string> <string name="simulate_initial_startup_descr">Setzt das Flag zum erstmaligen App-Start. Alle anderen Einstellungen bleiben unverändert.</string>
<string name="simulate_initial_startup">Simuliere den ersten App-Start</string> <string name="simulate_initial_startup">Simuliere den ersten App-Start</string>

28
OsmAnd/res/values-el/strings.xml
View file

@ -604,7 +604,7 @@
<string name="vector_data">Offline διανυσματικοί χάρτες</string> <string name="vector_data">Offline διανυσματικοί χάρτες</string>
<string name="transport_context_menu">Αναζήτηση μέσου μεταφοράς στη στάση</string> <string name="transport_context_menu">Αναζήτηση μέσου μεταφοράς στη στάση</string>
<string name="osb_bug_name">Σφάλμα</string>
<string name="poi_context_menu_modify">Τροποποίηση ΣΕ</string> <string name="poi_context_menu_modify">Τροποποίηση ΣΕ</string>
<string name="poi_context_menu_delete">Διαγραφή ΣΕ</string> <string name="poi_context_menu_delete">Διαγραφή ΣΕ</string>
<string name="rotate_map_compass_opt">Πυξίδα</string> <string name="rotate_map_compass_opt">Πυξίδα</string>
@ -848,7 +848,7 @@
<string name="search_tabs_location">Τοποθεσία</string> <string name="search_tabs_location">Τοποθεσία</string>
<string name="context_menu_item_update_map">Ενημέρωση χάρτη</string> <string name="context_menu_item_update_map">Ενημέρωση χάρτη</string>
<string name="context_menu_item_open_bug">Άνοιγμα σφάλματος OSM</string>
<string name="context_menu_item_create_poi">Δημιουργία ΣΕ</string> <string name="context_menu_item_create_poi">Δημιουργία ΣΕ</string>
<string name="shared_string_yes">Ναι</string> <string name="shared_string_yes">Ναι</string>
<string name="shared_string_cancel">Ακύρωση</string> <string name="shared_string_cancel">Ακύρωση</string>
@ -861,21 +861,21 @@
<string name="favourites_context_menu_delete">Διαγραφή αγαπημένου</string> <string name="favourites_context_menu_delete">Διαγραφή αγαπημένου</string>
<string name="favourites_remove_dialog_msg">Αφαίρεση αγαπημένου σημείου \'%s\'?</string> <string name="favourites_remove_dialog_msg">Αφαίρεση αγαπημένου σημείου \'%s\'?</string>
<string name="favourites_remove_dialog_success">Το αγαπημένο σημείο {0} διαγράφηκε με επιτυχία.</string> <string name="favourites_remove_dialog_success">Το αγαπημένο σημείο {0} διαγράφηκε με επιτυχία.</string>
<string name="osb_add_dialog_title">Εισαγωγή κειμένου σφάλματος</string>
<string name="osb_add_dialog_success">Το σφάλμα δημιουργήθηκε επιτυχώς</string>
<string name="osb_add_dialog_error">Προέκυψε εξαίρεση: το σφάλμα δεν δημιουργήθηκε</string>
<string name="osb_comment_menu_item">Προσθήκη σχολίου</string>
<string name="osb_comment_dialog_message">Μήνυμα</string> <string name="osb_comment_dialog_message">Μήνυμα</string>
<string name="osb_comment_dialog_author">Όνομα συγγραφέα</string> <string name="osb_comment_dialog_author">Όνομα συγγραφέα</string>
<string name="osb_comment_dialog_title">Προσθήκη σχολίου στο σφάλμα</string>
<string name="osb_comment_dialog_add_button">Προσθήκη σχολίου</string>
<string name="osb_comment_dialog_success">Το σχόλιο προστέθηκε με επιτυχία</string> <string name="osb_comment_dialog_success">Το σχόλιο προστέθηκε με επιτυχία</string>
<string name="osb_comment_dialog_error">Προέκυψε εξαίρεση: το σχόλιο δεν προστέθηκε</string> <string name="osb_comment_dialog_error">Προέκυψε εξαίρεση: το σχόλιο δεν προστέθηκε</string>
<string name="osb_close_menu_item">Κλείσιμο σφάλματος</string>
<string name="osb_close_dialog_title">Κλείσιμο σφάλματος</string>
<string name="osb_close_dialog_close_button">Κλείσιμο σφάλματος</string>
<string name="osb_close_dialog_success">Το σφάλμα έκλεισε με επιτυχία</string>
<string name="osb_close_dialog_error">Προέκυψε εξαίρεση: το σφάλμα δεν ήταν κλειστό</string>
<string name="poi_edit_title">Επεξεργασία ΣΕ</string> <string name="poi_edit_title">Επεξεργασία ΣΕ</string>
<string name="poi_create_title">Δημιουργία ΣΕ</string> <string name="poi_create_title">Δημιουργία ΣΕ</string>
<string name="poi_error_poi_not_found">Ο κόμβος δεν μπορεί να βρεθεί ή η υποδομή δεν είναι απλός κόμβος</string> <string name="poi_error_poi_not_found">Ο κόμβος δεν μπορεί να βρεθεί ή η υποδομή δεν είναι απλός κόμβος</string>
@ -1084,7 +1084,7 @@
<string name="destination_point">Προορισμός %1$s</string> <string name="destination_point">Προορισμός %1$s</string>
<string name="context_menu_item_destination_point">Ορισμός ως προορισμός</string> <string name="context_menu_item_destination_point">Ορισμός ως προορισμός</string>
<string name="please_select_address">Επιλέξτε πόλη ή οδό πρώτα</string> <string name="please_select_address">Επιλέξτε πόλη ή οδό πρώτα</string>
<string name="intermediate_items_sort_by_distance">Ταξινόμηση (πόρτα-πόρτα)</string> <string name="intermediate_items_sort_by_distance">Ταξινόμηση πόρτα-πόρτα</string>
<string name="local_osm_changes_backup_failed">Η δημιουργία αντιγράφου ασφαλείας αλλαγών OSM απέτυχε</string> <string name="local_osm_changes_backup_failed">Η δημιουργία αντιγράφου ασφαλείας αλλαγών OSM απέτυχε</string>
<string name="local_osm_changes_backup">Δημιουργία αντιγράφου ασφαλείας αλλαγών OSM</string> <string name="local_osm_changes_backup">Δημιουργία αντιγράφου ασφαλείας αλλαγών OSM</string>
<string name="layer_hillshade">Στρώση σκίασης αναγλύφου</string> <string name="layer_hillshade">Στρώση σκίασης αναγλύφου</string>

66
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -2399,7 +2399,7 @@
<string name="poi_bathing_yes">Permitido bañarse</string> <string name="poi_bathing_yes">Permitido bañarse</string>
<string name="poi_bathing_no">Prohibido bañarse</string> <string name="poi_bathing_no">Prohibido bañarse</string>
<string name="poi_traffic_calming_island">Mediana</string> <string name="poi_traffic_calming_island">Mediana (tráfico)</string>
<string name="poi_boat_storage">Almacén de botes (marina)</string> <string name="poi_boat_storage">Almacén de botes (marina)</string>
@ -2420,4 +2420,68 @@
<string name="poi_hackerspace">Encuentro de hackers</string> <string name="poi_hackerspace">Encuentro de hackers</string>
<string name="poi_wiki_lang_af">Wiki Afrikáans</string>
<string name="poi_wiki_lang_als">Wiki alsaciana</string>
<string name="poi_wiki_lang_az">Wiki azerí</string>
<string name="poi_wiki_lang_bn">Wiki bengalí</string>
<string name="poi_wiki_lang_bpy">Wiki bishnupriya</string>
<string name="poi_wiki_lang_br">Wiki bretona</string>
<string name="poi_wiki_lang_bs">Wiki bosnia</string>
<string name="poi_wiki_lang_cy">Wiki galés</string>
<string name="poi_wiki_lang_eo">Wiki esperanto</string>
<string name="poi_wiki_lang_eu">Wiki vasca</string>
<string name="poi_wiki_lang_fa">Wiki persa</string>
<string name="poi_wiki_lang_fy">Wiki frisona</string>
<string name="poi_wiki_lang_ga">Wiki irlandesa</string>
<string name="poi_wiki_lang_hy">Wiki armenia</string>
<string name="poi_wiki_lang_is">Wiki islandesa</string>
<string name="poi_wiki_lang_ka">Wiki georgiana</string>
<string name="poi_wiki_lang_ku">Wiki kurda</string>
<string name="poi_wiki_lang_la">Wiki latina</string>
<string name="poi_wiki_lang_lb">Wiki luxemburguesa</string>
<string name="poi_wiki_lang_mk">Wiki macedonia</string>
<string name="poi_wiki_lang_ml">Wiki malabari</string>
<string name="poi_wiki_lang_mr">Wiki maratí</string>
<string name="poi_wiki_lang_nds">Wiki baja sajona</string>
<string name="poi_wiki_lang_nv">Wiki navaja</string>
<string name="poi_wiki_lang_os">Wiki osetiana</string>
<string name="poi_wiki_lang_pms">Wiki piamontesa</string>
<string name="poi_wiki_lang_sc">Wiki sarda</string>
<string name="poi_wiki_lang_sh">Wiki serbio-croata</string>
<string name="poi_wiki_lang_sq">Wiki albana</string>
<string name="poi_wiki_lang_ta">Wiki tamilesa</string>
<string name="poi_wiki_lang_tl">Wiki filipina</string>
<string name="poi_wiki_lang_war">Wiki samareña</string>
<string name="poi_wiki_lang_min">Wiki minangkabau</string>
<string name="poi_wiki_lang_kk">Wiki kazaja</string>
<string name="poi_wiki_lang_uz">Wiki uzbeka</string>
<string name="poi_wiki_lang_ce">Wiki chechena</string>
<string name="poi_wiki_lang_ur">Wiki urdu</string>
<string name="poi_wiki_lang_oc">Wiki occitana</string>
<string name="poi_wiki_lang_zhminnan">Wiki Min del sur</string>
<string name="poi_wiki_lang_mg">Wiki malagache</string>
<string name="poi_wiki_lang_tt">Wiki tártara</string>
<string name="poi_wiki_lang_jv">Wiki javanesa</string>
<string name="poi_wiki_lang_ky">Wiki kirguistán</string>
<string name="poi_wiki_lang_zhyue">Wiki cantonesa</string>
<string name="poi_wiki_lang_ast">Wiki Astur-Leonesa</string>
<string name="poi_wiki_lang_tg">Wiki tajik</string>
<string name="poi_wiki_lang_ba">Wiki baskir</string>
<string name="poi_wiki_lang_sco">Wiki escocesa</string>
<string name="poi_wiki_lang_pnb">Wiki punyabí</string>
<string name="poi_wiki_lang_cv">Wiki Chuvasia</string>
<string name="poi_wiki_lang_lmo">Wiki lombard</string>
<string name="poi_wiki_lang_my">Wiki birmana</string>
<string name="poi_wiki_lang_yo">Wiki yoruba</string>
<string name="poi_wiki_lang_an">Wiki aragonesa</string>
<string name="poi_wiki_lang_ne">Wiki nepalí</string>
<string name="poi_wiki_lang_gu">Wiki guyaratí</string>
<string name="poi_wiki_lang_scn">Wiki siciliana</string>
<string name="poi_wiki_lang_bar">Wiki bávara</string>
<string name="poi_wiki_lang_mn">Wiki mongol</string>
<string name="poi_wiki_lang_nap">Wiki napolitana</string>
<string name="poi_craft_electronics">Reparación de electrodomésticos</string>
</resources> </resources>

60
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -661,7 +661,7 @@
<string name="please_select_address">Elige primero la ciudad o calle</string> <string name="please_select_address">Elige primero la ciudad o calle</string>
<string name="search_street_in_neighborhood_cities">Buscar la calle en ciudades vecinas</string> <string name="search_street_in_neighborhood_cities">Buscar la calle en ciudades vecinas</string>
<string name="intermediate_items_sort_return">Puntos de ruta intermedios reordenados para optimizar su recorrido en el camino desde la ubicación actual hasta el destino.</string> <string name="intermediate_items_sort_return">Puntos de ruta intermedios reordenados para optimizar su recorrido en el camino desde la ubicación actual hasta el destino.</string>
<string name="intermediate_items_sort_by_distance">Ordenar (puerta a puerta)</string> <string name="intermediate_items_sort_by_distance">Ordenar puerta a puerta</string>
<string name="local_osm_changes_backup_successful">Archivo de cambios OSM generado con éxito %1$s</string> <string name="local_osm_changes_backup_successful">Archivo de cambios OSM generado con éxito %1$s</string>
<string name="local_osm_changes_backup_failed">Falló la copia local de cambios OSM</string> <string name="local_osm_changes_backup_failed">Falló la copia local de cambios OSM</string>
<string name="local_osm_changes_backup">Copiar como cambio OSM</string> <string name="local_osm_changes_backup">Copiar como cambio OSM</string>
@ -774,7 +774,7 @@
<string name="rendering_attr_hikingRoutesOSMC_name">Superponer símbolo de senderismo</string> <string name="rendering_attr_hikingRoutesOSMC_name">Superponer símbolo de senderismo</string>
<string name="rendering_attr_hikingRoutesOSMC_description">Dibujar senderos según trazas OSMC</string> <string name="rendering_attr_hikingRoutesOSMC_description">Dibujar senderos según trazas OSMC</string>
<string name="rendering_attr_noAdminboundaries_name">Ocultar fronteras</string> <string name="rendering_attr_noAdminboundaries_name">Ocultar fronteras</string>
<string name="rendering_attr_noAdminboundaries_description">Evitar mostrar fronteras regionales (niveles administrativos 5-9)</string> <string name="rendering_attr_noAdminboundaries_description">Ocultar fronteras regionales (niveles administrativos 5-9)</string>
<string name="map_widget_max_speed">Límite de velocidad</string> <string name="map_widget_max_speed">Límite de velocidad</string>
<string name="monitoring_control_start">GPX</string> <string name="monitoring_control_start">GPX</string>
<string name="no_buildings_found">No se encontró edificios.</string> <string name="no_buildings_found">No se encontró edificios.</string>
@ -1446,7 +1446,7 @@
<string name="error_reading_gpx">Error leyendo datos GPX</string> <string name="error_reading_gpx">Error leyendo datos GPX</string>
<string name="vector_data">Mapas vectoriales descargados</string> <string name="vector_data">Mapas vectoriales descargados</string>
<string name="transport_context_menu">Buscar transporte en parada</string> <string name="transport_context_menu">Buscar transporte en parada</string>
<string name="osb_bug_name">Fallo</string>
<string name="poi_context_menu_modify">Modificar PDI</string> <string name="poi_context_menu_modify">Modificar PDI</string>
<string name="poi_context_menu_delete">Borrar PDI</string> <string name="poi_context_menu_delete">Borrar PDI</string>
<string name="rotate_map_compass_opt">A la brújula</string> <string name="rotate_map_compass_opt">A la brújula</string>
@ -1664,7 +1664,7 @@
<string name="search_address_street_option">Intersección de calle</string> <string name="search_address_street_option">Intersección de calle</string>
<string name="search_tabs_location">Ubicación</string> <string name="search_tabs_location">Ubicación</string>
<string name="context_menu_item_update_map">Actualizar mapa</string> <string name="context_menu_item_update_map">Actualizar mapa</string>
<string name="context_menu_item_open_bug">Crear nota de OSM</string>
<string name="context_menu_item_create_poi">Crear PDI</string> <string name="context_menu_item_create_poi">Crear PDI</string>
<string name="add_favorite_dialog_top_text">Ingrese nombre de favorito</string> <string name="add_favorite_dialog_top_text">Ingrese nombre de favorito</string>
<string name="add_favorite_dialog_default_favourite_name">Favorito</string> <string name="add_favorite_dialog_default_favourite_name">Favorito</string>
@ -1673,22 +1673,22 @@
<string name="favourites_context_menu_delete">Borrar favorito</string> <string name="favourites_context_menu_delete">Borrar favorito</string>
<string name="favourites_remove_dialog_msg">¿Quitar el favorito \'%s\'?</string> <string name="favourites_remove_dialog_msg">¿Quitar el favorito \'%s\'?</string>
<string name="favourites_remove_dialog_success">El punto favorito {0} se borró correctamente.</string> <string name="favourites_remove_dialog_success">El punto favorito {0} se borró correctamente.</string>
<string name="osb_add_dialog_title">Ingrese texto del fallo</string>
<string name="osb_add_dialog_success">Fallo creado correctamente</string>
<string name="osb_add_dialog_error">Error: No se creó el fallo</string>
<string name="osb_author_dialog_password">Contraseña de OSM (opcional)</string> <string name="osb_author_dialog_password">Contraseña de OSM (opcional)</string>
<string name="osb_comment_menu_item">Añadir comentario</string>
<string name="osb_comment_dialog_message">Mensaje</string> <string name="osb_comment_dialog_message">Mensaje</string>
<string name="osb_comment_dialog_author">Nombre del autor</string> <string name="osb_comment_dialog_author">Nombre del autor</string>
<string name="osb_comment_dialog_title">Añadiendo comentario al fallo</string>
<string name="osb_comment_dialog_add_button">Añadir comentario</string>
<string name="osb_comment_dialog_success">Comentario añadido correctamente</string> <string name="osb_comment_dialog_success">Comentario añadido correctamente</string>
<string name="osb_comment_dialog_error">Error: No se añadió el comentario</string> <string name="osb_comment_dialog_error">Error: No se añadió el comentario</string>
<string name="osb_close_menu_item">Cerrar fallo</string>
<string name="osb_close_dialog_title">Cerrando fallo</string>
<string name="osb_close_dialog_close_button">Cerrar fallo</string>
<string name="osb_close_dialog_success">Fallo cerrado correctamente</string>
<string name="osb_close_dialog_error">Error: No se cerró el fallo</string>
<string name="poi_edit_title">Editar PDI</string> <string name="poi_edit_title">Editar PDI</string>
<string name="poi_create_title">Crear PDI</string> <string name="poi_create_title">Crear PDI</string>
<string name="poi_error_poi_not_found">No se encontró el nodo o la instalación se compone de varios nodos</string> <string name="poi_error_poi_not_found">No se encontró el nodo o la instalación se compone de varios nodos</string>
@ -1938,7 +1938,7 @@
<string name="feedback">Encuesta</string> <string name="feedback">Encuesta</string>
<string name="contact_us">Contáctenos</string> <string name="contact_us">Contáctenos</string>
<string name="osm_edit_created_poi">PDI de OSM creado</string> <string name="osm_edit_created_poi">PDI de OSM creado</string>
<string name="osm_edit_created_bug">Nota OSM creada</string>
<string name="map_legend">Leyenda del mapa</string> <string name="map_legend">Leyenda del mapa</string>
<string name="shared_string_update">Actualizar</string> <string name="shared_string_update">Actualizar</string>
<string name="shared_string_upload">Subir</string> <string name="shared_string_upload">Subir</string>
@ -1952,4 +1952,32 @@
<string name="lang_fy">Frisón</string> <string name="lang_fy">Frisón</string>
<string name="lang_als">Albano (Tosk)</string> <string name="lang_als">Albano (Tosk)</string>
<string name="save_poi_without_poi_type_message">¿Quiere guardar el punto de interés sin especificar el tipo?</string> <string name="save_poi_without_poi_type_message">¿Quiere guardar el punto de interés sin especificar el tipo?</string>
<string name="shared_string_location">Ubicación</string>
<string name="poi_context_menu_modify_osm_change">Modificar cambio OSM</string>
<string name="osm_edit_modified_poi">PDI de OSM modificado</string>
<string name="osm_edit_deleted_poi">PDI de OSM borrado</string>
<string name="context_menu_item_open_note">Abrir nota OSM</string>
<string name="osm_edit_reopened_note">Nota OSM reabierta</string>
<string name="osm_edit_commented_note">Nota OSM comentada</string>
<string name="osm_edit_removed_note">Nota OSM borrada</string>
<string name="osm_edit_created_note">Nota OSM creada</string>
<string name="osn_bug_name">Nota OSM</string>
<string name="osn_add_dialog_title">Crear nota</string>
<string name="osn_comment_dialog_title">Añadir comentario</string>
<string name="osn_reopen_dialog_title">Reabrir nota</string>
<string name="osn_close_dialog_title">Cerrar nota</string>
<string name="osn_add_dialog_success">Nota creada exitosamente</string>
<string name="osn_add_dialog_error">Error: la nota no se creó</string>
<string name="osn_close_dialog_success">El error se cerró exitosamente</string>
<string name="osn_close_dialog_error">Error: no se cerró la nota</string>
<string name="shared_string_commit">Confirmar</string>
<string name="context_menu_item_delete_waypoint">¿Borrar punto de ruta GPX?</string>
<string name="context_menu_item_edit_waypoint">Editar punto de ruta GPX</string>
<string name="rendering_attr_currentTrackColor_description">Color del GPX</string>
<string name="rendering_attr_currentTrackWidth_description">Ancho del GPX</string>
<string name="rendering_attr_roadStyle_description">Estilo de carretera</string>
<string name="poi_dialog_reopen">Reabrir</string>
<string name="osm_save_offline">Guardar sin conexión</string>
<string name="release_2_2">" • Nueva interfaz de usuario sensible al contexto para aprovechar lugares en el mapa y en otra pantallas\n\n• La pantalla del mapa, ahora se inicia directamente, a menos que \'Mostrar panel de control en el arranque de la aplicación\' este seleccionado\n\n• El tablero de instrumentos, posee el opción de que tarjetas se visualizarán\n\n• Los mapas, pueden seleccionarse directamente y descargar el mapa mundial\n\n• Mejor recálculo de la ruta (después de reiterados intentos, el motor ahora sugiere una ruta diferente)\n\n• La búsqueda de PDI, ahora soporta consultas más específicas\n\n• Mejoras en PDI y funcionalidad de edición OSM\n\n• Se rediseñó la estructura e interfaz de los datos de mapas\n\n y más... "</string>
</resources> </resources>

35
OsmAnd/res/values-es/phrases.xml
View file

@ -2403,7 +2403,7 @@
<string name="poi_bathing_yes">Permitido bañarse</string> <string name="poi_bathing_yes">Permitido bañarse</string>
<string name="poi_bathing_no">Prohibido bañarse</string> <string name="poi_bathing_no">Prohibido bañarse</string>
<string name="poi_traffic_calming_island">Isleta vial</string> <string name="poi_traffic_calming_island">Mediana (tráfico)</string>
<string name="poi_boat_storage">Almacén de botes</string> <string name="poi_boat_storage">Almacén de botes</string>
@ -2455,4 +2455,37 @@
<string name="poi_wiki_lang_pms">Wiki piamontesa</string> <string name="poi_wiki_lang_pms">Wiki piamontesa</string>
<string name="poi_wiki_lang_nds">Wiki baja sajona</string> <string name="poi_wiki_lang_nds">Wiki baja sajona</string>
<string name="poi_wiki_lang_mr">Wiki maratí</string> <string name="poi_wiki_lang_mr">Wiki maratí</string>
<string name="poi_wiki_lang_ml">Wiki malabari</string>
<string name="poi_wiki_lang_ast">Wiki Astur-Leonesa</string>
<string name="poi_wiki_lang_an">Wiki aragonesa</string>
<string name="poi_wiki_lang_ne">Wiki nepalí</string>
<string name="poi_wiki_lang_war">Wiki samareña</string>
<string name="poi_wiki_lang_min">Wiki minangkabau</string>
<string name="poi_wiki_lang_kk">Wiki kazaja</string>
<string name="poi_wiki_lang_uz">Wiki uzbeka</string>
<string name="poi_wiki_lang_ce">Wiki chechena</string>
<string name="poi_wiki_lang_ur">Wiki urdu</string>
<string name="poi_wiki_lang_oc">Wiki occitana</string>
<string name="poi_wiki_lang_mg">Wiki malagache</string>
<string name="poi_wiki_lang_tt">Wiki tártara</string>
<string name="poi_wiki_lang_jv">Wiki javanesa</string>
<string name="poi_wiki_lang_ky">Wiki kirguistán</string>
<string name="poi_wiki_lang_zhyue">Wiki cantonesa</string>
<string name="poi_wiki_lang_tg">Wiki tajik</string>
<string name="poi_wiki_lang_scn">Wiki siciliana</string>
<string name="poi_wiki_lang_bar">Wiki bávara</string>
<string name="poi_wiki_lang_mn">Wiki mongol</string>
<string name="poi_wiki_lang_nap">Wiki napolitana</string>
<string name="poi_craft_electronics">Reparación de electrodomésticos</string>
<string name="poi_wiki_lang_sco">Wiki escocesa</string>
<string name="poi_wiki_lang_pnb">Wiki punyabí</string>
<string name="poi_wiki_lang_cv">Wiki Chuvasia</string>
<string name="poi_wiki_lang_my">Wiki birmana</string>
<string name="poi_wiki_lang_yo">Wiki yoruba</string>
<string name="poi_wiki_lang_gu">Wiki guyaratí</string>
<string name="poi_wiki_lang_zhminnan">Wiki Min del sur</string>
<string name="poi_wiki_lang_ba">Wiki baskir</string>
<string name="poi_wiki_lang_lmo">Wiki lombard</string>
</resources> </resources>

133
OsmAnd/res/values-es/strings.xml
View file

@ -59,7 +59,7 @@
<string name="routing_settings">Navegación</string> <string name="routing_settings">Navegación</string>
<string name="routing_settings_descr">Opciones específicas para la navegación</string> <string name="routing_settings_descr">Opciones específicas para la navegación</string>
<string name="global_settings">Ajustes globales</string> <string name="global_settings">Ajustes globales</string>
<string name="index_settings">Gestionar archivos de mapas</string> <string name="index_settings">Gestionar mapas</string>
<string name="index_settings_descr">Descarga y gestiona mapas sin conexión, almacenados en su dispositivo</string> <string name="index_settings_descr">Descarga y gestiona mapas sin conexión, almacenados en su dispositivo</string>
<string name="general_settings">General</string> <string name="general_settings">General</string>
<string name="general_settings_descr">Configura la presentación y otros ajustes comunes para la aplicación</string> <string name="general_settings_descr">Configura la presentación y otros ajustes comunes para la aplicación</string>
@ -76,11 +76,11 @@
<string name="use_transparent_map_theme">Tema transparente</string> <string name="use_transparent_map_theme">Tema transparente</string>
<string name="native_library_not_supported">La biblioteca nativa no está soportada en este dispositivo.</string> <string name="native_library_not_supported">La biblioteca nativa no está soportada en este dispositivo.</string>
<string name="init_native_library">Inicializando biblioteca nativa…</string> <string name="init_native_library">Inicializando biblioteca nativa…</string>
<string name="choose_auto_follow_route">Auto-centrar vista de mapa</string> <string name="choose_auto_follow_route">Auto-centrar vista del mapa</string>
<string name="choose_auto_follow_route_descr">Tiempo hasta que la vista del mapa vuelve a sincronizarse con la posición actual</string> <string name="choose_auto_follow_route_descr">Tiempo hasta que la vista del mapa vuelve a sincronizarse con la posición actual</string>
<string name="auto_follow_route_never">Nunca (pulse \'Ir\' para iniciar manualmente el guiado)</string> <string name="auto_follow_route_never">Nunca (pulse \'Ir\' para iniciar manualmente el guiado)</string>
<string name="auto_follow_route_navigation">Auto-centrar sólo nav</string> <string name="auto_follow_route_navigation">Auto-centrar sólo navegación</string>
<string name="auto_follow_route_navigation_descr">Auto-centra la vista del mapa sólo durante la navegación.</string> <string name="auto_follow_route_navigation_descr">Auto-centrar vista del mapa, sólo durante la navegación.</string>
<string name="auto_follow_location_enabled">Auto-centrar vista del mapa activado.</string> <string name="auto_follow_location_enabled">Auto-centrar vista del mapa activado.</string>
<string name="pref_vector_rendering">Opciones específicas de renderizado vectorial</string> <string name="pref_vector_rendering">Opciones específicas de renderizado vectorial</string>
<string name="pref_overlay">Superpuesta / subyacente</string> <string name="pref_overlay">Superpuesta / subyacente</string>
@ -162,7 +162,7 @@
<string name="search_offline_clear_search">Nueva búsqueda</string> <string name="search_offline_clear_search">Nueva búsqueda</string>
<string name="map_text_size_descr">Selecciona el tamaño del texto para los nombres en el mapa</string> <string name="map_text_size_descr">Selecciona el tamaño del texto para los nombres en el mapa</string>
<string name="map_text_size">Tamaño de texto</string> <string name="map_text_size">Tamaño de texto</string>
<string name="trace_rendering">Info depuración renderizado</string> <string name="trace_rendering">Información de renderizado</string>
<string name="trace_rendering_descr">Muestra el rendimiento de visualización</string> <string name="trace_rendering_descr">Muestra el rendimiento de visualización</string>
<string name="installing_new_resources">Desempaquetando nuevos datos…</string> <string name="installing_new_resources">Desempaquetando nuevos datos…</string>
<string name="internet_connection_required_for_online_route">Se seleccionó un servicio de navegación en línea, pero no hay conexión a Internet.</string> <string name="internet_connection_required_for_online_route">Se seleccionó un servicio de navegación en línea, pero no hay conexión a Internet.</string>
@ -219,7 +219,7 @@
<string name="mile">milla</string> <string name="mile">milla</string>
<string name="send_location_way_choose_title">Compartir ubicación utilizando</string> <string name="send_location_way_choose_title">Compartir ubicación utilizando</string>
<string name="send_location_sms_pattern">Ubicación: %1$s\n%2$s</string> <string name="send_location_sms_pattern">Ubicación: %1$s\n%2$s</string>
<string name="send_location_email_pattern">Para ver la ubicación sigue el enlace del navegador %1$s o el enlace interno de android %2$s</string> <string name="send_location_email_pattern">Para ver la ubicación sigue el enlace del navegador %1$s o el enlace interno de Android %2$s</string>
<string name="send_location">Enviar ubicación</string> <string name="send_location">Enviar ubicación</string>
<string name="context_menu_item_share_location">Compartir ubicación</string> <string name="context_menu_item_share_location">Compartir ubicación</string>
<string name="add_waypoint_dialog_added">El punto de ruta GPX «{0}» fue añadido correctamente</string> <string name="add_waypoint_dialog_added">El punto de ruta GPX «{0}» fue añadido correctamente</string>
@ -231,7 +231,7 @@
<string name="amenity_type_emergency">Emergencia</string> <string name="amenity_type_emergency">Emergencia</string>
<string name="amenity_type_entertainment">Entretenimiento</string> <string name="amenity_type_entertainment">Entretenimiento</string>
<string name="amenity_type_finance">Financiero</string> <string name="amenity_type_finance">Financiero</string>
<string name="amenity_type_geocache">Geocache</string> <string name="amenity_type_geocache">Geo-caché</string>
<string name="amenity_type_healthcare">Salud</string> <string name="amenity_type_healthcare">Salud</string>
<string name="amenity_type_historic">Histórico</string> <string name="amenity_type_historic">Histórico</string>
<string name="amenity_type_landuse">Uso de Suelo</string> <string name="amenity_type_landuse">Uso de Suelo</string>
@ -290,7 +290,7 @@
<string name="download_files_question">¿Descargar {0} archivo(s) ({1} MB)?</string> <string name="download_files_question">¿Descargar {0} archivo(s) ({1} MB)?</string>
<string name="items_were_selected">{0} elemento(s) seleccionado(s)</string> <string name="items_were_selected">{0} elemento(s) seleccionado(s)</string>
<string name="filter_existing_indexes">Descargados</string> <string name="filter_existing_indexes">Descargados</string>
<string name="shared_string_select_all">Seleccionar todo</string> <string name="shared_string_select_all">Marcar todo</string>
<string name="shared_string_refresh">Actualizar</string> <string name="shared_string_refresh">Actualizar</string>
<string name="fast_route_mode">Ruta más rápida</string> <string name="fast_route_mode">Ruta más rápida</string>
<string name="fast_route_mode_descr">"Habilitar para calcular la ruta más rápida o deshabilitar para la ruta más corta "</string> <string name="fast_route_mode_descr">"Habilitar para calcular la ruta más rápida o deshabilitar para la ruta más corta "</string>
@ -327,7 +327,6 @@
<string name="error_reading_gpx">Error leyendo datos GPX</string> <string name="error_reading_gpx">Error leyendo datos GPX</string>
<string name="vector_data">Mapas vectoriales sin conexión</string> <string name="vector_data">Mapas vectoriales sin conexión</string>
<string name="transport_context_menu">Buscar transporte en parada</string> <string name="transport_context_menu">Buscar transporte en parada</string>
<string name="osb_bug_name">Nota</string>
<string name="poi_context_menu_modify">Modificar PDI</string> <string name="poi_context_menu_modify">Modificar PDI</string>
<string name="poi_context_menu_delete">Borrar PDI</string> <string name="poi_context_menu_delete">Borrar PDI</string>
<string name="rotate_map_compass_opt">A la brújula</string> <string name="rotate_map_compass_opt">A la brújula</string>
@ -377,8 +376,8 @@
<string name="hide_poi_filter">Ocultar filtro</string> <string name="hide_poi_filter">Ocultar filtro</string>
<string name="show_poi_filter">Mostrar filtro</string> <string name="show_poi_filter">Mostrar filtro</string>
<string name="search_poi_filter">Filtro</string> <string name="search_poi_filter">Filtro</string>
<string name="menu_mute_off">Sonido on</string> <string name="menu_mute_off">Sonido activado</string>
<string name="menu_mute_on">Sonido off</string> <string name="menu_mute_on">Sonido desactivado</string>
<string name="voice_provider_descr">Selecciona el aviso de voz para la navegación</string> <string name="voice_provider_descr">Selecciona el aviso de voz para la navegación</string>
<string name="voice_provider">Avisos de voz</string> <string name="voice_provider">Avisos de voz</string>
<string name="voice_data_initializing">Inicializando datos de voz…</string> <string name="voice_data_initializing">Inicializando datos de voz…</string>
@ -461,7 +460,7 @@
<string name="downloading_list_indexes">Descargando lista de regiones disponibles…</string> <string name="downloading_list_indexes">Descargando lista de regiones disponibles…</string>
<string name="list_index_files_was_not_loaded">La lista de regiones no fue recuperada desde osmand.net.</string> <string name="list_index_files_was_not_loaded">La lista de regiones no fue recuperada desde osmand.net.</string>
<string name="select_index_file_to_download">No se encontró nada. Si no encuentra su región, puede hacer el archivo usted mismo (vea http://osmand.net).</string> <string name="select_index_file_to_download">No se encontró nada. Si no encuentra su región, puede hacer el archivo usted mismo (vea http://osmand.net).</string>
<string name="fav_points_edited">Se editó el punto favorito</string> <string name="fav_points_edited">Se editó el favorito</string>
<string name="fav_points_not_exist">No hay puntos favoritos</string> <string name="fav_points_not_exist">No hay puntos favoritos</string>
<string name="update_existing">Reemplazar</string> <string name="update_existing">Reemplazar</string>
<string name="only_show">Mostrar ruta</string> <string name="only_show">Mostrar ruta</string>
@ -551,7 +550,7 @@
<string name="app_mode_default">Explorar mapa</string> <string name="app_mode_default">Explorar mapa</string>
<string name="app_mode_car">Automóvil</string> <string name="app_mode_car">Automóvil</string>
<string name="app_mode_bicycle">Bicicleta</string> <string name="app_mode_bicycle">Bicicleta</string>
<string name="app_mode_pedestrian">Peatonal</string> <string name="app_mode_pedestrian">Peatón</string>
<string name="position_on_map_center">Centro</string> <string name="position_on_map_center">Centro</string>
<string name="position_on_map_bottom">Fondo</string> <string name="position_on_map_bottom">Fondo</string>
<string name="navigate_point_top_text">Introduzca la latitud y longitud en el formato seleccionado (D - grados, M - minutos, S - segundos)</string> <string name="navigate_point_top_text">Introduzca la latitud y longitud en el formato seleccionado (D - grados, M - minutos, S - segundos)</string>
@ -570,7 +569,6 @@
<string name="search_address_street_option">Intersección de calle</string> <string name="search_address_street_option">Intersección de calle</string>
<string name="search_tabs_location">Ubicación</string> <string name="search_tabs_location">Ubicación</string>
<string name="context_menu_item_update_map">Actualizar mapa</string> <string name="context_menu_item_update_map">Actualizar mapa</string>
<string name="context_menu_item_open_bug">Crear nota de OSM</string>
<string name="context_menu_item_create_poi">Crear PDI</string> <string name="context_menu_item_create_poi">Crear PDI</string>
<string name="shared_string_yes">Sí</string> <string name="shared_string_yes">Sí</string>
<string name="shared_string_cancel">Cancelar</string> <string name="shared_string_cancel">Cancelar</string>
@ -579,26 +577,15 @@
<string name="shared_string_no">No</string> <string name="shared_string_no">No</string>
<string name="add_favorite_dialog_top_text">Introduzca nombre de favorito</string> <string name="add_favorite_dialog_top_text">Introduzca nombre de favorito</string>
<string name="add_favorite_dialog_default_favourite_name">Favorito</string> <string name="add_favorite_dialog_default_favourite_name">Favorito</string>
<string name="add_favorite_dialog_favourite_added_template">El punto favorito \'\'{0}\'\' se añadió correctamente.</string> <string name="add_favorite_dialog_favourite_added_template">El favorito \'\'{0}\'\' se añadió correctamente.</string>
<string name="favourites_context_menu_edit">Editar favorito</string> <string name="favourites_context_menu_edit">Editar favorito</string>
<string name="favourites_context_menu_delete">Borrar favorito</string> <string name="favourites_context_menu_delete">Borrar favorito</string>
<string name="favourites_remove_dialog_msg">¿Borrar el punto favorito \'%s\'?</string> <string name="favourites_remove_dialog_msg">¿Quitar el favorito \'%s\'?</string>
<string name="favourites_remove_dialog_success">El punto favorito {0} se borró correctamente.</string> <string name="favourites_remove_dialog_success">El favorito {0} se borró correctamente.</string>
<string name="osb_add_dialog_title">Introduzca texto de la nota</string>
<string name="osb_add_dialog_success">La nota fue creada correctamente</string>
<string name="osb_add_dialog_error">Se produjo un error: la nota no fue creada</string>
<string name="osb_comment_menu_item">Añadir comentario</string>
<string name="osb_comment_dialog_message">Mensaje</string> <string name="osb_comment_dialog_message">Mensaje</string>
<string name="osb_comment_dialog_author">Nombre del autor</string> <string name="osb_comment_dialog_author">Nombre del autor</string>
<string name="osb_comment_dialog_title">Añadiendo comentario a la nota</string>
<string name="osb_comment_dialog_add_button">Añadir comentario</string>
<string name="osb_comment_dialog_success">El comentario fue añadido correctamente</string> <string name="osb_comment_dialog_success">El comentario fue añadido correctamente</string>
<string name="osb_comment_dialog_error">Error: No se añadió el comentario</string> <string name="osb_comment_dialog_error">Error: No se añadió el comentario</string>
<string name="osb_close_menu_item">Cerrar nota</string>
<string name="osb_close_dialog_title">Cerrando nota</string>
<string name="osb_close_dialog_close_button">Cerrar nota</string>
<string name="osb_close_dialog_success">La nota fue cerrada correctamente</string>
<string name="osb_close_dialog_error">Se produjo un error: la nota no fue cerrada</string>
<string name="poi_edit_title">Editar PDI</string> <string name="poi_edit_title">Editar PDI</string>
<string name="poi_create_title">Crear PDI</string> <string name="poi_create_title">Crear PDI</string>
<string name="poi_error_poi_not_found">No se encontró el nodo o la instalación se compone de varios nodos</string> <string name="poi_error_poi_not_found">No se encontró el nodo o la instalación se compone de varios nodos</string>
@ -627,7 +614,7 @@
<string name="offline_navigation_not_available">La navegación desconectada de OsmAnd, no está disponible temporalmente.</string> <string name="offline_navigation_not_available">La navegación desconectada de OsmAnd, no está disponible temporalmente.</string>
<string name="left_side_navigation">Conducción por la izquierda</string> <string name="left_side_navigation">Conducción por la izquierda</string>
<string name="left_side_navigation_descr">Seleccione en países con tráfico por la izquierda</string> <string name="left_side_navigation_descr">Seleccione en países con tráfico por la izquierda</string>
<string name="unknown_from_location">El punto de partida todavía no ha sido determinado</string> <string name="unknown_from_location">Todavía no se determinó el punto de partida</string>
<string name="confirm_interrupt_download">¿Quiere interrumpir la descarga de archivos?</string> <string name="confirm_interrupt_download">¿Quiere interrumpir la descarga de archivos?</string>
<string name="basemap_was_selected_to_download">El Mapa Base (World Basemap) se necesita para el correcto funcionamiento de la aplicación y se seleccionó para su descarga.</string> <string name="basemap_was_selected_to_download">El Mapa Base (World Basemap) se necesita para el correcto funcionamiento de la aplicación y se seleccionó para su descarga.</string>
<string name="map_online_plugin_is_not_installed">Habilita el complemento mapas en línea para seleccionar diferentes fuentes de mapas</string> <string name="map_online_plugin_is_not_installed">Habilita el complemento mapas en línea para seleccionar diferentes fuentes de mapas</string>
@ -639,7 +626,8 @@
\n\nCualquiera de estos mapas se puede utilizar como el mapa (base) principal, que se mostrará en la pantalla del mapa de OsmAnd, o como una superposición o subyacente de otro mapa base (como los mapas estándares en línea de OsmAnd). Para hacer cualquier mapa subyacente más visible, ciertos elementos de los mapas vectoriales de OsmAnd, se pueden ocultar fácilmente a través del menú \'Configurar mapa\' cuando desee. \n\nCualquiera de estos mapas se puede utilizar como el mapa (base) principal, que se mostrará en la pantalla del mapa de OsmAnd, o como una superposición o subyacente de otro mapa base (como los mapas estándares en línea de OsmAnd). Para hacer cualquier mapa subyacente más visible, ciertos elementos de los mapas vectoriales de OsmAnd, se pueden ocultar fácilmente a través del menú \'Configurar mapa\' cuando desee.
\n\nLas teselas de mapas, se pueden obtener directamente a través de fuentes en línea o pueden prepararse para su uso sin conexión (y copiarse manualmente en la carpeta de datos de OsmAnd) como una base de datos SQLite, que puede ser producida por una variedad de herramientas de preparación de mapas de terceros. "</string> \n\nLas teselas de mapas, se pueden obtener directamente a través de fuentes en línea o pueden prepararse para su uso sin conexión (y copiarse manualmente en la carpeta de datos de OsmAnd) como una base de datos SQLite, que puede ser producida por una variedad de herramientas de preparación de mapas de terceros. "</string>
<string name="osmand_background_plugin_description">Muestra los ajustes para habilitar el seguimiento y la navegación en segundo plano (pantalla apagada) activando periódicamente el dispositivo GPS.</string> <string name="osmand_background_plugin_description">Muestra los ajustes para habilitar el seguimiento y la navegación en segundo plano (pantalla apagada) activando periódicamente el dispositivo GPS.</string>
<string name="osmand_accessibility_description">Este complemento habilita las características de accesibilidad del dispositivo directamente en OsmAnd. Facilita, por ejemplo, el ajuste de la velocidad de la voz para voces TTS, la configuración de navegación de pantalla con el panel direccional, utilizando la bola de desplazamiento para el control de acercamiento, o el uso de comentarios de conversión de texto a voz, o para el anuncio automático de su posición.</string> <string name="osmand_accessibility_description">Este complemento habilita las características de accesibilidad del dispositivo directamente en OsmAnd.
\n\nFacilita, por ejemplo, el ajuste de la velocidad de la voz para voces TTS, la configuración de navegación de pantalla con el panel direccional, utilizando la bola de desplazamiento para el control del acercamiento, el uso de comentarios para la conversión de texto a voz, o para el anuncio automático de su posición.</string>
<string name="osmand_development_plugin_description">Este complemento muestra los ajustes de características de desarrollo y depuración para probar la simulación de rutas, el rendimiento del renderizado en pantalla, o los avisos de voz. <string name="osmand_development_plugin_description">Este complemento muestra los ajustes de características de desarrollo y depuración para probar la simulación de rutas, el rendimiento del renderizado en pantalla, o los avisos de voz.
\n\nEstos ajustes están destinados para los desarrolladores y no son necesarios para el usuario general.</string> \n\nEstos ajustes están destinados para los desarrolladores y no son necesarios para el usuario general.</string>
<string name="plugins_screen">Complementos</string> <string name="plugins_screen">Complementos</string>
@ -660,7 +648,7 @@
<string name="default_buttons_support">Soporte</string> <string name="default_buttons_support">Soporte</string>
<string name="support_new_features">Soporte de nuevas características</string> <string name="support_new_features">Soporte de nuevas características</string>
<string name="show_ruler_level">Mostrar escala</string> <string name="show_ruler_level">Mostrar escala</string>
<string name="info_button">Info</string> <string name="info_button">Información</string>
<string name="back_to_location">Volver a la posición</string> <string name="back_to_location">Volver a la posición</string>
<string name="shared_string_help">Ayuda</string> <string name="shared_string_help">Ayuda</string>
<string name="accessibility_extensions_descr">Extensión de accesibilidad para versiones viejas de Android</string> <string name="accessibility_extensions_descr">Extensión de accesibilidad para versiones viejas de Android</string>
@ -718,7 +706,7 @@
<string name="use_short_object_names">Utilizar nombre de objetos</string> <string name="use_short_object_names">Utilizar nombre de objetos</string>
<string name="accessibility_preferences_descr">Preferencias relativas a la accesibilidad</string> <string name="accessibility_preferences_descr">Preferencias relativas a la accesibilidad</string>
<string name="shared_string_accessibility">Accesibilidad</string> <string name="shared_string_accessibility">Accesibilidad</string>
<string name="local_index_routing_data">Datos de enrutamiento</string> <string name="local_index_routing_data">Datos de la navegación</string>
<string name="navigate_point_format">Formato</string> <string name="navigate_point_format">Formato</string>
<string name="poi_search_desc">Buscar PDI (punto de interés)</string> <string name="poi_search_desc">Buscar PDI (punto de interés)</string>
<string name="address_search_desc">Buscar dirección</string> <string name="address_search_desc">Buscar dirección</string>
@ -744,7 +732,7 @@
<string name="osmand_parking_event">Recoger el automóvil del aparcamiento</string> <string name="osmand_parking_event">Recoger el automóvil del aparcamiento</string>
<string name="osmand_parking_warning">Advertencia</string> <string name="osmand_parking_warning">Advertencia</string>
<string name="osmand_parking_warning_text">La notificación para recoger su automóvil, fue previamente añadida a su calendario. Permanecerá allí hasta que la borre manualmente.</string> <string name="osmand_parking_warning_text">La notificación para recoger su automóvil, fue previamente añadida a su calendario. Permanecerá allí hasta que la borre manualmente.</string>
<string name="osmand_parking_time_limit_title">Establecer el límite de tiempo del aparacamiento</string> <string name="osmand_parking_time_limit_title">Establecer el límite de tiempo del aparcamiento</string>
<string name="osmand_parking_delete_confirm">¿Quiere eliminar la ubicación del automóvil aparcado?</string> <string name="osmand_parking_delete_confirm">¿Quiere eliminar la ubicación del automóvil aparcado?</string>
<string name="osmand_parking_delete">Eliminar un marcador de aparcamiento</string> <string name="osmand_parking_delete">Eliminar un marcador de aparcamiento</string>
<string name="osmand_parking_choose_type">Elija el tipo de aparcamiento</string> <string name="osmand_parking_choose_type">Elija el tipo de aparcamiento</string>
@ -758,8 +746,7 @@
<string name="osmand_parking_pm">PM</string> <string name="osmand_parking_pm">PM</string>
<string name="osmand_parking_am">AM</string> <string name="osmand_parking_am">AM</string>
<string name="osmand_parking_position_name">Punto de aparcamiento</string> <string name="osmand_parking_position_name">Punto de aparcamiento</string>
<string name="osmand_parking_plugin_description">Este complemento de posición de aparcamiento le deja memorizar fácilmente cuándo se aparcó el automóvil y cuánto tiempo queda si el estacionamiento está limitado por tiempo. Puede encontrar su lugar y el tiempo de estacionamiento en la tarjeta del tablero de instrumentos y en el control del mapa. <string name="osmand_parking_plugin_description">Este complemento, le deja memorizar fácilmente cuándo se aparcó el automóvil y cuánto tiempo queda (si el estacionamiento está limitado por tiempo).\n\nPuede encontrar su lugar y el tiempo de estacionamiento, en la tarjeta del tablero de instrumentos y en el control del mapa. Añada una notificación al calendario, en el caso de que desee tener un recordatorio al respecto.</string>
\n\nAñada una notificación al calendario en el caso de que desee tener un recordatorio al respecto.</string>
<string name="osmand_parking_plugin_name">Aparcamiento</string> <string name="osmand_parking_plugin_name">Aparcamiento</string>
<string name="context_menu_item_add_parking_point">Marcar como posición de aparcamiento</string> <string name="context_menu_item_add_parking_point">Marcar como posición de aparcamiento</string>
<string name="context_menu_item_delete_parking_point">Eliminar un marcador de aparcamiento</string> <string name="context_menu_item_delete_parking_point">Eliminar un marcador de aparcamiento</string>
@ -887,7 +874,7 @@
<string name="map_widget_max_speed">Límite de velocidad</string> <string name="map_widget_max_speed">Límite de velocidad</string>
<string name="monitoring_control_start">GPX</string> <string name="monitoring_control_start">GPX</string>
<string name="rendering_attr_noAdminboundaries_name">Ocultar fronteras</string> <string name="rendering_attr_noAdminboundaries_name">Ocultar fronteras</string>
<string name="rendering_attr_noAdminboundaries_description">Evita mostrar las fronteras regionales (niveles administrativos 5-9)</string> <string name="rendering_attr_noAdminboundaries_description">Ocultar fronteras regionales (niveles administrativos 5-9)</string>
<string name="index_srtm_parts">piezas</string> <string name="index_srtm_parts">piezas</string>
<string name="index_srtm_ele">Curvas de nivel</string> <string name="index_srtm_ele">Curvas de nivel</string>
<string name="srtm_plugin_description">"Este complemento proporciona tanto una capa superpuesta de curvas de nivel y una capa (de relieve) sombreada que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje. <string name="srtm_plugin_description">"Este complemento proporciona tanto una capa superpuesta de curvas de nivel y una capa (de relieve) sombreada que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje.
@ -943,7 +930,7 @@
<string name="stop_routing_confirm">¿Está seguro que quiere parar la navegación?</string> <string name="stop_routing_confirm">¿Está seguro que quiere parar la navegación?</string>
<string name="clear_dest_confirm">¿Seguro que quiere borrar su punto de destino (y puntos de ruta)?</string> <string name="clear_dest_confirm">¿Seguro que quiere borrar su punto de destino (y puntos de ruta)?</string>
<string name="precise_routing_mode_descr">Habilitar para calcular rutas precisas sin interferencias. Aún está limitado por la distancia y es lento.</string> <string name="precise_routing_mode_descr">Habilitar para calcular rutas precisas sin interferencias. Aún está limitado por la distancia y es lento.</string>
<string name="precise_routing_mode">Enrutado preciso (alfa)</string> <string name="precise_routing_mode">Navegación precisa (alfa)</string>
<string name="local_indexes_cat_av">Datos multimedia</string> <string name="local_indexes_cat_av">Datos multimedia</string>
<string name="support_new_features_descr">Dona para ver nuevas características implementadas en la aplicación</string> <string name="support_new_features_descr">Dona para ver nuevas características implementadas en la aplicación</string>
<string name="download_hillshade_maps">Sombreado</string> <string name="download_hillshade_maps">Sombreado</string>
@ -1015,7 +1002,7 @@
\n- África: ** \n- África: **
\n- Antártida: * \n- Antártida: *
\n\nLa lista de países incluidos (¡prácticamente todo el mundo!): \n\nLa lista de países incluidos (¡prácticamente todo el mundo!):
\n\nAfganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Antillas Holandesas, Arabia Saudita, Argelia, Argentina, Armenia, Aruba, Australia, Austria, Azerbaiyán, Bahamas, Bahrein, Bangladesh, Barbados, Bélgica, Belice, Benín, Bermuda, Bielorrusia, Bolivia, Bonaire, Bosnia y Herzegovina, Botswana, Brasil, Brunei, Bulgaria, Burkina Faso, Burundi, Bután, Cabo Verde, Camboya, Camerún, Canadá, Chad, Chile, China, Chipre, Colombia, Comoras, Congo, Corea del Norte, Corea del Sur, Costa de Marfil, Costa Rica, Croacia, Cuba, Curazao, Dinamarca, Djibouti, Dominica, Ecuador, Egipto, El Salvador, El Vaticano, Emiratos Árabes Unidos, Eritrea, Eslovaquia, Eslovenia, España, Estados Unidos de América, Estonia, Etiopía, Fiji, Filipinas, Finlandia, Francia, Gabón, Gambia, Georgia, Georgia del Sur, Ghana, Gibraltar, Granada, Grecia, Groenlandia, Guadalupe, Guam, Guatemala, Guayana Francesa, Guernsey, Guinea, Guinea-Bissau, Guinea Ecuatorial, Guyana, Haití, Honduras, Hong Kong, Hungría, India, Indonesia, Irán, Iraq, Irlanda, Isla de Man, Islandia, Islas Vírgenes Británicas, Israel, Italia, Jamaica, Japón, Jersey, Jordania, Kazajstán, Kenya, Kirguistán, Kiribati, Kuwait, Laos, Lesotho, Letonia, Líbano, Liberia, Libia, Liechtenstein, Lituania, Luxemburgo, Macao, Macedonia, Madagascar, Malasia, Malawi, Maldivas, Malí, Malta, Marruecos, Martinica, Mauricio, Mauritania, Mayotte, México, Micronesia, Moldavia, Mónaco, Mongolia, Montenegro, Montserrat, Mozambique, Myanmar, Namibia, Nauru, Nepal, Nicaragua, Níger, Nigeria, Noruega, Nueva Caledonia, Nueva Zelanda, Omán, Países Bajos, Pakistán, Palau, Panamá, Papúa Nueva Guinea, Paraguay, Perú, Polinesia Francesa, Polonia, Portugal, Puerto Rico, Qatar, Reino Unido, República Centroafricana, República Checa, República Dominicana, Ruanda, Rumanía, Rusia, Sahara Occidental, Saint-Barthelemy, Saint Helena, Saint Kitts y Nevis, Samoa, San Marino, San Martin, San Pedro y Miquelón, Santa Lucía, San Vicente y las Granadinas, Senegal, Serbia, Seychelles, Sierra Leona, Singapur, Siria, Somalia, Sri Lanka, Sudáfrica, Sudán, Sudán del Sur, Suecia, Suiza, Suriname, Swazilandia, Tailandia, Taiwán, Tanzania, Tayikistán, Territorio Palestino, Timor Oriental, Togo, Tokelau, Tonga, Trinidad y Tobago, Túnez, Turkmenistán, Turquía, Tuvalu, Ucrania, Uganda, Uruguay, Uzbekistán, Vanuatu, Venezuela, Vietnam, Wallis y Futuna, Yemen, Zambia, Zimbabwe. "</string> \n\nAfganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Antillas Holandesas, Arabia Saudita, Argelia, Argentina, Armenia, Aruba, Australia, Austria, Azerbaiyán, Bahamas, Bahrein, Bangladesh, Barbados, Bélgica, Belice, Benín, Bermuda, Bielorrusia, Bolivia, Bonaire, Bosnia y Herzegovina, Botsuana, Brasil, Brunei, Bulgaria, Burkina Faso, Burundi, Bután, Cabo Verde, Camboya, Camerún, Canadá, Chad, Chile, China, Chipre, Colombia, Comoras, Congo, Corea del Norte, Corea del Sur, Costa de Marfil, Costa Rica, Croacia, Cuba, Curazao, Dinamarca, Djibouti, Dominica, Ecuador, Egipto, El Salvador, El Vaticano, Emiratos Árabes Unidos, Eritrea, Eslovaquia, Eslovenia, España, Estados Unidos de América, Estonia, Etiopía, Fiji, Filipinas, Finlandia, Francia, Gabón, Gambia, Georgia, Georgia del Sur, Ghana, Gibraltar, Granada, Grecia, Groenlandia, Guadalupe, Guam, Guatemala, Guayana Francesa, Guernsey, Guinea, Guinea-Bissau, Guinea Ecuatorial, Guyana, Haití, Honduras, Hong Kong, Hungría, India, Indonesia, Irán, Iraq, Irlanda, Isla de Man, Islandia, Islas Vírgenes Británicas, Israel, Italia, Jamaica, Japón, Jersey, Jordania, Kazajstán, Kenya, Kirguistán, Kiribati, Kuwait, Laos, Lesotho, Letonia, Líbano, Liberia, Libia, Liechtenstein, Lituania, Luxemburgo, Macao, Macedonia, Madagascar, Malasia, Malawi, Maldivas, Malí, Malta, Marruecos, Martinica, Mauricio, Mauritania, Mayotte, México, Micronesia, Moldavia, Mónaco, Mongolia, Montenegro, Montserrat, Mozambique, Myanmar, Namibia, Nauru, Nepal, Nicaragua, Níger, Nigeria, Noruega, Nueva Caledonia, Nueva Zelanda, Omán, Países Bajos, Pakistán, Palau, Panamá, Papúa Nueva Guinea, Paraguay, Perú, Polinesia Francesa, Polonia, Portugal, Puerto Rico, Qatar, Reino Unido, República Centroafricana, República Checa, República Dominicana, Ruanda, Rumanía, Rusia, Sahara Occidental, Saint-Barthelemy, Saint Helena, Saint Kitts y Nevis, Samoa, San Marino, San Martin, San Pedro y Miquelón, Santa Lucía, San Vicente y las Granadinas, Senegal, Serbia, Seychelles, Sierra Leona, Singapur, Siria, Somalia, Sri Lanka, Sudáfrica, Sudán, Sudán del Sur, Suecia, Suiza, Suriname, Swazilandia, Tailandia, Taiwán, Tanzania, Tayikistán, Territorio Palestino, Timor Oriental, Togo, Tokelau, Tonga, Trinidad y Tobago, Túnez, Turkmenistán, Turquía, Tuvalu, Ucrania, Uganda, Uruguay, Uzbekistán, Vanuatu, Venezuela, Vietnam, Wallis y Futuna, Yemen, Zambia, Zimbabwe. "</string>
<string name="layer_hillshade">Capa de sombreado</string> <string name="layer_hillshade">Capa de sombreado</string>
<string name="map_widget_gps_info">Información GPS</string> <string name="map_widget_gps_info">Información GPS</string>
<string name="osmand_play_title_30_chars">Navegación y Mapas OsmAnd</string> <string name="osmand_play_title_30_chars">Navegación y Mapas OsmAnd</string>
@ -1052,7 +1039,7 @@
<string name="please_select_address">Seleccione primero la ciudad o calle</string> <string name="please_select_address">Seleccione primero la ciudad o calle</string>
<string name="search_street_in_neighborhood_cities">Buscar la calle en las ciudades vecinas</string> <string name="search_street_in_neighborhood_cities">Buscar la calle en las ciudades vecinas</string>
<string name="intermediate_items_sort_return">Puntos de ruta intermedios reordenados para optimizar su recorrido en la ruta desde la ubicación actual hasta el destino.</string> <string name="intermediate_items_sort_return">Puntos de ruta intermedios reordenados para optimizar su recorrido en la ruta desde la ubicación actual hasta el destino.</string>
<string name="intermediate_items_sort_by_distance">Ordenar (puerta a puerta)</string> <string name="intermediate_items_sort_by_distance">Ordenar puerta a puerta</string>
<string name="local_osm_changes_backup_successful">Archivo de cambios OSM generado con éxito %1$s</string> <string name="local_osm_changes_backup_successful">Archivo de cambios OSM generado con éxito %1$s</string>
<string name="local_osm_changes_backup_failed">Fallo al respaldar los cambios OSM</string> <string name="local_osm_changes_backup_failed">Fallo al respaldar los cambios OSM</string>
<string name="local_osm_changes_backup">Copiar como cambio OSM</string> <string name="local_osm_changes_backup">Copiar como cambio OSM</string>
@ -1082,8 +1069,8 @@
<string name="av_camera_focus_infinity">Enfocado al infinito</string> <string name="av_camera_focus_infinity">Enfocado al infinito</string>
<string name="av_camera_focus_macro">Modo de enfoque macro (close-up)</string> <string name="av_camera_focus_macro">Modo de enfoque macro (close-up)</string>
<string name="av_camera_focus_continuous">La camera intenta enfocar continuamente</string> <string name="av_camera_focus_continuous">La camera intenta enfocar continuamente</string>
<string name="av_photo_play_sound">Sonido al hacer fotos</string> <string name="av_photo_play_sound">Sonido al fotografiar</string>
<string name="av_photo_play_sound_descr">Elige si reproducir un sonido al hacer fotos</string> <string name="av_photo_play_sound_descr">Elige si reproducir un sonido al fotografiar</string>
<string name="context_menu_item_directions_from">Ir desde aquí</string> <string name="context_menu_item_directions_from">Ir desde aquí</string>
<string name="route_via">Vía:</string> <string name="route_via">Vía:</string>
<string name="route_from">Desde:</string> <string name="route_from">Desde:</string>
@ -1119,7 +1106,7 @@
<string name="driving_region">Región de conducción</string> <string name="driving_region">Región de conducción</string>
<string name="edit_tilesource_minzoom">Acercamiento mínimo</string> <string name="edit_tilesource_minzoom">Acercamiento mínimo</string>
<string name="edit_tilesource_expiration_time">Expirar (minutos)</string> <string name="edit_tilesource_expiration_time">Expirar (minutos)</string>
<string name="edit_tilesource_successfully">Fuente de teselas %1$s ha sido guardada correctamente</string> <string name="edit_tilesource_successfully">La fuente de teselas %1$s, se guardó correctamente</string>
<string name="local_index_tile_data_name">Datos de teselas: %1$s</string> <string name="local_index_tile_data_name">Datos de teselas: %1$s</string>
<string name="local_index_tile_data_expire">Expirar (minutos): %1$s</string> <string name="local_index_tile_data_expire">Expirar (minutos): %1$s</string>
<string name="shared_string_about">Acerca de</string> <string name="shared_string_about">Acerca de</string>
@ -1127,7 +1114,7 @@
<string name="edit_tilesource_choose_existing">Elegir existente…</string> <string name="edit_tilesource_choose_existing">Elegir existente…</string>
<string name="local_index_tile_data_zooms">Acercamientos descargados: %1$s</string> <string name="local_index_tile_data_zooms">Acercamientos descargados: %1$s</string>
<string name="edit_tilesource_elliptic_tile">Mercator elíptica</string> <string name="edit_tilesource_elliptic_tile">Mercator elíptica</string>
<string name="map_widget_fps_info">Info depuración de FPS</string> <string name="map_widget_fps_info">Información de FPS</string>
<string name="base_world_map">Mapa base mundial</string> <string name="base_world_map">Mapa base mundial</string>
<string name="osmand_plus_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions, o traducido al español, Guía de navegación automatizada OSM) es un mapa y una aplicación de navegación con acceso a datos de todo el mundo, de alta calidad y gratuitos de OpenStreetMap (OSM). Todos los datos de los mapas se pueden almacenar en la tarjeta de memoria del dispositivo para su uso fuera de línea. A través del GPS de su dispositivo, OsmAnd ofrece avisos de navegación, visuales y de voz, para el automóvil, bicicleta y el peatón. Todas las funciones principales funcionan tanto en línea como fuera de línea (no necesita Internet). <string name="osmand_plus_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions, o traducido al español, Guía de navegación automatizada OSM) es un mapa y una aplicación de navegación con acceso a datos de todo el mundo, de alta calidad y gratuitos de OpenStreetMap (OSM). Todos los datos de los mapas se pueden almacenar en la tarjeta de memoria del dispositivo para su uso fuera de línea. A través del GPS de su dispositivo, OsmAnd ofrece avisos de navegación, visuales y de voz, para el automóvil, bicicleta y el peatón. Todas las funciones principales funcionan tanto en línea como fuera de línea (no necesita Internet).
\n\nOsmAnd+ es la versión de pago de la aplicación. Comprándola da soporte al proyecto, financia el desarrollo de nueva características y obtiene las últimas actualizaciones. Puede probar la aplicación antes de comprarla instalando la versión libre llamada OsmAnd. \n\nOsmAnd+ es la versión de pago de la aplicación. Comprándola da soporte al proyecto, financia el desarrollo de nueva características y obtiene las últimas actualizaciones. Puede probar la aplicación antes de comprarla instalando la versión libre llamada OsmAnd.
@ -1185,7 +1172,7 @@
\n- África: ** \n- África: **
\n- Antártida: * \n- Antártida: *
\n\nLa lista de países incluidos (¡prácticamente todo el mundo!): \n\nLa lista de países incluidos (¡prácticamente todo el mundo!):
\n\nAfganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Antillas Holandesas, Arabia Saudita, Argelia, Argentina, Armenia, Aruba, Australia, Austria, Azerbaiyán, Bahamas, Bahrein, Bangladesh, Barbados, Bélgica, Belice, Benín, Bermuda, Bielorrusia, Bolivia, Bonaire, Bosnia y Herzegovina, Botswana, Brasil, Brunei, Bulgaria, Burkina Faso, Burundi, Bután, Cabo Verde, Camboya, Camerún, Canadá, Chad, Chile, China, Chipre, Colombia, Comoras, Congo, Corea del Norte, Corea del Sur, Costa de Marfil, Costa Rica, Croacia, Cuba, Curazao, Dinamarca, Djibouti, Dominica, Ecuador, Egipto, El Salvador, El Vaticano, Emiratos Árabes Unidos, Eritrea, Eslovaquia, Eslovenia, España, Estados Unidos de América, Estonia, Etiopía, Fiji, Filipinas, Finlandia, Francia, Gabón, Gambia, Georgia, Georgia del Sur, Ghana, Gibraltar, Granada, Grecia, Groenlandia, Guadalupe, Guam, Guatemala, Guayana Francesa, Guernsey, Guinea, Guinea-Bissau, Guinea Ecuatorial, Guyana, Haití, Honduras, Hong Kong, Hungría, India, Indonesia, Irán, Iraq, Irlanda, Isla de Man, Islandia, Islas Vírgenes Británicas, Israel, Italia, Jamaica, Japón, Jersey, Jordania, Kazajstán, Kenya, Kirguistán, Kiribati, Kuwait, Laos, Lesotho, Letonia, Líbano, Liberia, Libia, Liechtenstein, Lituania, Luxemburgo, Macao, Macedonia, Madagascar, Malasia, Malawi, Maldivas, Malí, Malta, Marruecos, Martinica, Mauricio, Mauritania, Mayotte, México, Micronesia, Moldavia, Mónaco, Mongolia, Montenegro, Montserrat, Mozambique, Myanmar, Namibia, Nauru, Nepal, Nicaragua, Níger, Nigeria, Noruega, Nueva Caledonia, Nueva Zelanda, Omán, Países Bajos, Pakistán, Palau, Panamá, Papúa Nueva Guinea, Paraguay, Perú, Polinesia Francesa, Polonia, Portugal, Puerto Rico, Qatar, Reino Unido, República Centroafricana, República Checa, República Dominicana, Ruanda, Rumanía, Rusia, Sahara Occidental, Saint-Barthelemy, Saint Helena, Saint Kitts y Nevis, Samoa, San Marino, San Martin, San Pedro y Miquelón, Santa Lucía, San Vicente y las Granadinas, Senegal, Serbia, Seychelles, Sierra Leona, Singapur, Siria, Somalia, Sri Lanka, Sudáfrica, Sudán, Sudán del Sur, Suecia, Suiza, Suriname, Swazilandia, Tailandia, Taiwán, Tanzania, Tayikistán, Territorio Palestino, Timor Oriental, Togo, Tokelau, Tonga, Trinidad y Tobago, Túnez, Turkmenistán, Turquía, Tuvalu, Ucrania, Uganda, Uruguay, Uzbekistán, Vanuatu, Venezuela, Vietnam, Wallis y Futuna, Yemen, Zambia, Zimbabwe. "</string> \n\nAfganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Antillas Holandesas, Arabia Saudita, Argelia, Argentina, Armenia, Aruba, Australia, Austria, Azerbaiyán, Bahamas, Bahrein, Bangladesh, Barbados, Bélgica, Belice, Benín, Bermuda, Bielorrusia, Bolivia, Bonaire, Bosnia y Herzegovina, Botsuana, Brasil, Brunei, Bulgaria, Burkina Faso, Burundi, Bután, Cabo Verde, Camboya, Camerún, Canadá, Chad, Chile, China, Chipre, Colombia, Comoras, Congo, Corea del Norte, Corea del Sur, Costa de Marfil, Costa Rica, Croacia, Cuba, Curazao, Dinamarca, Djibouti, Dominica, Ecuador, Egipto, El Salvador, El Vaticano, Emiratos Árabes Unidos, Eritrea, Eslovaquia, Eslovenia, España, Estados Unidos de América, Estonia, Etiopía, Fiji, Filipinas, Finlandia, Francia, Gabón, Gambia, Georgia, Georgia del Sur, Ghana, Gibraltar, Granada, Grecia, Groenlandia, Guadalupe, Guam, Guatemala, Guayana Francesa, Guernsey, Guinea, Guinea-Bissau, Guinea Ecuatorial, Guyana, Haití, Honduras, Hong Kong, Hungría, India, Indonesia, Irán, Iraq, Irlanda, Isla de Man, Islandia, Islas Vírgenes Británicas, Israel, Italia, Jamaica, Japón, Jersey, Jordania, Kazajstán, Kenya, Kirguistán, Kiribati, Kuwait, Laos, Lesotho, Letonia, Líbano, Liberia, Libia, Liechtenstein, Lituania, Luxemburgo, Macao, Macedonia, Madagascar, Malasia, Malawi, Maldivas, Malí, Malta, Marruecos, Martinica, Mauricio, Mauritania, Mayotte, México, Micronesia, Moldavia, Mónaco, Mongolia, Montenegro, Montserrat, Mozambique, Myanmar, Namibia, Nauru, Nepal, Nicaragua, Níger, Nigeria, Noruega, Nueva Caledonia, Nueva Zelanda, Omán, Países Bajos, Pakistán, Palau, Panamá, Papúa Nueva Guinea, Paraguay, Perú, Polinesia Francesa, Polonia, Portugal, Puerto Rico, Qatar, Reino Unido, República Centroafricana, República Checa, República Dominicana, Ruanda, Rumanía, Rusia, Sahara Occidental, Saint-Barthelemy, Saint Helena, Saint Kitts y Nevis, Samoa, San Marino, San Martin, San Pedro y Miquelón, Santa Lucía, San Vicente y las Granadinas, Senegal, Serbia, Seychelles, Sierra Leona, Singapur, Siria, Somalia, Sri Lanka, Sudáfrica, Sudán, Sudán del Sur, Suecia, Suiza, Suriname, Swazilandia, Tailandia, Taiwán, Tanzania, Tayikistán, Territorio Palestino, Timor Oriental, Togo, Tokelau, Tonga, Trinidad y Tobago, Túnez, Turkmenistán, Turquía, Tuvalu, Ucrania, Uganda, Uruguay, Uzbekistán, Vanuatu, Venezuela, Vietnam, Wallis y Futuna, Yemen, Zambia, Zimbabwe. "</string>
<string name="map_magnifier">Ampliar el mapa</string> <string name="map_magnifier">Ampliar el mapa</string>
<string name="route_is_too_long">El cálculo de la ruta de OsmAnd sin conexión, puede tardar mucho tiempo (o a veces no funcionar) para puntos separados a más de 200km. Tal vez quiera añadir puntos de ruta intermedios para un mejor rendimiento.</string> <string name="route_is_too_long">El cálculo de la ruta de OsmAnd sin conexión, puede tardar mucho tiempo (o a veces no funcionar) para puntos separados a más de 200km. Tal vez quiera añadir puntos de ruta intermedios para un mejor rendimiento.</string>
<string name="auto_zoom_none">Sin acercamiento automático</string> <string name="auto_zoom_none">Sin acercamiento automático</string>
@ -1239,9 +1226,9 @@
\n Nota 2: En la nueva ubicación de almacenamiento no será posible compartir archivos entre OsmAnd y OsmAnd+.</string> \n Nota 2: En la nueva ubicación de almacenamiento no será posible compartir archivos entre OsmAnd y OsmAnd+.</string>
<string name="use_displayed_track_for_navigation">¿Quiere utilizar la traza mostrada para la navegación?</string> <string name="use_displayed_track_for_navigation">¿Quiere utilizar la traza mostrada para la navegación?</string>
<string name="keep_and_add_destination_point">Añadir como punto de destino</string> <string name="keep_and_add_destination_point">Añadir como punto de destino</string>
<string name="select_gpx">Seleccionar GPX…</string> <string name="select_gpx">Marcar GPX…</string>
<string name="route_descr_select_destination">Seleccionar destino</string> <string name="route_descr_select_destination">Seleccionar destino</string>
<string name="shared_string_select_on_map">Seleccionar en el mapa</string> <string name="shared_string_select_on_map">Marcar en el mapa</string>
<string name="shared_string_favorite">Favorito</string> <string name="shared_string_favorite">Favorito</string>
<string name="route_preferences">Preferencias de la ruta</string> <string name="route_preferences">Preferencias de la ruta</string>
<string name="route_info">Información de la ruta</string> <string name="route_info">Información de la ruta</string>
@ -1331,7 +1318,7 @@
<string name="osmo_locations_sent">"Ubicaciones enviadas %1$d (en buffer %2$d) "</string> <string name="osmo_locations_sent">"Ubicaciones enviadas %1$d (en buffer %2$d) "</string>
<string name="osmo_conn_successfull">Conexión establecida: %1$s </string> <string name="osmo_conn_successfull">Conexión establecida: %1$s </string>
<string name="osmo_groups">Grupos/Dispositivos OsMo</string> <string name="osmo_groups">Grupos/Dispositivos OsMo</string>
<string name="osmo_group_info">Info</string> <string name="osmo_group_info">Información</string>
<string name="color_red">rojo</string> <string name="color_red">rojo</string>
<string name="color_pink">rosa</string> <string name="color_pink">rosa</string>
<string name="color_orange">anaranjado</string> <string name="color_orange">anaranjado</string>
@ -1396,7 +1383,7 @@
<string name="osmo_show_group_notifications">Mostrar notificaciones de grupo</string> <string name="osmo_show_group_notifications">Mostrar notificaciones de grupo</string>
<string name="osmo_show_group_notifications_descr">Mostrar mensajes emergentes cuando usuarios se unen o abandonan el grupo</string> <string name="osmo_show_group_notifications_descr">Mostrar mensajes emergentes cuando usuarios se unen o abandonan el grupo</string>
<string name="shared_string_my_favorites">Mis favoritos</string> <string name="shared_string_my_favorites">Mis favoritos</string>
<string name="shared_string_my_places">Mis sitios</string> <string name="shared_string_my_places">Mis Sitios</string>
<string name="gpx_selection_number_of_points"> %1$s puntos</string> <string name="gpx_selection_number_of_points"> %1$s puntos</string>
<string name="gpx_selection_point">Punto %1$s</string> <string name="gpx_selection_point">Punto %1$s</string>
<string name="gpx_selection_route_points">%1$s \nPuntos de ruta %2$s</string> <string name="gpx_selection_route_points">%1$s \nPuntos de ruta %2$s</string>
@ -1425,7 +1412,7 @@
<string name="gpx_info_asc_altitude">Descenso/ascenso: %1$s</string> <string name="gpx_info_asc_altitude">Descenso/ascenso: %1$s</string>
<string name="map_widget_plain_time">Tiempo actual</string> <string name="map_widget_plain_time">Tiempo actual</string>
<string name="gpx_wpt">Punto de ruta</string> <string name="gpx_wpt">Punto de ruta</string>
<string name="select_destination_and_intermediate_points">Seleccionar puntos de ruta</string> <string name="select_destination_and_intermediate_points">Marcar puntos de ruta</string>
<string name="layer_amenity_label">Etiquetas de los puntos</string> <string name="layer_amenity_label">Etiquetas de los puntos</string>
<string name="save_as_favorites_points">Guardar como grupo de favoritos</string> <string name="save_as_favorites_points">Guardar como grupo de favoritos</string>
<string name="show_zoom_buttons_navigation_descr">Muestra los botones de acercamiento durante la navegación</string> <string name="show_zoom_buttons_navigation_descr">Muestra los botones de acercamiento durante la navegación</string>
@ -1434,7 +1421,7 @@
<string name="sort_by_distance">Ordenar por distancia</string> <string name="sort_by_distance">Ordenar por distancia</string>
<string name="sort_by_name">Ordenar por nombre</string> <string name="sort_by_name">Ordenar por nombre</string>
<string name="none_selected_gpx">No hay archivos GPX seleccionados. Para seleccionar presione y mantenga presionado en la traza disponible.</string> <string name="none_selected_gpx">No hay archivos GPX seleccionados. Para seleccionar presione y mantenga presionado en la traza disponible.</string>
<string name="local_index_select_gpx_file">Seleccionar para mostrar</string> <string name="local_index_select_gpx_file">Marcar para mostrar</string>
<string name="no_index_file_to_download">No se encontraron descargas, compruebe su conexión a Internet.</string> <string name="no_index_file_to_download">No se encontraron descargas, compruebe su conexión a Internet.</string>
<string name="rendering_attr_hideBuildings_name">Ocultar edificios</string> <string name="rendering_attr_hideBuildings_name">Ocultar edificios</string>
<string name="rendering_attr_hideNonVehicleHighways_name">Ocultar vías no aptas para vehículos</string> <string name="rendering_attr_hideNonVehicleHighways_name">Ocultar vías no aptas para vehículos</string>
@ -1506,7 +1493,7 @@
<string name="rendering_value_browse_map_name">Explorar mapa</string> <string name="rendering_value_browse_map_name">Explorar mapa</string>
<string name="rendering_value_car_name">Automóvil</string> <string name="rendering_value_car_name">Automóvil</string>
<string name="rendering_value_bicycle_name">Bicicleta</string> <string name="rendering_value_bicycle_name">Bicicleta</string>
<string name="rendering_value_pedestrian_name">Peatonal</string> <string name="rendering_value_pedestrian_name">Peatón</string>
<string name="shared_string_more">Más…</string> <string name="shared_string_more">Más…</string>
<string name="download_additional_maps">¿Descargar los mapas que faltan %1$s (%2$d MB)?</string> <string name="download_additional_maps">¿Descargar los mapas que faltan %1$s (%2$d MB)?</string>
<string name="waypoints">Puntos de ruta</string> <string name="waypoints">Puntos de ruta</string>
@ -1539,10 +1526,10 @@
<string name="traffic_warning">Aviso de tráfico</string> <string name="traffic_warning">Aviso de tráfico</string>
<string name="text_size_descr">Establece el tamaño del texto en el mapa.</string> <string name="text_size_descr">Establece el tamaño del texto en el mapa.</string>
<string name="text_size">Tamaño de texto</string> <string name="text_size">Tamaño de texto</string>
<string name="fav_point_dublicate">Nombre de punto favorito duplicado</string> <string name="fav_point_dublicate">Nombre del favorito duplicado</string>
<string name="fav_point_dublicate_message">El nombre del favorito especificado está en uso, fue cambiado a %1$s para evitar duplicados.</string> <string name="fav_point_dublicate_message">El nombre del favorito especificado está en uso, fue cambiado a %1$s para evitar duplicados.</string>
<string name="print_route">Imprimir ruta</string> <string name="print_route">Imprimir ruta</string>
<string name="fav_point_emoticons_message">El nombre de punto favorito ha sido cambiado a %1$s para facilitar el guardado de la cadena con emoticonos a un archivo.</string> <string name="fav_point_emoticons_message">Se cambió el nombre del favorito a %1$s, para facilitar el guardado de la cadena con emoticonos a un archivo.</string>
<string name="speed_limit_exceed">Tolerancia de límite de velocidad</string> <string name="speed_limit_exceed">Tolerancia de límite de velocidad</string>
<string name="speed_limit_exceed_message">Seleccione el margen de tolerancia sobre el límite de velocidad con el cual recibirá un aviso de voz.</string> <string name="speed_limit_exceed_message">Seleccione el margen de tolerancia sobre el límite de velocidad con el cual recibirá un aviso de voz.</string>
<string name="osmo_device_not_found">Dispositivo no encontrado</string> <string name="osmo_device_not_found">Dispositivo no encontrado</string>
@ -1690,8 +1677,8 @@
<string name="routing_settings_2">Ajustes de navegación</string> <string name="routing_settings_2">Ajustes de navegación</string>
<string name="general_settings_2">Ajustes generales</string> <string name="general_settings_2">Ajustes generales</string>
<string name="shared_string_ellipsis">…</string> <string name="shared_string_ellipsis">…</string>
<string name="shared_string_deselect">Deseleccionar</string> <string name="shared_string_deselect">Desmarcar</string>
<string name="shared_string_deselect_all">Deseleccionar todo</string> <string name="shared_string_deselect_all">Desmarcar todo</string>
<string name="shared_string_unexpected_error">Se produjo un error inesperado</string> <string name="shared_string_unexpected_error">Se produjo un error inesperado</string>
<string name="shared_string_action_template">Acción {0}</string> <string name="shared_string_action_template">Acción {0}</string>
<string name="shared_string_collapse">Contraer</string> <string name="shared_string_collapse">Contraer</string>
@ -1725,7 +1712,7 @@
<string name="shared_string_manage">Gestionar</string> <string name="shared_string_manage">Gestionar</string>
<string name="shared_string_edit">Editar</string> <string name="shared_string_edit">Editar</string>
<string name="shared_string_places">Lugares</string> <string name="shared_string_places">Lugares</string>
<string name="shared_string_search">Buscar</string> <string name="shared_string_search">Buscar cerca</string>
<string name="filter_poi_hint">Filtrar por nombre</string> <string name="filter_poi_hint">Filtrar por nombre</string>
<string name="search_poi_category_hint">Escribe para buscar en todos</string> <string name="search_poi_category_hint">Escribe para buscar en todos</string>
<string name="index_name_netherlands">Europa - Países Bajos</string> <string name="index_name_netherlands">Europa - Países Bajos</string>
@ -1742,7 +1729,6 @@
<string name="shared_string_copy">Copiar</string> <string name="shared_string_copy">Copiar</string>
<string name="application_dir_change_warning3">¿Quiere que OsmAnd también copie los archivos de datos al nuevo destino?</string> <string name="application_dir_change_warning3">¿Quiere que OsmAnd también copie los archivos de datos al nuevo destino?</string>
<string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string> <string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
<string name="routing_attr_avoid_borders_description">Evita cruzar una frontera hacia otro país</string> <string name="routing_attr_avoid_borders_description">Evita cruzar una frontera hacia otro país</string>
<string name="routing_attr_height_name">Límite de altura</string> <string name="routing_attr_height_name">Límite de altura</string>
<string name="routing_attr_height_description">Especifique la altura del vehículo que se permite en las rutas</string> <string name="routing_attr_height_description">Especifique la altura del vehículo que se permite en las rutas</string>
@ -1923,7 +1909,7 @@
<string name="share_menu_location">Compartir ubicación</string> <string name="share_menu_location">Compartir ubicación</string>
<string name="shared_string_send">Enviar</string> <string name="shared_string_send">Enviar</string>
<string name="application_dir_description">Elige donde guardar los archivos de los mapas.</string> <string name="application_dir_description">Elige donde guardar los archivos de los mapas.</string>
<string name="show_on_start_description">\'No\', inicia directamente en la pantalla del mapa</string> <string name="show_on_start_description">Si se desactiva, inicia directamente en la pantalla del mapa</string>
<string name="map_downloaded">Mapa descargado</string> <string name="map_downloaded">Mapa descargado</string>
<string name="map_downloaded_descr">Se descargó el mapa de %1$s. Vuelve al mapa para empezar a usarlo.</string> <string name="map_downloaded_descr">Se descargó el mapa de %1$s. Vuelve al mapa para empezar a usarlo.</string>
<string name="go_to_map">Ir al mapa</string> <string name="go_to_map">Ir al mapa</string>
@ -1950,12 +1936,10 @@
<string name="feedback">Encuesta</string> <string name="feedback">Encuesta</string>
<string name="contact_us">Contáctenos</string> <string name="contact_us">Contáctenos</string>
<string name="osm_edit_created_poi">PDI de OSM creado</string> <string name="osm_edit_created_poi">PDI de OSM creado</string>
<string name="osm_edit_created_bug">Nota OSM creada</string>
<string name="map_legend">Leyenda del mapa</string> <string name="map_legend">Leyenda del mapa</string>
<string name="shared_string_update">Actualizar</string> <string name="shared_string_update">Actualizar</string>
<string name="shared_string_upload">Subir</string> <string name="shared_string_upload">Subir</string>
<string name="rendering_attr_hideProposed_name">Ocultar objetos propuestos</string> <string name="rendering_attr_hideProposed_name">Ocultar objetos propuestos</string>
<string name="read_more">Leer más</string> <string name="read_more">Leer más</string>
<string name="whats_new">Novedades en</string> <string name="whats_new">Novedades en</string>
<string name="lang_nds">Bajo Alemán</string> <string name="lang_nds">Bajo Alemán</string>
@ -1964,4 +1948,33 @@
<string name="lang_als">Albano (Tosk)</string> <string name="lang_als">Albano (Tosk)</string>
<string name="share_osm_edits_subject">Ediciones OSM compartidas vía OsmAnd</string> <string name="share_osm_edits_subject">Ediciones OSM compartidas vía OsmAnd</string>
<string name="save_poi_without_poi_type_message">¿Quiere guardar el punto de interés sin especificar el tipo?</string> <string name="save_poi_without_poi_type_message">¿Quiere guardar el punto de interés sin especificar el tipo?</string>
<string name="shared_string_location">Ubicación</string>
<string name="poi_context_menu_modify_osm_change">Modificar cambio OSM</string>
<string name="context_menu_item_delete_waypoint">¿Borrar punto de ruta GPX?</string>
<string name="context_menu_item_edit_waypoint">Editar punto de ruta GPX</string>
<string name="context_menu_item_open_note">Abrir nota OSM</string>
<string name="osm_edit_reopened_note">Nota OSM reabierta</string>
<string name="osm_edit_commented_note">Nota OSM comentada</string>
<string name="osm_edit_removed_note">Nota OSM borrada</string>
<string name="osm_edit_created_note">Nota OSM creada</string>
<string name="osn_bug_name">Nota OSM</string>
<string name="osn_add_dialog_title">Crear nota</string>
<string name="osn_comment_dialog_title">Añadir comentario</string>
<string name="osn_reopen_dialog_title">Reabrir nota</string>
<string name="osn_close_dialog_title">Cerrar nota</string>
<string name="osn_add_dialog_success">Nota creada exitosamente</string>
<string name="osn_add_dialog_error">Error: la nota no se creó</string>
<string name="osn_close_dialog_success">El error se cerró exitosamente</string>
<string name="osn_close_dialog_error">Error: no se cerró la nota</string>
<string name="shared_string_commit">Confirmar</string>
<string name="poi_dialog_reopen">Reabrir</string>
<string name="osm_edit_modified_poi">PDI de OSM modificado</string>
<string name="osm_edit_deleted_poi">PDI de OSM borrado</string>
<string name="rendering_attr_currentTrackColor_description">Color del GPX</string>
<string name="rendering_attr_currentTrackWidth_description">Ancho del GPX</string>
<string name="rendering_attr_roadStyle_description">Estilo de carretera</string>
<string name="osm_save_offline">Guardar sin conexión</string>
<string name="release_2_2">" • Nueva interfaz de usuario sensible al contexto para aprovechar lugares en el mapa y en otra pantallas\n\n• La pantalla del mapa, ahora se inicia directamente, a menos que \'Mostrar panel de control en el arranque de la aplicación\' este seleccionado\n\n• El tablero de instrumentos, posee el opción de que tarjetas se visualizarán\n\n• Los mapas, pueden seleccionarse directamente y descargar el mapa mundial\n\n• Mejor recálculo de la ruta (después de reiterados intentos, el motor ahora sugiere una ruta diferente)\n\n• La búsqueda de PDI, ahora soporta consultas más específicas\n\n• Mejoras en PDI y funcionalidad de edición OSM\n\n• Se rediseñó la estructura e interfaz de los datos de mapas\n\n y más... "</string>
</resources> </resources>

28
OsmAnd/res/values-eu/strings.xml
View file

@ -55,7 +55,7 @@
<string name="search_street_in_neighborhood_cities">Bilatu kalea inguruko herrietan</string> <string name="search_street_in_neighborhood_cities">Bilatu kalea inguruko herrietan</string>
<string name="intermediate_items_sort_return">Erdibideko bide-puntuak bidea hobetzeko berantolatuak izan dira.</string> <string name="intermediate_items_sort_return">Erdibideko bide-puntuak bidea hobetzeko berantolatuak izan dira.</string>
<string name="intermediate_items_sort_by_distance">Ordenatu (door-to-door)</string> <string name="intermediate_items_sort_by_distance">Ordenatu door-to-door</string>
<string name="local_osm_changes_backup_successful">OSM aldaketa arrakastaz sortu da %1$s</string> <string name="local_osm_changes_backup_successful">OSM aldaketa arrakastaz sortu da %1$s</string>
<string name="local_osm_changes_backup_failed">OSMren aldaketen backupak huts egin du</string> <string name="local_osm_changes_backup_failed">OSMren aldaketen backupak huts egin du</string>
<string name="local_osm_changes_backup">OSMren aldaketa bezala backupa egin</string> <string name="local_osm_changes_backup">OSMren aldaketa bezala backupa egin</string>
@ -845,7 +845,7 @@
<string name="vector_data">Lineaz kanpoko bektore mapak</string> <string name="vector_data">Lineaz kanpoko bektore mapak</string>
<string name="transport_context_menu">Bilatu garraioa geldiunean</string> <string name="transport_context_menu">Bilatu garraioa geldiunean</string>
<string name="osb_bug_name">Akatsa</string>
<string name="poi_context_menu_modify">POIa eraldatu</string> <string name="poi_context_menu_modify">POIa eraldatu</string>
<string name="poi_context_menu_delete">POIa ezabatu</string> <string name="poi_context_menu_delete">POIa ezabatu</string>
<string name="rotate_map_compass_opt">Konpaseruntz</string> <string name="rotate_map_compass_opt">Konpaseruntz</string>
@ -1104,7 +1104,7 @@
<string name="search_tabs_location">Kokapena</string> <string name="search_tabs_location">Kokapena</string>
<string name="context_menu_item_update_map">Mapa eguneratu</string> <string name="context_menu_item_update_map">Mapa eguneratu</string>
<string name="context_menu_item_open_bug">Ireki OSM akats jakinarazpena</string>
<string name="context_menu_item_create_poi">POIa sortu</string> <string name="context_menu_item_create_poi">POIa sortu</string>
<string name="shared_string_yes">Bai</string> <string name="shared_string_yes">Bai</string>
<string name="shared_string_cancel">Ezeztatu</string> <string name="shared_string_cancel">Ezeztatu</string>
@ -1118,22 +1118,22 @@
<string name="favourites_context_menu_delete">Gogokoena ezabatu</string> <string name="favourites_context_menu_delete">Gogokoena ezabatu</string>
<string name="favourites_remove_dialog_msg">Ezabatu \'%s\' gogokoen puntua?</string> <string name="favourites_remove_dialog_msg">Ezabatu \'%s\' gogokoen puntua?</string>
<string name="favourites_remove_dialog_success">{0} punto gogokoena arrakastaz ezabatu da.</string> <string name="favourites_remove_dialog_success">{0} punto gogokoena arrakastaz ezabatu da.</string>
<string name="osb_add_dialog_title">Sartu akatsaren testua</string>
<string name="osb_add_dialog_success">Akats jakinarazpena arrakastaz sortu da</string>
<string name="osb_add_dialog_error">Salbuespena: akats jakinarazpena ez da sortu</string>
<string name="osb_author_dialog_password">OSMeko pasahitza (aukerazkoa)</string> <string name="osb_author_dialog_password">OSMeko pasahitza (aukerazkoa)</string>
<string name="osb_comment_menu_item">Iruzkina gehitu</string>
<string name="osb_comment_dialog_message">Mezua</string> <string name="osb_comment_dialog_message">Mezua</string>
<string name="osb_comment_dialog_author">Autorearen izena</string> <string name="osb_comment_dialog_author">Autorearen izena</string>
<string name="osb_comment_dialog_title">Akatsera iruzkin bat gehitzen</string>
<string name="osb_comment_dialog_add_button">Iruzkina gehitu</string>
<string name="osb_comment_dialog_success">Iruzkina arrakastaz gehitu da</string> <string name="osb_comment_dialog_success">Iruzkina arrakastaz gehitu da</string>
<string name="osb_comment_dialog_error">Salbuespena: ez da iruzkina gehitu</string> <string name="osb_comment_dialog_error">Salbuespena: ez da iruzkina gehitu</string>
<string name="osb_close_menu_item">Akatsa itxi</string>
<string name="osb_close_dialog_title">Akatsa ixten</string>
<string name="osb_close_dialog_close_button">Akatxa itxi</string>
<string name="osb_close_dialog_success">Akatxa arrakastaz itxi da</string>
<string name="osb_close_dialog_error">Salbuespena: akats jakinarazpena ez da itxi</string>
<string name="poi_edit_title">POIa editatu</string> <string name="poi_edit_title">POIa editatu</string>
<string name="poi_create_title">POIa sortu</string> <string name="poi_create_title">POIa sortu</string>
<string name="poi_error_poi_not_found">Ezin da nodoa aurkitu edo erosotasuna ez da puntu bakar bat</string> <string name="poi_error_poi_not_found">Ezin da nodoa aurkitu edo erosotasuna ez da puntu bakar bat</string>

26
OsmAnd/res/values-fa/strings.xml
View file

@ -232,16 +232,16 @@
<string name="poi_error_unexpected_template">خطای غیرمنتظره در حین {0} اتفاق افتاد.</string> <string name="poi_error_unexpected_template">خطای غیرمنتظره در حین {0} اتفاق افتاد.</string>
<string name="poi_error_io_error_template">خطای I/O در حین انجام {0} اتفاق افتاد.</string> <string name="poi_error_io_error_template">خطای I/O در حین انجام {0} اتفاق افتاد.</string>
<string name="poi_error_info_not_loaded">اطلاعات نقطه بارگذاری نشد</string> <string name="poi_error_info_not_loaded">اطلاعات نقطه بارگذاری نشد</string>
<string name="osb_comment_menu_item">افزودن توضیح</string>
<string name="osb_comment_dialog_message">پیام</string> <string name="osb_comment_dialog_message">پیام</string>
<string name="osb_comment_dialog_author">نام نویسنده</string> <string name="osb_comment_dialog_author">نام نویسنده</string>
<string name="osb_comment_dialog_title">افزودن توضیح به اشکال</string>
<string name="osb_comment_dialog_add_button">افزودن توضیح</string>
<string name="osb_comment_dialog_success">توضیح اضافه شد</string> <string name="osb_comment_dialog_success">توضیح اضافه شد</string>
<string name="osb_close_menu_item">بستن اشکال</string>
<string name="osb_close_dialog_title">درحال بستن اشکال</string>
<string name="osb_close_dialog_close_button">بستن اشکال</string>
<string name="osb_close_dialog_success">اشکال بسته شد</string>
<string name="poi_edit_title">ویرایش POI</string> <string name="poi_edit_title">ویرایش POI</string>
<string name="shared_string_show_on_map">روی نقشه نشان بده</string> <string name="shared_string_show_on_map">روی نقشه نشان بده</string>
@ -255,7 +255,7 @@
<string name="search_tabs_location">محل</string> <string name="search_tabs_location">محل</string>
<string name="context_menu_item_update_map">به روز رسانی نقشه</string> <string name="context_menu_item_update_map">به روز رسانی نقشه</string>
<string name="context_menu_item_open_bug">بازکردن اشکال OSM</string>
<string name="context_menu_item_create_poi">ایجاد POI</string> <string name="context_menu_item_create_poi">ایجاد POI</string>
<string name="shared_string_yes">بله</string> <string name="shared_string_yes">بله</string>
<string name="shared_string_cancel">لغو</string> <string name="shared_string_cancel">لغو</string>
@ -269,9 +269,9 @@
<string name="favourites_context_menu_delete">حذف علاقمندی</string> <string name="favourites_context_menu_delete">حذف علاقمندی</string>
<string name="favourites_remove_dialog_msg">آیا نقطه برگزیده \'%s\' حذف شود؟</string> <string name="favourites_remove_dialog_msg">آیا نقطه برگزیده \'%s\' حذف شود؟</string>
<string name="favourites_remove_dialog_success">علاقمندی {0} حذف شد.</string> <string name="favourites_remove_dialog_success">علاقمندی {0} حذف شد.</string>
<string name="osb_add_dialog_title">شرح اشکال را وارد کنید</string>
<string name="osb_add_dialog_success">اشکال با موفقیت ایجاد شد</string>
<string name="osb_add_dialog_error">خطایی روی داد: اشکال ایجاد نشد</string>
<string name="search_address">جستجوی آدرس</string> <string name="search_address">جستجوی آدرس</string>
<string name="shared_string_add_to_favorites">افزودن به علاقمندیها</string> <string name="shared_string_add_to_favorites">افزودن به علاقمندیها</string>
<string name="use_english_names_descr">انتخاب بین نامهای بومی یا انگلیسی</string> <string name="use_english_names_descr">انتخاب بین نامهای بومی یا انگلیسی</string>
@ -312,7 +312,7 @@
<string name="navigate_point_longitude">طول جغرافیایی</string> <string name="navigate_point_longitude">طول جغرافیایی</string>
<string name="poi_remove_confirm_template">{0} حذف شود(توضیح دهید)؟</string> <string name="poi_remove_confirm_template">{0} حذف شود(توضیح دهید)؟</string>
<string name="osb_comment_dialog_error">خطایی رخ داد: توضیح افزوده نشد</string> <string name="osb_comment_dialog_error">خطایی رخ داد: توضیح افزوده نشد</string>
<string name="osb_close_dialog_error">خطایی رخ داد: اشکال بسته نشد</string>
<string name="Closest_Amenities">نزدیکترین امکانات رفاهی</string> <string name="Closest_Amenities">نزدیکترین امکانات رفاهی</string>
<string name="map_tile_source_descr">منبع نقشه آنلاین یا ذخیره شده را انتخاب کنید</string> <string name="map_tile_source_descr">منبع نقشه آنلاین یا ذخیره شده را انتخاب کنید</string>
<string name="error_calculating_route_occured">درحین محاسبه مسیر خطایی رخ داد</string> <string name="error_calculating_route_occured">درحین محاسبه مسیر خطایی رخ داد</string>
@ -1005,7 +1005,7 @@
<string name="layer_gpx_layer">مسیر GPX…</string> <string name="layer_gpx_layer">مسیر GPX…</string>
<string name="error_reading_gpx">خطا هنگام خواندن داده GPX</string> <string name="error_reading_gpx">خطا هنگام خواندن داده GPX</string>
<string name="vector_data">نقشه های بُرداری آفلاین</string> <string name="vector_data">نقشه های بُرداری آفلاین</string>
<string name="osb_bug_name">اشکال</string>
<string name="downloading_build">درحال دانلود ساخت…</string> <string name="downloading_build">درحال دانلود ساخت…</string>
<string name="reading_cached_tiles">درحال خواندن کاشی های ذخیره شده…</string> <string name="reading_cached_tiles">درحال خواندن کاشی های ذخیره شده…</string>

10
OsmAnd/res/values-fi/strings.xml
View file

@ -238,7 +238,7 @@
<string name="context_menu_item_search_transport">Etsi kulkuneuvoa</string> <string name="context_menu_item_search_transport">Etsi kulkuneuvoa</string>
<string name="voice">Ääni</string> <string name="voice">Ääni</string>
<string name="osb_bug_name">Bugi</string>
<string name="rotate_map_to_bearing">Kartan orientaatio</string> <string name="rotate_map_to_bearing">Kartan orientaatio</string>
<string name="show_route">Reitin tiedot</string> <string name="show_route">Reitin tiedot</string>
<string name="fav_imported_sucessfully">Suosikit tuotu onnistuneesti</string> <string name="fav_imported_sucessfully">Suosikit tuotu onnistuneesti</string>
@ -416,9 +416,9 @@
<string name="favourites_context_menu_edit">Muokkaa suosikkia</string> <string name="favourites_context_menu_edit">Muokkaa suosikkia</string>
<string name="favourites_context_menu_delete">Poista suosikki</string> <string name="favourites_context_menu_delete">Poista suosikki</string>
<string name="favourites_remove_dialog_msg">Poista suosikki \'%s\'?</string> <string name="favourites_remove_dialog_msg">Poista suosikki \'%s\'?</string>
<string name="osb_comment_menu_item">Lisää kommentti</string>
<string name="osb_comment_dialog_message">Viesti (englanniksi)</string> <string name="osb_comment_dialog_message">Viesti (englanniksi)</string>
<string name="osb_comment_dialog_add_button">Lisää kommentti</string>
<string name="osb_comment_dialog_success">Kommentti lisätty onnistuneesti</string> <string name="osb_comment_dialog_success">Kommentti lisätty onnistuneesti</string>
<string name="osb_comment_dialog_error">Tapahtui virhe: kommenttia ei lisätty</string> <string name="osb_comment_dialog_error">Tapahtui virhe: kommenttia ei lisätty</string>
<string name="poi_edit_title">Muokkaa KP:ta</string> <string name="poi_edit_title">Muokkaa KP:ta</string>
@ -574,7 +574,7 @@
<string name="local_index_installed">Versio</string> <string name="local_index_installed">Versio</string>
<string name="poi_remove_confirm_template">Poista {0} (lisää kommentti)?</string> <string name="poi_remove_confirm_template">Poista {0} (lisää kommentti)?</string>
<string name="osb_close_dialog_error">Tapahtui virhe: bugia ei suljettu</string>
<string name="osb_comment_dialog_author">Tekijän nimi</string> <string name="osb_comment_dialog_author">Tekijän nimi</string>
<string name="route_descr_current_location">Nykyinen sijainti</string> <string name="route_descr_current_location">Nykyinen sijainti</string>
<string name="download_roads_only_item">"Tiet "</string> <string name="download_roads_only_item">"Tiet "</string>
@ -661,7 +661,7 @@
<string name="context_menu_item_destination_point">Valitse määränpääksi</string> <string name="context_menu_item_destination_point">Valitse määränpääksi</string>
<string name="please_select_address">Valitse kaupunki tai katu ensin</string> <string name="please_select_address">Valitse kaupunki tai katu ensin</string>
<string name="search_street_in_neighborhood_cities">Etsi katua lähikaupungeista</string> <string name="search_street_in_neighborhood_cities">Etsi katua lähikaupungeista</string>
<string name="intermediate_items_sort_by_distance">Lajittele (ovelta ovelle)</string> <string name="intermediate_items_sort_by_distance">Lajittele ovelta ovelle</string>
<string name="local_osm_changes_backup_successful">OSM muutostiedosto luotiin onnistuneesti %1$s</string> <string name="local_osm_changes_backup_successful">OSM muutostiedosto luotiin onnistuneesti %1$s</string>
<string name="delete_point">Poista piste</string> <string name="delete_point">Poista piste</string>
<string name="plugin_distance_point_time">aika</string> <string name="plugin_distance_point_time">aika</string>

54
OsmAnd/res/values-fr/strings.xml
View file

@ -349,7 +349,7 @@
<string name="vector_data">Cartes vectorielles OSM</string> <string name="vector_data">Cartes vectorielles OSM</string>
<string name="transport_context_menu">Transport en commun</string> <string name="transport_context_menu">Transport en commun</string>
<string name="osb_bug_name">Bogue</string>
<string name="poi_context_menu_modify">Modifier PI</string> <string name="poi_context_menu_modify">Modifier PI</string>
<string name="poi_context_menu_delete">Supprimer PI</string> <string name="poi_context_menu_delete">Supprimer PI</string>
<string name="rotate_map_compass_opt">D\'après la boussole</string> <string name="rotate_map_compass_opt">D\'après la boussole</string>
@ -611,7 +611,7 @@
<string name="search_tabs_location">Position</string> <string name="search_tabs_location">Position</string>
<string name="context_menu_item_update_map">Mettre à jour la carte</string> <string name="context_menu_item_update_map">Mettre à jour la carte</string>
<string name="context_menu_item_open_bug">Ouvrir un bogue OSM</string>
<string name="context_menu_item_create_poi">Créer un point d\'intérêt</string> <string name="context_menu_item_create_poi">Créer un point d\'intérêt</string>
<string name="shared_string_yes">Oui</string> <string name="shared_string_yes">Oui</string>
<string name="shared_string_cancel">Annuler</string> <string name="shared_string_cancel">Annuler</string>
@ -625,21 +625,21 @@
<string name="favourites_context_menu_delete">Supprimer le favori</string> <string name="favourites_context_menu_delete">Supprimer le favori</string>
<string name="favourites_remove_dialog_msg">Voulez-vous vraiment supprimer le favori \'%s\' ?</string> <string name="favourites_remove_dialog_msg">Voulez-vous vraiment supprimer le favori \'%s\' ?</string>
<string name="favourites_remove_dialog_success">Suppression du favori \'{0}\' réussie.</string> <string name="favourites_remove_dialog_success">Suppression du favori \'{0}\' réussie.</string>
<string name="osb_add_dialog_title">Description du bogue</string>
<string name="osb_add_dialog_success">Le bogue a bien été créé</string>
<string name="osb_add_dialog_error">Erreur : le bogue n\'a pas été créé</string>
<string name="osb_comment_menu_item">Ajouter commentaire</string>
<string name="osb_comment_dialog_message">Message</string> <string name="osb_comment_dialog_message">Message</string>
<string name="osb_comment_dialog_author">Nom de l\'auteur</string> <string name="osb_comment_dialog_author">Nom de l\'auteur</string>
<string name="osb_comment_dialog_title">Ajout d\'un commentaire au bogue</string>
<string name="osb_comment_dialog_add_button">Ajouter commentaire</string>
<string name="osb_comment_dialog_success">Ajout du commentaire réussi</string> <string name="osb_comment_dialog_success">Ajout du commentaire réussi</string>
<string name="osb_comment_dialog_error">Erreur : le commentaire n\'a pas été ajouté</string> <string name="osb_comment_dialog_error">Erreur : le commentaire n\'a pas été ajouté</string>
<string name="osb_close_menu_item">Fermer le bogue</string>
<string name="osb_close_dialog_title">Fermeture du bogue</string>
<string name="osb_close_dialog_close_button">Fermer bogue</string>
<string name="osb_close_dialog_success">Bogue ajouté avec succès</string>
<string name="osb_close_dialog_error">Erreur : le bogue n\'a pas été fermé</string>
<string name="poi_edit_title">Éditer PI</string> <string name="poi_edit_title">Éditer PI</string>
<string name="poi_create_title">Créer un point d\'intérêt (PI)</string> <string name="poi_create_title">Créer un point d\'intérêt (PI)</string>
<string name="poi_error_poi_not_found">Objet introuvable ou l\'équipement n\'est pas un composé d\'un seul objet</string> <string name="poi_error_poi_not_found">Objet introuvable ou l\'équipement n\'est pas un composé d\'un seul objet</string>
@ -2075,7 +2075,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="contact_us">Nous contacter</string> <string name="contact_us">Nous contacter</string>
<string name="osm_edit_created_poi">PI créés sur OSM</string> <string name="osm_edit_created_poi">PI créés sur OSM</string>
<string name="osm_edit_created_bug">Bugs déclarés sur OSM</string>
<string name="map_legend">Légende</string> <string name="map_legend">Légende</string>
<string name="shared_string_upload">Téléchargement</string> <string name="shared_string_upload">Téléchargement</string>
@ -2091,4 +2091,30 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="lang_nds">Bas allemand</string> <string name="lang_nds">Bas allemand</string>
<string name="share_osm_edits_subject">Éditions OSM partagées grâce à OsmAnd</string> <string name="share_osm_edits_subject">Éditions OSM partagées grâce à OsmAnd</string>
<string name="save_poi_without_poi_type_message">Souhaitez-vous enregistrer ce point d\'intérêt sans définir son type ?</string> <string name="save_poi_without_poi_type_message">Souhaitez-vous enregistrer ce point d\'intérêt sans définir son type ?</string>
<string name="shared_string_location">Localisation</string>
<string name="context_menu_item_delete_waypoint">Supprimer le point de passage GPX ?</string>
<string name="context_menu_item_edit_waypoint">Modifier le point de passage GPX</string>
<string name="context_menu_item_open_note">Ouvrir la note OSM</string>
<string name="osm_edit_reopened_note">Ré-ouvrir la note OSM</string>
<string name="osm_edit_removed_note">Note OSM supprimée</string>
<string name="osm_edit_created_note">Note OSM créée</string>
<string name="osn_bug_name">Note OSM</string>
<string name="osn_add_dialog_title">Créer une note</string>
<string name="osn_comment_dialog_title">Ajouter un commentaire</string>
<string name="osn_reopen_dialog_title">Ré-ouvrir la note</string>
<string name="osn_close_dialog_title">Fermer la note</string>
<string name="osn_add_dialog_success">Note créée avec succès</string>
<string name="osn_add_dialog_error">Une erreur s\'est produite : la note n\'a pas pu être créée</string>
<string name="osn_close_dialog_success">Le bug a été soumis avec succès</string>
<string name="osn_close_dialog_error">Une erreur s\'est produite : la note ne peut pas être fermée</string>
<string name="shared_string_commit">Soumettre</string>
<string name="poi_dialog_reopen">Ré-ouvrir</string>
<string name="osm_edit_commented_note">Note OSM commentée</string>
<string name="osm_edit_modified_poi">PI OSM modifié</string>
<string name="osm_edit_deleted_poi">PI OSM supprimé</string>
<string name="osm_save_offline">Enregistrer pour utiliser hors-ligne</string>
<string name="rendering_attr_currentTrackColor_description">Couleur GPX</string>
<string name="rendering_attr_currentTrackWidth_description">Largeur GPX</string>
<string name="rendering_attr_roadStyle_description">Style pour les routes</string>
</resources> </resources>

33
OsmAnd/res/values-gl/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="fav_point_dublicate_message">O nome do punto favorito xa está usado; foi cambiado a %1$s para evitar os duplicados.</string>
<resources><string name="fav_point_dublicate_message">O nome do punto favorito xa está usado; foi cambiado a %1$s para evitar os duplicados.</string>
<string name="text_size_descr">Configurar o tamaño da letra no mapa.</string> <string name="text_size_descr">Configurar o tamaño da letra no mapa.</string>
<string name="text_size">Tamaño da letra</string> <string name="text_size">Tamaño da letra</string>
<string name="traffic_warning_speed_limit">Límite de velocidade</string> <string name="traffic_warning_speed_limit">Límite de velocidade</string>
@ -430,7 +429,7 @@
<string name="search_street_in_neighborhood_cities">Buscar a rúa nas poboacións viciñas</string> <string name="search_street_in_neighborhood_cities">Buscar a rúa nas poboacións viciñas</string>
<string name="intermediate_items_sort_return">Os puntos de pasaxe intermedios foron reordenados para optimizar a ordenación de camiño ao destino.</string> <string name="intermediate_items_sort_return">Os puntos de pasaxe intermedios foron reordenados para optimizar a ordenación de camiño ao destino.</string>
<string name="intermediate_items_sort_by_distance">Ordenar (porta a porta)</string> <string name="intermediate_items_sort_by_distance">Ordenar porta a porta</string>
<string name="local_osm_changes_backup_successful">O ficheiro de cambios de OSM foi xerado correctamente %1$s</string> <string name="local_osm_changes_backup_successful">O ficheiro de cambios de OSM foi xerado correctamente %1$s</string>
<string name="local_osm_changes_backup_failed">Fallou a creación da copia de seguranza dos cambios de OSM</string> <string name="local_osm_changes_backup_failed">Fallou a creación da copia de seguranza dos cambios de OSM</string>
<string name="local_osm_changes_backup">Crear unha copia de seguranza como cambio de OSM</string> <string name="local_osm_changes_backup">Crear unha copia de seguranza como cambio de OSM</string>
@ -1215,7 +1214,7 @@
<string name="vector_data">Mapas vectoriais sen conexión</string> <string name="vector_data">Mapas vectoriais sen conexión</string>
<string name="transport_context_menu">Buscar transporte na paraxe</string> <string name="transport_context_menu">Buscar transporte na paraxe</string>
<string name="osb_bug_name">Fallo</string>
<string name="poi_context_menu_modify">Modificar o PDI</string> <string name="poi_context_menu_modify">Modificar o PDI</string>
<string name="poi_context_menu_delete">Eliminar o POI</string> <string name="poi_context_menu_delete">Eliminar o POI</string>
<string name="rotate_map_compass_opt">Co compás</string> <string name="rotate_map_compass_opt">Co compás</string>
@ -1468,7 +1467,7 @@
<string name="search_tabs_location">Situación</string> <string name="search_tabs_location">Situación</string>
<string name="context_menu_item_update_map">Actualizar o mapa</string> <string name="context_menu_item_update_map">Actualizar o mapa</string>
<string name="context_menu_item_open_bug">Abrir un informe de fallos de OSM</string>
<string name="context_menu_item_create_poi">Crear un PDI</string> <string name="context_menu_item_create_poi">Crear un PDI</string>
<string name="shared_string_yes">Si</string> <string name="shared_string_yes">Si</string>
<string name="shared_string_cancel">Cancelar</string> <string name="shared_string_cancel">Cancelar</string>
@ -1482,22 +1481,22 @@
<string name="favourites_context_menu_delete">Eliminar o favorito</string> <string name="favourites_context_menu_delete">Eliminar o favorito</string>
<string name="favourites_remove_dialog_msg">Retirar o punto favorito «%s»?</string> <string name="favourites_remove_dialog_msg">Retirar o punto favorito «%s»?</string>
<string name="favourites_remove_dialog_success">O punto favorito {0} foi eliminado correctamente.</string> <string name="favourites_remove_dialog_success">O punto favorito {0} foi eliminado correctamente.</string>
<string name="osb_add_dialog_title">Introduza o texto do informe de fallo</string>
<string name="osb_add_dialog_success">O informe de fallo foi creado correctamente</string>
<string name="osb_add_dialog_error">Produciuse unha excepción: o fallo non foi creado</string>
<string name="osb_author_dialog_password">Contrasinal de OSM (opcional)</string> <string name="osb_author_dialog_password">Contrasinal de OSM (opcional)</string>
<string name="osb_comment_menu_item">Engadir un comentario</string>
<string name="osb_comment_dialog_message">Mensaxe</string> <string name="osb_comment_dialog_message">Mensaxe</string>
<string name="osb_comment_dialog_author">Nome do autor</string> <string name="osb_comment_dialog_author">Nome do autor</string>
<string name="osb_comment_dialog_title">Engadir un comentario ao informe de fallo</string>
<string name="osb_comment_dialog_add_button">Engadir un comentario</string>
<string name="osb_comment_dialog_success">O comentario foi engadido correctamente</string> <string name="osb_comment_dialog_success">O comentario foi engadido correctamente</string>
<string name="osb_comment_dialog_error">Produciuse unha excecpción: o comentario non foi engadido</string> <string name="osb_comment_dialog_error">Produciuse unha excecpción: o comentario non foi engadido</string>
<string name="osb_close_menu_item">Fechar o informe de fallo</string>
<string name="osb_close_dialog_title">A fechar o informe de fallo</string>
<string name="osb_close_dialog_close_button">Fechar o informe de fallo</string>
<string name="osb_close_dialog_success">O informe de fallo foi fechado correctamente</string>
<string name="osb_close_dialog_error">Produciuse unha excepcións: o informe de fallo non foi fechado</string>
<string name="poi_edit_title">Editar o PDI</string> <string name="poi_edit_title">Editar o PDI</string>
<string name="poi_create_title">Crear un PDI</string> <string name="poi_create_title">Crear un PDI</string>
<string name="poi_error_poi_not_found">Non é posíbel atopar o nodo ou esta instalación non é un nodo único</string> <string name="poi_error_poi_not_found">Non é posíbel atopar o nodo ou esta instalación non é un nodo único</string>
@ -1873,7 +1872,7 @@
<string name="shared_string_update">Actualizar</string> <string name="shared_string_update">Actualizar</string>
<string name="shared_string_upload">Enviar</string> <string name="shared_string_upload">Enviar</string>
<string name="osm_edit_created_poi">Crear un PDI de OSM</string> <string name="osm_edit_created_poi">Crear un PDI de OSM</string>
<string name="osm_edit_created_bug">Creouse un fallo de OSM</string>
<string name="shared_string_qr_code">Código QR</string> <string name="shared_string_qr_code">Código QR</string>
<string name="map_downloaded">Mapa descargado</string> <string name="map_downloaded">Mapa descargado</string>
<string name="map_downloaded_descr">Descargouse o mapa de %1$s. Volva ao mapa para comezalo a usar.</string> <string name="map_downloaded_descr">Descargouse o mapa de %1$s. Volva ao mapa para comezalo a usar.</string>

28
OsmAnd/res/values-he/strings.xml
View file

@ -643,7 +643,7 @@
<string name="vector_data">מפות וקטוריות בלתי מקוונות</string> <string name="vector_data">מפות וקטוריות בלתי מקוונות</string>
<string name="transport_context_menu">חיפוש תחבורה בתחנה</string> <string name="transport_context_menu">חיפוש תחבורה בתחנה</string>
<string name="osb_bug_name">תקלה</string>
<string name="poi_context_menu_modify">שינוי נ״ע</string> <string name="poi_context_menu_modify">שינוי נ״ע</string>
<string name="poi_context_menu_delete">מחיקת נ״ע</string> <string name="poi_context_menu_delete">מחיקת נ״ע</string>
<string name="rotate_map_compass_opt">למצפן</string> <string name="rotate_map_compass_opt">למצפן</string>
@ -905,7 +905,7 @@
<string name="search_tabs_location">מיקום</string> <string name="search_tabs_location">מיקום</string>
<string name="context_menu_item_update_map">עדכון המפה</string> <string name="context_menu_item_update_map">עדכון המפה</string>
<string name="context_menu_item_open_bug">פתיחת תקלה ב־OSM</string>
<string name="context_menu_item_create_poi">יצירת נ״ע</string> <string name="context_menu_item_create_poi">יצירת נ״ע</string>
<string name="shared_string_cancel">ביטול</string> <string name="shared_string_cancel">ביטול</string>
<string name="shared_string_apply">החלה</string> <string name="shared_string_apply">החלה</string>
@ -917,21 +917,21 @@
<string name="favourites_context_menu_delete">מחיקת המועדף</string> <string name="favourites_context_menu_delete">מחיקת המועדף</string>
<string name="favourites_remove_dialog_msg">האם להסיר את הנקודה המועדפת ‚%s‘?</string> <string name="favourites_remove_dialog_msg">האם להסיר את הנקודה המועדפת ‚%s‘?</string>
<string name="favourites_remove_dialog_success">הנקודה המועדפת {0} הוסרה בהצלחה.</string> <string name="favourites_remove_dialog_success">הנקודה המועדפת {0} הוסרה בהצלחה.</string>
<string name="osb_add_dialog_title">נא להזין טקסט לדיווח התקלה</string>
<string name="osb_add_dialog_success">דיווח התקלה נוצר בהצלחה</string>
<string name="osb_add_dialog_error">אירעה חריגה: לא נוצר דיווח תקלה</string>
<string name="osb_comment_menu_item">הוספת הערה</string>
<string name="osb_comment_dialog_message">הודעה</string> <string name="osb_comment_dialog_message">הודעה</string>
<string name="osb_comment_dialog_author">שם היוצר</string> <string name="osb_comment_dialog_author">שם היוצר</string>
<string name="osb_comment_dialog_title">הוספת הערה לדיווח תקלה</string>
<string name="osb_comment_dialog_add_button">הוספת הערה</string>
<string name="osb_comment_dialog_success">ההערה נוספה בהצלחה</string> <string name="osb_comment_dialog_success">ההערה נוספה בהצלחה</string>
<string name="osb_comment_dialog_error">אירעה חריגה: לא נוספה הערה</string> <string name="osb_comment_dialog_error">אירעה חריגה: לא נוספה הערה</string>
<string name="osb_close_menu_item">סגירת דיווח תקלה</string>
<string name="osb_close_dialog_title">סגירת דיווח תקלה</string>
<string name="osb_close_dialog_close_button">סגירת דיווח תקלה</string>
<string name="osb_close_dialog_success">דיווח התקלה נסגר בהצלחה</string>
<string name="osb_close_dialog_error">אירעה חריגה: דיווח התקלה לא נסגר</string>
<string name="poi_edit_title">עריכת נ״ע</string> <string name="poi_edit_title">עריכת נ״ע</string>
<string name="poi_create_title">יצירת נ״ע</string> <string name="poi_create_title">יצירת נ״ע</string>
<string name="poi_error_poi_not_found">לא ניתן למצוא את המפרק או שנותן השירות מפוזר על פני מספר מפרקים</string> <string name="poi_error_poi_not_found">לא ניתן למצוא את המפרק או שנותן השירות מפוזר על פני מספר מפרקים</string>
@ -1127,7 +1127,7 @@
<string name="local_osm_changes_backup">גיבוי כשינוי ב־OSM</string> <string name="local_osm_changes_backup">גיבוי כשינוי ב־OSM</string>
<string name="search_street_in_neighborhood_cities">חיפוש רחוב בערים סמוכות</string> <string name="search_street_in_neighborhood_cities">חיפוש רחוב בערים סמוכות</string>
<string name="intermediate_items_sort_return">נקודות הביניים שבדרך סודרו מחדש באופן המיטבי בדרך אל היעד.</string> <string name="intermediate_items_sort_return">נקודות הביניים שבדרך סודרו מחדש באופן המיטבי בדרך אל היעד.</string>
<string name="intermediate_items_sort_by_distance">סידור (דלת לדלת)</string> <string name="intermediate_items_sort_by_distance">סידור דלת לדלת</string>
<string name="please_select_address">נא לבחור בעיר או ברחוב תחילה</string> <string name="please_select_address">נא לבחור בעיר או ברחוב תחילה</string>
<string name="context_menu_item_destination_point">הגדרה כיעד</string> <string name="context_menu_item_destination_point">הגדרה כיעד</string>

26
OsmAnd/res/values-hr/strings.xml
View file

@ -286,17 +286,17 @@
<string name="poi_action_succeded_template">Radnja {0} je uspješno završena.</string> <string name="poi_action_succeded_template">Radnja {0} je uspješno završena.</string>
<string name="poi_edit_title">Uredi POI</string> <string name="poi_edit_title">Uredi POI</string>
<string name="poi_create_title">Stvori POI</string> <string name="poi_create_title">Stvori POI</string>
<string name="osb_close_dialog_close_button">Zatvori bug</string>
<string name="osb_close_dialog_success">Bug je uspješno zatvoren</string>
<string name="osb_close_menu_item">Zatvori bug</string>
<string name="osb_close_dialog_title">Zatvaranje bug-a</string>
<string name="osb_comment_dialog_add_button">Dodaj komentar</string>
<string name="osb_comment_dialog_success">Komentar je uspješno dodan</string> <string name="osb_comment_dialog_success">Komentar je uspješno dodan</string>
<string name="osb_comment_dialog_error">Dogodila se greška: komentar nije dodan</string> <string name="osb_comment_dialog_error">Dogodila se greška: komentar nije dodan</string>
<string name="osb_comment_dialog_author">Ime autora</string> <string name="osb_comment_dialog_author">Ime autora</string>
<string name="osb_comment_dialog_title">Dodaj komentar na bug</string>
<string name="osb_comment_dialog_message">Poruka</string> <string name="osb_comment_dialog_message">Poruka</string>
<string name="osb_comment_menu_item">Dodaj komentar</string>
<string name="favourites_context_menu_edit">Uredi favorite</string> <string name="favourites_context_menu_edit">Uredi favorite</string>
<string name="favourites_context_menu_delete">Brisanje favorita</string> <string name="favourites_context_menu_delete">Brisanje favorita</string>
<string name="shared_string_cancel">Zatvori</string> <string name="shared_string_cancel">Zatvori</string>
@ -641,15 +641,15 @@
<string name="app_description">Navigacijska aplikacija</string> <string name="app_description">Navigacijska aplikacija</string>
<string name="search_POI_level_btn">Više rezultata</string> <string name="search_POI_level_btn">Više rezultata</string>
<string name="poi_remove_confirm_template">Izbriši {0} (unesite komentar)?</string> <string name="poi_remove_confirm_template">Izbriši {0} (unesite komentar)?</string>
<string name="osb_close_dialog_error">Došlo je do pogreške: bug nije zatvoren</string>
<string name="favourites_remove_dialog_msg">Ukloniti \'%s\' točku favorita?</string> <string name="favourites_remove_dialog_msg">Ukloniti \'%s\' točku favorita?</string>
<string name="favourites_remove_dialog_success">Točka favorita {0} je uspješno izbrisana.</string> <string name="favourites_remove_dialog_success">Točka favorita {0} je uspješno izbrisana.</string>
<string name="osb_add_dialog_title">Unesite tekst bug-a</string>
<string name="osb_add_dialog_success">Bug je uspješno stvoren</string>
<string name="osb_add_dialog_error">Dogodila se greška: bug nije stvoren</string>
<string name="add_favorite_dialog_default_favourite_name">Favorit</string> <string name="add_favorite_dialog_default_favourite_name">Favorit</string>
<string name="add_favorite_dialog_favourite_added_template">Točka favorita \'\'{0}\'\' je uspješno dodana.</string> <string name="add_favorite_dialog_favourite_added_template">Točka favorita \'\'{0}\'\' je uspješno dodana.</string>
<string name="context_menu_item_open_bug">Prijavi OSM bug</string>
<string name="search_address_street_option">Križanje cesta</string> <string name="search_address_street_option">Križanje cesta</string>
<string name="navigate_point_top_text">Unesite širinu i dužinu u odabranom formatu (D - stupnjeva, M - minuta, S - sekundi)</string> <string name="navigate_point_top_text">Unesite širinu i dužinu u odabranom formatu (D - stupnjeva, M - minuta, S - sekundi)</string>
<string name="Closest_Amenities">Najbliže usluge</string> <string name="Closest_Amenities">Najbliže usluge</string>
@ -972,7 +972,7 @@
<string name="speak_street_names">Najavi imena ulica (TTS)</string> <string name="speak_street_names">Najavi imena ulica (TTS)</string>
<string name="osb_author_or_password_not_specified">Molimo vas da u postavkama navedete OSM korisničko ime i lozinku</string> <string name="osb_author_or_password_not_specified">Molimo vas da u postavkama navedete OSM korisničko ime i lozinku</string>
<string name="search_street_in_neighborhood_cities">Traži ulicu u susjedstvu</string> <string name="search_street_in_neighborhood_cities">Traži ulicu u susjedstvu</string>
<string name="intermediate_items_sort_by_distance">Poredaj (od vrata do vrata)</string> <string name="intermediate_items_sort_by_distance">Poredaj od vrata do vrata</string>
<string name="local_osm_changes_backup_successful">Datoteka OSM izmjena je uspješno generirana %1$s</string> <string name="local_osm_changes_backup_successful">Datoteka OSM izmjena je uspješno generirana %1$s</string>
<string name="local_osm_changes_backup_failed">Sigurnosna kopija OSM izmjena nije uspjela</string> <string name="local_osm_changes_backup_failed">Sigurnosna kopija OSM izmjena nije uspjela</string>
<string name="local_osm_changes_backup">Sigurnosna kopija kao OSM izmjena</string> <string name="local_osm_changes_backup">Sigurnosna kopija kao OSM izmjena</string>

212
OsmAnd/res/values-hu/phrases.xml
View file

@ -1020,4 +1020,216 @@
<string name="poi_access_delivery">Áruszállításra használható</string> <string name="poi_access_delivery">Áruszállításra használható</string>
<string name="poi_access_agricultural">Mezőgazdasági bemenet</string> <string name="poi_access_agricultural">Mezőgazdasági bemenet</string>
<string name="poi_content_silage">Tartalom: silótakarmány</string>
<string name="poi_content_water">Tartalom: víz</string>
<string name="poi_content_slurry">Tartalom: cementlé</string>
<string name="poi_content_oil">Tartalom: olaj</string>
<string name="poi_content_fuel">Tartalom: üzemanyag</string>
<string name="poi_content_manure">Tartalom: trágya</string>
<string name="poi_content_wine">Tartalom: bor</string>
<string name="poi_content_sewage">Tartalom: ürülék</string>
<string name="poi_content_gas">Tartalom: gáz</string>
<string name="poi_content_biomass">Tartalom: biomassza</string>
<string name="poi_content_wastewater">Tartalom: szennyvíz</string>
<string name="poi_content_crop">Tartalom: termény</string>
<string name="poi_content_fodder">Tartalom: takarmány</string>
<string name="poi_content_beer">Tartalom: sör</string>
<string name="poi_content_salt">Tartalom: só</string>
<string name="poi_content_grain">Tartalom: gabona</string>
<string name="poi_nudism_yes">Nudizmus: nem engedélyezett</string>
<string name="poi_nudism_no">Nudizmus: tiltott</string>
<string name="poi_nudism_obligatory">Nudizmus: kötelező</string>
<string name="poi_nudism_customary">Nudizmus: megszokott</string>
<string name="poi_nudism_permissive">Nudizmus: engedélyköteles</string>
<string name="poi_trade_building_supplies">Építőanyag</string>
<string name="poi_trade_plumbing">Vízvezeték szerelési anyagok</string>
<string name="poi_trade_wood">Faanyag</string>
<string name="poi_trade_agricultural_supplies">Mezőgazdasági anyagok</string>
<string name="poi_trade_tile">Burkolóanyagok</string>
<string name="poi_population">Lakosság</string>
<string name="poi_parking_underground">Földalatti</string>
<string name="poi_parking_multi_storey">Többszintes</string>
<string name="poi_bicycle_parking_anchors">Horgony</string>
<string name="poi_bicycle_parking_stands">Korlát</string>
<string name="poi_bicycle_parking_wall_loops">Kerékbefogó hurok</string>
<string name="poi_bicycle_parking_rack">Keret</string>
<string name="poi_bicycle_parking_building">Speciális épület</string>
<string name="poi_bicycle_parking_shed">Fészer</string>
<string name="poi_bicycle_parking_bollard">Oszlop</string>
<string name="poi_bicycle_parking_informal">Nem hivatalos</string>
<string name="poi_leaf_type_broadleaved">Lombos</string>
<string name="poi_leaf_type_needleleaved">Tűlevelű</string>
<string name="poi_leaf_type_mixed">Vegyes</string>
<string name="poi_leaf_type_leafless">Levéltelen</string>
<string name="poi_species">Fajok</string>
<string name="poi_genus">Nemzetség</string>
<string name="poi_taxon">Taxon</string>
<string name="poi_trees_olive">Oliva</string>
<string name="poi_trees_apple">Alma</string>
<string name="poi_trees_oil">Olajpálma</string>
<string name="poi_trees_orange">Narancs</string>
<string name="poi_trees_almond">Mandula</string>
<string name="poi_trees_banana">Banán</string>
<string name="poi_trees_hazel">Mogyoró</string>
<string name="poi_trees_coconut">Kókusz</string>
<string name="poi_trees_persimmon">Datolyaszilva</string>
<string name="poi_trees_cherry">Cseresznye</string>
<string name="poi_trees_walnut">Dió</string>
<string name="poi_trees_plum">Szilva</string>
<string name="poi_trees_peach">Barack</string>
<string name="poi_trees_tea">Tea</string>
<string name="poi_trees_coca">Kokacserje</string>
<string name="poi_trees_kiwi">Kivi</string>
<string name="poi_trees_nectorine">Nektarin</string>
<string name="poi_trees_mango">Mangó</string>
<string name="poi_trees_rubber">Gumi</string>
<string name="poi_trees_meadow_orchard">Gyümölcsös</string>
<string name="poi_trees_date">Datolyapálma</string>
<string name="poi_trees_coffea">Kávé</string>
<string name="poi_trees_pomegranate">Gránátalma</string>
<string name="poi_urban">Városi</string>
<string name="poi_rural">Vidéki</string>
<string name="poi_int_name">Nemzetközi név</string>
<string name="poi_nat_name">Nemzeti név</string>
<string name="poi_reg_name">Regionális név</string>
<string name="poi_loc_name">Helyi név</string>
<string name="poi_old_name">Korábbi név</string>
<string name="poi_alt_name">Alternatív név</string>
<string name="poi_cuisine">Konyha</string>
<string name="poi_smoking_no">Nemdohányzó</string>
<string name="poi_capacity">Kapacitás</string>
<string name="poi_enforcement_traffic_signals">Forgalomellenőrzés: jelzőlámpa</string>
<string name="poi_enforcement_maxspeed">Forgalomellenőrzés: sebességkorlát</string>
<string name="poi_enforcement_maxheight">Forgalomellenőrzés: megengedett magasság</string>
<string name="poi_enforcement_mindistance">Forgalomellenőrzés: követési távolság</string>
<string name="poi_enforcement_check">Forgalomellenőrzés: ellenőrzőhely</string>
<string name="poi_enforcement_access">Forgalomellenőrzés: behajtás</string>
<string name="poi_enforcement_toll">Forgalomellenőrzés: útdíj</string>
<string name="poi_animal_shelter">Állatmenhely</string>
<string name="poi_animal_shelter_dog">Menhelytípus: kutya</string>
<string name="poi_animal_shelter_cat">Menhelytípus: macska</string>
<string name="poi_animal_shelter_dog_cat">Menhelytípus: kutya, macska</string>
<string name="poi_animal_shelter_bird">Menhelytípus: madár</string>
<string name="poi_seats">Helyek</string>
<string name="poi_backrest_yes">Háttámla: van</string>
<string name="poi_backrest_no">Háttámla: nincs</string>
<string name="poi_intermittent">Időszakos</string>
<string name="poi_building">Épület</string>
<string name="poi_generator_source_coal">Energiaforrás: szén</string>
<string name="poi_generator_source_gas">Energiaforrás: gáz</string>
<string name="poi_generator_source_nuclear">Energiaforrás: nukleáris</string>
<string name="poi_generator_source_solar">Energiaforrás: nap</string>
<string name="poi_generator_source_hydro">Energiaforrás: víz</string>
<string name="poi_generator_source_wind">Energiaforrás: szél</string>
<string name="poi_generator_source_geothermal">Energiaforrás: geotermikus</string>
<string name="poi_generator_source_oil">Energiaforrás: olaj</string>
<string name="poi_generator_source_diesel">Energiaforrás: dízel</string>
<string name="poi_pump_manual">Kézipumpa</string>
<string name="poi_pump_powered">Szivattyú</string>
<string name="poi_pump_no">Pumpa nélkül</string>
<string name="poi_pump">Pumpa</string>
<string name="poi_water_characteristic_mineral">Víz jelleg: ásványvíz</string>
<string name="poi_water_characteristic_mud">Víz jelleg: iszapos</string>
<string name="poi_water_characteristic_sulfuric">Víz jelleg: kénes</string>
<string name="poi_water_point">Vízvevőhely</string>
<string name="poi_information_guidepost">Útirányjelző tábla</string>
<string name="poi_information_board">Információs tábla</string>
<string name="poi_information_map">Térkép</string>
<string name="poi_information_office">Információs iroda</string>
<string name="poi_information_trail_blaze">Turistajelzés</string>
<string name="poi_information_terminal">Információs terminál</string>
<string name="poi_information_route_marker">Útjelzés</string>
<string name="poi_information_hikingmap">Turistatérkép</string>
<string name="poi_information_nature">Információ: természet</string>
<string name="poi_information_wildlife">Információ: vadvilág</string>
<string name="poi_information_history">Információ: történelem</string>
<string name="poi_information_sign">Jelzés</string>
<string name="poi_information_audioguide">Audioguide</string>
<string name="poi_information_bicyclemap">Kerékpártérkép</string>
<string name="poi_board_type_plants">Információ: növények</string>
<string name="poi_board_type_geology">Információ: földrajz</string>
<string name="poi_board_type_public_transport">Információ: tömegközlekedés</string>
<string name="poi_board_type_technology">Információ: technológia</string>
<string name="poi_board_type_astronomy">Információ: csillagászat</string>
<string name="poi_information_tactile_model">Tapintható model</string>
<string name="poi_information_tactile_map">Tapintható térkép</string>
<string name="poi_board_type_notice">Értesítő tábla</string>
<string name="poi_commercial">Üzleti terület</string>
<string name="poi_retail">Kiskereskedelmi terület</string>
<string name="poi_fireplace_yes">Tűzrakóhely</string>
<string name="poi_fireplace_no">Nincs tűzrakóhely</string>
<string name="poi_covered_yes">Fedett</string>
<string name="poi_covered_no">Fedetlen</string>
<string name="poi_smoking_outside">Dohányzás csak kültéren</string>
<string name="poi_smoking_yes">Dohányzás engedélyezett</string>
<string name="poi_smoking_separated">Dohányzás leválasztott szobában engedélyezet</string>
<string name="poi_smoking_isolated">Dohányzás elkülönített szobában engedélyezet</string>
<string name="poi_smoking_dedicated">Dohányzásra kijelölt</string>
<string name="poi_toll_yes">Fizetős</string>
<string name="poi_toll_no">Nem fizetős</string>
<string name="poi_toll_hgv_yes">Tehergépjárműnek fizetős</string>
<string name="poi_tactile_paving_yes">Van vakvezető sáv</string>
<string name="poi_tactile_paving_no">Nincs vakvezető sáv</string>
<string name="poi_traffic_signals_sound_yes">Van hangjelzés</string>
<string name="poi_traffic_signals_sound_no">Nincs hangjelzés</string>
<string name="poi_traffic_signals_sound_walk">Hangjelzés, amikor lehet menni</string>
<string name="poi_services">Pihenőhely</string>
<string name="poi_mini_roundabout">Mini körforgalom</string>
<string name="poi_railway_crossing">Vasúti kereszteződés</string>
<string name="poi_railway_level_crossing">Vasúti gyalogátjáró</string>
<string name="poi_bird_hide">Madármegfigyelő hely</string>
<string name="poi_horse_riding">Lovaglás</string>
<string name="poi_houseware">Háztartási bolt</string>
<string name="poi_occupational_therapist">Foglalkozás-terapeuta</string>
<string name="poi_racquet">Raketball</string>
<string name="poi_artist_name">Művész</string>
<string name="poi_sculptor">Szobrász</string>
<string name="poi_building_type_church">Épülettípus: templom</string>
<string name="poi_building_type_chapel">Épülettípus: kápolna</string>
<string name="poi_building_type_mosque">Épülettípus: mecset</string>
<string name="poi_building_type_temple">Épülettípus: templom</string>
<string name="poi_building_type_cathedral">Épülettípus: katedrális</string>
<string name="poi_building_type_monastery">Épülettípus: kolostor</string>
<string name="poi_building_type_basilica">Épülettípus: bazilika</string>
<string name="poi_building_type_synagogue">Épülettípus: zsinagóga</string>
<string name="poi_building_type_shrine">Épülettípus: kegyhely</string>
<string name="poi_cross">Kereszt</string>
<string name="poi_summit_cross">Csúcskereszt: van</string>
<string name="poi_temperature">Hőfok</string>
<string name="poi_bathing_yes">Fürdő: van</string>
<string name="poi_bathing_no">Fürdő: nincs</string>
<string name="poi_cargo_passengers">Rakomány: utas</string>
<string name="poi_cargo_vehicle">Rakomány: jármű</string>
<string name="poi_cargo_bicycle">Rakomány: kerékpár</string>
<string name="poi_cargo_container">Rakomány: konténer</string>
<string name="poi_cargo_hgv">Rakomány: tehergépjármű</string>
</resources> </resources>

60
OsmAnd/res/values-hu/strings.xml
View file

@ -421,7 +421,7 @@
<string name="vector_data">Vektoros OSM térkép</string> <string name="vector_data">Vektoros OSM térkép</string>
<string name="transport_context_menu">Közlekedés keresése a célnál</string> <string name="transport_context_menu">Közlekedés keresése a célnál</string>
<string name="osb_bug_name">Hiba</string>
<string name="poi_context_menu_modify">POI módosítás</string> <string name="poi_context_menu_modify">POI módosítás</string>
<string name="poi_context_menu_delete">POI törlés</string> <string name="poi_context_menu_delete">POI törlés</string>
<string name="rotate_map_compass_opt">Iránytű alapján</string> <string name="rotate_map_compass_opt">Iránytű alapján</string>
@ -686,7 +686,7 @@
<string name="search_tabs_location">Koordináta</string> <string name="search_tabs_location">Koordináta</string>
<string name="context_menu_item_update_map">Térkép frissítése</string> <string name="context_menu_item_update_map">Térkép frissítése</string>
<string name="context_menu_item_open_bug">OSM Bug nyitása</string>
<string name="context_menu_item_create_poi">POI készítés</string> <string name="context_menu_item_create_poi">POI készítés</string>
<string name="shared_string_yes">Igen</string> <string name="shared_string_yes">Igen</string>
<string name="shared_string_cancel">Mégsem</string> <string name="shared_string_cancel">Mégsem</string>
@ -700,21 +700,21 @@
<string name="favourites_context_menu_delete">Kedvenc törlése</string> <string name="favourites_context_menu_delete">Kedvenc törlése</string>
<string name="favourites_remove_dialog_msg">Törlöd a(z) \'%s\' kedvenc pontot?</string> <string name="favourites_remove_dialog_msg">Törlöd a(z) \'%s\' kedvenc pontot?</string>
<string name="favourites_remove_dialog_success">{0} kedvenc pont sikeresen törölve.</string> <string name="favourites_remove_dialog_success">{0} kedvenc pont sikeresen törölve.</string>
<string name="osb_add_dialog_title">Hiba leírása</string>
<string name="osb_add_dialog_success">Sikeresen elkészített hibajelentés</string>
<string name="osb_add_dialog_error">Hiba történt a hibajelentés elkészítésénél</string>
<string name="osb_comment_menu_item">Megjegyzés hozzáfűzése</string>
<string name="osb_comment_dialog_message">Üzenet</string> <string name="osb_comment_dialog_message">Üzenet</string>
<string name="osb_comment_dialog_author">Bejelentő neve</string> <string name="osb_comment_dialog_author">Bejelentő neve</string>
<string name="osb_comment_dialog_title">Megjegyzés hozzáadása a hibához</string>
<string name="osb_comment_dialog_add_button">Megjegyzés hozzáadása</string>
<string name="osb_comment_dialog_success">Megjegyzés sikeresen hozzáadva</string> <string name="osb_comment_dialog_success">Megjegyzés sikeresen hozzáadva</string>
<string name="osb_comment_dialog_error">Hiba történt a megjegyzés hozzáadásánál</string> <string name="osb_comment_dialog_error">Hiba történt a megjegyzés hozzáadásánál</string>
<string name="osb_close_menu_item">Hiba lezárás</string>
<string name="osb_close_dialog_title">Hiba lezárása</string>
<string name="osb_close_dialog_close_button">Hiba lezárás</string>
<string name="osb_close_dialog_success">Hiba sikeresen lezárva</string>
<string name="osb_close_dialog_error">Hiba történt a hibajegy lezárásakor</string>
<string name="poi_edit_title">POI szerkesztése</string> <string name="poi_edit_title">POI szerkesztése</string>
<string name="poi_create_title">POI létrehozása</string> <string name="poi_create_title">POI létrehozása</string>
<string name="poi_error_poi_not_found">A pont nem található, vagy a POI nem egy önálló pont</string> <string name="poi_error_poi_not_found">A pont nem található, vagy a POI nem egy önálló pont</string>
@ -1107,7 +1107,7 @@
<string name="delete_point">Pont törlése</string> <string name="delete_point">Pont törlése</string>
<string name="intermediate_items_sort_return">Célpontok optimális sorrendbe rendezése a pillanatnyi pozíciódtól a célpont felé.</string> <string name="intermediate_items_sort_return">Célpontok optimális sorrendbe rendezése a pillanatnyi pozíciódtól a célpont felé.</string>
<string name="intermediate_items_sort_by_distance">Rendezés (háztól-házig)</string> <string name="intermediate_items_sort_by_distance">Rendezés háztól-házig</string>
<string name="osb_author_or_password_not_specified">Kérlek adj meg OSM felhasználónevet és jelszót a Beállításokban</string> <string name="osb_author_or_password_not_specified">Kérlek adj meg OSM felhasználónevet és jelszót a Beállításokban</string>
<string name="clear_intermediate_points">Köztes pontok törlése</string> <string name="clear_intermediate_points">Köztes pontok törlése</string>
@ -1990,7 +1990,7 @@
<string name="shared_string_update">Frissítés</string> <string name="shared_string_update">Frissítés</string>
<string name="shared_string_upload">Feltöltés</string> <string name="shared_string_upload">Feltöltés</string>
<string name="osm_edit_created_poi">Létrehozott OSM POI</string> <string name="osm_edit_created_poi">Létrehozott OSM POI</string>
<string name="osm_edit_created_bug">Létrehozott OSM bug</string>
<string name="map_legend">Térkép jelkulcs</string> <string name="map_legend">Térkép jelkulcs</string>
<string name="favourites_edit_dialog_title">Kedvenc információk</string> <string name="favourites_edit_dialog_title">Kedvenc információk</string>
<string name="share_osm_edits_subject">OSM szerkesztés OsmAndból megosztva</string> <string name="share_osm_edits_subject">OSM szerkesztés OsmAndból megosztva</string>
@ -1998,4 +1998,34 @@
<string name="lang_mk">Macedón</string> <string name="lang_mk">Macedón</string>
<string name="lang_fy">Fríz</string> <string name="lang_fy">Fríz</string>
<string name="lang_als">Albán (toszk)</string> <string name="lang_als">Albán (toszk)</string>
<string name="osm_save_offline">Mentés offline</string>
<string name="osm_edit_modified_poi">Módosított OSM POI</string>
<string name="osm_edit_deleted_poi">Törölt OSM POI</string>
<string name="context_menu_item_open_note">OSM Jegyzet nyitása</string>
<string name="osm_edit_reopened_note">Újranyitott OSM Jegyzet</string>
<string name="osm_edit_commented_note">Kommentált OSM Jegyzet</string>
<string name="osm_edit_removed_note">Törölt OSM Jegyzet</string>
<string name="osm_edit_created_note">Létrehozott OSM Jegyzet</string>
<string name="osn_bug_name">OSM Jegyzet</string>
<string name="osn_add_dialog_title">Jegyzet létrehozása</string>
<string name="osn_comment_dialog_title">Megjegyzés hozzáfűzése</string>
<string name="osn_reopen_dialog_title">Jegyzet újranyitása</string>
<string name="osn_close_dialog_title">Jegyzet lezárása</string>
<string name="osn_add_dialog_success">Jegyzet sikeresen létre lett hozva</string>
<string name="osn_add_dialog_error">Kivétel történt: a jegyzet nem lett létrehozva</string>
<string name="osn_close_dialog_success">Jegyzet sikeresen le lett zárva</string>
<string name="osn_close_dialog_error">Kivétel történt: a jegyzet nem lett lezárva</string>
<string name="shared_string_commit">Beküldés</string>
<string name="context_menu_item_delete_waypoint">Törlöd a GPX útpontot?</string>
<string name="context_menu_item_edit_waypoint">GPX útpont szerkesztése</string>
<string name="shared_string_location">Cím</string>
<string name="rendering_attr_currentTrackColor_description">GPX szín</string>
<string name="rendering_attr_currentTrackWidth_description">GPX vastagság</string>
<string name="rendering_attr_roadStyle_description">Útstílus</string>
<string name="poi_dialog_reopen">Újranyitás</string>
<string name="save_poi_without_poi_type_message">Biztosan elmented a POI-t típus nélkül?</string>
<string name="poi_context_menu_modify_osm_change">OSM szerkesztés módosítása</string>
<string name="release_2_2">" • Új környezetérzékeny felhasználói felület térképre tapintáskor\n\n • Az alkalmazás már közvetlenül a térkép képernyővel indul a Műszerfal helyett\n\n • A Műszerfal kártyái elrejthetőek, testre szabhatóak\n\n • Térkép letöltéséhez elég a világtérkép régióira tapintani\n\n • A POI kereső már sokkal speciálisabb kérdéseket is megért\n\n • Továbbfejlesztett OSM POI szerkesztés\n\n • A térképletöltő felület felépítése és kezelőfelülete át lett dolgozva\n\n és sok egyéb fejlesztés… "</string>
<string name="shared_string_card_was_hidden">Kártya el volt rejtve</string>
</resources> </resources>

44
OsmAnd/res/values-it/strings.xml
View file

@ -119,7 +119,7 @@
<string name="favorite_home_category">Casa</string> <string name="favorite_home_category">Casa</string>
<string name="favorite_friends_category">Amici</string> <string name="favorite_friends_category">Amici</string>
<string name="favorite_places_category">Luoghi</string> <string name="favorite_places_category">Luoghi</string>
<string name="shared_string_others">Altro</string> <string name="shared_string_others">Ancora</string>
<string name="shared_string_no_thanks">No, grazie</string> <string name="shared_string_no_thanks">No, grazie</string>
<string name="basemap_missing">La mappa di base del mondo (ricopre l\'intero mondo per zoom bassi) è mancante. Puoi scaricare World_basemap_x.obf per un sistema completo.</string> <string name="basemap_missing">La mappa di base del mondo (ricopre l\'intero mondo per zoom bassi) è mancante. Puoi scaricare World_basemap_x.obf per un sistema completo.</string>
<string name="vector_data_missing">Mancano i dati (\'offline\') nella scheda SD. Ti consigliamo di scaricarli per poter usare le mappe offline.</string> <string name="vector_data_missing">Mancano i dati (\'offline\') nella scheda SD. Ti consigliamo di scaricarli per poter usare le mappe offline.</string>
@ -211,7 +211,7 @@
<string name="yard">iarda</string> <string name="yard">iarda</string>
<string name="foot">piedi</string> <string name="foot">piedi</string>
<string name="mile_per_hour">mph</string> <string name="mile_per_hour">mph</string>
<string name="mile">miglio</string> <string name="mile">miglia</string>
<string name="send_location_way_choose_title">Condividi la posizione usando</string> <string name="send_location_way_choose_title">Condividi la posizione usando</string>
<string name="send_location_sms_pattern">Posizione: %1$s\n%2$s</string> <string name="send_location_sms_pattern">Posizione: %1$s\n%2$s</string>
<string name="send_location_email_pattern">Per vedere la posizione segui il collegamento web %1$s o il collegamento %2$s</string> <string name="send_location_email_pattern">Per vedere la posizione segui il collegamento web %1$s o il collegamento %2$s</string>
@ -324,7 +324,7 @@
<string name="vector_data">Mappe vettoriali offline</string> <string name="vector_data">Mappe vettoriali offline</string>
<string name="transport_context_menu">Cerca un trasporto pubblico alla fermata</string> <string name="transport_context_menu">Cerca un trasporto pubblico alla fermata</string>
<string name="osb_bug_name">Errore</string>
<string name="poi_context_menu_modify">Modifica PDI</string> <string name="poi_context_menu_modify">Modifica PDI</string>
<string name="poi_context_menu_delete">Elimina PDI</string> <string name="poi_context_menu_delete">Elimina PDI</string>
<string name="rotate_map_compass_opt">Con bussola</string> <string name="rotate_map_compass_opt">Con bussola</string>
@ -580,7 +580,7 @@
<string name="search_tabs_location">Posizione</string> <string name="search_tabs_location">Posizione</string>
<string name="context_menu_item_update_map">Aggiorna la mappa</string> <string name="context_menu_item_update_map">Aggiorna la mappa</string>
<string name="context_menu_item_open_bug">Segnala un errore OSM</string>
<string name="context_menu_item_create_poi">Crea PDI</string> <string name="context_menu_item_create_poi">Crea PDI</string>
<string name="add_favorite_dialog_top_text">Inserisci il nome del preferito</string> <string name="add_favorite_dialog_top_text">Inserisci il nome del preferito</string>
<string name="add_favorite_dialog_default_favourite_name">Preferito</string> <string name="add_favorite_dialog_default_favourite_name">Preferito</string>
@ -589,21 +589,21 @@
<string name="favourites_context_menu_delete">Elimina preferito</string> <string name="favourites_context_menu_delete">Elimina preferito</string>
<string name="favourites_remove_dialog_msg">Eliminare il punto preferito \'%s\'?</string> <string name="favourites_remove_dialog_msg">Eliminare il punto preferito \'%s\'?</string>
<string name="favourites_remove_dialog_success">Il punto preferito {0} è stato eliminato.</string> <string name="favourites_remove_dialog_success">Il punto preferito {0} è stato eliminato.</string>
<string name="osb_add_dialog_title">Inserisci la descrizione dell\'errore</string>
<string name="osb_add_dialog_success">L\'errore è stato creato</string>
<string name="osb_add_dialog_error">Si è verificata un\'eccezione: il bug non è stato creato</string>
<string name="osb_comment_menu_item">Aggiungere commento</string>
<string name="osb_comment_dialog_message">Messaggio</string> <string name="osb_comment_dialog_message">Messaggio</string>
<string name="osb_comment_dialog_author">Nome autore</string> <string name="osb_comment_dialog_author">Nome autore</string>
<string name="osb_comment_dialog_title">Aggiungi un commento all\'errore</string>
<string name="osb_comment_dialog_add_button">Aggiungi commento</string>
<string name="osb_comment_dialog_success">Il commento è stato aggiunto correttamente</string> <string name="osb_comment_dialog_success">Il commento è stato aggiunto correttamente</string>
<string name="osb_comment_dialog_error">Si è verificata un\'eccezione: il commento non è stato aggiunto</string> <string name="osb_comment_dialog_error">Si è verificata un\'eccezione: il commento non è stato aggiunto</string>
<string name="osb_close_menu_item">Chiudi errore</string>
<string name="osb_close_dialog_title">Chiusura errore</string>
<string name="osb_close_dialog_close_button">Chiudi errore</string>
<string name="osb_close_dialog_success">L\'errore è stato chiuso correttamente</string>
<string name="osb_close_dialog_error">Si è verificata un\'eccezione: l\'errore non è stato chiuso</string>
<string name="poi_edit_title">Modifica PDI</string> <string name="poi_edit_title">Modifica PDI</string>
<string name="poi_create_title">Crea PDI</string> <string name="poi_create_title">Crea PDI</string>
<string name="poi_error_poi_not_found">Il nodo non è stato trovato o l\'amenità non è un nodo singolo</string> <string name="poi_error_poi_not_found">Il nodo non è stato trovato o l\'amenità non è un nodo singolo</string>
@ -1103,7 +1103,7 @@
<string name="search_street_in_neighborhood_cities">Cerca la strada nelle località vicine</string> <string name="search_street_in_neighborhood_cities">Cerca la strada nelle località vicine</string>
<string name="intermediate_items_sort_return">Punti intermedi riordinati in modo da ottimizzare il percorso dalla posizione attuale verso la destinazione.</string> <string name="intermediate_items_sort_return">Punti intermedi riordinati in modo da ottimizzare il percorso dalla posizione attuale verso la destinazione.</string>
<string name="intermediate_items_sort_by_distance">Ordina (porta a porta)</string> <string name="intermediate_items_sort_by_distance">Ordina porta a porta</string>
<string name="please_select_address">Scegli prima la città o la strada</string> <string name="please_select_address">Scegli prima la città o la strada</string>
<string name="context_menu_item_destination_point">Imposta come destinazione</string> <string name="context_menu_item_destination_point">Imposta come destinazione</string>
<string name="destination_point">Destinazione %1$s</string> <string name="destination_point">Destinazione %1$s</string>
@ -2002,7 +2002,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="application_dir_description">Scegli dove vuoi salvare i file delle mappe.</string> <string name="application_dir_description">Scegli dove vuoi salvare i file delle mappe.</string>
<string name="osm_edit_created_poi">POI OSM creato</string> <string name="osm_edit_created_poi">POI OSM creato</string>
<string name="osm_edit_created_bug">Errore OSM creato</string>
<string name="shared_string_qr_code">QR-code</string> <string name="shared_string_qr_code">QR-code</string>
<string name="map_downloaded">Mappa scaricata</string> <string name="map_downloaded">Mappa scaricata</string>
<string name="map_downloaded_descr">Mappa di %1$s scaricata. Torna alla mappa per iniziare a utilizzarla.</string> <string name="map_downloaded_descr">Mappa di %1$s scaricata. Torna alla mappa per iniziare a utilizzarla.</string>
@ -2040,6 +2040,14 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="rendering_attr_hideProposed_name">Nascondi gli oggetti proposti</string> <string name="rendering_attr_hideProposed_name">Nascondi gli oggetti proposti</string>
<string name="read_more">Leggi di più</string> <string name="read_more">Altro</string>
<string name="whats_new">Novità nella versione</string> <string name="whats_new">Novità nella versione</string>
<string name="share_osm_edits_subject">Modifiche Osm condivise tramite OsmAnd</string>
<string name="lang_nds">Bassa Germania</string>
<string name="lang_mk">Macedone</string>
<string name="save_poi_without_poi_type_message">Vuoi davvero salvare il PDI senza specificarne il tipo?</string>
<string name="context_menu_item_delete_waypoint">Cancellare il waypoint del GPX?</string>
<string name="context_menu_item_edit_waypoint">Modifica i waypoint del GPX</string>
<string name="shared_string_location">Localizzazione</string>
<string name="poi_context_menu_modify_osm_change">Modifica gli edit OSM</string>
</resources> </resources>

28
OsmAnd/res/values-ja/strings.xml
View file

@ -244,7 +244,7 @@ MB)をダウンロードしますか?</string>
<string name="vector_data">オフラインベクターマップ</string> <string name="vector_data">オフラインベクターマップ</string>
<string name="transport_context_menu">交通機関の乗降場を検索</string> <string name="transport_context_menu">交通機関の乗降場を検索</string>
<string name="osb_bug_name">バグ</string>
<string name="poi_context_menu_modify">POIを変更</string> <string name="poi_context_menu_modify">POIを変更</string>
<string name="poi_context_menu_delete">POIを削除</string> <string name="poi_context_menu_delete">POIを削除</string>
<string name="rotate_map_compass_opt">コンパスに従う</string> <string name="rotate_map_compass_opt">コンパスに従う</string>
@ -545,7 +545,7 @@ POIの更新は利用できません</string>
<string name="search_tabs_location">位置</string> <string name="search_tabs_location">位置</string>
<string name="context_menu_item_update_map">マップを更新</string> <string name="context_menu_item_update_map">マップを更新</string>
<string name="context_menu_item_open_bug">OSM バグをオープン</string>
<string name="context_menu_item_create_poi">POIを作成</string> <string name="context_menu_item_create_poi">POIを作成</string>
<string name="shared_string_yes">はい</string> <string name="shared_string_yes">はい</string>
@ -565,23 +565,23 @@ POIの更新は利用できません</string>
<string name="favourites_remove_dialog_success">お気に入り地点 {0} <string name="favourites_remove_dialog_success">お気に入り地点 {0}
は削除されました。</string> は削除されました。</string>
<string name="osb_add_dialog_title">バグのテキストを入力</string>
<string name="osb_add_dialog_success">バグ報告が作成されました</string>
<string name="osb_add_dialog_error">例外発生: バグ報告は作成されませんでした</string>
<string name="osb_comment_menu_item">コメントを追加</string>
<string name="osb_comment_dialog_message">メッセージ</string> <string name="osb_comment_dialog_message">メッセージ</string>
<string name="osb_comment_dialog_author">作成者名</string> <string name="osb_comment_dialog_author">作成者名</string>
<string name="osb_comment_dialog_title">バグにコメント追加中</string>
<string name="osb_comment_dialog_add_button">コメントを追加</string>
<string name="osb_comment_dialog_success">コメントが追加されました</string> <string name="osb_comment_dialog_success">コメントが追加されました</string>
<string name="osb_comment_dialog_error">例外発生: コメントは追加されませんでした</string> <string name="osb_comment_dialog_error">例外発生: コメントは追加されませんでした</string>
<string name="osb_close_menu_item">バグをクローズ</string>
<string name="osb_close_dialog_title">バグをクローズ中</string>
<string name="osb_close_dialog_close_button">バグをクローズ</string>
<string name="osb_close_dialog_success">バグがクローズされました</string>
<string name="osb_close_dialog_error">例外発生: バグはクローズされませんでした</string>
<string name="poi_edit_title">POIの編集</string> <string name="poi_edit_title">POIの編集</string>
<string name="poi_create_title">POIを作成</string> <string name="poi_create_title">POIを作成</string>
@ -680,7 +680,7 @@ POIの更新は利用できません</string>
<string name="please_select_address">最初に都市か通りを選択してください</string> <string name="please_select_address">最初に都市か通りを選択してください</string>
<string name="search_street_in_neighborhood_cities">近くの都市の通りを探す</string> <string name="search_street_in_neighborhood_cities">近くの都市の通りを探す</string>
<string name="intermediate_items_sort_return">中間経由地点は現在地から目的地へのルート最適化のために順序が変更されました。</string> <string name="intermediate_items_sort_return">中間経由地点は現在地から目的地へのルート最適化のために順序が変更されました。</string>
<string name="intermediate_items_sort_by_distance">ソート(ドア・ツー・ドア)</string> <string name="intermediate_items_sort_by_distance">ソートドア・ツー・ドア</string>
<string name="local_osm_changes_backup_successful">OSMの変更ファイルが正常に生成されました %1$s</string> <string name="local_osm_changes_backup_successful">OSMの変更ファイルが正常に生成されました %1$s</string>
<string name="local_osm_changes_backup_failed">OSMの変更のバックアップに失敗しました</string> <string name="local_osm_changes_backup_failed">OSMの変更のバックアップに失敗しました</string>
<string name="local_osm_changes_backup">OSMの変更としてバックアップ</string> <string name="local_osm_changes_backup">OSMの変更としてバックアップ</string>

26
OsmAnd/res/values-ka/strings.xml
View file

@ -477,7 +477,7 @@
<string name="vector_data">გათიშული ვექტორული რუკები</string> <string name="vector_data">გათიშული ვექტორული რუკები</string>
<string name="transport_context_menu">გაჩერებაზე ტრანსპორტის ძებნა</string> <string name="transport_context_menu">გაჩერებაზე ტრანსპორტის ძებნა</string>
<string name="osb_bug_name">ხოჭო</string>
<string name="poi_context_menu_modify">POI-ის ჩასწორება</string> <string name="poi_context_menu_modify">POI-ის ჩასწორება</string>
<string name="poi_context_menu_delete">POI-ს წაშლა</string> <string name="poi_context_menu_delete">POI-ს წაშლა</string>
<string name="rotate_map_compass_opt">კომპასისაკენ</string> <string name="rotate_map_compass_opt">კომპასისაკენ</string>
@ -746,7 +746,7 @@
<string name="search_tabs_location">მდებარეობა</string> <string name="search_tabs_location">მდებარეობა</string>
<string name="context_menu_item_update_map">რუკის განახლება</string> <string name="context_menu_item_update_map">რუკის განახლება</string>
<string name="context_menu_item_open_bug">OSM-ის შეცდომის რეპორტი</string>
<string name="context_menu_item_create_poi">POI-ის შექმნა</string> <string name="context_menu_item_create_poi">POI-ის შექმნა</string>
<string name="shared_string_yes">დიახ</string> <string name="shared_string_yes">დიახ</string>
<string name="shared_string_cancel">გაუქმება</string> <string name="shared_string_cancel">გაუქმება</string>
@ -760,21 +760,21 @@
<string name="favourites_context_menu_delete">რჩეულის წაშლა</string> <string name="favourites_context_menu_delete">რჩეულის წაშლა</string>
<string name="favourites_remove_dialog_msg">გნებავთ რჩეული წერტილის \'%s\' წაშლა?</string> <string name="favourites_remove_dialog_msg">გნებავთ რჩეული წერტილის \'%s\' წაშლა?</string>
<string name="favourites_remove_dialog_success">რჩეული წერტილი {0} წარმატებით წაიშალა.</string> <string name="favourites_remove_dialog_success">რჩეული წერტილი {0} წარმატებით წაიშალა.</string>
<string name="osb_add_dialog_title">შეცდომის ტექსტი</string>
<string name="osb_add_dialog_success">ხოჭოს რეპორტი წარმატებულად შეიქმნა</string>
<string name="osb_add_dialog_error">მოხდა შეცდომა: ხოჭოს რეპორტი არ შეიქმნა</string>
<string name="osb_comment_menu_item">კომენტარის დამატება</string>
<string name="osb_comment_dialog_message">შეტყობინება</string> <string name="osb_comment_dialog_message">შეტყობინება</string>
<string name="osb_comment_dialog_author">ავტორი</string> <string name="osb_comment_dialog_author">ავტორი</string>
<string name="osb_comment_dialog_title">ხოჭოსათვის კომენტარის დამატება</string>
<string name="osb_comment_dialog_add_button">კომენტარის დამატება</string>
<string name="osb_comment_dialog_success">კომენტარი დამატებულია</string> <string name="osb_comment_dialog_success">კომენტარი დამატებულია</string>
<string name="osb_comment_dialog_error">მოხდა შეცდომა: კომენტარი არ დაემატა</string> <string name="osb_comment_dialog_error">მოხდა შეცდომა: კომენტარი არ დაემატა</string>
<string name="osb_close_menu_item">ხოჭოს რეპორტის დახურვა</string>
<string name="osb_close_dialog_title">მიმდინარეობს ხოჭოს რეპორტის დახურვა</string>
<string name="osb_close_dialog_close_button">ხოჭოს რეპორტის დახურვა</string>
<string name="osb_close_dialog_success">ხოჭოს რეპორტი წარმატებით დაიხურა</string>
<string name="osb_close_dialog_error">მოხდა შეცდომა: ხოჭოს რეპორტი არ დაიხურა</string>
<string name="poi_edit_title">POI-ის ჩასწორება</string> <string name="poi_edit_title">POI-ის ჩასწორება</string>
<string name="poi_create_title">POI-ის შექმნა</string> <string name="poi_create_title">POI-ის შექმნა</string>
<string name="poi_error_poi_not_found">POI ვერ მოიძებნა</string> <string name="poi_error_poi_not_found">POI ვერ მოიძებნა</string>

28
OsmAnd/res/values-ko/strings.xml
View file

@ -451,7 +451,7 @@
<string name="vector_data">오프라인 벡터 맵</string> <string name="vector_data">오프라인 벡터 맵</string>
<string name="transport_context_menu">대중교통 정류소 검색</string> <string name="transport_context_menu">대중교통 정류소 검색</string>
<string name="osb_bug_name">버그</string>
<string name="poi_context_menu_modify">POI 수정</string> <string name="poi_context_menu_modify">POI 수정</string>
<string name="poi_context_menu_delete">POI 삭제</string> <string name="poi_context_menu_delete">POI 삭제</string>
<string name="rotate_map_compass_opt">나침반 방향</string> <string name="rotate_map_compass_opt">나침반 방향</string>
@ -716,7 +716,7 @@
<string name="search_tabs_location">좌표</string> <string name="search_tabs_location">좌표</string>
<string name="context_menu_item_update_map">지도 업데이트</string> <string name="context_menu_item_update_map">지도 업데이트</string>
<string name="context_menu_item_open_bug">OSM 버그 열기</string>
<string name="context_menu_item_create_poi">POI 생성</string> <string name="context_menu_item_create_poi">POI 생성</string>
<string name="add_favorite_dialog_top_text">즐겨찾기 이름 입력</string> <string name="add_favorite_dialog_top_text">즐겨찾기 이름 입력</string>
<string name="add_favorite_dialog_default_favourite_name">즐겨찾기</string> <string name="add_favorite_dialog_default_favourite_name">즐겨찾기</string>
@ -728,23 +728,23 @@
<string name="favourites_remove_dialog_success">즐겨찾기 포인트 {0} 가 성공적으로 삭제되었습니다.</string> <string name="favourites_remove_dialog_success">즐겨찾기 포인트 {0} 가 성공적으로 삭제되었습니다.</string>
<string name="osb_add_dialog_title">버그 텍스트 입력</string>
<string name="osb_add_dialog_success">버그가 성공적으로 생성되었습니다</string>
<string name="osb_add_dialog_error">예외발생: 버그가 생성되지 않았습니다</string>
<string name="osb_comment_menu_item">설명 추가</string>
<string name="osb_comment_dialog_message">메세지</string> <string name="osb_comment_dialog_message">메세지</string>
<string name="osb_comment_dialog_author">작성자 이름</string> <string name="osb_comment_dialog_author">작성자 이름</string>
<string name="osb_comment_dialog_title">버그에 설명 추가 중</string>
<string name="osb_comment_dialog_add_button">설명 추가</string>
<string name="osb_comment_dialog_success">설명이 성공적으로 추가되었습니다</string> <string name="osb_comment_dialog_success">설명이 성공적으로 추가되었습니다</string>
<string name="osb_comment_dialog_error">예외발생: 설명이 추가되지 않았습니다</string> <string name="osb_comment_dialog_error">예외발생: 설명이 추가되지 않았습니다</string>
<string name="osb_close_menu_item">버그 닫기</string>
<string name="osb_close_dialog_title">버그 닫는 중</string>
<string name="osb_close_dialog_close_button">버그 닫기</string>
<string name="osb_close_dialog_success">버그가 성공적으로 닫혔습니다</string>
<string name="osb_close_dialog_error">예외발생: 버그가 닫히지 않았습니다</string>
<string name="poi_edit_title">POI 편집</string> <string name="poi_edit_title">POI 편집</string>
<string name="poi_create_title">POI 생성</string> <string name="poi_create_title">POI 생성</string>
@ -945,7 +945,7 @@
<string name="search_street_in_neighborhood_cities">인근 도시에서 거리 검색</string> <string name="search_street_in_neighborhood_cities">인근 도시에서 거리 검색</string>
<string name="intermediate_items_sort_return">경유지는 현재 위치에서 도착지까지 가는 길에 경유지의 순서를 최적화하기 위해 재 정렬됩니다.</string> <string name="intermediate_items_sort_return">경유지는 현재 위치에서 도착지까지 가는 길에 경유지의 순서를 최적화하기 위해 재 정렬됩니다.</string>
<string name="intermediate_items_sort_by_distance">정렬 (도어 투 도어)</string> <string name="intermediate_items_sort_by_distance">정렬 도어 투 도어</string>
<string name="local_osm_changes_backup_successful">OSM 변경 파일이 성공적으로 생성되었습니다 %1$s</string> <string name="local_osm_changes_backup_successful">OSM 변경 파일이 성공적으로 생성되었습니다 %1$s</string>
<string name="local_osm_changes_backup_failed">백업 OSM 변경 실패</string> <string name="local_osm_changes_backup_failed">백업 OSM 변경 실패</string>
<string name="local_osm_changes_backup">OSM 변화에 따라 백업</string> <string name="local_osm_changes_backup">OSM 변화에 따라 백업</string>

3
OsmAnd/res/values-ku/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="local_indexes_cat_av">زانیاری دەنگ/ڤیدیۆ</string> <string name="local_indexes_cat_av">زانیاری دەنگ/ڤیدیۆ</string>
<string name="stop_routing_confirm">دڵنیای له وەی که ئه ته وێت ناڤیگێشن راگریت</string> <string name="stop_routing_confirm">دڵنیای له وەی که ئه ته وێت ناڤیگێشن راگریت</string>

33
OsmAnd/res/values-lt/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string> <string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
<string name="shared_location">Bendrinta vieta</string> <string name="shared_location">Bendrinta vieta</string>
<string name="osmand_parking_warning">Dėmesio</string> <string name="osmand_parking_warning">Dėmesio</string>
@ -505,7 +504,7 @@
<string name="vector_data">Parsiųsti vektoriniai žemėlapiai</string> <string name="vector_data">Parsiųsti vektoriniai žemėlapiai</string>
<string name="transport_context_menu">Ieškoti transporto stotelėje</string> <string name="transport_context_menu">Ieškoti transporto stotelėje</string>
<string name="osb_bug_name">Klaida</string>
<string name="poi_context_menu_modify">Koreguoti LV</string> <string name="poi_context_menu_modify">Koreguoti LV</string>
<string name="poi_context_menu_delete">Ištrinti LV</string> <string name="poi_context_menu_delete">Ištrinti LV</string>
<string name="rotate_map_compass_opt">Pagal kompasą</string> <string name="rotate_map_compass_opt">Pagal kompasą</string>
@ -768,7 +767,7 @@
<string name="search_tabs_location">Vieta</string> <string name="search_tabs_location">Vieta</string>
<string name="context_menu_item_update_map">Atnaujinti žemėlapį</string> <string name="context_menu_item_update_map">Atnaujinti žemėlapį</string>
<string name="context_menu_item_open_bug">Atidaryti OSM klaidą</string>
<string name="context_menu_item_create_poi">Sukurti LV</string> <string name="context_menu_item_create_poi">Sukurti LV</string>
<string name="shared_string_yes">Taip</string> <string name="shared_string_yes">Taip</string>
<string name="shared_string_cancel">Atšaukti</string> <string name="shared_string_cancel">Atšaukti</string>
@ -782,21 +781,21 @@
<string name="favourites_context_menu_delete">Ištrinti įsimintą vietą</string> <string name="favourites_context_menu_delete">Ištrinti įsimintą vietą</string>
<string name="favourites_remove_dialog_msg">Pašalinti įsimintą vietą \'%s\'?</string> <string name="favourites_remove_dialog_msg">Pašalinti įsimintą vietą \'%s\'?</string>
<string name="favourites_remove_dialog_success">Įsiminta vieta {0} buvo sėkmingai panaikinta.</string> <string name="favourites_remove_dialog_success">Įsiminta vieta {0} buvo sėkmingai panaikinta.</string>
<string name="osb_add_dialog_title">Įveskite klaidos tekstą</string>
<string name="osb_add_dialog_success">Pranešimas apie klaidą sukurtas</string>
<string name="osb_add_dialog_error">Įvyko klaida: klaidos pranešimas nebuvo sukurtas</string>
<string name="osb_comment_menu_item">Pridėti komentarą</string>
<string name="osb_comment_dialog_message">Pranešimas</string> <string name="osb_comment_dialog_message">Pranešimas</string>
<string name="osb_comment_dialog_author">Autoriaus vardas</string> <string name="osb_comment_dialog_author">Autoriaus vardas</string>
<string name="osb_comment_dialog_title">Prie klaidos pridedamas komentaras</string>
<string name="osb_comment_dialog_add_button">Pridėti komentarą</string>
<string name="osb_comment_dialog_success">Komentaras buvo sėkmingai pridėtas</string> <string name="osb_comment_dialog_success">Komentaras buvo sėkmingai pridėtas</string>
<string name="osb_comment_dialog_error">Įvyko klaida: komentaras nebuvo pridėtas</string> <string name="osb_comment_dialog_error">Įvyko klaida: komentaras nebuvo pridėtas</string>
<string name="osb_close_menu_item">Uždaryti klaidos pranešimą</string>
<string name="osb_close_dialog_title">Uždaromas klaidos pranešimas</string>
<string name="osb_close_dialog_close_button">Uždaryti klaidos pranešimą</string>
<string name="osb_close_dialog_success">Klaidos pranešimas buvo sėkmingai uždarytas</string>
<string name="osb_close_dialog_error">Įvyko klaida: klaidos aprašymas nebuvo uždarytas</string>
<string name="poi_edit_title">Redaguoti LV</string> <string name="poi_edit_title">Redaguoti LV</string>
<string name="poi_create_title">Sukurti LV</string> <string name="poi_create_title">Sukurti LV</string>
<string name="poi_error_poi_not_found">LV neina rasti arba LV sudaryta iš kelių elementų</string> <string name="poi_error_poi_not_found">LV neina rasti arba LV sudaryta iš kelių elementų</string>
@ -1112,7 +1111,7 @@
<string name="distance_measurement_load_gpx">Atidaryti egzistuojantį GPX failą</string> <string name="distance_measurement_load_gpx">Atidaryti egzistuojantį GPX failą</string>
<string name="search_street_in_neighborhood_cities">Ieškoti gatvės gretimuose miestuose</string> <string name="search_street_in_neighborhood_cities">Ieškoti gatvės gretimuose miestuose</string>
<string name="intermediate_items_sort_return">Taškai sudėlioti optimaliu maršrutu pakeliui iš esamos vietos į kelionės tikslą.</string> <string name="intermediate_items_sort_return">Taškai sudėlioti optimaliu maršrutu pakeliui iš esamos vietos į kelionės tikslą.</string>
<string name="intermediate_items_sort_by_distance">Rūšiuoti (nuo durų iki durų)</string> <string name="intermediate_items_sort_by_distance">Rūšiuoti nuo durų iki durų</string>
<string name="please_select_address">Pasirinkit pirmiausia miestą ar gatvę</string> <string name="please_select_address">Pasirinkit pirmiausia miestą ar gatvę</string>
<string name="destination_point">Kelionės tikslas %1$s</string> <string name="destination_point">Kelionės tikslas %1$s</string>
@ -1978,7 +1977,7 @@
<string name="techical_articles_item">Techniniai straipsniai</string> <string name="techical_articles_item">Techniniai straipsniai</string>
<string name="osm_edit_created_poi">Sukurta OSM LV</string> <string name="osm_edit_created_poi">Sukurta OSM LV</string>
<string name="osm_edit_created_bug">Sukurtas OSM riktas</string>

28
OsmAnd/res/values-lv/strings.xml
View file

@ -453,7 +453,7 @@
<string name="vector_data">Bezsaistes vektoru kartes</string> <string name="vector_data">Bezsaistes vektoru kartes</string>
<string name="transport_context_menu">Meklēt transportu pieturas vietā</string> <string name="transport_context_menu">Meklēt transportu pieturas vietā</string>
<string name="osb_bug_name">Kļūda</string>
<string name="poi_context_menu_modify">Labot POI</string> <string name="poi_context_menu_modify">Labot POI</string>
<string name="poi_context_menu_delete">Dzēst POI</string> <string name="poi_context_menu_delete">Dzēst POI</string>
<string name="rotate_map_compass_opt">Pēc kompasa</string> <string name="rotate_map_compass_opt">Pēc kompasa</string>
@ -724,7 +724,7 @@
<string name="search_tabs_location">Atrašanās vieta</string> <string name="search_tabs_location">Atrašanās vieta</string>
<string name="context_menu_item_update_map">Atjaunot karti</string> <string name="context_menu_item_update_map">Atjaunot karti</string>
<string name="context_menu_item_open_bug">Atvērt OSM bug</string>
<string name="context_menu_item_create_poi">Izveidot POI</string> <string name="context_menu_item_create_poi">Izveidot POI</string>
<string name="shared_string_yes">Jā</string> <string name="shared_string_yes">Jā</string>
<string name="shared_string_cancel">Atcelt</string> <string name="shared_string_cancel">Atcelt</string>
@ -738,21 +738,21 @@
<string name="favourites_context_menu_delete">Dzēst izlasi</string> <string name="favourites_context_menu_delete">Dzēst izlasi</string>
<string name="favourites_remove_dialog_msg">Dzēst izlases punktu \'%s\'?</string> <string name="favourites_remove_dialog_msg">Dzēst izlases punktu \'%s\'?</string>
<string name="favourites_remove_dialog_success">Izlases punkts {0} veiksmīgi dzēsts.</string> <string name="favourites_remove_dialog_success">Izlases punkts {0} veiksmīgi dzēsts.</string>
<string name="osb_add_dialog_title">Ievadiet kļūdas tekstu</string>
<string name="osb_add_dialog_success">Kļūdas pieteikums veiksmīgi izveidots</string>
<string name="osb_add_dialog_error">Kļūda:pieteikums netika pievienots</string>
<string name="osb_comment_menu_item">Pievienot komentāru</string>
<string name="osb_comment_dialog_message">Ziņa</string> <string name="osb_comment_dialog_message">Ziņa</string>
<string name="osb_comment_dialog_author">Autora vārds</string> <string name="osb_comment_dialog_author">Autora vārds</string>
<string name="osb_comment_dialog_title">Pievieno komentāru kļūdas pieteikumam</string>
<string name="osb_comment_dialog_add_button">Pievienot komentāru</string>
<string name="osb_comment_dialog_success">Komentārs veiksmīgi pievienots</string> <string name="osb_comment_dialog_success">Komentārs veiksmīgi pievienots</string>
<string name="osb_comment_dialog_error">Kļūda:komentārs netika pievienots</string> <string name="osb_comment_dialog_error">Kļūda:komentārs netika pievienots</string>
<string name="osb_close_menu_item">Aizvērt kļūdas pieteikumu</string>
<string name="osb_close_dialog_title">Aizver kļūdas pieteikumu</string>
<string name="osb_close_dialog_close_button">Aizvērt kļūdas pieteikumu</string>
<string name="osb_close_dialog_success">Kļūdas pieteikums veiksmīgi aizvērts</string>
<string name="osb_close_dialog_error">Kļūda: kļūdas pieteikums netika aizvērts</string>
<string name="poi_edit_title">Labot POI</string> <string name="poi_edit_title">Labot POI</string>
<string name="poi_create_title">Izveidot POI</string> <string name="poi_create_title">Izveidot POI</string>
<string name="poi_error_poi_not_found">Nevar atrast nodi, vai arī serviss nav atzīmēts kā viena node</string> <string name="poi_error_poi_not_found">Nevar atrast nodi, vai arī serviss nav atzīmēts kā viena node</string>
@ -1057,7 +1057,7 @@
<string name="please_select_address">Vispirms atzīmēt pilsētu vai ielu</string> <string name="please_select_address">Vispirms atzīmēt pilsētu vai ielu</string>
<string name="search_street_in_neighborhood_cities">Meklēt ielu nosaukumus blakus pilsētās</string> <string name="search_street_in_neighborhood_cities">Meklēt ielu nosaukumus blakus pilsētās</string>
<string name="intermediate_items_sort_return">Ceļapunkti tika pārkārtoti, lai optimizētu maršrutu no pašreizējās pozīcijas līdz galamērķim.</string> <string name="intermediate_items_sort_return">Ceļapunkti tika pārkārtoti, lai optimizētu maršrutu no pašreizējās pozīcijas līdz galamērķim.</string>
<string name="intermediate_items_sort_by_distance">Kārtot (pēc attāluma)</string> <string name="intermediate_items_sort_by_distance">Kārtot pēc attāluma</string>
<string name="local_osm_changes_backup_successful">OSM izmaiņu fails veiksmīgi izveidots %1$s</string> <string name="local_osm_changes_backup_successful">OSM izmaiņu fails veiksmīgi izveidots %1$s</string>
<string name="local_osm_changes_backup_failed">OSM izmaiņu fails netika izveidots</string> <string name="local_osm_changes_backup_failed">OSM izmaiņu fails netika izveidots</string>
<string name="local_osm_changes_backup">Izveidot OSM izmaiņu failu</string> <string name="local_osm_changes_backup">Izveidot OSM izmaiņu failu</string>

8
OsmAnd/res/values-nb/strings.xml
View file

@ -377,7 +377,7 @@
<string name="map_route_by_gpx">Naviger ved bruk av GPX</string> <string name="map_route_by_gpx">Naviger ved bruk av GPX</string>
<string name="vector_data">Offline vektorkart</string> <string name="vector_data">Offline vektorkart</string>
<string name="osb_bug_name">Feil</string>
<string name="poi_context_menu_modify">Endre interessepunkt</string> <string name="poi_context_menu_modify">Endre interessepunkt</string>
<string name="poi_context_menu_delete">Slett interessepunkt</string> <string name="poi_context_menu_delete">Slett interessepunkt</string>
<string name="rotate_map_compass_opt">Ifølge kompass</string> <string name="rotate_map_compass_opt">Ifølge kompass</string>
@ -536,7 +536,7 @@
<string name="search_tabs_location">Sted</string> <string name="search_tabs_location">Sted</string>
<string name="context_menu_item_update_map">Oppdater kart</string> <string name="context_menu_item_update_map">Oppdater kart</string>
<string name="context_menu_item_open_bug">Åpne OSM-feil</string>
<string name="context_menu_item_create_poi">Opprett interessepunkt</string> <string name="context_menu_item_create_poi">Opprett interessepunkt</string>
<string name="shared_string_yes">Ja</string> <string name="shared_string_yes">Ja</string>
<string name="shared_string_cancel">Avbryt</string> <string name="shared_string_cancel">Avbryt</string>
@ -548,7 +548,7 @@
<string name="favourites_context_menu_delete">Slett favoritt</string> <string name="favourites_context_menu_delete">Slett favoritt</string>
<string name="favourites_remove_dialog_msg">Fjerne favorittpunkt \'%s\'?</string> <string name="favourites_remove_dialog_msg">Fjerne favorittpunkt \'%s\'?</string>
<string name="favourites_remove_dialog_success">Favorittpunkt {0} ble vellykket slettet.</string> <string name="favourites_remove_dialog_success">Favorittpunkt {0} ble vellykket slettet.</string>
<string name="osb_comment_menu_item">Legg til kommentar</string>
<string name="osb_comment_dialog_message">Melding</string> <string name="osb_comment_dialog_message">Melding</string>
<string name="poi_edit_title">Rediger interessepunkt</string> <string name="poi_edit_title">Rediger interessepunkt</string>
<string name="poi_create_title">Opprett interessepunkt</string> <string name="poi_create_title">Opprett interessepunkt</string>
@ -881,7 +881,7 @@
<string name="loading_cities">Laster byer…</string> <string name="loading_cities">Laster byer…</string>
<string name="invalid_locations">Koordinater er ugyldige!</string> <string name="invalid_locations">Koordinater er ugyldige!</string>
<string name="go_back_to_osmand">Tilbake til OsmAnd-kart</string> <string name="go_back_to_osmand">Tilbake til OsmAnd-kart</string>
<string name="osb_comment_dialog_add_button">Legg til kommentar</string>
<string name="osb_comment_dialog_success">Kommentar ble vellykket lagt til</string> <string name="osb_comment_dialog_success">Kommentar ble vellykket lagt til</string>
<string name="no_buildings_found">Ingen bygninger funnet.</string> <string name="no_buildings_found">Ingen bygninger funnet.</string>
<string name="loading_streets_buildings">Laster gater/bygninger…</string> <string name="loading_streets_buildings">Laster gater/bygninger…</string>

49
OsmAnd/res/values-nl/strings.xml
View file

@ -444,7 +444,7 @@
<string name="vector_data">Offline vectorkaarten</string> <string name="vector_data">Offline vectorkaarten</string>
<string name="transport_context_menu">Zoek openbaar vervoer op halte</string> <string name="transport_context_menu">Zoek openbaar vervoer op halte</string>
<string name="osb_bug_name">Bug</string>
<string name="poi_context_menu_modify">Wijzig interessepunt</string> <string name="poi_context_menu_modify">Wijzig interessepunt</string>
<string name="poi_context_menu_delete">Verwijder interessepunt</string> <string name="poi_context_menu_delete">Verwijder interessepunt</string>
<string name="rotate_map_compass_opt">Volgens kompas</string> <string name="rotate_map_compass_opt">Volgens kompas</string>
@ -705,7 +705,7 @@
<string name="context_menu_item_update_map">Kaart bijwerken</string> <string name="context_menu_item_update_map">Kaart bijwerken</string>
<string name="context_menu_item_open_bug">Meld fout in OpenStreetMap</string>
<string name="context_menu_item_create_poi">Maak interessepunt in OSM</string> <string name="context_menu_item_create_poi">Maak interessepunt in OSM</string>
<string name="add_favorite_dialog_top_text">Geef de favoriet een naam</string> <string name="add_favorite_dialog_top_text">Geef de favoriet een naam</string>
<string name="add_favorite_dialog_default_favourite_name">Favoriet</string> <string name="add_favorite_dialog_default_favourite_name">Favoriet</string>
@ -714,21 +714,21 @@
<string name="favourites_context_menu_delete">Verwijder favoriet</string> <string name="favourites_context_menu_delete">Verwijder favoriet</string>
<string name="favourites_remove_dialog_msg">Verwijder favoriet \'%s\'?</string> <string name="favourites_remove_dialog_msg">Verwijder favoriet \'%s\'?</string>
<string name="favourites_remove_dialog_success">Favoriet {0} is verwijderd.</string> <string name="favourites_remove_dialog_success">Favoriet {0} is verwijderd.</string>
<string name="osb_add_dialog_title">Geef bug tekst in</string>
<string name="osb_add_dialog_success">Bug is aangemaakt</string>
<string name="osb_add_dialog_error">Fout opgetreden: bug is niet aangemaakt</string>
<string name="osb_comment_menu_item">Voeg commentaar toe</string>
<string name="osb_comment_dialog_message">Bericht</string> <string name="osb_comment_dialog_message">Bericht</string>
<string name="osb_comment_dialog_author">Naam auteur</string> <string name="osb_comment_dialog_author">Naam auteur</string>
<string name="osb_comment_dialog_title">Commentaar wordt aan bug toegevoegd</string>
<string name="osb_comment_dialog_add_button">Commentaar toevoegen</string>
<string name="osb_comment_dialog_success">Commentaar is toegevoegd</string> <string name="osb_comment_dialog_success">Commentaar is toegevoegd</string>
<string name="osb_comment_dialog_error">Fout opgetreden: commentaar is niet toegevoegd</string> <string name="osb_comment_dialog_error">Fout opgetreden: commentaar is niet toegevoegd</string>
<string name="osb_close_menu_item">Sluit bug</string>
<string name="osb_close_dialog_title">Bug wordt afgesloten</string>
<string name="osb_close_dialog_close_button">Sluit bug</string>
<string name="osb_close_dialog_success">Bug is afgesloten</string>
<string name="osb_close_dialog_error">Fout opgetreden: bug is niet gesloten</string>
<string name="poi_edit_title">Bewerk interessepunt</string> <string name="poi_edit_title">Bewerk interessepunt</string>
<string name="poi_create_title">Maak interessepunt</string> <string name="poi_create_title">Maak interessepunt</string>
<string name="poi_error_poi_not_found">Punt niet gevonden of voorziening is niet een enkel punt</string> <string name="poi_error_poi_not_found">Punt niet gevonden of voorziening is niet een enkel punt</string>
@ -1277,7 +1277,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="search_street_in_neighborhood_cities">Zoek straat in nabijgelegen plaatsen</string> <string name="search_street_in_neighborhood_cities">Zoek straat in nabijgelegen plaatsen</string>
<string name="intermediate_items_sort_return">De tussenliggende routepunten zijn opnieuw gesorteerd voor een optimale volgorde op de route van uw huidige positie naar uw bestemming.</string> <string name="intermediate_items_sort_return">De tussenliggende routepunten zijn opnieuw gesorteerd voor een optimale volgorde op de route van uw huidige positie naar uw bestemming.</string>
<string name="intermediate_items_sort_by_distance">Sorteer (kortste afstand)</string> <string name="intermediate_items_sort_by_distance">Sorteer kortste afstand</string>
<string name="please_select_address">Kies eerst een stad of straat</string> <string name="please_select_address">Kies eerst een stad of straat</string>
<string name="context_menu_item_destination_point">Als bestemming\ninstellen</string> <string name="context_menu_item_destination_point">Als bestemming\ninstellen</string>
<string name="destination_point">Bestemming %1$s</string> <string name="destination_point">Bestemming %1$s</string>
@ -2013,7 +2013,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="archive_wikipedia_data">Er zijn al (verouderde en incompatibele) Wikipedia-gegevens gedownload. Wilt u deze bewaren?</string> <string name="archive_wikipedia_data">Er zijn al (verouderde en incompatibele) Wikipedia-gegevens gedownload. Wilt u deze bewaren?</string>
<string name="download_wikipedia_files">Wilt u Wikipedia-artikelen downloaden (%1$s MB) ?</string> <string name="download_wikipedia_files">Wilt u Wikipedia-artikelen downloaden (%1$s MB) ?</string>
<string name="disable_recording_once_app_killed">Voorkom loggen als app wordt gesloten</string> <string name="disable_recording_once_app_killed">Voorkom loggen als app wordt gesloten</string>
<string name="disable_recording_once_app_killed_descrp">Stopt het opnemen van een GPX-spoor als de app wordt gesloten in de applicatielijst. (De OsmAnd achtergrondindicatie verdwijnt dan ook.)</string> <string name="disable_recording_once_app_killed_descrp">Stopt het opnemen van een GPX-spoor als de app wordt afgesloten met Recente Applicaties</string>
<string name="shared_string_import2osmand">Importeren in OsmAnd</string> <string name="shared_string_import2osmand">Importeren in OsmAnd</string>
<string name="download_wikipedia_maps">Wikipedia</string> <string name="download_wikipedia_maps">Wikipedia</string>
<string name="rendering_value_default13_name">Standaard (13)</string> <string name="rendering_value_default13_name">Standaard (13)</string>
@ -2118,7 +2118,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="shared_string_upload">Upload</string> <string name="shared_string_upload">Upload</string>
<string name="osm_edit_created_poi">POI in OSM gemaakt</string> <string name="osm_edit_created_poi">POI in OSM gemaakt</string>
<string name="osm_edit_created_bug">Bug in OSM gemaakt</string>
<string name="simulate_initial_startup_descr">Laat de app de volgende keer starten alsof deze net is geïnstalleerd. De instellingen blijven wel behouden.</string> <string name="simulate_initial_startup_descr">Laat de app de volgende keer starten alsof deze net is geïnstalleerd. De instellingen blijven wel behouden.</string>
<string name="simulate_initial_startup">Simuleer eerste start van de app</string> <string name="simulate_initial_startup">Simuleer eerste start van de app</string>
<string name="shared_string_others">Overige</string> <string name="shared_string_others">Overige</string>
@ -2199,4 +2199,21 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="lang_mk">Macedonisch</string> <string name="lang_mk">Macedonisch</string>
<string name="lang_fy">Fries</string> <string name="lang_fy">Fries</string>
<string name="lang_als">Toskisch (Albanees)</string> <string name="lang_als">Toskisch (Albanees)</string>
<string name="shared_string_location">Locatie</string>
<string name="osm_edit_modified_poi">Gewijzigde OSM POI</string>
<string name="osm_edit_deleted_poi">Gewiste OSM POI</string>
<string name="context_menu_item_open_note">Open OSM-opmerking</string>
<string name="osm_edit_reopened_note">Heropende OSM-opmerking</string>
<string name="osm_edit_commented_note">OSM-opmerking met commentaar</string>
<string name="osm_edit_removed_note">OSM-opmerking gewist</string>
<string name="osm_edit_created_note">OSM-opmerking gemaakt</string>
<string name="osn_bug_name">OSM-opmerking</string>
<string name="osn_add_dialog_title">Maak opmerking</string>
<string name="osn_comment_dialog_title">Voeg commentaar toe</string>
<string name="osn_reopen_dialog_title">Heropen notitie</string>
<string name="osn_close_dialog_title">Sluit notitie</string>
<string name="osn_add_dialog_success">Notitie aangemaakt</string>
<string name="osn_add_dialog_error">Er was een probleem: notitie niet aangemaakt</string>
<string name="osn_close_dialog_success">Bug is gesloten</string>
<string name="osn_close_dialog_error">Er was een probleem: notitie is niet afgesloten</string>
</resources> </resources>

73
OsmAnd/res/values-pl/strings.xml
View file

File diff suppressed because one or more lines are too long

30
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -686,7 +686,7 @@
<string name="search_street_in_neighborhood_cities">Pesquisar rua na vizinhança</string> <string name="search_street_in_neighborhood_cities">Pesquisar rua na vizinhança</string>
<string name="intermediate_items_sort_return">Paradas intermediárias reordenadas para otimizar o caminho do local atual até o destino.</string> <string name="intermediate_items_sort_return">Paradas intermediárias reordenadas para otimizar o caminho do local atual até o destino.</string>
<string name="intermediate_items_sort_by_distance">Ordem (porta a porta)</string> <string name="intermediate_items_sort_by_distance">Ordem porta a porta</string>
<string name="local_osm_changes_backup_successful">Arquivo de alterações do OSM gerado com sucesso %1$s</string> <string name="local_osm_changes_backup_successful">Arquivo de alterações do OSM gerado com sucesso %1$s</string>
<string name="local_osm_changes_backup_failed">Falha ao copiar as alterações no OSM</string> <string name="local_osm_changes_backup_failed">Falha ao copiar as alterações no OSM</string>
<string name="local_osm_changes_backup">Copiar como alteração no OSM</string> <string name="local_osm_changes_backup">Copiar como alteração no OSM</string>
@ -1203,7 +1203,7 @@
<string name="use_english_names">Usar nomes em inglês nos mapas</string> <string name="use_english_names">Usar nomes em inglês nos mapas</string>
<string name="show_poi_over_map_description">Mostrar POI no mapa (usar o último filtro)</string> <string name="show_poi_over_map_description">Mostrar POI no mapa (usar o último filtro)</string>
<string name="show_poi_over_map">Mostrar POI</string> <string name="show_poi_over_map">Mostrar POI</string>
<string name="context_menu_item_open_bug">Relatar erro no OSM</string>
<string name="poi_edit_title">Modificar POI</string> <string name="poi_edit_title">Modificar POI</string>
<string name="city_type_suburb">Subúrbio</string> <string name="city_type_suburb">Subúrbio</string>
<string name="city_type_hamlet">Lugarejo</string> <string name="city_type_hamlet">Lugarejo</string>
@ -1420,7 +1420,7 @@
<string name="error_reading_gpx">Erro na leitura de dados GPX</string> <string name="error_reading_gpx">Erro na leitura de dados GPX</string>
<string name="vector_data">Mapas vetoriais off-line</string> <string name="vector_data">Mapas vetoriais off-line</string>
<string name="transport_context_menu">Pesquisar transporte na parada</string> <string name="transport_context_menu">Pesquisar transporte na parada</string>
<string name="osb_bug_name">Erro</string>
<string name="poi_context_menu_modify">Modificar POI</string> <string name="poi_context_menu_modify">Modificar POI</string>
<string name="poi_context_menu_delete">Apagar POI</string> <string name="poi_context_menu_delete">Apagar POI</string>
<string name="rotate_map_compass_opt">Na direção da bússola</string> <string name="rotate_map_compass_opt">Na direção da bússola</string>
@ -1612,22 +1612,22 @@
<string name="favourites_context_menu_delete">Apagar favorito</string> <string name="favourites_context_menu_delete">Apagar favorito</string>
<string name="favourites_remove_dialog_msg">Apagar ponto favorito \'%s\'?</string> <string name="favourites_remove_dialog_msg">Apagar ponto favorito \'%s\'?</string>
<string name="favourites_remove_dialog_success">Ponto favorito {0} apagado.</string> <string name="favourites_remove_dialog_success">Ponto favorito {0} apagado.</string>
<string name="osb_add_dialog_title">Descrição do erro</string>
<string name="osb_add_dialog_success">Alerta de erro criado</string>
<string name="osb_add_dialog_error">Erro: o alerta de erro não foi criado</string>
<string name="osb_author_dialog_password">Senha do OSM (opcional)</string> <string name="osb_author_dialog_password">Senha do OSM (opcional)</string>
<string name="osb_comment_menu_item">Adicionar comentário</string>
<string name="osb_comment_dialog_message">Mensagem</string> <string name="osb_comment_dialog_message">Mensagem</string>
<string name="osb_comment_dialog_author">Autor</string> <string name="osb_comment_dialog_author">Autor</string>
<string name="osb_comment_dialog_title">Adicionando comentário ao erro</string>
<string name="osb_comment_dialog_add_button">Adicionar comentário</string>
<string name="osb_comment_dialog_success">Comentário adicionado</string> <string name="osb_comment_dialog_success">Comentário adicionado</string>
<string name="osb_comment_dialog_error">Erro: o comentário não foi adicionado</string> <string name="osb_comment_dialog_error">Erro: o comentário não foi adicionado</string>
<string name="osb_close_menu_item">Fechar o erro</string>
<string name="osb_close_dialog_title">Fechando o erro</string>
<string name="osb_close_dialog_close_button">Fechar o erro</string>
<string name="osb_close_dialog_success">Erro fechado</string>
<string name="osb_close_dialog_error">Erro: o alerta de erro não foi fechado</string>
<string name="poi_create_title">Criar POI</string> <string name="poi_create_title">Criar POI</string>
<string name="poi_error_poi_not_found">Nó não pode ser encontrado ou POI não é um único nó</string> <string name="poi_error_poi_not_found">Nó não pode ser encontrado ou POI não é um único nó</string>
<string name="poi_remove_confirm_template">Apagar {0} (enter comment)?</string> <string name="poi_remove_confirm_template">Apagar {0} (enter comment)?</string>
@ -1806,7 +1806,7 @@
<string name="shared_string_upload">Enviar</string> <string name="shared_string_upload">Enviar</string>
<string name="osm_edit_created_poi">POI OSM criado</string> <string name="osm_edit_created_poi">POI OSM criado</string>
<string name="osm_edit_created_bug">Erro no OSM criado</string>
<string name="shared_string_qr_code">QR-code</string> <string name="shared_string_qr_code">QR-code</string>
<string name="map_downloaded">Mapa baixado</string> <string name="map_downloaded">Mapa baixado</string>
</resources> </resources>

31
OsmAnd/res/values-pt/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="amenity_type_administrative">Administrativo</string>
<resources><string name="amenity_type_administrative">Administrativo</string>
<string name="amenity_type_barrier">Barreira</string> <string name="amenity_type_barrier">Barreira</string>
<string name="amenity_type_education">Educação</string> <string name="amenity_type_education">Educação</string>
<string name="amenity_type_emergency">Emergência</string> <string name="amenity_type_emergency">Emergência</string>
@ -102,7 +101,7 @@
<string name="vector_data">Mapas vetoriais offline</string> <string name="vector_data">Mapas vetoriais offline</string>
<string name="transport_context_menu">Procurar transporte na parada</string> <string name="transport_context_menu">Procurar transporte na parada</string>
<string name="osb_bug_name">Erro</string>
<string name="poi_context_menu_modify">Modificar POI</string> <string name="poi_context_menu_modify">Modificar POI</string>
<string name="poi_context_menu_delete">Apagar POI</string> <string name="poi_context_menu_delete">Apagar POI</string>
<string name="rotate_map_compass_opt">Na direção da bússola</string> <string name="rotate_map_compass_opt">Na direção da bússola</string>
@ -382,7 +381,7 @@
<string name="search_tabs_location">Localização</string> <string name="search_tabs_location">Localização</string>
<string name="context_menu_item_update_map">Atualizar mapa</string> <string name="context_menu_item_update_map">Atualizar mapa</string>
<string name="context_menu_item_open_bug">Reportar problema OSM</string>
<string name="context_menu_item_create_poi">Criar ponto de interesse</string> <string name="context_menu_item_create_poi">Criar ponto de interesse</string>
<string name="shared_string_yes">Sim</string> <string name="shared_string_yes">Sim</string>
<string name="shared_string_cancel">Cancelar</string> <string name="shared_string_cancel">Cancelar</string>
@ -396,21 +395,21 @@
<string name="favourites_context_menu_delete">Apagar favorito</string> <string name="favourites_context_menu_delete">Apagar favorito</string>
<string name="favourites_remove_dialog_msg">Você quer mesmo apagar este favorito \'%s\'?</string> <string name="favourites_remove_dialog_msg">Você quer mesmo apagar este favorito \'%s\'?</string>
<string name="favourites_remove_dialog_success">Ponto favorito {0} apagado com sucesso.</string> <string name="favourites_remove_dialog_success">Ponto favorito {0} apagado com sucesso.</string>
<string name="osb_add_dialog_title">Descrição do problema</string>
<string name="osb_add_dialog_success">O bug foi criado</string>
<string name="osb_add_dialog_error">Erro: bug não foi criado</string>
<string name="osb_comment_menu_item">Adicionar comentário</string>
<string name="osb_comment_dialog_message">Mensagem</string> <string name="osb_comment_dialog_message">Mensagem</string>
<string name="osb_comment_dialog_author">Autor</string> <string name="osb_comment_dialog_author">Autor</string>
<string name="osb_comment_dialog_title">Adicionando comentário ao bug</string>
<string name="osb_comment_dialog_add_button">Adicionar comentário</string>
<string name="osb_comment_dialog_success">Comentário adicionado</string> <string name="osb_comment_dialog_success">Comentário adicionado</string>
<string name="osb_comment_dialog_error">Erro: o comentário não foi adicionado</string> <string name="osb_comment_dialog_error">Erro: o comentário não foi adicionado</string>
<string name="osb_close_menu_item">Fechar o bug</string>
<string name="osb_close_dialog_title">Fechando o bug</string>
<string name="osb_close_dialog_close_button">Fechar o bug</string>
<string name="osb_close_dialog_success">Bug fechado com sucesso</string>
<string name="osb_close_dialog_error">Erro: bug não foi fechado</string>
<string name="poi_edit_title">Editar POI</string> <string name="poi_edit_title">Editar POI</string>
<string name="poi_create_title">Criar POI</string> <string name="poi_create_title">Criar POI</string>
<string name="poi_error_poi_not_found">Nó não pode ser encontrado ou POI não é um único nó</string> <string name="poi_error_poi_not_found">Nó não pode ser encontrado ou POI não é um único nó</string>
@ -1151,7 +1150,7 @@
<string name="search_street_in_neighborhood_cities">Procurar rua na vizinhança</string> <string name="search_street_in_neighborhood_cities">Procurar rua na vizinhança</string>
<string name="intermediate_items_sort_return">Pontos intermédios organizados para otimizar a ordem até ao destino.</string> <string name="intermediate_items_sort_return">Pontos intermédios organizados para otimizar a ordem até ao destino.</string>
<string name="intermediate_items_sort_by_distance">Ordem (porta a porta)</string> <string name="intermediate_items_sort_by_distance">Ordem porta a porta</string>
<string name="use_distance_measurement_help">Toque para marcar um pont.\n <string name="use_distance_measurement_help">Toque para marcar um pont.\n
Pressione e segure no mapa para apagar pontos anteriores.\n Pressione e segure no mapa para apagar pontos anteriores.\n
Pressione e segure no ponto para ver e anexar descrição.\n Pressione e segure no ponto para ver e anexar descrição.\n

26
OsmAnd/res/values-ro/strings.xml
View file

@ -646,7 +646,7 @@
<string name="vector_data">Hărți vectoriale offline</string> <string name="vector_data">Hărți vectoriale offline</string>
<string name="transport_context_menu">Căutare transport la destinație</string> <string name="transport_context_menu">Căutare transport la destinație</string>
<string name="osb_bug_name">Bug</string>
<string name="poi_context_menu_modify">Modifică POI</string> <string name="poi_context_menu_modify">Modifică POI</string>
<string name="poi_context_menu_delete">Șterge POI</string> <string name="poi_context_menu_delete">Șterge POI</string>
<string name="rotate_map_compass_opt">Către direcție busolă</string> <string name="rotate_map_compass_opt">Către direcție busolă</string>
@ -909,7 +909,7 @@
<string name="search_tabs_location">Poziție</string> <string name="search_tabs_location">Poziție</string>
<string name="context_menu_item_update_map">Actualizează hartă</string> <string name="context_menu_item_update_map">Actualizează hartă</string>
<string name="context_menu_item_open_bug">Deschide un Bug OSM</string>
<string name="context_menu_item_create_poi">Creează POI</string> <string name="context_menu_item_create_poi">Creează POI</string>
<string name="shared_string_yes">Da</string> <string name="shared_string_yes">Da</string>
<string name="shared_string_cancel">Anulează</string> <string name="shared_string_cancel">Anulează</string>
@ -923,21 +923,21 @@
<string name="favourites_context_menu_delete">Șterge punctul favorit</string> <string name="favourites_context_menu_delete">Șterge punctul favorit</string>
<string name="favourites_remove_dialog_msg">Ștergeți punctul favorit \'%s\'?</string> <string name="favourites_remove_dialog_msg">Ștergeți punctul favorit \'%s\'?</string>
<string name="favourites_remove_dialog_success">Punctul favorit {0} a fost șters.</string> <string name="favourites_remove_dialog_success">Punctul favorit {0} a fost șters.</string>
<string name="osb_add_dialog_title">Introduceți textul Bug-ului</string>
<string name="osb_add_dialog_success">Bug creat cu succes</string>
<string name="osb_add_dialog_error">A intervenit o eroare: bug-ul nu a fost creat</string>
<string name="osb_comment_menu_item">Adaugă comentariu</string>
<string name="osb_comment_dialog_message">Mesaj</string> <string name="osb_comment_dialog_message">Mesaj</string>
<string name="osb_comment_dialog_author">Nume autor</string> <string name="osb_comment_dialog_author">Nume autor</string>
<string name="osb_comment_dialog_title">Adăugare comentariu la un Bug</string>
<string name="osb_comment_dialog_add_button">Adaugă comentariu</string>
<string name="osb_comment_dialog_success">comentariul a fost adăugat cu succes</string> <string name="osb_comment_dialog_success">comentariul a fost adăugat cu succes</string>
<string name="osb_comment_dialog_error">Eroare: comentariul nu a fost adăugat</string> <string name="osb_comment_dialog_error">Eroare: comentariul nu a fost adăugat</string>
<string name="osb_close_menu_item">Închidere Bug</string>
<string name="osb_close_dialog_title">Se închide Bug-ul</string>
<string name="osb_close_dialog_close_button">Închide bug</string>
<string name="osb_close_dialog_success">Bug-ul a fost închis cu succes</string>
<string name="osb_close_dialog_error">Eroare: bug-ul nu a fost închis</string>
<string name="poi_edit_title">Editare POI</string> <string name="poi_edit_title">Editare POI</string>
<string name="poi_create_title">Creează POI</string> <string name="poi_create_title">Creează POI</string>
<string name="poi_error_poi_not_found">POI-ul nu poate fi găsit sau punctul de interes nu este singular</string> <string name="poi_error_poi_not_found">POI-ul nu poate fi găsit sau punctul de interes nu este singular</string>

32
OsmAnd/res/values-ru/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="lang_nds">Нижненемецкий</string> <string name="lang_nds">Нижненемецкий</string>
<string name="lang_mk">Македонский</string> <string name="lang_mk">Македонский</string>
@ -376,7 +375,7 @@
<string name="layer_gpx_layer">Трек GPX…</string> <string name="layer_gpx_layer">Трек GPX…</string>
<string name="error_reading_gpx">Ошибка чтения данных GPX</string> <string name="error_reading_gpx">Ошибка чтения данных GPX</string>
<string name="vector_data">Локальные векторные карты</string> <string name="vector_data">Локальные векторные карты</string>
<string name="osb_bug_name">Ошибка</string>
<string name="poi_context_menu_modify">Редактировать POI</string> <string name="poi_context_menu_modify">Редактировать POI</string>
<string name="poi_context_menu_delete">Удалить POI</string> <string name="poi_context_menu_delete">Удалить POI</string>
<string name="rotate_map_compass_opt">По направлению компаса</string> <string name="rotate_map_compass_opt">По направлению компаса</string>
@ -615,7 +614,7 @@
<string name="search_address_street_option">Пересечение улиц</string> <string name="search_address_street_option">Пересечение улиц</string>
<string name="search_tabs_location">Координаты</string> <string name="search_tabs_location">Координаты</string>
<string name="context_menu_item_update_map">Обновить карту</string> <string name="context_menu_item_update_map">Обновить карту</string>
<string name="context_menu_item_open_bug">Сообщить об ошибке на карте</string>
<string name="context_menu_item_create_poi">Добавить POI</string> <string name="context_menu_item_create_poi">Добавить POI</string>
<string name="shared_string_yes">Да</string> <string name="shared_string_yes">Да</string>
<string name="shared_string_cancel">Отмена</string> <string name="shared_string_cancel">Отмена</string>
@ -627,19 +626,19 @@
<string name="favourites_context_menu_delete">Удалить точку</string> <string name="favourites_context_menu_delete">Удалить точку</string>
<string name="favourites_remove_dialog_msg">Вы действительно хотите удалить точку \"%s\" из Избранных?</string> <string name="favourites_remove_dialog_msg">Вы действительно хотите удалить точку \"%s\" из Избранных?</string>
<string name="favourites_remove_dialog_success">Точка {0} была успешно удалена из Избранных.</string> <string name="favourites_remove_dialog_success">Точка {0} была успешно удалена из Избранных.</string>
<string name="osb_add_dialog_title">Подробно опишите ошибку</string>
<string name="osb_add_dialog_success">Спасибо, ваше замечание добавлено в базу</string>
<string name="osb_add_dialog_error">Возникло исключение: сообщение об ошибке не создано</string>
<string name="osb_comment_dialog_title">Добавление комментария к ошибке</string>
<string name="osb_comment_dialog_add_button">Добавить комментарий</string>
<string name="osb_comment_dialog_success">Комментарий был успешно добавлен</string> <string name="osb_comment_dialog_success">Комментарий был успешно добавлен</string>
<string name="osb_comment_dialog_error">Возникло исключение: комментарий не добавлен</string> <string name="osb_comment_dialog_error">Возникло исключение: комментарий не добавлен</string>
<string name="osb_close_dialog_title">Закрываю ошибку</string>
<string name="osb_close_dialog_close_button">Закрыть ошибку</string>
<string name="osb_close_dialog_success">Ошибка была успешно закрыта</string>
<string name="osb_close_dialog_error">Возникло исключение: ошибка не была закрыта</string>
<string name="osb_comment_menu_item">Добавить комментарий</string>
<string name="osb_close_menu_item">Закрыть ошибку</string>
<string name="osb_comment_dialog_message">Комментарий</string> <string name="osb_comment_dialog_message">Комментарий</string>
<string name="osb_comment_dialog_author">Автор</string> <string name="osb_comment_dialog_author">Автор</string>
<string name="poi_edit_title">Редактирование POI</string> <string name="poi_edit_title">Редактирование POI</string>
@ -1812,11 +1811,12 @@
<string name="shared_string_update">Обновить</string> <string name="shared_string_update">Обновить</string>
<string name="shared_string_upload">Отправить</string> <string name="shared_string_upload">Отправить</string>
<string name="osm_edit_created_poi">Создана OSM POI</string> <string name="osm_edit_created_poi">Создана OSM POI</string>
<string name="osm_edit_created_bug">Создана заметка OSM</string>
<string name="osmand_running_in_background">Работает в фоновом режиме</string> <string name="osmand_running_in_background">Работает в фоновом режиме</string>
<string name="av_locations">Места</string> <string name="av_locations">Места</string>
<string name="downloading_number_of_files">Загрузка файла - %1$d</string> <string name="downloading_number_of_files">Загрузка файла - %1$d</string>
<string name="read_more">Подробнее</string> <string name="read_more">Подробнее</string>
<string name="whats_new">Что нового в</string> <string name="whats_new">Что нового в</string>
<string name="save_poi_without_poi_type_message">Вы действительно хотите сохранить POI без указания типа?</string>
</resources> </resources>

115
OsmAnd/res/values-sc/phrases.xml
View file

@ -1590,4 +1590,119 @@
<string name="poi_wiki_lang_als">Wiki in alsazianu</string> <string name="poi_wiki_lang_als">Wiki in alsazianu</string>
<string name="poi_wiki_lang_az">Wiki in azeri</string> <string name="poi_wiki_lang_az">Wiki in azeri</string>
<string name="poi_wiki_lang_bn">Wiki in bengali</string> <string name="poi_wiki_lang_bn">Wiki in bengali</string>
<string name="poi_wiki_lang_bpy">Wiki in bishnupriya</string>
<string name="poi_wiki_lang_br">Wiki in bretonu</string>
<string name="poi_wiki_lang_bs">Wiki in bosniacu</string>
<string name="poi_wiki_lang_cy">Wiki in gallesu</string>
<string name="poi_wiki_lang_eo">Wiki in esperanto</string>
<string name="poi_wiki_lang_eu">Wiki in bascu</string>
<string name="poi_wiki_lang_fa">Wiki in persianu</string>
<string name="poi_wiki_lang_fy">Wiki in frisonu otzidentale</string>
<string name="poi_wiki_lang_ga">Wiki in irlandesu</string>
<string name="poi_wiki_lang_hy">Wiki in armenu</string>
<string name="poi_wiki_lang_is">Wiki in islandesu</string>
<string name="poi_wiki_lang_ka">Wiki in georgianu</string>
<string name="poi_wiki_lang_ku">Wiki in curdu</string>
<string name="poi_wiki_lang_la">Wiki in latinu</string>
<string name="poi_wiki_lang_lb">Wiki in lussemburghesu</string>
<string name="poi_wiki_lang_mk">Wiki in matzèdone</string>
<string name="poi_wiki_lang_ml">Wiki in malayam</string>
<string name="poi_wiki_lang_mr">Wiki in marathi</string>
<string name="poi_wiki_lang_nds">Wiki in bassu-sassone</string>
<string name="poi_wiki_lang_nv">Wiki in Navajo</string>
<string name="poi_wiki_lang_os">Wiki in ossetiu</string>
<string name="poi_wiki_lang_pms">Wiki in piemontesu</string>
<string name="poi_wiki_lang_sc">Wiki in sardu</string>
<string name="poi_wiki_lang_sh">Wiki in serbo-croatu</string>
<string name="poi_wiki_lang_sq">Wiki in albanesu</string>
<string name="poi_wiki_lang_ta">Wiki in tamil</string>
<string name="poi_wiki_lang_tl">Wiki in filipinu</string>
<string name="poi_route_bus_ref">Postale</string>
<string name="poi_route_share_taxi_ref">Taxi cumpartzidu</string>
<string name="poi_route_trolleybus_ref">Filubus</string>
<string name="poi_route_tram_ref">Tram</string>
<string name="poi_route_train_ref">Trenu</string>
<string name="poi_route_light_rail_ref">Trenu lèbiu/metropolitana lèbia</string>
<string name="poi_route_monorail_ref">Monorotàia</string>
<string name="poi_route_funicular_ref">Funiculare</string>
<string name="poi_route_ferry_ref">Navile</string>
<string name="poi_wiki_lang_war">Wiki in Waray</string>
<string name="poi_wiki_lang_min">Wiki in minangkabau</string>
<string name="poi_wiki_lang_kk">Wiki in kazacu</string>
<string name="poi_wiki_lang_uz">Wiki in uzbecu</string>
<string name="poi_wiki_lang_ce">Wiki in cecenu</string>
<string name="poi_wiki_lang_ur">Wiki in urdu</string>
<string name="poi_wiki_lang_oc">Wiki in occitanu</string>
<string name="poi_wiki_lang_zhminnan">Wiki in min nan</string>
<string name="poi_wiki_lang_mg">Wiki in malgàsciu</string>
<string name="poi_wiki_lang_tt">Wiki in tàtaru</string>
<string name="poi_wiki_lang_jv">Wiki in giavanesu</string>
<string name="poi_wiki_lang_ky">Wiki in chirghisu</string>
<string name="poi_wiki_lang_zhyue">Wiki in cantonesu</string>
<string name="poi_wiki_lang_ast">Wiki in asturiano-leonesu</string>
<string name="poi_wiki_lang_tg">Wiki in tagicu</string>
<string name="poi_wiki_lang_ba">Wiki in baschiru</string>
<string name="poi_wiki_lang_sco">Wiki in scots</string>
<string name="poi_wiki_lang_pnb">Wiki in punjabi</string>
<string name="poi_wiki_lang_cv">Wiki in ciuvasciu</string>
<string name="poi_wiki_lang_lmo">Wiki in lombardu</string>
<string name="poi_wiki_lang_my">Wiki in birmanu</string>
<string name="poi_wiki_lang_yo">Wiki in yoruba</string>
<string name="poi_wiki_lang_an">Wiki in aragonesu</string>
<string name="poi_wiki_lang_ne">Wiki in nepalesu</string>
<string name="poi_wiki_lang_gu">Wiki in gujarati</string>
<string name="poi_wiki_lang_scn">Wiki in sitzilianu</string>
<string name="poi_wiki_lang_bar">Wiki in bavaresu</string>
<string name="poi_wiki_lang_mn">Wiki in mòngolu</string>
<string name="poi_wiki_lang_nap">Wiki in napoletanu</string>
<string name="poi_industrial_oil">Casta: industria petrolìfera</string>
<string name="poi_industrial_wellsite">Casta: giassu de putzos</string>
<string name="poi_industrial_factory">Casta: fàbrica</string>
<string name="poi_industrial_gas">Casta: industria de gas</string>
<string name="poi_industrial_timber">Casta: linna</string>
<string name="poi_industrial_refinery">Casta: rafineria</string>
<string name="poi_industrial_warehouse">Casta: magasinu</string>
<string name="poi_industrial_auto_wrecker">Casta: iscontza-màchinas</string>
<string name="poi_industrial_agriculture">Casta: agricultura</string>
<string name="poi_industrial_brewery">Casta: birrifìtziu</string>
<string name="poi_industrial_depot">Casta: depòsitu</string>
<string name="poi_industrial_brickyard">Casta: fàbrica de matones</string>
<string name="poi_industrial_intermodal_freight_terminal">Casta: terminal de trasportu intermodale</string>
<string name="poi_industrial_sawmill">Casta: segheria</string>
<string name="poi_industrial_water_purification">Casta: purificatzione de s’abba</string>
<string name="poi_industrial_port">Casta: portu</string>
<string name="poi_watering_place">Abbadòrgiu</string>
<string name="poi_animal_boarding">Posada pro animales</string>
<string name="poi_animal_boarding_dog">Casta de posada: pro canes</string>
<string name="poi_animal_boarding_cat">Casta de posada: pro gatos</string>
<string name="poi_animal_boarding_dog_cat">Casta de posada: pro canes e gatos</string>
<string name="poi_animal_boarding_horse">Casta de posada: pro caddos</string>
<string name="poi_historic_aircraft">Aèreu istòricu</string>
<string name="poi_honey">Butega de mele</string>
<string name="poi_elevator_yes">Cun ascensore</string>
<string name="poi_elevator_no">Chene ascensore</string>
<string name="poi_technical_monument">Monumentu tècnicu</string>
<string name="poi_office_camping">Ufìtziu de su campègiu</string>
<string name="poi_model_aerodrome">Aeròdromu pro modellinos</string>
<string name="poi_street_lamp">Lampione</string>
<string name="poi_toilets_yes">Cun bagnos</string>
<string name="poi_toilets_no">Chene bagnos</string>
<string name="poi_toilets_wheelchair_yes">Atzessu a sos bagnos pro cadiras a rodas: eja</string>
<string name="poi_toilets_wheelchair_no">Atzessu a sos bagnos pro cadiras a rodas: nono</string>
<string name="poi_toilets_access_customers">Atzessu a sos bagnos: clientes</string>
<string name="poi_toilets_access_permissive">Atzessu a sos bagnos: permissivu</string>
<string name="poi_toilets_access_community">Atzessu a sos bagnos: comunidade</string>
<string name="poi_toilets_access_public">Atzessu a sos bagnos: pùblicu</string>
<string name="poi_vending_cigarettes">Sigaretas</string>
</resources> </resources>

249
OsmAnd/res/values-sc/strings.xml
View file

File diff suppressed because one or more lines are too long

129
OsmAnd/res/values-sk/phrases.xml
View file

@ -1388,4 +1388,133 @@
<string name="poi_payment_credit_cards_no">Neprijíma kreditné karty</string> <string name="poi_payment_credit_cards_no">Neprijíma kreditné karty</string>
<string name="poi_traffic_calming_island">Ostrovček v ceste</string> <string name="poi_traffic_calming_island">Ostrovček v ceste</string>
<string name="poi_tourism_yes">Turistický objekt</string> <string name="poi_tourism_yes">Turistický objekt</string>
<string name="poi_buoy_isolated_danger">Bója izolovaného nebezpečenstva</string>
<string name="poi_seamark_light">Svetlo, námorná značka</string>
<string name="poi_seamark_light_major">Významné svetlo, námorná značka</string>
<string name="poi_seamark_light_minor">Druhoradé svetlo, námorná značka</string>
<string name="poi_seamark_light_float">Plávajúce svetlo, námorná značka</string>
<string name="poi_seamark_light_vessel">Svetlo plavidla, námorná značka</string>
<string name="poi_notice">Upozornenie, námorná značka</string>
<string name="poi_radar_transponder">Radarový vysielač, námorná značka</string>
<string name="poi_debris">Trosky</string>
<string name="poi_jersey_barrier">Skladacia bariéra</string>
<string name="poi_animal_shelter">Prístrešok pre zvieratá</string>
<string name="poi_payment_notes_yes">Prijíma bankovky</string>
<string name="poi_payment_notes_no">Neprijíma bankovky</string>
<string name="poi_payment_electronic_purses_yes">Prijíma elektronické peňaženky</string>
<string name="poi_payment_electronic_purses_no">Neprijíma elektronické peňaženky</string>
<string name="poi_payment_cash_yes">Prijíma hotovosť</string>
<string name="poi_payment_cash_no">Neprijíma hotovosť</string>
<string name="poi_payment_debit_cards_yes">Prijíma debetné karty</string>
<string name="poi_payment_debit_cards_no">Neprijíma debetné karty</string>
<string name="poi_payment_bitcoin_yes">Prijíma Bitcoin</string>
<string name="poi_payment_bitcoin_no">Neprijíma Bitcoin</string>
<string name="poi_payment_visa_yes">Prijíma Visa karty</string>
<string name="poi_payment_visa_no">Neprijíma Visa karty</string>
<string name="poi_payment_mastercard_yes">Prijíma MasterCard karty</string>
<string name="poi_payment_mastercard_no">Neprijíma MasterCard karty</string>
<string name="poi_payment_none">Bez poplatku</string>
<string name="poi_payment_account_cards_yes">Prijíma účtové karty</string>
<string name="poi_payment_account_cards_no">Neprijíma účtové karty</string>
<string name="poi_payment_maestro_yes">Prijíma Maestro karty</string>
<string name="poi_payment_maestro_no">Neprijíma Maestro karty</string>
<string name="poi_payment_american_express_yes">Prijíma American Express (AMEX) karty</string>
<string name="poi_payment_american_express_no">Neprijíma American Express (AMEX) karty</string>
<string name="poi_payment_diners_club_yes">Prijíma Diners Club karty</string>
<string name="poi_payment_diners_club_no">Neprijíma Diners Club karty</string>
<string name="poi_payment_dkv_yes">Prijíma DKV</string>
<string name="poi_payment_dkv_no">Neprijíma DKV</string>
<string name="poi_payment_uta_yes">Prijíma UTA karty</string>
<string name="poi_payment_uta_no">Neprijíma UTA karty</string>
<string name="poi_payment_efectivo_yes">Prijíma Efectivo</string>
<string name="poi_payment_efectivo_no">Neprijíma Efectivo</string>
<string name="poi_payment_girocard_yes">Prijíma Girocard</string>
<string name="poi_payment_girocard_no">Neprijíma Girocard</string>
<string name="poi_payment_discover_card_yes">Prijíma Discover karty</string>
<string name="poi_payment_discover_card_no">Neprijíma Discover karty</string>
<string name="poi_payment_visa_electron_yes">Prijíma Visa Electron karty</string>
<string name="poi_payment_visa_electron_no">Neprijíma Visa Electron karty</string>
<string name="poi_payment_litecoin_yes">Prijíma Litecoin</string>
<string name="poi_payment_litecoin_no">Neprijíma Litecoin</string>
<string name="poi_payment_cheque_yes">Prijíma šeky</string>
<string name="poi_payment_cheque_no">Neprijíma šeky</string>
<string name="poi_payment_pikepass_yes">Prijíma PIKEPASS</string>
<string name="poi_payment_pikepass_no">Neprijíma PIKEPASS</string>
<string name="poi_payment_pikepass_designated">Prijíma PIKEPASS (designated)</string>
<string name="poi_payment_visa_debit_yes">Prijíma Visa debetné karty</string>
<string name="poi_payment_visa_debit_no">Neprijíma Visa debetné karty</string>
<string name="poi_payment_cryptocurrencies_no">Neprijíma kryptomeny</string>
<string name="poi_payment_others_yes">Prijíma iné spôsoby platby</string>
<string name="poi_payment_others_no">Neprijíma iné spôsoby platby</string>
<string name="poi_payment_routex_yes">Prijíma Routex palivové karty</string>
<string name="poi_payment_routex_no">Neprijíma Routex palivové karty</string>
<string name="poi_payment_bancomat_yes">Prijíma Bancomat</string>
<string name="poi_payment_bancomat_no">Prijíma Bancomat</string>
<string name="poi_payment_icsf_yes">Prijíma karty IC s predplateným jazdným</string>
<string name="poi_payment_icsf_no">Neprijíma karty IC s predplateným jazdným</string>
<string name="poi_payment_prepaid_ticket_yes">Prijíma predplatené lístky</string>
<string name="poi_payment_jcb_yes">Prijíma JCB karty</string>
<string name="poi_payment_jcb_no">Neprijíma JCB karty</string>
<string name="poi_payment_laser_yes">Prijíma Laser karty</string>
<string name="poi_payment_laser_no">Neprijíma Laser karty</string>
<string name="poi_payment_ep_quick_yes">Prijíma Quick karty</string>
<string name="poi_payment_ep_quick_no">Neprijíma Quick karty</string>
<string name="poi_payment_eurowag_yes">Prijíma Eurowag karty</string>
<string name="poi_payment_eurowag_no">Neprijíma Eurowag karty</string>
<string name="poi_payment_e_zpass_yes">Prijíma E-ZPass</string>
<string name="poi_payment_e_zpass_no">Neprijíma E-ZPass</string>
<string name="poi_payment_euroshell_yes">Prijíma Euroshell palivové karty</string>
<string name="poi_payment_euroshell_no">Neprijíma Euroshell palivové karty</string>
<string name="poi_payment_kitcard_yes">Prijíma KITCard</string>
<string name="poi_payment_kitcard_no">Neprijíma KITCard</string>
<string name="poi_payment_westfalen_card_yes">Prijíma Westfalen karty</string>
<string name="poi_payment_westfalen_card_no">Neprijíma Westfalen karty</string>
<string name="poi_payment_v_pay_yes">Prijíma V PAY karty</string>
<string name="poi_payment_v_pay_no">Neprijíma V PAY karty</string>
<string name="poi_payment_dogecoin_yes">Prijíma Dogecoin</string>
<string name="poi_payment_dogecoin_no">Neprijíma Dogecoin</string>
<string name="poi_payment_cibus_yes">Prijíma Cibus karty</string>
<string name="poi_payment_cibus_no">Neprijíma Cibus karty</string>
<string name="poi_payment_wire_transfer_yes">Prijíma bankové prevody</string>
<string name="poi_payment_wire_transfer_no">Neprijíma bankové prevody</string>
<string name="poi_payment_ep_cash_yes">Prijíma Geldkarte hotovostné karty</string>
<string name="poi_payment_ep_cash_no">Neprijíma Geldkarte hotovostné karty</string>
<string name="poi_payment_ep_proton_yes">Prijíma Proton karty</string>
<string name="poi_payment_ep_proton_no">Neprijíma Proton karty</string>
<string name="poi_payment_ep_avant_yes">Prijíma AvantCard</string>
<string name="poi_payment_ep_avant_no">Neprijíma AvantCard</string>
<string name="poi_payment_ep_mep_yes">Prijíma MEP</string>
<string name="poi_payment_ep_mep_no">Neprijíma MEP</string>
<string name="poi_payment_ep_minipay_yes">Prijíma Minipay</string>
<string name="poi_payment_ep_minipay_no">Neprijíma Minipay</string>
<string name="poi_payment_ep_minicash_yes">Prijíma MiniCash</string>
<string name="poi_payment_ep_minicash_no">Neprijíma MiniCash</string>
<string name="poi_payment_ep_moneo_yes">Prijíma Moneo</string>
<string name="poi_payment_ep_moneo_no">Neprijíma Moneo</string>
<string name="poi_payment_ep_monedero4b_yes">Prijíma Monedero 4B</string>
<string name="poi_payment_ep_monedero4b_no">Neprijíma Monedero 4B</string>
<string name="poi_payment_ep_monedero_yes">Prijíma Monedero</string>
<string name="poi_payment_ep_monedero_no">Neprijíma Monedero</string>
<string name="poi_payment_bankaxess_yes">Prijíma BankAxess</string>
<string name="poi_payment_bankaxess_no">Neprijíma BankAxess</string>
<string name="poi_payment_coinkite_yes">Prijíma Coinkite</string>
<string name="poi_payment_coinkite_no">Neprijíma Coinkite</string>
<string name="poi_payment_roadrunner_yes">Prijíma Roadrunner karty</string>
<string name="poi_payment_roadrunner_no">Neprijíma Roadrunner karty</string>
<string name="poi_payment_svg_yes">Prijíma SVG</string>
<string name="poi_payment_svg_no">Neprijíma SVG</string>
<string name="poi_payment_sms_yes">Prijíma SMS platby</string>
<string name="poi_payment_sms_no">Neprijíma SMS platby</string>
<string name="poi_payment_ov_chipkaart_yes">Prijíma OV-Chipkaart</string>
<string name="poi_payment_ov_chipkaart_no">Neprijíma OV-Chipkaart</string>
<string name="poi_payment_oyster_yes">Prijíma Oyster karty</string>
<string name="poi_payment_oyster_no">Neprijíma Oyster karty</string>
<string name="poi_payment_sube_yes">Prijíma SUBE karty</string>
<string name="poi_payment_sube_no">Neprijíma SUBE karty</string>
<string name="poi_payment_via_verde_yes">Prijíma Via Verde</string>
<string name="poi_payment_via_verde_no">Neprijíma Via Verde</string>
<string name="poi_payment_meal_voucher_yes">Prijíma stravné poukážky</string>
<string name="poi_payment_meal_voucher_no">Neprijíma stravné poukážky</string>
<string name="poi_payment_paypal_yes">Prijíma PayPal</string>
<string name="poi_payment_paypal_no">Neprijíma PayPal</string>
</resources> </resources>

38
OsmAnd/res/values-sk/strings.xml
View file

@ -440,7 +440,7 @@
<string name="error_reading_gpx">Chyba pri načítavaní GPX údajov</string> <string name="error_reading_gpx">Chyba pri načítavaní GPX údajov</string>
<string name="vector_data">Vektorové OSM mapy</string> <string name="vector_data">Vektorové OSM mapy</string>
<string name="transport_context_menu">Hľadať prepravu na zastávke</string> <string name="transport_context_menu">Hľadať prepravu na zastávke</string>
<string name="osb_bug_name">Chyba</string>
<string name="poi_context_menu_modify">Upraviť bod záujmu (POI)</string> <string name="poi_context_menu_modify">Upraviť bod záujmu (POI)</string>
<string name="poi_context_menu_delete">Vymazať bod záujmu (POI)</string> <string name="poi_context_menu_delete">Vymazať bod záujmu (POI)</string>
<string name="rotate_map_compass_opt">Podľa kompasu</string> <string name="rotate_map_compass_opt">Podľa kompasu</string>
@ -677,7 +677,7 @@
<string name="search_address_street_option">Pretínajúca ulica</string> <string name="search_address_street_option">Pretínajúca ulica</string>
<string name="search_tabs_location">Pozícia</string> <string name="search_tabs_location">Pozícia</string>
<string name="context_menu_item_update_map">Aktualizovať mapu</string> <string name="context_menu_item_update_map">Aktualizovať mapu</string>
<string name="context_menu_item_open_bug">Otvoriť OSM chybu</string>
<string name="context_menu_item_create_poi">Vytvoriť POI</string> <string name="context_menu_item_create_poi">Vytvoriť POI</string>
<string name="add_favorite_dialog_top_text">Zadajte meno obľúbeného bodu</string> <string name="add_favorite_dialog_top_text">Zadajte meno obľúbeného bodu</string>
<string name="add_favorite_dialog_default_favourite_name">Obľúbený bod</string> <string name="add_favorite_dialog_default_favourite_name">Obľúbený bod</string>
@ -686,21 +686,21 @@
<string name="favourites_context_menu_delete">Vymazať obľúbený bod</string> <string name="favourites_context_menu_delete">Vymazať obľúbený bod</string>
<string name="favourites_remove_dialog_msg">Odstrániť obľúbený bod "%s"?</string> <string name="favourites_remove_dialog_msg">Odstrániť obľúbený bod "%s"?</string>
<string name="favourites_remove_dialog_success">Obľúbený bod {0} bol úspešne zmazaný.</string> <string name="favourites_remove_dialog_success">Obľúbený bod {0} bol úspešne zmazaný.</string>
<string name="osb_add_dialog_title">Zadajte popis k chybe</string>
<string name="osb_add_dialog_success">Chyba úspešne pridaná</string>
<string name="osb_add_dialog_error">Vyskytla sa výnimka: chybové hlásenie nebolo vytvorené</string>
<string name="osb_comment_menu_item">Pridať komentár</string>
<string name="osb_comment_dialog_message">Správa</string> <string name="osb_comment_dialog_message">Správa</string>
<string name="osb_comment_dialog_author">Meno autora</string> <string name="osb_comment_dialog_author">Meno autora</string>
<string name="osb_comment_dialog_title">Pridáva sa komentár k chybe</string>
<string name="osb_comment_dialog_add_button">Pridať komentár</string>
<string name="osb_comment_dialog_success">Komentár bol úspešne pridaný</string> <string name="osb_comment_dialog_success">Komentár bol úspešne pridaný</string>
<string name="osb_comment_dialog_error">Vyskytla sa výnimka: komentár nebol pridaný</string> <string name="osb_comment_dialog_error">Vyskytla sa výnimka: komentár nebol pridaný</string>
<string name="osb_close_menu_item">Zavrieť chybu</string>
<string name="osb_close_dialog_title">Zatvorenie chyby</string>
<string name="osb_close_dialog_close_button">Zavrieť chybu</string>
<string name="osb_close_dialog_success">Chyba bola úspešne uzavretá</string>
<string name="osb_close_dialog_error">Vyskytla sa výnimka: chybové hlásenie nebolo uzavreté</string>
<string name="poi_edit_title">Upravenie bodu záujmu (POI)</string> <string name="poi_edit_title">Upravenie bodu záujmu (POI)</string>
<string name="poi_create_title">Vytvorenie bodu záujmu (POI)</string> <string name="poi_create_title">Vytvorenie bodu záujmu (POI)</string>
<string name="poi_error_poi_not_found">Uzol sa nedá nájsť alebo bod záujmu nie je samostatný uzol</string> <string name="poi_error_poi_not_found">Uzol sa nedá nájsť alebo bod záujmu nie je samostatný uzol</string>
@ -1922,7 +1922,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="shared_string_send">Odoslať</string> <string name="shared_string_send">Odoslať</string>
<string name="application_dir_description">Zvoľte kam chcete uložiť súbory máp.</string> <string name="application_dir_description">Zvoľte kam chcete uložiť súbory máp.</string>
<string name="osm_edit_created_poi">Vytvorený OSM POI</string> <string name="osm_edit_created_poi">Vytvorený OSM POI</string>
<string name="osm_edit_created_bug">Vytvorená OSM chyba</string>
<string name="world_map_download_descr">Svetová základná mapa (pokrývajúca celý svet pri malom priblížení) chýba alebo je zastaralá. Prosím zvážte stiahnutie Svetovej základnej mapy, aby ste mali kompletné prostredie.</string> <string name="world_map_download_descr">Svetová základná mapa (pokrývajúca celý svet pri malom priblížení) chýba alebo je zastaralá. Prosím zvážte stiahnutie Svetovej základnej mapy, aby ste mali kompletné prostredie.</string>
<string name="shared_string_qr_code">QR kód</string> <string name="shared_string_qr_code">QR kód</string>
<string name="map_downloaded">Mapa stiahnutá</string> <string name="map_downloaded">Mapa stiahnutá</string>
@ -1957,4 +1957,14 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="read_more">Prečítať viac</string> <string name="read_more">Prečítať viac</string>
<string name="whats_new">Čo je nové v</string> <string name="whats_new">Čo je nové v</string>
<!-- string name="map_legend_item_description">Vysvetlivky k základnému mapovému štýlu v OsmAnd. Pre ich zobrazenie je potrebné pripojenie na Internet</string --> <!-- string name="map_legend_item_description">Vysvetlivky k základnému mapovému štýlu v OsmAnd. Pre ich zobrazenie je potrebné pripojenie na Internet</string -->
<string name="share_osm_edits_subject">Úpravy OSM zdieľané cez OsmAnd</string>
<string name="lang_nds">Dolná nemčina</string>
<string name="lang_mk">Macedónsky</string>
<string name="lang_fy">Frízsky</string>
<string name="lang_als">Albánsky (Tosk)</string>
<string name="save_poi_without_poi_type_message">Naozaj chcete uložiť bod bez uvedenia typu?</string>
<string name="shared_string_location">Poloha</string>
<string name="poi_context_menu_modify_osm_change">Upraviť zmenu OSM</string>
<string name="context_menu_item_delete_waypoint">Odstrániť bod GPX?</string>
<string name="context_menu_item_edit_waypoint">Upraviť bod GPX</string>
</resources> </resources>

43
OsmAnd/res/values-sl/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="search_button">Poišči</string> <string name="search_button">Poišči</string>
<string name="search_activity">Iskanje podatkov</string> <string name="search_activity">Iskanje podatkov</string>
@ -39,7 +38,7 @@
<string name="shared_string_add">Dodaj</string> <string name="shared_string_add">Dodaj</string>
<string name="shared_string_apply">Uporabi</string> <string name="shared_string_apply">Uporabi</string>
<string name="context_menu_item_create_poi">Ustvari točko POI</string> <string name="context_menu_item_create_poi">Ustvari točko POI</string>
<string name="context_menu_item_open_bug">Prijavi napako OSM</string>
<string name="context_menu_item_update_map">Osveži zemljevid</string> <string name="context_menu_item_update_map">Osveži zemljevid</string>
<string name="search_tabs_location">Mesto</string> <string name="search_tabs_location">Mesto</string>
<string name="add_favorite_dialog_default_favourite_name">Priljubljena točka</string> <string name="add_favorite_dialog_default_favourite_name">Priljubljena točka</string>
@ -586,21 +585,21 @@
<string name="osm_settings">Urejanje točk OSM</string> <string name="osm_settings">Urejanje točk OSM</string>
<string name="website">Spletna stran</string> <string name="website">Spletna stran</string>
<string name="osb_add_dialog_title">Vnos napake OSM</string>
<string name="osb_comment_dialog_message">Sporočilo</string> <string name="osb_comment_dialog_message">Sporočilo</string>
<string name="osb_comment_dialog_author">Ime avtorja</string> <string name="osb_comment_dialog_author">Ime avtorja</string>
<string name="osb_add_dialog_success">Poročilo o hrošču je uspešno ustvarjeno</string>
<string name="osb_add_dialog_error">Prišlo je do napake: napaka ni bila ustvarjena</string>
<string name="osb_comment_dialog_add_button">Dodaj opis napake</string>
<string name="osb_comment_menu_item">Dodaj opis napake</string>
<string name="osb_comment_dialog_title">Dodajanje opisa napake</string>
<string name="osb_comment_dialog_success">Opomba je bila uspešno dodana</string> <string name="osb_comment_dialog_success">Opomba je bila uspešno dodana</string>
<string name="osb_comment_dialog_error">Prišlo je do napake: opomba ni bila dodana</string> <string name="osb_comment_dialog_error">Prišlo je do napake: opomba ni bila dodana</string>
<string name="osb_close_menu_item">Zapri hrošča</string>
<string name="osb_close_dialog_title">Zapiranje hrošča</string>
<string name="osb_close_dialog_close_button">Zapri hrošča</string>
<string name="osb_close_dialog_success">Hrošč je bil uspešno zaprt</string>
<string name="osb_close_dialog_error">Prišlo je do napake: hrošča ni mogoče zapreti</string>
<string name="route_descr_lat_lon">ZD (λ) %1$.3f; ZŠ (β) %2$.3f</string> <string name="route_descr_lat_lon">ZD (λ) %1$.3f; ZŠ (β) %2$.3f</string>
@ -806,7 +805,7 @@
<string name="error_reading_gpx">Napaka med branjem podatkov GPX</string> <string name="error_reading_gpx">Napaka med branjem podatkov GPX</string>
<string name="vector_data">Vektorski zemljevidi za delo brez povezave</string> <string name="vector_data">Vektorski zemljevidi za delo brez povezave</string>
<string name="transport_context_menu">Iskanje prevoza na postaji</string> <string name="transport_context_menu">Iskanje prevoza na postaji</string>
<string name="osb_bug_name">Hrošč</string>
<string name="rotate_map_to_bearing_descr">Izbor poravnave zaslona zemljevida</string> <string name="rotate_map_to_bearing_descr">Izbor poravnave zaslona zemljevida</string>
<string name="show_route">Podrobnosti poti</string> <string name="show_route">Podrobnosti poti</string>
<string name="fav_imported_sucessfully">Priljubljene točke so uspešno uvožene</string> <string name="fav_imported_sucessfully">Priljubljene točke so uspešno uvožene</string>
@ -1084,7 +1083,7 @@
<string name="local_osm_changes_backup">Varnostna kopija sprememb za OSM</string> <string name="local_osm_changes_backup">Varnostna kopija sprememb za OSM</string>
<string name="destination_point">Cilj %1$s</string> <string name="destination_point">Cilj %1$s</string>
<string name="intermediate_items_sort_by_distance">Razvrsti (od vrat do vrat)</string> <string name="intermediate_items_sort_by_distance">Razvrsti od vrat do vrat</string>
<string name="osmand_distance_planning_plugin_description">Vstavek omogoča načrtovanje poti (ali uporabo/spreminjanje obstoječih datotek GPX) in merjenje razdalj med točkami na sledi. Podatke je mogoče shraniti kot poti GPX in jih kasneje uporabiti tudi na poti.</string> <string name="osmand_distance_planning_plugin_description">Vstavek omogoča načrtovanje poti (ali uporabo/spreminjanje obstoječih datotek GPX) in merjenje razdalj med točkami na sledi. Podatke je mogoče shraniti kot poti GPX in jih kasneje uporabiti tudi na poti.</string>
<string name="osmand_distance_planning_plugin_name">Orodje za načrtovanje poti</string> <string name="osmand_distance_planning_plugin_name">Orodje za načrtovanje poti</string>
<string name="distance_measurement_finish_subtrack">Začni z novo podrejeno sledjo</string> <string name="distance_measurement_finish_subtrack">Začni z novo podrejeno sledjo</string>
@ -1941,7 +1940,7 @@
<string name="free_downloads_used">Omejitev brezplačnih prejemov je dosežena.</string> <string name="free_downloads_used">Omejitev brezplačnih prejemov je dosežena.</string>
<string name="free_downloads_used_description">Videti je mogoče, koliko brezplačnih prejemov je že bilo izvedenih.</string> <string name="free_downloads_used_description">Videti je mogoče, koliko brezplačnih prejemov je že bilo izvedenih.</string>
<string name="osm_edit_created_poi">Ustvarjena točka POI</string> <string name="osm_edit_created_poi">Ustvarjena točka POI</string>
<string name="osm_edit_created_bug">Ustvarjen hrošč OSM</string>
<string name="shared_string_qr_code">Koda QR</string> <string name="shared_string_qr_code">Koda QR</string>
<string name="map_downloaded">Zemljevid je prejet</string> <string name="map_downloaded">Zemljevid je prejet</string>
<string name="map_downloaded_descr">Zemljevid %1$s je prejet in je pripravljen za uporabo.</string> <string name="map_downloaded_descr">Zemljevid %1$s je prejet in je pripravljen za uporabo.</string>
@ -1987,4 +1986,14 @@
<string name="read_more">Preberite več</string> <string name="read_more">Preberite več</string>
<string name="whats_new">Kaj je novega v</string> <string name="whats_new">Kaj je novega v</string>
<string name="rendering_attr_hideProposed_name">Skrij predlagane predmete</string> <string name="rendering_attr_hideProposed_name">Skrij predlagane predmete</string>
<string name="share_osm_edits_subject">Posodobitve OSM, oddane preko OsmAnd</string>
<string name="lang_nds">Nizka nemščina</string>
<string name="lang_mk">Makedonščina</string>
<string name="lang_fy">Frizijščina</string>
<string name="lang_als">Toskovska albanščina</string>
<string name="save_poi_without_poi_type_message">Ali res želite shraniti točko POI brez ustreznega določila vrste?</string>
<string name="context_menu_item_delete_waypoint">Ali želite izbrisati vmesno točko GPX?</string>
<string name="context_menu_item_edit_waypoint">Uredi vmesno točko GPX</string>
<string name="shared_string_location">Mesto</string>
<string name="poi_context_menu_modify_osm_change">Popravi spremembo OSM</string>
</resources> </resources>

2
OsmAnd/res/values-sr/strings.xml
View file

@ -169,7 +169,7 @@
<string name="gpx_files_not_found">Нема GPX фајлова у фасцикли стаза</string> <string name="gpx_files_not_found">Нема GPX фајлова у фасцикли стаза</string>
<string name="error_reading_gpx">Грешка при читању GPX података</string> <string name="error_reading_gpx">Грешка при читању GPX података</string>
<string name="osb_bug_name">Грешка</string>
<string name="poi_context_menu_modify">Измена POI</string> <string name="poi_context_menu_modify">Измена POI</string>
<string name="poi_context_menu_delete">Брисање POI</string> <string name="poi_context_menu_delete">Брисање POI</string>
<string name="rotate_map_none_opt">Без ротације (север је горе)</string> <string name="rotate_map_none_opt">Без ротације (север је горе)</string>

35
OsmAnd/res/values-sv/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string> <string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
<string name="ChooseCountry">Välj land</string> <string name="ChooseCountry">Välj land</string>
<string name="choose_city">Välj stad</string> <string name="choose_city">Välj stad</string>
@ -81,7 +80,7 @@
<string name="search_tabs_location">Plats</string> <string name="search_tabs_location">Plats</string>
<string name="context_menu_item_update_map">Uppdatera kartan</string> <string name="context_menu_item_update_map">Uppdatera kartan</string>
<string name="context_menu_item_open_bug">Öppna OSM-bugg</string>
<string name="context_menu_item_create_poi">Skapa POI</string> <string name="context_menu_item_create_poi">Skapa POI</string>
<string name="use_internet">Använd Internet</string> <string name="use_internet">Använd Internet</string>
<string name="map_widget_config">Konfigurera skärmen</string> <string name="map_widget_config">Konfigurera skärmen</string>
@ -751,7 +750,7 @@
<string name="fav_points_edited">Favoritpunkten redigerades</string> <string name="fav_points_edited">Favoritpunkten redigerades</string>
<string name="edit_filter_delete_message">Filtret {0} har tagits bort</string> <string name="edit_filter_delete_message">Filtret {0} har tagits bort</string>
<string name="poi_dialog_name">Namn</string> <string name="poi_dialog_name">Namn</string>
<string name="osb_bug_name">Bugg</string>
<string name="foot">ft</string> <string name="foot">ft</string>
<string name="mile_per_hour">mph</string> <string name="mile_per_hour">mph</string>
<string name="mile">mi</string> <string name="mile">mi</string>
@ -809,21 +808,21 @@
<string name="favourites_context_menu_delete">Ta bort favorit</string> <string name="favourites_context_menu_delete">Ta bort favorit</string>
<string name="favourites_remove_dialog_msg">Ta bort favoritpunkten \'%s\'?</string> <string name="favourites_remove_dialog_msg">Ta bort favoritpunkten \'%s\'?</string>
<string name="favourites_remove_dialog_success">Favoritpunkten {0} togs bort utan problem.</string> <string name="favourites_remove_dialog_success">Favoritpunkten {0} togs bort utan problem.</string>
<string name="osb_add_dialog_title">Skriv in buggtext</string>
<string name="osb_add_dialog_success">Bugg har skapats</string>
<string name="osb_add_dialog_error">Ett undantagsfel inträffade: bugg skapades inte</string>
<string name="osb_comment_menu_item">Lägg till en kommentar</string>
<string name="osb_comment_dialog_message">Meddelande</string> <string name="osb_comment_dialog_message">Meddelande</string>
<string name="osb_comment_dialog_author">Författarnamn</string> <string name="osb_comment_dialog_author">Författarnamn</string>
<string name="osb_comment_dialog_title">Lägger till kommentar till bugg</string>
<string name="osb_comment_dialog_add_button">Lägg till rn kommentar</string>
<string name="osb_comment_dialog_success">Kommentaren lades till utan problem</string> <string name="osb_comment_dialog_success">Kommentaren lades till utan problem</string>
<string name="osb_comment_dialog_error">Ett undantagsfel inträffade: kommentaren lades inte till</string> <string name="osb_comment_dialog_error">Ett undantagsfel inträffade: kommentaren lades inte till</string>
<string name="osb_close_menu_item">Stäng bugg</string>
<string name="osb_close_dialog_title">Stänger bugg</string>
<string name="osb_close_dialog_close_button">Stäng bugg</string>
<string name="osb_close_dialog_success">Buggen stängdes utan problem</string>
<string name="osb_close_dialog_error">Ett undantagsfel inträffade: buggen stängdes inte</string>
<string name="poi_edit_title">Redigera POI</string> <string name="poi_edit_title">Redigera POI</string>
<string name="poi_create_title">Skapa POI</string> <string name="poi_create_title">Skapa POI</string>
<string name="poi_error_poi_not_found">Noden kan inte hittas eller bekvämligheten är inte en enda nod</string> <string name="poi_error_poi_not_found">Noden kan inte hittas eller bekvämligheten är inte en enda nod</string>
@ -1036,7 +1035,7 @@
<string name="search_street_in_neighborhood_cities">Sök gator i grannstäder</string> <string name="search_street_in_neighborhood_cities">Sök gator i grannstäder</string>
<string name="intermediate_items_sort_return">Mellanliggande waypoints ordnade för att optimera deras ordning från aktuell position till destinationen.</string> <string name="intermediate_items_sort_return">Mellanliggande waypoints ordnade för att optimera deras ordning från aktuell position till destinationen.</string>
<string name="intermediate_items_sort_by_distance">Sortera (dörr-till-dörr)</string> <string name="intermediate_items_sort_by_distance">Sortera dörr-till-dörr</string>
<string name="local_osm_changes_backup_failed">Säkerhetskopieringen av OSM-ändringar misslyckades</string> <string name="local_osm_changes_backup_failed">Säkerhetskopieringen av OSM-ändringar misslyckades</string>
<string name="local_osm_changes_backup">Säkerhetskopiera som OSM-förändring</string> <string name="local_osm_changes_backup">Säkerhetskopiera som OSM-förändring</string>
<string name="delete_point">Ta bort punkt</string> <string name="delete_point">Ta bort punkt</string>
@ -1959,7 +1958,7 @@
<string name="versions_item">Versioner</string> <string name="versions_item">Versioner</string>
<string name="contact_us">Kontakta oss</string> <string name="contact_us">Kontakta oss</string>
<string name="osm_edit_created_poi">Skapat en OSM POI</string> <string name="osm_edit_created_poi">Skapat en OSM POI</string>
<string name="osm_edit_created_bug">Skapat en OSM-bugg</string>
<string name="world_map_download_descr">Baskarta över världen (täcker hela världen med låg zoomningsgrad) saknas eller är gammal. Hämta gärna denna karta till din enhet.</string> <string name="world_map_download_descr">Baskarta över världen (täcker hela världen med låg zoomningsgrad) saknas eller är gammal. Hämta gärna denna karta till din enhet.</string>
<string name="shared_string_upload">Skicka</string> <string name="shared_string_upload">Skicka</string>
<string name="map_legend">Teckenförklaring</string> <string name="map_legend">Teckenförklaring</string>
@ -1975,4 +1974,6 @@
<string name="lang_als">Albanska (Toskiska)</string> <string name="lang_als">Albanska (Toskiska)</string>
<string name="share_osm_edits_subject">Osm-redigeringar delade via OsmAnd</string> <string name="share_osm_edits_subject">Osm-redigeringar delade via OsmAnd</string>
<string name="save_poi_without_poi_type_message">Vill du verkligen spara denna POI utan att ange typ?</string> <string name="save_poi_without_poi_type_message">Vill du verkligen spara denna POI utan att ange typ?</string>
<string name="shared_string_location">Plats</string>
<string name="poi_context_menu_modify_osm_change">Modifiera OSM-ändring</string>
</resources> </resources>

12
OsmAnd/res/values-tr/strings.xml
View file

@ -362,7 +362,7 @@
<string name="voice">Ses</string> <string name="voice">Ses</string>
<string name="no_vector_map_loaded">Vektör haritalar yüklenmedi</string> <string name="no_vector_map_loaded">Vektör haritalar yüklenmedi</string>
<string name="vector_data">Çevrimdışı vektör haritaları</string> <string name="vector_data">Çevrimdışı vektör haritaları</string>
<string name="osb_bug_name">Hata</string>
<string name="poi_context_menu_delete">POI sil</string> <string name="poi_context_menu_delete">POI sil</string>
<string name="fav_saved_sucessfully">Favoriler şuraya başarıyla kaydedildi: {0}</string> <string name="fav_saved_sucessfully">Favoriler şuraya başarıyla kaydedildi: {0}</string>
<string name="no_fav_to_save">Kaydedecek favori noktalar yok</string> <string name="no_fav_to_save">Kaydedecek favori noktalar yok</string>
@ -462,14 +462,14 @@
<string name="shared_string_no">Hayır</string> <string name="shared_string_no">Hayır</string>
<string name="add_favorite_dialog_default_favourite_name">Favori</string> <string name="add_favorite_dialog_default_favourite_name">Favori</string>
<string name="favourites_context_menu_delete">Favoriyi sil</string> <string name="favourites_context_menu_delete">Favoriyi sil</string>
<string name="osb_add_dialog_error">İstisnai durum oluştu: Hata oluşturulamadı</string>
<string name="osb_comment_menu_item">Yorum ekle</string>
<string name="osb_comment_dialog_message">Mesaj</string> <string name="osb_comment_dialog_message">Mesaj</string>
<string name="osb_comment_dialog_author">Yazar adı</string> <string name="osb_comment_dialog_author">Yazar adı</string>
<string name="osb_comment_dialog_add_button">Yorum ekle</string>
<string name="osb_comment_dialog_success">Yorum başarıyla eklendi</string> <string name="osb_comment_dialog_success">Yorum başarıyla eklendi</string>
<string name="osb_comment_dialog_error">İstisnai durum oluştu: yorum eklenemedi</string> <string name="osb_comment_dialog_error">İstisnai durum oluştu: yorum eklenemedi</string>
<string name="osb_close_dialog_success">Hata başarıyla kapatıldı</string>
<string name="poi_edit_title">POI düzenle</string> <string name="poi_edit_title">POI düzenle</string>
<string name="poi_create_title">POI oluştur</string> <string name="poi_create_title">POI oluştur</string>
<string name="poi_remove_title">POI sil</string> <string name="poi_remove_title">POI sil</string>
@ -777,7 +777,7 @@
<string name="context_menu_item_destination_point">Hedef olarak belirle</string> <string name="context_menu_item_destination_point">Hedef olarak belirle</string>
<string name="please_select_address">Önce şehir ya da sokak seç</string> <string name="please_select_address">Önce şehir ya da sokak seç</string>
<string name="search_street_in_neighborhood_cities">Yakın şehirlerde sokak ara</string> <string name="search_street_in_neighborhood_cities">Yakın şehirlerde sokak ara</string>
<string name="intermediate_items_sort_by_distance">Sırala (kapıdan kapıya)</string> <string name="intermediate_items_sort_by_distance">Sırala kapıdan kapıya</string>
<string name="local_osm_changes_backup_successful">OSM değişiklik dosyası başarıyla oluşturuldu</string> <string name="local_osm_changes_backup_successful">OSM değişiklik dosyası başarıyla oluşturuldu</string>
<string name="local_osm_changes_backup_failed">OSM değişikliklerinin yedeklemesi başarısız</string> <string name="local_osm_changes_backup_failed">OSM değişikliklerinin yedeklemesi başarısız</string>
<string name="delete_point">Mevkiyi sil</string> <string name="delete_point">Mevkiyi sil</string>

29
OsmAnd/res/values-uk/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="asap">Швидко</string> <string name="asap">Швидко</string>
<string name="route_roundabout">Круговий рух : %1$d з’їзд</string> <string name="route_roundabout">Круговий рух : %1$d з’їзд</string>
@ -491,7 +490,7 @@
<string name="vector_data">Оффлайн векторні мапи</string> <string name="vector_data">Оффлайн векторні мапи</string>
<string name="transport_context_menu">Шукати транспорт на зупинці</string> <string name="transport_context_menu">Шукати транспорт на зупинці</string>
<string name="osb_bug_name">Помилка</string>
<string name="poi_context_menu_modify">Редагувати POI</string> <string name="poi_context_menu_modify">Редагувати POI</string>
<string name="poi_context_menu_delete">Вилучити POI</string> <string name="poi_context_menu_delete">Вилучити POI</string>
<string name="rotate_map_compass_opt">За напрямком компаса</string> <string name="rotate_map_compass_opt">За напрямком компаса</string>
@ -760,7 +759,7 @@
<string name="search_tabs_location">Координати</string> <string name="search_tabs_location">Координати</string>
<string name="context_menu_item_update_map">Оновити мапу</string> <string name="context_menu_item_update_map">Оновити мапу</string>
<string name="context_menu_item_open_bug">Повідомити про помилку на мапі</string>
<string name="context_menu_item_create_poi">Додати POI</string> <string name="context_menu_item_create_poi">Додати POI</string>
<string name="shared_string_yes">Так</string> <string name="shared_string_yes">Так</string>
<string name="shared_string_cancel">Скасувати</string> <string name="shared_string_cancel">Скасувати</string>
@ -774,21 +773,21 @@
<string name="favourites_context_menu_delete">Вилучити точку</string> <string name="favourites_context_menu_delete">Вилучити точку</string>
<string name="favourites_remove_dialog_msg">Ви дійсно хочете вилучити точку \'%s\' з Закладок?</string> <string name="favourites_remove_dialog_msg">Ви дійсно хочете вилучити точку \'%s\' з Закладок?</string>
<string name="favourites_remove_dialog_success">Точка {0} була успішно вилучена з Закладок.</string> <string name="favourites_remove_dialog_success">Точка {0} була успішно вилучена з Закладок.</string>
<string name="osb_add_dialog_title">Опишіть детально помилку</string>
<string name="osb_add_dialog_success">Дякую, ваше повідомлення було відіслано</string>
<string name="osb_add_dialog_error">Виникла помилка при створенні повідомлення</string>
<string name="osb_comment_menu_item">Додати коментар</string>
<string name="osb_comment_dialog_message">Повідомлення</string> <string name="osb_comment_dialog_message">Повідомлення</string>
<string name="osb_comment_dialog_author">Автор</string> <string name="osb_comment_dialog_author">Автор</string>
<string name="osb_comment_dialog_title">Додати коментар в Open Street Bug</string>
<string name="osb_comment_dialog_add_button">Додати</string>
<string name="osb_comment_dialog_success">Коментар успішно додано</string> <string name="osb_comment_dialog_success">Коментар успішно додано</string>
<string name="osb_comment_dialog_error">Помилка: коментар не додано</string> <string name="osb_comment_dialog_error">Помилка: коментар не додано</string>
<string name="osb_close_menu_item">Закрити Open Street Bug</string>
<string name="osb_close_dialog_title">Закрити баг</string>
<string name="osb_close_dialog_close_button">Закрити баг</string>
<string name="osb_close_dialog_success">Open Street Bug успішно закрито</string>
<string name="osb_close_dialog_error">Виникла помилка при закритті Open Street Bug</string>
<string name="poi_edit_title">Редагування POI</string> <string name="poi_edit_title">Редагування POI</string>
<string name="poi_create_title">Створити POI</string> <string name="poi_create_title">Створити POI</string>
<string name="poi_error_poi_not_found">POI не знайдена або не є точкою</string> <string name="poi_error_poi_not_found">POI не знайдена або не є точкою</string>

26
OsmAnd/res/values-vi/strings.xml
View file

@ -316,7 +316,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com --><resources>
<string name="vector_data">Bản đồ vector Offline</string> <string name="vector_data">Bản đồ vector Offline</string>
<string name="transport_context_menu">Search transport at stop</string> <string name="transport_context_menu">Search transport at stop</string>
<string name="osb_bug_name">Bug</string>
<string name="poi_context_menu_modify">Sửa địa điểm</string> <string name="poi_context_menu_modify">Sửa địa điểm</string>
<string name="poi_context_menu_delete">Xóa địa điểm</string> <string name="poi_context_menu_delete">Xóa địa điểm</string>
<string name="rotate_map_compass_opt">Theo la bàn</string> <string name="rotate_map_compass_opt">Theo la bàn</string>
@ -590,7 +590,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com --><resources>
<string name="search_tabs_location">Khu vực</string> <string name="search_tabs_location">Khu vực</string>
<string name="context_menu_item_update_map">Cập nhật bản đồ</string> <string name="context_menu_item_update_map">Cập nhật bản đồ</string>
<string name="context_menu_item_open_bug">Mở OSM bug</string>
<string name="context_menu_item_create_poi">Tạo địa điểm</string> <string name="context_menu_item_create_poi">Tạo địa điểm</string>
<string name="shared_string_yes">OK</string> <string name="shared_string_yes">OK</string>
@ -608,23 +608,23 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com --><resources>
<string name="favourites_remove_dialog_msg">Bạn có muốn xóa điểm ưa thích \'%s\'?</string> <string name="favourites_remove_dialog_msg">Bạn có muốn xóa điểm ưa thích \'%s\'?</string>
<string name="favourites_remove_dialog_success">Điểm Ưa thích {0} đã xóa thành công.</string> <string name="favourites_remove_dialog_success">Điểm Ưa thích {0} đã xóa thành công.</string>
<string name="osb_add_dialog_title">Nhập thông tin bug</string>
<string name="osb_add_dialog_success">Bug được tạo thành công</string>
<string name="osb_add_dialog_error">Exception occured: bug was not created</string>
<string name="osb_comment_menu_item">Thêm bình luận</string>
<string name="osb_comment_dialog_message">Nội dung</string> <string name="osb_comment_dialog_message">Nội dung</string>
<string name="osb_comment_dialog_author">Tên tác giả</string> <string name="osb_comment_dialog_author">Tên tác giả</string>
<string name="osb_comment_dialog_title">Thêm bình luận cho lỗi</string>
<string name="osb_comment_dialog_add_button">Thêm bình luận</string>
<string name="osb_comment_dialog_success">Bình luận được thêm thành công</string> <string name="osb_comment_dialog_success">Bình luận được thêm thành công</string>
<string name="osb_comment_dialog_error">Ngoại lệ xảy ra: Bình luận không được thêm</string> <string name="osb_comment_dialog_error">Ngoại lệ xảy ra: Bình luận không được thêm</string>
<string name="osb_close_menu_item">Đóng bug</string>
<string name="osb_close_dialog_title">Đang đóng bug</string>
<string name="osb_close_dialog_close_button">Đóng bug</string>
<string name="osb_close_dialog_success">Bug đã được đóng thành công</string>
<string name="osb_close_dialog_error">Biệt lệ xảy ra: bug không được đóng</string>
<string name="poi_edit_title">Sửa địa điểm</string> <string name="poi_edit_title">Sửa địa điểm</string>
<string name="poi_create_title">Tạo địa điểm</string> <string name="poi_create_title">Tạo địa điểm</string>

28
OsmAnd/res/values-zh-rCN/strings.xml
View file

@ -294,7 +294,7 @@
<string name="gpx_files_not_found">GPX文件中找不到/曲目目录</string> <string name="gpx_files_not_found">GPX文件中找不到/曲目目录</string>
<string name="layer_gpx_layer">GPX轨迹…</string> <string name="layer_gpx_layer">GPX轨迹…</string>
<string name="error_reading_gpx">GPX数据读取错误</string> <string name="error_reading_gpx">GPX数据读取错误</string>
<string name="osb_bug_name">问题</string>
<string name="error_occurred_loading_gpx">时发生错误加载GPX</string> <string name="error_occurred_loading_gpx">时发生错误加载GPX</string>
<string name="shared_string_import">导入</string> <string name="shared_string_import">导入</string>
@ -880,7 +880,7 @@
<string name="shared_string_show_on_map">在地图上显示</string> <string name="shared_string_show_on_map">在地图上显示</string>
<string name="context_menu_item_update_map">更新地图</string> <string name="context_menu_item_update_map">更新地图</string>
<string name="context_menu_item_open_bug">打开 OSM bug</string>
<string name="context_menu_item_create_poi">创建POI</string> <string name="context_menu_item_create_poi">创建POI</string>
<string name="add_favorite_dialog_top_text">输入收藏点名称</string> <string name="add_favorite_dialog_top_text">输入收藏点名称</string>
<string name="add_favorite_dialog_default_favourite_name">收藏夹</string> <string name="add_favorite_dialog_default_favourite_name">收藏夹</string>
@ -889,22 +889,22 @@
<string name="favourites_context_menu_delete">删除收藏</string> <string name="favourites_context_menu_delete">删除收藏</string>
<string name="favourites_remove_dialog_msg">是否删除收藏点 \'%s\'？</string> <string name="favourites_remove_dialog_msg">是否删除收藏点 \'%s\'？</string>
<string name="favourites_remove_dialog_success">收藏点 {0} 已被成功删除。</string> <string name="favourites_remove_dialog_success">收藏点 {0} 已被成功删除。</string>
<string name="osb_add_dialog_title">输出 Bug 文本</string>
<string name="osb_add_dialog_success">Bug 已成功创建</string>
<string name="osb_add_dialog_error">发生异常：Bug 未能创建</string>
<string name="osb_author_dialog_password">OSM 密码(可选)</string> <string name="osb_author_dialog_password">OSM 密码(可选)</string>
<string name="osb_comment_menu_item">添加备注</string>
<string name="osb_comment_dialog_message">消息</string> <string name="osb_comment_dialog_message">消息</string>
<string name="osb_comment_dialog_author">作者名称</string> <string name="osb_comment_dialog_author">作者名称</string>
<string name="osb_comment_dialog_title">向 Bug 添加备注</string>
<string name="osb_comment_dialog_add_button">添加备注</string>
<string name="osb_comment_dialog_success">备注已成功添加</string> <string name="osb_comment_dialog_success">备注已成功添加</string>
<string name="osb_comment_dialog_error">发生异常：备注未能添加</string> <string name="osb_comment_dialog_error">发生异常：备注未能添加</string>
<string name="osb_close_menu_item">关闭 Bug</string>
<string name="osb_close_dialog_title">正在关闭 Bug</string>
<string name="osb_close_dialog_close_button">关闭 Bug</string>
<string name="osb_close_dialog_success">Bug 已被成功关闭</string>
<string name="osb_close_dialog_error">发生异常：Bug 未能关闭</string>
<string name="poi_edit_title">编辑 POI</string> <string name="poi_edit_title">编辑 POI</string>
<string name="poi_create_title">创建 POI</string> <string name="poi_create_title">创建 POI</string>
<string name="poi_error_poi_not_found">节点未找到，或者设施不是单个节点</string> <string name="poi_error_poi_not_found">节点未找到，或者设施不是单个节点</string>
@ -928,7 +928,7 @@
<string name="settings_preset_descr">每种使用场景的地图和导航设置是相互独立的。在这里设置您的缺省使用场景。</string> <string name="settings_preset_descr">每种使用场景的地图和导航设置是相互独立的。在这里设置您的缺省使用场景。</string>
<string name="intermediate_items_sort_by_distance">排序 (门到门)</string> <string name="intermediate_items_sort_by_distance">排序 门到门</string>
<string name="plugin_distance_point_ele">海拔</string> <string name="plugin_distance_point_ele">海拔</string>
<string name="use_kalman_filter_compass_descr">使用卡尔曼滤波避免罗盘误差</string> <string name="use_kalman_filter_compass_descr">使用卡尔曼滤波避免罗盘误差</string>
<string name="use_kalman_filter_compass">使用卡尔曼滤波</string> <string name="use_kalman_filter_compass">使用卡尔曼滤波</string>

14
OsmAnd/res/values-zh-rTW/phrases.xml
View file

@ -2170,4 +2170,18 @@
<string name="poi_social_facility_workshop">社會設施：工場</string> <string name="poi_social_facility_workshop">社會設施：工場</string>
<string name="poi_social_facility_day_care">社會設施：日間護理</string> <string name="poi_social_facility_day_care">社會設施：日間護理</string>
<string name="poi_social_facility_for_senior">目標社群：老年人</string>
<string name="poi_social_facility_for_child">目標社群：兒童</string>
<string name="poi_social_facility_for_orphan">目標社群：孤兒</string>
<string name="poi_social_facility_for_disabled">目標社群：身心障礙者</string>
<string name="poi_social_facility_for_mental_health">目標社群：精神疾病患者</string>
<string name="poi_social_facility_for_juvenile">目標社群：青少年</string>
<string name="poi_social_facility_for_homeless">目標社群：無家可歸者</string>
<string name="poi_social_facility_for_migrant">目標社群：移民</string>
<string name="poi_social_facility_for_underprivileged">目標社群：貧困者</string>
<string name="poi_social_facility_for_drug_addicted">目標社群：吸毒成癮者</string>
<string name="poi_social_facility_for_unemployed">目標社群：失業者</string>
<string name="poi_social_facility_for_diseased">目標社群：病患者</string>
<string name="poi_social_facility_for_child_juvenile">目標社群：兒童；青少年</string>
</resources> </resources>

64
OsmAnd/res/values-zh-rTW/strings.xml
View file

File diff suppressed because one or more lines are too long

5
OsmAnd/res/values/colors.xml
View file

@ -1,6 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="audio_video_icon_color">#128a89</color>
<color name="created_poi_icon_color">#4caf50</color>
<color name="osm_bug_unresolved_icon_color">#d44a4a</color>
<color name="osm_bug_resolved_icon_color">#4caf50</color>
<color name="osmand_orange">#ff8f00</color> <color name="osmand_orange">#ff8f00</color>
<color name="app_mode_icon_color">#33B4E4</color> <color name="app_mode_icon_color">#33B4E4</color>
<color name="recording_color">#F44336</color> <color name="recording_color">#F44336</color>

69
OsmAnd/res/values/strings.xml
View file

@ -9,6 +9,43 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
--> -->
<string name="release_2_2">
\u2022 New context-sensitive UI for tapping locations on the map and on other screens\n\n
\u2022 Map screen is now launched directly unless \'Show Dashboard on app start\' is selected\n\n
\u2022 Configure which and how cards are displayed on the Dashboard\n\n
\u2022 To download maps, regions can be directly selected by tapping on the world map\n\n
\u2022 POI Search now supports more specific queries\n\n
\u2022 Imporoved POI and OSM Editing functionality\n\n
\u2022 Map data download structure and interface reworked\n\n
and more...
</string>
<string name="osm_save_offline">Save offline</string>
<string name="osm_edit_modified_poi">Modified OSM POI</string>
<string name="osm_edit_deleted_poi">Deleted OSM POI</string>
<string name="context_menu_item_open_note">Open OSM Note</string>
<string name="osm_edit_reopened_note">Reopened OSM Note</string>
<string name="osm_edit_commented_note">Commented OSM Note</string>
<string name="osm_edit_removed_note">Deleted OSM Note</string>
<string name="osm_edit_created_note">Created OSM Note</string>
<string name="osn_bug_name">Osm Note</string>
<string name="osn_add_dialog_title">Create note</string>
<string name="osn_comment_dialog_title">Add comment</string>
<string name="osn_reopen_dialog_title">Reopen note</string>
<string name="osn_close_dialog_title">Close note</string>
<string name="osn_add_dialog_success">Note successfully created</string>
<string name="osn_add_dialog_error">Exception occurred: note was not created</string>
<string name="osn_close_dialog_success">Bug was successfully closed</string>
<string name="osn_close_dialog_error">Exception occurred: note was not closed</string>
<string name="osb_author_dialog_password">OSM password (optional)</string>
<string name="osb_comment_dialog_message">Message</string>
<string name="osb_comment_dialog_author">Author name</string>
<string name="osb_comment_dialog_error">Exception occurred: comment was not added</string>
<string name="osb_comment_dialog_success">Comment was successfully added</string>
<string name="shared_string_commit">Commit</string>
<string name="context_menu_item_delete_waypoint">Delete GPX waypoint?</string>
<string name="context_menu_item_edit_waypoint">Edit GPX waypoint</string>
<string name="shared_string_location">Location</string>
<string name="share_osm_edits_subject">Osm Edits shared via OsmAnd</string> <string name="share_osm_edits_subject">Osm Edits shared via OsmAnd</string>
<string name="lang_nds">Low German</string> <string name="lang_nds">Low German</string>
<string name="lang_mk">Macedonian</string> <string name="lang_mk">Macedonian</string>
@ -20,7 +57,7 @@
<string name="shared_string_update">Update</string> <string name="shared_string_update">Update</string>
<string name="shared_string_upload">Upload</string> <string name="shared_string_upload">Upload</string>
<string name="osm_edit_created_poi">Created OSM POI</string> <string name="osm_edit_created_poi">Created OSM POI</string>
<string name="osm_edit_created_bug">Created OSM bug</string>
<string name="world_map_download_descr">World basemap (covering the whole world at small zooms) is missing or outdated. Please consider downloading World basemap for a complete environment.</string> <string name="world_map_download_descr">World basemap (covering the whole world at small zooms) is missing or outdated. Please consider downloading World basemap for a complete environment.</string>
<string name="shared_string_qr_code">QR-code</string> <string name="shared_string_qr_code">QR-code</string>
<string name="map_downloaded">Map downloaded</string> <string name="map_downloaded">Map downloaded</string>
@ -75,7 +112,9 @@
<string name="rendering_value_default13_name">Default (13)</string> <string name="rendering_value_default13_name">Default (13)</string>
<string name="rendering_value_defaultTranslucentCyan_name">Default (translucent cyan)</string> <string name="rendering_value_defaultTranslucentCyan_name">Default (translucent cyan)</string>
<string name="rendering_attr_currentTrackColor_name">GPX color</string> <string name="rendering_attr_currentTrackColor_name">GPX color</string>
<string name="rendering_attr_currentTrackColor_description">GPX color</string>
<string name="rendering_attr_currentTrackWidth_name">GPX width</string> <string name="rendering_attr_currentTrackWidth_name">GPX width</string>
<string name="rendering_attr_currentTrackWidth_description">GPX width</string>
<string name="rendering_value_red_name">Red</string> <string name="rendering_value_red_name">Red</string>
<string name="rendering_value_translucent_red_name">Translucent red</string> <string name="rendering_value_translucent_red_name">Translucent red</string>
<string name="rendering_value_orange_name">Orange</string> <string name="rendering_value_orange_name">Orange</string>
@ -360,6 +399,7 @@
<string name="avoid_roads_msg">You can trigger an alternative route by selecting roads to avoid</string> <string name="avoid_roads_msg">You can trigger an alternative route by selecting roads to avoid</string>
<string name="speak_pedestrian">Pedestrian crosswalks</string> <string name="speak_pedestrian">Pedestrian crosswalks</string>
<string name="rendering_attr_roadStyle_name">Road style</string> <string name="rendering_attr_roadStyle_name">Road style</string>
<string name="rendering_attr_roadStyle_description">Road style</string>
<string name="rendering_value__name">Default</string> <string name="rendering_value__name">Default</string>
<string name="rendering_value_default_name">Default</string> <string name="rendering_value_default_name">Default</string>
<string name="rendering_value_germanRoadAtlas_name">German road atlas</string> <string name="rendering_value_germanRoadAtlas_name">German road atlas</string>
@ -826,7 +866,7 @@
<string name="please_select_address">Select city or street first</string> <string name="please_select_address">Select city or street first</string>
<string name="search_street_in_neighborhood_cities">Search street in neighborhood cities</string> <string name="search_street_in_neighborhood_cities">Search street in neighborhood cities</string>
<string name="intermediate_items_sort_return">Intermediate waypoints resorted to optimize their order on the way from current location to the destination.</string> <string name="intermediate_items_sort_return">Intermediate waypoints resorted to optimize their order on the way from current location to the destination.</string>
<string name="intermediate_items_sort_by_distance">Sort (door-to-door)</string> <string name="intermediate_items_sort_by_distance">Sort door-to-door</string>
<string name="local_osm_changes_backup_successful">OSM change file successfully generated %1$s</string> <string name="local_osm_changes_backup_successful">OSM change file successfully generated %1$s</string>
<string name="local_osm_changes_backup_failed">Backup OSM changes failed</string> <string name="local_osm_changes_backup_failed">Backup OSM changes failed</string>
<string name="local_osm_changes_backup">Backup as OSM change</string> <string name="local_osm_changes_backup">Backup as OSM change</string>
@ -1079,12 +1119,12 @@ Bicycle and Pedestrian Features
- Display of contour lines and hillshades (via additional plugin) - Display of contour lines and hillshades (via additional plugin)
Directly Contribute to OpenStreetMap Directly Contribute to OpenStreetMap
- Report map bugs - Report map notes
- Upload GPX tracks to OSM directly from the app - Upload GPX tracks to OSM directly from the app
- Add POIs and directly upload them to OSM (or later if offline) - Add POIs and directly upload them to OSM (or later if offline)
- Optional trip recording also in background mode (while device is in sleep mode) - Optional trip recording also in background mode (while device is in sleep mode)
OsmAnd is open source and actively being developed. Everyone can contribute to the application by reporting bugs, improving translations, or coding new features. The project is in a lively state of continuous improvement by all these forms of developer and user interaction. The project progress also relies on financial contributions to fund the development, coding, and testing of new functionalities. By buying OsmAnd+ you help the application to be even more awesome! It is also possible to fund specific new features, or to make a general donation on osmand.net. OsmAnd is open source and actively being developed. Everyone can contribute to the application by reporting notes, improving translations, or coding new features. The project is in a lively state of continuous improvement by all these forms of developer and user interaction. The project progress also relies on financial contributions to fund the development, coding, and testing of new functionalities. By buying OsmAnd+ you help the application to be even more awesome! It is also possible to fund specific new features, or to make a general donation on osmand.net.
Approximate map coverage and quality: Approximate map coverage and quality:
@ -1693,7 +1733,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="error_reading_gpx">Error reading GPX data</string> <string name="error_reading_gpx">Error reading GPX data</string>
<string name="vector_data">Offline vector maps</string> <string name="vector_data">Offline vector maps</string>
<string name="transport_context_menu">Search transport at stop</string> <string name="transport_context_menu">Search transport at stop</string>
<string name="osb_bug_name">Bug</string>
<string name="poi_context_menu_modify">Modify POI</string> <string name="poi_context_menu_modify">Modify POI</string>
<string name="poi_context_menu_delete">Delete POI</string> <string name="poi_context_menu_delete">Delete POI</string>
<string name="rotate_map_compass_opt">To compass</string> <string name="rotate_map_compass_opt">To compass</string>
@ -1910,7 +1949,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="search_address_street_option">Intersecting street</string> <string name="search_address_street_option">Intersecting street</string>
<string name="search_tabs_location">Location</string> <string name="search_tabs_location">Location</string>
<string name="context_menu_item_update_map">Update map</string> <string name="context_menu_item_update_map">Update map</string>
<string name="context_menu_item_open_bug">Open OSM bug</string>
<string name="context_menu_item_create_poi">Create POI</string> <string name="context_menu_item_create_poi">Create POI</string>
<string name="add_favorite_dialog_top_text">Enter favorite name</string> <string name="add_favorite_dialog_top_text">Enter favorite name</string>
<string name="add_favorite_dialog_default_favourite_name">Favorite</string> <string name="add_favorite_dialog_default_favourite_name">Favorite</string>
@ -1920,22 +1959,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="favourites_context_menu_delete">Delete favorite</string> <string name="favourites_context_menu_delete">Delete favorite</string>
<string name="favourites_remove_dialog_msg">Remove favorite point \'%s\'?</string> <string name="favourites_remove_dialog_msg">Remove favorite point \'%s\'?</string>
<string name="favourites_remove_dialog_success">Favorite point {0} was successfully deleted.</string> <string name="favourites_remove_dialog_success">Favorite point {0} was successfully deleted.</string>
<string name="osb_add_dialog_title">Enter bug text</string>
<string name="osb_add_dialog_success">Bug successfully created</string>
<string name="osb_add_dialog_error">Exception occurred: bug was not created</string>
<string name="osb_author_dialog_password">OSM password (optional)</string>
<string name="osb_comment_menu_item">Add comment</string>
<string name="osb_comment_dialog_message">Message</string>
<string name="osb_comment_dialog_author">Author name</string>
<string name="osb_comment_dialog_title">Adding comment to bug</string>
<string name="osb_comment_dialog_add_button">Add comment</string>
<string name="osb_comment_dialog_success">Comment was successfully added</string>
<string name="osb_comment_dialog_error">Exception occurred: comment was not added</string>
<string name="osb_close_menu_item">Close bug</string>
<string name="osb_close_dialog_title">Closing bug</string>
<string name="osb_close_dialog_close_button">Close bug</string>
<string name="osb_close_dialog_success">Bug was successfully closed</string>
<string name="osb_close_dialog_error">Exception occurred: bug was not closed</string>
<string name="poi_edit_title">Edit POI</string> <string name="poi_edit_title">Edit POI</string>
<string name="poi_create_title">Create POI</string> <string name="poi_create_title">Create POI</string>
<string name="poi_error_poi_not_found">Node cannot be found or amenity is not a single node</string> <string name="poi_error_poi_not_found">Node cannot be found or amenity is not a single node</string>
@ -1952,6 +1975,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="poi_dialog_name">Name</string> <string name="poi_dialog_name">Name</string>
<string name="poi_dialog_opening_hours">Open</string> <string name="poi_dialog_opening_hours">Open</string>
<string name="poi_dialog_comment">Comment</string> <string name="poi_dialog_comment">Comment</string>
<string name="poi_dialog_reopen">Reopen</string>
<string name="poi_dialog_comment_default">POI changing</string> <string name="poi_dialog_comment_default">POI changing</string>
<string name="poi_dialog_other_tags_message">All other tags are preserved</string> <string name="poi_dialog_other_tags_message">All other tags are preserved</string>
<string name="default_buttons_commit">Commit</string> <string name="default_buttons_commit">Commit</string>
@ -2061,5 +2085,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="contact_us">Contact us</string> <string name="contact_us">Contact us</string>
<string name="map_legend">Map legend</string> <string name="map_legend">Map legend</string>
<string name="save_poi_without_poi_type_message">Do you really want to save poi without POI type?</string> <string name="save_poi_without_poi_type_message">Do you really want to save poi without POI type?</string>
<string name="poi_context_menu_modify_osm_change">Modify OSM change</string>
<!-- string name="map_legend_item_description">Legend for OsmAnd default map style, Internet connectivity needed to display</string --> <!-- string name="map_legend_item_description">Legend for OsmAnd default map style, Internet connectivity needed to display</string -->
</resources> </resources>

8
OsmAnd/res/values/styles.xml
View file

@ -124,6 +124,10 @@
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
</style> </style>
<style name="OsmandLightTheme.NoActionbar.Preferences">
<item name="android:textColorSecondary">@color/color_black</item>
</style>
<style name="OsmandLightTheme.DarkActionbar"> <style name="OsmandLightTheme.DarkActionbar">
<item name="android:textColorPrimary">@color/color_white</item> <item name="android:textColorPrimary">@color/color_white</item>
<item name="android:textColorSecondary">@color/inactive_item_orange</item> <item name="android:textColorSecondary">@color/inactive_item_orange</item>
@ -166,6 +170,10 @@
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
</style> </style>
<style name="OsmandDarkTheme.NoActionbar.Preferences">
<item name="android:textColorSecondary">@color/color_white</item>
</style>
<style name="OsmandDarkTheme" parent="Theme.AppCompat"> <style name="OsmandDarkTheme" parent="Theme.AppCompat">
<item name="list_divider">@color/list_divider_light</item> <item name="list_divider">@color/list_divider_light</item>
<item name="expandable_category_color">?android:attr/colorBackground</item> <item name="expandable_category_color">?android:attr/colorBackground</item>

1
OsmAnd/src/net/osmand/data/PointDescription.java
View file

@ -40,6 +40,7 @@ public class PointDescription {
public static final String POINT_TYPE_TARGET = "destination"; public static final String POINT_TYPE_TARGET = "destination";
public static final String POINT_TYPE_OSM_BUG = "bug"; public static final String POINT_TYPE_OSM_BUG = "bug";
public static final String POINT_TYPE_WORLD_REGION = "world_region"; public static final String POINT_TYPE_WORLD_REGION = "world_region";
public static final String POINT_TYPE_GPX_ITEM = "gpx_item";
public static final PointDescription LOCATION_POINT = new PointDescription(POINT_TYPE_LOCATION, ""); public static final PointDescription LOCATION_POINT = new PointDescription(POINT_TYPE_LOCATION, "");

12
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -52,13 +52,15 @@ import java.util.Random;
import btools.routingapp.BRouterServiceConnection; import btools.routingapp.BRouterServiceConnection;
/** /**
* Created by Denis
* on 03.03.15.
*/ */
public class AppInitializer implements IProgress { public class AppInitializer implements IProgress {
// 22 - 2.2
private static final int CURRENT_VERSION_FOR_UGPRADE = 22;
public static final boolean TIPS_AND_TRICKS = false; public static final boolean TIPS_AND_TRICKS = false;
private static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$ private static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$
private static final String VERSION_INSTALLED_NUMBER = "VERSION_INSTALLED_NUMBER"; //$NON-NLS-1$
public static final String NUMBER_OF_STARTS = "NUMBER_OF_STARTS"; //$NON-NLS-1$ public static final String NUMBER_OF_STARTS = "NUMBER_OF_STARTS"; //$NON-NLS-1$
public static final String FIRST_INSTALLED = "FIRST_INSTALLED"; //$NON-NLS-1$ public static final String FIRST_INSTALLED = "FIRST_INSTALLED"; //$NON-NLS-1$
private static final String VECTOR_INDEXES_CHECK = "VECTOR_INDEXES_CHECK"; //$NON-NLS-1$ private static final String VECTOR_INDEXES_CHECK = "VECTOR_INDEXES_CHECK"; //$NON-NLS-1$
@ -130,7 +132,13 @@ public class AppInitializer implements IProgress {
firstTime = true; firstTime = true;
startPrefs.edit().putBoolean(FIRST_TIME_APP_RUN, true).commit(); startPrefs.edit().putBoolean(FIRST_TIME_APP_RUN, true).commit();
startPrefs.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit(); startPrefs.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, CURRENT_VERSION_FOR_UGPRADE).commit();
} else if (!Version.getFullVersion(app).equals(startPrefs.getString(VERSION_INSTALLED, ""))) { } else if (!Version.getFullVersion(app).equals(startPrefs.getString(VERSION_INSTALLED, ""))) {
if(startPrefs.getInt(VERSION_INSTALLED_NUMBER, 0) < 22) {
app.getSettings().SHOW_DASHBOARD_ON_START.set(true);
app.getSettings().SHOW_DASHBOARD_ON_MAP_SCREEN.set(true);
app.getSettings().SHOW_CARD_TO_CHOOSE_DRAWER.set(true);
}
startPrefs.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit(); startPrefs.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
appVersionChanged = true; appVersionChanged = true;
} }

2
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -343,7 +343,7 @@ public class ContextMenuAdapter {
} }
}); });
} }
if (convertView == null || (convertView.getTag() != lid)) { if (convertView == null || (!lid.equals(convertView.getTag()))) {
convertView = activity.getLayoutInflater().inflate(lid, parent, false); convertView = activity.getLayoutInflater().inflate(lid, parent, false);
convertView.setTag(lid); convertView.setTag(lid);
} }

47
OsmAnd/src/net/osmand/plus/GPXUtilities.java
View file

@ -136,6 +136,31 @@ public class GPXUtilities {
return true; return true;
} }
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + ((category == null) ? 0 : category.hashCode());
result = prime * result + ((desc == null) ? 0 : desc.hashCode());
result = prime * result + ((lat == 0) ? 0 : Double.valueOf(lat).hashCode());
result = prime * result + ((lon == 0) ? 0 : Double.valueOf(lon).hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null || getClass() != obj.getClass())
return false;
WptPt other = (WptPt) obj;
return Algorithms.objectEquals(other.name, name)
&& Algorithms.objectEquals(other.category, category)
&& Algorithms.objectEquals(other.lat, lat)
&& Algorithms.objectEquals(other.lon, lon)
&& Algorithms.objectEquals(other.desc, desc);
}
} }
public static class TrkSegment extends GPXExtensions { public static class TrkSegment extends GPXExtensions {
@ -606,6 +631,28 @@ public class GPXUtilities {
return false; return false;
} }
public void updateWptPt(WptPt pt, double lat, double lon, long time, String description, String name, String category, int color) {
int index = points.indexOf(pt);
pt.lat = lat;
pt.lon = lon;
pt.time = time;
pt.desc = description;
pt.name = name;
pt.category = category;
if (color != 0) {
pt.setColor(color);
}
if (index != -1) {
points.set(index, pt);
}
}
public boolean deleteWptPt(WptPt pt) {
return points.remove(pt);
}
public List<TrkSegment> processRoutePoints() { public List<TrkSegment> processRoutePoints() {
List<TrkSegment> tpoints = new ArrayList<TrkSegment>(); List<TrkSegment> tpoints = new ArrayList<TrkSegment>();
if (routes.size() > 0) { if (routes.size() > 0) {

22
OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
View file

@ -1,8 +1,6 @@
package net.osmand.plus; package net.osmand.plus;
import java.io.File; import android.graphics.Bitmap;
import java.util.ArrayList;
import java.util.List;
import net.osmand.IProgress; import net.osmand.IProgress;
import net.osmand.plus.GPXUtilities.GPXFile; import net.osmand.plus.GPXUtilities.GPXFile;
@ -11,7 +9,6 @@ import net.osmand.plus.GPXUtilities.Route;
import net.osmand.plus.GPXUtilities.Track; import net.osmand.plus.GPXUtilities.Track;
import net.osmand.plus.GPXUtilities.TrkSegment; import net.osmand.plus.GPXUtilities.TrkSegment;
import net.osmand.plus.GPXUtilities.WptPt; import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
import net.osmand.plus.OsmandSettings.MetricsConstants; import net.osmand.plus.OsmandSettings.MetricsConstants;
import net.osmand.plus.activities.SavingTrackHelper; import net.osmand.plus.activities.SavingTrackHelper;
import net.osmand.plus.helpers.GpxUiHelper; import net.osmand.plus.helpers.GpxUiHelper;
@ -21,7 +18,9 @@ import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import android.graphics.Bitmap; import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class GpxSelectionHelper { public class GpxSelectionHelper {
@ -53,6 +52,15 @@ public class GpxSelectionHelper {
return selectedGPXFiles; return selectedGPXFiles;
} }
public SelectedGpxFile getSelectedGPXFile(WptPt point) {
for (SelectedGpxFile g : selectedGPXFiles) {
if (g.getGpxFile().points.contains(point)) {
return g;
}
}
return null;
}
public final String getString(int resId, Object... formatArgs) { public final String getString(int resId, Object... formatArgs) {
return app.getString(resId, formatArgs); return app.getString(resId, formatArgs);
} }
@ -187,6 +195,7 @@ public class GpxSelectionHelper {
item.description = GpxUiHelper.getDescription(app, analysis, true); item.description = GpxUiHelper.getDescription(app, analysis, true);
item.analysis = analysis; item.analysis = analysis;
/*
String name = ""; String name = "";
// if(group.track.segments.size() > 1) { // if(group.track.segments.size() > 1) {
// name += t++ + ". "; // name += t++ + ". ";
@ -229,7 +238,8 @@ public class GpxSelectionHelper {
OsmAndFormatter.getFormattedAlt(analysis.diffElevationUp, app)); OsmAndFormatter.getFormattedAlt(analysis.diffElevationUp, app));
} }
} }
item.name = name; */
item.name = group.getName();//.replace("\n", "");
item.locationStart = analysis.locationStart; item.locationStart = analysis.locationStart;
item.locationEnd = analysis.locationEnd; item.locationEnd = analysis.locationEnd;
list.add(item); list.add(item);

4
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -633,6 +633,10 @@ public class OsmandSettings {
} }
public final CommonPreference<Boolean> USE_FAST_RECALCULATION = new BooleanPreference("use_fast_recalculation", true).makeGlobal().cache(); public final CommonPreference<Boolean> USE_FAST_RECALCULATION = new BooleanPreference("use_fast_recalculation", true).makeGlobal().cache();
public final CommonPreference<Boolean> SHOW_CARD_TO_CHOOSE_DRAWER = new BooleanPreference("show_card_to_choose_drawer", false).makeGlobal();
public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_START = new BooleanPreference("should_show_dashboard_on_start", false).makeGlobal();
public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_MAP_SCREEN = new BooleanPreference("show_dashboard_on_map_screen", false).makeGlobal();
// this value string is synchronized with settings_pref.xml preference name // this value string is synchronized with settings_pref.xml preference name
public final CommonPreference<Boolean> USE_INTERNET_TO_DOWNLOAD_TILES = new BooleanPreference("use_internet_to_download_tiles", true).makeGlobal().cache(); public final CommonPreference<Boolean> USE_INTERNET_TO_DOWNLOAD_TILES = new BooleanPreference("use_internet_to_download_tiles", true).makeGlobal().cache();

1
OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
View file

@ -170,6 +170,7 @@ public class TargetPointsHelper {
pointToNavigate = intermediatePoints.remove(index); pointToNavigate = intermediatePoints.remove(index);
settings.setPointToNavigate(pointToNavigate.getLatitude(), pointToNavigate.getLongitude(), settings.setPointToNavigate(pointToNavigate.getLatitude(), pointToNavigate.getLongitude(),
pointToNavigate.pointDescription); pointToNavigate.pointDescription);
pointToNavigate.intermediate = false;
settings.deleteIntermediatePoint(index); settings.deleteIntermediatePoint(index);
updateRouteAndReferesh(updateRoute); updateRouteAndReferesh(updateRoute);
} }

6
OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
View file

@ -27,11 +27,11 @@ public abstract class ActionBarPreferenceActivity extends AppCompatPreferenceAct
protected void onCreate(final Bundle savedInstanceState) { protected void onCreate(final Bundle savedInstanceState) {
//settings needed it's own theme because of check boxes not styled properly //settings needed it's own theme because of check boxes not styled properly
OsmandSettings settings = ((OsmandApplication) getApplication()).getSettings(); OsmandSettings settings = ((OsmandApplication) getApplication()).getSettings();
int t = R.style.OsmandLightTheme_NoActionbar; int t = R.style.OsmandLightTheme_NoActionbar_Preferences;
if (settings.OSMAND_THEME.get() == OsmandSettings.OSMAND_DARK_THEME) { if (settings.OSMAND_THEME.get() == OsmandSettings.OSMAND_DARK_THEME) {
t = R.style.OsmandDarkTheme_NoActionbar; t = R.style.OsmandDarkTheme_NoActionbar_Preferences;
} else if (settings.OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME) { } else if (settings.OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME) {
t = R.style.OsmandLightTheme_NoActionbar; t = R.style.OsmandLightTheme_NoActionbar_Preferences;
} }
setTheme(t); setTheme(t);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);

12
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -62,6 +62,7 @@ import net.osmand.plus.activities.search.SearchActivity;
import net.osmand.plus.base.FailSafeFuntions; import net.osmand.plus.base.FailSafeFuntions;
import net.osmand.plus.base.MapViewTrackingUtilities; import net.osmand.plus.base.MapViewTrackingUtilities;
import net.osmand.plus.dashboard.DashboardOnMap; import net.osmand.plus.dashboard.DashboardOnMap;
import net.osmand.plus.dialogs.ErrorBottomSheetDialog;
import net.osmand.plus.dialogs.WhatsNewDialogFragment; import net.osmand.plus.dialogs.WhatsNewDialogFragment;
import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents; import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents;
import net.osmand.plus.helpers.GpxImportHelper; import net.osmand.plus.helpers.GpxImportHelper;
@ -139,8 +140,6 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {
private IMapDownloaderCallback downloaderCallback; private IMapDownloaderCallback downloaderCallback;
private DrawerLayout drawerLayout; private DrawerLayout drawerLayout;
public static final String SHOULD_SHOW_DASHBOARD_ON_START = "should_show_dashboard_on_start";
private Notification getNotification() { private Notification getNotification() {
Intent notificationIndent = new Intent(this, getMyApplication().getAppCustomization().getMapActivity()); Intent notificationIndent = new Intent(this, getMyApplication().getAppCustomization().getMapActivity());
notificationIndent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); notificationIndent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@ -392,10 +391,13 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {
long tm = System.currentTimeMillis(); long tm = System.currentTimeMillis();
if (app.isApplicationInitializing() || DashboardOnMap.staticVisible) { if (app.isApplicationInitializing() || DashboardOnMap.staticVisible) {
if (!dashboardOnMap.isVisible()) { if (!dashboardOnMap.isVisible()) {
final OsmandSettings.CommonPreference<Boolean> shouldShowDashboardOnStart = if (settings.SHOW_DASHBOARD_ON_START.get()) {
settings.registerBooleanPreference(MapActivity.SHOULD_SHOW_DASHBOARD_ON_START, true);
if (shouldShowDashboardOnStart.get() || dashboardOnMap.hasCriticalMessages())
dashboardOnMap.setDashboardVisibility(true, DashboardOnMap.staticVisibleType); dashboardOnMap.setDashboardVisibility(true, DashboardOnMap.staticVisibleType);
} else {
if (ErrorBottomSheetDialog.shouldShow(settings, this)) {
new ErrorBottomSheetDialog().show(getFragmentManager(), "dialog");
}
}
} }
} }
dashboardOnMap.updateLocation(true, true, false); dashboardOnMap.updateLocation(true, true, false);

75
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -1,24 +1,10 @@
package net.osmand.plus.activities; package net.osmand.plus.activities;
import android.app.Activity; import java.io.File;
import android.app.Dialog; import java.text.MessageFormat;
import android.content.DialogInterface; import java.util.ArrayList;
import android.content.Intent; import java.util.Date;
import android.graphics.drawable.Drawable; import java.util.List;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import net.londatiga.android.ActionItem; import net.londatiga.android.ActionItem;
import net.londatiga.android.QuickAction; import net.londatiga.android.QuickAction;
@ -58,11 +44,25 @@ import net.osmand.util.MapUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import java.io.File; import android.app.Activity;
import java.text.MessageFormat; import android.app.Dialog;
import java.util.ArrayList; import android.content.DialogInterface;
import java.util.Date; import android.content.Intent;
import java.util.List; import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
public class MapActivityActions implements DialogProvider { public class MapActivityActions implements DialogProvider {
private static final Log LOG = PlatformUtil.getLog(MapActivityActions.class); private static final Log LOG = PlatformUtil.getLog(MapActivityActions.class);
@ -163,7 +163,7 @@ public class MapActivityActions implements DialogProvider {
public void addAsTarget(double latitude, double longitude, PointDescription pd) { public void addAsTarget(double latitude, double longitude, PointDescription pd) {
TargetPointsHelper targets = getMyApplication().getTargetPointsHelper(); TargetPointsHelper targets = getMyApplication().getTargetPointsHelper();
targets.navigateToPoint(new LatLon(latitude, longitude), true, -1, targets.navigateToPoint(new LatLon(latitude, longitude), true, targets.getIntermediatePoints().size() + 1,
pd); pd);
openIntermediateEditPointsDialog(); openIntermediateEditPointsDialog();
} }
@ -186,19 +186,6 @@ public class MapActivityActions implements DialogProvider {
return bundle; return bundle;
} }
public void addWaypoint(final double latitude, final double longitude) {
String name;
PointDescription pointDescription = mapActivity.getContextMenu().getPointDescription();
if (!pointDescription.isWpt() && !mapActivity.getContextMenu().isAddressUnknown()) {
name = mapActivity.getContextMenu().getTitleStr();
} else {
name = "";
}
enhance(dialogBundle, latitude, longitude, name);
mapActivity.showDialog(DIALOG_ADD_WAYPOINT);
}
private Dialog createAddWaypointDialog(final Bundle args) { private Dialog createAddWaypointDialog(final Bundle args) {
AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity); AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
builder.setTitle(R.string.add_waypoint_dialog_title); builder.setTitle(R.string.add_waypoint_dialog_title);
@ -213,7 +200,7 @@ public class MapActivityActions implements DialogProvider {
double longitude = args.getDouble(KEY_LONGITUDE); double longitude = args.getDouble(KEY_LONGITUDE);
String name = editText.getText().toString(); String name = editText.getText().toString();
SavingTrackHelper savingTrackHelper = mapActivity.getMyApplication().getSavingTrackHelper(); SavingTrackHelper savingTrackHelper = mapActivity.getMyApplication().getSavingTrackHelper();
savingTrackHelper.insertPointData(latitude, longitude, System.currentTimeMillis(), null, name, null); savingTrackHelper.insertPointData(latitude, longitude, System.currentTimeMillis(), null, name, null, 0);
AccessibleToast.makeText(mapActivity, MessageFormat.format(getString(R.string.add_waypoint_dialog_added), name), Toast.LENGTH_SHORT) AccessibleToast.makeText(mapActivity, MessageFormat.format(getString(R.string.add_waypoint_dialog_added), name), Toast.LENGTH_SHORT)
.show(); .show();
dialog.dismiss(); dialog.dismiss();
@ -348,6 +335,10 @@ public class MapActivityActions implements DialogProvider {
public void contextMenuPoint(final double latitude, final double longitude, final ContextMenuAdapter iadapter, Object selectedObj) { public void contextMenuPoint(final double latitude, final double longitude, final ContextMenuAdapter iadapter, Object selectedObj) {
final ContextMenuAdapter adapter = iadapter == null ? new ContextMenuAdapter(mapActivity) : iadapter; final ContextMenuAdapter adapter = iadapter == null ? new ContextMenuAdapter(mapActivity) : iadapter;
adapter.item(R.string.context_menu_item_search).iconColor(R.drawable.ic_action_search_dark).reg(); adapter.item(R.string.context_menu_item_search).iconColor(R.drawable.ic_action_search_dark).reg();
if (!mapActivity.getRoutingHelper().isFollowingMode() && !mapActivity.getRoutingHelper().isRoutePlanningMode()) {
adapter.item(R.string.context_menu_item_directions_from).iconColor(
R.drawable.ic_action_gdirections_dark).reg();
}
OsmandPlugin.registerMapContextMenu(mapActivity, latitude, longitude, adapter, selectedObj); OsmandPlugin.registerMapContextMenu(mapActivity, latitude, longitude, adapter, selectedObj);
getMyApplication().getAppCustomization().prepareLocationMenu(mapActivity, adapter); getMyApplication().getAppCustomization().prepareLocationMenu(mapActivity, adapter);
@ -368,6 +359,10 @@ public class MapActivityActions implements DialogProvider {
intent.putExtra(SearchActivity.SEARCH_LON, longitude); intent.putExtra(SearchActivity.SEARCH_LON, longitude);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
mapActivity.startActivity(intent); mapActivity.startActivity(intent);
} else if (standardId == R.string.context_menu_item_directions_from) {
mapActivity.getContextMenu().hide();
enterRoutePlanningMode(new LatLon(latitude, longitude),
mapActivity.getContextMenu().getPointDescription(), false);
} }
} }
}); });
@ -785,7 +780,7 @@ public class MapActivityActions implements DialogProvider {
} }
public void openIntermediateEditPointsDialog() { public void openIntermediateEditPointsDialog() {
mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.WAYPOINTS); mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.WAYPOINTS_EDIT);
} }
private TargetPointsHelper getTargets() { private TargetPointsHelper getTargets() {

134
OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
View file

@ -33,7 +33,7 @@ import android.text.format.DateFormat;
public class SavingTrackHelper extends SQLiteOpenHelper { public class SavingTrackHelper extends SQLiteOpenHelper {
public final static String DATABASE_NAME = "tracks"; //$NON-NLS-1$ public final static String DATABASE_NAME = "tracks"; //$NON-NLS-1$
public final static int DATABASE_VERSION = 4; public final static int DATABASE_VERSION = 5;
public final static String TRACK_NAME = "track"; //$NON-NLS-1$ public final static String TRACK_NAME = "track"; //$NON-NLS-1$
public final static String TRACK_COL_DATE = "date"; //$NON-NLS-1$ public final static String TRACK_COL_DATE = "date"; //$NON-NLS-1$
@ -50,11 +50,12 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
public final static String POINT_COL_NAME = "pname"; //$NON-NLS-1$ public final static String POINT_COL_NAME = "pname"; //$NON-NLS-1$
public final static String POINT_COL_CATEGORY = "category"; //$NON-NLS-1$ public final static String POINT_COL_CATEGORY = "category"; //$NON-NLS-1$
public final static String POINT_COL_DESCRIPTION = "description"; //$NON-NLS-1$ public final static String POINT_COL_DESCRIPTION = "description"; //$NON-NLS-1$
public final static String POINT_COL_COLOR = "color"; //$NON-NLS-1$
public final static Log log = PlatformUtil.getLog(SavingTrackHelper.class); public final static Log log = PlatformUtil.getLog(SavingTrackHelper.class);
private String updateScript; private String updateScript;
private String updatePointsScript; private String insertPointsScript;
private long lastTimeUpdated = 0; private long lastTimeUpdated = 0;
private final OsmandApplication ctx; private final OsmandApplication ctx;
@ -73,10 +74,12 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
gx.showCurrentTrack = true; gx.showCurrentTrack = true;
this.currentTrack.setGpxFile(gx); this.currentTrack.setGpxFile(gx);
prepareCurrentTrackForRecording(); prepareCurrentTrackForRecording();
updateScript = "INSERT INTO " + TRACK_NAME + " (" + TRACK_COL_LAT + ", " + TRACK_COL_LON + ", " updateScript = "INSERT INTO " + TRACK_NAME + " (" + TRACK_COL_LAT + ", " + TRACK_COL_LON + ", "
+ TRACK_COL_ALTITUDE + ", " + TRACK_COL_SPEED + ", " + TRACK_COL_HDOP + ", " + TRACK_COL_DATE + ")" + TRACK_COL_ALTITUDE + ", " + TRACK_COL_SPEED + ", " + TRACK_COL_HDOP + ", " + TRACK_COL_DATE + ")"
+ " VALUES (?, ?, ?, ?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$ + " VALUES (?, ?, ?, ?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$
updatePointsScript = "INSERT INTO " + POINT_NAME + " VALUES (?, ?, ?, ?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$
insertPointsScript = "INSERT INTO " + POINT_NAME + " VALUES (?, ?, ?, ?, ?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$
} }
@Override @Override
@ -94,7 +97,8 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
private void createTableForPoints(SQLiteDatabase db){ private void createTableForPoints(SQLiteDatabase db){
try { try {
db.execSQL("CREATE TABLE " + POINT_NAME + " (" + POINT_COL_LAT + " double, " + POINT_COL_LON + " double, " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ db.execSQL("CREATE TABLE " + POINT_NAME + " (" + POINT_COL_LAT + " double, " + POINT_COL_LON + " double, " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ POINT_COL_DATE + " long, " + POINT_COL_DESCRIPTION + " text, " + POINT_COL_NAME + " text, " + POINT_COL_CATEGORY + " text" + ")"); //$NON-NLS-1$ //$NON-NLS-2$ + POINT_COL_DATE + " long, " + POINT_COL_DESCRIPTION + " text, " + POINT_COL_NAME + " text, "
+ POINT_COL_CATEGORY + " text, " + POINT_COL_COLOR + " long" + ")"); //$NON-NLS-1$ //$NON-NLS-2$
} catch (RuntimeException e) { } catch (RuntimeException e) {
// ignore if already exists // ignore if already exists
} }
@ -112,6 +116,9 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_NAME + " text"); db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_NAME + " text");
db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_CATEGORY + " text"); db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_CATEGORY + " text");
} }
if(oldVersion < 5){
db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_COLOR + " long");
}
} }
@ -243,7 +250,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
private void collectDBPoints(SQLiteDatabase db, Map<String, GPXFile> dataTracks) { private void collectDBPoints(SQLiteDatabase db, Map<String, GPXFile> dataTracks) {
Cursor query = db.rawQuery("SELECT " + POINT_COL_LAT + "," + POINT_COL_LON + "," + POINT_COL_DATE + "," //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ Cursor query = db.rawQuery("SELECT " + POINT_COL_LAT + "," + POINT_COL_LON + "," + POINT_COL_DATE + "," //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ POINT_COL_DESCRIPTION + "," + POINT_COL_NAME + "," + POINT_COL_CATEGORY + " FROM " + POINT_NAME+" ORDER BY " + POINT_COL_DATE +" ASC", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + POINT_COL_DESCRIPTION + "," + POINT_COL_NAME + "," + POINT_COL_CATEGORY + "," + POINT_COL_COLOR + " FROM " + POINT_NAME+" ORDER BY " + POINT_COL_DATE +" ASC", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
if (query.moveToFirst()) { if (query.moveToFirst()) {
do { do {
WptPt pt = new WptPt(); WptPt pt = new WptPt();
@ -254,6 +261,10 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
pt.desc = query.getString(3); pt.desc = query.getString(3);
pt.name = query.getString(4); pt.name = query.getString(4);
pt.category = query.getString(5); pt.category = query.getString(5);
int color = query.getInt(6);
if (color != 0) {
pt.setColor(color);
}
// check if name is extension (needed for audio/video plugin & josm integration) // check if name is extension (needed for audio/video plugin & josm integration)
if(pt.name != null && pt.name.length() > 4 && pt.name.charAt(pt.name.length() - 4) == '.') { if(pt.name != null && pt.name.length() > 4 && pt.name.charAt(pt.name.length() - 4) == '.') {
@ -403,15 +414,124 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
currentTrack.getModifiableGpxFile().modifiedTime = time; currentTrack.getModifiableGpxFile().modifiedTime = time;
} }
public void insertPointData(double lat, double lon, long time, String description, String name, String category) { public WptPt insertPointData(double lat, double lon, long time, String description, String name, String category, int color) {
final WptPt pt = new WptPt(lat, lon, time, Double.NaN, 0, Double.NaN); final WptPt pt = new WptPt(lat, lon, time, Double.NaN, 0, Double.NaN);
pt.name = name; pt.name = name;
pt.category = category; pt.category = category;
pt.desc = description; pt.desc = description;
if (color != 0) {
pt.setColor(color);
}
currentTrack.getModifiableGpxFile().points.add(pt); currentTrack.getModifiableGpxFile().points.add(pt);
currentTrack.getModifiableGpxFile().modifiedTime = time; currentTrack.getModifiableGpxFile().modifiedTime = time;
points++; points++;
execWithClose(updatePointsScript, new Object[] { lat, lon, time, description, name, category }); execWithClose(insertPointsScript, new Object[] { lat, lon, time, description, name, category, color });
return pt;
}
public void updatePointData(WptPt pt, double lat, double lon, long time, String description, String name, String category, int color) {
currentTrack.getModifiableGpxFile().modifiedTime = time;
List<Object> params = new ArrayList<>();
params.add(lat);
params.add(lon);
params.add(time);
params.add(description);
params.add(name);
params.add(category);
params.add(color);
params.add(pt.getLatitude());
params.add(pt.getLongitude());
params.add(pt.time);
StringBuilder sb = new StringBuilder();
String prefix = "UPDATE " + POINT_NAME
+ " SET "
+ POINT_COL_LAT + "=?, "
+ POINT_COL_LON + "=?, "
+ POINT_COL_DATE + "=?, "
+ POINT_COL_DESCRIPTION + "=?, "
+ POINT_COL_NAME + "=?, "
+ POINT_COL_CATEGORY + "=?, "
+ POINT_COL_COLOR + "=? "
+ "WHERE "
+ POINT_COL_LAT + "=? AND "
+ POINT_COL_LON + "=? AND "
+ POINT_COL_DATE + "=?";
sb.append(prefix);
if (pt.desc != null) {
sb.append(" AND ").append(POINT_COL_DESCRIPTION).append("=?");
params.add(pt.desc);
} else {
sb.append(" AND ").append(POINT_COL_DESCRIPTION).append(" IS NULL");
}
if (pt.name != null) {
sb.append(" AND ").append(POINT_COL_NAME).append("=?");
params.add(pt.name);
} else {
sb.append(" AND ").append(POINT_COL_NAME).append(" IS NULL");
}
if (pt.category != null) {
sb.append(" AND ").append(POINT_COL_CATEGORY).append("=?");
params.add(pt.category);
} else {
sb.append(" AND ").append(POINT_COL_CATEGORY).append(" IS NULL");
}
execWithClose(sb.toString(), params.toArray());
pt.lat = lat;
pt.lon = lon;
pt.time = time;
pt.desc = description;
pt.name = name;
pt.category = category;
if (color != 0) {
pt.setColor(color);
}
}
public void deletePointData(WptPt pt) {
currentTrack.getModifiableGpxFile().points.remove(pt);
currentTrack.getModifiableGpxFile().modifiedTime = System.currentTimeMillis();
points--;
List<Object> params = new ArrayList<>();
params.add(pt.getLatitude());
params.add(pt.getLongitude());
params.add(pt.time);
StringBuilder sb = new StringBuilder();
String prefix = "DELETE FROM "
+ POINT_NAME
+ " WHERE "
+ POINT_COL_LAT + "=? AND "
+ POINT_COL_LON + "=? AND "
+ POINT_COL_DATE + "=?";
sb.append(prefix);
if (pt.desc != null) {
sb.append(" AND ").append(POINT_COL_DESCRIPTION).append("=?");
params.add(pt.desc);
} else {
sb.append(" AND ").append(POINT_COL_DESCRIPTION).append(" IS NULL");
}
if (pt.name != null) {
sb.append(" AND ").append(POINT_COL_NAME).append("=?");
params.add(pt.name);
} else {
sb.append(" AND ").append(POINT_COL_NAME).append(" IS NULL");
}
if (pt.category != null) {
sb.append(" AND ").append(POINT_COL_CATEGORY).append("=?");
params.add(pt.category);
} else {
sb.append(" AND ").append(POINT_COL_CATEGORY).append(" IS NULL");
}
execWithClose(sb.toString(), params.toArray());
} }
private synchronized void execWithClose(String script, Object[] objects) { private synchronized void execWithClose(String script, Object[] objects) {

6
OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
View file

@ -20,6 +20,7 @@ import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording;
import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider; import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider;
import net.osmand.plus.views.OsmandMapLayer; import net.osmand.plus.views.OsmandMapLayer;
import net.osmand.plus.views.OsmandMapTileView; import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.util.Algorithms;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -136,10 +137,11 @@ public class AudioNotesLayer extends OsmandMapLayer implements IContextMenuProvi
public PointDescription getObjectName(Object o) { public PointDescription getObjectName(Object o) {
if(o instanceof Recording){ if(o instanceof Recording){
Recording rec = (Recording) o; Recording rec = (Recording) o;
if(rec.getName(activity).isEmpty()) { String recName = rec.getName(activity, true);
if(Algorithms.isEmpty(recName)) {
return new PointDescription(rec.getSearchHistoryType(), view.getResources().getString(R.string.recording_default_name)); return new PointDescription(rec.getSearchHistoryType(), view.getResources().getString(R.string.recording_default_name));
} }
return new PointDescription(rec.getSearchHistoryType(), ((Recording)o).getName(activity)); return new PointDescription(rec.getSearchHistoryType(), recName);
} }
return null; return null;
} }

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AudioVideoNoteMenuBuilder.java → OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteMenuBuilder.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.mapcontextmenu.builders; package net.osmand.plus.audionotes;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;

35
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AudioVideoNoteMenuController.java → OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteMenuController.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.mapcontextmenu.controllers; package net.osmand.plus.audionotes;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
@ -12,11 +12,9 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording; import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording;
import net.osmand.plus.mapcontextmenu.MapContextMenuFragment; import net.osmand.plus.mapcontextmenu.MapContextMenuFragment;
import net.osmand.plus.mapcontextmenu.MenuController; import net.osmand.plus.mapcontextmenu.MenuController;
import net.osmand.plus.mapcontextmenu.builders.AudioVideoNoteMenuBuilder;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
@ -34,7 +32,7 @@ public class AudioVideoNoteMenuController extends MenuController {
@Override @Override
public void buttonPressed() { public void buttonPressed() {
if (plugin != null) { if (plugin != null) {
plugin.playRecording(getMapActivity(), recording); plugin.playRecording(getMapActivity(), getRecording());
} }
} }
}; };
@ -59,7 +57,7 @@ public class AudioVideoNoteMenuController extends MenuController {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (plugin != null) { if (plugin != null) {
plugin.deleteRecording(recording); plugin.deleteRecording(getRecording());
getMapActivity().getContextMenu().close(); getMapActivity().getContextMenu().close();
} }
} }
@ -72,6 +70,17 @@ public class AudioVideoNoteMenuController extends MenuController {
rightTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark; rightTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
} }
@Override
protected void setObject(Object object) {
if (object instanceof Recording) {
this.recording = (Recording) object;
}
}
public Recording getRecording() {
return recording;
}
@Override @Override
protected int getSupportedMenuStatesPortrait() { protected int getSupportedMenuStatesPortrait() {
return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN; return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN;
@ -80,19 +89,29 @@ public class AudioVideoNoteMenuController extends MenuController {
@Override @Override
public Drawable getLeftIcon() { public Drawable getLeftIcon() {
if (recording.isPhoto()) { if (recording.isPhoto()) {
return getIcon(R.drawable.ic_action_photo_dark, R.color.osmand_orange_dark, R.color.osmand_orange); return getIcon(R.drawable.ic_action_photo_dark, R.color.audio_video_icon_color);
} else if (recording.isAudio()) { } else if (recording.isAudio()) {
return getIcon(R.drawable.ic_action_micro_dark, R.color.osmand_orange_dark, R.color.osmand_orange); return getIcon(R.drawable.ic_action_micro_dark, R.color.audio_video_icon_color);
} else { } else {
return getIcon(R.drawable.ic_action_video_dark, R.color.osmand_orange_dark, R.color.osmand_orange); return getIcon(R.drawable.ic_action_video_dark, R.color.audio_video_icon_color);
} }
} }
@Override
public String getNameStr() {
return recording.getName(getMapActivity(), false);
}
@Override @Override
public String getTypeStr() { public String getTypeStr() {
return recording.getType(getMapActivity()); return recording.getType(getMapActivity());
} }
@Override
public String getCommonTypeStr() {
return getMapActivity().getString(R.string.audionotes_plugin_name);
}
@Override @Override
public boolean needStreetName() { public boolean needStreetName() {
return false; return false;

14
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -228,18 +228,18 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
return dateFormat.format(dateTime) + " " + timeFormat.format(dateTime); return dateFormat.format(dateTime) + " " + timeFormat.format(dateTime);
} }
public String getName(Context ctx) { public String getName(Context ctx, boolean includingType) {
String fileName = file.getName(); String fileName = file.getName();
String desc = getDescriptionName(fileName); String desc = getDescriptionName(fileName);
if (desc != null) { if (desc != null) {
return desc; return desc;
} else if (this.isAudio()) { } else if (this.isAudio() || this.isVideo() || this.isPhoto()) {
return formatDateTime(ctx, file.lastModified()); if (includingType) {
} else if (this.isVideo()) { return getType(ctx) + " " + formatDateTime(ctx, file.lastModified());
return formatDateTime(ctx, file.lastModified()); } else {
} else if (this.isPhoto()) {
return formatDateTime(ctx, file.lastModified()); return formatDateTime(ctx, file.lastModified());
} }
}
return ""; return "";
} }
@ -1168,7 +1168,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
&& OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null) { && OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null) {
String name = f.getName(); String name = f.getName();
SavingTrackHelper savingTrackHelper = app.getSavingTrackHelper(); SavingTrackHelper savingTrackHelper = app.getSavingTrackHelper();
savingTrackHelper.insertPointData(rec.lat, rec.lon, System.currentTimeMillis(), null, name, null); savingTrackHelper.insertPointData(rec.lat, rec.lon, System.currentTimeMillis(), null, name, null, 0);
} }
} }

4
OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
View file

@ -106,7 +106,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
public void onClick(View v) { public void onClick(View v) {
getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(), getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(),
recording.getLongitude(), 15, recording.getLongitude(), 15,
new PointDescription(recording.getSearchHistoryType(), recording.getName(getActivity())), new PointDescription(recording.getSearchHistoryType(), recording.getName(getActivity(), true)),
true, recording); //$NON-NLS-1$ true, recording); //$NON-NLS-1$
MapActivity.launchMapActivityMoveToTop(getActivity()); MapActivity.launchMapActivityMoveToTop(getActivity());
} }
@ -117,7 +117,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
public static Drawable getNoteView(final AudioVideoNotesPlugin.Recording recording, View view, public static Drawable getNoteView(final AudioVideoNotesPlugin.Recording recording, View view,
final OsmandApplication ctx) { final OsmandApplication ctx) {
String name = recording.getName(ctx); String name = recording.getName(ctx, true);
TextView nameText = ((TextView) view.findViewById(R.id.name)); TextView nameText = ((TextView) view.findViewById(R.id.name));
nameText.setText(name); nameText.setText(name);
((TextView) view.findViewById(R.id.description)).setText(recording.getSmallDescription(ctx)); ((TextView) view.findViewById(R.id.description)).setText(recording.getSmallDescription(ctx));

4
OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
View file

@ -424,7 +424,7 @@ public class NotesFragment extends OsmAndListFragment {
private void showOnMap(Recording recording) { private void showOnMap(Recording recording) {
getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(), recording.getLongitude(), 15, getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(), recording.getLongitude(), 15,
new PointDescription(recording.getSearchHistoryType(), recording.getName(getActivity())), true, new PointDescription(recording.getSearchHistoryType(), recording.getName(getActivity(), true)), true,
recording); //$NON-NLS-1$ recording); //$NON-NLS-1$
MapActivity.launchMapActivityMoveToTop(getActivity()); MapActivity.launchMapActivityMoveToTop(getActivity());
} }
@ -523,7 +523,7 @@ public class NotesFragment extends OsmAndListFragment {
final View v = getActivity().getLayoutInflater().inflate(R.layout.note_edit_dialog, getListView(), false); final View v = getActivity().getLayoutInflater().inflate(R.layout.note_edit_dialog, getListView(), false);
final EditText editText = (EditText) v.findViewById(R.id.name); final EditText editText = (EditText) v.findViewById(R.id.name);
builder.setView(v); builder.setView(v);
editText.setText(recording.getName(getActivity())); editText.setText(recording.getName(getActivity(), true));
InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT); imm.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT);
builder.setNegativeButton(R.string.shared_string_cancel, null); builder.setNegativeButton(R.string.shared_string_cancel, null);

12
OsmAnd/src/net/osmand/plus/download/ui/BottomSheetDownloadFragment.java → OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java
View file

@ -1,4 +1,4 @@
package net.osmand.plus.download.ui; package net.osmand.plus.base;
import android.app.Dialog; import android.app.Dialog;
import android.app.DialogFragment; import android.app.DialogFragment;
@ -6,7 +6,6 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.ColorRes; import android.support.annotation.ColorRes;
import android.support.annotation.DrawableRes; import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -14,19 +13,12 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import net.osmand.map.WorldRegion;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.IndexItem;
public abstract class BottomSheetDownloadFragment extends DialogFragment { public abstract class BottomSheetDialogFragment extends DialogFragment {
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {

67
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -1,34 +1,5 @@
package net.osmand.plus.dashboard; package net.osmand.plus.dashboard;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
import net.osmand.plus.ContextMenuAdapter.OnRowItemClick;
import net.osmand.plus.IconsCache;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.IntermediatePointsDialog;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.tools.DashFragmentData;
import net.osmand.plus.dashboard.tools.DashboardSettingsDialogFragment;
import net.osmand.plus.dashboard.tools.TransactionBuilder;
import net.osmand.plus.dialogs.ConfigureMapMenu;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.helpers.WaypointDialogHelper;
import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.DownloadedRegionsLayer;
import net.osmand.plus.views.OsmandMapTileView;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@ -60,6 +31,36 @@ import com.github.ksoichiro.android.observablescrollview.ObservableScrollView;
import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks; import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks;
import com.github.ksoichiro.android.observablescrollview.ScrollState; import com.github.ksoichiro.android.observablescrollview.ScrollState;
import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
import net.osmand.plus.ContextMenuAdapter.OnRowItemClick;
import net.osmand.plus.IconsCache;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.IntermediatePointsDialog;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.tools.DashFragmentData;
import net.osmand.plus.dashboard.tools.DashboardSettingsDialogFragment;
import net.osmand.plus.dashboard.tools.TransactionBuilder;
import net.osmand.plus.dialogs.ConfigureMapMenu;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.helpers.WaypointDialogHelper;
import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.DownloadedRegionsLayer;
import net.osmand.plus.views.OsmandMapTileView;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
/** /**
*/ */
public class DashboardOnMap implements ObservableScrollViewCallbacks { public class DashboardOnMap implements ObservableScrollViewCallbacks {
@ -503,7 +504,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
} }
public void refreshContent(boolean force) { public void refreshContent(boolean force) {
if (visibleType == DashboardType.WAYPOINTS || force) { if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_EDIT || force) {
updateListAdapter(); updateListAdapter();
} else { } else {
listAdapter.notifyDataSetChanged(); listAdapter.notifyDataSetChanged();
@ -903,12 +904,6 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
transaction.show(frag).commit(); transaction.show(frag).commit();
} }
public boolean hasCriticalMessages() {
final OsmandSettings settings = getMyApplication().getSettings();
return rateUsShouldShow.shouldShow(settings, mapActivity, DashRateUsFragment.TAG)
|| errorShouldShow.shouldShow(null, mapActivity, null);
}
View getParentView() { View getParentView() {
return dashboardView; return dashboardView;
} }

9
OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
View file

@ -71,11 +71,10 @@ public class DashboardSettingsDialogFragment extends DialogFragment
R.layout.show_dashboard_on_start_dialog_item, null, false); R.layout.show_dashboard_on_start_dialog_item, null, false);
final TextView textView = (TextView) view.findViewById(R.id.text); final TextView textView = (TextView) view.findViewById(R.id.text);
textView.setText(R.string.show_on_start); textView.setText(R.string.show_on_start);
final OsmandSettings.CommonPreference<Boolean> shouldShowDashboardOnStart =
settings.registerBooleanPreference(MapActivity.SHOULD_SHOW_DASHBOARD_ON_START, true);
final CompoundButton compoundButton = (CompoundButton) view.findViewById(R.id.check_item); final CompoundButton compoundButton = (CompoundButton) view.findViewById(R.id.check_item);
compoundButton.setChecked(shouldShowDashboardOnStart.get()); // FIXME Yura add settings.SHOW_DASHBOARD_ON_MAP_SCREEN
textView.setTextColor(shouldShowDashboardOnStart.get() ? textColorPrimary compoundButton.setChecked(settings.SHOW_DASHBOARD_ON_MAP_SCREEN.get());
textView.setTextColor(settings.SHOW_DASHBOARD_ON_MAP_SCREEN.get() ? textColorPrimary
: textColorSecondary); : textColorSecondary);
compoundButton.setOnCheckedChangeListener( compoundButton.setOnCheckedChangeListener(
new CompoundButton.OnCheckedChangeListener() { new CompoundButton.OnCheckedChangeListener() {
@ -111,7 +110,7 @@ public class DashboardSettingsDialogFragment extends DialogFragment
} }
} }
mapActivity.getDashboard().refreshDashboardFragments(); mapActivity.getDashboard().refreshDashboardFragments();
shouldShowDashboardOnStart.set(compoundButton.isChecked()); settings.SHOW_DASHBOARD_ON_MAP_SCREEN.set(compoundButton.isChecked());
} }
}) })
.setNegativeButton(R.string.shared_string_cancel, null); .setNegativeButton(R.string.shared_string_cancel, null);

97
OsmAnd/src/net/osmand/plus/dialogs/ErrorBottomSheetDialog.java Normal file
View file

@ -0,0 +1,97 @@
package net.osmand.plus.dialogs;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.Typeface;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import net.osmand.PlatformUtil;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.OsmandActionBarActivity;
import net.osmand.plus.base.BottomSheetDialogFragment;
import net.osmand.plus.helpers.FontCache;
import java.io.File;
import java.text.MessageFormat;
/**
* Created by GaidamakUA on 11/13/15.
*/
public class ErrorBottomSheetDialog extends BottomSheetDialogFragment {
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = getActivity().getLayoutInflater().inflate(R.layout.dash_error_fragment, container, false);
String msg = MessageFormat.format(getString(R.string.previous_run_crashed), OsmandApplication.EXCEPTION_PATH);
Typeface typeface = FontCache.getRobotoMedium(getActivity());
ImageView iv = ((ImageView) view.findViewById(R.id.error_icon));
iv.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_crashlog));
TextView message = ((TextView) view.findViewById(R.id.error_header));
message.setTypeface(typeface);
message.setText(msg);
Button errorBtn = ((Button) view.findViewById(R.id.error_btn));
errorBtn.setTypeface(typeface);
errorBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(Intent.ACTION_SEND);
intent.putExtra(Intent.EXTRA_EMAIL, new String[]{"crash@osmand.net"}); //$NON-NLS-1$
File file = getMyApplication().getAppPath(OsmandApplication.EXCEPTION_PATH);
intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
intent.setType("vnd.android.cursor.dir/email"); //$NON-NLS-1$
intent.putExtra(Intent.EXTRA_SUBJECT, "OsmAnd bug"); //$NON-NLS-1$
StringBuilder text = new StringBuilder();
text.append("\nDevice : ").append(Build.DEVICE); //$NON-NLS-1$
text.append("\nBrand : ").append(Build.BRAND); //$NON-NLS-1$
text.append("\nModel : ").append(Build.MODEL); //$NON-NLS-1$
text.append("\nProduct : ").append(Build.PRODUCT); //$NON-NLS-1$
text.append("\nBuild : ").append(Build.DISPLAY); //$NON-NLS-1$
text.append("\nVersion : ").append(Build.VERSION.RELEASE); //$NON-NLS-1$
text.append("\nApp Version : ").append(Version.getAppName(getMyApplication())); //$NON-NLS-1$
try {
PackageInfo info = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(),
0);
if (info != null) {
text.append("\nApk Version : ").append(info.versionName).append(" ").append(info.versionCode); //$NON-NLS-1$ //$NON-NLS-2$
}
} catch (PackageManager.NameNotFoundException e) {
PlatformUtil.getLog(ErrorBottomSheetDialog.class).error("", e);
}
intent.putExtra(Intent.EXTRA_TEXT, text.toString());
startActivity(Intent.createChooser(intent, getString(R.string.send_report)));
}
});
Button cancelBtn = ((Button) view.findViewById(R.id.error_cancel));
cancelBtn.setTypeface(typeface);
cancelBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
OsmandActionBarActivity dashboardActivity = ((OsmandActionBarActivity) getActivity());
if (dashboardActivity != null) {
dismiss();
}
}
});
return view;
}
public static boolean shouldShow(OsmandSettings settings, MapActivity activity) {
return activity.getMyApplication().getAppInitializer()
.checkPreviousRunsForExceptions(activity, settings != null);
}
}

16
OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
View file

@ -203,6 +203,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
originalGPX = null; originalGPX = null;
measurementPoints.clear(); measurementPoints.clear();
calculateDistance(); calculateDistance();
activity.getContextMenu().close();
} else if (id == R.string.shared_string_save_as_gpx) { } else if (id == R.string.shared_string_save_as_gpx) {
saveGpx(activity); saveGpx(activity);
} else if (id == R.string.distance_measurement_load_gpx) { } else if (id == R.string.distance_measurement_load_gpx) {
@ -637,6 +638,17 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
public void populateObjectContextMenu(Object o, ContextMenuAdapter adapter) { public void populateObjectContextMenu(Object o, ContextMenuAdapter adapter) {
if(o instanceof WptPt) { if(o instanceof WptPt) {
final WptPt p = (WptPt) o; final WptPt p = (WptPt) o;
boolean containsPoint = false;
for (int i = 0; i < measurementPoints.size(); i++) {
Iterator<WptPt> it = measurementPoints.get(i).iterator();
while (it.hasNext()) {
if (it.next() == p) {
containsPoint = true;
break;
}
}
}
if (containsPoint) {
OnContextMenuClick listener = new OnContextMenuClick() { OnContextMenuClick listener = new OnContextMenuClick() {
@Override @Override
@ -651,6 +663,9 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
} }
} }
calculateDistance(); calculateDistance();
if (adapter.getContext() instanceof MapActivity) {
((MapActivity)adapter.getContext()).getContextMenu().close();
}
} }
return true; return true;
} }
@ -658,6 +673,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
adapter.item(R.string.delete_point).iconColor(R.drawable.ic_action_delete_dark).listen(listener).reg(); adapter.item(R.string.delete_point).iconColor(R.drawable.ic_action_delete_dark).listen(listener).reg();
} }
} }
}
@Override @Override
public String getObjectDescription(Object o) { public String getObjectDescription(Object o) {

84
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -1,45 +1,5 @@
package net.osmand.plus.download; package net.osmand.plus.download;
import java.io.File;
import java.lang.ref.WeakReference;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import net.osmand.IProgress;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast;
import net.osmand.data.LatLon;
import net.osmand.map.WorldRegion;
import net.osmand.map.WorldRegion.RegionParams;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.DrivingRegion;
import net.osmand.plus.OsmandSettings.MetricsConstants;
import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.activities.ActionBarProgressActivity;
import net.osmand.plus.activities.LocalIndexInfo;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.TabActivity;
import net.osmand.plus.base.BasicProgressAsyncTask;
import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents;
import net.osmand.plus.download.ui.ActiveDownloadsDialogFragment;
import net.osmand.plus.download.ui.BottomSheetDownloadFragment;
import net.osmand.plus.download.ui.DataStoragePlaceDialogFragment;
import net.osmand.plus.download.ui.DownloadResourceGroupFragment;
import net.osmand.plus.download.ui.LocalIndexesFragment;
import net.osmand.plus.download.ui.UpdatesIndexFragment;
import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
import net.osmand.plus.srtmplugin.SRTMPlugin;
import net.osmand.plus.views.controls.PagerSlidingTabStrip;
import org.apache.commons.logging.Log;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
@ -65,6 +25,46 @@ import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import net.osmand.IProgress;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast;
import net.osmand.data.LatLon;
import net.osmand.map.WorldRegion;
import net.osmand.map.WorldRegion.RegionParams;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.DrivingRegion;
import net.osmand.plus.OsmandSettings.MetricsConstants;
import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.activities.ActionBarProgressActivity;
import net.osmand.plus.activities.LocalIndexInfo;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.TabActivity;
import net.osmand.plus.base.BasicProgressAsyncTask;
import net.osmand.plus.base.BottomSheetDialogFragment;
import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents;
import net.osmand.plus.download.ui.ActiveDownloadsDialogFragment;
import net.osmand.plus.download.ui.DataStoragePlaceDialogFragment;
import net.osmand.plus.download.ui.DownloadResourceGroupFragment;
import net.osmand.plus.download.ui.LocalIndexesFragment;
import net.osmand.plus.download.ui.UpdatesIndexFragment;
import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
import net.osmand.plus.srtmplugin.SRTMPlugin;
import net.osmand.plus.views.controls.PagerSlidingTabStrip;
import org.apache.commons.logging.Log;
import java.io.File;
import java.lang.ref.WeakReference;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
public class DownloadActivity extends ActionBarProgressActivity implements DownloadEvents { public class DownloadActivity extends ActionBarProgressActivity implements DownloadEvents {
private static final Log LOG = PlatformUtil.getLog(DownloadActivity.class); private static final Log LOG = PlatformUtil.getLog(DownloadActivity.class);
@ -662,7 +662,7 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl
} }
public static class AskMapDownloadFragment extends BottomSheetDownloadFragment { public static class AskMapDownloadFragment extends BottomSheetDialogFragment {
public static final String TAG = "AskMapDownloadFragment"; public static final String TAG = "AskMapDownloadFragment";
private static final String KEY_ASK_MAP_DOWNLOAD_ITEM_FILENAME = "key_ask_map_download_item_filename"; private static final String KEY_ASK_MAP_DOWNLOAD_ITEM_FILENAME = "key_ask_map_download_item_filename";
@ -745,7 +745,7 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl
} }
public static class GoToMapFragment extends BottomSheetDownloadFragment { public static class GoToMapFragment extends BottomSheetDialogFragment {
public static final String TAG = "GoToMapFragment"; public static final String TAG = "GoToMapFragment";
private static final String KEY_GOTO_MAP_REGION_CENTER = "key_goto_map_region_center"; private static final String KEY_GOTO_MAP_REGION_CENTER = "key_goto_map_region_center";

32
OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java
View file

@ -1,13 +1,8 @@
package net.osmand.plus.download.ui; package net.osmand.plus.download.ui;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog;
import android.app.DialogFragment;
import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.os.StatFs; import android.os.StatFs;
import android.support.annotation.ColorRes;
import android.support.annotation.DrawableRes;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -23,27 +18,17 @@ import net.osmand.access.AccessibleToast;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.base.BottomSheetDialogFragment;
import net.osmand.plus.download.DownloadActivity; import net.osmand.plus.download.DownloadActivity;
import java.io.File; import java.io.File;
public class DataStoragePlaceDialogFragment extends DialogFragment { public class DataStoragePlaceDialogFragment extends BottomSheetDialogFragment {
private File internalStorage; private File internalStorage;
private File externalStorage; private File externalStorage;
public static boolean isInterestedInFirstTime = true; public static boolean isInterestedInFirstTime = true;
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
boolean isLightTheme = ((OsmandApplication) getActivity().getApplication())
.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
int themeId = isLightTheme ? R.style.OsmandLightTheme_BottomSheet
: R.style.OsmandDarkTheme_BottomSheet;
final Dialog dialog = new Dialog(getActivity(), themeId);
dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
return dialog;
}
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
@ -106,19 +91,6 @@ public class DataStoragePlaceDialogFragment extends DialogFragment {
.getDefaultInternalStorage(); .getDefaultInternalStorage();
} }
private OsmandApplication getMyApplication() {
return (OsmandApplication) getActivity().getApplication();
}
private Drawable getContentIcon(@DrawableRes int drawableRes) {
return getMyApplication().getIconsCache().getContentIcon(drawableRes);
}
private Drawable getIcon(@DrawableRes int drawableRes, @ColorRes int color) {
return getMyApplication().getIconsCache().getIcon(drawableRes, color);
}
private String getFreeSpace(File dir) { private String getFreeSpace(File dir) {
String sz = ""; String sz = "";
if (dir.canRead()) { if (dir.canRead()) {

24
OsmAnd/src/net/osmand/plus/download/ui/UpdatesIndexFragment.java
View file

@ -1,16 +1,5 @@
package net.osmand.plus.download.ui; package net.osmand.plus.download.ui;
import java.util.Comparator;
import java.util.List;
import net.osmand.map.OsmandRegions;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.OsmAndListFragment;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents;
import net.osmand.plus.download.DownloadResources;
import net.osmand.plus.download.IndexItem;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
@ -27,6 +16,18 @@ import android.widget.ArrayAdapter;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import net.osmand.map.OsmandRegions;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.OsmAndListFragment;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents;
import net.osmand.plus.download.DownloadResources;
import net.osmand.plus.download.IndexItem;
import java.util.Comparator;
import java.util.List;
public class UpdatesIndexFragment extends OsmAndListFragment implements DownloadEvents { public class UpdatesIndexFragment extends OsmAndListFragment implements DownloadEvents {
private static final int RELOAD_ID = 5; private static final int RELOAD_ID = 5;
private UpdateIndexAdapter listAdapter; private UpdateIndexAdapter listAdapter;
@ -210,5 +211,4 @@ public class UpdatesIndexFragment extends OsmAndListFragment implements Download
return v; return v;
} }
} }
} }

5
OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
View file

@ -240,7 +240,10 @@ public class GpxUiHelper {
@Override @Override
public View getView(final int position, View convertView, ViewGroup parent) { public View getView(final int position, View convertView, ViewGroup parent) {
// User super class to create the View // User super class to create the View
View v = activity.getLayoutInflater().inflate(layout, null); View v = convertView;
if (v == null) {
v = activity.getLayoutInflater().inflate(layout, null);
}
ImageView icon = (ImageView) v.findViewById(R.id.icon); ImageView icon = (ImageView) v.findViewById(R.id.icon);
icon.setImageDrawable(adapter.getImage(app, position, light)); icon.setImageDrawable(adapter.getImage(app, position, light));
final ArrayAdapter<String> arrayAdapter = this; final ArrayAdapter<String> arrayAdapter = this;

35
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
View file

@ -10,6 +10,7 @@ import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.GPXUtilities.WptPt; import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.mapcontextmenu.MenuController.MenuState;
import net.osmand.plus.mapcontextmenu.MenuController.MenuType; import net.osmand.plus.mapcontextmenu.MenuController.MenuType;
import net.osmand.plus.mapcontextmenu.MenuController.TitleButtonController; import net.osmand.plus.mapcontextmenu.MenuController.TitleButtonController;
import net.osmand.plus.mapcontextmenu.MenuController.TitleProgressController; import net.osmand.plus.mapcontextmenu.MenuController.TitleProgressController;
@ -198,6 +199,8 @@ public class MapContextMenu extends MenuTitleController {
if (needAcquireMenuController) { if (needAcquireMenuController) {
acquireMenuController(); acquireMenuController();
} else {
menuController.update(pointDescription, object);
} }
initTitle(); initTitle();
@ -210,7 +213,7 @@ public class MapContextMenu extends MenuTitleController {
mapActivity.getMapView().setMapPosition(0); mapActivity.getMapView().setMapPosition(0);
} }
mapActivity.getMapView().refreshMap(); mapActivity.refreshMap();
return true; return true;
} }
@ -244,12 +247,14 @@ public class MapContextMenu extends MenuTitleController {
} }
public void close() { public void close() {
if (active) {
active = false; active = false;
if (this.object != null) { if (this.object != null) {
clearSelectedObject(this.object); clearSelectedObject(this.object);
} }
hide(); hide();
mapActivity.getMapView().refreshMap(); mapActivity.refreshMap();
}
} }
public void hide() { public void hide() {
@ -332,7 +337,6 @@ public class MapContextMenu extends MenuTitleController {
protected void acquireIcons() { protected void acquireIcons() {
super.acquireIcons(); super.acquireIcons();
if (menuController != null) { if (menuController != null) {
favActionIconId = menuController.getFavActionIconId(); favActionIconId = menuController.getFavActionIconId();
} else { } else {
@ -341,10 +345,9 @@ public class MapContextMenu extends MenuTitleController {
} }
public void fabPressed() { public void fabPressed() {
mapActivity.getMapActions().showNavigationContextMenuPoint(latLon.getLatitude(), latLon.getLongitude()); mapActivity.getMapActions().directionTo(latLon.getLatitude(), latLon.getLongitude(), getPointDescription());
//mapActivity.getMapActions().directionTo(latLon.getLatitude(), latLon.getLongitude());
hide(); hide();
//mapActivity.getMapLayers().getMapControlsLayer().showRouteInfoControlDialog(); mapActivity.getMapLayers().getMapControlsLayer().showRouteInfoControlDialog();
} }
public void buttonWaypointPressed() { public void buttonWaypointPressed() {
@ -361,7 +364,11 @@ public class MapContextMenu extends MenuTitleController {
if (object != null && object instanceof FavouritePoint) { if (object != null && object instanceof FavouritePoint) {
getFavoritePointEditor().edit((FavouritePoint) object); getFavoritePointEditor().edit((FavouritePoint) object);
} else { } else {
getFavoritePointEditor().add(latLon, getTitleStr()); String title = getTitleStr();
if (pointDescription.isFavorite() || title.equals(addressNotKnownStr)) {
title = "";
}
getFavoritePointEditor().add(latLon, title);
} }
} }
@ -385,8 +392,12 @@ public class MapContextMenu extends MenuTitleController {
} }
public void addWptPt() { public void addWptPt() {
if (object == null || !(object instanceof WptPt)) { if (object == null) {
getWptPtPointEditor().add(latLon, getTitleStr()); String title = getTitleStr();
if (pointDescription.isWpt() || title.equals(addressNotKnownStr)) {
title = "";
}
getWptPtPointEditor().add(latLon, title);
} }
} }
@ -433,7 +444,7 @@ public class MapContextMenu extends MenuTitleController {
if (menuController != null) { if (menuController != null) {
return menuController.getCurrentMenuState(); return menuController.getCurrentMenuState();
} else { } else {
return MenuController.MenuState.HEADER_ONLY; return MenuState.HEADER_ONLY;
} }
} }
@ -505,6 +516,10 @@ public class MapContextMenu extends MenuTitleController {
return menuController != null && menuController.displayDistanceDirection(); return menuController != null && menuController.displayDistanceDirection();
} }
public boolean displayStreetNameInTitle() {
return menuController != null && menuController.displayStreetNameInTitle();
}
public void updateData() { public void updateData() {
if (menuController != null) { if (menuController != null) {
menuController.updateData(); menuController.updateData();

108
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -39,10 +39,12 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.DashLocationFragment; import net.osmand.plus.dashboard.DashLocationFragment;
import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents; import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents;
import net.osmand.plus.mapcontextmenu.MenuController.MenuState;
import net.osmand.plus.mapcontextmenu.MenuController.TitleButtonController; import net.osmand.plus.mapcontextmenu.MenuController.TitleButtonController;
import net.osmand.plus.mapcontextmenu.MenuController.TitleProgressController; import net.osmand.plus.mapcontextmenu.MenuController.TitleProgressController;
import net.osmand.plus.views.AnimateDraggingMapThread; import net.osmand.plus.views.AnimateDraggingMapThread;
import net.osmand.plus.views.OsmandMapTileView; import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.util.Algorithms;
import static android.util.TypedValue.COMPLEX_UNIT_DIP; import static android.util.TypedValue.COMPLEX_UNIT_DIP;
import static net.osmand.plus.mapcontextmenu.MenuBuilder.SHADOW_HEIGHT_BOTTOM_DP; import static net.osmand.plus.mapcontextmenu.MenuBuilder.SHADOW_HEIGHT_BOTTOM_DP;
@ -55,6 +57,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
public static final float FAB_PADDING_TOP_DP = 4f; public static final float FAB_PADDING_TOP_DP = 4f;
public static final float MARKER_PADDING_DP = 20f; public static final float MARKER_PADDING_DP = 20f;
public static final float MARKER_PADDING_X_DP = 50f; public static final float MARKER_PADDING_X_DP = 50f;
public static final float SKIP_HALF_SCREEN_STATE_KOEF = .21f;
private View view; private View view;
private View mainView; private View mainView;
@ -87,6 +90,8 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
private int origMarkerY; private int origMarkerY;
private boolean customMapCenter; private boolean customMapCenter;
private float skipHalfScreenStateLimit;
private int screenOrientation; private int screenOrientation;
private class SingleTapConfirm implements OnGestureListener { private class SingleTapConfirm implements OnGestureListener {
@ -130,6 +135,8 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
Bundle savedInstanceState) { Bundle savedInstanceState) {
screenHeight = getScreenHeight(); screenHeight = getScreenHeight();
skipHalfScreenStateLimit = screenHeight * SKIP_HALF_SCREEN_STATE_KOEF;
viewHeight = screenHeight - getStatusBarHeight(); viewHeight = screenHeight - getStatusBarHeight();
fabPaddingTopPx = dpToPx(FAB_PADDING_TOP_DP); fabPaddingTopPx = dpToPx(FAB_PADDING_TOP_DP);
@ -244,7 +251,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
showOnMap(menu.getLatLon(), true, false); showOnMap(menu.getLatLon(), true, false);
if (hasMoved) { if (hasMoved) {
applyPosY(getViewY(), false, false); applyPosY(getViewY(), false, false, 0, 0);
} }
return true; return true;
} }
@ -295,18 +302,29 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
velocity.recycle(); velocity.recycle();
boolean skipHalfScreenState = Math.abs(currentY - dyMain) > skipHalfScreenStateLimit;
boolean needCloseMenu = false; boolean needCloseMenu = false;
int oldMenuState = menu.getCurrentMenuState(); int oldMenuState = menu.getCurrentMenuState();
if (menuBottomViewHeight > 0 && slidingUp) { if (menuBottomViewHeight > 0 && slidingUp) {
menu.slideUp(); menu.slideUp();
if (skipHalfScreenState) {
menu.slideUp();
}
} else if (slidingDown) { } else if (slidingDown) {
needCloseMenu = !menu.slideDown(); needCloseMenu = !menu.slideDown();
if (!needCloseMenu && skipHalfScreenState) {
menu.slideDown();
}
} }
int newMenuState = menu.getCurrentMenuState(); int newMenuState = menu.getCurrentMenuState();
boolean needMapAdjust = oldMenuState != newMenuState && newMenuState != MenuController.MenuState.FULL_SCREEN; boolean needMapAdjust = oldMenuState != newMenuState && newMenuState != MenuState.FULL_SCREEN;
applyPosY(currentY, needCloseMenu, needMapAdjust); if (newMenuState != oldMenuState) {
doBeforeMenuStateChange(oldMenuState, newMenuState);
}
applyPosY(currentY, needCloseMenu, needMapAdjust, oldMenuState, newMenuState);
break; break;
@ -314,7 +332,8 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
return true; return true;
} }
private void applyPosY(final int currentY, final boolean needCloseMenu, boolean needMapAdjust) { private void applyPosY(final int currentY, final boolean needCloseMenu, boolean needMapAdjust,
final int previousMenuState, final int newMenuState) {
final int posY = getPosY(needCloseMenu); final int posY = getPosY(needCloseMenu);
if (currentY != posY) { if (currentY != posY) {
if (posY < currentY) { if (posY < currentY) {
@ -332,6 +351,9 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
menu.close(); menu.close();
} else { } else {
updateMainViewLayout(posY); updateMainViewLayout(posY);
if (previousMenuState != 0 && newMenuState != 0 && previousMenuState != newMenuState) {
doAfterMenuStateChange(previousMenuState, newMenuState);
}
} }
} }
@ -341,6 +363,9 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
menu.close(); menu.close();
} else { } else {
updateMainViewLayout(posY); updateMainViewLayout(posY);
if (previousMenuState != 0 && newMenuState != 0 && previousMenuState != newMenuState) {
doAfterMenuStateChange(previousMenuState, newMenuState);
}
} }
} }
}) })
@ -356,7 +381,14 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
} }
} else { } else {
setViewY(posY, false, needMapAdjust); setViewY(posY, false, needMapAdjust);
if (needCloseMenu) {
menu.close();
} else {
updateMainViewLayout(posY); updateMainViewLayout(posY);
if (previousMenuState != 0 && newMenuState != 0 && previousMenuState != newMenuState) {
doAfterMenuStateChange(previousMenuState, newMenuState);
}
}
} }
} }
} }
@ -411,8 +443,13 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
}); });
final ImageButton buttonWaypoint = (ImageButton) view.findViewById(R.id.context_menu_route_button); final ImageButton buttonWaypoint = (ImageButton) view.findViewById(R.id.context_menu_route_button);
if (getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_flag_dark,
light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
} else {
buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_waypoints, buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_waypoints,
light ? R.color.icon_color : R.color.dashboard_subheader_text_dark)); light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
}
buttonWaypoint.setOnClickListener(new View.OnClickListener() { buttonWaypoint.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -478,6 +515,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
if (leftTitleButtonController.needRightText) { if (leftTitleButtonController.needRightText) {
titleButtonRightText.setText(leftTitleButtonController.rightTextCaption); titleButtonRightText.setText(leftTitleButtonController.rightTextCaption);
titleButtonRightText.setVisibility(View.VISIBLE);
} else { } else {
titleButtonRightText.setVisibility(View.GONE); titleButtonRightText.setVisibility(View.GONE);
} }
@ -592,6 +630,12 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
} }
public void rebuildMenu() { public void rebuildMenu() {
IconsCache iconsCache = getMyApplication().getIconsCache();
boolean light = getMyApplication().getSettings().isLightContent();
final ImageButton buttonFavorite = (ImageButton) view.findViewById(R.id.context_menu_fav_button);
buttonFavorite.setImageDrawable(iconsCache.getIcon(menu.getFavActionIconId(),
light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
buildHeader(); buildHeader();
LinearLayout bottomLayout = (LinearLayout)view.findViewById(R.id.context_menu_bottom_view); LinearLayout bottomLayout = (LinearLayout)view.findViewById(R.id.context_menu_bottom_view);
@ -677,22 +721,39 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
line1.setText(menu.getTitleStr()); line1.setText(menu.getTitleStr());
// Text line 2 // Text line 2
TextView distanceText = (TextView) view.findViewById(R.id.distance);
ImageView direction = (ImageView) view.findViewById(R.id.direction);
if (menu.displayDistanceDirection()) {
updateDistanceDirection();
} else {
direction.setVisibility(View.GONE);
distanceText.setVisibility(View.GONE);
}
TextView line2 = (TextView) view.findViewById(R.id.context_menu_line2); TextView line2 = (TextView) view.findViewById(R.id.context_menu_line2);
line2.setText(menu.getLocationStr()); String typeStr = menu.getTypeStr();
Drawable icon = menu.getSecondLineIcon(); String streetStr = menu.getStreetStr();
if (icon != null) { StringBuilder line2Str = new StringBuilder();
if (!Algorithms.isEmpty(typeStr)) {
line2Str.append(typeStr);
Drawable icon = menu.getTypeIcon();
line2.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null); line2.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
line2.setCompoundDrawablePadding(dpToPx(5f)); line2.setCompoundDrawablePadding(dpToPx(5f));
} }
if (!Algorithms.isEmpty(streetStr) && !menu.displayStreetNameInTitle()) {
if (line2Str.length() > 0) {
line2Str.append(", ");
}
line2Str.append(streetStr);
}
line2.setText(line2Str.toString());
updateCompassVisibility();
}
private void updateCompassVisibility() {
View compassView = view.findViewById(R.id.compass_layout);
if (menu.displayDistanceDirection() && menu.getCurrentMenuState() != MenuState.FULL_SCREEN) {
updateDistanceDirection();
compassView.setVisibility(View.VISIBLE);
} else {
if (!menu.displayDistanceDirection()) {
compassView.setVisibility(View.GONE);
} else {
compassView.setVisibility(View.INVISIBLE);
}
}
} }
private void updateDistanceDirection() { private void updateDistanceDirection() {
@ -719,20 +780,20 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
destinationState = menu.getCurrentMenuState(); destinationState = menu.getCurrentMenuState();
minHalfY = viewHeight - (int)(viewHeight * menu.getHalfScreenMaxHeightKoef()); minHalfY = viewHeight - (int)(viewHeight * menu.getHalfScreenMaxHeightKoef());
} else { } else {
destinationState = MenuController.MenuState.HEADER_ONLY; destinationState = MenuState.HEADER_ONLY;
minHalfY = viewHeight; minHalfY = viewHeight;
} }
int posY = 0; int posY = 0;
switch (destinationState) { switch (destinationState) {
case MenuController.MenuState.HEADER_ONLY: case MenuState.HEADER_ONLY:
posY = viewHeight - (menuTitleHeight - dpToPx(SHADOW_HEIGHT_BOTTOM_DP)); posY = viewHeight - (menuTitleHeight - dpToPx(SHADOW_HEIGHT_BOTTOM_DP));
break; break;
case MenuController.MenuState.HALF_SCREEN: case MenuState.HALF_SCREEN:
posY = viewHeight - menuFullHeightMax; posY = viewHeight - menuFullHeightMax;
posY = Math.max(posY, minHalfY); posY = Math.max(posY, minHalfY);
break; break;
case MenuController.MenuState.FULL_SCREEN: case MenuState.FULL_SCREEN:
posY = -menuTopShadowHeight - dpToPx(SHADOW_HEIGHT_TOP_DP); posY = -menuTopShadowHeight - dpToPx(SHADOW_HEIGHT_TOP_DP);
break; break;
default: default:
@ -943,5 +1004,12 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
public void updateLocation(boolean centerChanged, boolean locationChanged, boolean compassChanged) { public void updateLocation(boolean centerChanged, boolean locationChanged, boolean compassChanged) {
updateDistanceDirection(); updateDistanceDirection();
} }
private void doBeforeMenuStateChange(int previousState, int newState) {
}
private void doAfterMenuStateChange(int previousState, int newState) {
updateCompassVisibility();
}
} }

36
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
View file

@ -9,6 +9,7 @@ import net.osmand.data.FavouritePoint;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
import net.osmand.plus.GPXUtilities.WptPt; import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper.TargetPoint; import net.osmand.plus.TargetPointsHelper.TargetPoint;
@ -16,15 +17,16 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording; import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording;
import net.osmand.plus.helpers.SearchHistoryHelper; import net.osmand.plus.helpers.SearchHistoryHelper;
import net.osmand.plus.mapcontextmenu.controllers.AmenityMenuController; import net.osmand.plus.mapcontextmenu.controllers.AmenityMenuController;
import net.osmand.plus.mapcontextmenu.controllers.AudioVideoNoteMenuController; import net.osmand.plus.audionotes.AudioVideoNoteMenuController;
import net.osmand.plus.mapcontextmenu.controllers.EditPOIMenuController; import net.osmand.plus.osmedit.EditPOIMenuController;
import net.osmand.plus.mapcontextmenu.controllers.FavouritePointMenuController; import net.osmand.plus.mapcontextmenu.controllers.FavouritePointMenuController;
import net.osmand.plus.mapcontextmenu.controllers.GpxItemMenuController;
import net.osmand.plus.mapcontextmenu.controllers.HistoryMenuController; import net.osmand.plus.mapcontextmenu.controllers.HistoryMenuController;
import net.osmand.plus.mapcontextmenu.controllers.MapDataMenuController; import net.osmand.plus.mapcontextmenu.controllers.MapDataMenuController;
import net.osmand.plus.mapcontextmenu.controllers.MyLocationMenuController; import net.osmand.plus.mapcontextmenu.controllers.MyLocationMenuController;
import net.osmand.plus.mapcontextmenu.controllers.OsMoMenuController; import net.osmand.plus.osmo.OsMoMenuController;
import net.osmand.plus.mapcontextmenu.controllers.OsmBugMenuController; import net.osmand.plus.osmedit.OsmBugMenuController;
import net.osmand.plus.mapcontextmenu.controllers.ParkingPositionMenuController; import net.osmand.plus.parkingpoint.ParkingPositionMenuController;
import net.osmand.plus.mapcontextmenu.controllers.PointDescriptionMenuController; import net.osmand.plus.mapcontextmenu.controllers.PointDescriptionMenuController;
import net.osmand.plus.mapcontextmenu.controllers.TargetPointMenuController; import net.osmand.plus.mapcontextmenu.controllers.TargetPointMenuController;
import net.osmand.plus.mapcontextmenu.controllers.WptPtMenuController; import net.osmand.plus.mapcontextmenu.controllers.WptPtMenuController;
@ -35,7 +37,7 @@ import net.osmand.plus.osmo.OsMoGroupsStorage.OsMoDevice;
public abstract class MenuController extends BaseMenuController { public abstract class MenuController extends BaseMenuController {
public class MenuState { public static class MenuState {
public static final int HEADER_ONLY = 1; public static final int HEADER_ONLY = 1;
public static final int HALF_SCREEN = 2; public static final int HALF_SCREEN = 2;
public static final int FULL_SCREEN = 4; public static final int FULL_SCREEN = 4;
@ -93,6 +95,8 @@ public abstract class MenuController extends BaseMenuController {
menuController = new MapDataMenuController(app, mapActivity, pointDescription, (BinaryMapDataObject) object); menuController = new MapDataMenuController(app, mapActivity, pointDescription, (BinaryMapDataObject) object);
} else if (object instanceof OpenStreetNote) { } else if (object instanceof OpenStreetNote) {
menuController = new OsmBugMenuController(app, mapActivity, pointDescription, (OpenStreetNote) object); menuController = new OsmBugMenuController(app, mapActivity, pointDescription, (OpenStreetNote) object);
} else if (object instanceof GpxDisplayItem) {
menuController = new GpxItemMenuController(app, mapActivity, pointDescription, (GpxDisplayItem) object);
} else if (object instanceof LatLon) { } else if (object instanceof LatLon) {
if (pointDescription.isParking()) { if (pointDescription.isParking()) {
menuController = new ParkingPositionMenuController(app, mapActivity, pointDescription); menuController = new ParkingPositionMenuController(app, mapActivity, pointDescription);
@ -100,15 +104,25 @@ public abstract class MenuController extends BaseMenuController {
menuController = new MyLocationMenuController(app, mapActivity, pointDescription); menuController = new MyLocationMenuController(app, mapActivity, pointDescription);
} }
} }
} else { }
if (menuController == null) {
menuController = new PointDescriptionMenuController(app, mapActivity, pointDescription); menuController = new PointDescriptionMenuController(app, mapActivity, pointDescription);
} }
if (menuController != null) {
menuController.menuType = menuType; menuController.menuType = menuType;
}
return menuController; return menuController;
} }
public void update(PointDescription pointDescription, Object object) {
setPointDescription(pointDescription);
setObject(object);
}
protected void setPointDescription(PointDescription pointDescription) {
this.pointDescription = pointDescription;
}
protected abstract void setObject(Object object);
public void addPlainMenuItem(int iconId, String text, boolean needLinks) { public void addPlainMenuItem(int iconId, String text, boolean needLinks) {
builder.addPlainMenuItem(iconId, text, needLinks); builder.addPlainMenuItem(iconId, text, needLinks);
} }
@ -240,12 +254,14 @@ public abstract class MenuController extends BaseMenuController {
public Drawable getLeftIcon() { return null; } public Drawable getLeftIcon() { return null; }
public Drawable getSecondLineIcon() { return null; } public Drawable getSecondLineTypeIcon() { return null; }
public int getFavActionIconId() { return R.drawable.ic_action_fav_dark; } public int getFavActionIconId() { return R.drawable.ic_action_fav_dark; }
public String getTypeStr() { return ""; } public String getTypeStr() { return ""; }
public String getCommonTypeStr() { return ""; }
public String getNameStr() { return pointDescription.getName(); } public String getNameStr() { return pointDescription.getName(); }
public void share(LatLon latLon, String title) { public void share(LatLon latLon, String title) {

62
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java
View file

@ -19,9 +19,10 @@ public abstract class MenuTitleController {
protected Drawable leftIcon; protected Drawable leftIcon;
protected String nameStr = ""; protected String nameStr = "";
protected String typeStr = ""; protected String typeStr = "";
protected Drawable secondLineIcon; protected String commonTypeStr = "";
protected Drawable secondLineTypeIcon;
protected String streetStr = ""; protected String streetStr = "";
protected boolean addressUnknown = false; protected String addressNotKnownStr;
public abstract MapActivity getMapActivity(); public abstract MapActivity getMapActivity();
@ -37,10 +38,6 @@ public abstract class MenuTitleController {
return nameStr; return nameStr;
} }
public boolean isAddressUnknown() {
return addressUnknown;
}
public int getLeftIconId() { public int getLeftIconId() {
return leftIconId; return leftIconId;
} }
@ -49,24 +46,34 @@ public abstract class MenuTitleController {
return leftIcon; return leftIcon;
} }
public Drawable getSecondLineIcon() { public Drawable getTypeIcon() {
return secondLineIcon; return secondLineTypeIcon;
} }
public String getLocationStr() { public String getTypeStr() {
MenuController menuController = getMenuController(); MenuController menuController = getMenuController();
if (menuController != null && menuController.needTypeStr()) { if (menuController != null && menuController.needTypeStr()) {
return typeStr; return typeStr;
} else { } else {
if (Algorithms.isEmpty(streetStr)) { return "";
return typeStr;
} else {
return streetStr;
} }
} }
public String getCommonTypeStr() {
return commonTypeStr;
}
public String getStreetStr() {
MenuController menuController = getMenuController();
if (menuController != null && menuController.needStreetName()) {
return streetStr;
} else {
return "";
}
} }
protected void initTitle() { protected void initTitle() {
addressNotKnownStr = getMapActivity().getString(R.string.address_unknown);
acquireIcons(); acquireIcons();
acquireNameAndType(); acquireNameAndType();
if (needStreetName()) { if (needStreetName()) {
@ -88,45 +95,38 @@ public abstract class MenuTitleController {
leftIconId = 0; leftIconId = 0;
leftIcon = null; leftIcon = null;
secondLineIcon = null; secondLineTypeIcon = null;
if (menuController != null) { if (menuController != null) {
leftIconId = menuController.getLeftIconId(); leftIconId = menuController.getLeftIconId();
leftIcon = menuController.getLeftIcon(); leftIcon = menuController.getLeftIcon();
secondLineIcon = menuController.getSecondLineIcon(); secondLineTypeIcon = menuController.getSecondLineTypeIcon();
} }
} }
protected void acquireNameAndType() { protected void acquireNameAndType() {
nameStr = ""; nameStr = "";
typeStr = ""; typeStr = "";
commonTypeStr = "";
streetStr = ""; streetStr = "";
addressUnknown = false;
MenuController menuController = getMenuController(); MenuController menuController = getMenuController();
PointDescription pointDescription = getPointDescription();
if (menuController != null) { if (menuController != null) {
nameStr = menuController.getNameStr(); nameStr = menuController.getNameStr();
typeStr = menuController.getTypeStr(); typeStr = menuController.getTypeStr();
} commonTypeStr = menuController.getCommonTypeStr();
if (Algorithms.isEmpty(nameStr)) {
nameStr = pointDescription.getName();
}
if (Algorithms.isEmpty(typeStr)) {
typeStr = pointDescription.getTypeName();
} }
if (Algorithms.isEmpty(nameStr)) { if (Algorithms.isEmpty(nameStr)) {
if (!Algorithms.isEmpty(typeStr)) { if (!Algorithms.isEmpty(typeStr)) {
nameStr = typeStr; nameStr = typeStr;
if (menuController == null || menuController.getMenuType() == MenuController.MenuType.STANDARD) { typeStr = commonTypeStr;
typeStr = "";
}
} else { } else {
nameStr = getMapActivity().getString(R.string.address_unknown); nameStr = addressNotKnownStr;
addressUnknown = true; typeStr = commonTypeStr;
} }
} else if (Algorithms.isEmpty(typeStr)) {
typeStr = commonTypeStr;
} }
} }
@ -148,8 +148,6 @@ public abstract class MenuTitleController {
MenuController menuController = getMenuController(); MenuController menuController = getMenuController();
if (menuController == null || menuController.displayStreetNameInTitle()) { if (menuController == null || menuController.displayStreetNameInTitle()) {
nameStr = streetStr; nameStr = streetStr;
addressUnknown = false;
streetStr = "";
getPointDescription().setName(nameStr); getPointDescription().setName(nameStr);
} }
getMapActivity().runOnUiThread(new Runnable() { getMapActivity().runOnUiThread(new Runnable() {
@ -158,8 +156,6 @@ public abstract class MenuTitleController {
} }
}); });
} }
} else {
streetStr = "";
} }
return true; return true;
} }

22
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AmenityMenuController.java
View file

@ -15,13 +15,20 @@ import net.osmand.util.Algorithms;
public class AmenityMenuController extends MenuController { public class AmenityMenuController extends MenuController {
private final Amenity amenity; private Amenity amenity;
public AmenityMenuController(OsmandApplication app, MapActivity mapActivity, PointDescription pointDescription, final Amenity amenity) { public AmenityMenuController(OsmandApplication app, MapActivity mapActivity, PointDescription pointDescription, Amenity amenity) {
super(new AmenityMenuBuilder(app, amenity), pointDescription, mapActivity); super(new AmenityMenuBuilder(app, amenity), pointDescription, mapActivity);
this.amenity = amenity; this.amenity = amenity;
} }
@Override
protected void setObject(Object object) {
if (object instanceof Amenity) {
this.amenity = (Amenity) object;
}
}
@Override @Override
protected int getSupportedMenuStatesPortrait() { protected int getSupportedMenuStatesPortrait() {
return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN; return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN;
@ -55,6 +62,11 @@ public class AmenityMenuController extends MenuController {
return 0; return 0;
} }
@Override
public boolean displayDistanceDirection() {
return true;
}
@Override @Override
public String getTypeStr() { public String getTypeStr() {
PoiCategory pc = amenity.getType(); PoiCategory pc = amenity.getType();
@ -68,6 +80,12 @@ public class AmenityMenuController extends MenuController {
return typeStr; return typeStr;
} }
@Override
public String getCommonTypeStr() {
PoiCategory pc = amenity.getType();
return pc.getTranslation();
}
@Override @Override
public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) { public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) {
if (!Algorithms.isEmpty(typeStr)) { if (!Algorithms.isEmpty(typeStr)) {

12
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java
View file

@ -5,7 +5,6 @@ import android.support.v4.app.Fragment;
import net.osmand.data.FavouritePoint; import net.osmand.data.FavouritePoint;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
import net.osmand.plus.IconsCache;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
@ -24,6 +23,13 @@ public class FavouritePointMenuController extends MenuController {
this.fav = fav; this.fav = fav;
} }
@Override
protected void setObject(Object object) {
if (object instanceof FavouritePoint) {
this.fav = (FavouritePoint) object;
}
}
@Override @Override
protected int getSupportedMenuStatesPortrait() { protected int getSupportedMenuStatesPortrait() {
return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN; return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN;
@ -56,11 +62,11 @@ public class FavouritePointMenuController extends MenuController {
@Override @Override
public Drawable getLeftIcon() { public Drawable getLeftIcon() {
return getPaintedIcon(R.drawable.ic_action_fav_dark, fav.getColor()); return FavoriteImageDrawable.getOrCreate(getMapActivity().getMyApplication(), fav.getColor(), false);
} }
@Override @Override
public Drawable getSecondLineIcon() { public Drawable getSecondLineTypeIcon() {
return getIcon(R.drawable.ic_small_group); return getIcon(R.drawable.ic_small_group);
} }

53
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/GpxItemMenuController.java Normal file
View file

@ -0,0 +1,53 @@
package net.osmand.plus.mapcontextmenu.controllers;
import android.graphics.drawable.Drawable;
import net.osmand.data.PointDescription;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.mapcontextmenu.MenuBuilder;
import net.osmand.plus.mapcontextmenu.MenuController;
public class GpxItemMenuController extends MenuController {
private GpxDisplayItem item;
public GpxItemMenuController(OsmandApplication app, MapActivity mapActivity, PointDescription pointDescription, GpxDisplayItem item) {
super(new MenuBuilder(app), pointDescription, mapActivity);
this.item = item;
}
@Override
protected void setObject(Object object) {
if (object instanceof GpxDisplayItem) {
this.item = (GpxDisplayItem) object;
}
}
@Override
protected int getSupportedMenuStatesPortrait() {
return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN;
}
@Override
public String getTypeStr() {
return getPointDescription().getTypeName();
}
@Override
public String getCommonTypeStr() {
return getMapActivity().getString(R.string.gpx_selection_segment_title);
}
@Override
public boolean needStreetName() {
return false;
}
@Override
public Drawable getLeftIcon() {
return getIcon(R.drawable.ic_action_polygom_dark, R.color.osmand_orange);
}
}

Some files were not shown because too many files have changed in this diff Show more