Make UI interface for OSM bug edition

OsmAnd/res/menu/localosm_child.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/showpoi" android:title="@string/local_openstreetmap_show_poi"></item>
+    <item android:id="@+id/showmod" android:title="@string/local_openstreetmap_show"></item>
-    <item android:id="@+id/deletepoimod" android:title="@string/local_openstreetmap_delete"></item>
+    <item android:id="@+id/deletemod" android:title="@string/local_openstreetmap_delete"></item>
     
 
 </menu>

OsmAnd/res/menu/localosm_group.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/uploadpoimods" android:title="@string/local_openstreetmap_upload"></item>
+    <item android:id="@+id/uploadmods" android:title="@string/local_openstreetmap_upload"></item>
     
 
 </menu>

OsmAnd/res/values-bs/strings.xml

@@ -161,16 +161,16 @@
 	<string name="tip_recent_changes_0_7_1_t">"Changes in 0.7.1 : \n\t- Offline POI editing \n\t- Live Tracking option - send coordinates to web service periodically (read how to setup your own web service in HowTo Articles) \n\t- Show currently recorded track on map \n\t- Direction detection: \'Make U-turn\' is indicated and announced when heading in opposite direction or after missing a turn \n\t- New voice prompt \'Route recalculated\' \n\t- Optical indication of an imminent turn within 100m by diretion arrow changing color \n\t- Actuality also of deactivated index files now shown on Download screen in dark green and dark blue \n\t- Other changes "</string>
 
 	<string name="update_poi_does_not_change_indexes">POI changes inside application do not affect downloaded map files, changes are saved to local file instead.</string>
-	<string name="local_openstreetmap_uploading_poi">Uploading POI…</string>
+	<string name="local_openstreetmap_uploading">Uploading…</string>
-	<string name="local_openstreetmap_poi_were_uploaded">{0} POI were uploaded</string>
+	<string name="local_openstreetmap_were_uploaded">{0} POI/Bugs were uploaded</string>
 	<string name="local_openstreetmap_uploadall">Upload all POI</string>
 	<string name="local_openstreetmap_items"></string>
-	<string name="local_openstreetmap_show_poi">Show POI on map</string>
+	<string name="local_openstreetmap_show">Show on map</string>
 	<string name="local_openstreetmap_upload">Upload modification to OSM</string>
-	<string name="local_openstreetmap_delete">Delete POI modification</string>
+	<string name="local_openstreetmap_delete">Delete modification</string>
-	<string name="local_openstreetmap_descr_title">Asynchronous OSM POI Editing:</string>
+	<string name="local_openstreetmap_descr_title">Asynchronous OSM Editing:</string>
-	<string name="local_openstreetmap_settings">Locally saved OSM POIs</string>
+	<string name="local_openstreetmap_settings">Locally saved OSM POIs/Bugs</string>
-	<string name="local_openstreetmap_settings_descr">Show and manage OSM POIs noted in local database</string>
+	<string name="local_openstreetmap_settings_descr">Show and manage OSM POIs/Bugs noted in local database</string>
 
 	<string name="live_monitoring_descr">Send tracking to a specified web service</string>
 	<string name="live_monitoring">Online live tracking</string>

OsmAnd/res/values-cs/strings.xml

@@ -77,14 +77,14 @@
   <string name="offline_edition_descr">Vždy používat offline editaci</string>
   <string name="tip_recent_changes_0_7_1_t">"Změny ve verzi 0.7.1 : \n\t- offline editace POI \n\t- přímý přenos pozice - pravidelně posílá souřadnice na webový server (návod jak nastavit vlastní webovou služby je v HowTo článcích) \n\t- Zobrazení momentálně zaznamenávané trasy \n\t- Detekce směru pohybu: indikace a hlášení \'Otočte se zpět\' v případě pohybu směrem od cíle nebo po minutí odbočky \n\t- Obnovené hlasové hlášení \'Přepočítávám cestu\' \n\t- Optická indikace blížící se odbočky během 100m pomocí změny barvy šipky \n\t- Zobrazení aktuálnosti offline dat u deaktivovaných souborů (sekce Download) pomocí tmavě zelené a tmavě modré \n\t- Další změny \n\nSledujte také stránky české podpory osmand.cz "</string>
   <string name="update_poi_does_not_change_indexes">Změny POI bodů v aplikaci nemají vliv na zobrazení stažených map, změny se ukládají do lokálního souboru.</string>
-  <string name="local_openstreetmap_uploading_poi">Odesílám POI…</string>
+  <string name="local_openstreetmap_uploading">Odesílám…</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI bylo odesláno</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs bylo odesláno</string>
-  <string name="local_openstreetmap_uploadall">Odeslat všechny POI</string>
+  <string name="local_openstreetmap_uploadall">Odeslat všechny</string>
   <string name="local_openstreetmap_items">" "</string>
-  <string name="local_openstreetmap_show_poi">Zobrazit POI na mapě</string>
+  <string name="local_openstreetmap_show">Zobrazit na mapě</string>
   <string name="local_openstreetmap_upload">Odeslat změny do OSM</string>
-  <string name="local_openstreetmap_delete">Smazat změny POI</string>
+  <string name="local_openstreetmap_delete">Smazat změny</string>
-  <string name="local_openstreetmap_descr_title">Offline editace POI v Openstreetmap:</string>
+  <string name="local_openstreetmap_descr_title">Offline editace POI/Bugs v Openstreetmap:</string>
   <string name="local_openstreetmap_settings">Lokální body Openstreetmap</string>
   <string name="local_openstreetmap_settings_descr">Lokální body uložené v databázi</string>
   <string name="live_monitoring_descr">Zapnout odesílání pozice na HTTP server v reálném čase</string>

OsmAnd/res/values-de/strings.xml

@@ -117,16 +117,16 @@
 	<string name="offline_edition_descr">Immer Offline-Bearbeitung verwenden</string>
 	<string name="tip_recent_changes_0_7_1_t">"Änderungen in 0.7.1 : \n\t- Offline POI-Bearbeitung \n\t- Live-Tracking Option: Koordinaten periodisch an einen Web-Service schicken (Setup-Anleitung für eigenen Web-Service in den HowTo-Artikeln) \n\t- Anzeige des gegenwärtig aufgezeichneten Tracks möglich \n\t- Richtungsüberprüfung: \'Bitte wenden\' wird jetzt angezeigt und angesagt bei entgegengesetzter Bewegungsrichtung oder bei verpasster Abzweigung \n\t- Neue Ansage \'Strecke neu berechnet\' \n\t- Optische Anzeige eines innerhalb 100m bevorstehenden Abbiegevorgangs durch Farbwechsel des Richtungspfeils \n\t- Die Aktualität auch der deaktivierten Karten wird jetzt im Download-Liste in dunkelgrün und dunkelblau angezeigt \n\t- Weitere Verbesserungen "</string>
 	<string name="update_poi_does_not_change_indexes">Das Bearbeiten von POIs innerhalb der Applikation beeinflusst nicht die Offline-Karten, sondern wird in einer eigenen Datei gespeichert.</string>
-	<string name="local_openstreetmap_uploading_poi">POI hochladen…</string>
+	<string name="local_openstreetmap_uploading">hochladen…</string>
-	<string name="local_openstreetmap_poi_were_uploaded">{0} POI wurden hochgeladen</string>
+	<string name="local_openstreetmap_were_uploaded">{0} POI/Bugs wurden hochgeladen</string>
-	<string name="local_openstreetmap_uploadall">Alle POI hochladen</string>
+	<string name="local_openstreetmap_uploadall">Alle hochladen</string>
 	<string name="local_openstreetmap_items">" "</string>
-	<string name="local_openstreetmap_show_poi">POI auf Karte zeigen</string>
+	<string name="local_openstreetmap_show">Auf Karte zeigen</string>
-	<string name="local_openstreetmap_upload">POI Änderung auf OSM hochladen</string>
+	<string name="local_openstreetmap_upload">Änderung auf OSM hochladen</string>
-	<string name="local_openstreetmap_delete">POI Änderung löschen</string>
+	<string name="local_openstreetmap_delete">Änderung löschen</string>
-	<string name="local_openstreetmap_descr_title">Asynchrone OSM POI Bearbeitung:</string>
+	<string name="local_openstreetmap_descr_title">Asynchrone OSM Bearbeitung:</string>
-	<string name="local_openstreetmap_settings">Lokal notierte OSM Punkte</string>
+	<string name="local_openstreetmap_settings">Lokal notierte OSM Punkte/Bugs</string>
-	<string name="local_openstreetmap_settings_descr">Lokal vorgemerkte OSM Punkte anzeigen und verwalten</string>
+	<string name="local_openstreetmap_settings_descr">Lokal vorgemerkte OSM Punkte/Bugs anzeigen und verwalten</string>
 	<string name="live_monitoring_descr">Senden von HTTP-Daten an einen Web-Service</string>
 	<string name="live_monitoring">Live-Tracking aktivieren</string>
 	<string name="live_monitoring_interval_descr">Angabe des Live-Tracking Invervalls</string>

OsmAnd/res/values-es/strings.xml

@@ -6,16 +6,16 @@
   <string name="offline_edition_descr">Usar siempre edición sin conexión</string>
   <string name="tip_recent_changes_0_7_1_t">Cambios en 0.7.1 : \n\t- Edición de POI sin conexión \n\t- Seguimiento en directo opcional - envía las coordenadas a un servicio web periódicamente (lea cómo configurar su propio servicio web en los artículos HowTo) \n\t- Muestra la traza actual en el mapa \n\t- Detección de la dirección : \'Da la vuelta\' se indica y se anuncia cuando se orienta en la dirección opuesta o después de saltarse un giro \n\t- Nuevo anuncio de voz \'Ruta recalculada\' \n\t- Indicación óptica de un giro inminente en menos de 100m por el cambio de color en la flecha de dirección \n\t- Disponibilidad de versión actual también para ficheros de índice desactivados - se muestra en la pantalla de Descarga en verde oscuro y azul oscuro \n\t- Otros cambios</string>
   <string name="update_poi_does_not_change_indexes">Los cambios a PDIs dentro de la aplicación no afectan a los archivos de mapa descargados; los cambios se guardan en un archivo local.</string>
-  <string name="local_openstreetmap_uploading_poi">Enviando PDIs…</string>
+  <string name="local_openstreetmap_uploading">Enviando…</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} PDIs enviados</string>
+  <string name="local_openstreetmap_were_uploaded">{0} PDIs/Bugs enviados</string>
-  <string name="local_openstreetmap_uploadall">Enviar todos los PDIs</string>
+  <string name="local_openstreetmap_uploadall">Enviar todos</string>
   <string name="local_openstreetmap_items">""</string>
-  <string name="local_openstreetmap_show_poi">Mostrar PDI en el mapa</string>
+  <string name="local_openstreetmap_show">Mostrar en el mapa</string>
   <string name="local_openstreetmap_upload">Enviar modificación a OSM</string>
-  <string name="local_openstreetmap_delete">Suprimir modificación a PDI</string>
+  <string name="local_openstreetmap_delete">Suprimir modificación</string>
-  <string name="local_openstreetmap_descr_title">Edición asíncrona de PDIs de OSM:</string>
+  <string name="local_openstreetmap_descr_title">Edición asíncrona de OSM:</string>
-  <string name="local_openstreetmap_settings">Puntos OSM guardados localmente</string>
+  <string name="local_openstreetmap_settings">Puntos/Bugs OSM guardados localmente</string>
-  <string name="local_openstreetmap_settings_descr">Mostrar y gestionar puntos OSM anotados en base de datos local</string>
+  <string name="local_openstreetmap_settings_descr">Mostrar y gestionar puntos/bugs OSM anotados en base de datos local</string>
   <string name="live_monitoring_descr">Permite el envío de peticiones HTTP a un servicio web especificado</string>
   <string name="live_monitoring">Seguimiento en directo</string>
   <string name="live_monitoring_interval_descr">Especifique el intervalo de Seguimiento en directo</string>

