MarkerDetail page shows name in title.

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<Marker.Id> 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)));
         }
     }
 }

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);

src/main/res/layout/marker_detail_fragment.xml

@@ -45,14 +45,6 @@ limitations under the License.
             android:orientation="vertical"
             android:padding="8dp">
 
-            <TextView
-                android:id="@+id/marker_detail_marker_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="?attr/textAppearanceBody1"
-                android:paddingTop="8dp"
-                tools:text="Marker Name" />
-
             <TextView
                 android:id="@+id/marker_detail_marker_category"
                 android:layout_width="wrap_content"

src/main/res/values-ar/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">حذف العلامة؟</string>
     <string name="marker_delete_multiple_confirm_message">سيتم حذف العلامات التي تم تحديدها نهائيًا من الجهاز</string>
     <string name="marker_name_format">مُحدد %1$d</string>
-    <string name="marker_title">%1$d‏ من‏ %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">نوع المُحدد (على سبيل المثال شلال)</string>

src/main/res/values-b+en+001/strings.xml

@@ -117,7 +117,6 @@
     <string name="marker_delete_one_confirm_title">Delete marker?</string>
     <string name="marker_delete_multiple_confirm_message">The selected markers will be permanently deleted from the device</string>
     <string name="marker_name_format">Marker %1$d</string>
-    <string name="marker_title">%1$d of %2$d</string>
     <string name="marker_edit_marker_type">Marker type (e.g. waterfall)</string>
     <string name="marker_list_empty_message">You don\'t have any markers</string>
     <string name="menu_aggregated_statistics">Aggregated stats</string>

src/main/res/values-b+es+419/strings.xml

@@ -117,7 +117,6 @@
     <string name="marker_delete_one_confirm_title">¿Eliminar marcador?</string>
     <string name="marker_delete_multiple_confirm_message">Los marcadores seleccionados se eliminarán del dispositivo de forma permanente</string>
     <string name="marker_name_format">Marcador %1$d</string>
-    <string name="marker_title">%1$d de %2$d</string>
     <string name="marker_edit_marker_type">Tipo de marcador (p. ej., cascada)</string>
     <string name="marker_list_empty_message">No tienes ningún marcador</string>
     <string name="menu_aggregated_statistics">Estadíst. globales</string>

src/main/res/values-bg/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Да се изтрие ли маркерът?</string>
     <string name="marker_delete_multiple_confirm_message">Избраните маркери ще бъдат окончателно изтрити от устройството</string>
     <string name="marker_name_format">Маркер %1$d</string>
-    <string name="marker_title">%1$d от %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Тип маркер (напр. водопад)</string>

src/main/res/values-ca/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Voleu suprimir el marcador?</string>
     <string name="marker_delete_multiple_confirm_message">Els marcadors seleccionats se suprimiran permanentment del dispositiu</string>
     <string name="marker_name_format">Marcador %1$d</string>
-    <string name="marker_title">%1$d de %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Tipus de marcador (p. ex. cascada)</string>

src/main/res/values-co/strings.xml

@@ -147,7 +147,6 @@
     <string name="marker_delete_one_confirm_title">Squassà a stantella ?</string>
     <string name="marker_delete_multiple_confirm_message">E stantelle selezziunate seranu squassate ab’eternu da l’apparechju</string>
     <string name="marker_name_format">Stantella %1$d</string>
-    <string name="marker_title">%1$d nant’à %2$d</string>
     <string name="marker_list_empty_message">Ùn avete nisuna stantella</string>
     <string name="menu_aggregated_statistics">Statistiche aggregate</string>
     <string name="menu_edit">Mudificà</string>

src/main/res/values-cs/strings.xml

@@ -175,7 +175,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Smazat značku?</string>
     <string name="marker_delete_multiple_confirm_message">Vybrané značky budou trvale smazány ze zařízení</string>
     <string name="marker_name_format">Značka %1$d</string>
-    <string name="marker_title">%1$d z %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Typ značky (např. vodopád)</string>

src/main/res/values-da/strings.xml

@@ -191,7 +191,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Slet markøren\?</string>
     <string name="marker_delete_multiple_confirm_message">De valgte markører slettes permanent fra enheden</string>
     <string name="marker_name_format">Markør %1$d</string>
