diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 3f9663e..a17aac8 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -514,7 +514,7 @@
         positionMarker.setPosition(gp);
         positionMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM);
         positionMarker.setTitle(getString(R.string.osm_marker_title));
-        positionMarker.setSnippet("Latitude: " + gp.getLatitude() + "\n" + "Longitude: " + gp.getLongitude());
+        positionMarker.setSnippet(String.format(getString(R.string.osm_marker_snippet), gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), 0));
         mapView.getOverlays().add(positionMarker);
         mapView.invalidate();
     }
@@ -597,13 +597,13 @@
                         titleArr = titles.toArray(titleArr);
                         descArr = descs.toArray(descArr);
                         WarningListAdapter warningAdapter = new WarningListAdapter(MainActivity.this, titleArr, descArr);
-                        InformListDialog weatherHintDialog = new InformListDialog("Hints", warningAdapter);
+                        InformListDialog weatherHintDialog = new InformListDialog(getString(R.string.hint_dialog_title), warningAdapter);
                         weatherHintDialog.show(getFragmentManager(), "Warning Hint Dialog");
                     }
                 }
                 if (isSevereWeather) {
-                    String warnMsg = "The weather around you in " + todaysWeather.location.getCity() + " is '" + todaysWeather.currentCondition.getWeatherCode().getLabel(getApplicationContext()) + "'!";
-                    InformDialog informAlertDialog = new InformDialog("Weather Warning!", warnMsg);
+                    String warnMsg = String.format(getString(R.string.weather_warning_dialog_msg), todaysWeather.location.getCity(), todaysWeather.currentCondition.getWeatherCode().getLabel(getApplicationContext()));
+                    InformDialog informAlertDialog = new InformDialog(getString(R.string.weather_warning_dialog_title), warnMsg);
                     informAlertDialog.show(getFragmentManager(), "Inform Dialog - Weather Warning");
                 }
             }
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 9ca58b2..8da70be 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -27,6 +27,9 @@
     <string name="inform_title">Information</string>
     <string name="inform_gps_pos_not_found">Dein Standort konnte nicht ermittelt werden!\nBitte versuche es nochmal, sobald dein Standort gefunden wurde.</string>
     <string name="add_poi_success">Dein POI wurde erfolgreich hinzugefügt!</string>
+    <string name="hint_dialog_title">Hinweise</string>
+    <string name="weather_warning_dialog_title">Wetterwarnung!</string>
+    <string name="weather_warning_dialog_msg">Das Wetter in deiner Umgebung in %1$s ist \'%2$s\'!</string>
     <string name="inform_positive_button">Verstanden!</string>
     <string name="osm_marker_title">Dein Standort</string>
     <string name="osm_marker_snippet">Latitude: %1$.03f&lt;br/&gt;Longitude: %2$.03f&lt;br/&gt;Höhe: %3$dm&lt;br/&gt;Hinzugefügt: %4$s</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 290cb89..7f6d7e4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,6 +28,9 @@
     <string name="inform_title">Information</string>
     <string name="inform_gps_pos_not_found">Couldn\'t find your location!\nPlease try again after your position has been found.</string>
     <string name="add_poi_success">Sucessfully added your POI!</string>
+    <string name="hint_dialog_title">Hints</string>
+    <string name="weather_warning_dialog_title">Weather Warning!</string>
+    <string name="weather_warning_dialog_msg">The weather around you in %1$s is \'%2$s\'!</string>
     <string name="inform_positive_button">Got it!</string>
     <string name="osm_marker_title">Your position</string>
     <string name="osm_marker_snippet">Latitude: %1$.03f&lt;br/&gt;Longitude: %2$.03f&lt;br/&gt;Altitude: %3$d meters&lt;br/&gt;Added: %4$s</string>