OsmAnd/res/values-eu/strings.xml

@@ -129,16 +129,16 @@
   <string name="offline_edition_descr">Always use offline editing</string>
   <string name="tip_recent_changes_0_7_1_t">"Changes in 0.7.1 : \n\t- Offline POI editing \n\t- Live Tracking option - send coordinates to web service periodically (read how to setup your own web service in HowTo Articles) \n\t- Show currently recorded track on map \n\t- Direction detection: \'Make U-turn\' is indicated and announced when heading in opposite direction or after missing a turn \n\t- New voice prompt \'Route recalculated\' \n\t- Optical indication of an imminent turn within 100m by diretion arrow changing color \n\t- Actuality also of deactivated index files now shown on Download screen in dark green and dark blue \n\t- Other changes "</string>
   <string name="update_poi_does_not_change_indexes">POI changes inside application do not affect downloaded map files, changes are saved to local file instead.</string>
-  <string name="local_openstreetmap_uploading_poi">Uploading POI…</string>
+  <string name="local_openstreetmap_uploading">Uploading…</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI were uploaded</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs were uploaded</string>
-  <string name="local_openstreetmap_uploadall">Upload all POI</string>
+  <string name="local_openstreetmap_uploadall">Upload all</string>
   <string name="local_openstreetmap_items">""</string>
-  <string name="local_openstreetmap_show_poi">Show POI on map</string>
+  <string name="local_openstreetmap_show">Show on map</string>
   <string name="local_openstreetmap_upload">Upload modification to OSM</string>
-  <string name="local_openstreetmap_delete">Delete POI modification</string>
+  <string name="local_openstreetmap_delete">Delete modification</string>
-  <string name="local_openstreetmap_descr_title">Asynchronous OSM POI Editing:</string>
+  <string name="local_openstreetmap_descr_title">Asynchronous OSM Editing:</string>
-  <string name="local_openstreetmap_settings">Locally saved OSM POIs</string>
+  <string name="local_openstreetmap_settings">Locally saved OSM POIs/Bugs</string>
-  <string name="local_openstreetmap_settings_descr">Show and manage OSM POIs noted in local database</string>
+  <string name="local_openstreetmap_settings_descr">Show and manage OSM POIs/Bugs noted in local database</string>
   <string name="live_monitoring_descr">Send tracking to a specified web service</string>
   <string name="live_monitoring">Online live tracking</string>
   <string name="live_monitoring_interval_descr">Specify live tracking interval</string>

OsmAnd/res/values-fr/strings.xml

@@ -4,16 +4,16 @@
   <string name="offline_edition_descr">Toujours utiliser la modification hors ligne</string>
   <string name="tip_recent_changes_0_7_1_t">"Modifications en 0.7.1 : \n\t- Modification hors ligne des POI \n\t- Option de suivi en ligne - envoyer ses coordonnées à un service web de façon périodique (lire la configuration dans les articles HowTo) \n\t- Afficher l\'itinéraire en cours d\'enregistrement sur la carte \n\t- Détection de la direction: \'Faîtes demi-tour\' est affiché et annoncé lors d\'un déplacement dans la direction opposée, ou après avoir raté un virage \n\t- Nouveau message vocal \'Itinéraire recalculé\' \n\t- Indication visuelle d\'un tournant imminent dans les 100m en changeant la couleur de la flèche de direction \n\t- Etat des fichiers de cartes désactivés affichés dans l\'écran de téléchargement en vert foncé et bleu foncé \n\t- Modifications diverses "</string>
   <string name="update_poi_does_not_change_indexes">Les modifications de POI dans l\'application sont sans effet sur les cartes téléchargées, les modifications sont enregistrées dans un fichier.</string>
-  <string name="local_openstreetmap_uploading_poi">Téléchargement des POI…</string>
+  <string name="local_openstreetmap_uploading">Téléchargement…</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI ont été téléchargés</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs ont été téléchargés</string>
-  <string name="local_openstreetmap_uploadall">Télécharger tous les POI</string>
+  <string name="local_openstreetmap_uploadall">Télécharger les tous</string>
   <string name="local_openstreetmap_items">" "</string>
-  <string name="local_openstreetmap_show_poi">Afficher le POI sur la carte</string>
+  <string name="local_openstreetmap_show">Afficher le sur la carte</string>
   <string name="local_openstreetmap_upload">Télécharger les modifications vers OSM</string>
-  <string name="local_openstreetmap_delete">Supprimer la modification de POI</string>
+  <string name="local_openstreetmap_delete">Supprimer la modification</string>
   <string name="local_openstreetmap_descr_title">Modification asynchrone de points OSM:</string>
-  <string name="local_openstreetmap_settings">Points OSM enregistrés en local</string>
+  <string name="local_openstreetmap_settings">Points/Bugs OSM enregistrés en local</string>
-  <string name="local_openstreetmap_settings_descr">Afficher et gérer les points OSM enregistrés dans la base locale</string>
+  <string name="local_openstreetmap_settings_descr">Afficher et gérer les points/Bugs OSM enregistrés dans la base locale</string>
   <string name="live_monitoring_descr">Activer l\'envoi de requêtes HTTP à un service web donné</string>
   <string name="live_monitoring">Activer le suivi en ligne</string>
   <string name="live_monitoring_interval_descr">Préciser l\'intervalle pour le suivi en ligne</string>

OsmAnd/res/values-hi/strings.xml

@@ -128,16 +128,16 @@
   <string name="offline_edition_descr">Always use offline editing</string>
   <string name="tip_recent_changes_0_7_1_t">"Changes in 0.7.1 : \n\t- Offline POI editing \n\t- Live Tracking option - send coordinates to web service periodically (read how to setup your own web service in HowTo Articles) \n\t- Show currently recorded track on map \n\t- Direction detection: \'Make U-turn\' is indicated and announced when heading in opposite direction or after missing a turn \n\t- New voice prompt \'Route recalculated\' \n\t- Optical indication of an imminent turn within 100m by diretion arrow changing color \n\t- Actuality also of deactivated index files now shown on Download screen in dark green and dark blue \n\t- Other changes "</string>
   <string name="update_poi_does_not_change_indexes">POI changes inside application do not affect downloaded map files, changes are saved to local file instead.</string>
-  <string name="local_openstreetmap_uploading_poi">Uploading POI…</string>
+  <string name="local_openstreetmap_uploading">Uploading…</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI were uploaded</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs were uploaded</string>
-  <string name="local_openstreetmap_uploadall">Upload all POI</string>
+  <string name="local_openstreetmap_uploadall">Upload all</string>
   <string name="local_openstreetmap_items">" "</string>
-  <string name="local_openstreetmap_show_poi">Show POI on map</string>
+  <string name="local_openstreetmap_show">Show on map</string>
   <string name="local_openstreetmap_upload">Upload modification to OSM</string>
-  <string name="local_openstreetmap_delete">Delete POI modification</string>
+  <string name="local_openstreetmap_delete">Delete modification</string>
-  <string name="local_openstreetmap_descr_title">Asynchronous OSM POI Editing:</string>
+  <string name="local_openstreetmap_descr_title">Asynchronous OSM Editing:</string>
-  <string name="local_openstreetmap_settings">Locally saved OSM POIs</string>
+  <string name="local_openstreetmap_settings">Locally saved OSM POIs/Bugs</string>
-  <string name="local_openstreetmap_settings_descr">Show and manage OSM POIs noted in local database</string>
+  <string name="local_openstreetmap_settings_descr">Show and manage OSM POIs/Bugs noted in local database</string>
   <string name="live_monitoring_descr">Send tracking to a specified web service</string>
   <string name="live_monitoring">Online live tracking</string>
   <string name="live_monitoring_interval_descr">Specify live tracking interval</string>

OsmAnd/res/values-hu/strings.xml

@@ -76,16 +76,16 @@
   <string name="offline_edition_descr">Szerkesztése mindig offline módban</string>
   <string name="tip_recent_changes_0_7_1_t">"A 0.7.1 verzió változásai: \n\t- Offline POI szerkesztés \n\t- Élő Útvonalrögzítési lehetőség: periodikusan koordinátákat küld egy webes szolgáltatásnak (a beállításról a weboldalunk HowTo cikkében olvashatsz) \n\t- Rögzítés alatt álló útvonal megjeleníthető a térképen \n\t- Irányfelismerés: \'Fordulj vissza\' utasítás megjelenítése és bemondása, ha rossz irányba mész, vagy elvétettél egy lekanyarodást \n\t- Új figyelmeztető hang: \'Útvonal újratervezve\' \n\t- A lekanyarodáshoz közeledve az irányjelző nyíl színe megváltozik \n\t- A letöltéskezelőben a deaktivált indexfájlok sötétebb színnel jelennek meg \n\t- Egyéb javítások "</string>
   <string name="update_poi_does_not_change_indexes">Az alkalmazáson belüli POI módosítások nincsenek hatással a letöltött térképre, a változások helyi fájlban tárolódnak.</string>
-  <string name="local_openstreetmap_uploading_poi">POI feltöltése…</string>
+  <string name="local_openstreetmap_uploading">Feltöltése…</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI feltöltve</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs feltöltve</string>
-  <string name="local_openstreetmap_uploadall">Összes POI feltöltése</string>
+  <string name="local_openstreetmap_uploadall">Összes feltöltése</string>
   <string name="local_openstreetmap_items">" "</string>
-  <string name="local_openstreetmap_show_poi">POI megjelenítése a térképen</string>
+  <string name="local_openstreetmap_show">Megjelenítése a térképen</string>
   <string name="local_openstreetmap_upload">Módosítások feltöltése OSM-re</string>
-  <string name="local_openstreetmap_delete">POI módosítás törlése</string>
+  <string name="local_openstreetmap_delete">Módosítás törlése</string>
-  <string name="local_openstreetmap_descr_title">Aszinkron OSM POI szerkesztés:</string>
+  <string name="local_openstreetmap_descr_title">Aszinkron OSM szerkesztés:</string>
-  <string name="local_openstreetmap_settings">Helyileg tárolt OSM pontok</string>
+  <string name="local_openstreetmap_settings">Helyileg tárolt OSM pontok/Bugs</string>
-  <string name="local_openstreetmap_settings_descr">Helyi adatbázisban tárolt OSM pontok megjelenítése, kezelése</string>
+  <string name="local_openstreetmap_settings_descr">Helyi adatbázisban tárolt OSM pontok/Bugs megjelenítése, kezelése</string>
   <string name="live_monitoring_descr">Lehetővé teszi HTTP üzenetek küldését a megadott webes szolgáltatásnak</string>
   <string name="live_monitoring">Élő Útvonalrögzítés</string>
   <string name="live_monitoring_interval_descr">Élő Útvonalrögzítés intervalluma</string>

OsmAnd/res/values-hy/strings.xml

@@ -155,16 +155,16 @@
 	<string name="tip_recent_changes_0_7_1_t">"Changes in 0.7.1 : \n\t- Offline POI editing \n\t- Live Tracking option - send coordinates to web service periodically (read how to setup your own web service in HowTo Articles) \n\t- Show currently recorded track on map \n\t- Direction detection: \'Make U-turn\' is indicated and announced when heading in opposite direction or after missing a turn \n\t- New voice prompt \'Route recalculated\' \n\t- Optical indication of an imminent turn within 100m by diretion arrow changing color \n\t- Actuality also of deactivated index files now shown on Download screen in dark green and dark blue \n\t- Other changes "</string>
 
 	<string name="update_poi_does_not_change_indexes">POI changes inside application do not affect downloaded map files, changes are saved to local file instead.</string>