-    <string name="marker_title">%1$d af %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Markørtype (f.eks. vandfald)</string>

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
     <string name="marker_delete_one_confirm_title">Markierung löschen?</string>
     <string name="marker_delete_multiple_confirm_message">Die ausgewählten Markierungen werden endgültig vom Gerät gelöscht</string>
     <string name="marker_name_format">%1$d. Markierung</string>
-    <string name="marker_title">%1$d von %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Art der Markierung, z. B. Wasserfall</string>

src/main/res/values-el/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Διαγραφή δείκτη;</string>
     <string name="marker_delete_multiple_confirm_message">Οι επιλεγμένοι δείκτες θα διαγραφούν οριστικά από τη συσκευή</string>
     <string name="marker_name_format">Σήμανση %1$d</string>
-    <string name="marker_title">%1$d από %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Τύπος σήμανσης (π.χ. καταρράκτης)</string>

src/main/res/values-es/strings.xml

@@ -191,7 +191,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">¿Eliminar marcador?</string>
     <string name="marker_delete_multiple_confirm_message">Los marcadores seleccionados se eliminarán del dispositivo de forma permanente</string>
     <string name="marker_name_format">Marcador %1$d</string>
-    <string name="marker_title">%1$d de %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Tipo de marcador (p. ej., cascada)</string>

src/main/res/values-et/strings.xml

@@ -191,7 +191,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Kas kustutada märgis\?</string>
     <string name="marker_delete_multiple_confirm_message">Valitud märgis kustutatakse seadmest jäädavalt</string>
     <string name="marker_name_format">Märgis %1$d</string>
-    <string name="marker_title">%1$d/%2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Märgise tüüp (nt juga)</string>

src/main/res/values-eu/strings.xml

@@ -193,7 +193,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O
     <string name="marker_delete_one_confirm_title">Markatzailea ezabatu nahi duzu?</string>
     <string name="marker_delete_multiple_confirm_message">Hautatutako markatzaileak behin betiko ezabatuko dira gailutik</string>
     <string name="marker_name_format">%1$d markatzailea</string>
-    <string name="marker_title">%1$d/%2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Markatzaile mota (adibidez, ur-jauzia)</string>

src/main/res/values-fa/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">نشانگر حذف شود؟</string>
     <string name="marker_delete_multiple_confirm_message">نشانگرهای انتخاب شده برای همیشه از دستگاه حذف خواهد شد</string>
     <string name="marker_name_format">نشانگر %1$d</string>
-    <string name="marker_title">%1$d از %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">نوع نشانگر (برای مثال آبشار)</string>

src/main/res/values-fi/strings.xml

@@ -194,7 +194,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Poistetaanko merkki?</string>
     <string name="marker_delete_multiple_confirm_message">Valitut merkit poistetaan laitteesta pysyvästi</string>
     <string name="marker_name_format">Merkki %1$d</string>
-    <string name="marker_title">%1$d/%2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Merkin tyyppi (esim. vesiputous)</string>

src/main/res/values-fr-rCA/strings.xml

@@ -117,7 +117,6 @@
     <string name="marker_delete_one_confirm_title">Supprimer le repère?</string>
     <string name="marker_delete_multiple_confirm_message">Les repères sélectionnés seront définitivement supprimés de l\'appareil</string>
     <string name="marker_name_format">Repère %1$d</string>
-    <string name="marker_title">%1$d sur %2$d</string>
     <string name="marker_edit_marker_type">Type de repère (p. ex. : cascade)</string>
     <string name="marker_list_empty_message">Vous n\'avez aucun repère</string>
     <string name="menu_aggregated_statistics">Statistiques cumulées</string>

src/main/res/values-fr-rCH/strings.xml

@@ -117,7 +117,6 @@
     <string name="marker_delete_one_confirm_title">Supprimer le repère ?</string>
     <string name="marker_delete_multiple_confirm_message">Les repères sélectionnés vont être définitivement supprimés de l\'appareil.</string>
     <string name="marker_name_format">Repère %1$d</string>
-    <string name="marker_title">%1$d sur %2$d</string>
     <string name="marker_edit_marker_type">Type de repère (exemple : cascade)</string>
     <string name="marker_list_empty_message">Vous n\'avez aucun repère.</string>
     <string name="menu_aggregated_statistics">Statistiques cumulées</string>

src/main/res/values-fr/strings.xml

@@ -193,7 +193,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="marker_delete_one_confirm_title">Supprimer le repère ?</string>
     <string name="marker_delete_multiple_confirm_message">Les repères sélectionnés vont être définitivement supprimés de l\'appareil</string>
     <string name="marker_name_format">Repère %1$d</string>
