From eef8f343a98919910408e0c197be3a98343b97cf Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 28 Jul 2014 05:51:25 +0200 Subject: [PATCH 01/19] Add navigate buttons --- OsmAnd/res/values/sherpafy.xml | 3 +- OsmAnd/src/net/osmand/plus/GPXUtilities.java | 13 +++ .../sherpafy/SherpafyFavoriteFragment.java | 2 +- .../sherpafy/SherpafySelectToursFragment.java | 57 +--------- .../plus/sherpafy/SherpafyStageFragment.java | 96 +--------------- .../plus/sherpafy/SherpafyTourFragment.java | 3 + .../plus/sherpafy/TourViewActivity.java | 103 ++++++++++++++++++ 7 files changed, 126 insertions(+), 151 deletions(-) diff --git a/OsmAnd/res/values/sherpafy.xml b/OsmAnd/res/values/sherpafy.xml index 243de084d6..281ea9d08f 100644 --- a/OsmAnd/res/values/sherpafy.xml +++ b/OsmAnd/res/values/sherpafy.xml @@ -1,5 +1,7 @@ + Do you want to interrupt current stage and start new ? + Enter access code to see if you are entitled for a specific tour (optional) Fav Target Route @@ -18,7 +20,6 @@ Download Tours Sherpafy Tours Access code is not valid - Enter access code Overview Selecting tour... No stages provided diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java index 5730ed411f..b82e5d2457 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java @@ -554,6 +554,19 @@ public class GPXUtilities { } return tpoints; } + + public WptPt getLastPoint() { + if (tracks.size() > 0) { + Track tk = tracks.get(tracks.size() - 1); + if (tk.segments.size() > 0) { + TrkSegment ts = tk.segments.get(tk.segments.size() - 1); + if (ts.points.size() > 0) { + return ts.points.get(ts.points.size() - 1); + } + } + } + return null; + } public WptPt findPointToShow() { for (Track t : tracks) { diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java index 3949608194..e5da264e4e 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java @@ -53,7 +53,7 @@ public class SherpafyFavoriteFragment extends SherpafyStageInfoFragment { public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) { if (item.getItemId() == SHOW_ON_MAP) { - // TODO actions + ((TourViewActivity) getSherlockActivity()).goToMap(fav.location); return true; } else if (item.getItemId() == android.R.id.home) { ((TourViewActivity) getSherlockActivity()).showSelectedItem(); diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java index 7348f7555f..4aa8b893a3 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java @@ -22,8 +22,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.EditText; import android.widget.ImageView; @@ -65,20 +63,14 @@ public class SherpafySelectToursFragment extends SherlockListFragment { @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - com.actionbarsherlock.view.MenuItem menuItem = menu.add(0, ACTION_DOWNLOAD, 0, R.string.sherpafy_download_tours).setShowAsActionFlags( MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); -// OsmandApplication app = (OsmandApplication) getActivity().getApplication(); // boolean light = true; //app.getSettings().isLightActionBar(); //menuItem = menuItem.setIcon(light ? R.drawable.ic_action_gdirections_light : R.drawable.ic_action_gdirections_dark); menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { @Override public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) { - if (custom.getAccessCode().length() == 0) { - openAccessCode(true); - } else { - startDownloadActivity(); - } + openAccessCode(); return true; } }); @@ -95,7 +87,7 @@ public class SherpafySelectToursFragment extends SherlockListFragment { // }); } - protected void openAccessCode(final boolean startDownload) { + protected void openAccessCode() { Builder builder = new AlertDialog.Builder(getActivity()); builder.setTitle(R.string.enter_access_code); final EditText editText = new EditText(getActivity()); @@ -113,55 +105,12 @@ public class SherpafySelectToursFragment extends SherlockListFragment { Toast.makeText(getActivity(), R.string.access_code_is_not_valid, Toast.LENGTH_LONG).show(); return; } - if (startDownload) { - startDownloadActivity(); - } + ((TourViewActivity) getActivity()).startDownloadActivity(); } }); builder.create().show(); } - private void startDownloadActivity() { - final Intent download = new Intent(getActivity(), DownloadIndexActivity.class); - download.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - startActivity(download); - } - - private void selectTourAsync(final TourInformation tour) { - new AsyncTask() { - private ProgressDialog dlg; - - protected void onPreExecute() { - dlg = new ProgressDialog(getActivity()); - dlg.setTitle(R.string.selecting_tour_progress); - dlg.setMessage(getString(R.string.indexing_tour, tour == null ? "" : tour.getName())); - dlg.show(); - }; - - @Override - protected Void doInBackground(TourInformation... params) { - // if tour is already selected - do nothing - if (custom.getSelectedTour() != null) { - if (custom.getSelectedTour().equals(params[0])) { - return null; - } - } - custom.selectTour(params[0], IProgress.EMPTY_PROGRESS); - return null; - } - - protected void onPostExecute(Void result) { - // to avoid illegal argument exception when rotating phone during loading - try { - dlg.dismiss(); - } catch (Exception ex) { - ex.printStackTrace(); - } - //startTourView(); - }; - }.execute(tour); - } - class TourAdapter extends ArrayAdapter { public TourAdapter(List list) { diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java index ccd296bf6b..a73ea47841 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java @@ -2,38 +2,24 @@ package net.osmand.plus.sherpafy; import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.List; -import net.osmand.access.AccessibleAlertBuilder; -import net.osmand.plus.GPXUtilities.GPXFile; -import net.osmand.plus.GPXUtilities.WptPt; -import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.sherpafy.TourInformation.StageFavoriteGroup; import net.osmand.plus.sherpafy.TourInformation.StageInformation; import android.app.Activity; import android.content.Context; -import android.content.Intent; -import android.graphics.Bitmap; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.view.ViewPager; -import android.text.Html; -import android.text.Html.ImageGetter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.ScrollView; import android.widget.TabHost; import android.widget.TabHost.TabSpec; import android.widget.TabWidget; -import android.widget.TextView; import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.view.Menu; @@ -100,6 +86,7 @@ public class SherpafyStageFragment extends SherlockFragment { ((TourViewActivity) getSherlockActivity()).selectMenu(tour); return true; } else if(item.getItemId() == START) { + ((TourViewActivity) getSherlockActivity()).startStage(stage); return true; } return super.onOptionsItemSelected(item); @@ -155,88 +142,7 @@ public class SherpafyStageFragment extends SherlockFragment { e.printStackTrace(); } } - -///////// - private ImageGetter getImageGetter(final View v) { - return new Html.ImageGetter() { - @Override - public Drawable getDrawable(String s) { - Bitmap file = customization.getSelectedTour().getImageBitmapFromPath(s); - v.setTag(file); - Drawable bmp = new BitmapDrawable(getResources(), file); - // if image is thicker than screen - it may cause some problems, so we need to scale it - int imagewidth = bmp.getIntrinsicWidth(); - // TODO -// if (displaySize.x - 1 > imagewidth) { -// bmp.setBounds(0, 0, bmp.getIntrinsicWidth(), bmp.getIntrinsicHeight()); -// } else { -// double scale = (double) (displaySize.x - 1) / imagewidth; -// bmp.setBounds(0, 0, (int) (scale * bmp.getIntrinsicWidth()), -// (int) (scale * bmp.getIntrinsicHeight())); -// } - return bmp; - } - }; - } - - - - private void addOnClickListener(final TextView tv) { - tv.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - if (v.getTag() instanceof Bitmap) { - final AccessibleAlertBuilder dlg = new AccessibleAlertBuilder(getActivity()); - dlg.setPositiveButton(R.string.default_buttons_ok, null); - ScrollView sv = new ScrollView(getActivity()); - ImageView img = new ImageView(getActivity()); - img.setImageBitmap((Bitmap) tv.getTag()); - sv.addView(img); - dlg.setView(sv); - dlg.show(); - } - } - }); - } - - private void prepareBitmap(Bitmap imageBitmap) { - ImageView img = null; - if (imageBitmap != null) { - img.setImageBitmap(imageBitmap); - img.setAdjustViewBounds(true); - img.setScaleType(ImageView.ScaleType.CENTER_INSIDE); - img.setCropToPadding(true); - img.setVisibility(View.VISIBLE); - } else { - img.setVisibility(View.GONE); - } - } - - private void goToMap() { - if (customization.getSelectedStage() != null) { - GPXFile gpx = customization.getSelectedStage().getGpx(); - List sgpx = getMyApplication().getSelectedGpxHelper().getSelectedGPXFiles(); - if (gpx == null && sgpx.size() > 0) { - getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow(); - } else if (sgpx.size() != 1 || sgpx.get(0).getGpxFile() != gpx) { - getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow(); - if (gpx != null && gpx.findPointToShow() != null) { - WptPt p = gpx.findPointToShow(); - getMyApplication().getSettings().setMapLocationToShow(p.lat, p.lon, 16, null); - getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(gpx); - } - } - } - Intent newIntent = new Intent(getActivity(), customization.getMapActivity()); - newIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - this.startActivityForResult(newIntent, 0); - } - - private OsmandApplication getMyApplication() { - return (OsmandApplication) getActivity().getApplication(); - } /** * This is a helper class that implements the management of tabs and all diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java index b783396100..84be43bf6f 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java @@ -126,6 +126,9 @@ public class SherpafyTourFragment extends SherlockListFragment { } sd.showDialog(); return true; + } else if(item.getItemId() == START) { + ((TourViewActivity) getSherlockActivity()).startTour(tour); + return true; } return super.onOptionsItemSelected(item); } diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java index 41135b5eb6..4c4161f116 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java @@ -1,11 +1,22 @@ package net.osmand.plus.sherpafy; +import java.util.List; import java.util.WeakHashMap; +import net.osmand.data.LatLon; +import net.osmand.plus.GPXUtilities.GPXFile; +import net.osmand.plus.GPXUtilities.WptPt; +import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; +import net.osmand.plus.TargetPointsHelper; +import net.osmand.plus.activities.DownloadIndexActivity; import net.osmand.plus.sherpafy.TourInformation.StageFavorite; import net.osmand.plus.sherpafy.TourInformation.StageInformation; +import android.app.AlertDialog; +import android.app.AlertDialog.Builder; +import android.content.DialogInterface; +import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.res.Configuration; @@ -330,4 +341,96 @@ public class TourViewActivity extends SherlockFragmentActivity { } + public void startDownloadActivity() { + final Intent download = new Intent(this, DownloadIndexActivity.class); + download.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + startActivity(download); + } + + public void goToMap(LatLon location) { + if(location != null) { + getMyApplication().getSettings().setMapLocationToShow(location.getLatitude(), location.getLatitude(), 16, null); + } + Intent newIntent = new Intent(this, customization.getMapActivity()); + newIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + this.startActivityForResult(newIntent, 0); + } + + public void startStage(final StageInformation stage) { + if(stage != customization.getSelectedStage() && customization.getSelectedStage() != null) { + Builder bld = new AlertDialog.Builder(this); + bld.setMessage(R.string.start_new_stage); + bld.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + runStage(stage.getTour(), stage, customization.getSelectedStage() != stage); + } + }); + bld.setNegativeButton(R.string.default_buttons_yes, null); + } else { + runStage(stage.getTour(), stage, customization.getSelectedStage() != stage); + } + } + + + public void startTour(final TourInformation tour) { + if(tour != customization.getSelectedTour() && customization.getSelectedTour() != null) { + Builder bld = new AlertDialog.Builder(this); + bld.setMessage(R.string.start_new_stage); + bld.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + startTourImpl(tour); + } + }); + bld.setNegativeButton(R.string.default_buttons_yes, null); + } else { + startTourImpl(tour); + } + } + + private void startTourImpl(TourInformation tour) { + StageInformation stage; + if (tour.getStageInformation().isEmpty()) { + if (tour != customization.getSelectedTour() || customization.getSelectedStage() == null) { + stage = tour.getStageInformation().get(0); + } else { + stage = customization.getSelectedStage(); + } + runStage(tour, stage, customization.getSelectedTour() != tour); + } + } + + + private void runStage(TourInformation tour, StageInformation stage, boolean startOver) { + WptPt point = null; + GPXFile gpx = null; + customization.selectTour(tour, null); + customization.selectStage(stage, null); + if (customization.getSelectedStage() != null) { + gpx = customization.getSelectedStage().getGpx(); + List sgpx = getMyApplication().getSelectedGpxHelper().getSelectedGPXFiles(); + if (gpx == null && sgpx.size() > 0) { + getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow(); + } else if (sgpx.size() != 1 || sgpx.get(0).getGpxFile() != gpx) { + getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow(); + if (gpx != null && gpx.findPointToShow() != null) { + point = gpx.findPointToShow(); + getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(gpx); + } + } + } + WptPt lp = gpx.getLastPoint(); + if(lp != null) { + TargetPointsHelper targetPointsHelper = getMyApplication().getTargetPointsHelper(); + targetPointsHelper.navigateToPoint(new LatLon(lp.lat, lp.lon), true, -1, lp.name); + getMyApplication().getSettings().navigateDialog(); + } + if(startOver && point != null){ + goToMap(new LatLon(point.lat, point.lon)); + } else { + goToMap(null); + } + } + } From 7ea5a8ce189c5f624f6b83a995134743505f4715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C4=85tkowski?= Date: Mon, 28 Jul 2014 13:47:00 +0200 Subject: [PATCH 02/19] Translated using Weblate (Polish) Currently translated at 100.0% (1474 of 1474 strings) --- OsmAnd/res/values-pl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 61a9e7de0f..b176618707 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -1868,7 +1868,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Nazwy lokalne Suahili Hebrajski - Do przodu + Prosto Dom Wysyłaj aktualną pozycję do określonej usługi internetowej, jeśli nagrywanie GPX jest włączone. Śledzenie online (wymagane GPX) From e810aa890dbd4ef82ea72c2e9bf2aec05a04d585 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Mon, 28 Jul 2014 21:06:27 +0200 Subject: [PATCH 03/19] Translated using Weblate (Slovak) Currently translated at 100.0% (1474 of 1474 strings) --- OsmAnd/res/values-sk/strings.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index f67dc9c585..ea58380b6d 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1,4 +1,4 @@ - + Zobraziť Fotografia %1$s zachytená dňa %2$s Zachytiť fotografiu @@ -1745,11 +1745,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Welšsky (Cymraeg) Jedinečné ID zariadenia Zmeniť nastavenia monitorovania a nastaviť osobný monitorovací kanál - OpenStreetMap-Monitorovanie - Pokročilé sledovanie naživo. Ponúka možnosti sledovania iných zariadení a byť sledovaný. - Vytvorte anonymné skupiny, zdieľajte vzájomne polohu a komunikujte. Rôzne možnosti nastavenia krátkodobého a dlhodobého sledovania. - Anonymné skupiny sú obmedzené na počet dní a pre niektoré funkcie nie je diaľkové ovládanie ani administrátor skupiny. - Plne funkčné skupiny sa vytvárajú na webstránke a sú prístupné len registrovaným používateľom. - Prečítajte si viac na http://osmo.mobi. + "OpenStreetMap pokročilé sledovanie naživo, pozrite http://osmo.mobi. Ponúka možnosti sledovania iných zariadení a byť sledovaný. Vytvorte anonymné skupiny, zdieľajte vzájomne polohu a komunikujte. Rôzne možnosti nastavenia krátkodobého a dlhodobého sledovania. Anonymné skupiny sú obmedzené na počet dní a pre niektoré funkcie nie je diaľkové ovládanie ani administrátor skupiny. Plne funkčné skupiny sa vytvárajú na webstránke a sú prístupné len registrovaným používateľom. " OsMo (Pokročilé sledovanie naživo) OsMo sledovanie OpenStreetMap (beta) Nikdy @@ -1939,4 +1935,11 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Zobraziť cyklocesty Perzsky Ponechať + Režim metra + Albánsky + Arabsky + Sardínsky + Srbsky + Zjednodušená čínština + Tradičná čínština From e4a7a1080bd59f880de5814c840c29935e0d4636 Mon Sep 17 00:00:00 2001 From: KAMiKAZOW Date: Tue, 29 Jul 2014 03:38:58 +0200 Subject: [PATCH 04/19] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix Unicode: Cura�ao -> Curaçao --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5122aa5d3d..5f1f66b38b 100644 --- a/README.md +++ b/README.md @@ -78,5 +78,5 @@ Functionality

List of countries supported (basically world wide!): -Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Cura�ao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe. +Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Curaçao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe.

From c3e1f0f45955cc77ef3bcf572fa246a573a86e0b Mon Sep 17 00:00:00 2001 From: KAMiKAZOW Date: Tue, 29 Jul 2014 03:45:11 +0200 Subject: [PATCH 05/19] Update AUTHORS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Android is perfectly capable of Unicode, so let’s use it properly. Description of Harry’s contributions had weird grammar. --- AUTHORS | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/AUTHORS b/AUTHORS index 4d93cca9c9..16c27abd73 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,17 +1,17 @@ -(C) OsmAnd 2010-2014 -### Credits to all major contributors/developers : - * Victor Shcherb - all parts of the project, originator - * Pavol Zibrita - first contributor and developer of some utilities - * Dusan Kazik - one of the first contributors - * Andre Van Atten - project supporter, active forum participant, one of the first users. - * Dr. Hardy Mueller - map appearance concept and base renderers, international consistency and testing, usability, app scoping, concepts, documentation, wiki, market research. - * Yvecai - main contributor to Contour Lines and Hillshade maps - * Alexey Pelykh - C++ developer, created native library and made application much snappier. - * Max (Zahnstocher) - Java contributor, active forum participant. - * Harry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant. - * Robin `ypid` Schneider - opening hours contributor +Copyright © OsmAnd 2010–2014 +### Credits to all major contributors/developers: + * Victor Shcherb – all parts of the project, originator + * Pavol Zibrita – first contributor and developer of some utilities + * Dusan Kazik – one of the first contributors + * Andre Van Atten – project supporter, active forum participant, one of the first users. + * Dr. Hardy Mueller – map appearance concept and base renderers, international consistency and testing, usability, app scoping, concepts, documentation, wiki, market research. + * Yvecai – main contributor to Contour Lines and Hillshade maps + * Alexey Pelykh – C++ developer, created native library and made application much snappier. + * Max (Zahnstocher) – Java contributor, active forum participant. + * Harry van der Wolf – contributor to country boundaries, configuration files, address files, and much else; active forum participant. + * Robin ‘ypid’ Schneider – opening hours contributor ### Other Pull requests -(C) All authors of translations and pull requests could be found in commits history : - - Translations are under special "contributor" name 'weblate' - - Pull requests have 2 committers, first is original contributor and second is project maintainer +Copyright © All authors of translations and pull requests could be found in commits history: + - Translations are under special “contributor” name ‘weblate’ + - Pull requests have two committers, first is original contributor and second is project maintainer From 8776ab5262b13c3cdf9a9be11f50f1a486588b81 Mon Sep 17 00:00:00 2001 From: KAMiKAZOW Date: Tue, 29 Jul 2014 03:54:43 +0200 Subject: [PATCH 06/19] Update LICENSE Minor corrections, mostly overused space characters. --- LICENSE | 75 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/LICENSE b/LICENSE index 22fb05baa9..ea9dfbaa48 100644 --- a/LICENSE +++ b/LICENSE @@ -1,16 +1,16 @@ - - OsmAnd - OSM Automated Navigation Directions - navigation software based on OSM maps. - Copyright (C) 2010-2014 OsmAnd ( Amstelveen, Netherlands - KvK 55730183). - - The code in that repository is mainly covered by *GPLv3*, except some 3rd party libs and resources. - ATTENTION : please be aware that some art work has proprietary license. - Main AUTHORS (more detailed list in AUTHORS): - Victor Shcherb - all parts of the project, originator - Alexey Pelykh - rendering and core parts - Hardy Mueller - main parts of the project, mostly rendering, UI interaction design - Pavol Zibrita - first contributor and developer of some utilities - + OsmAnd – OSM Automated Navigation Directions – navigation software based on OpenStreetMap. + Copyright © 2010–2014 OsmAnd (Amstelveen, Netherlands - KvK 55730183). + + The code in that repository is mainly covered by *GPLv3*, except some 3rd party libs and resources. + ATTENTION: please be aware that some artwork has proprietary license. + + Main AUTHORS (more detailed list in AUTHORS): + Victor Shcherb – all parts of the project, originator + Alexey Pelykh – rendering and core parts + Hardy Mueller – main parts of the project, mostly rendering, UI interaction design + Pavol Zibrita – first contributor and developer of some utilities + -------------------------- GPLv3 ---------------------------------- This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ ------------------------------------------------------------------- - * Source code in main repositories is covered by GPLv3 (license exceptions below) : + * Source code in main repositories is covered by GPLv3 (license exceptions below): - https://github.com/osmandapp/Osmand/tree/master/OsmAnd - https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java - https://github.com/osmandapp/Osmand-core/tree/legacy_core @@ -38,22 +38,22 @@ * UI Design and UX work, such as layout, icons is covered by CC-BY-ND - https://github.com/osmandapp/Osmand/tree/master/OsmAnd/res and others - * Map icons and their derived primities are covered by proprietary license : - - (C) icons8.com (https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg/icons8) + * Map icons and their derived primities are covered by proprietary license: + - © icons8.com (https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg/icons8) - * Generated voice files from TTS files are covered by proprietary license : + * Generated voice files from TTS files are covered by proprietary license: - Voice files (https://github.com/osmandapp/OsmAnd-resources/tree/master/voice) - + * Fonts (https://github.com/osmandapp/OsmAnd-resources/tree/master/rendering_styles/fonts) - Google Fonts (Apache License 2) - - * Map icons (Mapnik) : - - Open-SVG-Map-Icons - Public Domain - * Non patched source libraries : + * Map icons (Mapnik): + - Open-SVG-Map-Icons - Public Domain + + * Non patched source libraries: - SherlockBar - Apache Lisense - https://github.com/osmandapp/Osmand/tree/master/SherlockBar (https://github.com/JakeWharton/ActionBarSherlock/blob/master/LICENSE.txt) - * Patched libraries : + * Patched libraries: - Protobuf - New BSD License (patches - https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java/protobuf-src, https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/protobuf) - Expat - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/expat) - Freetype - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/freetype) @@ -63,31 +63,30 @@ - Skia - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/skia) - ZLib - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/zlib) - * 3rd party libraries present in the libs folder (https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java/libs): - - bzip2-20090327.jar Bzip2 - Apache License + * 3rd party libraries present in the libs folder (https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java/libs): + - bzip2-20090327.jar Bzip2 - Apache License - bsh-core-2.0b4.jar Bean Shell - SPL and LGPL (http://www.beanshell.org/license.html) - - commons-logging-1.1.1.jar - Apache License - - gnu-trove-osmand.jar GNU trove - LGPL - - icu4j-49_1.jar - ICU license ( http://source.icu-project.org/repos/icu/icu/trunk/license.html) + - commons-logging-1.1.1.jar - Apache License + - gnu-trove-osmand.jar GNU trove - LGPL + - icu4j-49_1.jar - ICU license (http://source.icu-project.org/repos/icu/icu/trunk/license.html) - json-20090211.jar - BSD alike (http://www.json.org/license.html) - - junidecode-0.1.jar - BSD-4-Clause-UC (http://sourceforge.net/projects/junidecode/) - - kxml2-2.3.0.jar - BSD license ( http://www.kxml.org/) + - junidecode-0.1.jar - BSD-4-Clause-UC (http://sourceforge.net/projects/junidecode/) + - kxml2-2.3.0.jar - BSD license (http://www.kxml.org/) - tuprolog.jar - LGPL (http://apice.unibo.it/xwiki/bin/view/Tuprolog/) - - - * Pull-requests and translations : - - All pull requests are accepted under MIT License (most honorable contributors are mentioned in AUTHORS list ) + + * Pull-requests and translations: + - All pull requests are accepted under MIT License (most honorable contributors are mentioned in AUTHORS list) * Libraries not used in final product (https://github.com/osmandapp/OsmAnd-tools/tree/master/OsmAndMapCreator/libi) - Ant libraries - (tools) https://github.com/osmandapp/Osmand/tree/master/OsmAnd/ant-lib - - jleveldb-v01.jar + - jleveldb-v01.jar - jsch-20120101.jar - junit-4.10.jar - mysql-connector-java-5.1.18-bin.jar - sqlite-jdbc-3.7.6.3-20110609.081603-3.jar - h2-latest.jar - * Special tools for new rendering (GPLv3) - (C) Alexey Pelykh + * Special tools for new rendering (GPLv3) - © Alexey Pelykh - https://github.com/osmandapp/OsmAnd-tools/tree/master/obf-inspector - https://github.com/osmandapp/OsmAnd-tools/tree/master/obf-verifier - https://github.com/osmandapp/OsmAnd-tools/tree/master/route-tester @@ -96,7 +95,7 @@ - Extracts - https://github.com/osmandapp/OsmAnd-misc/blob/master/osm-planet/osm-data/ * Data files - - Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/geo-polygons (C) by Geofabrik - data free to use - - Country boundaries https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/gislab-polygons (C) by http://be.gis-lab.info - data free to use + - Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/geo-polygons © by Geofabrik - data free to use + - Country boundaries https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/gislab-polygons © by http://be.gis-lab.info - data free to use + - From d4e1c99c9e771c999ab0c12699447130e12b597b Mon Sep 17 00:00:00 2001 From: KAMiKAZOW Date: Tue, 29 Jul 2014 04:08:26 +0200 Subject: [PATCH 07/19] Update LICENSE --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index ea9dfbaa48..83c1e329c3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ OsmAnd – OSM Automated Navigation Directions – navigation software based on OpenStreetMap. - Copyright © 2010–2014 OsmAnd (Amstelveen, Netherlands - KvK 55730183). + Copyright © 2010–2014 OsmAnd (Amstelveen, Netherlands - KvK 55730183). The code in that repository is mainly covered by *GPLv3*, except some 3rd party libs and resources. ATTENTION: please be aware that some artwork has proprietary license. @@ -19,7 +19,7 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License From ab50581e8b9cc6a7a8da5e6a9081927b6027a497 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 29 Jul 2014 09:49:41 +0200 Subject: [PATCH 08/19] Start and stop stage --- .../src/net/osmand/data/FavouritePoint.java | 18 +++++ OsmAnd/res/drawable/sherpafy_tour_row.xml | 2 +- OsmAnd/res/values/strings.xml | 2 + .../net/osmand/access/AccessibleActivity.java | 2 + .../osmand/plus/OsmAndAppCustomization.java | 5 ++ .../plus/activities/MapActivityActions.java | 19 +++++ .../plus/sherpafy/SherpafyCustomization.java | 81 +++++++++++++------ .../sherpafy/SherpafyFavoriteFragment.java | 9 ++- .../plus/sherpafy/SherpafyStageFragment.java | 13 ++- .../plus/sherpafy/SherpafyTourFragment.java | 11 ++- .../plus/sherpafy/TourViewActivity.java | 23 +++--- .../net/osmand/plus/views/FavoritesLayer.java | 64 ++++++++++----- 12 files changed, 184 insertions(+), 65 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/data/FavouritePoint.java b/OsmAnd-java/src/net/osmand/data/FavouritePoint.java index b92a2e9e9f..5eb38e8c58 100644 --- a/OsmAnd-java/src/net/osmand/data/FavouritePoint.java +++ b/OsmAnd-java/src/net/osmand/data/FavouritePoint.java @@ -9,7 +9,9 @@ public class FavouritePoint implements Serializable { private double latitude; private double longitude; private int color; + private int extraParam = -1; private boolean visible = true; + private boolean removeable = true; public FavouritePoint(){ } @@ -21,6 +23,22 @@ public class FavouritePoint implements Serializable { this.name = name; } + public int getExtraParam() { + return extraParam; + } + + public void setExtraParam(int extraParam) { + this.extraParam = extraParam; + } + + public boolean isRemoveable() { + return removeable; + } + + public void setRemoveable(boolean removeable) { + this.removeable = removeable; + } + public int getColor() { return color; } diff --git a/OsmAnd/res/drawable/sherpafy_tour_row.xml b/OsmAnd/res/drawable/sherpafy_tour_row.xml index 70de77c04b..2d26de6db5 100644 --- a/OsmAnd/res/drawable/sherpafy_tour_row.xml +++ b/OsmAnd/res/drawable/sherpafy_tour_row.xml @@ -1,4 +1,4 @@ - + + Continue Navigation + Pause Navigation Keep Stop Enable sleep mode diff --git a/OsmAnd/src/net/osmand/access/AccessibleActivity.java b/OsmAnd/src/net/osmand/access/AccessibleActivity.java index ff6ea46d66..ff0eb42b10 100644 --- a/OsmAnd/src/net/osmand/access/AccessibleActivity.java +++ b/OsmAnd/src/net/osmand/access/AccessibleActivity.java @@ -3,6 +3,8 @@ package net.osmand.access; import android.app.Activity; import android.view.MotionEvent; +import com.actionbarsherlock.app.SherlockActivity; + // Provide some additional accessibility means for activity view elements. // // To make use of these capabilities simply derive your activity from this class diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java index b65a60cb78..411839b89f 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import net.osmand.IProgress; +import net.osmand.data.FavouritePoint; import net.osmand.plus.activities.DownloadIndexActivity; import net.osmand.plus.activities.FavouritesActivity; import net.osmand.plus.activities.LocalIndexesActivity; @@ -102,4 +103,8 @@ public class OsmAndAppCustomization { public void prepareLocationMenu(MapActivity mapActivity, ContextMenuAdapter adapter) { } + public List getFavorites() { + return null; + } + } diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index a9db9b040f..6cb301f648 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -805,6 +805,25 @@ public class MapActivityActions implements DialogProvider { enterRoutePlanningMode(null, null); } }).reg(); + } else if(routingHelper.isRouteCalculated()) { + optionsMenuHelper.item( + routingHelper.isRoutePlanningMode() ? R.string.continue_navigation : + R.string.pause_navigation) + .icons(R.drawable.ic_action_gdirections_dark, R.drawable.ic_action_gdirections_light) + .listen(new OnContextMenuClick() { + @Override + public void onContextMenuClick(int itemId, int pos, boolean isChecked, DialogInterface dialog) { + if(routingHelper.isRoutePlanningMode()) { + routingHelper.setRoutePlanningMode(false); + routingHelper.setFollowingMode(true); + } else { + routingHelper.setRoutePlanningMode(true); + routingHelper.setFollowingMode(false); + } + mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode(); + mapActivity.refreshMap(); + } + }).reg(); } if (getTargets().getPointToNavigate() != null) { optionsMenuHelper.item(R.string.target_points).icons(R.drawable.ic_action_flage_dark, R.drawable.ic_action_flage_light) diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java index 55cc9962ae..d41b1ed94c 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java @@ -10,6 +10,7 @@ import java.util.Map; import java.util.TreeSet; import net.osmand.IProgress; +import net.osmand.data.FavouritePoint; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.GPXUtilities; import net.osmand.plus.OsmAndAppCustomization; @@ -19,10 +20,15 @@ import net.osmand.plus.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.activities.DownloadIndexActivity; import net.osmand.plus.activities.MapActivity; +import net.osmand.plus.activities.MapActivityLayers; import net.osmand.plus.api.FileSettingsAPIImpl; import net.osmand.plus.download.DownloadActivityType; +import net.osmand.plus.sherpafy.TourInformation.StageFavorite; import net.osmand.plus.sherpafy.TourInformation.StageInformation; import android.app.Activity; +import android.app.AlertDialog; +import android.app.AlertDialog.Builder; +import android.os.Bundle; import android.view.Window; import android.widget.TextView; @@ -39,6 +45,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization { private TourInformation selectedTour = null; private File toursFolder; private CommonPreference accessCodePref; + private List cachedFavorites = new ArrayList(); @Override public void setup(OsmandApplication app) { @@ -149,7 +156,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization { e.printStackTrace(); } if (selected) { - reloadSelectedTour(progress, tr, tourInformation, warns); + reloadSelectedTour(progress, tourInformation); } } } @@ -170,11 +177,11 @@ public class SherpafyCustomization extends OsmAndAppCustomization { return selectedTour; } - private void reloadSelectedTour(IProgress progress, File tr, final TourInformation tourInformation, List warns) { + private void reloadSelectedTour(IProgress progress, final TourInformation tourInformation) { if(progress != null) { - progress.startTask(app.getString(R.string.indexing_tour, tr.getName()), -1); + progress.startTask(app.getString(R.string.indexing_tour, tourInformation.getName()), -1); } - File settingsFile = new File(tr, "settings.props"); + File settingsFile = new File(tourInformation.getFolder(), "settings.props"); FileSettingsAPIImpl fapi; try { fapi = new FileSettingsAPIImpl(app, settingsFile); @@ -183,25 +190,10 @@ public class SherpafyCustomization extends OsmAndAppCustomization { } app.getSettings().setSettingsAPI(fapi); } catch (IOException e) { - warns.add(app.getString(R.string.settings_file_create_error)); app.showToastMessage(R.string.settings_file_create_error); } selectedStagePref = app.getSettings().registerStringPreference(SELECTED_STAGE, null).makeGlobal(); - try { - tourInformation.loadFullInformation(); - } catch (Exception e) { - warns.add("Selected tour : " + e.getMessage()); - } selectedTour = tourInformation; - if(selectedStagePref.get() != null) { - for(StageInformation s : selectedTour.getStageInformation()) { - if(s.getName().equals(selectedStagePref.get())) { - selectedStage = s; - loadSelectedStage(); - break; - } - } - } } public StageInformation getSelectedStage() { @@ -221,6 +213,20 @@ public class SherpafyCustomization extends OsmAndAppCustomization { private void loadSelectedStage() { final StageInformation st = selectedStage; + cachedFavorites = new ArrayList(); + for(Object o : st.favorites ) { + if(o instanceof StageFavorite) { + StageFavorite sf = (StageFavorite) o; + FavouritePoint fp = new FavouritePoint(sf.getLatLon().getLatitude(), sf.getLatLon().getLongitude(), + sf.getName(), sf.getGroup() == null ? "" : sf.getGroup().name); + if(sf.getGroup() != null && sf.getGroup().getColor() != 0 ){ + fp.setColor(sf.getGroup().getColor()); + } + fp.setRemoveable(false); + fp.setExtraParam(sf.getOrder()); + cachedFavorites.add(fp); + } + } if(st != null && st.gpxFile != null) { if(st.gpx == null) { st.gpx = GPXUtilities.loadGPXFile(app, st.gpxFile); @@ -235,13 +241,8 @@ public class SherpafyCustomization extends OsmAndAppCustomization { } else { selectedTourPref.set(tour.getName()); } - selectedTour = null; - selectedStage = null; - // to avoid null reference ecxeption if there's no selected tour yet. - if (selectedStagePref != null) { - selectedStagePref.set(null); - } - app.getResourceManager().reloadIndexes(progress); + selectedTour = tour; + reloadSelectedTour(progress, tour); } @Override @@ -254,8 +255,31 @@ public class SherpafyCustomization extends OsmAndAppCustomization { filter(adapter, R.string.context_menu_item_directions_to, R.string.context_menu_item_destination_point, R.string.context_menu_item_search, R.string.context_menu_item_share_location, R.string.context_menu_item_add_favorite); + MapActivityLayers layers = mapActivity.getMapLayers(); + if(layers.getContextMenuLayer().getFirstSelectedObject() instanceof FavouritePoint) { + FavouritePoint fp = ((FavouritePoint)layers.getContextMenuLayer().getFirstSelectedObject()); + if(fp.getExtraParam() >= 0 && selectedStage != null) { + StageFavorite sf = (StageFavorite) selectedStage.getFavorites().get(fp.getExtraParam()); + showFavoriteDialog(mapActivity, selectedStage, sf); + } + } } + private void showFavoriteDialog(MapActivity mapActivity, StageInformation stage, StageFavorite sf) { + SherpafyFavoriteFragment fragment = new SherpafyFavoriteFragment(); + Bundle bl = new Bundle(); + bl.putInt(SherpafyFavoriteFragment.STAGE_PARAM, stage.getOrder()); + bl.putString(SherpafyFavoriteFragment.TOUR_PARAM, stage.getTour().getId()); + bl.putInt(SherpafyFavoriteFragment.FAV_PARAM, sf.getOrder()); + fragment.setArguments(bl); + Builder bld = new AlertDialog.Builder(mapActivity); + bld.setTitle(sf.getName() + " TODO "); + bld.setPositiveButton(R.string.default_buttons_ok, null); + // TODO +// Builder bld = new AlertDialog.Builder(mapActivity); +// FragmentManager fragmentManager = mapActivity.getSupportFragmentManager(); + } + @Override public void prepareOptionsMenu(MapActivity mapActivity, ContextMenuAdapter adapter) { @@ -280,4 +304,9 @@ public class SherpafyCustomization extends OsmAndAppCustomization { } } } + + @Override + public List getFavorites() { + return cachedFavorites; + } } diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java index e5da264e4e..bdf56cb1db 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java @@ -3,6 +3,7 @@ package net.osmand.plus.sherpafy; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; +import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener; import net.osmand.plus.R; import net.osmand.plus.sherpafy.TourInformation.StageFavorite; @@ -47,7 +48,13 @@ public class SherpafyFavoriteFragment extends SherpafyStageInfoFragment { ((TourViewActivity) getSherlockActivity()).createMenuItem(menu, SHOW_ON_MAP, R.string.show_poi_on_map , R.drawable.ic_action_map_marker_light, R.drawable.ic_action_map_marker_dark, - MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT, new OnMenuItemClickListener() { + + @Override + public boolean onMenuItemClick(MenuItem item) { + return onOptionsItemSelected(item); + } + }); } diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java index a73ea47841..ff197daa96 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java @@ -25,6 +25,7 @@ import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; +import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener; public class SherpafyStageFragment extends SherlockFragment { public static final String STAGE_PARAM = "STAGE"; @@ -73,10 +74,14 @@ public class SherpafyStageFragment extends SherlockFragment { // MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); if (tour != null) { boolean current = customization.getSelectedStage() == stage; - ((TourViewActivity) getSherlockActivity()).createMenuItem(menu, START, - current ? R.string.continue_stage : R.string.start_stage , - 0, 0, - MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + ((TourViewActivity) getSherlockActivity()).createMenuItem(menu, START, current ? R.string.continue_stage + : R.string.start_stage, 0, 0, MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT, + new OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + return onOptionsItemSelected(item); + } + }); } } diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java index 84be43bf6f..e47f8d2fb3 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java @@ -26,6 +26,7 @@ import com.actionbarsherlock.app.SherlockListFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; +import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener; public class SherpafyTourFragment extends SherlockListFragment { private static final int SHARE_ID = 6; @@ -105,13 +106,19 @@ public class SherpafyTourFragment extends SherlockListFragment { // MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); if (tour != null) { boolean current = customization.getSelectedTour() == tour; + OnMenuItemClickListener oic = new OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + return onOptionsItemSelected(item); + } + }; ((TourViewActivity) getSherlockActivity()).createMenuItem(menu, START, current ? R.string.continue_tour : R.string.start_tour , 0, 0, - MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT, oic); ((TourViewActivity) getSherlockActivity()).createMenuItem(menu, SHARE_ID, R.string.share_fav, R.drawable.ic_action_gshare_light, R.drawable.ic_action_gshare_dark, - MenuItem.SHOW_AS_ACTION_IF_ROOM); + MenuItem.SHOW_AS_ACTION_IF_ROOM, oic); } } diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java index 4c4161f116..004fd8c916 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java @@ -3,6 +3,7 @@ package net.osmand.plus.sherpafy; import java.util.List; import java.util.WeakHashMap; +import net.osmand.IProgress; import net.osmand.data.LatLon; import net.osmand.plus.GPXUtilities.GPXFile; import net.osmand.plus.GPXUtilities.WptPt; @@ -199,19 +200,15 @@ public class TourViewActivity extends SherlockFragmentActivity { super.onResume(); } - public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconLight, int iconDark, int menuItemType) { + public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconLight, int iconDark, int menuItemType, + final OnMenuItemClickListener listener) { // int r = getMyApplication().getSettings().isLightActionBar() ? iconLight : iconDark; int r = iconLight; MenuItem menuItem = m.add(0, id, 0, titleRes); if (r != 0) { menuItem.setIcon(r); } - menuItem.setShowAsActionFlags(menuItemType).setOnMenuItemClickListener(new OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) { - return onOptionsItemSelected(item); - } - }); + menuItem.setShowAsActionFlags(menuItemType).setOnMenuItemClickListener(listener); return menuItem; } @@ -349,7 +346,7 @@ public class TourViewActivity extends SherlockFragmentActivity { public void goToMap(LatLon location) { if(location != null) { - getMyApplication().getSettings().setMapLocationToShow(location.getLatitude(), location.getLatitude(), 16, null); + getMyApplication().getSettings().setMapLocationToShow(location.getLatitude(), location.getLongitude(), 16, null); } Intent newIntent = new Intent(this, customization.getMapActivity()); newIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); @@ -366,7 +363,8 @@ public class TourViewActivity extends SherlockFragmentActivity { runStage(stage.getTour(), stage, customization.getSelectedStage() != stage); } }); - bld.setNegativeButton(R.string.default_buttons_yes, null); + bld.setNegativeButton(R.string.default_buttons_no, null); + bld.show(); } else { runStage(stage.getTour(), stage, customization.getSelectedStage() != stage); } @@ -383,7 +381,8 @@ public class TourViewActivity extends SherlockFragmentActivity { startTourImpl(tour); } }); - bld.setNegativeButton(R.string.default_buttons_yes, null); + bld.setNegativeButton(R.string.default_buttons_no, null); + bld.show(); } else { startTourImpl(tour); } @@ -405,8 +404,8 @@ public class TourViewActivity extends SherlockFragmentActivity { private void runStage(TourInformation tour, StageInformation stage, boolean startOver) { WptPt point = null; GPXFile gpx = null; - customization.selectTour(tour, null); - customization.selectStage(stage, null); + customization.selectTour(tour, IProgress.EMPTY_PROGRESS); + customization.selectStage(stage, IProgress.EMPTY_PROGRESS); if (customization.getSelectedStage() != null) { gpx = customization.getSelectedStage().getGpx(); List sgpx = getMyApplication().getSelectedGpxHelper().getSelectedGPXFiles(); diff --git a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java index 4226048781..1e0074f813 100644 --- a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java @@ -11,6 +11,7 @@ import net.osmand.data.RotatedTileBox; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick; import net.osmand.plus.FavouritesDbHelper; +import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.R; import net.osmand.plus.base.FavoriteImageDrawable; import net.osmand.plus.views.MapTextLayer.MapTextProvider; @@ -33,6 +34,8 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I private List cache = new ArrayList(); private MapTextLayer textLayer; // private Bitmap d; + + private OsmAndAppCustomization customization; @@ -46,7 +49,7 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I favorites = view.getApplication().getFavorites(); textLayer = view.getLayerByClass(MapTextLayer.class); - + customization = view.getApplication().getAppCustomization(); // favoriteIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.poi_favourite); } @@ -80,15 +83,12 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I // request to load final QuadRect latLonBounds = tileBox.getLatLonBounds(); for (FavouritePoint o : favorites.getFavouritePoints()) { - if (o.isVisible() && o.getLatitude() >= latLonBounds.bottom && o.getLatitude() <= latLonBounds.top && o.getLongitude() >= latLonBounds.left - && o.getLongitude() <= latLonBounds.right ) { - cache.add(o); - int x = (int) tileBox.getPixXFromLatLon(o.getLatitude(), o.getLongitude()); - int y = (int) tileBox.getPixYFromLatLon(o.getLatitude(), o.getLongitude()); - FavoriteImageDrawable fid = FavoriteImageDrawable.getOrCreate(view.getContext(), o.getColor()); - fid.drawBitmapInCenter(canvas, x, y, tileBox.getDensity()); -// canvas.drawBitmap(favoriteIcon, x - favoriteIcon.getWidth() / 2, -// y - favoriteIcon.getHeight(), paint); + drawPoint(canvas, tileBox, latLonBounds, o); + } + List customFavorites = customization.getFavorites(); + if (customFavorites != null) { + for (FavouritePoint o : customFavorites) { + drawPoint(canvas, tileBox, latLonBounds, o); } } } @@ -96,6 +96,19 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I textLayer.putData(this, cache); } } + + private void drawPoint(Canvas canvas, RotatedTileBox tileBox, final QuadRect latLonBounds, FavouritePoint o) { + if (o.isVisible() && o.getLatitude() >= latLonBounds.bottom && o.getLatitude() <= latLonBounds.top && o.getLongitude() >= latLonBounds.left + && o.getLongitude() <= latLonBounds.right ) { + cache.add(o); + int x = (int) tileBox.getPixXFromLatLon(o.getLatitude(), o.getLongitude()); + int y = (int) tileBox.getPixYFromLatLon(o.getLatitude(), o.getLongitude()); + FavoriteImageDrawable fid = FavoriteImageDrawable.getOrCreate(view.getContext(), o.getColor()); + fid.drawBitmapInCenter(canvas, x, y, tileBox.getDensity()); +// canvas.drawBitmap(favoriteIcon, x - favoriteIcon.getWidth() / 2, +// y - favoriteIcon.getHeight(), paint); + } + } @Override @@ -108,12 +121,23 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I int ex = (int) point.x; int ey = (int) point.y; for (FavouritePoint n : favorites.getFavouritePoints()) { - if (n.isVisible()) { - int x = (int) tb.getPixXFromLatLon(n.getLatitude(), n.getLongitude()); - int y = (int) tb.getPixYFromLatLon(n.getLatitude(), n.getLongitude()); - if (calculateBelongs(ex, ey, x, y, r)) { - res.add(n); - } + getFavFromPoint(tb, res, r, ex, ey, n); + } + List customFavorites = customization.getFavorites(); + if (customFavorites != null) { + for (FavouritePoint n : customFavorites) { + getFavFromPoint(tb, res, r, ex, ey, n); + } + } + } + + private void getFavFromPoint(RotatedTileBox tb, List res, int r, int ex, int ey, + FavouritePoint n) { + if (n.isVisible()) { + int x = (int) tb.getPixXFromLatLon(n.getLatitude(), n.getLongitude()); + int y = (int) tb.getPixYFromLatLon(n.getLatitude(), n.getLongitude()); + if (calculateBelongs(ex, ey, x, y, r)) { + res.add(n); } } } @@ -190,9 +214,11 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I } } }; - - adapter.item(R.string.favourites_context_menu_delete).icons(R.drawable.ic_action_delete_dark, - R.drawable.ic_action_delete_light).listen(listener).reg(); + if (a.isRemoveable()) { + adapter.item(R.string.favourites_context_menu_delete) + .icons(R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_light).listen(listener) + .reg(); + } } } From d099d1e5127f0f29bc3611455a363cb226a75972 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 30 Jul 2014 09:15:23 +0200 Subject: [PATCH 09/19] fix bug wqith wrong help button captions in some languages --- OsmAnd/src/net/osmand/plus/activities/HelpActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java index 07a12cbe14..9baee3ef04 100644 --- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java @@ -106,10 +106,10 @@ public class HelpActivity extends SherlockActivity { createMenuItem(menu, HOME, R.string.home, R.drawable.ic_action_home_light, R.drawable.ic_action_home_dark, MenuItem.SHOW_AS_ACTION_IF_ROOM ); - createMenuItem(menu, BACK, R.string.back, + createMenuItem(menu, BACK, R.string.previous_button, 0, 0, //R.drawable.ic_action_home_light, R.drawable.ic_action_home_dark, MenuItem.SHOW_AS_ACTION_IF_ROOM ); - createMenuItem(menu, FORWARD, R.string.forward, + createMenuItem(menu, FORWARD, R.string.next_button, 0, 0, //R.drawable.ic_action_home_light, R.drawable.ic_action_home_dark, MenuItem.SHOW_AS_ACTION_IF_ROOM ); createMenuItem(menu, CLOSE, R.string.close, From 55453fce36738ce35f3adc72955501216da7ef81 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sun, 27 Jul 2014 10:53:50 +0200 Subject: [PATCH 10/19] Translated using Weblate (Danish) Currently translated at 100.0% (1474 of 1474 strings) --- OsmAnd/res/values-da/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index e4a2d5e178..d52862397b 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -392,7 +392,7 @@ Vis detaljer Tilgængelighedsudvidelser for gamle Android versioner Tilgængelighedsudvidelser - Tilgængelighedsmodus + Tilgængelighedstilstand PM Støt Information @@ -1939,5 +1939,5 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda, Kinesisk, forenklet Kinesisk, traditionelt Sardisk - Undergrundsbanetilstand + Metrotilstand From cc2b868534aeda6d1404ddc2c1964e4710792714 Mon Sep 17 00:00:00 2001 From: stephan 75 Date: Sun, 27 Jul 2014 10:46:51 +0200 Subject: [PATCH 11/19] Translated using Weblate (German) Currently translated at 99.3% (1465 of 1474 strings) --- OsmAnd/res/values-de/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 8fcbc70be0..23e5eedd7a 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1924,4 +1924,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Stoppe GPX-Aufzeichnung Starte neues Segment Sardinisch + U-Bahn-Modus + GPS Aufwach Intervall + GPS aktiv lassen? From 1a2bd4e55090e8ac15dd9f5eca5c65c66f256dbd Mon Sep 17 00:00:00 2001 From: Hinagiku Zeppeki Date: Tue, 29 Jul 2014 08:33:51 +0200 Subject: [PATCH 12/19] Translated using Weblate (Japanese) Currently translated at 94.6% (1395 of 1474 strings) --- OsmAnd/res/values-ja/strings.xml | 51 +++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml index 94d8d573d3..e88af5090c 100644 --- a/OsmAnd/res/values-ja/strings.xml +++ b/OsmAnd/res/values-ja/strings.xml @@ -1221,7 +1221,7 @@ ASTERはNASAと日本の経済産業省（METI）、そして宇宙システム オンライン追跡ウェブアドレス \'追跡ログをGPXに記録\'を有効にして下さい 現在のトラックを表示 - このOsmAnd 無料バージョンは%1$sのダウンロード数が制限されており、オフラインでWikipediaの記事をサポートしていません。 + このOsmAnd 無料バージョンはダウンロード数が%1$s個に制限されており、オフラインでのWikipediaの記事利用をサポートしていません。 無料バージョン POIの説明文を表示 北米 @@ -1918,4 +1918,53 @@ OsmAndはオープンソースであり、活発に開発が進められいま ブラウザで現在のセッションを共有する セッションはが利用できません「送信場所」がオンになっていることを確認してください。 セッションの共有 + 地下鉄モード + デバイスを追跡するためのセッションURL (%1$s) + 目的のデバイス %2$sに接続するには、リンク %3$sをクリックするかトラッカーIDを指定してください(%1$s) + 記録間隔 + 位置を送信する時間間隔を選択してください + 日 + 接続 + 失効 + 解説 + ポリシー + トラッカーID + ユーザーネーム + グループID + グループ名 + デバイスとリンク + グループとリンク + 接続する + グループの作成 + OsMoのサーバー操作に失敗しました + OpenStreetMapの監視 + 自分の場所を送信 + OsMoクイックアクセス + 時間前 + 分前 + 秒前 + デバイスと接続されました + OsMoグループ/デバイス + アプリケーション起動後に自動的にトラッカーセッションを開始し場所を送信する + 自動的トラッカーセッションを開始する + パーソナルトラッカーID + クリックでトラッカーIDを表示したり共有したりします。トラッカーIDにて接続されたデバイスを使用すると、このデバイスのすべての動きを監視することができます！解除するには[再作成]オプションを選択してください。 + セッショントークン: %1$s + 認証を待っています... + "位置の送信 %1$d (バッファ内 %2$d) " + "接続が確立されました: %1$s " + "OsMoの接続に問題があります " + 固有のデバイスID + "1.8での変更点：* GPXトラックのルートポイント間のルートを計算 * 国別ダウンロードのレイアウト変更(ローカル名検索をサポート) * GPX / KMLのインポートをサポート(KMLからGPXに変換) * GPXトラックは「マイデータ」に移動 * GPXトラックを分割し、距離/標高差/速度を確認することができます * ナビゲーションを遅延させて自動開始 " + 地点間のルートを計算 + OsMoセッションを再起動 + OsMoセッションの停止 + OsMoセッションの開始 + デバッグ情報 + 監視についての設定と各個の監視チャネルのセットアップ + OsMo OpenStreetMap監視 (beta) + ナビゲーション指示の繰り返し + 定期的にナビゲーション指示を繰り返す + 目的地周辺のお知らせ + どの程度の距離で目的地周辺のアナウンスを希望するか？ From c1feabf34b604ab1f13997296cf44e2893d4b281 Mon Sep 17 00:00:00 2001 From: cho bkwon Date: Sun, 27 Jul 2014 06:43:19 +0200 Subject: [PATCH 13/19] Translated using Weblate (Korean) Currently translated at 100.0% (1474 of 1474 strings) --- OsmAnd/res/values-ko/strings.xml | 145 +++++++++++++++---------------- 1 file changed, 70 insertions(+), 75 deletions(-) diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index 0d6039b1f6..eae43e4b12 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -227,7 +227,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 파일 이름을 바꿀 수 없습니다. 같은 이름을 가진 파일이 이미 존재합니다. GPX 루트 - 이름으로 검색한 POI에 해당하는 몇몇 카테고라를 찾았습니다 : + 이름으로 검색한 POI에 해당하는 몇몇 카테고리를 찾았습니다 : 검색한 POI에 대한 로컬 데이터가 존재하지 않습니다. 이름으로 검색 POI 데이터 파일 \'%1$s\' 가 중복되어 있으니 삭제할 수 있습니다. @@ -298,7 +298,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 %2$d 개의 아이템 중 %1$d 가 성공적으로 활성화되었습니다. %1$s할 아이템이 없습니다 %2$s 아이템을 %1$s하려고 합니다. 계속하시겠습니까? - 지도 파일 관리 + 지도 관리 활성화 비활성화 @@ -338,7 +338,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 온라인 길안내 서비스가 선택되었지만 인터넷 연결이 되지 않습니다. 지원되지 않은 언어 선택한 언어는 설치된 안드로이드 TTS (text-to-speech) 엔진이 지원되지 않습니다. 다른 TTS 엔진을 찾기 위해 구글마켓으로 가시겠습니까? 아니면 미리설정된 TTS 언어가 사용될 것입니다. - 실종된 데이터 + 누락된 데이터 선택한 언어에 대한 데이터가 설치되지 않았습니다. 설치하기 위해 구글마켓으로 가시겠습니까? GPX 길안내 반대로 가기 @@ -369,7 +369,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 동작에 필요한 인터넷 연결이 되지 않습니다 추가 설치… - 오프라인 지도 업데이중 + 오프라인 지도 업데이트중 Up-to-date map data is essential for offline map viewing, for POI/address search, and for offline navigation. OsmAnd provides a data manager to download these offline maps (and some other data files), and to check for available updates. \n\nTo download maps go to \'Settings\' → \'Data Management\' → \'Download offline data\'. \n\nAfter the global region list is retrieved from the internet, click on any entry to download or update a file. Please note the file type selector near the top of the screen to select the type of download you want (regular maps, hillshade overlays, etc.). @@ -430,8 +430,9 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 검색 중 [위치 사용] 메뉴 - - + "The \'Use location\' context menu contains all actions referring to a point (location). +\n\nIt is available by long-pressing any point on the map (then tapping its marker), or by pressing the trackball button, or by selecting \'Menu\' → \'Use location\' (the last two ways take the map center as reference). +\n\nA marker box can be hidden again by long-clicking on it. " 팁과 트릭 OsmAnd는 많은 기능을 가진 네비게이션 앱입니다. @@ -504,7 +505,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 저장 폴더 - 이전 OsmAnd 버전이 설치되어 있습니다. 모든 오프라인 데이터는 새로운 앱에서 지원합니다. 하지만 즐겨찾기 포인트는 이전 앱에서 익스포트되어야 하며 나중에 새로은 것으로 임포트되어야 합니다.. + 이전 OsmAnd 버전이 설치되어 있습니다. 모든 오프라인 데이터는 새로운 앱에서 지원합니다. 하지만 즐겨찾기 포인트는 이전 앱에서 익스포트되어야 하며 나중에 새로운 것으로 임포트(가져오기)하여야 합니다.. 빌드 {0} 가 성공적으로 설치되었습니다 ({1}). 빌드 다운로딩… OsmAnd - {0} from {1} {2} MB - 설치를 계속하시겠습니까 ? @@ -525,7 +526,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 주간/야간 모드 {0} 개의 파일 ({1} MB) 를 다운로드? - {0} 항목이 선택되었습니다 + {0} 아이템목이 선택되었습니다 다운로드된 것들로 필터링 모든 선택 해제 모두 선택 @@ -555,7 +556,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 필터 종류 고해상도 지도 표시 고해상도 장치를 위해 고해상도 지도를 사용합니다 - 위치를 알 수 없음 + 위치는 아직 알 수 없음 다운로드 대중교통 검색 대중교통 검색결과 (목적지 없음): @@ -720,7 +721,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 다운로드 중… 사용 가능한 지역 목록을 다운로드하는 중… 지역 목록을 osmand.googlecode.com 로부터 가져올 수 없습니다. - 원하는 지역을 찾을 수 없으면, 직접 지도를 만들 수도 있습니다. http://osmand.net 를 참고하세요. + 원하는 지역의 지도를 찾을 수 없으면, 직접 지도를 만들 수도 있습니다. http://osmand.net 를 참고하세요. 지도에서 보기 즐겨찾기 포인트가 수정되었습니다 즐겨찾기 포인트가 하나도 존재하지 않습니다 @@ -922,7 +923,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 전국 주소 세계 고도 보정 - 세계 등대 + 세계 seamarks 세계 개요 지도 세계 스키 지도 크로아티아어 @@ -983,9 +984,10 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 전용도로 회피하기 최대중량 차량중량제한 지정하기 - KitKat version 이후로 이전에 저장한 위치에 지도를 다운로드하고 업데이트 할 수 없습니다 (%s). 모든 파일을 그곳에 복사하는 것을 허락하겠는가? - \n Note : 이전 파일은 그대로 유지됩니다. - \n Note : OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다. + "KitKat version 이후로 이전에 저장한 위치에 지도를 다운로드하고 업데이트 할 수 없습니다 (%s). +\n모든 파일을 그곳에 복사하는 것을 허락하겠는가? +\n Note : 이전 파일은 그대로 유지됩니다. +\n Note : OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다. " OsmAnd는 새 목적지로 데이터를 이동하려고 합니다. 그렇게 하겠습니까? 새 목적지로 파일(%s)을 복사중... 새로운 목적지에 OsmAnd 파일을 복사중 (%s) @@ -996,8 +998,8 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 TTS에 대한 음성속도를 지정합니다 음성 속도 빠른 루트 계산 실패(%s), 느린 계산으로 돌아감. - 복잡한 라우팅 비활성화 - 등대 + 복잡한 라우팅 사용불능 + Seamark 앱 프로필 지도 렌더링: 하이킹 @@ -1008,10 +1010,10 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 자주 묻는 질문 (FAQ) 모두 삭제하기 먼저 루트를 계산하세요 - 계산된 루트를 사용하여 모의주행하기 + "계산된 루트를 이용하여 모의주행하기 " GPX트랙을 이용하여 모의주행하기 - 나의 선택을 기억하기 - GPS 상태 + 내 선택을 기억하기 + GPS status 그리고 또는 자동 줌 안됨 @@ -1065,13 +1067,11 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵 웨일스어 루트 선호도 길안내 선호도 - 자동차 길안내에 대한 2길 길찾기(라우팅) 비활성화 + 자동차 길안내에 대한 2길 라우팅 사용불능 앱에서 볼 수있는 사용자 프로필를 선택합니다 나머지 요소 : %1$d OSM 변경 사항을 삭제하려고 합니다. 확실합니까? - OsmAnd 오프라인 라우팅(길찾기)는 200km 이상 떨어진 포인트를 계산할 때 매우 긴 시간이 걸리 수 있다. -(가끔 작동 되지 않을 수 있음) -당신은 더 나은 성능을 위해 중간 중간 포인트를 추가할 수 있다. + OsmAnd 오프라인 라우팅(길찾기)는 200km 이상 떨어진 포인트를 계산할 때 매우 긴 시간이 걸리 수 있습니다. (가끔 작동 되지 않을 수 있음) 당신은 더 나은 성능을 위해 중간 중간 포인트를 추가할 수 있습니다. 좀더 가까이에 미드 레인지(중간 거리)에 롱 레인지(긴 거리)에 @@ -1169,7 +1169,7 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다. 즐겨찾기 선택 OSM 대량수정 다른 작업 - 다운로드 할 파일 가능 %1$d + "다운로드 할 파일 %1$d 가능" 음영 레이어 GPS 정보 @@ -1214,13 +1214,13 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다. 오디오/비디오 설정 "기록하는 동안 오류가 발생했습니다 " 카메라는 사용할 수 없습니다 - 오디오/비디오는 기록 되고있다. 정지하려면 AV 위젯을 누르면 됩니다. + 오디오/비디오는 기록되고 있습니다. 정지하려면 AV 위젯을 누르면 됩니다. 지정된 레코딩에서 오디오가 재생되고 있습니다.\n%1$s 외부 플레이어 열기 이 기록을 삭제하시겠습니까 ? 사용 불가능 - 오디오 녹음하기 - 비디오 녹화하기 + 오디오 노트 기록하기 + 비디오 노트 기록하기 레코딩 레이어 레코딩을 재생할 수 없습니다 레코딩 삭제 @@ -1229,13 +1229,13 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다. 레코딩 정지 찍기 - 오디오/비디오 메모 + 오디오/비디오 노트 오프라인 등고선에 대한 OsmAnd 플러그인 거리 측정 정지 - 오디오 메모 - 트래킹하는 동안 오디오/비디오 찍기 - 오디오/비디오 메모 + 오디오 노트 + 여행하는 동안 오디오/비디오 노트 기록하기 + 오디오/비디오 노트 부분 등고선 오프라인 등고선 과 음영은 다운로드를 용이하게 한다. (설정→데이터 관리→다운로드→ 원하는 지도 유형 선택) @@ -1279,8 +1279,8 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다. 로깅 서비스 어떠한 루트도 없음 포인트 제거 - 목적지 %1$s - 중간 포인트 %1$s + 포인트 %1$s + 포인트 %1$s 마지막 포인트로 추가 첫번째 포인트로 추가 마지막 목적지 포인트로 추가 @@ -1289,10 +1289,10 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다. 목적지 포인트 대체 이미 목적지 포인트 세트가 있다. 목적지 - 도로에서 너무 멀리 떨어진 중간 포인트 %1$s . - 중간 포인트에 도착했습니다 - 중간 포인트로 추가 - 중간 포인트 + 도로에서 너무 멀리 떨어진 포인트 %1$s . + 포인트에 도착했습니다 + 포인트로 추가 + 포인트 도로에서 너무 멀리 떨어진 마지막 포인트. 태그 추가 고급 모드… @@ -1414,7 +1414,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A 일출: %1$s \n일몰: %2$s 주간/야간 정보 주간/야간 지도 - 특성 렌더링 : + 렌더링 속성: 지도 스타일 @@ -1441,7 +1441,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A 화면 잠금 나침반 상태 표시줄 : - 기본값으로 초기화 + 기본값으로 재설정 오른쪽 패널 : 왼쪽 패널 : 주차 @@ -1462,7 +1462,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A 트래픽 경고 표시 유료 도로 회피 이전 길안내는 아직 끝나지 안났습니다. 계속 길안내를 받으시겠습니까? (%1$s 초) - 위치가 발견되면 루트를 찾을 것입니다 + 위치가 확정되면 루트를 찾을 것입니다 시간 분 자동차를 ~에 주차했습니다 : @@ -1506,7 +1506,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A 주차 마커를 삭제 공용 식별가능 - 트래킹 가능 + 추적 가능 개인 가능한 빨리 GPX 파일로 루트를 저장 @@ -1532,9 +1532,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A OsmAnd 오프라인 길안내는 일시적으로 사용할 수 없습니다. 왼쪽좌석 운전 왼쪽좌석 운전 국가를 선택합니다 - 오프라인 데이터를 다운로드 하거나 업데이트 하려면 여기를 클릭하십시오. -세부정보를 보려면 기존 아이템을 클릭하세요, 비활성화 하거나 삭제하려면 위해 길게 누르세요. -기기에 남아있는 현재 데이터는 (%1$s free): + 오프라인 데이터를 다운로드 하거나 업데이트 하려면 여기를 클릭하십시오. 세부정보를 보려면 기존 아이템을 클릭하세요, 비활성화 하거나 삭제하려면 길게 누르세요. 기기에 남아있는 현재 데이터는 (%1$s free): 시작 포인트은 아직 결정되지 않았습니다 파일 다운로드를 중단 하시겠습니까 ? 베이스맵은 적절한 앱의 작동에 필요하며, 다운로드하기 위해 베이스맵을 선택 했습니다. @@ -1665,7 +1663,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A \n\t* 버그 수정 \n\t* 지도 세부정보아 함께 지도 스타일 옵션, 새 도로 스타일, \n\t* EGM96 geoid 오프셋 보정, GPS 고도 읽기 " - 메모와 연결할 위치는 아직 정의되지 않았습니다. 지정된 위치에 메모를 할당하려면 \" 위치 사용…\" + 노트와 연결할 위치는 아직 정의되지 않았습니다. 지정된 위치에 노트를 할당하려면 \" 위치 사용…\" "Changes in 0.8.3: \n\t* 포인트 \n\t* 향상된 루트 안내 @@ -1810,7 +1808,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z \n\t* \'To compass\': Map will continuously be aligned with the device\'s compass reading 이동방향(나침반) : 지도는 계속 나침반의 진행방향을 가르킨다 - 마일퍼아워 + mph Changes in 1.6: \n\t* 풀 HD 기기 지원. \n\t* 투명지도 백그라운드 지원. @@ -1827,7 +1825,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z 음성 기타 현지화 - 이 플러그인은 OsmAnd 의 오프라인 지도에 표시할 수 있는 등고선을 제공합니다. (북쪽으로 70도 남쪽으로 70도 사이 ) 글로벌 데이터는 SRTM (셔틀 레이더 지형 미션 ) 과 ASTER (고급화 된 Spaceborne 열 방출 및 반사 복사계 테라 온보드영상 기기) NASA 의 주력 위성에 의한 측정을 기반으로 합니다. 지구 관측 시스템의 애스터 는 NASA 사이의 협력 노력 , 일본의 경제 산업성(METI ), 일본 우주 시스템 (J- spacesystems )의 장관. + 이 플러그인은 OsmAnd 의 오프라인 지도에 표시할 수 있는 등고선을 제공합니다. (북쪽으로 70도 남쪽으로 70도 사이 ) 글로벌 데이터는 SRTM (셔틀 레이더 지형 미션 ) 과 ASTER (고급화 된 Spaceborne 열 방출 및 반사 복사계 테라 온보드영상 기기) NASA 의 주력 위성에 의한 측정을 기반으로 합니다. 지구 관측 시스템의 ASTER 는 NASA 사이의 협력 노력 , 일본의 경제 산업성(METI ), 일본 우주 시스템 (J- spacesystems )의 장관. 대부분의 GPS 장치는 로컬로 사용되는 시스템에 대한 변환이 위치에 의존하는 보정을 필요로 하는 타원체 기반 WGS84 참조 시스템에서 고도 측정을 보고합니다. 이 지역 시스템에 더 나은 근사치의 EGM96 (지오이드) 기준 입니다. [설정]를 통해 세계 Altitide 보정 파일를 다운로드 한 후 EGM96 시스템의 고도는 위치를 표시합니다. @@ -1847,14 +1845,13 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z \ n 개의 \ 티셔츠 * 사용성 및 UI 경험 * \ n \ t - 많은 분야에서 개선 - 지도의 모양은 오프라인 벡터 맵에서 주간(밝게 )과 야간(어둡게) 사이에서 변경 될 수 있습니다. 야간의 색상은 안전하고 야간 운전에 더 편안합니다. - \'메뉴\'→\'화면구성\'→\'주간/야간 지도\' 의 주간/야간 전환을 설정할 수 있습니다. - 선택 사항은 다음과 같습니다 : - \'일출/일몰\' 자동 모드 (태양의 위치에 따라 제어) - \'주간\' 항상 주간 모드를 사용 - \'야간\' 항상 야간 모드를 사용 - \'광 센서\' : 지도 모양이 장치의 광센서에 의해 제어된다 (광센서가 장착된 경우에만) - + "The map appearance can for offline vector maps be changed between day (brighter) and night (darker). Night colors are safer and more comfortable for night driving. +\n\nYou can set a policy for day/night switching in \'Menu\' → \'Configure screen\' → \'Day/night map\'. +\n\nThe choices are: +\n\t* \'Sunrise/Sunset\': automatic mode, controlled by the position of the sun (default) +\n\t* \'Day\': always use day mode +\n\t* \'Night\': always use night mode +\n\t* \'Light sensor\': map appearance is controlled by the device\'s light sensor (only if equipped) " 표시된 지도소스와 지도레이어는 [메뉴]->[지도 레이어]에서 변경할 수 있다. [지도 소스] 아래에 미리 로드된 오프라인 벡터 지도를 사용하여 선택할 수 있다. OsmAnd 는 또한 사용자 지도를 지원한다. @@ -1872,7 +1869,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z \n\n컨텍스트 메뉴를 이용하거나 또는 액션 바는 [길안내 또는 지도에서 보기] 등을 제공합니다. 고유 장치 id - 모니터링 설정 및 설정 개인 모니터링 채널을 구성 + 모니터링 설정을 구성하고 개인 모니터링 채널을 설정 "OpenStreetMap 고급 실시간 모니터링. 이에 대해서는 http://osmo.mobi를 참조 하십시오. 다른 장치를 추적하고 추적받는 가능성을 제공 합니다. 익명 그룹을 만들고, 서로의 위치를 공유하고 소통한다. 세션 트래킹 또는 영구 트래킹에 대한 다양한 설정을 합니다. 익명그룹는 수많은 날에 제한되며 일부 기능 즉, 원격 제어 및 그룹 관리자는 제한된다. 완벽하게 기능적인 그룹은 웹사이트에 생성하고 그들에게 등록된 사용자만 액세스할 수 있습니다. " OsMo (실시간 친구위치 공유) OsMo (실시간 친구찾기) @@ -1900,12 +1897,10 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z 연결된 장치 OsMo 그룹/장치 - 자동으로 트래커 세션을 시작하고 응용 프로그램 시작 후 위치를 전송 - 자동으로 트래킹 세션을 시작 + 자동으로 트래커 세션을 시작하고 앱 시작 후 위치를 전송 + 자동으로 트래커 세션을 시작 개인 트래커 ID - 트래킹 ID를 보거나 공유하려면 클릭하십시오. -         트래커 ID 연결된 장치를 사용하면 이 장치의 모든 움직임을 모니터 할 수 있습니다! -선택 재생성 옵션을 분리합니다. + 트래커 ID를 보거나 공유하려면 클릭하십시오. 트래커 ID 연결된 장치를 사용하면 이 장치의 모든 움직임을 모니터 할 수 있습니다! 선택 재생성 옵션을 분리합니다. 세션 토큰 : %1$s 허가를 기다리는 중... 위치 전송 %1$d (in buffer %2$d) @@ -1919,13 +1914,13 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z %2$s 그룹에 연결하려면, 그룹 아이디(%1$s) 를 지정하세요 또는 %3$s 를 클릭하세요. 영구적으로 이 장치를 따릅니다. 브라우저에서 현재의 세션을 공유하기 - 세션을 사용할 수 없습니다 , \'Send locations\' 가 켜져 있는지 확인하시기 바랍니다 + 세션을 사용할 수 없습니다 , \'위치 전송하기\' 가 켜져 있는지 확인하시기 바랍니다 세션 공유 장치를 추적하기 위한 세션 URL(%1$s) %2$s 목적지 장치를 연결하려면, %3$s 링크를 클릭하거나 tracker id(%1$s)를 지정하세요 로깅 간격 위치를 전송하도록 시간 간격을 선택 - 일 + 하루 연결 만료 설명 @@ -1937,7 +1932,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z 그룹 만들기 OsMo 서버 작업 실패 OpenStreetMap의 모니터링 - 내 위치 보내기 + 내 위치 전송하기 OsMo 빠른 접근 내보내기 GPX 파일로 저장? 또는 즐겨찾기로 가져오기? @@ -1954,7 +1949,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z 사용자 등록정보 변경 디스플레이 색상 따라가기 - 로그인 + 가입하기 그룹을 만들려면 OsMo의 사용자 등록이 필요합니다. OsMo 자격증명이 유효하지 않습니다. 개인 ID를 재발급 받으시겠습니까? 연결된 모든 장치는 더 이상 GPX트랙을 기록할 수 없습니다. @@ -1967,16 +1962,16 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z 사용자 녹색 - 사용자 %1$s 이(가) 그룹 %2$s 에 합류 - 사용자 %1$s 그룹 %2$s 남기다 + 사용자 %1$s이(가) 그룹 %2$s에 합류합니다 + "사용자 %1$s가 그룹 %2$s에 남습니다" 그룹 알림 보기 사용자가 그룹에 참여 또는 해체 할때 토스트 메시지를 표시 GPX트랙이 비어있습니다 선택한 GPX트랙 모든 GPX트랙 내 즐겨찾기 - 즐겨찾기 - 즐겨찾기 + 내 장소 + 내 장소 하위트랙 : %1$s 거리: %1$s (%2$s points) 시작 시간: %1$tF, %1$tR @@ -1986,7 +1981,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z 평균 고도: %1$s 고도 범위: %1$s 시간 범위: %1$s - 이동한 시간: %1$s + 이동 시간: %1$s 구간 %1$s 포인트 포인트 %1$s @@ -1997,7 +1992,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z 현재 기록중인 GPX트랙 %1$s 불러오는 중… 현재 시간 - 중간지점 + 포인트 \n\n지도를 보려면 누르고 계십시요 순차적인 길안내를 시작합니다 선택됨 @@ -2009,7 +2004,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z 포인트 레이블 길안내중에 줌 버튼 보기 줌 버튼 보이기 - "선택한 GPX 파일 없음. 사용 가능한 GPX트랙을 선택 하려면 누르고 있어요." + "선택한 GPX 파일 없음. 이용 가능한 경로를 선택 하려면 누르고 있어요." 선택을 취소합니다. 보이기위해 선택 거리로 정렬 @@ -2025,7 +2020,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z 그룹을 만들기 전에 읽어 보시기 바랍니다! OsMo 로그인 실패 OsMo 포인트 %1$s 다운로드됨. - 응용 프로그램 시작 후 서비스에 자동으로 연결 + 앱 시작 후 서비스에 자동으로 연결 자동 연결 OsMo 서비스 OsMo GPX트랙 %1$s 다운로드됨. @@ -2037,10 +2032,10 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z 더 상세히 덜 상세히 액세스 유형 숨기기 - 액세스 유형을 표시합니다 + 액세스 유형 보이기 도로의 품질 표시 도로 표면 표시 - 자전거 노선 표시하기 + 자전거 루트 표시 계속 중지 절전 모드 활성화 From 1d7f2cd5ab22872c64d1e769bf4120e60614eabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Michalski?= Date: Mon, 28 Jul 2014 17:52:15 +0200 Subject: [PATCH 14/19] Translated using Weblate (Polish) Currently translated at 100.0% (1474 of 1474 strings) --- OsmAnd/res/values-pl/strings.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index b176618707..66579f5e52 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -683,7 +683,8 @@ Nawigacja offline w OsmAnd jest tymczasowo niedostępna. Ruch lewostronny Wybierz dla krajów z ruchem lewostronnym - Kliknij tutaj, aby pobrać lub zaktualizować pliki map w trybu offline. \nKliknij istniejący element, aby zobaczyć więcej szczegółów. Naciśnij i przytrzymaj, aby go wyłączyć lub usunąć. Obecne dane na urządzeniu (%1$s dostępne): + Kliknij tutaj, aby pobrać lub zaktualizować pliki map trybu offline. +\nKliknij istniejący element, aby zobaczyć więcej szczegółów. Naciśnij i przytrzymaj, aby go wyłączyć lub usunąć. Obecne dane na urządzeniu (%1$s dostępne): Punkt początkowy nie jest jeszcze wyznaczony Czy chcesz przerwać pobieranie pliku? Mapa bazowa jest wymagana do prawidłowego funkcjonowania aplikacji i została wybrana do pobrania. @@ -1839,8 +1840,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Wybierz punkty Etykiety punktów Pokaż na mapie - Pokazuj przyciski zbliżania podczas nawigacji - Pokazuj przyciski zbliżania + Pokazuj przyciski skalowania podczas nawigacji + Pokazuj przyciski skalowania Sortuj według odległości Sortuj według nazwy Nie wybrano żadnych plików GPX. W celu wyboru naciśnij i przytrzymaj dostępną ścieżkę. @@ -1868,7 +1869,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Nazwy lokalne Suahili Hebrajski - Prosto + Dalej Dom Wysyłaj aktualną pozycję do określonej usługi internetowej, jeśli nagrywanie GPX jest włączone. Śledzenie online (wymagane GPX) From 6bba023bb8fb21d2f58b34e669aa3f2775e10bca Mon Sep 17 00:00:00 2001 From: Lu Ca Date: Mon, 28 Jul 2014 00:42:03 +0200 Subject: [PATCH 15/19] Translated using Weblate (Sardinian) Currently translated at 55.9% (825 of 1474 strings) --- OsmAnd/res/values-sc/strings.xml | 241 ++++++++++++++++++++++++++++++- 1 file changed, 239 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index da6f4edd4c..2be1d21dc5 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -706,12 +706,249 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres Firma\n modalidade \"a reposu\" Intervallu de ischidada GPS: %s Sighidu - " OsmAnd (OSM Automated Navigation Directions) OsmAnd est un aplicu pro su nàvigu chi impreat sa cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s\'ischeda de su telèfono pro èssere impreadas sena lìnia. OsmAnd offridi fintzas sa funtzionalidade de su càlculu de s\'àndala in lìnia (online) e sena lìnia (offline) cumpresa sa boghe de ghia curva pro curva. Calicunas de sas caraterìsticas printzipales: - Funtzionalidade cumprida sena lìnia (Sarba sas mapas vetoriales o a tasseddos in una cartella isseberada) - Mapas sena lìnia cumpatas isgarrigàbiles pro totu su mundu - Igariiramentu de sas mapas de regiones o istados deretamente dae sa mapa - Possibilidade de sovrapposizione de diferentes istrados, comente rastas GPX o de nàvigu, puntos de interesse, preffèrridos, curvas de livellu, firmadas de sos mezos pùblicos, mapas annangàbiles cun trasparentzia pessonalizzàbile - Chirca sena lìnia pro indiritzos e locos (POIs) - Càlculu de s\'àndala pro distàntzias curtzas (isperimentale) - Modalidades màchina, bitzicleta, e pedone cun: - Mudadura automàtica optzionale de sa vista die/note - Zoom automàticu optzionale basau in supra de sa lestresa - Allineamentu de sa mapa basandesi in supra de sa diretzione o a de sa bùssola - indicatore de corsia optzionale, segnalatzione de su lìmite de lestresa, boghes registradas e TTS - Limitatziones de custa versione gratùita de OsmAnd: - Nùmeru limitadu de isgarrigamentu de mapas - Atzessu a Wikipedia pro sos POIs sena lìnia fartante- OsmAnd est totora in fase de isvilupu e su progetu nostru e su progressu suo si basada in supra de sos contributos finantziarios pro s\'isvilupu e s\'iscumprou (sa prova) de funtzionalidades noas. Pro piaghere cunsidera s\'optzione de comporare OsmAnd+, de finantziare novas funtziones didlindadas o de fàghere una donatzione generale a osmand.net. " + " OsmAnd (OSM Automated Navigation Directions) OsmAnd est un aplicu pro su nàvigu chi impreat sa cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s\'ischeda de su telèfono pro èssere impreadas sena lìnia. OsmAnd offridi fintzas sa funtzionalidade de su càlculu de s\'àndala in lìnia (online) e sena lìnia (offline) cumpresa sa boghe de ghia curva pro curva. Calicunas de sas caraterìsticas printzipales: - Funtzionalidade cumprida sena lìnia (Sarba sas mapas vetoriales o a tasseddos in una cartella isseberada) - Mapas sena lìnia cumpatas isgarrigàbiles pro totu su mundu - Igariiramentu de sas mapas de regiones o istados deretamente dae sa mapa - Possibilidade de sovrapposizione de diferentes istrados, comente rastas GPX o de nàvigu, puntos de interesse, preffèrridos, curvas de livellu, firmadas de sos mezos pùblicos, mapas annangàbiles cun trasparentzia pessonalizzàbile - Chirca sena lìnia pro indiritzos e locos (PDI) - Càlculu de s\'àndala pro distàntzias curtzas (isperimentale) - Modalidades màchina, bitzicleta, e pedone cun: - Mudadura automàtica optzionale de sa vista die/note - Zoom automàticu optzionale basau in supra de sa lestresa - Allineamentu de sa mapa basandesi in supra de sa diretzione o de sa bùssola - indicatore de corsia optzionale, segnalatzione de su lìmite de lestresa, boghes registradas e TTS - Limitatziones de custa versione gratùita de OsmAnd: - Nùmeru limitadu de isgarrigamentu de mapas - Atzessu a Wikipedia pro sos PDI sena lìnia fartante- OsmAnd est totora in fase de isvilupu e su progetu nostru e su progressu suo si basada in supra de sos contributos finantziarios pro s\'isvilupu e s\'iscumprou (sa prova) de funtzionalidades noas. Pro piaghere cunsidera s\'optzione de comporare OsmAnd+, de finantziare novas funtziones didlindadas o de fàghere una donatzione generale a osmand.net. " Albanesu Àrabu Sardu Serbu Tzinesu semplificau Tzinesu traditzionale - " OsmAnd (OSM Automated Navigation Directions) est un aplicu pro su nàvigu chi impreat sa cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s\'ischeda de su telèfono pro èssere impreadas sena lìnia. Impreande su GPS de su dispositivu OsmAnd ofèrridi su nàvigu cun, s\'in casu, sa ghia vocale, pro sa màchina, sa bitzicleta e a pedes. Totu sas funtzionalidades sunt disponìbiles siat in lìnia chi sena lìnia (non serbit connessione ad ìnternet).↵ ↵ Calicuna de sas caraterìsticas printzipales: Nàvigu - Funtziònada in lìnia (lestru) o sena lìnia (sena costos candu ses in s\'èstero) - Ghia bogale bortada pro bortada(boghes registradas e sintetizzadas) - Indicatzione de corsia optzionale, indicatzione de su nùmene de s\'istrada, indicatzione de su tempus de lòmpida istimadu - Suportada puntos mesanos in s\'àndala - Recàlculu automàticu cada borta chi èssis dae s\'àndala - Chirca pro indiritzu, pro gasta (es.: ristorante, albergu, istatzione de servìtziu, museu) e pro coordinatas geogràficas de sos locos Visualizatzione de sa mapa - Ammustra sa positzione e s\'orientamentu tuo in sa mapa - Allìnia optzionalmente sa mapa sighinde sa bùssola o sa diretzione de movimentu - Sarba sos locos prus importantes pro tie in sos Prefèrridos - Ammustra sos POIs (puntos de interesse) inghìriu a tie - Podet ammustrare mapas spetzializadas a tasseddos in lìnia - Podet ammustrare vistas satellitares (dae Bing) - Podet ammustrare istratos subraponìbiles diferentes, comente rastas GPX pro nàvigu e mapas additzionales cun trasparentzia pessonalizzàbile - Ammustra sos nùmenes in inglesu, limba locale, o pronùntzia fonètica Imprea datos OpenStreetMap e Wikipedia: - Datos de arta calidade dae sos mègius progetos collaborativos de su mundu - Mapas globales pro OpenStreetMap, disponìbiles pro istadu o regione - Wikipedia POIs, òtimos pro giros turìsticos (non disponìbiles in sa versione gratùita) - Isgarrigamentos gratuitos sena lìmites, diretamente dae s\'aplicu (lìmite de isgarrigamentu de 16 documentos de sa mapa in sa versione gratùita) - Mapas sèmpere agiornadas (a su mancu una borta a su mese) - Mapas vetoriales compatas sena lìnia - Issèbera intre mapas cumpridas e petzi istradales (es: totu su Giapone est 700 MB, o 200 MB pro petzi sas istradas) - Suportada fintzas mapas a tasseddos in lìnia o in sa cache Carateristicas pro sa segurantzia - Mudadura automàtica optzionale de sa vista die/note - Ammustradura optzionale de su lìmite de lestresa, cun avisos si lu barigas - Zoom automàticu optzionale basau in supra de sa lestresa - Cumpartzi sa positzione tua pro permìtere a sos amicos tuos de t\'agatare Funtziones pro sa bitzicleta e a pede - Sa mapa inclùidi àndalas prp bitzicleta, escursionimu e pedonales, òtimas pro sas atividades a s\'àera aberta - Modalidades ispetziales pro sa bitzicleta e a pedes - Firmadas de su trasportu pùblicu (postales, trams, trenos) optzionales, cun sos nùmenes de sas lìnias incluidos - Registratzione optionales in documentos GPX locales o servìtzios in lìnia - Ammustradura optzionale de sa lestresa e de s\'artaria - Ammustradura de sas lìnias de livellu e de sas umbraduras de su rilievu (impreande unu componente agiuntivu, o plugin, apòsitu) Contributzione dereta ad OpenStreetMap - Sinnala errores in sa mapa - Càrriga rastas GPX in OSM dderetamente dae s\'aplicu - Annanghe POIs e càrrigalos deretamente in OSM (o prus a tardu si ses sena lìnia) - Registratzione optzionale fintzas in modalidade \"in s\'isfondu\" (cando su dispositivu est in modalidade \"a reposu\") OsmAnd est unu progetu a mitza aberta e est ativamente isvilupau. Cadaunu podet cuntribuire a s\'aplicu marcande errores, megiorande sas bortaduras, o programmande funtzionalidades noas. Su progetu est totora in unu istadu sighidu e vitale de megioramentu pro mèdiu de totu custas formas de interatziones intre impitadores e isvilupadores. Su progetu andada in antis gràtzias fintzas a sas cuntributziones finantziarias, pro titu s\'isvilupu e s\'isperimentatzione de caraterìsticas noas. Comporande OsmAnd+ podes agiudare s\'aplicu a divènnere fintzas prus ispantosu! Est fintzas possìbile finantziare funtziones dislindadas, o fàghere una donatzione generale in osmand.net. Calidade e cubertura aprosimativa: - Western Europe: **** - Eastern Europe: *** - Russia: *** - North America: *** - South America: ** - Asia: ** - Japan & Korea: *** - Middle East: ** - Africa: ** - Antarctica: * Lista de sa regiones suportadas (praticamente totu su mundu!): Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Curaçao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe. " + " OsmAnd (OSM Automated Navigation Directions) est un aplicu pro su nàvigu chi impreat sa cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s\'ischeda de su telèfono pro èssere impreadas sena lìnia. Impreande su GPS de su dispositivu OsmAnd ofèrridi su nàvigu cun, s\'in casu, sa ghia vocale, pro sa màchina, sa bitzicleta e a pedes. Totu sas funtzionalidades sunt disponìbiles siat in lìnia chi sena lìnia (non serbit connessione ad ìnternet).↵ ↵ Calicuna de sas caraterìsticas printzipales: Nàvigu - Funtziònada in lìnia (lestru) o sena lìnia (sena costos candu ses in s\'èstero) - Ghia bogale bortada pro bortada(boghes registradas e sintetizzadas) - Indicatzione de corsia optzionale, indicatzione de su nùmene de s\'istrada, indicatzione de su tempus de lòmpida istimadu - Suportada puntos mesanos in s\'àndala - Recàlculu automàticu cada borta chi èssis dae s\'àndala - Chirca pro indiritzu, pro gasta (es.: ristorante, albergu, istatzione de servìtziu, museu) e pro coordinatas geogràficas de sos locos Visualizatzione de sa mapa - Ammustra sa positzione e s\'orientamentu tuo in sa mapa - Allìnia optzionalmente sa mapa sighinde sa bùssola o sa diretzione de movimentu - Sarba sos locos prus importantes pro tie in sos Prefèrridos - Ammustra sos PDI (puntos de interesse) inghìriu a tie - Podet ammustrare mapas spetzializadas a tasseddos in lìnia - Podet ammustrare vistas satellitares (dae Bing) - Podet ammustrare istratos subraponìbiles diferentes, comente rastas GPX pro nàvigu e mapas additzionales cun trasparentzia pessonalizzàbile - Ammustra sos nùmenes in inglesu, limba locale, o pronùntzia fonètica Imprea datos OpenStreetMap e Wikipedia: - Datos de arta calidade dae sos mègius progetos collaborativos de su mundu - Mapas globales pro OpenStreetMap, disponìbiles pro istadu o regione - Wikipedia PDI, òtimos pro giros turìsticos (non disponìbiles in sa versione gratùita) - Isgarrigamentos gratuitos sena lìmites, diretamente dae s\'aplicu (lìmite de isgarrigamentu de 16 documentos de sa mapa in sa versione gratùita) - Mapas sèmpere agiornadas (a su mancu una borta a su mese) - Mapas vetoriales compatas sena lìnia - Issèbera intre mapas cumpridas e petzi istradales (es: totu su Giapone est 700 MB, o 200 MB pro petzi sas istradas) - Suportada fintzas mapas a tasseddos in lìnia o in sa cache Carateristicas pro sa segurantzia - Mudadura automàtica optzionale de sa vista die/note - Ammustradura optzionale de su lìmite de lestresa, cun avisos si lu barigas - Zoom automàticu optzionale basau in supra de sa lestresa - Cumpartzi sa positzione tua pro permìtere a sos amicos tuos de t\'agatare Funtziones pro sa bitzicleta e a pede - Sa mapa inclùidi àndalas prp bitzicleta, escursionimu e pedonales, òtimas pro sas atividades a s\'àera aberta - Modalidades ispetziales pro sa bitzicleta e a pedes - Firmadas de su trasportu pùblicu (postales, trams, trenos) optzionales, cun sos nùmenes de sas lìnias incluidos - Registratzione optionales in documentos GPX locales o servìtzios in lìnia - Ammustradura optzionale de sa lestresa e de s\'artaria - Ammustradura de sas lìnias de livellu e de sas umbraduras de su rilievu (impreande unu componente agiuntivu, o plugin, apòsitu) Contributzione dereta ad OpenStreetMap - Sinnala errores in sa mapa - Càrriga rastas GPX in OSM dderetamente dae s\'aplicu - Annanghe PDI e càrrigalos deretamente in OSM (o prus a tardu si ses sena lìnia) - Registratzione optzionale fintzas in modalidade \"in s\'isfondu\" (cando su dispositivu est in modalidade \"a reposu\") OsmAnd est unu progetu a mitza aberta e est ativamente isvilupau. Cadaunu podet cuntribuire a s\'aplicu marcande errores, megiorande sas bortaduras, o programmande funtzionalidades noas. Su progetu est totora in unu istadu sighidu e vitale de megioramentu pro mèdiu de totu custas formas de interatziones intre impitadores e isvilupadores. Su progetu andada in antis gràtzias fintzas a sas cuntributziones finantziarias, pro titu s\'isvilupu e s\'isperimentatzione de caraterìsticas noas. Comporande OsmAnd+ podes agiudare s\'aplicu a divènnere fintzas prus ispantosu! Est fintzas possìbile finantziare funtziones dislindadas, o fàghere una donatzione generale in osmand.net. Calidade e cubertura aprosimativa: - Western Europe: **** - Eastern Europe: *** - Russia: *** - North America: *** - South America: ** - Asia: ** - Japan & Korea: *** - Middle East: ** - Africa: ** - Antarctica: * Lista de sa regiones suportadas (praticamente totu su mundu!): Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Curaçao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe. " + Modalidade metropolitana + " OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ est unu aplicu a mitza aberta pro su nàvigu chi tènet atzessu a sa variedade manna de datos globales de Openstreetmap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in sa memòria de su telèfono pro èssere impreadas sena lìnia. OsmAnd ofèrridi fintzas una funtzione de nàvigu cun ghia vocale in lìnia e sena lìnia. OsmAnd+ est sa versione a pagamentu, comporandela suportas su progetu, finantzias s\'isvilupu de funtzionalidades noas, e retzives totu sos ùrtimos agiornamentos. Calicuna de sas funtziones printzipales: - Funtzionalidade cumprida sena lìnia (sarba mapas vetoriales o a tasseddos in una cartella isseberàbile) - Mapas compatas sena lìnia disponìbiles pro totu su mundu - Isgarrigamentu sena lìmites de mapas de regiones e istados deretamente dae s\'aplicu - Funtzionalidade sena lìnia de Wikipedia (isgàrriga PDI Wikipedia), òtima pro giros turìsticos - Possibilidade de subraporre diferentes istrados de mapas, comente rastas GPX o de nàvigu, Puntos De Interesse, prefèrridos, lìnias de livellu, firmadas de sos trasportos pùblicos, mapas addizionales cun trasparèntzia pessonalizzàbile - Chirca sena lìnia pro indiritzos e locos (PDI) - Càlculu de s\'àndala sena lìnia pro distantzias curtzas (isperimentale) - Modalidades in màchina, bitzicleta, e a pede cun: - mudadura automàtica optzionale de sa vista die/note - zoom automàticu optzionale basau in supra de sa lestresa - allineamentu de sa mapa basandesi in supra de sa diretzione o de sa bùssola - indicatore de corsia optzionale, segnalatzione de su lìmite de lestresa, boghes registradas e TTS " + " OsmAnd (OSM Automated Navigation Directions) est un aplicu pro su nàvigu chi impreat sa cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s\'ischeda de su telèfono pro èssere impreadas sena lìnia. Impreande su GPS de su dispositivu OsmAnd ofèrridi su nàvigu cun, s\'in casu, sa ghia vocale, pro sa màchina, sa bitzicleta e a pedes. Totu sas funtzionalidades sunt disponìbiles siat in lìnia chi sena lìnia (non serbit connessione ad ìnternet).↵ ↵ Calicuna de sas caraterìsticas printzipales: Nàvigu - Funtziònada in lìnia (lestru) o sena lìnia (sena costos candu ses in s\'èstero) - Ghia bogale bortada pro bortada(boghes registradas e sintetizzadas) - Indicatzione de corsia optzionale, indicatzione de su nùmene de s\'istrada, indicatzione de su tempus de lòmpida istimadu - Suportada puntos mesanos in s\'àndala - Recàlculu automàticu cada borta chi èssis dae s\'àndala - Chirca pro indiritzu, pro gasta (es.: ristorante, albergu, istatzione de servìtziu, museu) e pro coordinatas geogràficas de sos locos Visualizatzione de sa mapa - Ammustra sa positzione e s\'orientamentu tuo in sa mapa - Allìnia optzionalmente sa mapa sighinde sa bùssola o sa diretzione de movimentu - Sarba sos locos prus importantes pro tie in sos Prefèrridos - Ammustra sos PDIs (puntos de interesse) inghìriu a tie - Podet ammustrare mapas spetzializadas a tasseddos in lìnia - Podet ammustrare vistas satellitares (dae Bing) - Podet ammustrare istratos subraponìbiles diferentes, comente rastas GPX pro nàvigu e mapas additzionales cun trasparentzia pessonalizzàbile - Ammustra sos nùmenes in inglesu, limba locale, o pronùntzia fonètica Imprea datos OpenStreetMap e Wikipedia: - Datos de arta calidade dae sos mègius progetos collaborativos de su mundu - Mapas globales pro OpenStreetMap, disponìbiles pro istadu o regione - Wikipedia PDI, òtimos pro giros turìsticos (non disponìbiles in sa versione gratùita) - Isgarrigamentos gratuitos sena lìmites, diretamente dae s\'aplicu (lìmite de isgarrigamentu de 16 documentos de sa mapa in sa versione gratùita) - Mapas sèmpere agiornadas (a su mancu una borta a su mese) - Mapas vetoriales compatas sena lìnia - Issèbera intre mapas cumpridas e petzi istradales (es: totu su Giapone est 700 MB, o 200 MB pro petzi sas istradas) - Suportada fintzas mapas a tasseddos in lìnia o in sa cache Carateristicas pro sa segurantzia - Mudadura automàtica optzionale de sa vista die/note - Ammustradura optzionale de su lìmite de lestresa, cun avisos si lu barigas - Zoom automàticu optzionale basau in supra de sa lestresa - Cumpartzi sa positzione tua pro permìtere a sos amicos tuos de t\'agatare Funtziones pro sa bitzicleta e a pede - Sa mapa inclùidi àndalas prp bitzicleta, escursionimu e pedonales, òtimas pro sas atividades a s\'àera aberta - Modalidades ispetziales pro sa bitzicleta e a pedes - Firmadas de su trasportu pùblicu (postales, trams, trenos) optzionales, cun sos nùmenes de sas lìnias incluidos - Registratzione optionales in documentos GPX locales o servìtzios in lìnia - Ammustradura optzionale de sa lestresa e de s\'artaria - Ammustradura de sas lìnias de livellu e de sas umbraduras de su rilievu (impreande unu componente agiuntivu, o plugin, apòsitu) Contributzione dereta ad OpenStreetMap - Sinnala errores in sa mapa - Càrriga rastas GPX in OSM dderetamente dae s\'aplicu - Annanghe PDI e càrrigalos deretamente in OSM (o prus a tardu si ses sena lìnia) - Registratzione optzionale fintzas in modalidade \"in s\'isfondu\" (cando su dispositivu est in modalidade \"a reposu\") OsmAnd est unu progetu a mitza aberta e est ativamente isvilupau. Cadaunu podet cuntribuire a s\'aplicu marcande errores, megiorande sas bortaduras, o programmande funtzionalidades noas. Su progetu est totora in unu istadu sighidu e vitale de megioramentu pro mèdiu de totu custas formas de interatziones intre impitadores e isvilupadores. Su progetu andada in antis gràtzias fintzas a sas cuntributziones finantziarias, pro titu s\'isvilupu e s\'isperimentatzione de caraterìsticas noas. Comporande OsmAnd+ podes agiudare s\'aplicu a divènnere fintzas prus ispantosu! Est fintzas possìbile finantziare funtziones dislindadas, o fàghere una donatzione generale in osmand.net. Calidade e cubertura aprosimativa: - Western Europe: **** - Eastern Europe: *** - Russia: *** - North America: *** - South America: ** - Asia: ** - Japan & Korea: *** - Middle East: ** - Africa: ** - Antarctica: * Lista de sa regiones suportadas (praticamente totu su mundu!): Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Curaçao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe. " + Datos PDI + Datos PDI + Muda PDI + PDI… + Chirca PDI + Agiorna PDI + Carrigamentu PDI… + PDI + PDI/Errores sarbados in locale + PDI Wikipedia mondiale + S\'agiornamentu de sos PDI non est disponìbile pro livellos de zoom bassos + "Mapas agiorndas sunt fundamentales pro sa visione sena lìnia, pro sa chirca tramite PDI/indiritzu, e pro su nàvigu sena lìnia. OsmAnd frunidi unu gestore de sas mapas pro las isgarrigare e pro chircare pro agiornamentos. +\n\nPro isgarrigare mapas bae in \'Impostaduras\' → \'Manage map files\' → \'Isgàrriga\'. +\n\nA pustis chi sa lista globale de sas regiones at a èssere istada isgarrigada, carca in supra de unu ogetu pro isgarrigare o carrigare unu documentu. Pro piaghere nota s\'isseberadore de tiou de documentu in sa parte arta de s\'ischermu pro ischertare su tipu de isgarrigamentu chi boles (mapas regulares, umbraduras de sos rilievos, etc.). +\n\nPodes filtrare sa lista de sas regiones iscrivende carchi lètera, o ischertande s\'optzione \'Impostaduras\' → \'Filtra isgarrigadas \' pro bìere agiornamentos pro petzi sos datos chi tenes giai in su dispositivu. +\n\n\t* Boghes in \'birde\' indicana documentos de datos identicos in su dispositivu e in su server +\n\t* Boghes in \'blu\' indicana agioramentos disponìbiles in su server +\n\t* Boghes in corsivu indicana datos deativados in su dispositivu " + Caraterìsticas de su disinnu: + Pro dearreere s\'ischermu carca s\'icona de su luchete + Nùmene de s\'istrada + Cunfigura s\'ischermu + In ue so + Areea s\'ischermu + Bùssola + Barra de istadu: + Reimposta sos valores predefinidos + Pannellu de destra: + Pannellu de manca: + Parchègiu + Registratzione GPX + Lestresa + Destinatzione + Artària + Tempus abarrau + Bortada imbeniente + Bortada imbeniente (minore) + Segunda bortada imbeniente + Minimapa de s\'àndala + Areea s\'ischermu + Deareea s\'ischermu + S\'ischermu est areeau + Imposta s\'intervallu de ischidada: + Ammustra autovelox + Ammustra lìmites de lestresa + Istansi sas istradas a pedàgiu + Su nàvigu pretzedente no est istadu cumpridu. Sighire cun cussu? (%1$s segundos) + S\'àndala at a èssere calculada a positzione achirida + Oras + Minutos + Sa màchina est istada parchegiada a sas: + "Mudas in sa 0.8.1: +\n\t* Àndalas prus pretzisas (unu pagu prus lentas) +\n\t* Ricalculu de s\'àndala intelligente e lestru +\n\t* Diretzione basadas in supra de sas corsias +\n\t* Informaztiones in supra de lìmites de lestresa, autovelox, e dossos rallentadores +\n\t* Boghe de ghia in sas autostradas megiorada +\n\t* Cumponente agiuntivu (plugin) pro su parchègiu (\'In ue est sa màchina mea?\') +\n\t* Abìlita/disabìlita su widget pro sa compidada " + Issèbera sa lestresa de s\'animatzione de s\'àndala + Memòria allocata %1$s MB (lìmite de Android %2$s MB, Dalvik %3$s MB). + Memòria allocata + Memòria nativa totale allocada dae s\'aplicu %1$s MB (Dalvik %2$s MB, àteru %3$s MB). Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB). + Memòria nativa locale + Torra a carrigare s\'elencu + Puntu de mòida tropu distante dae s\'istrada prus a curtzu. + Positzione cumpartzida + Piga sa màchina dae su parchègiu + Atentzione + Imposta su lìmite de oràriu de su parchègiu + Issèbera su tipu de parchègiu + A tempus + Sena lìmites de tempus + Annanghe una notìfica a s\'aplicu Calendariu + Parchègiu a tempus + Parchègiu sena lìmites de tempus + Sa positzione de s\'auto parchegiada tua. %1$s + PM + AM + Puntu de parchègiu + Custu plugin agiùdada ad ammentare su logu de parchègiu de sa màchina tua. + Plugin positzione parchègiu + Marca comente positzione de parchègiu + Pùblicu + Identificàbile + Arrastàbile + Privadu + ASAP + Sarba s\'àndala comente documentu GPX + Cumpartzi s\'àndala comente documentu GPX + Àndala cumpartzida tràmite OsmAnd + Mantène sa manca e sighi + Mantène sa destra e sighi + Cua sos polìgonos + Modalidade de disinnu + Visualiza curvas de livellu + Datos àndala + Formatu: + Chirca PDI (puntos de interesse) + Chirca de sos indiritzos + Coordinatas + Chirca de sos trasportos pùblicos + Chirca de sos prefèrridos + Su nàvigu sena lìnia de OsmAnd est temporaneamente non disponìbile. + Ghia a manca + Abìlita in sos istados in ue si ghiat mantenende sa manca + Sa positzione de tzucada no est istada galu determinata + Positzione calu non connota + Muda sa trasparèntzia (0 - trasparente, 255 - annapau) + Boles firmare s\'isgarrigamentu de sos documentos? + Mapas in lìnia a tasseddos + Mapas sena lìnia (vetoriales) + Mapas in lìnia e a tasseddos + Imprea sas mapas in lìnia (iscàrriga e archìvia sos tasseddos in s\'ischeda SD) + Mapas in lìnia + Cunfigura sas mitzas de sas mapas in lìnia o de sos tasseddos in cache + Impostaduras mapas + Cunfigura sa visualizatzione de sa mapa + Ammustra sas impostaduras pro funtzionalidades ispetziales pro s\'atzessibilidade. + Impostaduras avantzadas + Plugins + Issèbera unu plugin pro l\'ativare o lu deativare. (Diat pòdere serbire su reaviu de OsmAnd.) + Sos plugins abìlitana funtzionalidades azuntivas e impostaduras avantzadas + Plugins + Isvilupu de OsmAnd + Disinnu nativu + Inviare sos documentos GPX a OSM? + Visibilidade + Etichetas + Descritzione + Imposta impitadore e crae (password) de OSM pro carrigare documentos GPX. + Sustènne + Sustènne caraterìsticas noas + Visualizza s\'iscala gràfica + Info + Torra a sa positzione + Agiudu + Modalidade atzessìbile + Abìlita sas funtziones chi pertocant a s\'atzessibilidade + Ativau + Deativau + Torra a su Menù + Su zoom est + nord + nord-nord-est + nord-est + est-nord-est + est + est-sud-est + sud-est + sud-sud-est + sud + sud-sud-ovest + sud-ovest + ovest-sud-ovest + ovest + ovest-nord-ovest + nord-ovest + nord-nord-ovest + Destra + Manca + in puntu + Pretzisione + Artària + Peruna informatzione + Diretziones (8 setores) + Bùssola (12 setores) + Istile de sa diretzione + Deo so inoghe + Imprea sos nùmenes de sos ogetos + + Atzessibilidade + Carrigamentu … + Carriga totu + Ammustra in sa mapa + Ammustra sa rasta currente + Versione gratùita + Ammustra descritzione PDI + Nord Amèrica + Nord Amèrica - Istados Unidos + Amèrica Tzentrale + Sud Amèrica + Europa + Europa - Frantza + Europa - Germània + Europa/Àsia - Rùssia + Àfrica + Àsia + Oceània + Mapas mundiales e de base + Wikipedia (sena lìnia) + Impostaduras dislindadas de su profilu + Nàvigu + Dislinda sas optziones de nàvigu + Impostaduras globales + Impostaduras generales + Cunfigura sas impostaduras globales + Impostaduras globales de s\'aplicu + Nùmene impitadore in OSM + Crae (password) in OSM + Orientamentu de sa mapa + Modalidade die/note + Megiora sos datos OSM + Nàvigu + Mai + Mai + Torra a repìtere sas istrutziones de nàvigu + Impostaduras de sa mitza de sa mapa + Impostaduras de sa mapa vetoriale + Bidda + Bidditzolu + Tzidadina + Tzitade + + Firma animatzione + Avia animatzione + Esistit giai unu documentu cun su matessi nùmene. + Àndala GPX + Chirca pro nùmene + Agiorna OsmAnd+ + Ammustra in sa mapa + Nominatim in lìnia + Chircande sa positzione… + Positzione (agatada) + Indiritzu… + Prefèrridos… + Chirca a curtzu de: + Chirca a curtzu de inoghe + Sarba s\'àndala comente rasta GPX + Àndala sarbada comente \'%1$s\'. + "Nùmene documentu: " + Esistit giai unu documentu cun su matessi numene. + Sarba + Sarba diretziones From 9e595e49b05247e2577f032d747840b65381553b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0tefan=20Baebler?= Date: Sun, 27 Jul 2014 07:47:30 +0200 Subject: [PATCH 16/19] Translated using Weblate (Slovenian) Currently translated at 100.0% (1474 of 1474 strings) --- OsmAnd/res/values-sl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 460f7f446f..7a7d58bcb2 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -1858,7 +1858,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Končaj GPX snemanje Začni nov segment Skrij stavbe - Skrij ne-vozne ceste + Skrij neprevozne ceste Skrij besedilo Skrij gozdove in grmičevje Zgradbe v povečavi 15 From a43b23f6cc5b2aad6e155a503d7878a361b23701 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Sat, 26 Jul 2014 20:55:53 +0200 Subject: [PATCH 17/19] Translated using Weblate (Swedish) Currently translated at 99.3% (1465 of 1474 strings) --- OsmAnd/res/values-sv/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 625ebcad7c..63fe8f5b7f 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1645,4 +1645,5 @@ Serbiska Förenklad kinesiska Traditionell kinesiska - + Tunnelbaneläge + From 4653e629d11d26ce16278130f80177b8662d6712 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Wed, 30 Jul 2014 02:13:47 +0200 Subject: [PATCH 18/19] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (1474 of 1474 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 31 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 355028bb4b..6305094411 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -220,7 +220,7 @@ OsmAnd 離線導航，暫時不能使用。 左駕 選擇左駕的國家 - 點選此處下載或更新離線地圖檔案。\n按任何一項查看細節，按住即可解除或刪除。目前裝置上的資料空間剩(%1$s 可用)： + 點選此處可下載或更新離線地圖檔案。\n點選現存的任何項目可查看細節，按住即可停用或刪除。目前裝置上資料的可用空間尚有 (%1$s)： 起始標點尚未決定 未知地理位置 調整透明度(0 - 透明, 255 - 不透明) @@ -298,21 +298,21 @@ 北北西 前方 右前方 - 右邊 + 右方 右後方 往後 左後方 - 左邊 + 左方 左前方 - 點 - 接近 + 點鐘 + 將近 精確性 高度 - 無資訊 - 方向方位 (8個方位) - 時鐘方位(12個方位) + 沒有數據 + 橫向 (8 個扇區) + 順時鐘 (12 個扇區) 方向樣式 - 選擇在行進中相對方向的表示樣式 + 在行進當中，以選擇的樣式來表示相對的方向 啟動自動告知 關閉自動告知 在觸控螢幕上用手勢移動地圖 @@ -324,7 +324,7 @@ 使用物件名稱 協助工具的相關偏好設定 協助工具 - 沒有足夠的處理記憶體去顯示已選取的區域 + 處理記憶體不足，無法顯示已選取的區域 螢光覆疊層 使用螢光色彩來顯示軌跡與導航路線 離線編輯 @@ -1721,7 +1721,7 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告 位置顯示始終處於中心 聲音 定位 - 當制作通告時中斷音樂 + 當制作預告時中斷音樂 中斷音樂 雜項 以 GPX 檔案分享路線 @@ -1735,8 +1735,8 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告 永不 按照定期間隔重新通報導航指示 重複導航指示 - 抵達通告 - 您希望抵達通告要有多快？ + 到達預告 + 您希望到達預告要有多快告知？ OsMo 連線問題： 停止 OsMo 連線階段 啟動 OsMo 連線階段 @@ -1748,8 +1748,7 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告 自動開始追蹤連線階段和發送位置之後啟動應用程式 自動開始追蹤連線階段 個人追蹤 ID - 點擊查看或分享追蹤 ID。 -         使用追蹤 ID 連線的裝置將能夠監視該裝置的所有動作！ 要斷開選擇恢復選項。 + 點擊查看或分享追蹤 ID。          使用追蹤 ID 連線的裝置將能夠監控該裝置的所有動作！ 要斷開選擇恢復選項。 連線階段標記：%1$s 等候授權... 發送位置 %1$d（在緩衝區 %2$d） @@ -1788,7 +1787,7 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告 連接到 建立群組 OsMo 伺服器操作失敗 - OpenStreetMap-監視 + OpenStreetMap-監控中 傳送我的位置 OsMo 快速進入 匯出 From d0ea6fb5d4560ce4ade8b47d7e7a023281f5274c Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 30 Jul 2014 12:30:04 +0200 Subject: [PATCH 19/19] Attempt to fix 2323 --- OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java b/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java index 410bb32d78..ead86115a8 100644 --- a/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java +++ b/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java @@ -1,6 +1,8 @@ package net.osmand.plus; import java.io.IOException; +import java.util.HashMap; +import java.util.LinkedHashMap; import net.osmand.Location; import net.osmand.binary.RouteDataObject; @@ -36,7 +38,8 @@ public class CurrentPositionHelper { } else { return; } - RoutingConfiguration cfg = app.getDefaultRoutingConfig().build(p.name().toLowerCase(), 10); + RoutingConfiguration cfg = app.getDefaultRoutingConfig().build(p.name().toLowerCase(), 10, + new HashMap()); ctx = new RoutePlannerFrontEnd(false).buildRoutingContext(cfg, null, app.getResourceManager().getRoutingMapFiles()); }