-	<string name="local_openstreetmap_uploading_poi">Uploading POI…</string>
+	<string name="local_openstreetmap_uploading">Uploading…</string>
-	<string name="local_openstreetmap_poi_were_uploaded">{0} POI were uploaded</string>
+	<string name="local_openstreetmap_were_uploaded">{0} POI/Bugs were uploaded</string>
-	<string name="local_openstreetmap_uploadall">Upload all POI</string>
+	<string name="local_openstreetmap_uploadall">Upload all</string>
 	<string name="local_openstreetmap_items"></string>
-	<string name="local_openstreetmap_show_poi">Show POI on map</string>
+	<string name="local_openstreetmap_show">Show on map</string>
 	<string name="local_openstreetmap_upload">Upload modification to OSM</string>
-	<string name="local_openstreetmap_delete">Delete POI modification</string>
+	<string name="local_openstreetmap_delete">Delete modification</string>
-	<string name="local_openstreetmap_descr_title">Asynchronous OSM POI Editing:</string>
+	<string name="local_openstreetmap_descr_title">Asynchronous OSM Editing:</string>
-	<string name="local_openstreetmap_settings">Locally saved OSM POIs</string>
+	<string name="local_openstreetmap_settings">Locally saved OSM POIs/Bugs</string>
-	<string name="local_openstreetmap_settings_descr">Show and manage OSM POIs noted in local database</string>
+	<string name="local_openstreetmap_settings_descr">Show and manage OSM POIs/Bugs noted in local database</string>
 
 	<string name="live_monitoring_descr">Send tracking to a specified web service</string>
 	<string name="live_monitoring">Online live tracking</string>

OsmAnd/res/values-id/strings.xml

@@ -137,16 +137,16 @@
   <string name="offline_edition_descr">Always use offline editing</string>
   <string name="tip_recent_changes_0_7_1_t">"Changes in 0.7.1 : \n\t- Offline POI editing \n\t- Live Tracking option - send coordinates to web service periodically (read how to setup your own web service in HowTo Articles) \n\t- Show currently recorded track on map \n\t- Direction detection: \'Make U-turn\' is indicated and announced when heading in opposite direction or after missing a turn \n\t- New voice prompt \'Route recalculated\' \n\t- Optical indication of an imminent turn within 100m by diretion arrow changing color \n\t- Actuality also of deactivated index files now shown on Download screen in dark green and dark blue \n\t- Other changes "</string>
   <string name="update_poi_does_not_change_indexes">POI changes inside application do not affect downloaded map files, changes are saved to local file instead.</string>
-  <string name="local_openstreetmap_uploading_poi">Uploading POI…</string>
+  <string name="local_openstreetmap_uploading">Uploading…</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI were uploaded</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs were uploaded</string>
-  <string name="local_openstreetmap_uploadall">Upload all POI</string>
+  <string name="local_openstreetmap_uploadall">Upload all</string>
   <string name="local_openstreetmap_items">" "</string>
-  <string name="local_openstreetmap_show_poi">Show POI on map</string>
+  <string name="local_openstreetmap_show">Show on map</string>
   <string name="local_openstreetmap_upload">Upload modification to OSM</string>
-  <string name="local_openstreetmap_delete">Delete POI modification</string>
+  <string name="local_openstreetmap_delete">Delete modification</string>
-  <string name="local_openstreetmap_descr_title">Asynchronous OSM POI Editing:</string>
+  <string name="local_openstreetmap_descr_title">Asynchronous OSM Editing:</string>
-  <string name="local_openstreetmap_settings">Locally saved OSM POIs</string>
+  <string name="local_openstreetmap_settings">Locally saved OSM POIs/Bugs</string>
-  <string name="local_openstreetmap_settings_descr">Show and manage OSM POIs noted in local database</string>
+  <string name="local_openstreetmap_settings_descr">Show and manage OSM POIs/Bugs noted in local database</string>
   <string name="live_monitoring_descr">Send tracking to a specified web service</string>
   <string name="live_monitoring">Online live tracking</string>
   <string name="live_monitoring_interval_descr">Specify live tracking interval</string>

OsmAnd/res/values-it/strings.xml

@@ -6,16 +6,16 @@
   <string name="offline_edition_descr">Usa sempre l\'editing offline</string>
   <string name="tip_recent_changes_0_7_1_t">"Cambiamenti nella versione 0.7.1 : \n\t- Editing offline dei PDI \n\t- Opzione per il Live Tracking - invia le coordinate periodicamente ad un servizio web (guarda come impostare il tuo servizio personale negli articoli dell\'HowTo) \n\t- Mostra sulla mappa la traccia registrata \n\t- Individuazione della direzione: \'Esegui una svolta ad U\' è indicato e annunciato quando ci si dirige in direzione opposta o dopo aver sbagliato una svolta \n\t- Nuovo avviso vocale \'Ricalcolo percorso\' \n\t- Indicazione visiva di una svolta imminente entro 100 metri tramite il cambio del colore della freccia della direzione \n\t- Viene mostrato in verde e blu scuro nella schermata di Download l\'età dei file di indice disattivati \n\t- Altri cambiamenti "</string>
   <string name="update_poi_does_not_change_indexes">I cambiamenti dei PDI all\'interno dell\'applicazione non si riflettono nelle mappe scaricate, i cambiamenti sono salvati in un file locale.</string>
-  <string name="local_openstreetmap_uploading_poi">Caricando i PDI…</string>
+  <string name="local_openstreetmap_uploading">Caricando…</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} PDI sono stati caricati</string>
+  <string name="local_openstreetmap_were_uploaded">{0} PDI/Bugs sono stati caricati</string>
-  <string name="local_openstreetmap_uploadall">Carica tutti i PDI</string>
+  <string name="local_openstreetmap_uploadall">Carica tutti</string>
   <string name="local_openstreetmap_items">" "</string>
-  <string name="local_openstreetmap_show_poi">Modifica il PDI sulla mappa</string>
+  <string name="local_openstreetmap_show">Modifica sulla mappa</string>
   <string name="local_openstreetmap_upload">Carica in OSM la modifica</string>
-  <string name="local_openstreetmap_delete">Cancella la modifica al PDI</string>
+  <string name="local_openstreetmap_delete">Cancella la modifica</string>
-  <string name="local_openstreetmap_descr_title">Modifica asincrona dei PDI OSM:</string>
+  <string name="local_openstreetmap_descr_title">Modifica asincrona dei OSM:</string>
-  <string name="local_openstreetmap_settings">Nodi OSM salvati in locale</string>
+  <string name="local_openstreetmap_settings">Nodi/Bugs OSM salvati in locale</string>
-  <string name="local_openstreetmap_settings_descr">Mostra e gestisci i nodi OSM inseriti nel database locale</string>
+  <string name="local_openstreetmap_settings_descr">Mostra e gestisci i nodi/Bugs OSM inseriti nel database locale</string>
   <string name="live_monitoring_descr">Abilita l\'invio di richieste HTTP ad un specifico servizio web</string>
   <string name="live_monitoring">Online Live Tracking</string>
   <string name="live_monitoring_interval_descr">Specifica l\'intervallo del Live Tracking</string>

OsmAnd/res/values-ka/strings.xml

@@ -129,16 +129,16 @@
   <string name="offline_edition_descr">ყოველთვის გამოვიყენოთ POI-ს ჩასწორების გათიშული რეჟიმი</string>
   <string name="tip_recent_changes_0_7_1_t">"ცვლილებები 0.7.1-ში : \n\t- POI-ის გათიშულ რეჟიმში ჩასწორება \n\t- დევნა რეალურ დროში - კოორდინატების პერიოდულად გაგზავნა ვებსერვერისათვის (საკუთარი ვებსერვერის ასაწყობად იხილეთ დოკუმენტაცია)\n\t- მიმდინარე ჩაწერილი ბილიკის რუკაზე ჩვენება\n\t- მიმართულების დადგენა: \'შემობრუნდით\' იქნება ნაჩვენები როდესაც მიდიხართ ზუსტად საპირისპირო მიმართულებით\n\t- ახალი ხმოვანი შეტყობინება: \'გზის გადათვლა დასრულებულია\'\n\t- შეხვევის ისრით ჩვენება 100 მეტრის დაცილებისას \n\t- დეაქტივირებული ინდექს ფაილების ჩვენება მუქი მწვანე და მუქი ლურჯი ფერებით\n\t- სხვა ცვლილებები"</string>
   <string name="update_poi_does_not_change_indexes">აპლიკაციაში POI-ის ცვლილებები არ ეხება ჩამოტვირთულ რუკის ფაილებს. ცვლილებები ინახება ლოკალურ ფაილში.</string>
-  <string name="local_openstreetmap_uploading_poi">POI-ის ატვირთვა..</string>
+  <string name="local_openstreetmap_uploading">POI-ის ატვირთვა..</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI ატვირთულია</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs ატვირთულია</string>
   <string name="local_openstreetmap_uploadall">ყველა POI-ს ატვირთვა</string>
   <string name="local_openstreetmap_items">" "</string>
-  <string name="local_openstreetmap_show_poi">POI-ის რუკაზე ჩვენება</string>
+  <string name="local_openstreetmap_show">POI-ის რუკაზე ჩვენება</string>
   <string name="local_openstreetmap_upload">ცვლილების OSM-ზე ატვირთვა</string>
   <string name="local_openstreetmap_delete">POI-ის ცვლილების წაშლა</string>
   <string name="local_openstreetmap_descr_title">OSM POI-ის ასინქრონული ჩასწორება:</string>
-  <string name="local_openstreetmap_settings">ადგილობრივად შენახული OSM POI-ები</string>
+  <string name="local_openstreetmap_settings">ადგილობრივად შენახული OSM POI-ები/Bugs</string>
-  <string name="local_openstreetmap_settings_descr">ადგილობრივ ბაზაში შენახული OSM POI-ების ჩვენება და მართვა</string>
+  <string name="local_openstreetmap_settings_descr">ადგილობრივ ბაზაში შენახული OSM POI-ების/Bugs ჩვენება და მართვა</string>
   <string name="live_monitoring_descr">დევნის მითითებულ ვებსერვისზე გაგზავნა</string>
   <string name="live_monitoring">დევნა მიმდინარე რეჟიმში</string>
   <string name="live_monitoring_interval_descr">მიუთითეთ მიმდინარე რეჟიმში დევნის ინტერვალი</string>

OsmAnd/res/values-ko/strings.xml

@@ -107,14 +107,14 @@
 	</string>
 
 	<string name="update_poi_does_not_change_indexes">프로그램 내의 POI 변경은  다운로드된 맵 파일에 영향을 주지 않고, 대신 따로 파일로 저장됩니다.</string>
-	<string name="local_openstreetmap_uploading_poi">POI 업로드 중...</string>
+	<string name="local_openstreetmap_uploading">POI 업로드 중...</string>
-	<string name="local_openstreetmap_poi_were_uploaded">{0} POI 가 업로드되었습니다</string>
+	<string name="local_openstreetmap_were_uploaded">{0} POI/Bugs 가 업로드되었습니다</string>
 	<string name="local_openstreetmap_uploadall">모든 POI 업로드하기</string>
 	<string name="local_openstreetmap_items"></string>
-	<string name="local_openstreetmap_show_poi">맵 상에 POI 표시</string>
+	<string name="local_openstreetmap_show">맵 상에 표시</string>
 	<string name="local_openstreetmap_upload">수정사항을 OSM 으로 업로드</string>
-	<string name="local_openstreetmap_delete">POI 수정사항 삭제</string>
+	<string name="local_openstreetmap_delete">수정사항 삭제</string>
-	<string name="local_openstreetmap_descr_title">비동기적인 Openstreetmap POI 편집:</string>
+	<string name="local_openstreetmap_descr_title">비동기적인 Openstreetmap 편집:</string>
 	<string name="local_openstreetmap_settings">지역 Openstreetmap 지점들</string>
 	<string name="local_openstreetmap_settings_descr">DB에 저장된 지역 지점들</string>
 

OsmAnd/res/values-lv/strings.xml