-    <string name="marker_title">%1$d sur %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Type de repère (exemple : cascade)</string>

src/main/res/values-ga/strings.xml

@@ -163,7 +163,6 @@
     <string name="marker_delete_one_confirm_title">Scrios an marcóir\?</string>
     <string name="marker_delete_multiple_confirm_message">Scriosfar na marcóirí roghnaithe go buan ón bhfeiste</string>
     <string name="marker_name_format">Marcóir %1$d</string>
-    <string name="marker_title">%1$d de %2$d</string>
     <string name="marker_edit_marker_type">Cineál marcóra (m.sh. eas)</string>
     <string name="menu_aggregated_statistics">Staitisticí comhiomlána</string>
     <string name="menu_delete">Scrios</string>

src/main/res/values-gl/strings.xml

@@ -181,7 +181,6 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele
     <string name="marker_delete_one_confirm_title">Eliminar o marcador?</string>
     <string name="marker_delete_multiple_confirm_message">Os marcadores seleccionados eliminaranse permanentemente do dispositivo</string>
     <string name="marker_name_format">Marcador %1$d</string>
-    <string name="marker_title">%1$d de %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Tipo de marcador (por exemplo, fervenza)</string>

src/main/res/values-hi/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">मार्कर हटाएं?</string>
     <string name="marker_delete_multiple_confirm_message">चयनित मार्कर उपकरण से स्थायी रूप से हटा दिए जाएंगे</string>
     <string name="marker_name_format">मार्कर %1$d</string>
-    <string name="marker_title">%2$d में से %1$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">मार्कर प्रकार (उदा., झरना)</string>

src/main/res/values-hr/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Želite li izbrisati oznaku?</string>
     <string name="marker_delete_multiple_confirm_message">Odabrane oznake trajno će se izbrisati s uređaja</string>
     <string name="marker_name_format">Oznaka %1$d</string>
-    <string name="marker_title">%1$d od %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Vrsta oznake (npr. vodopad)</string>

src/main/res/values-hu/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Törli a jelölőt?</string>
     <string name="marker_delete_multiple_confirm_message">A kiválasztott jelölők véglegesen törlődnek az eszközről</string>
     <string name="marker_name_format">%1$d. jelölő</string>
-    <string name="marker_title">%1$d/%2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Jelölő típusa (pl. vízesés)</string>

src/main/res/values-in/strings.xml

@@ -117,7 +117,6 @@
     <string name="marker_delete_one_confirm_title">Hapus penanda?</string>
     <string name="marker_delete_multiple_confirm_message">Penanda yang dipilih akan dihapus secara permanen dari perangkat</string>
     <string name="marker_name_format">Penanda %1$d</string>
-    <string name="marker_title">%1$d dari %2$d</string>
     <string name="marker_edit_marker_type">Jenis penanda (misal: air terjun)</string>
     <string name="marker_list_empty_message">Anda tidak memiliki penanda</string>
     <string name="menu_aggregated_statistics">Statistik agregat</string>

src/main/res/values-it/strings.xml

@@ -179,7 +179,6 @@ Infatti, un\'applicazione deve supportare <i>ACTION_VIEW</i> con MIME <i>applica
     <string name="marker_delete_one_confirm_title">Eliminare indicatore?</string>
     <string name="marker_delete_multiple_confirm_message">Gli indicatori selezionati verranno eliminati definitivamente dal dispositivo</string>
     <string name="marker_name_format">Indicatore %1$d</string>
-    <string name="marker_title">%1$d di %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Tipo di indicatore (ad es. cascata)</string>

src/main/res/values-iw/strings.xml

@@ -117,7 +117,6 @@
     <string name="marker_delete_one_confirm_title">למחוק את הסמן?</string>
     <string name="marker_delete_multiple_confirm_message">הסמנים שנבחרו יימחקו לצמיתות מהמכשיר</string>
     <string name="marker_name_format">סמן %1$d</string>
-    <string name="marker_title">%1$d מתוך %2$d משימות</string>
     <string name="marker_edit_marker_type">סוג סמן (כגון מפל)</string>
     <string name="marker_list_empty_message">אין לך סמנים</string>
     <string name="menu_aggregated_statistics">סטטיסטיקה מצטברת</string>

