diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java index 3c6ea8cbc..bfbded0a6 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java @@ -28,13 +28,11 @@ import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.widget.ViewPager2; -import java.util.ArrayList; -import java.util.List; - import de.dennisguse.opentracks.AbstractActivity; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.tables.MarkerColumns; import de.dennisguse.opentracks.databinding.MarkerDetailActivityBinding; import de.dennisguse.opentracks.ui.markers.DeleteMarkerDialogFragment.DeleteMarkerCaller; @@ -53,7 +51,7 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark private MarkerDetailActivityBinding viewBinding; - private List markerIds; + private Cursor cursor; @Override protected void onCreate(Bundle bundle) { @@ -69,24 +67,23 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark ContentProviderUtils contentProviderUtils = new ContentProviderUtils(this); Marker marker = contentProviderUtils.getMarker(markerId); - markerIds = new ArrayList<>(); + //TODO only load used data: ID + name + cursor = contentProviderUtils.getMarkerCursor(marker.getTrackId(), null, -1); + if (cursor == null) { + finish(); + } + int markerIndex = -1; - - //TODO Load only markerIds, not the whole marker - try (Cursor cursor = contentProviderUtils.getMarkerCursor(marker.getTrackId(), null, -1)) { - if (cursor != null && cursor.moveToFirst()) { - for (int i = 0; i < cursor.getCount(); i++) { - Marker currentMarker = contentProviderUtils.createMarker(cursor); - markerIds.add(currentMarker.getId()); - if (markerId.equals(currentMarker.getId())) { - markerIndex = markerIds.size() - 1; - } - - cursor.moveToNext(); + if (cursor != null && cursor.moveToFirst()) { + while (markerIndex == -1 && cursor.moveToNext()) { + Marker.Id currentId = new Marker.Id(cursor.getLong(cursor.getColumnIndexOrThrow(MarkerColumns._ID))); + if (markerId.equals(currentId)) { + markerIndex = cursor.getPosition(); } } } + final MarkerDetailPagerAdapter markerAdapter = new MarkerDetailPagerAdapter(this); viewBinding.makerDetailActivityViewPager.setAdapter(markerAdapter); viewBinding.makerDetailActivityViewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { @@ -111,7 +108,9 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark protected void onDestroy() { super.onDestroy(); viewBinding = null; - markerIds = null; + + if (cursor != null) cursor.close(); + cursor = null; } @Override @@ -128,17 +127,19 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark @Override @NonNull public Fragment createFragment(int position) { - return MarkerDetailFragment.newInstance(markerIds.get(position)); + cursor.moveToPosition(position); + return MarkerDetailFragment.newInstance(new Marker.Id(cursor.getLong(cursor.getColumnIndexOrThrow(MarkerColumns._ID)))); } @Override public int getItemCount() { - return markerIds.size(); + return cursor.getCount(); } @Nullable public CharSequence getPageTitle(int position) { - return getString(R.string.marker_title, position + 1, getItemCount()); + cursor.moveToPosition(position); + return getString(R.string.marker_detail_title, position + 1, getItemCount(), cursor.getString(cursor.getColumnIndexOrThrow(MarkerColumns.NAME))); } } } \ No newline at end of file diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java index 130b81e70..885852d7e 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java @@ -34,6 +34,7 @@ import androidx.annotation.NonNull; import androidx.core.view.MenuProvider; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; +import androidx.lifecycle.Lifecycle; import java.time.Duration; @@ -135,7 +136,7 @@ public class MarkerDetailFragment extends Fragment { public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater) { menuInflater.inflate(R.menu.marker_detail, menu); shareMarkerImageMenuItem = menu.findItem(R.id.marker_detail_share); - updateMarker(false); + updateMarker(); updateMenuItems(); } @@ -171,7 +172,7 @@ public class MarkerDetailFragment extends Fragment { return false; } - }, getViewLifecycleOwner()); + }, getViewLifecycleOwner(), Lifecycle.State.RESUMED); return viewBinding.getRoot(); } @@ -182,7 +183,7 @@ public class MarkerDetailFragment extends Fragment { super.onResume(); // Need to update the marker in case returning after an edit - updateMarker(true); + updateMarker(); updateUi(); updateMenuItems(); } @@ -221,17 +222,16 @@ public class MarkerDetailFragment extends Fragment { } private void updateMenuItems() { - if (shareMarkerImageMenuItem != null) - shareMarkerImageMenuItem.setVisible(marker.hasPhoto()); + if (shareMarkerImageMenuItem != null) { // MenuProvider might not yet been initialized. +// shareMarkerImageMenuItem.setEnabled(marker.hasPhoto()); + } } - private void updateMarker(boolean refresh) { - if (refresh || marker == null) { - marker = contentProviderUtils.getMarker(markerId); - if (marker == null) { - Log.d(TAG, "marker is null"); - getParentFragmentManager().popBackStack(); - } + private void updateMarker() { + marker = contentProviderUtils.getMarker(markerId); + if (marker == null) { + Log.d(TAG, "marker is null"); + getParentFragmentManager().popBackStack(); } } @@ -245,9 +245,6 @@ public class MarkerDetailFragment extends Fragment { viewBinding.markerDetailMarkerPhoto.setImageDrawable(MarkerUtils.getDefaultPhoto(getContext())); } - ListItemUtils.setTextView(getActivity(), viewBinding.markerDetailMarkerName, marker.getName(), hasPhoto); - - ListItemUtils.setTextView(getActivity(), viewBinding.markerDetailMarkerCategory, StringUtils.getCategory(marker.getCategory()), hasPhoto); ListItemUtils.setTextView(getActivity(), viewBinding.markerDetailMarkerDescription, marker.getDescription(), hasPhoto); diff --git a/src/main/res/layout/marker_detail_fragment.xml b/src/main/res/layout/marker_detail_fragment.xml index 7cdbc84e3..76cfe0555 100644 --- a/src/main/res/layout/marker_detail_fragment.xml +++ b/src/main/res/layout/marker_detail_fragment.xml @@ -45,14 +45,6 @@ limitations under the License. android:orientation="vertical" android:padding="8dp"> - - حذف العلامة؟ سيتم حذف العلامات التي تم تحديدها نهائيًا من الجهاز مُحدد %1$d - %1$d‏ من‏ %2$d نوع المُحدد (على سبيل المثال شلال) diff --git a/src/main/res/values-b+en+001/strings.xml b/src/main/res/values-b+en+001/strings.xml index 3de3ee9ef..68c509d5d 100644 --- a/src/main/res/values-b+en+001/strings.xml +++ b/src/main/res/values-b+en+001/strings.xml @@ -117,7 +117,6 @@ Delete marker? The selected markers will be permanently deleted from the device Marker %1$d - %1$d of %2$d Marker type (e.g. waterfall) You don\'t have any markers Aggregated stats diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml index 85d1d03bb..f1d66aa8c 100644 --- a/src/main/res/values-b+es+419/strings.xml +++ b/src/main/res/values-b+es+419/strings.xml @@ -117,7 +117,6 @@ ¿Eliminar marcador? Los marcadores seleccionados se eliminarán del dispositivo de forma permanente Marcador %1$d - %1$d de %2$d Tipo de marcador (p. ej., cascada) No tienes ningún marcador Estadíst. globales diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 60dec1b0f..31e6e2938 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Да се изтрие ли маркерът? Избраните маркери ще бъдат окончателно изтрити от устройството Маркер %1$d - %1$d от %2$d Тип маркер (напр. водопад) diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index a3e880300..d6bb8951a 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Voleu suprimir el marcador? Els marcadors seleccionats se suprimiran permanentment del dispositiu Marcador %1$d - %1$d de %2$d Tipus de marcador (p. ex. cascada) diff --git a/src/main/res/values-co/strings.xml b/src/main/res/values-co/strings.xml index 08caa7ad6..7d2207b3b 100644 --- a/src/main/res/values-co/strings.xml +++ b/src/main/res/values-co/strings.xml @@ -147,7 +147,6 @@ Squassà a stantella ? E stantelle selezziunate seranu squassate ab’eternu da l’apparechju Stantella %1$d - %1$d nant’à %2$d Ùn avete nisuna stantella Statistiche aggregate Mudificà diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 3279e48f2..5cbbd6c4c 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -175,7 +175,6 @@ limitations under the License. Smazat značku? Vybrané značky budou trvale smazány ze zařízení Značka %1$d - %1$d z %2$d Typ značky (např. vodopád) diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index 330549431..36d1b0c0e 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -191,7 +191,6 @@ limitations under the License. Slet markøren\? De valgte markører slettes permanent fra enheden Markør %1$d - %1$d af %2$d Markørtype (f.eks. vandfald) diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index be88b2104..dd6e065ad 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -193,7 +193,6 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka Markierung löschen? Die ausgewählten Markierungen werden endgültig vom Gerät gelöscht %1$d. Markierung - %1$d von %2$d Art der Markierung, z. B. Wasserfall diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 65a2ae584..0e94a0cfe 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Διαγραφή δείκτη; Οι επιλεγμένοι δείκτες θα διαγραφούν οριστικά από τη συσκευή Σήμανση %1$d - %1$d από %2$d Τύπος σήμανσης (π.χ. καταρράκτης) diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 075350221..1e9188d27 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -191,7 +191,6 @@ limitations under the License. ¿Eliminar marcador? Los marcadores seleccionados se eliminarán del dispositivo de forma permanente Marcador %1$d - %1$d de %2$d Tipo de marcador (p. ej., cascada) diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml index 96a760dde..3e29b6133 100644 --- a/src/main/res/values-et/strings.xml +++ b/src/main/res/values-et/strings.xml @@ -191,7 +191,6 @@ limitations under the License. Kas kustutada märgis\? Valitud märgis kustutatakse seadmest jäädavalt Märgis %1$d - %1$d/%2$d Märgise tüüp (nt juga) diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 63b5dee85..c8360ebd9 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -193,7 +193,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O Markatzailea ezabatu nahi duzu? Hautatutako markatzaileak behin betiko ezabatuko dira gailutik %1$d markatzailea - %1$d/%2$d Markatzaile mota (adibidez, ur-jauzia) diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index c25bc9f9e..d8ea240a7 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -141,7 +141,6 @@ limitations under the License. نشانگر حذف شود؟ نشانگرهای انتخاب شده برای همیشه از دستگاه حذف خواهد شد نشانگر %1$d - %1$d از %2$d نوع نشانگر (برای مثال آبشار) diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index e334f7a8d..05a6fb770 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -194,7 +194,6 @@ limitations under the License. Poistetaanko merkki? Valitut merkit poistetaan laitteesta pysyvästi Merkki %1$d - %1$d/%2$d Merkin tyyppi (esim. vesiputous) diff --git a/src/main/res/values-fr-rCA/strings.xml b/src/main/res/values-fr-rCA/strings.xml index 8c1abefb9..a5fdf294b 100644 --- a/src/main/res/values-fr-rCA/strings.xml +++ b/src/main/res/values-fr-rCA/strings.xml @@ -117,7 +117,6 @@ Supprimer le repère? Les repères sélectionnés seront définitivement supprimés de l\'appareil Repère %1$d - %1$d sur %2$d Type de repère (p. ex. : cascade) Vous n\'avez aucun repère Statistiques cumulées diff --git a/src/main/res/values-fr-rCH/strings.xml b/src/main/res/values-fr-rCH/strings.xml index e60f5d643..d18967161 100644 --- a/src/main/res/values-fr-rCH/strings.xml +++ b/src/main/res/values-fr-rCH/strings.xml @@ -117,7 +117,6 @@ Supprimer le repère ? Les repères sélectionnés vont être définitivement supprimés de l\'appareil. Repère %1$d - %1$d sur %2$d Type de repère (exemple : cascade) Vous n\'avez aucun repère. Statistiques cumulées diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index abec65e8f..f283ce4b9 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -193,7 +193,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio Supprimer le repère ? Les repères sélectionnés vont être définitivement supprimés de l\'appareil Repère %1$d - %1$d sur %2$d Type de repère (exemple : cascade) diff --git a/src/main/res/values-ga/strings.xml b/src/main/res/values-ga/strings.xml index 8a4f03cb2..945c438d5 100644 --- a/src/main/res/values-ga/strings.xml +++ b/src/main/res/values-ga/strings.xml @@ -163,7 +163,6 @@ Scrios an marcóir\? Scriosfar na marcóirí roghnaithe go buan ón bhfeiste Marcóir %1$d - %1$d de %2$d Cineál marcóra (m.sh. eas) Staitisticí comhiomlána Scrios diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 11b043f05..8f554098f 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -181,7 +181,6 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele Eliminar o marcador? Os marcadores seleccionados eliminaranse permanentemente do dispositivo Marcador %1$d - %1$d de %2$d Tipo de marcador (por exemplo, fervenza) diff --git a/src/main/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml index b65f5f5be..3d28a4b4e 100644 --- a/src/main/res/values-hi/strings.xml +++ b/src/main/res/values-hi/strings.xml @@ -141,7 +141,6 @@ limitations under the License. मार्कर हटाएं? चयनित मार्कर उपकरण से स्थायी रूप से हटा दिए जाएंगे मार्कर %1$d - %2$d में से %1$d मार्कर प्रकार (उदा., झरना) diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml index e82593d84..7c94ba376 100644 --- a/src/main/res/values-hr/strings.xml +++ b/src/main/res/values-hr/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Želite li izbrisati oznaku? Odabrane oznake trajno će se izbrisati s uređaja Oznaka %1$d - %1$d od %2$d Vrsta oznake (npr. vodopad) diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index c4593b75d..d50147e6c 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Törli a jelölőt? A kiválasztott jelölők véglegesen törlődnek az eszközről %1$d. jelölő - %1$d/%2$d Jelölő típusa (pl. vízesés) diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml index 78e63c440..1233cb273 100644 --- a/src/main/res/values-in/strings.xml +++ b/src/main/res/values-in/strings.xml @@ -117,7 +117,6 @@ Hapus penanda? Penanda yang dipilih akan dihapus secara permanen dari perangkat Penanda %1$d - %1$d dari %2$d Jenis penanda (misal: air terjun) Anda tidak memiliki penanda Statistik agregat diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index b42eb299c..e6dbf902c 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -179,7 +179,6 @@ Infatti, un\'applicazione deve supportare ACTION_VIEW con MIME applica Eliminare indicatore? Gli indicatori selezionati verranno eliminati definitivamente dal dispositivo Indicatore %1$d - %1$d di %2$d Tipo di indicatore (ad es. cascata) diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 5acaa70b2..c38fb7df8 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -117,7 +117,6 @@ למחוק את הסמן? הסמנים שנבחרו יימחקו לצמיתות מהמכשיר סמן %1$d - %1$d מתוך %2$d משימות סוג סמן (כגון מפל) אין לך סמנים סטטיסטיקה מצטברת diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index dcfba7712..5e07f880f 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -141,7 +141,6 @@ limitations under the License. マーカーを削除しますか? 選択したマーカーが端末から完全に削除されます マーカー%1$d - %1$d/%2$d マーカーの種類(例: 滝) diff --git a/src/main/res/values-kn/strings.xml b/src/main/res/values-kn/strings.xml index c2af96214..0af62b881 100644 --- a/src/main/res/values-kn/strings.xml +++ b/src/main/res/values-kn/strings.xml @@ -205,7 +205,6 @@ ಮಾರ್ಕರ್ ಅಳಿಸುವುದೇ? ಆಯ್ಕೆಮಾಡಿದ ಗುರುತುಗಳನ್ನು ಸಾಧನದಿಂದ ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ ಮಾರ್ಕರ್ %1$d - %2$d ರಲ್ಲಿ %1$d ಮಾರ್ಕರ್ ಪ್ರಕಾರ (ಉದಾ. ಜಲಪಾತ) ನೀವು ಯಾವುದೇ ಮಾರ್ಕರ್‌ಗಳನ್ನು ಹೊಂದಿಲ್ಲ ಒಟ್ಟು ಅಂಕಿಅಂಶಗಳು diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 3f0a3e6b1..165f0bec5 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -141,7 +141,6 @@ limitations under the License. 마커를 삭제하시겠습니까? 선택한 마커가 기기에서 영구적으로 삭제됩니다. 아이콘 %1$d - %2$d개 중 %1$d개 아이콘 유형(예: 폭포) diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml index bada70a4d..fc0a30109 100644 --- a/src/main/res/values-lt/strings.xml +++ b/src/main/res/values-lt/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Ištrinti žymeklį? Pasirinkti žymekliai bus visam laikui ištrinti iš įrenginio Žymeklis %1$d - %1$d iš %2$d Žymeklio tipas (pvz., krioklys) diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml index db52cc364..98d7ff8de 100644 --- a/src/main/res/values-lv/strings.xml +++ b/src/main/res/values-lv/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Vai dzēst atzīmi? Atlasītās atzīmes tiks neatgriezeniski dzēstas no ierīces Marķieris %1$d - %1$d no %2$d atzīmes(-ēm) Marķiera veids (piemēram, ūdenskritums) diff --git a/src/main/res/values-mo/strings.xml b/src/main/res/values-mo/strings.xml index 61d73c1e5..904f48050 100644 --- a/src/main/res/values-mo/strings.xml +++ b/src/main/res/values-mo/strings.xml @@ -117,7 +117,6 @@ Ștergeți marcatorul? Marcatorii selectați vor fi șterși definitiv de pe dispozitiv Marcator %1$d - %1$d din %2$d Tip de marcator (de exemplu: cascadă) Nu aveți niciun marcator Statistici cumulate diff --git a/src/main/res/values-ms/strings.xml b/src/main/res/values-ms/strings.xml index efcc3b61c..995e121f1 100644 --- a/src/main/res/values-ms/strings.xml +++ b/src/main/res/values-ms/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Padamkan penanda? Penanda yang dipilih akan dipadamkan terus dari peranti Penanda %1$d - %1$d daripada %2$d Jenis penanda (mis. air terjun) diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index 0933e2287..5caccebd7 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Slett markøren\? De valgte markørene blir slettet fra enheten for godt Markør %1$d - %1$d av %2$d Markørtype (f.eks. foss) diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index fb7898608..b2d40f9e7 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -177,7 +177,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid Markering verwijderen? De geselecteerde markeringen worden definitief verwijderd van het apparaat Markering %1$d - %1$d van %2$d Type markering (bijv. waterval) diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 18af506ae..9611a3567 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -151,7 +151,6 @@ limitations under the License. Usunąć znacznik? Wybrane znaczniki zostaną trwale usunięte z tego urządzenia Znacznik %1$d - %1$d z %2$d Typ znacznika (np. wodospad) diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 42baf17b1..53e412d8c 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -117,7 +117,6 @@ Excluir marcador? Os marcadores selecionados serão permanentemente excluídos do dispositivo Marcador %1$d - %1$d de %2$d Tipo de marcador (por exemplo, cascata) Você não tem marcadores Estatísticas reunidas diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml index 279ba5d9f..54da27108 100644 --- a/src/main/res/values-pt-rPT/strings.xml +++ b/src/main/res/values-pt-rPT/strings.xml @@ -117,7 +117,6 @@ Excluir marcador\? Os marcadores selecionados serão permanentemente excluídos do dispositivo Marcador %1$d - %1$d de %2$d Tipo de marcador (por exemplo, cascata) Você não tem marcadores Estatísticas reunidas diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 45e38a8bd..d432c0f63 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Excluir marcador? Os marcadores selecionados serão permanentemente excluídos do dispositivo Marcador %1$d - %1$d de %2$d Tipo de marcador (por exemplo, cascata) diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml index ed3508531..f17672143 100644 --- a/src/main/res/values-ro/strings.xml +++ b/src/main/res/values-ro/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Ștergeți marcatorul? Marcatorii selectați vor fi șterși definitiv de pe dispozitiv Marcator %1$d - %1$d din %2$d Tip de marcator (de exemplu: cascadă) diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 98ea33037..5c0c98b4e 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Удалить маркер? Выбранные маркеры будут удалены с устройства без возможности восстановления Маркер %1$d - %1$d из %2$d Тип маркера (например, водопад) diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index f8d39e606..567d06fcb 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Odstrániť značku? Vybraté značky sa zo zariadenia natrvalo odstránia Značka %1$d - %1$d z %2$d Typ značky (napr. vodopád…) diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml index 5d77bc2c3..8023443f5 100644 --- a/src/main/res/values-sl/strings.xml +++ b/src/main/res/values-sl/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Izbriši oznako? Izbrane oznake bodo trajno izbrisane iz naprave Oznaka %1$d - %1$d od %2$d Vrsta oznake (npr. slap) diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 76719753b..b84bb18ae 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Желите да избришете означивач? Изабрани означивачи ће бити трајно избрисани са уређаја Означивач %1$d - %1$d. од %2$d Тип означивача (нпр. водопад) diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 470a97d87..50e14c63e 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Ta bort markör? Markerade markörer tas bort permanent från enheten Markör %1$d - %1$d av %2$d Markörtyp (t.ex. vattenfall) diff --git a/src/main/res/values-ta/strings.xml b/src/main/res/values-ta/strings.xml index 4bdf2bd23..931e14255 100644 --- a/src/main/res/values-ta/strings.xml +++ b/src/main/res/values-ta/strings.xml @@ -3,7 +3,6 @@ மணித்துளி உயரம்: %1$d மீ ( %2$d அடி) மேலெழுதும் %1$s: %2$s - %1$d %2$d மார்க்கர் வகை (எ.கா. நீர்வீழ்ச்சி) ஓபன்ட்ராக்சுக்கு சி.பி.எச் பயன்படுத்த இசைவு தேவை. தூரம் மூலம் diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml index 33977d106..eb5faaa03 100644 --- a/src/main/res/values-th/strings.xml +++ b/src/main/res/values-th/strings.xml @@ -141,7 +141,6 @@ limitations under the License. ลบเครื่องหมายไหม เครื่องหมายที่เลือกจะถูกลบออกจากอุปกรณ์อย่างถาวร เครื่องหมาย %1$d - %1$d จาก %2$d ประเภทเครื่องหมาย (เช่น น้ำตก) diff --git a/src/main/res/values-tl/strings.xml b/src/main/res/values-tl/strings.xml index 9408585df..e627ce5c4 100644 --- a/src/main/res/values-tl/strings.xml +++ b/src/main/res/values-tl/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Tanggalin ang marker? Permanenteng tatanggalin ang mga piling marker mula sa device Marker %1$d - %1$d ng %2$d Uri ng marker (hal.talon) diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 7126883e7..53eba2283 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -141,7 +141,6 @@ limitations under the License. İşaretçi silinsin mi? Seçilen işaretçiler cihazdan kalıcı olarak silinecek İşaretçi %1$d - %1$d/%2$d İşaretçi türü (ör. şelale) diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index fb680e7f9..8efc479c1 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Видалити маркер? Вибрані маркери буде назавжди видалено з пам’яті пристрою Маркер %1$d - %1$d із %2$d Тип маркера (наприклад, водоспад) diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 38e0a1166..33c4f5afb 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -141,7 +141,6 @@ limitations under the License. Xóa điểm đánh dấu? Điểm đánh dấu đã chọn sẽ bị xóa vĩnh viễn khỏi thiết bị Điểm đánh dấu %1$d - %1$d / %2$d Loại điểm đánh dấu (ví dụ: thác nước) diff --git a/src/main/res/values-zh-rHK/strings.xml b/src/main/res/values-zh-rHK/strings.xml index c4c81c91c..b936afbfa 100644 --- a/src/main/res/values-zh-rHK/strings.xml +++ b/src/main/res/values-zh-rHK/strings.xml @@ -117,7 +117,6 @@ 確定要刪除標記? 系統將永久刪除裝置上您所選取的這些標記 標記 %1$d - %1$d 個位置 (共 %2$d 個) 標記類型 (例如瀑布) 您沒有任何標記 彙總的統計資料 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 718dc0cec..859f1ef27 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -252,7 +252,6 @@ limitations under the License. 確定要刪除標記? 系統將永久刪除裝置上您所選取的這些標記 標記 %1$d - %1$d 個位置 (共 %2$d 個) 標記類型 (例如瀑布) diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml index e78dcc28e..1c4fc92de 100644 --- a/src/main/res/values-zh/strings.xml +++ b/src/main/res/values-zh/strings.xml @@ -141,7 +141,6 @@ limitations under the License. 删除标记? 所选标记将永久地从设备中删除 标记 %1$d - 第%1$d个(共%2$d个) 标记类型(如瀑布) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 600f4fe96..277302fd8 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -267,7 +267,7 @@ limitations under the License. Delete marker? The selected markers will be permanently deleted from the device Marker %1$d - %1$d of %2$d + %1$d of %2$d: %3$s Marker type (e.g. waterfall)