@@ -90,16 +90,16 @@
   <string name="offline_edition_descr">Viemēr pielietot bezsaistes rediģēšanu</string>
   <string name="tip_recent_changes_0_7_1_t">"Jaumi 0.7.1 versijā : \n\t- Bezsaistes POI rediģēšana \n\t- Sekošanas opcija - periodiska koordināšu sūtīšana uz web servisu. (kā izveidot savu web servisu var izlasīt HowTo) \n\t- Parādīt kartē ierakstītos trekus \n\t- Virziena noteikšana: Ja brauciet pretējā virzienā vai esiet pabraucis garām pagriezienam tiek paziņots \'Izpildiet U-pagriezienu\' \n\t- Jauns bals ziņojums \'Maršruts pārrēķināts\' \n\t- Tūlītēja (100m)pagrieziena indikācija ar virziena bultas krāsas maiņu \n\t- Deaktivizēto indeksu failu aktualitāte tiek parādīta lejuplādes ekrānā ar tumši zaļu un tumši zilu \n\t- Citas izmaiņas "</string>
   <string name="update_poi_does_not_change_indexes">POI izmaiņas aplikācijā neietekmē lejuplādētos kartes attēlus, izmaiņas tiek saglabātas atsevišķā failā.</string>
-  <string name="local_openstreetmap_uploading_poi">Lejuplādē POI…</string>
+  <string name="local_openstreetmap_uploading">Lejuplādē…</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI tika lejuplādētji</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs tika lejuplādētji</string>
-  <string name="local_openstreetmap_uploadall">Lejuplādēt visus POI</string>
+  <string name="local_openstreetmap_uploadall">Lejuplādēt visus</string>
   <string name="local_openstreetmap_items">" "</string>
-  <string name="local_openstreetmap_show_poi">Rādīt POI uz kartes</string>
+  <string name="local_openstreetmap_show">Rādīt uz kartes</string>
   <string name="local_openstreetmap_upload">Augšuplādēt izmaiņas uz OSM</string>
-  <string name="local_openstreetmap_delete">Dzēst POI labojumus</string>
+  <string name="local_openstreetmap_delete">Dzēst labojumus</string>
-  <string name="local_openstreetmap_descr_title">Asinhronā POI rediģēšana:</string>
+  <string name="local_openstreetmap_descr_title">Asinhronā rediģēšana:</string>
-  <string name="local_openstreetmap_settings">Laokāli saglabātie OSM POIs</string>
+  <string name="local_openstreetmap_settings">Laokāli saglabātie OSM POIs/Bugs</string>
-  <string name="local_openstreetmap_settings_descr">Rādīt un organizēt lokālajā datubāzē pieejamos OSM POI</string>
+  <string name="local_openstreetmap_settings_descr">Rādīt un organizēt lokālajā datubāzē pieejamos OSM POI/Bugs</string>
   <string name="live_monitoring_descr">Nosūtīt treku uz norādīto web servisu</string>
   <string name="live_monitoring">Tiešsaistes sekošana</string>
   <string name="live_monitoring_interval_descr">Norādīt tiešsaistes sekošanas intervālu</string>

OsmAnd/res/values-mr/strings.xml

@@ -128,16 +128,16 @@
   <string name="offline_edition_descr">Always use offline editing</string>
   <string name="tip_recent_changes_0_7_1_t">"Changes in 0.7.1 : \n\t- Offline POI editing \n\t- Live Tracking option - send coordinates to web service periodically (read how to setup your own web service in HowTo Articles) \n\t- Show currently recorded track on map \n\t- Direction detection: \'Make U-turn\' is indicated and announced when heading in opposite direction or after missing a turn \n\t- New voice prompt \'Route recalculated\' \n\t- Optical indication of an imminent turn within 100m by diretion arrow changing color \n\t- Actuality also of deactivated index files now shown on Download screen in dark green and dark blue \n\t- Other changes "</string>
   <string name="update_poi_does_not_change_indexes">POI changes inside application do not affect downloaded map files, changes are saved to local file instead.</string>
-  <string name="local_openstreetmap_uploading_poi">Uploading POI…</string>
+  <string name="local_openstreetmap_uploading">Uploading…</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI were uploaded</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs were uploaded</string>
-  <string name="local_openstreetmap_uploadall">Upload all POI</string>
+  <string name="local_openstreetmap_uploadall">Upload all</string>
   <string name="local_openstreetmap_items">""</string>
-  <string name="local_openstreetmap_show_poi">Show POI on map</string>
+  <string name="local_openstreetmap_show">Show on map</string>
   <string name="local_openstreetmap_upload">Upload modification to OSM</string>
-  <string name="local_openstreetmap_delete">Delete POI modification</string>
+  <string name="local_openstreetmap_delete">Delete modification</string>
-  <string name="local_openstreetmap_descr_title">Asynchronous OSM POI Editing:</string>
+  <string name="local_openstreetmap_descr_title">Asynchronous OSM Editing:</string>
-  <string name="local_openstreetmap_settings">Locally saved OSM POIs</string>
+  <string name="local_openstreetmap_settings">Locally saved OSM POIs/Bugs</string>
-  <string name="local_openstreetmap_settings_descr">Show and manage OSM POIs noted in local database</string>
+  <string name="local_openstreetmap_settings_descr">Show and manage OSM POIs/Bugs noted in local database</string>
   <string name="live_monitoring_descr">Send tracking to a specified web service</string>
   <string name="live_monitoring">Online live tracking</string>
   <string name="live_monitoring_interval_descr">Specify live tracking interval</string>

OsmAnd/res/values-nl/strings.xml

@@ -83,16 +83,16 @@
   <string name="offline_edition_descr">Gebruik altijd offline bewerking</string>
   <string name="tip_recent_changes_0_7_1_t">"Wijzigingen in 0.7.1 : \n\t- Offline bewerken van interessepunten \n\t- Live Tracking optie - zend coordinaten naar web service (lees voor het opzetten van je eigen webservice de HowTo Artikelen) \n\t- Toon eerder opgenomen tracks op de kaart \n\t- Richtingdetectie: \'Keer terug\' wordt weergegeven bij een koers in de tegengestelde richting of na het missen van een afslag \n\t- Nieuwe stem-instructie \'Route wordt opnieuw berekend\' \n\t- Optische aanduiding van een afslag binnen 100m door een richtingpijl met veranderende kleur \n\t- Weergave van actuele status van gedeactiveerde kaarten nu op het downloadscherm in donker groen en donker blauw \n\t- Andere wijzigingen "</string>
   <string name="update_poi_does_not_change_indexes">Wijzigingen van interessepunten worden niet bewaard in de gedownloade kaartbestanden, maar in een lokaal bestand.</string>
-  <string name="local_openstreetmap_uploading_poi">Interessepunt wordt ge-upload</string>
+  <string name="local_openstreetmap_uploading">Wordt ge-upload</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} interessepunten zijn ge-upload</string>
+  <string name="local_openstreetmap_were_uploaded">{0} interessepunten/Bugs zijn ge-upload</string>
-  <string name="local_openstreetmap_uploadall">Upload Alle interessepunten</string>
+  <string name="local_openstreetmap_uploadall">Upload Alle</string>
   <string name="local_openstreetmap_items">" "</string>
-  <string name="local_openstreetmap_show_poi">Toon interessepunten op kaart</string>
+  <string name="local_openstreetmap_show">Toon op kaart</string>
   <string name="local_openstreetmap_upload">Upload wijziging naar OSM</string>
-  <string name="local_openstreetmap_delete">Wis de wijziging van interessepunten</string>
+  <string name="local_openstreetmap_delete">Wis de wijziging</string>
-  <string name="local_openstreetmap_descr_title">Asynchrone Openstreetmap interessepunten wijziging:</string>
+  <string name="local_openstreetmap_descr_title">Asynchrone Openstreetmap wijziging:</string>
-  <string name="local_openstreetmap_settings">Locale Openstreetmap punten</string>
+  <string name="local_openstreetmap_settings">Locale Openstreetmap punten/Bugs</string>
-  <string name="local_openstreetmap_settings_descr">Locale Punten bewaard in database</string>
+  <string name="local_openstreetmap_settings_descr">Locale Punten/Bugs bewaard in database</string>
   <string name="live_monitoring_descr">Versturen HTTP verzoeken naar een webservice toestaan</string>
   <string name="live_monitoring">Online Live Tracking</string>
   <string name="live_monitoring_interval_descr">Specificeer Live Tracking interval</string>

OsmAnd/res/values-pl/strings.xml

@@ -763,16 +763,16 @@
   <string name="offline_edition">Edycja w trybie offline</string>
   <string name="offline_edition_descr">Zawsze edytuj w trybie offline</string>
   <string name="tip_recent_changes_0_7_1_t">"Zmiany w 0.7.1 : \n\t- Edycja POI w trybie offline\n\t- Opcja zapisywania ścieżki na bieżąco - cykliczne wysyłanie informacji o pozycji do usługi sieciowej (przeczytaj jak ustawić własną usługę sieciową w artykułach HowTo)\n\t- Pokazywanie aktualnie nagranego śladu na mapie\n\t- Wykrywanie kierunku poruszania: Nakazanie \'Zawróć\' podczas poruszania w przeciwnym kierunku lub po przeoczeniu zakrętu\n\t- Nowa podpowiedź głosowa - \'Trasa przeliczona\' \n\t- Optyczne wskazanie bliskości zakrętu w odległości nie większej niż 100m prze zmianę koloru strzałki\n\t- Zdezaktywowane pliki indeksów są teraz pokazywane w ekranie pobrań w kolorze ciemno zielonym i ciemno niebieskim\n\t- Inne zmiany"</string>
-  <string name="local_openstreetmap_uploading_poi">Wysyłam POI...</string>
+  <string name="local_openstreetmap_uploading">Wysyłam...</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI zostało wysłanych</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs zostało wysłanych</string>
-  <string name="local_openstreetmap_uploadall">Wyślij wszystkie POI</string>
+  <string name="local_openstreetmap_uploadall">Wyślij wszystkie</string>
   <string name="local_openstreetmap_items" />
-  <string name="local_openstreetmap_show_poi">Pokaż POI na mapie</string>
+  <string name="local_openstreetmap_show">Pokaż na mapie</string>
   <string name="local_openstreetmap_upload">Wyślij modyfikacje do OSM</string>
-  <string name="local_openstreetmap_delete">Usuń modyfikacje POI</string>
+  <string name="local_openstreetmap_delete">Usuń modyfikacje</string>
-  <string name="local_openstreetmap_descr_title">Asynchroniczna edycja POI OSM:</string>
+  <string name="local_openstreetmap_descr_title">Asynchroniczna edycja OSM:</string>
-  <string name="local_openstreetmap_settings">Lokalnie zapisane POI OSM</string>
+  <string name="local_openstreetmap_settings">Lokalnie zapisane POI/Bugs OSM</string>
-  <string name="local_openstreetmap_settings_descr">Pokaż i zarządzaj POI OSM zapisanymi w lokalnej bazie danych</string>
+  <string name="local_openstreetmap_settings_descr">Pokaż i zarządzaj POI/Bugs OSM zapisanymi w lokalnej bazie danych</string>
   <string name="live_monitoring_descr">Wysyłaj informacje o pozycji do wybranej usługi sieciowej</string>
   <string name="live_monitoring">Śledzenie online na bieżąco</string>
   <string name="live_monitoring_interval_descr">Określ interwał pomiędzy wysyłaniem danych</string>

OsmAnd/res/values-pt/strings.xml

@@ -569,16 +569,16 @@
   <string name="offline_edition_descr">Always use offline editing</string>
   <string name="tip_recent_changes_0_7_1_t">"Changes in 0.7.1 : \n\t- Offline POI editing \n\t- Live Tracking option - send coordinates to web service periodically (read how to setup your own web service in HowTo Articles) \n\t- Show currently recorded track on map \n\t- Direction detection: \'Make U-turn\' is indicated and announced when heading in opposite direction or after missing a turn \n\t- New voice prompt \'Route recalculated\' \n\t- Optical indication of an imminent turn within 100m by diretion arrow changing color \n\t- Actuality also of deactivated index files now shown on Download screen in dark green and dark blue \n\t- Other changes "</string>
   <string name="update_poi_does_not_change_indexes">POI changes inside application do not affect downloaded map files, changes are saved to local file instead.</string>