src/main/res/values-ja/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">マーカーを削除しますか？</string>
     <string name="marker_delete_multiple_confirm_message">選択したマーカーが端末から完全に削除されます</string>
     <string name="marker_name_format">マーカー%1$d</string>
-    <string name="marker_title">%1$d/%2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">マーカーの種類（例: 滝）</string>

src/main/res/values-kn/strings.xml

@@ -205,7 +205,6 @@
     <string name="marker_delete_one_confirm_title">ಮಾರ್ಕರ್ ಅಳಿಸುವುದೇ?</string>
     <string name="marker_delete_multiple_confirm_message">ಆಯ್ಕೆಮಾಡಿದ ಗುರುತುಗಳನ್ನು ಸಾಧನದಿಂದ ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ</string>
     <string name="marker_name_format">ಮಾರ್ಕರ್ %1$d</string>
-    <string name="marker_title">%2$d ರಲ್ಲಿ %1$d</string>
     <string name="marker_edit_marker_type">ಮಾರ್ಕರ್ ಪ್ರಕಾರ (ಉದಾ. ಜಲಪಾತ)</string>
     <string name="marker_list_empty_message">ನೀವು ಯಾವುದೇ ಮಾರ್ಕರ್‌ಗಳನ್ನು ಹೊಂದಿಲ್ಲ</string>
     <string name="menu_aggregated_statistics">ಒಟ್ಟು ಅಂಕಿಅಂಶಗಳು</string>

src/main/res/values-ko/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">마커를 삭제하시겠습니까?</string>
     <string name="marker_delete_multiple_confirm_message">선택한 마커가 기기에서 영구적으로 삭제됩니다.</string>
     <string name="marker_name_format">아이콘 %1$d</string>
-    <string name="marker_title">%2$d개 중 %1$d개</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">아이콘 유형(예: 폭포)</string>

src/main/res/values-lt/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Ištrinti žymeklį?</string>
     <string name="marker_delete_multiple_confirm_message">Pasirinkti žymekliai bus visam laikui ištrinti iš įrenginio</string>
     <string name="marker_name_format">Žymeklis %1$d</string>
-    <string name="marker_title">%1$d iš %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Žymeklio tipas (pvz., krioklys)</string>

src/main/res/values-lv/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Vai dzēst atzīmi?</string>
     <string name="marker_delete_multiple_confirm_message">Atlasītās atzīmes tiks neatgriezeniski dzēstas no ierīces</string>
     <string name="marker_name_format">Marķieris %1$d</string>
-    <string name="marker_title">%1$d no %2$d atzīmes(-ēm)</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Marķiera veids (piemēram, ūdenskritums)</string>

src/main/res/values-mo/strings.xml

@@ -117,7 +117,6 @@
     <string name="marker_delete_one_confirm_title">Ștergeți marcatorul?</string>
     <string name="marker_delete_multiple_confirm_message">Marcatorii selectați vor fi șterși definitiv de pe dispozitiv</string>
     <string name="marker_name_format">Marcator %1$d</string>
-    <string name="marker_title">%1$d din %2$d</string>
     <string name="marker_edit_marker_type">Tip de marcator (de exemplu: cascadă)</string>
     <string name="marker_list_empty_message">Nu aveți niciun marcator</string>
     <string name="menu_aggregated_statistics">Statistici cumulate</string>

src/main/res/values-ms/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Padamkan penanda?</string>
     <string name="marker_delete_multiple_confirm_message">Penanda yang dipilih akan dipadamkan terus dari peranti</string>
     <string name="marker_name_format">Penanda %1$d</string>
-    <string name="marker_title">%1$d daripada %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Jenis penanda (mis. air terjun)</string>

src/main/res/values-nb/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Slett markøren\?</string>
     <string name="marker_delete_multiple_confirm_message">De valgte markørene blir slettet fra enheten for godt</string>
     <string name="marker_name_format">Markør %1$d</string>
-    <string name="marker_title">%1$d av %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Markørtype (f.eks. foss)</string>

src/main/res/values-nl/strings.xml

@@ -177,7 +177,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="marker_delete_one_confirm_title">Markering verwijderen?</string>
     <string name="marker_delete_multiple_confirm_message">De geselecteerde markeringen worden definitief verwijderd van het apparaat</string>
     <string name="marker_name_format">Markering %1$d</string>
-    <string name="marker_title">%1$d van %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Type markering (bijv. waterval)</string>

src/main/res/values-pl/strings.xml