-  <string name="local_openstreetmap_uploading_poi">Uploading POI…</string>
+  <string name="local_openstreetmap_uploading">Uploading…</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI were uploaded</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs were uploaded</string>
-  <string name="local_openstreetmap_uploadall">Upload all POI</string>
+  <string name="local_openstreetmap_uploadall">Upload all</string>
   <string name="local_openstreetmap_items" />
-  <string name="local_openstreetmap_show_poi">Show POI on map</string>
+  <string name="local_openstreetmap_show">Show on map</string>
   <string name="local_openstreetmap_upload">Upload modification to OSM</string>
-  <string name="local_openstreetmap_delete">Delete POI modification</string>
+  <string name="local_openstreetmap_delete">Delete modification</string>
-  <string name="local_openstreetmap_descr_title">Asynchronous OSM POI Editing:</string>
+  <string name="local_openstreetmap_descr_title">Asynchronous OSM Editing:</string>
-  <string name="local_openstreetmap_settings">Locally saved OSM POIs</string>
+  <string name="local_openstreetmap_settings">Locally saved OSM POIs/Bugs</string>
-  <string name="local_openstreetmap_settings_descr">Show and manage OSM POIs noted in local database</string>
+  <string name="local_openstreetmap_settings_descr">Show and manage OSM POIs/Bugs noted in local database</string>
   <string name="live_monitoring_descr">Send tracking to a specified web service</string>
   <string name="live_monitoring">Online live tracking</string>
   <string name="live_monitoring_interval_descr">Specify live tracking interval</string>

OsmAnd/res/values-ru/strings.xml

@@ -66,16 +66,16 @@
   <string name="offline_edition_descr">Всегда использовать локальное редактирование</string>
   <string name="tip_recent_changes_0_7_1_t">"Изменения в 0.7.1: \n\t- Локальное редактирование POI \n\t- Live Tracking функциональность (использование и настройка web service в HowTo en) \n\t- Показывать текущий записываемый трек на карте \n\t- Другие изменения "</string>
   <string name="update_poi_does_not_change_indexes">Изменение POI в приложении не меняет POI загруженные из интернета, однако все изменения сохраняются в локальный файл.</string>
-  <string name="local_openstreetmap_uploading_poi">Загрузка POI</string>
+  <string name="local_openstreetmap_uploading">Загрузка</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI были загружены</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs были загружены</string>
-  <string name="local_openstreetmap_uploadall">Загрузить все POI</string>
+  <string name="local_openstreetmap_uploadall">Загрузить все</string>
   <string name="local_openstreetmap_items">" "</string>
-  <string name="local_openstreetmap_show_poi">Показать POI на карте</string>
+  <string name="local_openstreetmap_show">Показать на карте</string>
   <string name="local_openstreetmap_upload">Загрузить изменения в OSM</string>
-  <string name="local_openstreetmap_delete">Удалить созданные POI</string>
+  <string name="local_openstreetmap_delete">Удалить созданные</string>
-  <string name="local_openstreetmap_descr_title">Offline POI дополнение:</string>
+  <string name="local_openstreetmap_descr_title">Offline дополнение:</string>
   <string name="local_openstreetmap_settings">Локальные Openstreetmap точки</string>
-  <string name="local_openstreetmap_settings_descr">"Управление локальными POI"</string>
+  <string name="local_openstreetmap_settings_descr">"Управление локальными POI/Bugs"</string>
   <string name="live_monitoring_descr">Отсылать текущее положение на специальный web-сервис</string>
   <string name="live_monitoring">Включить Live слежение</string>
   <string name="live_monitoring_interval_descr">Укажите интервал Live слежения</string>

OsmAnd/res/values-sk/strings.xml

@@ -104,16 +104,16 @@
   <string name="offline_edition_descr">Ak chcete používať iba offline úpravu</string>
   <string name="tip_recent_changes_0_7_1_t">"Zmeny vo verzii 0.7.1 : \n\t- Offline úpravy POI \n\t- Možnosť stopovania naživo - pravidelné odosielanie súradníc do webovej služby (prečítajte si ako nastaviť Vašu webovú službu v článkoch Ako na to) \n\t- Zobrazenie aktuálne zaznamenávanej stopy na mape \n\t- Detekcia smeru jazdy: \'Otočte sa\' je indikované a oznámené pri smerovaní do opačného smeru alebo minutí odbočenia \n\t- Nový hlasový povel \'Cesta prepočítaná\' \n\t- Optická inidkácia najbližšieho odbočenia v 100 metroch zmenou farby smerovej šípky \n\t- Aktuálne sú tiež deaktivované súbory indexov vyznačené v Sťahovaniach ako tmavo zelené a tmavo modré \n\t- Iné zmeny "</string>
   <string name="update_poi_does_not_change_indexes">Zmeny POI v aplikácii neovplyvnia stiahnuté mapové súbory, zmeny sú uložené namiesto toho v lokálnom súbore.</string>
-  <string name="local_openstreetmap_uploading_poi">Nahrávajú sa POI</string>
+  <string name="local_openstreetmap_uploading">Nahrávajú sa</string>
-  <string name="local_openstreetmap_poi_were_uploaded">{0} POI bolo nahratých</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs bolo nahratých</string>
-  <string name="local_openstreetmap_uploadall">Nahrať všetky POI</string>
+  <string name="local_openstreetmap_uploadall">Nahrať všetky</string>
   <string name="local_openstreetmap_items">" "</string>
-  <string name="local_openstreetmap_show_poi">Zobraziť POI na mape</string>
+  <string name="local_openstreetmap_show">Zobraziť na mape</string>
   <string name="local_openstreetmap_upload">Nahrať úpravu na OSM</string>
-  <string name="local_openstreetmap_delete">Vymazať úpravu POI</string>
+  <string name="local_openstreetmap_delete">Vymazať úpravu</string>
-  <string name="local_openstreetmap_descr_title">Asynchrónna úprava Openstreetmap POI:</string>
+  <string name="local_openstreetmap_descr_title">Asynchrónna úprava Openstreetmap:</string>
-  <string name="local_openstreetmap_settings">Lokálne Openstreetmap body</string>
+  <string name="local_openstreetmap_settings">Lokálne Openstreetmap body/Bugs</string>
-  <string name="local_openstreetmap_settings_descr">Lokálne body uložené v databáze</string>
+  <string name="local_openstreetmap_settings_descr">Lokálne body/Bugs uložené v databáze</string>
   <string name="live_monitoring_descr">Zapnutie posielania HTTP požiadaviek na určenú webovú službu</string>
   <string name="live_monitoring">Zapnúť stopovanie naživo</string>
   <string name="live_monitoring_interval_descr">Určenie intervalu stopovania naživo</string>

OsmAnd/res/values-uk/strings.xml

@@ -161,16 +161,16 @@
 	<string name="tip_recent_changes_0_7_1_t">"Changes in 0.7.1 : \n\t- Offline POI editing \n\t- Live Tracking option - send coordinates to web service periodically (read how to setup your own web service in HowTo Articles) \n\t- Show currently recorded track on map \n\t- Direction detection: \'Make U-turn\' is indicated and announced when heading in opposite direction or after missing a turn \n\t- New voice prompt \'Route recalculated\' \n\t- Optical indication of an imminent turn within 100m by diretion arrow changing color \n\t- Actuality also of deactivated index files now shown on Download screen in dark green and dark blue \n\t- Other changes "</string>
 
 	<string name="update_poi_does_not_change_indexes">POI changes inside application do not affect downloaded map files, changes are saved to local file instead.</string>
-	<string name="local_openstreetmap_uploading_poi">Uploading POI…</string>
+	<string name="local_openstreetmap_uploading">Uploading…</string>
-	<string name="local_openstreetmap_poi_were_uploaded">{0} POI were uploaded</string>
+	<string name="local_openstreetmap_were_uploaded">{0} POI/Bugs were uploaded</string>
-	<string name="local_openstreetmap_uploadall">Upload all POI</string>
+	<string name="local_openstreetmap_uploadall">Upload all</string>
 	<string name="local_openstreetmap_items"></string>
-	<string name="local_openstreetmap_show_poi">Show POI on map</string>
+	<string name="local_openstreetmap_show">Show on map</string>
 	<string name="local_openstreetmap_upload">Upload modification to OSM</string>
-	<string name="local_openstreetmap_delete">Delete POI modification</string>
+	<string name="local_openstreetmap_delete">Delete modification</string>
-	<string name="local_openstreetmap_descr_title">Asynchronous OSM POI Editing:</string>
+	<string name="local_openstreetmap_descr_title">Asynchronous OSM Editing:</string>
-	<string name="local_openstreetmap_settings">Locally saved OSM POIs</string>
+	<string name="local_openstreetmap_settings">Locally saved OSM POIs/Bugs</string>
-	<string name="local_openstreetmap_settings_descr">Show and manage OSM POIs noted in local database</string>
+	<string name="local_openstreetmap_settings_descr">Show and manage OSM POIs/Bugs noted in local database</string>
 
 	<string name="live_monitoring_descr">Send tracking to a specified web service</string>
 	<string name="live_monitoring">Online live tracking</string>

OsmAnd/res/values/strings.xml

@@ -214,16 +214,16 @@ You can enable (online or cached) tile map sources, tracking settings, and many
 	</string>
 
 	<string name="update_poi_does_not_change_indexes">POI changes inside application do not affect downloaded map files, changes are saved to local file instead.</string>
-	<string name="local_openstreetmap_uploading_poi">Uploading POI…</string>
+	<string name="local_openstreetmap_uploading">Uploading…</string>
-	<string name="local_openstreetmap_poi_were_uploaded">{0} POI were uploaded</string>
+	<string name="local_openstreetmap_were_uploaded">{0} POI/Bugs were uploaded</string>
-	<string name="local_openstreetmap_uploadall">Upload all POI</string>
+	<string name="local_openstreetmap_uploadall">Upload all</string>
 	<string name="local_openstreetmap_items"></string>
-	<string name="local_openstreetmap_show_poi">Show POI on map</string>
+	<string name="local_openstreetmap_show">Show on map</string>
 	<string name="local_openstreetmap_upload">Upload modification to OSM</string>
-	<string name="local_openstreetmap_delete">Delete POI modification</string>
+	<string name="local_openstreetmap_delete">Delete modification</string>
-	<string name="local_openstreetmap_descr_title">Asynchronous OSM POI Editing:</string>
+	<string name="local_openstreetmap_descr_title">Asynchronous OSM Editing:</string>
-	<string name="local_openstreetmap_settings">Locally saved OSM POIs</string>
+	<string name="local_openstreetmap_settings">Locally saved OSM POIs/Bugs</string>
-	<string name="local_openstreetmap_settings_descr">Show and manage OSM POIs noted in local database</string>
+	<string name="local_openstreetmap_settings_descr">Show and manage OSM POIs/Bugs noted in local database</string>
 
 	<string name="live_monitoring_descr">Send tracking to a specified web service</string>
 	<string name="live_monitoring">Online live tracking</string>

OsmAnd/src/net/osmand/plus/osmedit/AbstractOpenstreetmapUtil.java

@@ -17,7 +17,7 @@ import android.widget.Toast;
 public abstract class AbstractOpenstreetmapUtil implements OpenstreetmapUtil  {
 
 	@Override
-	public void updateNodeInIndexes(Activity ctx, OpenstreetmapUtil.Action action, Node n, Node oldNode) {
+	public void updateNodeInIndexes(Activity ctx, OsmPoint.Action action, Node n, Node oldNode) {
 		final OsmandApplication app = (OsmandApplication) ctx.getApplication();
 		final AmenityIndexRepositoryOdb repo = app.getResourceManager().getUpdatablePoiDb();
 		ctx.runOnUiThread(new Runnable() {
@@ -42,12 +42,12 @@ public abstract class AbstractOpenstreetmapUtil implements OpenstreetmapUtil  {
 		}
 		
 		// delete all amenities with same id
-		if (OpenstreetmapUtil.Action.DELETE == action || OpenstreetmapUtil.Action.MODIFY == action) {
+		if (OsmPoint.Action.DELETE == action || OsmPoint.Action.MODIFY == action) {
 			repo.deleteAmenities(n.getId() << 1);
 			repo.clearCache();
 		}
 		// add amenities
-		if (OpenstreetmapUtil.Action.DELETE != action) {
+		if (OsmPoint.Action.DELETE != action) {
 			List<Amenity> ams = Amenity.parseAmenities(MapRenderingTypes.getDefault(), n, new ArrayList<Amenity>());
 			for (Amenity a : ams) {
 				repo.addAmenity(a);

OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java

@@ -134,7 +134,7 @@ public class EditingPOIActivity implements DialogProvider {
 			public void onClick(DialogInterface dialog, int which) {
 				Node n = (Node) args.getSerializable(KEY_AMENITY_NODE);
 				String c = comment.getText().toString();
-				commitNode(OpenstreetmapUtil.Action.DELETE, n, openstreetmapUtil.getEntityInfo(), c, new Runnable(){
+				commitNode(OsmPoint.Action.DELETE, n, openstreetmapUtil.getEntityInfo(), c, new Runnable(){
 					@Override
 					public void run() {
 						AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.poi_remove_success), Toast.LENGTH_LONG).show();
@@ -248,7 +248,7 @@ public class EditingPOIActivity implements DialogProvider {
 				Resources resources = v.getResources();
 				final String msg = n.getId() == -1 ? resources.getString(R.string.poi_action_add) : resources
 						.getString(R.string.poi_action_change);
-				OpenstreetmapUtil.Action action = n.getId() == -1 ? OpenstreetmapUtil.Action.CREATE : OpenstreetmapUtil.Action.MODIFY;
+				OsmPoint.Action action = n.getId() == -1 ? OsmPoint.Action.CREATE : OsmPoint.Action.MODIFY;
 				Map<AmenityType, Map<String, String>> typeNameToTagVal = MapRenderingTypes.getDefault().getAmenityTypeNameToTagVal();
 				AmenityType type = a.getType();
 				String tag = type.getDefaultTag();
@@ -362,8 +362,8 @@ public class EditingPOIActivity implements DialogProvider {
 	}
 	
 	
-	public void commitNode(final OpenstreetmapUtil.Action action, final Node n, final EntityInfo info, final String comment, final Runnable successAction) {
+	public void commitNode(final OsmPoint.Action action, final Node n, final EntityInfo info, final String comment, final Runnable successAction) {
-		if (info == null && OpenstreetmapUtil.Action.CREATE != action) {
+		if (info == null && OsmPoint.Action.CREATE != action) {
 			AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.poi_error_info_not_loaded), Toast.LENGTH_LONG).show();
 			return;
 		}

OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java

@@ -42,11 +42,13 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 
 	private LocalOpenstreetmapAdapter listAdapter;
 
-	private OpenstreetmapsDbHelper db;
+	private OpenstreetmapsDbHelper dbpoi;
+	private OsmBugsDbHelper dbbug;
 
-	private OpenstreetmapRemoteUtil remote;
+	private OpenstreetmapRemoteUtil remotepoi;
+	private OsmBugsRemoteUtil remotebug;
 
-	protected OpenstreetmapPoint[] toUpload;
+	protected OsmPoint[] toUpload;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -71,9 +73,11 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 		});
 		setListAdapter(listAdapter);
 
-		db = new OpenstreetmapsDbHelper(this);
+		dbpoi = new OpenstreetmapsDbHelper(this);
+		dbbug = new OsmBugsDbHelper(this);
 
-		remote = new OpenstreetmapRemoteUtil(this, this.getWindow().getDecorView());
+		remotepoi = new OpenstreetmapRemoteUtil(this, this.getWindow().getDecorView());
+		remotebug = new OsmBugsRemoteUtil();
 
 		findViewById(R.id.UploadAllButton).setOnClickListener(new View.OnClickListener() {
 
@@ -81,7 +85,7 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 			@Override
 			public void onClick(View v) {
 				//NOTE, the order of upload is important, there can be more edits per one POI!!
-				toUpload = listAdapter.values().toArray(new OpenstreetmapPoint[0]);
+				toUpload = listAdapter.values().toArray(new OsmPoint[0]);
 				showDialog(DIALOG_PROGRESS_UPLOAD);
 			}
 		});
@@ -91,10 +95,14 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 	protected void onResume() {
 		super.onResume();
 		listAdapter.clear();
-		List<OpenstreetmapPoint> l = db.getOpenstreetmapPoints();
+		List<OpenstreetmapPoint> l1 = dbpoi.getOpenstreetmapPoints();
-		android.util.Log.d(LogUtil.TAG, "List of POI " + l.size() + " length");
+		List<OsmbugsPoint> l2 = dbbug.getOsmbugsPoints();
-		for (OpenstreetmapPoint p : l) {
+		android.util.Log.d(LogUtil.TAG, "List " + (l1.size() + l2.size()) + " length");
-			listAdapter.addOpenstreetmapPoint(p);
+		for (OpenstreetmapPoint p : l1) {
+			listAdapter.addOsmPoint(p);
+		}
+		for (OsmbugsPoint p : l2) {
+			listAdapter.addOsmPoint(p);
 		}
 		listAdapter.notifyDataSetChanged();
 	}
@@ -105,21 +113,25 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 		int group = ExpandableListView.getPackedPositionGroup(packedPos);
 		int child = ExpandableListView.getPackedPositionChild(packedPos);
 		int itemId = item.getItemId();
-	    if(itemId == R.id.showpoi) {
+		if(itemId == R.id.showmod) {
 			OsmandSettings settings = getMyApplication().getSettings();
-			OpenstreetmapPoint info = (OpenstreetmapPoint) listAdapter.getChild(group, child);
+			OsmPoint info = (OsmPoint) listAdapter.getChild(group, child);
 			settings.setMapLocationToShow(info.getLatitude(), info.getLongitude(), settings.getLastKnownMapZoom());
 			MapActivity.launchMapActivityMoveToTop(LocalOpenstreetmapActivity.this);
 			return true;
-	    } else if(itemId == R.id.deletepoimod) {
+		} else if(itemId == R.id.deletemod) {
-			OpenstreetmapPoint info = (OpenstreetmapPoint) listAdapter.getChild(group, child);
+			OsmPoint info = (OsmPoint) listAdapter.getChild(group, child);
-			db.deleteAllPOIModifications(info.getId());
+			if (info.getGroup() == OsmPoint.Group.POI) {
+				dbpoi.deleteAllPOIModifications(info.getId());
+			} else if (info.getGroup() == OsmPoint.Group.BUG) {
+				dbbug.deleteAllBugModifications(info.getId());
+			}
 			listAdapter.delete(info);
 			return true;
-	    } else if(itemId == R.id.uploadpoimods) {
+		} else if(itemId == R.id.uploadmods) {
-			List<OpenstreetmapPoint> list = listAdapter.data.get(group);
+			List<OsmPoint> list = listAdapter.data.get(group);
 			if (list != null) {
-				toUpload = list.toArray(new OpenstreetmapPoint[] {});
+				toUpload = list.toArray(new OsmPoint[] {});
 				showDialog(DIALOG_PROGRESS_UPLOAD);
 				return true;
 			}
@@ -131,8 +143,11 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
-		if (db != null) {
+		if (dbpoi != null) {
-			db.close();
+			dbpoi.close();
+		}
+		if (dbbug != null) {
+			dbbug.close();
 		}
 	}
 	
@@ -143,7 +158,7 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 				return ProgressDialogImplementation.createProgressDialog(
 						LocalOpenstreetmapActivity.this,
 						getString(R.string.uploading),
-						getString(R.string.local_openstreetmap_uploading_poi),
+						getString(R.string.local_openstreetmap_uploading),
 						ProgressDialog.STYLE_HORIZONTAL).getDialog();
 		}
 		return null;
@@ -153,45 +168,63 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 	protected void onPrepareDialog(int id, Dialog dialog, Bundle args) {
 		switch (id) {
 		case DIALOG_PROGRESS_UPLOAD:
-			UploadOpenstreetmapPointAsyncTask uploadTask = new UploadOpenstreetmapPointAsyncTask((ProgressDialog) dialog, remote,
+			UploadOpenstreetmapPointAsyncTask uploadTask = new UploadOpenstreetmapPointAsyncTask((ProgressDialog) dialog, remotepoi,
-					toUpload.length);
+					 remotebug, toUpload.length);
 			uploadTask.execute(toUpload);
 			break;
 		}
 	}
 
-	public class UploadOpenstreetmapPointAsyncTask extends AsyncTask<OpenstreetmapPoint, OpenstreetmapPoint, Integer> {
+	public class UploadOpenstreetmapPointAsyncTask extends AsyncTask<OsmPoint, OsmPoint, Integer> {
 
 		private ProgressDialog progress;
 
-		private OpenstreetmapRemoteUtil remote;
+		private OpenstreetmapRemoteUtil remotepoi;
+
+		private OsmBugsRemoteUtil remotebug;
 
 		private int listSize = 0;
 
 		private boolean interruptUploading = false;
 
 		public UploadOpenstreetmapPointAsyncTask(ProgressDialog progress,
-												 OpenstreetmapRemoteUtil remote,
+												 OpenstreetmapRemoteUtil remotepoi,
+												 OsmBugsRemoteUtil remotebug,
 												 int listSize) {
 			this.progress = progress;
-			this.remote = remote;
+			this.remotepoi = remotepoi;
+			this.remotebug = remotebug;
 			this.listSize = listSize;
 		}
 
 		@Override
-		protected Integer doInBackground(OpenstreetmapPoint... points) {
+		protected Integer doInBackground(OsmPoint... points) {
 			int uploaded = 0;
 
-			for (OpenstreetmapPoint p : points) {
+			for (OsmPoint point : points) {
 				if (interruptUploading) break;
 
+				if (point.getGroup() == OsmPoint.Group.POI) {
+					OpenstreetmapPoint p = (OpenstreetmapPoint) point;
 					EntityInfo entityInfo = null;
-				if (OpenstreetmapUtil.Action.CREATE != p.getAction()) {
+					if (OsmPoint.Action.CREATE != p.getAction()) {
-					entityInfo = remote.loadNode(p.getEntity());
+						entityInfo = remotepoi.loadNode(p.getEntity());
 					}
 					Node n;
-				if ((n = remote.commitNodeImpl(p.getAction(), p.getEntity(), entityInfo, p.getComment())) != null) {
+					if ((n = remotepoi.commitNodeImpl(p.getAction(), p.getEntity(), entityInfo, p.getComment())) != null) {
-					remote.updateNodeInIndexes(LocalOpenstreetmapActivity.this, p.getAction(), n, p.getEntity());
+						remotepoi.updateNodeInIndexes(LocalOpenstreetmapActivity.this, p.getAction(), n, p.getEntity());
+						publishProgress(p);
+						uploaded++;
+					}
+				} else if (point.getGroup() == OsmPoint.Group.BUG) {
+					OsmbugsPoint p = (OsmbugsPoint) point;
+					if (p.getAction() == OsmPoint.Action.CREATE) {
+						remotebug.createNewBug(p.getLatitude(), p.getLongitude(), p.getText(), p.getAuthor());
+					} else if (p.getAction() == OsmPoint.Action.MODIFY) {
+						remotebug.addingComment(p.getId(), p.getText(), p.getAuthor());
+					} else if (p.getAction() == OsmPoint.Action.DELETE) {
+						remotebug.closingBug(p.getId());
+					}
 					publishProgress(p);
 					uploaded++;
 				}
@@ -219,7 +252,7 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 		protected void onPostExecute(Integer result) {
 			listAdapter.notifyDataSetChanged();
 			if(result != null){
-				AccessibleToast.makeText(LocalOpenstreetmapActivity.this, MessageFormat.format(getString(R.string.local_openstreetmap_poi_were_uploaded), result.intValue()), Toast.LENGTH_LONG).show();
+				AccessibleToast.makeText(LocalOpenstreetmapActivity.this, MessageFormat.format(getString(R.string.local_openstreetmap_were_uploaded), result.intValue()), Toast.LENGTH_LONG).show();
 			}
 			removeDialog(DIALOG_PROGRESS_UPLOAD);
 		}
@@ -229,7 +262,7 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 		}
 
 		@Override
-		protected void onProgressUpdate(OpenstreetmapPoint... points) {
+		protected void onProgressUpdate(OsmPoint... points) {
 			listAdapter.delete(points[0]);
 			progress.incrementProgressBy(1);
 		}
@@ -237,7 +270,7 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 	}
 	
 	protected class LocalOpenstreetmapAdapter extends BaseExpandableListAdapter {
-		Map<Long, List<OpenstreetmapPoint>> data = new LinkedHashMap<Long, List<OpenstreetmapPoint>>();
+		Map<Long, List<OsmPoint>> data = new LinkedHashMap<Long, List<OsmPoint>>();
 		List<Long> category = new ArrayList<Long>();
 		
 
@@ -250,21 +283,26 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 			notifyDataSetChanged();
 		}
 
-		public List<OpenstreetmapPoint> values() {
+		public List<OsmPoint> values() {
-			List<OpenstreetmapPoint> values = new ArrayList<OpenstreetmapPoint>();
+			List<OsmPoint> values = new ArrayList<OsmPoint>();
-			for (List<OpenstreetmapPoint> v : data.values()) {
+			for (List<OsmPoint> v : data.values()) {
 				values.addAll(v);
 			}
 			return values;
 		}
 
-		public void delete(OpenstreetmapPoint i) {
+		public void delete(OsmPoint i) {
 			final AmenityIndexRepositoryOdb repo = getMyApplication().getResourceManager().getUpdatablePoiDb();
 			android.util.Log.d(LogUtil.TAG, "Delete " + i);
-			db.deleteOpenstreetmap(i);
+
+			if (i.getGroup() == OsmPoint.Group.POI) {
+				dbpoi.deleteOpenstreetmap((OpenstreetmapPoint) i);
+			} else if (i.getGroup() == OsmPoint.Group.BUG) {
+				dbbug.deleteOsmbugs((OsmbugsPoint) i);
+			}
 			Long c = i.getId();
 			if(c != null){
-				List<OpenstreetmapPoint> list = data.get(c);
+				List<OsmPoint> list = data.get(c);
 				list.remove(i);
 				if (list.isEmpty()) {
 					data.remove(c);
@@ -272,8 +310,11 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 				}
 				repo.deleteAmenities(i.getId() << 1);
 				// We need to re-insert the POI if it is a delete or modify
-				for (OpenstreetmapPoint p : list) {
+				for (OsmPoint point : list) {
-					remote.updateNodeInIndexes(LocalOpenstreetmapActivity.this, p.getAction(), p.getEntity(), p.getEntity());
+					if (point.getGroup() == OsmPoint.Group.POI) {
+						OpenstreetmapPoint p = (OpenstreetmapPoint) point;
+						remotepoi.updateNodeInIndexes(LocalOpenstreetmapActivity.this, p.getAction(), p.getEntity(), p.getEntity());
+					}
 				}
 				repo.clearCache();
 			}
@@ -284,7 +325,7 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 			notifyDataSetChanged();
 		}
 		
-		public void addOpenstreetmapPoint(OpenstreetmapPoint info) {
+		public void addOsmPoint(OsmPoint info) {
 			int found = -1;
 			// search from end
 			for (int i = category.size() - 1; i >= 0; i--) {
@@ -299,13 +340,13 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 				category.add(info.getId());
 			}
 			if (!data.containsKey(category.get(found))) {
-				data.put(category.get(found), new ArrayList<OpenstreetmapPoint>());
+				data.put(category.get(found), new ArrayList<OsmPoint>());
 			}
 			data.get(category.get(found)).add(info);
 		}
 
 		@Override
-		public OpenstreetmapPoint getChild(int groupPosition, int childPosition) {
+		public OsmPoint getChild(int groupPosition, int childPosition) {
 			Long cat = category.get(groupPosition);
 			return data.get(cat).get(childPosition);
 		}
@@ -319,18 +360,21 @@ public class LocalOpenstreetmapActivity extends OsmandExpandableListActivity {
 		@Override
 		public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
 			View v = convertView;
-			final OpenstreetmapPoint child = (OpenstreetmapPoint) getChild(groupPosition, childPosition);
+			final OsmPoint child = (OsmPoint) getChild(groupPosition, childPosition);
 			if (v == null ) {
 				LayoutInflater inflater = getLayoutInflater();
 				v = inflater.inflate(net.osmand.plus.R.layout.local_openstreetmap_list_item, parent, false);
 			}
 			TextView viewName = ((TextView) v.findViewById(R.id.local_openstreetmap_name));
-			viewName.setText("(" + child.getSubtype() + ") " + child.getName());
+			if (child.getGroup() == OsmPoint.Group.POI)
-			if (child.getAction() == OpenstreetmapUtil.Action.CREATE) {
+				viewName.setText("(" + ((OpenstreetmapPoint) child).getSubtype() + ") " + ((OpenstreetmapPoint) child).getName());
+			else if (child.getGroup() == OsmPoint.Group.BUG)
+				viewName.setText("(" + ((OsmbugsPoint) child).getAuthor() + ") " + ((OsmbugsPoint) child).getText());
+			if (child.getAction() == OsmPoint.Action.CREATE) {
 				viewName.setTextColor(getResources().getColor(R.color.osm_create));
-			} else if (child.getAction() == OpenstreetmapUtil.Action.MODIFY) {
+			} else if (child.getAction() == OsmPoint.Action.MODIFY) {
 				viewName.setTextColor(getResources().getColor(R.color.osm_modify));
-			} else if (child.getAction() == OpenstreetmapUtil.Action.DELETE) {
+			} else if (child.getAction() == OsmPoint.Action.DELETE) {
 				viewName.setTextColor(getResources().getColor(R.color.osm_delete));
 			}
 

OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapLocalUtil.java

@@ -37,7 +37,7 @@ public class OpenstreetmapLocalUtil extends AbstractOpenstreetmapUtil {
 	}
 	
 	@Override
-	public Node commitNodeImpl(Action action, Node n, EntityInfo info, String comment){
+	public Node commitNodeImpl(OsmPoint.Action action, Node n, EntityInfo info, String comment){
 		Node newNode = n;
 		if (n.getId() == -1) {
 			newNode = new Node(n,--nextid); //generate local id for the created node
@@ -46,7 +46,7 @@ public class OpenstreetmapLocalUtil extends AbstractOpenstreetmapUtil {
 		p.setEntity(newNode);
 		p.setAction(action);
 		p.setComment(comment);
-		if (p.getAction() == Action.DELETE && newNode.getId() < 0) { //if it is our local poi
+		if (p.getAction() == OsmPoint.Action.DELETE && newNode.getId() < 0) { //if it is our local poi
 			db.deleteAllPOIModifications(p.getId());
 		} else {
 			db.addOpenstreetmap(p);

OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapPoint.java

@@ -6,12 +6,10 @@ import net.osmand.data.AmenityType;
 import net.osmand.osm.Node;
 import net.osmand.osm.OSMSettings.OSMTagKey;
 
-public class OpenstreetmapPoint implements Serializable {
+public class OpenstreetmapPoint extends OsmPoint implements Serializable {
 	private static final long serialVersionUID = 729654300829771467L;
 	private Node entity;
-	private OpenstreetmapUtil.Action action;
 	private String comment;
-	private boolean stored = false;
 
 	public OpenstreetmapPoint(){
 	}
@@ -51,6 +49,10 @@ public class OpenstreetmapPoint implements Serializable {
 		return entity.getLongitude();
 	}
 
+	public Group getGroup() {
+		return Group.POI;
+	}
+
 	public String getOpeninghours() {
 		String ret = entity.getTag(OSMTagKey.OPENING_HOURS.getValue());
 		if (ret == null)
@@ -62,38 +64,18 @@ public class OpenstreetmapPoint implements Serializable {
 		return entity;
 	}
 
-	public OpenstreetmapUtil.Action getAction() {
-		return action;
-	}
-
 	public String getComment() {
 		return comment;
 	}
 
-	public boolean isStored() {
-		return stored;
-	}
-
 	public void setEntity(Node entity) {
 		this.entity = entity;
 	}
 
-	public void setAction(String action) {
-		this.action = OpenstreetmapRemoteUtil.actionString.get(action);
-	}
-
-	public void setAction(OpenstreetmapUtil.Action action) {
-		this.action = action;
-	}
-
 	public void setComment(String comment) {
 		this.comment = comment;
 	}
 
-	public void setStored(boolean stored) {
-		this.stored = stored;
-	}
-
 	@Override
 	public String toString() {
 		return new StringBuffer("Openstreetmap Point ").append(this.getAction()).append(" ").append(this.getName())

OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java

@@ -14,7 +14,6 @@ import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.MessageFormat;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -61,18 +60,6 @@ public class OpenstreetmapRemoteUtil extends AbstractOpenstreetmapUtil {
 //	private final static String SITE_API = "http://api06.dev.openstreetmap.org/";
 	private final static String SITE_API = "http://api.openstreetmap.org/"; //$NON-NLS-1$
 
-	public static final Map<Action, String> stringAction = new HashMap<Action, String>();
-	public static final Map<String, Action> actionString = new HashMap<String, Action>();
-	static {
-		stringAction.put(Action.CREATE, "create");
-		stringAction.put(Action.MODIFY, "modify");
-		stringAction.put(Action.DELETE, "delete");
-
-		actionString.put("create", Action.CREATE);
-		actionString.put("modify", Action.MODIFY);
-		actionString.put("delete", Action.DELETE);
-	};
-
 	private static final long NO_CHANGESET_ID = -1;
 	
 	private final Context ctx;
@@ -336,7 +323,7 @@ public class OpenstreetmapRemoteUtil extends AbstractOpenstreetmapUtil {
 	}
 
 	@Override
-	public Node commitNodeImpl(Action action, final Node n, EntityInfo info, String comment){
+	public Node commitNodeImpl(OsmPoint.Action action, final Node n, EntityInfo info, String comment){
 		if (isNewChangesetRequired()){
 			changeSetId = openChangeSet(comment);
 			changeSetTimeStamp = System.currentTimeMillis();
@@ -355,11 +342,11 @@ public class OpenstreetmapRemoteUtil extends AbstractOpenstreetmapUtil {
 				ser.startTag(null, "osmChange"); //$NON-NLS-1$
 				ser.attribute(null, "version", "0.6");  //$NON-NLS-1$ //$NON-NLS-2$
 				ser.attribute(null, "generator", Version.getAppName(ctx)); //$NON-NLS-1$
-				ser.startTag(null, stringAction.get(action));
+				ser.startTag(null, OsmPoint.stringAction.get(action));
 				ser.attribute(null, "version", "0.6"); //$NON-NLS-1$ //$NON-NLS-2$
 				ser.attribute(null, "generator", Version.getAppName(ctx)); //$NON-NLS-1$
 				writeNode(n, info, ser, changeSetId, settings.USER_NAME.get());
-				ser.endTag(null, stringAction.get(action));
+				ser.endTag(null, OsmPoint.stringAction.get(action));
 				ser.endTag(null, "osmChange"); //$NON-NLS-1$
 				ser.endDocument();
 			} catch (IOException e) {
@@ -369,7 +356,7 @@ public class OpenstreetmapRemoteUtil extends AbstractOpenstreetmapUtil {
 					writer.getBuffer().toString(), ctx.getString(R.string.commiting_node), true);
 			log.debug(res+""); //$NON-NLS-1$
 			if (res != null) {
-				if (Action.CREATE == action) {
+				if (OsmPoint.Action.CREATE == action) {
 					long newId = n.getId();
 					int i = res.indexOf("new_id=\""); //$NON-NLS-1$
 					if (i > 0) {

OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapUtil.java

@@ -7,13 +7,11 @@ import android.app.Activity;
 
 public interface OpenstreetmapUtil {
 	
-	public static enum Action {CREATE, MODIFY, DELETE};
-
 	public EntityInfo getEntityInfo();
 	
-	public Node commitNodeImpl(Action action, Node n, EntityInfo info, String comment);
+	public Node commitNodeImpl(OsmPoint.Action action, Node n, EntityInfo info, String comment);
 	
 	public Node loadNode(Amenity n);
 	
-	public void updateNodeInIndexes(Activity ctx, OpenstreetmapUtil.Action action, Node n, Node oldNode);
+	public void updateNodeInIndexes(Activity ctx, OsmPoint.Action action, Node n, Node oldNode);
 }

OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapsDbHelper.java

@@ -58,7 +58,7 @@ public class OpenstreetmapsDbHelper extends SQLiteOpenHelper {
 		if (db != null) {
 			db.execSQL("INSERT INTO " + OPENSTREETMAP_TABLE_NAME +
 					" (" + OPENSTREETMAP_COL_ID + ", " + OPENSTREETMAP_COL_NAME + ", " + OPENSTREETMAP_COL_TYPE + ", " + OPENSTREETMAP_COL_SUBTYPE + ", " + OPENSTREETMAP_COL_LAT + "," + OPENSTREETMAP_COL_LON + "," + OPENSTREETMAP_COL_ACTION + "," + OPENSTREETMAP_COL_COMMENT + "," + OPENSTREETMAP_COL_OPENINGHOURS + ")" +
-					   " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", new Object[] { p.getId(), p.getName(), p.getType(), p.getSubtype(), p.getLatitude(), p.getLongitude(), OpenstreetmapRemoteUtil.stringAction.get(p.getAction()), p.getComment(), p.getOpeninghours() }); //$NON-NLS-1$ //$NON-NLS-2$
+					   " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", new Object[] { p.getId(), p.getName(), p.getType(), p.getSubtype(), p.getLatitude(), p.getLongitude(), OsmPoint.stringAction.get(p.getAction()), p.getComment(), p.getOpeninghours() }); //$NON-NLS-1$ //$NON-NLS-2$
 			cachedOpenstreetmapPoints.add(p);
 			p.setStored(true);
 			return true;
@@ -80,7 +80,7 @@ public class OpenstreetmapsDbHelper extends SQLiteOpenHelper {
 					   OPENSTREETMAP_COL_ACTION + " = ? AND " +
 					   OPENSTREETMAP_COL_COMMENT + " = ? AND " +
 					   OPENSTREETMAP_COL_OPENINGHOURS + " = ?",
-					   new Object[] { p.getId(), p.getName(), p.getType(), p.getSubtype(), p.getLatitude(), p.getLongitude(), OpenstreetmapRemoteUtil.stringAction.get(p.getAction()), p.getComment(), p.getOpeninghours() }); //$NON-NLS-1$ //$NON-NLS-2$
+					   new Object[] { p.getId(), p.getName(), p.getType(), p.getSubtype(), p.getLatitude(), p.getLongitude(), OsmPoint.stringAction.get(p.getAction()), p.getComment(), p.getOpeninghours() }); //$NON-NLS-1$ //$NON-NLS-2$
 			cachedOpenstreetmapPoints.remove(p);
 			p.setStored(false);
 			return true;

OsmAnd/src/net/osmand/plus/osmedit/OsmBugsDbHelper.java

@@ -53,7 +53,7 @@ public class OsmBugsDbHelper extends SQLiteOpenHelper {
 		if (db != null) {
 			db.execSQL("INSERT INTO " + OSMBUGS_TABLE_NAME +
 					" (" + OSMBUGS_COL_ID + ", " + OSMBUGS_COL_TEXT + ", " + OSMBUGS_COL_LAT + "," + OSMBUGS_COL_LON + "," + OSMBUGS_COL_ACTION + "," + OSMBUGS_COL_AUTHOR + ")" +
-					   " VALUES (?, ?, ?, ?, ?, ?)", new Object[] { p.getId(), p.getText(), p.getLatitude(), p.getLongitude(), OsmBugsRemoteUtil.stringAction.get(p.getAction()), p.getAuthor() }); //$NON-NLS-1$ //$NON-NLS-2$
+					   " VALUES (?, ?, ?, ?, ?, ?)", new Object[] { p.getId(), p.getText(), p.getLatitude(), p.getLongitude(), OsmPoint.stringAction.get(p.getAction()), p.getAuthor() }); //$NON-NLS-1$ //$NON-NLS-2$
 			cachedOsmbugsPoints.add(p);
 			p.setStored(true);
 			return true;
@@ -72,7 +72,7 @@ public class OsmBugsDbHelper extends SQLiteOpenHelper {
 					   OSMBUGS_COL_LON + " = ? AND " +
 					   OSMBUGS_COL_ACTION + " = ? AND " +
 					   OSMBUGS_COL_AUTHOR + " = ?",
-					   new Object[] { p.getId(), p.getText(), p.getLatitude(), p.getLongitude(), OsmBugsRemoteUtil.stringAction.get(p.getAction()), p.getAuthor() }); //$NON-NLS-1$ //$NON-NLS-2$
+					   new Object[] { p.getId(), p.getText(), p.getLatitude(), p.getLongitude(), OsmPoint.stringAction.get(p.getAction()), p.getAuthor() }); //$NON-NLS-1$ //$NON-NLS-2$
 			cachedOsmbugsPoints.remove(p);
 			p.setStored(false);
 			return true;

OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLocalUtil.java

@@ -24,7 +24,7 @@ public class OsmBugsLocalUtil implements OsmBugsUtil {
 		p.setText(text);
 		p.setLatitude(latitude);
 		p.setLongitude(longitude);
-		p.setAction(OsmBugsUtil.Action.CREATE);
+		p.setAction(OsmPoint.Action.CREATE);
 		p.setAuthor(authorName);
 		return db.addOsmbugs(p);
 	}
@@ -33,7 +33,7 @@ public class OsmBugsLocalUtil implements OsmBugsUtil {
 		OsmbugsPoint p = new OsmbugsPoint();
 		p.setId(id);
 		p.setText(text);
-		p.setAction(OsmBugsUtil.Action.MODIFY);
+		p.setAction(OsmPoint.Action.MODIFY);
 		p.setAuthor(authorName);
 		return db.addOsmbugs(p);
 	}
@@ -41,7 +41,7 @@ public class OsmBugsLocalUtil implements OsmBugsUtil {
 	public boolean closingBug(long id){
 		OsmbugsPoint p = new OsmbugsPoint();
 		p.setId(id);
-		p.setAction(OsmBugsUtil.Action.CLOSE);
+		p.setAction(OsmPoint.Action.DELETE);
 		return db.addOsmbugs(p);
 	}
 

OsmAnd/src/net/osmand/plus/osmedit/OsmBugsRemoteUtil.java

@@ -6,8 +6,6 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
 
 import net.osmand.LogUtil;
 
@@ -19,18 +17,6 @@ public class OsmBugsRemoteUtil implements OsmBugsUtil {
 
 	private final static String SITE_API = "http://openstreetbugs.schokokeks.org/api/0.1/"; //$NON-NLS-1$
 
-	public static final Map<Action, String> stringAction = new HashMap<Action, String>();
-	public static final Map<String, Action> actionString = new HashMap<String, Action>();
-	static {
-		stringAction.put(Action.CREATE, "create");
-		stringAction.put(Action.MODIFY, "modify");
-		stringAction.put(Action.CLOSE, "close");
-
-		actionString.put("create", Action.CREATE);
-		actionString.put("modify", Action.MODIFY);
-		actionString.put("close", Action.CLOSE);
-	};
-
 	public boolean createNewBug(double latitude, double longitude, String text, String authorName){
 		StringBuilder b = new StringBuilder();
 		b.append(SITE_API).append("addPOIexec?"); //$NON-NLS-1$

OsmAnd/src/net/osmand/plus/osmedit/OsmPoint.java

@@ -0,0 +1,64 @@
+package net.osmand.plus.osmedit;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public abstract class OsmPoint {
+	private static final long serialVersionUID = 729654300829771469L;
+
+	public static enum Group {BUG, POI};
+
+	public static enum Action {CREATE, MODIFY, DELETE};
+
+	public static final Map<Action, String> stringAction = new HashMap<Action, String>();
+	public static final Map<String, Action> actionString = new HashMap<String, Action>();
+	static {
+		stringAction.put(Action.CREATE, "create");
+		stringAction.put(Action.MODIFY, "modify");
+		stringAction.put(Action.DELETE, "delete");
+
+		actionString.put("create", Action.CREATE);
+		actionString.put("modify", Action.MODIFY);
+		actionString.put("delete", Action.DELETE);
+	};
+
+	private Action action;
+	private boolean stored = false;
+
+	public OsmPoint(){
+	}
+
+	public abstract long getId();
+
+	public abstract double getLatitude();
+
+	public abstract double getLongitude();
+
+	public abstract Group getGroup();
+
+	public Action getAction() {
+		return action;
+	}
+
+	public boolean isStored() {
+		return stored;
+	}
+
+	public void setAction(String action) {
+		this.action = actionString.get(action);
+	}
+
+	public void setAction(Action action) {
+		this.action = action;
+	}
+
+	public void setStored(boolean stored) {
+		this.stored = stored;
+	}
+
+	@Override
+	public String toString() {
+		return new StringBuffer("Osm Point ").append(this.getAction()).append(" ")
+			.toString();
+	}
+}

OsmAnd/src/net/osmand/plus/osmedit/OsmbugsPoint.java

@@ -2,16 +2,14 @@ package net.osmand.plus.osmedit;
 
 import java.io.Serializable;
 
-public class OsmbugsPoint implements Serializable {
+public class OsmbugsPoint extends OsmPoint implements Serializable {
 	private static final long serialVersionUID = 729654300829771468L;
 
 	private long id;
 	private String text;
 	private double latitude;
 	private double longitude;
-	private OsmBugsUtil.Action action;
 	private String author;
-	private boolean stored = false;
 
 	public OsmbugsPoint(){
 	}
@@ -32,18 +30,14 @@ public class OsmbugsPoint implements Serializable {
 		return longitude;
 	}
 
-	public OsmBugsUtil.Action getAction() {
+	public Group getGroup() {
-		return action;
+		return Group.BUG;
 	}
 
 	public String getAuthor() {
 		return author;
 	}
 
-	public boolean isStored() {
-		return stored;
-	}
-
 	public void setId(long id) {
 		this.id = id;
 	}
@@ -60,22 +54,10 @@ public class OsmbugsPoint implements Serializable {
 		this.longitude = longitude;
 	}
 
-	public void setAction(String action) {
-		this.action = OsmBugsRemoteUtil.actionString.get(action);
-	}
-
-	public void setAction(OsmBugsUtil.Action action) {
-		this.action = action;
-	}
-
 	public void setAuthor(String author) {
 		this.author = author;
 	}
 
-	public void setStored(boolean stored) {
-		this.stored = stored;
-	}
-
 	@Override
 	public String toString() {
 		return new StringBuffer("OsmBugs Point ").append(this.getAction()).append(" ").append(this.getText())