@@ -151,7 +151,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Usunąć znacznik?</string>
     <string name="marker_delete_multiple_confirm_message">Wybrane znaczniki zostaną trwale usunięte z tego urządzenia</string>
     <string name="marker_name_format">Znacznik %1$d</string>
-    <string name="marker_title">%1$d z %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Typ znacznika (np. wodospad)</string>

src/main/res/values-pt-rBR/strings.xml

@@ -117,7 +117,6 @@
     <string name="marker_delete_one_confirm_title">Excluir marcador?</string>
     <string name="marker_delete_multiple_confirm_message">Os marcadores selecionados serão permanentemente excluídos do dispositivo</string>
     <string name="marker_name_format">Marcador %1$d</string>
-    <string name="marker_title">%1$d de %2$d</string>
     <string name="marker_edit_marker_type">Tipo de marcador (por exemplo, cascata)</string>
     <string name="marker_list_empty_message">Você não tem marcadores</string>
     <string name="menu_aggregated_statistics">Estatísticas reunidas</string>

src/main/res/values-pt-rPT/strings.xml

@@ -117,7 +117,6 @@
     <string name="marker_delete_one_confirm_title">Excluir marcador\?</string>
     <string name="marker_delete_multiple_confirm_message">Os marcadores selecionados serão permanentemente excluídos do dispositivo</string>
     <string name="marker_name_format">Marcador %1$d</string>
-    <string name="marker_title">%1$d de %2$d</string>
     <string name="marker_edit_marker_type">Tipo de marcador (por exemplo, cascata)</string>
     <string name="marker_list_empty_message">Você não tem marcadores</string>
     <string name="menu_aggregated_statistics">Estatísticas reunidas</string>

src/main/res/values-pt/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Excluir marcador?</string>
     <string name="marker_delete_multiple_confirm_message">Os marcadores selecionados serão permanentemente excluídos do dispositivo</string>
     <string name="marker_name_format">Marcador %1$d</string>
-    <string name="marker_title">%1$d de %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Tipo de marcador (por exemplo, cascata)</string>

src/main/res/values-ro/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Ștergeți marcatorul?</string>
     <string name="marker_delete_multiple_confirm_message">Marcatorii selectați vor fi șterși definitiv de pe dispozitiv</string>
     <string name="marker_name_format">Marcator %1$d</string>
-    <string name="marker_title">%1$d din %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Tip de marcator (de exemplu: cascadă)</string>

src/main/res/values-ru/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Удалить маркер?</string>
     <string name="marker_delete_multiple_confirm_message">Выбранные маркеры будут удалены с устройства без возможности восстановления</string>
     <string name="marker_name_format">Маркер %1$d</string>
-    <string name="marker_title">%1$d из %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Тип маркера (например, водопад)</string>

src/main/res/values-sk/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Odstrániť značku?</string>
     <string name="marker_delete_multiple_confirm_message">Vybraté značky sa zo zariadenia natrvalo odstránia</string>
     <string name="marker_name_format">Značka %1$d</string>
-    <string name="marker_title">%1$d z %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Typ značky (napr. vodopád…)</string>

src/main/res/values-sl/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Izbriši oznako?</string>
     <string name="marker_delete_multiple_confirm_message">Izbrane oznake bodo trajno izbrisane iz naprave</string>
     <string name="marker_name_format">Oznaka %1$d</string>
-    <string name="marker_title">%1$d od %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Vrsta oznake (npr. slap)</string>

src/main/res/values-sr/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Желите да избришете означивач?</string>
     <string name="marker_delete_multiple_confirm_message">Изабрани означивачи ће бити трајно избрисани са уређаја</string>
     <string name="marker_name_format">Означивач %1$d</string>
-    <string name="marker_title">%1$d. од %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Тип означивача (нпр. водопад)</string>

src/main/res/values-sv/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Ta bort markör?</string>
     <string name="marker_delete_multiple_confirm_message">Markerade markörer tas bort permanent från enheten</string>
     <string name="marker_name_format">Markör %1$d</string>
-    <string name="marker_title">%1$d av %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Markörtyp (t.ex. vattenfall)</string>

src/main/res/values-ta/strings.xml

@@ -3,7 +3,6 @@
     <string name="description_min_altitude">மணித்துளி உயரம்: %1$d மீ ( %2$d அடி)</string>
     <string name="generic_overwrite">மேலெழுதும்</string>
     <string name="import_error_info">%1$s: %2$s</string>
-    <string name="marker_title">%1$d %2$d</string>
     <string name="marker_edit_marker_type">மார்க்கர் வகை (எ.கா. நீர்வீழ்ச்சி)</string>
     <string name="permission_gps_failed">ஓபன்ட்ராக்சுக்கு சி.பி.எச் பயன்படுத்த இசைவு தேவை.</string>
     <string name="settings_chart_by_distance">தூரம் மூலம்</string>

src/main/res/values-th/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">ลบเครื่องหมายไหม</string>
     <string name="marker_delete_multiple_confirm_message">เครื่องหมายที่เลือกจะถูกลบออกจากอุปกรณ์อย่างถาวร</string>
     <string name="marker_name_format">เครื่องหมาย %1$d</string>
-    <string name="marker_title">%1$d จาก %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">ประเภทเครื่องหมาย (เช่น น้ำตก)</string>

src/main/res/values-tl/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Tanggalin ang marker?</string>
     <string name="marker_delete_multiple_confirm_message">Permanenteng tatanggalin ang mga piling marker mula sa device</string>
     <string name="marker_name_format">Marker %1$d</string>
-    <string name="marker_title">%1$d ng %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Uri ng marker (hal.talon)</string>

src/main/res/values-tr/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">İşaretçi silinsin mi?</string>
     <string name="marker_delete_multiple_confirm_message">Seçilen işaretçiler cihazdan kalıcı olarak silinecek</string>
     <string name="marker_name_format">İşaretçi %1$d</string>
-    <string name="marker_title">%1$d/%2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">İşaretçi türü (ör. şelale)</string>

src/main/res/values-uk/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Видалити маркер?</string>
     <string name="marker_delete_multiple_confirm_message">Вибрані маркери буде назавжди видалено з пам’яті пристрою</string>
     <string name="marker_name_format">Маркер %1$d</string>
-    <string name="marker_title">%1$d із %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Тип маркера (наприклад, водоспад)</string>

src/main/res/values-vi/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Xóa điểm đánh dấu?</string>
     <string name="marker_delete_multiple_confirm_message">Điểm đánh dấu đã chọn sẽ bị xóa vĩnh viễn khỏi thiết bị</string>
     <string name="marker_name_format">Điểm đánh dấu %1$d</string>
-    <string name="marker_title">%1$d / %2$d</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Loại điểm đánh dấu (ví dụ: thác nước)</string>

src/main/res/values-zh-rHK/strings.xml

@@ -117,7 +117,6 @@
     <string name="marker_delete_one_confirm_title">確定要刪除標記？</string>
     <string name="marker_delete_multiple_confirm_message">系統將永久刪除裝置上您所選取的這些標記</string>
     <string name="marker_name_format">標記 %1$d</string>
-    <string name="marker_title">%1$d 個位置 (共 %2$d 個)</string>
     <string name="marker_edit_marker_type">標記類型 (例如瀑布)</string>
     <string name="marker_list_empty_message">您沒有任何標記</string>
     <string name="menu_aggregated_statistics">彙總的統計資料</string>

src/main/res/values-zh-rTW/strings.xml

@@ -252,7 +252,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">確定要刪除標記？</string>
     <string name="marker_delete_multiple_confirm_message">系統將永久刪除裝置上您所選取的這些標記</string>
     <string name="marker_name_format">標記 %1$d</string>
-    <string name="marker_title">%1$d 個位置 (共 %2$d 個)</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">標記類型 (例如瀑布)</string>

src/main/res/values-zh/strings.xml

@@ -141,7 +141,6 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">删除标记？</string>
     <string name="marker_delete_multiple_confirm_message">所选标记将永久地从设备中删除</string>
     <string name="marker_name_format">标记 %1$d</string>
-    <string name="marker_title">第%1$d个（共%2$d个）</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">标记类型（如瀑布）</string>

src/main/res/values/strings.xml

@@ -267,7 +267,7 @@ limitations under the License.
     <string name="marker_delete_one_confirm_title">Delete marker?</string>
     <string name="marker_delete_multiple_confirm_message">The selected markers will be permanently deleted from the device</string>
     <string name="marker_name_format">Marker %1$d</string>
-    <string name="marker_title">%1$d of %2$d</string>
+    <string name="marker_detail_title">%1$d of %2$d: %3$s</string>
     <!-- Marker Detail -->
     <!-- Marker Edit -->
     <string name="marker_edit_marker_type">Marker type (e.g. waterfall)</string>