diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index f702a99c61..99c7bb5000 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -276,7 +276,7 @@
 	<string name="share">مشاركة</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">رسالة</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">البريد الالكتروني</string>
 	<!-- Copy Link -->
 	<string name="copy_link">نسخ الرابط</string>
@@ -771,7 +771,7 @@
 	<string name="dialog_routing_if_get_cross_route">هل تريد إنشاء مسار مباشر بشكل أكبر يمتد عبر أكثر من خريطة؟</string>
 	<string name="dialog_routing_cross_route_is_optimal">هناك مسار أفضل يعبر حافة هذه الخريطة.</string>
 	<string name="dialog_routing_always_cross_that_border">اعبر هذه الحدود دائمًا</string>
-	<string name="dialog_routing_not_now">ليس الآن</string>
+	<string name="not_now">ليس الآن</string>
 	<string name="dialog_routing_build_route">إنشاء</string>
 	<string name="dialog_routing_download_and_build_cross_route">هل ترغب في تنزيل الخريطة وإنشاء مسار أفضل يمتد عبر أكثر من خريطة؟</string>
 	<string name="dialog_routing_download_cross_route">تنزيل الخريطة لإنشاء مسار أفضل يعبر حافة هذه الخريطة.</string>
@@ -851,4 +851,52 @@
 	<string name="download_all">تنزيل الكل</string>
 	<string name="delete_all">حذف الكل</string>
 	<string name="autodownload">التنزيل التلقائي</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">مغلق الآن</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">يوميا</string>
+	<string name="twentyfour_seven">ليلا ونهارا</string>
+	<string name="day_off_today">اليوم عطلة</string>
+	<string name="day_off">عطلة</string>
+	<string name="today">اليوم</string>
+	<string name="sunrise_to_sunset">من الشروق إلى المغيب</string>
+	<string name="add_opening_hours">اضف ساعات عمل</string>
+	<string name="edit_opening_hours">حرر ساعات عمل</string>
+	<string name="profile">الملف الشخصي</string>
+	<string name="no_osm_account">ليس لديك حساب في OpenStreetMap؟</string>
+	<string name="register_at_openstreetmap">التسجيل</string>
+	<string name="login">تسجيل الدخول</string>
+	<string name="password">كلمة المرور</string>
+	<string name="forgot_password">هل نسيت كلمة المرور؟</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">استعادة كلمة المرور</string>
+	<string name="enter_email_address_to_reset_password">أدخل عنوان البريد الإلكتروني الذي استخدمته عند التسجيل وسنرسل لك رابط لتجديد كلمة المرور</string>
+	<string name="reset_password">إعادة تعيين كلمة المرور</string>
+	<string name="username">اسم المستخدم</string>
+	<string name="osm_account">حساب OSM</string>
+	<string name="logout">تسجيل الخروج</string>
+	<string name="login_and_edit_map_motivation_message">قم بتسجيل الدخول وعدل البيانات الخاصة بالمكان على الخريطة وسنجعلها متاحة لملايين المستخدمين الآخرين. لنجعل العالم أفضل معا.</string>
+	<string name="not_sent">لم ترسل</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">تغييرات</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">لقد قمت بتعديلك الأول!</string>
+	<string name="thank_you">شكرا لك</string>
+	<string name="login_with_openstreetmap">قم بتسجيل الدخول في www.openstreetmap.org</string>
+	<string name="edit_place">تعديل المكان</string>
+	<string name="place_name">اسم المكان</string>
+	<string name="place_name_caption">أدخل الاسم كما هو مبين على الإشارة الخاصة بالمكان</string>
+	<string name="add_language">إضافة لغة</string>
+	<string name="address">العنوان</string>
+	<string name="street">الشارع</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">المبني</string>
+	<string name="details">التفاصيل</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">إضافة شارع</string>
+	<string name="choose_language">اختر اللغة</string>
+	<string name="choose_street">اختر الشارع</string>
+	<string name="postal_code">الرمز البريدي</string>
+	<!-- login text field -->
+	<string name="email_or_username">البريد الإلكتروني أو اسم المستخدم</string>
 </resources>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index d3fb2d0e78..b2e59247ad 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -273,7 +273,7 @@
 	<string name="share">Sdílet</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Zpráva</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Zkopírovat odkaz</string>
@@ -774,7 +774,7 @@
 	<string name="dialog_routing_if_get_cross_route">Chcete vytvořit přímější trasu, která vede přes více než jednu mapu?</string>
 	<string name="dialog_routing_cross_route_is_optimal">K dispozici je optimálnější trasa, která překračuje hranice této mapy.</string>
 	<string name="dialog_routing_always_cross_that_border">Vždy překročit tuto hranici</string>
-	<string name="dialog_routing_not_now">Nyní ne</string>
+	<string name="not_now">Nyní ne</string>
 	<string name="dialog_routing_build_route">Vytvořit</string>
 	<string name="dialog_routing_download_and_build_cross_route">Chcete mapu stáhnout a vytvořit optimálnější trasu, která vede přes více než jednu mapu?</string>
 	<string name="dialog_routing_download_cross_route">Stáhnout mapu a vytvořit optimálnější trasu, která překračuje hranice této mapy.</string>
@@ -854,4 +854,52 @@
 	<string name="download_all">Stáhnout vše</string>
 	<string name="delete_all">Odstranit vše</string>
 	<string name="autodownload">Automaticky stahovat</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Nyní je zavřeno</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Denně</string>
+	<string name="twentyfour_seven">Den a noc</string>
+	<string name="day_off_today">Dnes je den volna</string>
+	<string name="day_off">Den volna</string>
+	<string name="today">Dnes</string>
+	<string name="sunrise_to_sunset">Od úsvitu do soumraku</string>
+	<string name="add_opening_hours">Přidat otevírací dobu</string>
+	<string name="edit_opening_hours">Upravit otevírací dobu</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">Nemáte účet u OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Registrace</string>
+	<string name="login">Přihlásit se</string>
+	<string name="password">Heslo</string>
+	<string name="forgot_password">Zapomenuté heslo?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Obnovit heslo</string>
+	<string name="enter_email_address_to_reset_password">Zadejte emailovou adresu, kterou jste používali během registrace a my Vám pošleme odkaz, abyste mohli obnovit svoje heslo.</string>
+	<string name="reset_password">Resetovat heslo</string>
+	<string name="username">Uživatelské jméno</string>
+	<string name="osm_account">Účet OSM</string>
+	<string name="logout">Odhlášení</string>
+	<string name="login_and_edit_map_motivation_message">Přihlaste se a editujte informace o objektech na mapě a my je zpřístupníme miliónům dalších uživatelů. Udělejme společně svět dokonalejším místem.</string>
+	<string name="not_sent">Neposláno</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">změn</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Editovali jste svůj první objekt!</string>
+	<string name="thank_you">Děkujeme Vám</string>
+	<string name="login_with_openstreetmap">Log in at www.openstreetmap.org</string>
+	<string name="edit_place">Upravit místo</string>
+	<string name="place_name">Název místa</string>
+	<string name="place_name_caption">Zadejte název, jak je uveden na vývěsním štítu místa</string>
+	<string name="add_language">Přidat jazyk</string>
+	<string name="address">Adresa</string>
+	<string name="street">Ulice</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Budova</string>
+	<string name="details">Podrobnosti</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Přidat ulici</string>
+	<string name="choose_language">Zvolit jazyk</string>
+	<string name="choose_street">Zvolit ulici</string>
+	<string name="postal_code">PSČ</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-mail nebo uživatelské jméno</string>
 </resources>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 5be44423b4..b625274f60 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -274,7 +274,7 @@
 	<string name="share">Del</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Besked</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Kopier link</string>
@@ -767,7 +767,7 @@
 	<string name="dialog_routing_if_get_cross_route">Ønsker du at planlægge en mere direkte rute, der strækker sig over mere end ét kort?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Der findes en mere optimal rute, som strækker sig ud over dette korts grænser.</string>
 	<string name="dialog_routing_always_cross_that_border">Kryds altid denne grænse</string>
-	<string name="dialog_routing_not_now">Ikke nu</string>
+	<string name="not_now">Ikke nu</string>
 	<string name="dialog_routing_build_route">Opret</string>
 	<string name="dialog_routing_download_and_build_cross_route">Ønsker du at downloade kortet og planlægge en mere optimal rute, der strækker sig over mere end ét kort?</string>
 	<string name="dialog_routing_download_cross_route">Download kortet for at planlægge en mere optimal rute, der strækker sig ud over dette korts grænser.</string>
@@ -847,4 +847,52 @@
 	<string name="download_all">Download alle</string>
 	<string name="delete_all">Slet alle</string>
 	<string name="autodownload">Automatisk download</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Lukket nu</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Daglig</string>
+	<string name="twentyfour_seven">Dag og nat</string>
+	<string name="day_off_today">Fridag i dag</string>
+	<string name="day_off">Fridag</string>
+	<string name="today">I dag</string>
+	<string name="sunrise_to_sunset">Fra solopgang til solnedgang</string>
+	<string name="add_opening_hours">Tilføj arbejdstid</string>
+	<string name="edit_opening_hours">Rediger arbejdstid</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">Ingen konto på OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Tilmeld dig</string>
+	<string name="login">Log ind</string>
+	<string name="password">Adgangskode</string>
+	<string name="forgot_password">Glemt adgangskode?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Genopret adgangskode</string>
+	<string name="enter_email_address_to_reset_password">Indtast den e-mailadresse du anvendte under tilmelding, så sender vi dig linket til at forny din adgangskode.</string>
+	<string name="reset_password">Nulstil adgangskode</string>
+	<string name="username">Brugernavn</string>
+	<string name="osm_account">OSM-konto</string>
+	<string name="logout">Log ud</string>
+	<string name="login_and_edit_map_motivation_message">Log ind og rediger oplysninger for objekter på kortet, så sørger vi for, at de er tilgængelige for millioner af andre brugere. Lad os sammen gøre verden bedre.</string>
+	<string name="not_sent">Ikke sendt</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">ændringer</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Du har redigeret dit første objekt!</string>
+	<string name="thank_you">Mange tak</string>
+	<string name="login_with_openstreetmap">Log ind på www.openstreetmap.org</string>
+	<string name="edit_place">Redigér stedet</string>
+	<string name="place_name">Navn på sted</string>
+	<string name="place_name_caption">Indtast navnet, som det står på skiltet for stedet</string>
+	<string name="add_language">Tilføj et sprog</string>
+	<string name="address">Adresse</string>
+	<string name="street">Gade</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Bygning</string>
+	<string name="details">Oplysninger</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Tilføj en gade</string>
+	<string name="choose_language">Vælg et sprog</string>
+	<string name="choose_street">Vælg en gade</string>
+	<string name="postal_code">Postnummer</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-mail eller brugernavn</string>
 </resources>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 06fbb95435..1990efb361 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -278,7 +278,7 @@
 	<string name="share">Teilen</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Nachricht</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-Mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Link kopieren</string>
@@ -789,7 +789,7 @@
 	<string name="dialog_routing_if_get_cross_route">Möchten Sie eine direktere Route erstellen, die mehr als eine Karte umfasst?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Es ist eine bessere Route verfügbar, die den Rand dieser Karte überschreitet.</string>
 	<string name="dialog_routing_always_cross_that_border">Diese Grenze immer überschreiten</string>
-	<string name="dialog_routing_not_now">Nicht jetzt</string>
+	<string name="not_now">Nicht jetzt</string>
 	<string name="dialog_routing_build_route">Erstellen</string>
 	<string name="dialog_routing_download_and_build_cross_route">Möchten Sie die Karte herunterladen und eine bessere Route erstellen, die mehr als eine Karte umfasst?</string>
 	<string name="dialog_routing_download_cross_route">Laden Sie die Karte herunter, um eine bessere Route zu erstellen, die den Rand dieser Karte überschreitet.</string>
@@ -869,4 +869,52 @@
 	<string name="download_all">Alle herunterladen</string>
 	<string name="delete_all">Alle löschen</string>
 	<string name="autodownload">Automatisch Herunterladen</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Jetzt geschlossen</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Täglich</string>
+	<string name="twentyfour_seven">Tag und Nacht</string>
+	<string name="day_off_today">Heute Ruhetag</string>
+	<string name="day_off">Ruhetag</string>
+	<string name="today">Heute</string>
+	<string name="sunrise_to_sunset">Von Sonnenauf- bis Sonnenuntergang</string>
+	<string name="add_opening_hours">Geschäftszeiten hinzufügen</string>
+	<string name="edit_opening_hours">Geschäftszeiten bearbeiten</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">Kein Konto in OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Registrieren</string>
+	<string name="login">Anmelden</string>
+	<string name="password">Passwort</string>
+	<string name="forgot_password">Passwort vergessen?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Passwort wiederherstellen</string>
+	<string name="enter_email_address_to_reset_password">Geben Sie bitte die E-Mail-Adresse ein, die Sie zur Registrierung verwendet haben. Wir senden Ihnen dann den Link zur Erneuerung Ihres Passworts.</string>
+	<string name="reset_password">Passwort zurücksetzen</string>
+	<string name="username">Benutzername</string>
+	<string name="osm_account">OSM Konto</string>
+	<string name="logout">Abmelden</string>
+	<string name="login_and_edit_map_motivation_message">Anmelden und Informationen zu den Objekten auf der Karte bearbeiten. Wir werden sie für Millionen von anderen Nutzern verfügbar machen. Lassen Sie uns zusammen die Welt verbessern.</string>
+	<string name="not_sent">Nicht gesendet</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">Änderungen</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Sie haben Ihr erstes Objekt bearbeitet!</string>
+	<string name="thank_you">Danke</string>
+	<string name="login_with_openstreetmap">Anmelden bei www.openstreetmap.org</string>
+	<string name="edit_place">Platz bearbeiten</string>
+	<string name="place_name">Name des Platzes</string>
+	<string name="place_name_caption">Geben Sie den Namen ein, der auf dem Schild des Platzes steht</string>
+	<string name="add_language">Eine Sprache hinzufügen</string>
+	<string name="address">Adresse</string>
+	<string name="street">Straße</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Gebäude</string>
+	<string name="details">Einzelheiten</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Eine Straße hinzufügen</string>
+	<string name="choose_language">Eine Sprache wählen</string>
+	<string name="choose_street">Eine Straße wählen</string>
+	<string name="postal_code">Postleitzahl</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-Mail oder Benutzername</string>
 </resources>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 840426fdf3..237338ce49 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -265,7 +265,7 @@
 	<string name="share">Compartir</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Mensaje</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">Correo electrónico</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Copiar enlace</string>
@@ -760,7 +760,7 @@
 	<string name="dialog_routing_if_get_cross_route">¿Desea crear una ruta más directa que abarca más de un mapa?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Está disponible una ruta mejor que cruza los límites de este mapa.</string>
 	<string name="dialog_routing_always_cross_that_border">Cruzar siempre este límite</string>
-	<string name="dialog_routing_not_now">No ahora</string>
+	<string name="not_now">No ahora</string>
 	<string name="dialog_routing_build_route">Crear</string>
 	<string name="dialog_routing_download_and_build_cross_route">¿Desea descargar el mapa y crear una ruta mejor que abarca más de un mapa?</string>
 	<string name="dialog_routing_download_cross_route">Descargar el mapa para crear una ruta mejor que cruza los límites de este mapa.</string>
@@ -842,4 +842,52 @@
 	<string name="download_all">Descargar todos</string>
 	<string name="delete_all">Eliminar todos</string>
 	<string name="autodownload">Descarga automática</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Cerrado ahora</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Diario</string>
+	<string name="twentyfour_seven">Día y noche</string>
+	<string name="day_off_today">Día libre hoy</string>
+	<string name="day_off">Día libre</string>
+	<string name="today">Hoy</string>
+	<string name="sunrise_to_sunset">Del amanecer al atardecer</string>
+	<string name="add_opening_hours">Añadir horas comerciales</string>
+	<string name="edit_opening_hours">Editar las horas comerciales</string>
+	<string name="profile">Perfil</string>
+	<string name="no_osm_account">¿No tienes cuenta en OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Registrarse</string>
+	<string name="login">Iniciar sesión</string>
+	<string name="password">Contraseña</string>
+	<string name="forgot_password">¿Has olvidado tu contraseña?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Restaurar contraseña</string>
+	<string name="enter_email_address_to_reset_password">Introduce la dirección de correo electrónico que utilizaste durante el registro y te enviaremos el enlace para restaurar tu contraseña.</string>
+	<string name="reset_password">Restablecer contraseña</string>
+	<string name="username">Usuario</string>
+	<string name="osm_account">Cuenta OSM</string>
+	<string name="logout">Cerrar sesión</string>
+	<string name="login_and_edit_map_motivation_message">Inicia sesión y edita la información de los objetos en el mapa y los pondremos a disposición de millones de otros usuarios. Hagamos de este mundo un lugar mejor.</string>
+	<string name="not_sent">No enviado</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">cambios</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">¡Has editado tu primer objeto!</string>
+	<string name="thank_you">Gracias</string>
+	<string name="login_with_openstreetmap">Iniciar sesión en www.openstreetmap.org</string>
+	<string name="edit_place">Editar el lugar</string>
+	<string name="place_name">Nombre del lugar</string>
+	<string name="place_name_caption">Introduce el nombre como está en la señal del lugar</string>
+	<string name="add_language">Añadir un idioma</string>
+	<string name="address">Dirección</string>
+	<string name="street">Calle</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Edificio</string>
+	<string name="details">Detalles</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Añadir una calle</string>
+	<string name="choose_language">Elegir un idioma</string>
+	<string name="choose_street">Elegir una calle</string>
+	<string name="postal_code">Código postal</string>
+	<!-- login text field -->
+	<string name="email_or_username">Correo electrónico o usuario</string>
 </resources>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 511501067a..697bb51219 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -272,7 +272,7 @@
 	<string name="share">Jaa</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Viesti</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">Sähköposti</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Kopioi linkki</string>
@@ -767,7 +767,7 @@
 	<string name="dialog_routing_if_get_cross_route">Haluatko luoda suoremman reitin, joka ylettyy usealle kartalle?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Tarjolla on suorempi reitti, joka ylittää tämän kartan reunan.</string>
 	<string name="dialog_routing_always_cross_that_border">Ylitä aina tämä raja</string>
-	<string name="dialog_routing_not_now">Ei nyt</string>
+	<string name="not_now">Ei nyt</string>
 	<string name="dialog_routing_build_route">Luo</string>
 	<string name="dialog_routing_download_and_build_cross_route">Haluatko ladata kartan ja luoda paremman reitin, joka ylettyy usealle kartalle?</string>
 	<string name="dialog_routing_download_cross_route">Lataa kartta ja luo parempi reitti, joka ylittää tämän kartan reunan.</string>
@@ -847,4 +847,52 @@
 	<string name="download_all">Lataa kaikki</string>
 	<string name="delete_all">Poista kaikki</string>
 	<string name="autodownload">Lataa automaattisesti</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Suljettu nyt</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Päivittäin</string>
+	<string name="twentyfour_seven">Päivin ja öin</string>
+	<string name="day_off_today">Vapaapäivä tänään</string>
+	<string name="day_off">Vapaapäivä</string>
+	<string name="today">Tänään</string>
+	<string name="sunrise_to_sunset">Auringonnoususta auringonlaskuun</string>
+	<string name="add_opening_hours">Lisää aukioloajat</string>
+	<string name="edit_opening_hours">Muokkaa aukioloaikoja</string>
+	<string name="profile">Profiili</string>
+	<string name="no_osm_account">Eikö sinulla ole tiliä OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Rekisteröidy</string>
+	<string name="login">Kirjaudu sisään</string>
+	<string name="password">Salasana</string>
+	<string name="forgot_password">Unohtuiko salasana?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Palauta salasana</string>
+	<string name="enter_email_address_to_reset_password">Syötä rekisteröitymisessä käyttämäsi sähköpostiosoite, niin lähetämme sinulle linkin salasanasi vaihtamista varten.</string>
+	<string name="reset_password">Aseta salasana uudelleen</string>
+	<string name="username">Käyttäjänimi</string>
+	<string name="osm_account">OSM-tili</string>
+	<string name="logout">Kirjaudu ulos</string>
+	<string name="login_and_edit_map_motivation_message">Kirjaudu sisään ja muokkaa kartan kohteiden tietoja, ja me asetamme kohteet miljoonien muiden käyttäjien saataville. Tehdään maailmasta yhdessä parempi paikka.</string>
+	<string name="not_sent">Ei lähetetty</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">muutosta</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Olet muokannut ensimmäistä kohdettasi!</string>
+	<string name="thank_you">Kiitos</string>
+	<string name="login_with_openstreetmap">Kirjaudu sisään osoitteessa www.openstreetmap.org</string>
+	<string name="edit_place">Muokkaa sijaintia</string>
+	<string name="place_name">Paikan nimi</string>
+	<string name="place_name_caption">Syötä paikan nimi siinä muodossa kun se kyltissä on</string>
+	<string name="add_language">Lisää kieli</string>
+	<string name="address">Osoite</string>
+	<string name="street">Katu</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Rakennus</string>
+	<string name="details">Lisätiedot</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Lisää katu</string>
+	<string name="choose_language">Valitse kieli</string>
+	<string name="choose_street">Valitse katu</string>
+	<string name="postal_code">Postikoodi</string>
+	<!-- login text field -->
+	<string name="email_or_username">Sähköposti tai käyttäjätunnus</string>
 </resources>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 7bb8449ac7..38887b743d 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -277,8 +277,8 @@
 	<string name="share">Partager</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Message</string>
-	<!-- Share by email button text -->
-	<string name="email">Courriel</string>
+	<!-- Share by email button text, also used in editor. -->
+	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Copier le lien</string>
 	<!-- Text for the button that returns to caller application -->
@@ -778,7 +778,7 @@
 	<string name="dialog_routing_if_get_cross_route">Voulez-vous créer un itinéraire plus direct s\&#39;étendant sur plus d\&#39;une carte ?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Un itinéraire plus direct sortant du cadre de cette carte est disponible.</string>
 	<string name="dialog_routing_always_cross_that_border">Toujours dépasser ce cadre</string>
-	<string name="dialog_routing_not_now">Pas maintenant</string>
+	<string name="not_now">Pas maintenant</string>
 	<string name="dialog_routing_build_route">Créer</string>
 	<string name="dialog_routing_download_and_build_cross_route">Voulez-vous télécharger la carte et créer un itinéraire plus direct s\&#39;étendant sur plus d\&#39;une carte?</string>
 	<string name="dialog_routing_download_cross_route">Téléchargez la carte pour créer un itinéraire plus direct sortant du cadre de cette carte.</string>
@@ -858,4 +858,52 @@
 	<string name="download_all">Tout télécharger</string>
 	<string name="delete_all">Supprimer tout</string>
 	<string name="autodownload">Téléchargement automatique</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Fermé actuellement</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Tous les jours</string>
+	<string name="twentyfour_seven">Jour et nuit</string>
+	<string name="day_off_today">Jour de fermeture aujourd\&#39;hui</string>
+	<string name="day_off">Jour de fermeture</string>
+	<string name="today">Aujourd\&#39;hui</string>
+	<string name="sunrise_to_sunset">Du lever au coucher du soleil</string>
+	<string name="add_opening_hours">Ajouter les heures d\&#39;ouverture</string>
+	<string name="edit_opening_hours">Modifier les heures d\&#39;ouverture</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">Vous n\&#39;avez pas de compte sur OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Inscription</string>
+	<string name="login">Connexion</string>
+	<string name="password">Mot de passe</string>
+	<string name="forgot_password">Mot de passe oublié ?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Réinitialiser le mot de passe</string>
+	<string name="enter_email_address_to_reset_password">Entrez l\&#39;adresse e-mail que vous avez utilisé lors de l\&#39;inscription et nous vous ferons parvenir le lien pour renouveler votre mot de passe.</string>
+	<string name="reset_password">Réinitialiser le mot de passe</string>
+	<string name="username">Nom d\&#39;utilisateur</string>
+	<string name="osm_account">Compte OSM</string>
+	<string name="logout">Déconnexion</string>
+	<string name="login_and_edit_map_motivation_message">Connectez-vous et modifiez les informations des objets présents sur la carte et nous allons les rendre disponibles pour des millions d\&#39;autres utilisateurs. Rendons le monde meilleur ensemble.</string>
+	<string name="not_sent">Non envoyé</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">modifications</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Vous avez modifié votre premier objet!</string>
+	<string name="thank_you">Merci</string>
+	<string name="login_with_openstreetmap">Connectez-vous sur www.openstreetmap.org</string>
+	<string name="edit_place">Modifier le lieu</string>
+	<string name="place_name">Nom du lieu</string>
+	<string name="place_name_caption">Saisissez le nom tel qu\&#39;il apparaît sur le panneau du lieu</string>
+	<string name="add_language">Ajouter une langue</string>
+	<string name="address">Adresse</string>
+	<string name="street">Rue</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Immeuble</string>
+	<string name="details">Détails</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Ajouter une rue</string>
+	<string name="choose_language">Choisir une langue</string>
+	<string name="choose_street">Choisir une rue</string>
+	<string name="postal_code">Code postal</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-mail ou nom d\&#39;utilisateur</string>
 </resources>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 2f829325ab..5ec7932dc1 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -273,8 +273,8 @@
 	<string name="share">Megosztás</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Üzenet</string>
-	<!-- Share by email button text -->
-	<string name="email">Email</string>
+	<!-- Share by email button text, also used in editor. -->
+	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Hivatkozás másolása</string>
 	<!-- Text for the button that returns to caller application -->
@@ -768,7 +768,7 @@
 	<string name="dialog_routing_if_get_cross_route">Szeretne egy közvetlenebb útvonalat létrehozni, amely több, mint egy térképen terül el?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Elérhető egy optimálisabb útvonal, amely áthalad a jelenlegi térkép szélén.</string>
 	<string name="dialog_routing_always_cross_that_border">Mindig haladjon át ezen a határon</string>
-	<string name="dialog_routing_not_now">Most nem</string>
+	<string name="not_now">Most nem</string>
 	<string name="dialog_routing_build_route">Létrehozás</string>
 	<string name="dialog_routing_download_and_build_cross_route">Szeretné letölteni a térképet és létrehozni egy optimálisabb útvonalat, amely több, mint egy térképen terül el?</string>
 	<string name="dialog_routing_download_cross_route">Töltse le a térképet, hogy létrehozzon egy optimálisabb útvonalat, amely áthalad a jelenlegi térkép szélén.</string>
@@ -848,4 +848,52 @@
 	<string name="download_all">Összes letöltése</string>
 	<string name="delete_all">Összes térkép törlése</string>
 	<string name="autodownload">Automatikus letöltés</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Most zárva</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Naponta</string>
+	<string name="twentyfour_seven">Nappal és éjszaka</string>
+	<string name="day_off_today">Ma szabadnap</string>
+	<string name="day_off">Szabadnap</string>
+	<string name="today">Ma</string>
+	<string name="sunrise_to_sunset">Napkeltétől napnyugtáig</string>
+	<string name="add_opening_hours">Nyitvatartás hozzáadása</string>
+	<string name="edit_opening_hours">Nyitvatartás szerkesztése</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">Nem rendelkezel még OpenStreetMap-felhasználói fiókkal?</string>
+	<string name="register_at_openstreetmap">Regisztráció</string>
+	<string name="login">Bejelentkezés</string>
+	<string name="password">Jelszó</string>
+	<string name="forgot_password">Elfelejtett jelszó?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Jelszó visszaállítása</string>
+	<string name="enter_email_address_to_reset_password">Add meg a regisztrációkor használt e-mail-címedet és elküldjük neked a jelszavad megújításához szükséges linket.</string>
+	<string name="reset_password">Jelszó visszaállítása</string>
+	<string name="username">Felhasználónév</string>
+	<string name="osm_account">OSM-felhasználói fiók</string>
+	<string name="logout">Kijelentkezés</string>
+	<string name="login_and_edit_map_motivation_message">Jelentkezz be és szerkeszd az egyes objektumokhoz tartozó információkat a térképen, valamint tedd őket elérhetővé több millió felhasználó számára.</string>
+	<string name="not_sent">Nincs elküldve</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">változtatás</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Szerkesztetted az első objektumod!</string>
+	<string name="thank_you">Köszönjük</string>
+	<string name="login_with_openstreetmap">Jelentkezz be a www.openstreetmap.org oldalon</string>
+	<string name="edit_place">Hely szerkesztése</string>
+	<string name="place_name">Hely neve</string>
+	<string name="place_name_caption">Add meg a nevet, ami a helyet jelzi</string>
+	<string name="add_language">Nyelv hozzáadása</string>
+	<string name="address">Cím</string>
+	<string name="street">Utca</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Épület</string>
+	<string name="details">Részletek</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Utca hozzáadása</string>
+	<string name="choose_language">Nyelv kiválasztása</string>
+	<string name="choose_street">Utca kiválasztása</string>
+	<string name="postal_code">Irányítószám</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-mail vagy felhasználónév</string>
 </resources>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 2d75824bf5..56d7313ae3 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -272,7 +272,7 @@
 	<string name="share">Bagikan</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Pesan</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">Surel</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Salin Tautan</string>
@@ -766,7 +766,7 @@
 	<string name="dialog_routing_if_get_cross_route">Apakah Anda ingin membuat rute yang lebih langsung yang meliputi lebih dari satu peta?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Ada rute yang lebih optimal yang melewati ujung peta ini.</string>
 	<string name="dialog_routing_always_cross_that_border">Selalu lewati batas ini</string>
-	<string name="dialog_routing_not_now">Jangan Sekarang</string>
+	<string name="not_now">Jangan Sekarang</string>
 	<string name="dialog_routing_build_route">Buat</string>
 	<string name="dialog_routing_download_and_build_cross_route">Apakah Anda ingin mengunduh peta dan membuat rute yang lebih optimal yang meliputi lebih dari satu peta?</string>
 	<string name="dialog_routing_download_cross_route">Unduh peta untuk membuat rute yang lebih optimal yang melewati ujung peta ini.</string>
@@ -846,4 +846,52 @@
 	<string name="download_all">Unduh semua</string>
 	<string name="delete_all">Hapus semua</string>
 	<string name="autodownload">Unduhan otomatis</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Sekarang Tutup</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Setiap Hari</string>
+	<string name="twentyfour_seven">siang dan malam</string>
+	<string name="day_off_today">Hari ini libur</string>
+	<string name="day_off">Libur</string>
+	<string name="today">Hari ini</string>
+	<string name="sunrise_to_sunset">Dari matahari terbit sampai matahari terbenam</string>
+	<string name="add_opening_hours">Tambah jam kerja</string>
+	<string name="edit_opening_hours">Sunting jam kerja</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">Tidak ada akun di OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Mendaftar</string>
+	<string name="login">Masuk</string>
+	<string name="password">Kata sandi</string>
+	<string name="forgot_password">Lupa kata sandi?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Pulihkan kata sandi</string>
+	<string name="enter_email_address_to_reset_password">Masukkan alamat surek yang Anda gunakan pada saat pendaftaran dan kami akan mengirim tautan untuk memperbarui kata sandi Anda.</string>
+	<string name="reset_password">Atur ulang kata sandi</string>
+	<string name="username">Nama pengguna</string>
+	<string name="osm_account">Akun OSM</string>
+	<string name="logout">Keluar</string>
+	<string name="login_and_edit_map_motivation_message">Masuk dan sunting informasi objek pada peta dan kami akan membuatnya tersedia bagi jutaan pengguna lain. Mari kita menjadikan dunia lebih baik bersama-sama.</string>
+	<string name="not_sent">Tidak terkirim</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">perubahan</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Anda menyunting objek pertama Anda!</string>
+	<string name="thank_you">Terima kasih</string>
+	<string name="login_with_openstreetmap">Masuk di www.openstreetmap.org</string>
+	<string name="edit_place">Sunting tempat</string>
+	<string name="place_name">Nama tempat</string>
+	<string name="place_name_caption">Masukkan nama seperti pada tanda tempat</string>
+	<string name="add_language">Tambahkan bahasa</string>
+	<string name="address">Alamat</string>
+	<string name="street">Jalan</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Bangunan</string>
+	<string name="details">Detail</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Tambahkan jalan</string>
+	<string name="choose_language">Pilih bahasa</string>
+	<string name="choose_street">Pilih jalan</string>
+	<string name="postal_code">Kode Pos</string>
+	<!-- login text field -->
+	<string name="email_or_username">Surel atau nama pengguna</string>
 </resources>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 805fc57341..748a5bfa67 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -269,7 +269,7 @@
 	<string name="share">Condividi</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Messaggio</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Copia link</string>
@@ -764,7 +764,7 @@
 	<string name="dialog_routing_if_get_cross_route">Vuoi creare un percorso più diretto che si estende su più mappe?</string>
 	<string name="dialog_routing_cross_route_is_optimal">È disponibile un percorso migliore che oltrepassa il limite di questa mappa.</string>
 	<string name="dialog_routing_always_cross_that_border">Oltrepassa sempre questo limite</string>
-	<string name="dialog_routing_not_now">Non ora</string>
+	<string name="not_now">Non ora</string>
 	<string name="dialog_routing_build_route">Crea</string>
 	<string name="dialog_routing_download_and_build_cross_route">Vuoi scaricare la mappa e creare un percorso migliore che si estende su più mappe?</string>
 	<string name="dialog_routing_download_cross_route">Per creare un percorso migliore che oltrepassa il limite di questa mappa, scarica la mappa.</string>
@@ -844,4 +844,52 @@
 	<string name="download_all">Scarica tutto</string>
 	<string name="delete_all">Elimina tutti</string>
 	<string name="autodownload">Scaricamento automatico</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Ora chiuso</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Tutti i giorni</string>
+	<string name="twentyfour_seven">Giorno e notte</string>
+	<string name="day_off_today">Oggi giorno di riposo</string>
+	<string name="day_off">Giorno di riposo</string>
+	<string name="today">Oggi</string>
+	<string name="sunrise_to_sunset">Dall\&#39;alba al tramonto</string>
+	<string name="add_opening_hours">Aggiungi orari di apertura</string>
+	<string name="edit_opening_hours">Modifica orari di apertura</string>
+	<string name="profile">Profilo</string>
+	<string name="no_osm_account">Non hai un account su OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Registrati</string>
+	<string name="login">Accedi</string>
+	<string name="password">Password</string>
+	<string name="forgot_password">Hai dimenticato la password?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Ripristina password</string>
+	<string name="enter_email_address_to_reset_password">Inserisci l\&#39;indirizzo email utilizzato durante la registrazione e ti invieremo un link per recuperare la password.</string>
+	<string name="reset_password">Reimpostare password</string>
+	<string name="username">Nome utente</string>
+	<string name="osm_account">Account OSM</string>
+	<string name="logout">Esci</string>
+	<string name="login_and_edit_map_motivation_message">Accedi e modifica le informazioni degli oggetti sulla mappa e noi provvederemo a renderli disponibili a milioni di altri utenti. Creiamo un mondo migliore assieme.</string>
+	<string name="not_sent">Non inviato</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">modifiche</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Hai modificato il tuo primo oggetto!</string>
+	<string name="thank_you">Grazie</string>
+	<string name="login_with_openstreetmap">Accedi su www.openstreetmap.org</string>
+	<string name="edit_place">Modifica il luogo</string>
+	<string name="place_name">Nome del luogo</string>
+	<string name="place_name_caption">Inserisci il nome così com\&#39;è scritto sul segnale del luogo</string>
+	<string name="add_language">Aggiungi una lingua</string>
+	<string name="address">Indirizzo</string>
+	<string name="street">Via</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Edificio</string>
+	<string name="details">Dettagli</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Aggiungi una strada</string>
+	<string name="choose_language">Scegli una lingua</string>
+	<string name="choose_street">Scegli una strada</string>
+	<string name="postal_code">Codice postale</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-mail o nome utente</string>
 </resources>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 612569070e..d7a511e5a6 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -269,7 +269,7 @@
 	<string name="share">その他の共有</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">メッセージ</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">Eメール</string>
 	<!-- Copy Link -->
 	<string name="copy_link">リンクをコピー</string>
@@ -764,7 +764,7 @@
 	<string name="dialog_routing_if_get_cross_route">複数マップを利用してより最適なルートを作成しますか？</string>
 	<string name="dialog_routing_cross_route_is_optimal">このマップの境界を越えて複数マップを利用すると、より最適なルートを作成できます。</string>
 	<string name="dialog_routing_always_cross_that_border">常にこの境界を越える</string>
-	<string name="dialog_routing_not_now">あとで</string>
+	<string name="not_now">あとで</string>
 	<string name="dialog_routing_build_route">作成する</string>
 	<string name="dialog_routing_download_and_build_cross_route">マップをダウンロードし、複数マップを利用してより最適なルートを作成しますか？</string>
 	<string name="dialog_routing_download_cross_route">このマップの境界を越えて複数マップを利用し、より最適なルートを作成するには、マップをダウンロードしてください。</string>
@@ -844,4 +844,52 @@
 	<string name="download_all">全てをダウンロード</string>
 	<string name="delete_all">すべて削除</string>
 	<string name="autodownload">自動ダウンロード</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">現在閉店</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">毎日</string>
+	<string name="twentyfour_seven">昼と夜</string>
+	<string name="day_off_today">今日は休み</string>
+	<string name="day_off">休み</string>
+	<string name="today">今日は</string>
+	<string name="sunrise_to_sunset">日の出から日没まで</string>
+	<string name="add_opening_hours">営業時間を追加</string>
+	<string name="edit_opening_hours">営業時間を編集</string>
+	<string name="profile">プロフィール</string>
+	<string name="no_osm_account">OpenStreetMapのアカウントがありませんか？</string>
+	<string name="register_at_openstreetmap">登録</string>
+	<string name="login">ログイン</string>
+	<string name="password">パスワード</string>
+	<string name="forgot_password">パスワードをお忘れですか？</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">パスワードをf復元</string>
+	<string name="enter_email_address_to_reset_password">登録の際に使用したメールアドレスを入力してください。パスワードを更新するリンクをお送りします。</string>
+	<string name="reset_password">パスワードをリセット</string>
+	<string name="username">ユーザー名</string>
+	<string name="osm_account">OSMアカウント</string>
+	<string name="logout">ログアウト</string>
+	<string name="login_and_edit_map_motivation_message">ログインしてマップ上のオブジェクトの詳細を編集すると、何百万人もの他のユーザーがその情報を利用できるようになります。一緒により良い世界を作りましょう。</string>
+	<string name="not_sent">送信されませんでした</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">つの変更点</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">初めてオブジェクトを編集しました！</string>
+	<string name="thank_you">ありがとうございます</string>
+	<string name="login_with_openstreetmap">www.openstreetmap.orgでログインしてください</string>
+	<string name="edit_place">場所を編集</string>
+	<string name="place_name">場所の名前</string>
+	<string name="place_name_caption">この場所の看板通りに名前を入力してください</string>
+	<string name="add_language">言語を追加</string>
+	<string name="address">住所</string>
+	<string name="street">通り</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">建物</string>
+	<string name="details">詳細</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">通りを追加</string>
+	<string name="choose_language">言語を選択</string>
+	<string name="choose_street">通りを選択</string>
+	<string name="postal_code">郵便番号</string>
+	<!-- login text field -->
+	<string name="email_or_username">メールアドレスまたはユーザー名</string>
 </resources>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index ae3d412022..ae3d3444cc 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -268,7 +268,7 @@
 	<string name="share">공유</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">메시지</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">이메일</string>
 	<!-- Copy Link -->
 	<string name="copy_link">링크 복사하기</string>
@@ -757,7 +757,7 @@
 	<string name="dialog_routing_if_get_cross_route">두 개 이상의 지도를 통과하는 더 직접적인 경로를 설정하시겠습니까?</string>
 	<string name="dialog_routing_cross_route_is_optimal">이 지도의 경계를 통과하는 더 최적화된 경로를 사용할 수 있습니다.</string>
 	<string name="dialog_routing_always_cross_that_border">항상 이 경계 통과</string>
-	<string name="dialog_routing_not_now">나중에</string>
+	<string name="not_now">나중에</string>
 	<string name="dialog_routing_build_route">만들기</string>
 	<string name="dialog_routing_download_and_build_cross_route">지도를 다운로드하여, 두 개 이상의 지도를 통과하는 더 최적화된 경로를 설정하시겠습니까?</string>
 	<string name="dialog_routing_download_cross_route">이 지도의 경계를 통과하는 더 최적화된 경로를 설정하려면 지도를 다운로드하세요.</string>
@@ -837,4 +837,52 @@
 	<string name="download_all">모두 다운로드</string>
 	<string name="delete_all">모두 삭제</string>
 	<string name="autodownload">자동 다운로드</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">지금 닫힘</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">일별</string>
+	<string name="twentyfour_seven">24 시간</string>
+	<string name="day_off_today">오늘 휴가</string>
+	<string name="day_off">휴가</string>
+	<string name="today">오늘</string>
+	<string name="sunrise_to_sunset">일출에서 일몰로</string>
+	<string name="add_opening_hours">영업일 추가</string>
+	<string name="edit_opening_hours">영업일 편집</string>
+	<string name="profile">프로필</string>
+	<string name="no_osm_account">OpenStreetMap에서 계정이 없습니까?</string>
+	<string name="register_at_openstreetmap">등록</string>
+	<string name="login">로그인</string>
+	<string name="password">암호</string>
+	<string name="forgot_password">암호를 잊으 셨나요?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">암호 복원</string>
+	<string name="enter_email_address_to_reset_password">등록시 사용한 이메일 주소를 입력하면 암호를 갱신하도록 링크를 전송할 것입니다.</string>
+	<string name="reset_password">비밀번호 재 설정</string>
+	<string name="username">사용자 이름</string>
+	<string name="osm_account">OSM 계정</string>
+	<string name="logout">로그 아웃</string>
+	<string name="login_and_edit_map_motivation_message">로그인하고 지도 상의 개체 정보를 편집하면 다른 수백만 명의 사용자가 사용할 수 있도록 하겠습니다. 함께 더 나은 세상으로 만들어 봅시다.</string>
+	<string name="not_sent">전송되지 않음</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">가지 변경</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">로그인하고 전 세계 수백만 사람들을 위해 변화를 더하십시오!</string>
+	<string name="thank_you">고맙습니다.</string>
+	<string name="login_with_openstreetmap">www.openstreetmap.org에 로그인</string>
+	<string name="edit_place">장소 편집</string>
+	<string name="place_name">지명</string>
+	<string name="place_name_caption">이 장소의 기호와 같이 이름 입력</string>
+	<string name="add_language">언어 추가</string>
+	<string name="address">주소</string>
+	<string name="street">거리</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">건물</string>
+	<string name="details">세부 정보</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">거리 추가</string>
+	<string name="choose_language">언어 선택</string>
+	<string name="choose_street">거리 선택</string>
+	<string name="postal_code">우편 번호</string>
+	<!-- login text field -->
+	<string name="email_or_username">이메일 또는 사용자 이름</string>
 </resources>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index ecdfcf638a..b7691baa9a 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -272,7 +272,7 @@
 	<string name="share">Del</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Melding</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-post</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Kopier kobling</string>
@@ -767,7 +767,7 @@
 	<string name="dialog_routing_if_get_cross_route">Vil du opprette en mer direkte rute som går over flere kart?</string>
 	<string name="dialog_routing_cross_route_is_optimal">En mer optimal rute som går utenfor dette kartet er tilgjengelig.</string>
 	<string name="dialog_routing_always_cross_that_border">Kryss alltid denne grensen</string>
-	<string name="dialog_routing_not_now">Ikke nå</string>
+	<string name="not_now">Ikke nå</string>
 	<string name="dialog_routing_build_route">Opprett</string>
 	<string name="dialog_routing_download_and_build_cross_route">Vil du laste ned kartet og lage en mer optimal rute som går over flere kart?</string>
 	<string name="dialog_routing_download_cross_route">Last ned kartet for å opprette en mer optimal rute som går utenfor dette kartet.</string>
@@ -847,4 +847,52 @@
 	<string name="download_all">Last ned alle</string>
 	<string name="delete_all">Slett alle</string>
 	<string name="autodownload">Automatisk nedlasting</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Lukket nå</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Daglig</string>
+	<string name="twentyfour_seven">Dag og natt</string>
+	<string name="day_off_today">Fridag i dag</string>
+	<string name="day_off">Fridag</string>
+	<string name="today">I dag</string>
+	<string name="sunrise_to_sunset">Fra morgen til kveld</string>
+	<string name="add_opening_hours">Legg til åpningstider</string>
+	<string name="edit_opening_hours">Rediger åpningstider</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">Har du ingen konto hos OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Registrer deg</string>
+	<string name="login">Logg inn</string>
+	<string name="password">Passord</string>
+	<string name="forgot_password">Glemt passordet?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Gjenopprett passordet</string>
+	<string name="enter_email_address_to_reset_password">Skriv inn e-postadressen du brukte ved registreringen, så vil vi sende deg en kobling for å fornye passordet ditt.</string>
+	<string name="reset_password">Tilbakestill passord</string>
+	<string name="username">Brukernavn</string>
+	<string name="osm_account">OSM-konto</string>
+	<string name="logout">Logg ut</string>
+	<string name="login_and_edit_map_motivation_message">Logg deg inn og rediger informasjonen til objektene på kartet, så vil vi gjøre den tilgjengelig for millioner av andre brukere. La oss gjøre verden bedre sammen.</string>
+	<string name="not_sent">Ikke sendt</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">endringer</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Du har redigert ditt første objekt!</string>
+	<string name="thank_you">Takk skal du ha</string>
+	<string name="login_with_openstreetmap">Logg deg inn på www.openstreetmap.org</string>
+	<string name="edit_place">Rediger stedet</string>
+	<string name="place_name">Stedsnavn</string>
+	<string name="place_name_caption">Skriv inn navnet slik det står på stedets navneskilt</string>
+	<string name="add_language">Legg til et språk</string>
+	<string name="address">Adresse</string>
+	<string name="street">Gate</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Bygning</string>
+	<string name="details">Detaljer</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Legg til en gate</string>
+	<string name="choose_language">Velg et språk</string>
+	<string name="choose_street">Velg en gate</string>
+	<string name="postal_code">Postnummer</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-postadresse eller brukernavn</string>
 </resources>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 02f1a1f392..cfa70af75e 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -264,7 +264,7 @@
 	<string name="share">Delen</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Bericht</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Kopieer koppeling</string>
@@ -757,7 +757,7 @@
 	<string name="dialog_routing_if_get_cross_route">Wilt u een rechtstreeksere route samenstellen die meer dan één kaart beslaat?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Er is een betere route beschikbaar die de grenzen van deze kaart overschrijdt.</string>
 	<string name="dialog_routing_always_cross_that_border">Deze grens altijd overschrijden</string>
-	<string name="dialog_routing_not_now">Niet nu</string>
+	<string name="not_now">Niet nu</string>
 	<string name="dialog_routing_build_route">Samenstellen</string>
 	<string name="dialog_routing_download_and_build_cross_route">Wilt u de kaart downloaden en een betere route samenstellen die meer dan één kaart beslaat?</string>
 	<string name="dialog_routing_download_cross_route">Download de kaart om een betere route samen te stellen die de grenzen van deze kaart overschrijdt.</string>
@@ -837,4 +837,52 @@
 	<string name="download_all">Alles downloaden</string>
 	<string name="delete_all">Alles verwijderen</string>
 	<string name="autodownload">Automatische download</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Nu gesloten</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Dagelijks</string>
+	<string name="twentyfour_seven">Nacht en dag</string>
+	<string name="day_off_today">Vrije dag vandaag</string>
+	<string name="day_off">Vrije dag</string>
+	<string name="today">Vandaag</string>
+	<string name="sunrise_to_sunset">Van zonsopgang tot zonsondergang</string>
+	<string name="add_opening_hours">Openingsuren toevoegen</string>
+	<string name="edit_opening_hours">Openingsuren bewerken</string>
+	<string name="profile">Profiel</string>
+	<string name="no_osm_account">Geen account bij OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Registeren</string>
+	<string name="login">Log in</string>
+	<string name="password">Wachtwoord</string>
+	<string name="forgot_password">Wachtwoord vergeten?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Wachtwoord herstellen</string>
+	<string name="enter_email_address_to_reset_password">Voer het e-mailadres in dat u heeft gebruikt tijdens de registratie, dan sturen wij u de link om uw wachtwoord te vernieuwen.</string>
+	<string name="reset_password">Wachtwoord resetten</string>
+	<string name="username">Gebruikersnaam</string>
+	<string name="osm_account">OSM-account</string>
+	<string name="logout">Uitloggen</string>
+	<string name="login_and_edit_map_motivation_message">Log in en bewerk gegevens van de objecten op de kaart, dan zullen wij ze beschikbaar maken voor miljoenen andere gebruikers. Laten we samen de wereld beter maken.</string>
+	<string name="not_sent">Niet verzonden</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">wijzigingen</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Je hebt je eerste object aangepast!</string>
+	<string name="thank_you">Dank je wel</string>
+	<string name="login_with_openstreetmap">Log in op www.openstreetmap.org</string>
+	<string name="edit_place">De locatie bewerken</string>
+	<string name="place_name">Locatienaam</string>
+	<string name="place_name_caption">Voer de naam in zoals die op het bord van de locatie wordt weergegeven</string>
+	<string name="add_language">Een taal toevoegen</string>
+	<string name="address">Adres</string>
+	<string name="street">Straat</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Gebouw</string>
+	<string name="details">Details</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Een straat toevoegen</string>
+	<string name="choose_language">Een taal kiezen</string>
+	<string name="choose_street">Een straat kiezen</string>
+	<string name="postal_code">Postcode</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-mailadres of gebruikersnaam</string>
 </resources>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index b6f179c3d5..162eb09c91 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -273,7 +273,7 @@
 	<string name="share">Udostępnij</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Wiadomość</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Kopiuj link</string>
@@ -768,7 +768,7 @@
 	<string name="dialog_routing_if_get_cross_route">Chcesz wyznaczyć lepszą trasę, obejmującą więcej map?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Dostępna jest lepsza trasa, wykraczająca poza granice bieżącej mapy.</string>
 	<string name="dialog_routing_always_cross_that_border">Zawsze przekraczaj tę granicę</string>
-	<string name="dialog_routing_not_now">Nie teraz</string>
+	<string name="not_now">Nie teraz</string>
 	<string name="dialog_routing_build_route">Wyznacz</string>
 	<string name="dialog_routing_download_and_build_cross_route">Chcesz pobrać mapę i wyznaczyć lepszą trasę, obejmującą więcej map?</string>
 	<string name="dialog_routing_download_cross_route">Pobierz mapę i wyznacz lepszą trasę, wykraczającą poza granice bieżącej mapy.</string>
@@ -848,4 +848,52 @@
 	<string name="download_all">Pobierz wszystko</string>
 	<string name="delete_all">Usuń wszystkie</string>
 	<string name="autodownload">Automatyczne pobieranie</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Nieczynne</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Codziennie</string>
+	<string name="twentyfour_seven">Dzień i noc</string>
+	<string name="day_off_today">Dziś dzień wolny</string>
+	<string name="day_off">Dzień wolny</string>
+	<string name="today">Dzisiaj</string>
+	<string name="sunrise_to_sunset">Od wschodu do zachodu słońca</string>
+	<string name="add_opening_hours">Dodaj godziny otwarcia</string>
+	<string name="edit_opening_hours">Edytuj godziny otwarcia</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">Nie masz konta w OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Zarejestruj się</string>
+	<string name="login">Zaloguj się</string>
+	<string name="password">Hasło</string>
+	<string name="forgot_password">Nie pamiętasz hasła?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Przypomnij hasło</string>
+	<string name="enter_email_address_to_reset_password">Wpisz adres e-mail, którego użyto podczas rejestracji, a prześlemy Ci link do ponownego utworzenia hasła.</string>
+	<string name="reset_password">Resetuj hasło</string>
+	<string name="username">Nazwa użytkownika</string>
+	<string name="osm_account">Konto OSM</string>
+	<string name="logout">Wyloguj</string>
+	<string name="login_and_edit_map_motivation_message">Zaloguj się i edytuj dane obiektów na mapie, a my udostępnimy je milionom innych użytkowników. Razem możemy poprawić świat.</string>
+	<string name="not_sent">Nie wysłano</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">zmian</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Edycja Twojego pierwszego obiektu zakończona!</string>
+	<string name="thank_you">Dziękujemy</string>
+	<string name="login_with_openstreetmap">Zaloguj się na www.openstreetmap.org</string>
+	<string name="edit_place">Edytuj miejsce</string>
+	<string name="place_name">Nazwa miejsca</string>
+	<string name="place_name_caption">Wpisz nazwę, która znajduje się na szyldzie miejsca</string>
+	<string name="add_language">Dodaj język</string>
+	<string name="address">Adres</string>
+	<string name="street">Ulica</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Numer</string>
+	<string name="details">Szczegóły</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Dodaj ulicę</string>
+	<string name="choose_language">Wybierz język</string>
+	<string name="choose_street">Wybierz ulicę</string>
+	<string name="postal_code">Kod pocztowy</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-mail lub nazwa użytkownika</string>
 </resources>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index b7b8613c38..37ae8d32db 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -269,7 +269,7 @@
 	<string name="share">Partilhar</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Mensagem</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Copiar hiperligação</string>
@@ -762,7 +762,7 @@
 	<string name="dialog_routing_if_get_cross_route">Deseja traçar uma rota mais direta, mas que se estenda por mais de um mapa?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Há uma rota disponível que vai além dos limites desse mapa.</string>
 	<string name="dialog_routing_always_cross_that_border">Sempre cruzar esse limite</string>
-	<string name="dialog_routing_not_now">Agora Não</string>
+	<string name="not_now">Agora Não</string>
 	<string name="dialog_routing_build_route">Traçar</string>
 	<string name="dialog_routing_download_and_build_cross_route">Deseja baixar o mapa e traçar uma rota melhor, mas que se estenda por mais de um mapa?</string>
 	<string name="dialog_routing_download_cross_route">Baixe o mapa para traçar uma rota melhor que vai além dos limites desse mapa.</string>
@@ -842,4 +842,52 @@
 	<string name="download_all">Baixar tudo</string>
 	<string name="delete_all">Excluir todos</string>
 	<string name="autodownload">Download automático</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Fechado agora</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Diariamente</string>
+	<string name="twentyfour_seven">Dia e noite</string>
+	<string name="day_off_today">Dia de folga hoje</string>
+	<string name="day_off">Dia de folga</string>
+	<string name="today">Hoje</string>
+	<string name="sunrise_to_sunset">Do amanhecer ao anoitecer</string>
+	<string name="add_opening_hours">Adicionar horário de funcionamento</string>
+	<string name="edit_opening_hours">Editar horário de funcionamento</string>
+	<string name="profile">Perfil</string>
+	<string name="no_osm_account">Sem conta no OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Cadastrar-se</string>
+	<string name="login">Acessar</string>
+	<string name="password">Senha</string>
+	<string name="forgot_password">Esqueceu sua senha?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Recuperar senha</string>
+	<string name="enter_email_address_to_reset_password">Digite o endereço de e-mail que você usou ao cadastrar-se, e nós lhe enviaremos o link para renovar a sua senha.</string>
+	<string name="reset_password">Redefinir senha</string>
+	<string name="username">Nome de usuário</string>
+	<string name="osm_account">Conta OSM</string>
+	<string name="logout">Encerrar sessão</string>
+	<string name="login_and_edit_map_motivation_message">Acesse e edite informações dos objetos no mapa e eles serão disponibilizados para milhões de outros usuários. Vamos melhorar o mundo juntos.</string>
+	<string name="not_sent">Não enviado</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">alterações</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Você editou o seu primeiro objeto!</string>
+	<string name="thank_you">Obrigado</string>
+	<string name="login_with_openstreetmap">Acessar em www.openstreetmap.org</string>
+	<string name="edit_place">Editar o local</string>
+	<string name="place_name">Nome do local</string>
+	<string name="place_name_caption">Insira o nome da forma que está na placa do local</string>
+	<string name="add_language">Adicionar um idioma</string>
+	<string name="address">Endereço</string>
+	<string name="street">Rua</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Edifício</string>
+	<string name="details">Detalhes</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Adicionar uma rua</string>
+	<string name="choose_language">Escolher um idioma</string>
+	<string name="choose_street">Escolher uma rua</string>
+	<string name="postal_code">Código postal</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-mail ou nome de usuário</string>
 </resources>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index e1cde8693c..04a5b1078a 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -272,7 +272,7 @@
 	<string name="share">Chia sẻ</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Tin nhắn</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Copiați link-ul</string>
@@ -764,7 +764,7 @@
 	<string name="dialog_routing_if_get_cross_route">Doriţi să creaţi un traseu mai direct care include mai mult decât o hartă?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Este disponibil un traseu mai adecvat care trece de limita acestei hărţi.</string>
 	<string name="dialog_routing_always_cross_that_border">Întotdeauna să se treacă această limită</string>
-	<string name="dialog_routing_not_now">Nu acum</string>
+	<string name="not_now">Nu acum</string>
 	<string name="dialog_routing_build_route">Creare</string>
 	<string name="dialog_routing_download_and_build_cross_route">Doriţi să descărcaţi harta şi să creaţi un traseu mai direct care include mai mult decât o hartă?</string>
 	<string name="dialog_routing_download_cross_route">Pentru a crea un traseu mai adecvat care trece de limita acestei hărţi, descărcaţi harta.</string>
@@ -844,4 +844,52 @@
 	<string name="download_all">Descarcă toate</string>
 	<string name="delete_all">Ștergere toate</string>
 	<string name="autodownload">Descărcare automată</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Închis acum</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Zilnic</string>
+	<string name="twentyfour_seven">Zi și noapte</string>
+	<string name="day_off_today">Zi liberă azi</string>
+	<string name="day_off">Zi liberă</string>
+	<string name="today">Azi</string>
+	<string name="sunrise_to_sunset">De la răsărit până la apus</string>
+	<string name="add_opening_hours">Adăugare ore de funcționare</string>
+	<string name="edit_opening_hours">Editare ore de funcționare</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">Nu aveți un cont în OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Înregistrați-vă</string>
+	<string name="login">Autentificare</string>
+	<string name="password">Parolă</string>
+	<string name="forgot_password">Ați uitat parola?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Recuperare parolă</string>
+	<string name="enter_email_address_to_reset_password">Introduceți adresa de e-mail pe care ați utilizat-o în momentul înregistrării, iar noi vă vom trimite link-ul pentru a vă reînnoi parola.</string>
+	<string name="reset_password">Resetare parolă</string>
+	<string name="username">Nume de utilizator</string>
+	<string name="osm_account">Cont OSM</string>
+	<string name="logout">Ieșire</string>
+	<string name="login_and_edit_map_motivation_message">Autentificați-vă și editați informația despre obiectele de pe hartă, iar noi le vom face disponibile pentru milioane de alți utilizatori. Să facem împreună lumea mai bună.</string>
+	<string name="not_sent">Nu a fost trimis</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">modificări</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Ați editat primul dvs. obiect!</string>
+	<string name="thank_you">Vă mulțumim</string>
+	<string name="login_with_openstreetmap">Autentificați-vă pe www.openstreetmap.org</string>
+	<string name="edit_place">Editați loc</string>
+	<string name="place_name">Denumire loc</string>
+	<string name="place_name_caption">Introduceți denumirea astfel cum apare aceasta pe semnul locului</string>
+	<string name="add_language">Adăugare limbă</string>
+	<string name="address">Adresă</string>
+	<string name="street">Stradă</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Clădire</string>
+	<string name="details">Detalii</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Adăugare stradă</string>
+	<string name="choose_language">Alegeți o limbă</string>
+	<string name="choose_street">Alegeți o stradă</string>
+	<string name="postal_code">Cod postal</string>
+	<!-- login text field -->
+	<string name="email_or_username">Adresa de e-mail sau numele de utilizator</string>
 </resources>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index f210f347e4..ac5a374b9d 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -277,7 +277,7 @@
 	<string name="share">Поделиться</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Сообщение</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Скопировать ссылку</string>
@@ -796,7 +796,7 @@
 	<string name="dialog_routing_if_get_cross_route">Построить более оптимальный маршрут с пересечением границы карты?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Маршрут с пересечением границы карты более оптимальный.</string>
 	<string name="dialog_routing_always_cross_that_border">Всегда пересекать эту границу</string>
-	<string name="dialog_routing_not_now">Не сейчас</string>
+	<string name="not_now">Не сейчас</string>
 	<string name="dialog_routing_build_route">Построить</string>
 	<string name="dialog_routing_download_and_build_cross_route">Загрузить карту и построить более оптимальный маршрут с пересечением границы карты?</string>
 	<string name="dialog_routing_download_cross_route">Для построения более оптимального маршрута с пересечением границы требуется загрузить карту.</string>
@@ -856,10 +856,6 @@
 	<string name="whats_new_next_button">Далее</string>
 	<string name="whats_new_night_caption">Ночной режим навигации</string>
 	<string name="whats_new_night_body">Для удобства использования MAPS.ME во время вождения автомобиля в темное время суток мы добавили ночной режим. Он запускается автоматически после захода солнца.</string>
-	<!-- «Add place» button in place page. -->
-	<string name="pp_place_add">Добавить место</string>
-	<!-- «Edit place» button in place page. -->
-	<string name="pp_place_edit">Редактировать место</string>
 	<string name="editor_time_add">Добавить расписание</string>
 	<string name="editor_time_delete">Удалить расписание</string>
 	<!-- Text for allday switch. -->
@@ -882,4 +878,60 @@
 	<string name="download_all">Загрузить все</string>
 	<string name="delete_all">Удалить все</string>
 	<string name="autodownload">Автоматическая загрузка</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Сейчас закрыто</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Ежедневно</string>
+	<string name="twentyfour_seven">Круглосуточно</string>
+	<string name="day_off_today">Сегодня выходной</string>
+	<string name="day_off">Выходной</string>
+	<string name="today">Сегодня</string>
+	<string name="sunrise_to_sunset">От рассвета до заката</string>
+	<string name="add_opening_hours">Добавить время работы</string>
+	<string name="edit_opening_hours">Редактировать время работы</string>
+	<string name="profile">Профиль</string>
+	<string name="no_osm_account">Не зарегистрированы в OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Зарегистрироваться</string>
+	<string name="login">Войти</string>
+	<string name="password">Пароль</string>
+	<string name="forgot_password">Забыли пароль?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Восстановление пароля</string>
+	<string name="enter_email_address_to_reset_password">Введите почтовый ящик, который вы использовали для регистрации, и мы вышлем на него ссылку для сброса пароля.</string>
+	<string name="reset_password">Cбросить пароль</string>
+	<string name="username">Имя пользователя</string>
+	<string name="osm_account">OSM Аккаунт</string>
+	<string name="logout">Выйти</string>
+	<string name="login_and_edit_map_motivation_message">Авторизуйтесь и редактируйте информацию об объектах на карте. А мы сделаем её доступной для миллионов пользователей. Улучшим мир вместе!</string>
+	<string name="not_sent">Не отправлено</string>
+	<!-- Information text: "Last upload 11.01.2016" -->
+	<string name="last_upload">Последняя отправка</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">правок</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Вы отредактировали свой первый объект!</string>
+	<string name="thank_you">Спасибо</string>
+	<string name="login_with_openstreetmap">Войти через www.openstreetmap.org</string>
+	<string name="edit_place">Редактировать место</string>
+	<string name="place_name">Название</string>
+	<string name="place_name_caption">Введите название, как на вывеске или табличке</string>
+	<!-- title above languages list cells in the editor, below editable name text field. -->
+	<string name="other_languages">Другие языки</string>
+	<!-- small button to open list with names in different languages -->
+	<string name="show_more">Показать больше</string>
+	<!-- small button to close list with names in different languages -->
+	<string name="show_less">Показать меньше</string>
+	<string name="add_language">Добавить язык</string>
+	<string name="address">Адрес</string>
+	<string name="street">Улица</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Дом</string>
+	<string name="details">Подробнее</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Добавить улицу</string>
+	<string name="choose_language">Выбрать язык</string>
+	<string name="choose_street">Выбрать улицу</string>
+	<string name="postal_code">Почтовый индекс</string>
+	<!-- login text field -->
+	<string name="email_or_username">Эл. почта или имя пользователя</string>
 </resources>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 1c5d21e0b2..45d4085b9b 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -271,7 +271,7 @@
 	<string name="share">Zdielať</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Správa</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Skopírovať odkaz</string>
@@ -770,7 +770,7 @@
 	<string name="dialog_routing_if_get_cross_route">Chceli by ste vytvoriť priamejšiu trasu, ktorá zahŕňa viac ako jednu mapu?</string>
 	<string name="dialog_routing_cross_route_is_optimal">K dispozícii je optimálnejšia trasa, ktorá presahuje hranice tejto mapy.</string>
 	<string name="dialog_routing_always_cross_that_border">Vždy prekročiť túto hranicu</string>
-	<string name="dialog_routing_not_now">Nie teraz</string>
+	<string name="not_now">Nie teraz</string>
 	<string name="dialog_routing_build_route">Vytvoriť</string>
 	<string name="dialog_routing_download_and_build_cross_route">Chcete si prevziať mapu a vytvoriť optimálnejšiu trasu, ktorá si vyžaduje viac ako jednu mapu?</string>
 	<string name="dialog_routing_download_cross_route">Prevezmite si mapu na vytvorenie optimálnejšej trasy, ktorá prekračuje okraje tejto mapy.</string>
@@ -850,4 +850,52 @@
 	<string name="download_all">Stiahnuť všetko</string>
 	<string name="delete_all">Vymazať všetky</string>
 	<string name="autodownload">Automaticky stiahnuť</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Teraz zatvorené</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Denne</string>
+	<string name="twentyfour_seven">Deň a noc</string>
+	<string name="day_off_today">Dnes deň voľna</string>
+	<string name="day_off">Deň voľna</string>
+	<string name="today">Dnes</string>
+	<string name="sunrise_to_sunset">Od východu do západu slnka</string>
+	<string name="add_opening_hours">Pridať otváracie hodiny</string>
+	<string name="edit_opening_hours">Upraviť otváracie hodiny</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">Nemáte účet v OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Zaregistrovať sa</string>
+	<string name="login">Prihlásiť sa</string>
+	<string name="password">Heslo</string>
+	<string name="forgot_password">Zabudli ste heslo?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Obnovenie hesla</string>
+	<string name="enter_email_address_to_reset_password">Zadajte e-mailovú adresu, ktorú ste použili pri registrácii, a my Vám zašleme odkaz na obnovenie hesla.</string>
+	<string name="reset_password">Obnoviť heslo</string>
+	<string name="username">Používateľské meno</string>
+	<string name="osm_account">OSM účet</string>
+	<string name="logout">Odhlásiť sa</string>
+	<string name="login_and_edit_map_motivation_message">Prihláste sa a upravte informácie o objektoch na mape, a my ich sprístupníme miliónom ďalších používateľov. Urobme svet spoločne lepším.</string>
+	<string name="not_sent">Neodoslaný</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">zmien</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Upravili ste svoj prvý objekt!</string>
+	<string name="thank_you">Ďakujeme Vám</string>
+	<string name="login_with_openstreetmap">Prihláste sa na adrese www.openstreetmap.org</string>
+	<string name="edit_place">Upraviť miesto</string>
+	<string name="place_name">Názov miesta</string>
+	<string name="place_name_caption">Zadajte skutočný názov miesta</string>
+	<string name="add_language">Pridať jazyk</string>
+	<string name="address">Adresa</string>
+	<string name="street">Ulica</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Budova</string>
+	<string name="details">Podrobnosti</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Pridať ulicu</string>
+	<string name="choose_language">Vybrať jazyk</string>
+	<string name="choose_street">Vybrať ulicu</string>
+	<string name="postal_code">PSČ</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-mail alebo používateľské meno</string>
 </resources>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 550972a0e8..a02ce721ec 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -272,8 +272,8 @@
 	<string name="share">Dela</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Meddelande</string>
-	<!-- Share by email button text -->
-	<string name="email">E-mail</string>
+	<!-- Share by email button text, also used in editor. -->
+	<string name="email">E-post</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Kopiera Länk</string>
 	<!-- Text for the button that returns to caller application -->
@@ -769,7 +769,7 @@
 	<string name="dialog_routing_if_get_cross_route">Vill du skapa en mer direkt väg som sträcker sig över fler än en karta?</string>
 	<string name="dialog_routing_cross_route_is_optimal">En optimalare väg som sträcker sig utanför den här kartan är tillgänglig.</string>
 	<string name="dialog_routing_always_cross_that_border">Korsa alltid den här gränsen</string>
-	<string name="dialog_routing_not_now">Inte nu</string>
+	<string name="not_now">Inte nu</string>
 	<string name="dialog_routing_build_route">Skapa</string>
 	<string name="dialog_routing_download_and_build_cross_route">Vill du ladda ned kartan och skapa en optimalare väg som sträcker sig över fler än en karta?</string>
 	<string name="dialog_routing_download_cross_route">Ladda ned kartan för att skapa en optimalare väg som sträcker sig utanför den här kartan.</string>
@@ -849,4 +849,52 @@
 	<string name="download_all">Ladda ner alla</string>
 	<string name="delete_all">Radera alla</string>
 	<string name="autodownload">Automatisk nedladdning</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Stängt just nu</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Dagligen</string>
+	<string name="twentyfour_seven">dag och natt</string>
+	<string name="day_off_today">Stängt idag</string>
+	<string name="day_off">Stängt</string>
+	<string name="today">Idag</string>
+	<string name="sunrise_to_sunset">Från gryning till skymning</string>
+	<string name="add_opening_hours">Lägg till öppettider</string>
+	<string name="edit_opening_hours">Redigera öppettider</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">Inget konto hos OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Registrera</string>
+	<string name="login">Logga in</string>
+	<string name="password">Lösenord</string>
+	<string name="forgot_password">Glömt lösenord?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Återställ lösenord?</string>
+	<string name="enter_email_address_to_reset_password">Mata in e-postadressen som du använde vid registrering så skickar vi en återställningslänk till dig.</string>
+	<string name="reset_password">återställ lösenord</string>
+	<string name="username">Användarnamn</string>
+	<string name="osm_account">OSM-konto</string>
+	<string name="logout">Logga ut</string>
+	<string name="login_and_edit_map_motivation_message">Logga in och redigera informationen om objekten på kartan så kommer vi att göra ändringarna tillgängliga för miljontals andra användare. Låt oss göra världen bättre tillsammans.</string>
+	<string name="not_sent">Ej skickat</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">ändringar</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Du har redigerat ditt första objekt!</string>
+	<string name="thank_you">Tack</string>
+	<string name="login_with_openstreetmap">Logga in på www.openstreetmap.org</string>
+	<string name="edit_place">Ändra platsen</string>
+	<string name="place_name">Platsens namn</string>
+	<string name="place_name_caption">Skriv in namnet så som det står på platsens skylt</string>
+	<string name="add_language">Lägg till ett språk</string>
+	<string name="address">Adress</string>
+	<string name="street">Gata</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Byggnad</string>
+	<string name="details">Detaljer</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Lägg till en gata</string>
+	<string name="choose_language">Välj ett språk</string>
+	<string name="choose_street">Välj en gata</string>
+	<string name="postal_code">Postkod</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-postadress eller användarnamn</string>
 </resources>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 0005a00f50..04098f8df0 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -274,7 +274,7 @@
 	<string name="share">แชร์</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">ข้อความ</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">อีเมล</string>
 	<!-- Copy Link -->
 	<string name="copy_link">คัดลอกลิงก์</string>
@@ -769,7 +769,7 @@
 	<string name="dialog_routing_if_get_cross_route">คุณต้องการสร้างเส้นทางที่อ้อมน้อยลงซึ่งข้ามเกินหนึ่งแผนที่หรือไม่?</string>
 	<string name="dialog_routing_cross_route_is_optimal">มีเส้นทางที่เหมาะสมกว่าซึ่งข้ามเลยขอบของแผนที่นี้</string>
 	<string name="dialog_routing_always_cross_that_border">ข้ามขอบเขตนี้เสมอ</string>
-	<string name="dialog_routing_not_now">ไว้คราวหลัง</string>
+	<string name="not_now">ไว้คราวหลัง</string>
 	<string name="dialog_routing_build_route">สร้าง</string>
 	<string name="dialog_routing_download_and_build_cross_route">คุณต้องการดาวน์โหลดแผนที่และสร้างเส้นทางที่เหมาะสมกว่าซึ่งข้ามเกินหนึ่งแผนที่หรือไม่?</string>
 	<string name="dialog_routing_download_cross_route">ดาวน์โหลดแผนที่เพื่อสร้างเส้นทางที่เหมาะสมกว่าซึ่งข้ามเลยขอบของแผนที่นี้</string>
@@ -849,4 +849,52 @@
 	<string name="download_all">ดาวน์โหลดทั้งหมด</string>
 	<string name="delete_all">ลบทั้งหมด</string>
 	<string name="autodownload">ดาวน์โหลดอัตโนมัติ</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">ปิดตอนนี้</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">ทุกวัน</string>
+	<string name="twentyfour_seven">ทั้งกลางวันและกลางคืน</string>
+	<string name="day_off_today">ปิดในวันนี้</string>
+	<string name="day_off">วันปิด</string>
+	<string name="today">วันนี้</string>
+	<string name="sunrise_to_sunset">ตั้งแต่พระอาทิตย์ขึ้นจนพระอาทิตย์ตก</string>
+	<string name="add_opening_hours">เพิ่มชั่วโมงทำการ</string>
+	<string name="edit_opening_hours">แก้ไขชั่วโมงทำการ</string>
+	<string name="profile">โปรไฟล์</string>
+	<string name="no_osm_account">ไม่มีบัญชีใน OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">ลงทะเบียน</string>
+	<string name="login">ล็อกอิน</string>
+	<string name="password">รหัสผ่าน</string>
+	<string name="forgot_password">ลืมรหัสผ่าน?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">เรียกคืนรหัสผ่าน</string>
+	<string name="enter_email_address_to_reset_password">ใส่ที่อยู่อีเมลที่คุณใช้ระหว่างการลงทะเบียนแล้วเราจะส่งลิงก์ไปยังคุณเพื่อต่ออายุรหัสผ่านของคุณ</string>
+	<string name="reset_password">ตั้งรหัสผ่านใหม่</string>
+	<string name="username">ชื่อผู้ใช้</string>
+	<string name="osm_account">บัญชี OSM</string>
+	<string name="logout">ออกจากระบบ</string>
+	<string name="login_and_edit_map_motivation_message">ล็อกอินและแก้ไขข้อมูลวัตถุบนแผนที่ และเราจะทำให้มันสามารถใช้งานได้สำหรับผู้ใช้ท่านอื่น ๆ อีกนับล้าน มาช่วยกันทำให้โลกดียิ่งขึ้นร่วมกัน</string>
+	<string name="not_sent">ไม่มีการส่ง</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">การเปลี่ยนแปลง</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">คุณได้แก้ไขวัตถุแรกของคุณ!</string>
+	<string name="thank_you">ขอบพระคุณ</string>
+	<string name="login_with_openstreetmap">ล็อกอินที่ www.openstreetmap.org</string>
+	<string name="edit_place">แก้ไขสถานที่</string>
+	<string name="place_name">ชื่อสถานที่</string>
+	<string name="place_name_caption">ใส่ชื่อเนื่องจากมันอยู่บนสัญลักษณ์ของสถานที่</string>
+	<string name="add_language">เพิ่มภาษา</string>
+	<string name="address">ที่อยู่</string>
+	<string name="street">ถนน</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">อาคาร</string>
+	<string name="details">รายละเอียด</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">เพิ่มถนน</string>
+	<string name="choose_language">เลือกภาษา</string>
+	<string name="choose_street">เลือกถนน</string>
+	<string name="postal_code">รหัสไปรษณีย์</string>
+	<!-- login text field -->
+	<string name="email_or_username">อีเมลหรือชื่อผู้ใช้</string>
 </resources>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index bafbbed737..04963417b7 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -276,8 +276,8 @@
 	<string name="share">Paylaş</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Mesaj</string>
-	<!-- Share by email button text -->
-	<string name="email">E-Posta</string>
+	<!-- Share by email button text, also used in editor. -->
+	<string name="email">E-posta</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Bağlantıyı Kopyala</string>
 	<!-- Text for the button that returns to caller application -->
@@ -771,7 +771,7 @@
 	<string name="dialog_routing_if_get_cross_route">Bir haritadan daha fazlasına uzanan doğrudan bir güzergah oluşturmak ister misiniz?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Bu haritanın bir kısmından geçen daha uygun bir güzergah mevcut.</string>
 	<string name="dialog_routing_always_cross_that_border">Bu sınırı her zaman geçin</string>
-	<string name="dialog_routing_not_now">Şimdi Değil</string>
+	<string name="not_now">Şimdi Değil</string>
 	<string name="dialog_routing_build_route">Oluşturun</string>
 	<string name="dialog_routing_download_and_build_cross_route">Haritayı indirerek birden fazla haritaya uzanan daha uygun bir güzergah oluşturmak ister misiniz?</string>
 	<string name="dialog_routing_download_cross_route">Bu haritanın bir kısmından geçen daha uygun bir güzergah oluşturmak için haritayı indirin.</string>
@@ -851,4 +851,52 @@
 	<string name="download_all">Tümünü indir</string>
 	<string name="delete_all">Tümünü sil</string>
 	<string name="autodownload">Otomatik indir</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Şu anda kapalı</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Günlük</string>
+	<string name="twentyfour_seven">Gündüz ve gece</string>
+	<string name="day_off_today">Bugün izin günü</string>
+	<string name="day_off">İzin günü</string>
+	<string name="today">Bugün</string>
+	<string name="sunrise_to_sunset">Güneşin doğuşundan batışına kadar</string>
+	<string name="add_opening_hours">İş saatlerini ekle</string>
+	<string name="edit_opening_hours">İş saatlerini düzenle</string>
+	<string name="profile">Profil</string>
+	<string name="no_osm_account">OpenStreetMap\&#39; hesabın yok mu?</string>
+	<string name="register_at_openstreetmap">Kaydol</string>
+	<string name="login">Oturum aç</string>
+	<string name="password">Şifre</string>
+	<string name="forgot_password">Şifreni mi unuttun?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Şifreyi yenile</string>
+	<string name="enter_email_address_to_reset_password">Kayıt sırasında kullandığınız e-posta adresini girin ve şifrenizi yenileyeceğiniz bağlantıyı gönderelim.</string>
+	<string name="reset_password">Parolayı sıfırla</string>
+	<string name="username">Kullanıcı Adı</string>
+	<string name="osm_account">OSM Hesabı</string>
+	<string name="logout">Oturumu kapat</string>
+	<string name="login_and_edit_map_motivation_message">Oturum aç ve haritada nesne bilgilerini düzenleyip diğer milyonlarca kullanıcıya aç. Birlikte dünyayı daha iyi bir yer haline getirelim.</string>
+	<string name="not_sent">Gönderilmedi</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">değişiklik</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">İlk nesneni düzenledin!</string>
+	<string name="thank_you">Teşekkür ederiz</string>
+	<string name="login_with_openstreetmap">www.openstreetmap.org adresinden oturum aç</string>
+	<string name="edit_place">Yeri düzenle</string>
+	<string name="place_name">Yer ismi</string>
+	<string name="place_name_caption">Yerin adını tabelada olduğu şekliyle girin</string>
+	<string name="add_language">Bir dil ekle</string>
+	<string name="address">Adres</string>
+	<string name="street">Sokak</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Bina</string>
+	<string name="details">Detaylar</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Bir sokak ekle</string>
+	<string name="choose_language">Bir dil seç</string>
+	<string name="choose_street">Bir sokak seç</string>
+	<string name="postal_code">Posta kodu</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-posta veya kullanıcı adı</string>
 </resources>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 2a2dbd90b9..b51a117a33 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -277,8 +277,8 @@
 	<string name="share">Подiлитись</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Повідомлення</string>
-	<!-- Share by email button text -->
-	<string name="email">Електронна пошта</string>
+	<!-- Share by email button text, also used in editor. -->
+	<string name="email">Ел. пошта</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Копіювати посилання</string>
 	<!-- Text for the button that returns to caller application -->
@@ -770,7 +770,7 @@
 	<string name="dialog_routing_if_get_cross_route">Побудувати більш оптимальний маршрут з перетином межі карти?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Маршрут з перетином межі карти більш оптимальний.</string>
 	<string name="dialog_routing_always_cross_that_border">Завжди перетинати цю межу</string>
-	<string name="dialog_routing_not_now">Не зараз</string>
+	<string name="not_now">Не зараз</string>
 	<string name="dialog_routing_build_route">Побудувати</string>
 	<string name="dialog_routing_download_and_build_cross_route">Завантажити карту і побудувати більш оптимальний маршрут з перетином межі карти?</string>
 	<string name="dialog_routing_download_cross_route">Для побудови більш оптимального маршруту з перетином межі потрібно завантажити карту.</string>
@@ -850,4 +850,52 @@
 	<string name="download_all">Завантажити всі</string>
 	<string name="delete_all">Видалити всі</string>
 	<string name="autodownload">Автоматичне завантаження</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Зараз закрито</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Щоденно</string>
+	<string name="twentyfour_seven">Цілодобово</string>
+	<string name="day_off_today">Сьогодні вихідний</string>
+	<string name="day_off">Вихідний</string>
+	<string name="today">Сьогодні</string>
+	<string name="sunrise_to_sunset">Від світанку до заходу</string>
+	<string name="add_opening_hours">Додати години роботи</string>
+	<string name="edit_opening_hours">Редагувати години роботи</string>
+	<string name="profile">Профіль</string>
+	<string name="no_osm_account">Не зареєстровані в OpenStreetMap?</string>
+	<string name="register_at_openstreetmap">Зареєструватися</string>
+	<string name="login">Увійти</string>
+	<string name="password">Пароль</string>
+	<string name="forgot_password">Забули пароль?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Відновити пароль</string>
+	<string name="enter_email_address_to_reset_password">Введіть адресу ел. пошти, яку ви використали під час реєстрації і ми надішлемо вам посилання для відновлення паролю.</string>
+	<string name="reset_password">Змінити пароль</string>
+	<string name="username">Ім\&#39;я користувача</string>
+	<string name="osm_account">Обліковий запис OSM</string>
+	<string name="logout">Вийти</string>
+	<string name="login_and_edit_map_motivation_message">Увійдіть та редагуйте інформацію про об\&#39;єкти на карті, і ми зробимо їх доступними для мільйонів інших користувачів. Давайте зробимо світ кращим разом.</string>
+	<string name="not_sent">Не надіслано</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">змін</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Ви редагували свій перший об\&#39;єкт!</string>
+	<string name="thank_you">Дякуємо</string>
+	<string name="login_with_openstreetmap">Увійдіть на www.openstreetmap.org</string>
+	<string name="edit_place">Редагувати місце</string>
+	<string name="place_name">Назва</string>
+	<string name="place_name_caption">Введіть назву, як на вивісці або табличці</string>
+	<string name="add_language">Додати мову</string>
+	<string name="address">Адреса</string>
+	<string name="street">Вулиця</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Будинок</string>
+	<string name="details">Детальніше</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Додати вулицю</string>
+	<string name="choose_language">Вибрати мову</string>
+	<string name="choose_street">Вибрати вулицю</string>
+	<string name="postal_code">Поштовий індекс</string>
+	<!-- login text field -->
+	<string name="email_or_username">Ел. пошта або ім\&#39;я користувача</string>
 </resources>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index c6535dcf3f..bd513f52eb 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -272,7 +272,7 @@
 	<string name="share">Chia sẻ</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Tin nhắn</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-mail</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Sao chép Liên kết</string>
@@ -767,7 +767,7 @@
 	<string name="dialog_routing_if_get_cross_route">Bạn có muốn tạo một tuyến đường thẳng hơn mà kéo dài trên nhiều bản đồ không?</string>
 	<string name="dialog_routing_cross_route_is_optimal">Có một tuyến đường tối ưu hơn đi qua cạnh của bản đồ này.</string>
 	<string name="dialog_routing_always_cross_that_border">Luôn đi qua ranh giới này</string>
-	<string name="dialog_routing_not_now">Lúc khác</string>
+	<string name="not_now">Lúc khác</string>
 	<string name="dialog_routing_build_route">Tạo</string>
 	<string name="dialog_routing_download_and_build_cross_route">Bạn có muốn tải về bản đồ và tạo một tuyến đường tối ưu hơn kéo dài trên nhiều hơn một bản đồ?</string>
 	<string name="dialog_routing_download_cross_route">Tải về bản đồ để tạo tuyến đường tối ưu hơn mà đi qua cạnh của bản đồ này.</string>
@@ -847,4 +847,52 @@
 	<string name="download_all">Tải về tất cả</string>
 	<string name="delete_all">Xóa tất cả</string>
 	<string name="autodownload">Tự động tải về</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Hiện đã đóng</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Hàng ngày</string>
+	<string name="twentyfour_seven">ngày và đêm</string>
+	<string name="day_off_today">Nghỉ hôm nay</string>
+	<string name="day_off">Ngày nghỉ</string>
+	<string name="today">Hôm nay</string>
+	<string name="sunrise_to_sunset">Từ bình minh đến hoàng hôn</string>
+	<string name="add_opening_hours">Thêm giờ làm việc</string>
+	<string name="edit_opening_hours">Sửa giờ làm việc</string>
+	<string name="profile">Hồ sơ</string>
+	<string name="no_osm_account">Bạn chưa có tài khoản tại OpenStreetMap ư?</string>
+	<string name="register_at_openstreetmap">Đăng ký</string>
+	<string name="login">Đăng nhập</string>
+	<string name="password">Mật khẩu</string>
+	<string name="forgot_password">Quên mật khẩu?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Khôi phục mật khẩu</string>
+	<string name="enter_email_address_to_reset_password">Nhập địa chỉ email bạn đã sử dụng trong quá trình đăng ký và chúng tôi sẽ gửi cho bạn liên kết để tạo mới mật khẩu của bạn.</string>
+	<string name="reset_password">đặt lại mật khẩu</string>
+	<string name="username">Tên đăng nhập</string>
+	<string name="osm_account">Tài khoản OSM</string>
+	<string name="logout">Đăng xuất</string>
+	<string name="login_and_edit_map_motivation_message">Đăng nhập và chỉnh sửa thông tin của các đối tượng trên bản đồ và chúng tôi sẽ hiển thị chúng cho hàng triệu người dùng khác. Hãy cùng nhau làm cho thế giới tốt đẹp hơn.</string>
+	<string name="not_sent">Chưa được gửi</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">thay đổi</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">Bạn đã chỉnh sửa đối tượng đầu tiên của mình!</string>
+	<string name="thank_you">Cảm ơn bạn</string>
+	<string name="login_with_openstreetmap">Đăng nhập tại www.openstreetmap.org</string>
+	<string name="edit_place">Chỉnh sửa địa điểm</string>
+	<string name="place_name">Tên địa điểm</string>
+	<string name="place_name_caption">Nhập tên như nó trên dấu hiệu của địa điểm</string>
+	<string name="add_language">Thêm ngôn ngữ</string>
+	<string name="address">Địa chỉ</string>
+	<string name="street">Đường</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">Tòa nhà</string>
+	<string name="details">Chi tiết</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Thêm con đường</string>
+	<string name="choose_language">Đã chọn ngôn ngữ</string>
+	<string name="choose_street">Đã chọn con đường</string>
+	<string name="postal_code">Mã bưu chính</string>
+	<!-- login text field -->
+	<string name="email_or_username">E-mail hoặc tên người dùng</string>
 </resources>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index e930cbd9bf..c1c759cb34 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -262,7 +262,7 @@
 	<string name="share">分享</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">消息</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">電子郵件</string>
 	<!-- Copy Link -->
 	<string name="copy_link">拷贝链接</string>
@@ -753,7 +753,7 @@
 	<string name="dialog_routing_if_get_cross_route">您想產生跨越邊界的更好路線嗎？</string>
 	<string name="dialog_routing_cross_route_is_optimal">跨越邊界的路線更為理想。</string>
 	<string name="dialog_routing_always_cross_that_border">一律跨越邊界。</string>
-	<string name="dialog_routing_not_now">先不要</string>
+	<string name="not_now">先不要</string>
 	<string name="dialog_routing_build_route">產生</string>
 	<string name="dialog_routing_download_and_build_cross_route">您是否要下載地圖，產生跨越邊界的更好路線？</string>
 	<string name="dialog_routing_download_cross_route">若要產生跨越邊界的更理想路線，您需要下載地圖。</string>
@@ -833,4 +833,52 @@
 	<string name="download_all">全部下載。</string>
 	<string name="delete_all">刪除全部</string>
 	<string name="autodownload">自動下載</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">現在關門</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">每天</string>
+	<string name="twentyfour_seven">白天和黑夜</string>
+	<string name="day_off_today">今天休息日</string>
+	<string name="day_off">休息日</string>
+	<string name="today">今天</string>
+	<string name="sunrise_to_sunset">從日出到日落</string>
+	<string name="add_opening_hours">添加工作時間</string>
+	<string name="edit_opening_hours">編輯工作時間</string>
+	<string name="profile">資料</string>
+	<string name="no_osm_account">OpenStreetMap上沒有賬戶嗎？</string>
+	<string name="register_at_openstreetmap">註冊</string>
+	<string name="login">登錄</string>
+	<string name="password">密碼</string>
+	<string name="forgot_password">忘記密碼</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">恢復密碼</string>
+	<string name="enter_email_address_to_reset_password">輸入您在註冊時所用的郵箱地址，我們會給您發送鏈接更新密碼</string>
+	<string name="reset_password">重置密碼</string>
+	<string name="username">用戶名</string>
+	<string name="osm_account">OSM賬戶</string>
+	<string name="logout">登出</string>
+	<string name="login_and_edit_map_motivation_message">登錄並編輯地圖上的物品信息，我們就會讓數百萬其他用戶看到。</string>
+	<string name="not_sent">讓我們共同把世界變得更美好。</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">次改變</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">您已編輯您的第一件物品！</string>
+	<string name="thank_you">謝謝您</string>
+	<string name="login_with_openstreetmap">登錄到www.openstreetmap.org</string>
+	<string name="edit_place">編輯地點</string>
+	<string name="place_name">地點名稱</string>
+	<string name="place_name_caption">依照地點標牌輸入名稱</string>
+	<string name="add_language">添加語言</string>
+	<string name="address">地址</string>
+	<string name="street">街道</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">樓房</string>
+	<string name="details">詳細資訊</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">添加街道</string>
+	<string name="choose_language">選擇語言</string>
+	<string name="choose_street">選擇街道</string>
+	<string name="postal_code">郵政編碼</string>
+	<!-- login text field -->
+	<string name="email_or_username">郵箱或用戶名</string>
 </resources>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index a017123010..77b8c16360 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -272,7 +272,7 @@
 	<string name="share">分享</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">消息</string>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<string name="email">邮件</string>
 	<!-- Copy Link -->
 	<string name="copy_link">复制链接</string>
@@ -771,7 +771,7 @@
 	<string name="dialog_routing_if_get_cross_route">您是否要创建一条跨越多张地图的更直接路线？</string>
 	<string name="dialog_routing_cross_route_is_optimal">有一条跨越本地图边缘的更佳路线可用。</string>
 	<string name="dialog_routing_always_cross_that_border">始终跨越此边界线</string>
-	<string name="dialog_routing_not_now">现在不用</string>
+	<string name="not_now">现在不用</string>
 	<string name="dialog_routing_build_route">创建</string>
 	<string name="dialog_routing_download_and_build_cross_route">您是否要下载地图并创建一条跨越多张地图的更佳路线？</string>
 	<string name="dialog_routing_download_cross_route">下载地图，创建一条跨越此地图边缘的更佳路线。</string>
@@ -851,4 +851,52 @@
 	<string name="download_all">下载所有</string>
 	<string name="delete_all">删除全部</string>
 	<string name="autodownload">自动下载</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">现在关门</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">每天</string>
+	<string name="twentyfour_seven">白天和黑夜</string>
+	<string name="day_off_today">今天休息日</string>
+	<string name="day_off">休息日</string>
+	<string name="today">今天</string>
+	<string name="sunrise_to_sunset">从日出到日落</string>
+	<string name="add_opening_hours">添加工作时间</string>
+	<string name="edit_opening_hours">编辑工作时间</string>
+	<string name="profile">资料</string>
+	<string name="no_osm_account">OpenStreetMap上没有账户吗？</string>
+	<string name="register_at_openstreetmap">注册</string>
+	<string name="login">登录</string>
+	<string name="password">密码</string>
+	<string name="forgot_password">忘记密码</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">恢复密码</string>
+	<string name="enter_email_address_to_reset_password">输入您在注册时所用的邮箱地址，我们会给您发送链接更新密码</string>
+	<string name="reset_password">重置密码</string>
+	<string name="username">用户名</string>
+	<string name="osm_account">OSM账户</string>
+	<string name="logout">登出</string>
+	<string name="login_and_edit_map_motivation_message">登录并编辑地图上的物品信息，我们就会让数百万其他用户看到。</string>
+	<string name="not_sent">让我们共同把世界变得更美好。</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">次改变</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">您已编辑您的第一件物品！</string>
+	<string name="thank_you">谢谢您</string>
+	<string name="login_with_openstreetmap">登录到www.openstreetmap.org</string>
+	<string name="edit_place">编辑地点</string>
+	<string name="place_name">地点名</string>
+	<string name="place_name_caption">输入地点标志上的名称</string>
+	<string name="add_language">添加语言</string>
+	<string name="address">地址</string>
+	<string name="street">街道</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">楼房</string>
+	<string name="details">细节</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">添加街道</string>
+	<string name="choose_language">选择语言</string>
+	<string name="choose_street">选择街道</string>
+	<string name="postal_code">邮政编码</string>
+	<!-- login text field -->
+	<string name="email_or_username">邮箱或用户名</string>
 </resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index f760dd3601..f6a8eafbfd 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -279,8 +279,8 @@
 	<string name="share">Share</string>
 	<!-- iOS share by Message button text (including SMS) -->
 	<string name="message">Message</string>
-	<!-- Share by email button text -->
-	<string name="email">E-mail</string>
+	<!-- Share by email button text, also used in editor. -->
+	<string name="email">Email</string>
 	<!-- Copy Link -->
 	<string name="copy_link">Copy Link</string>
 	<!-- Text for the button that returns to caller application -->
@@ -798,7 +798,7 @@
 	<string name="dialog_routing_if_get_cross_route">Would you like to create a more direct route that spans more than one map?</string>
 	<string name="dialog_routing_cross_route_is_optimal">A more optimal route that crosses the edge of this map is available.</string>
 	<string name="dialog_routing_always_cross_that_border">Always cross this boundary</string>
-	<string name="dialog_routing_not_now">Not Now</string>
+	<string name="not_now">Not Now</string>
 	<string name="dialog_routing_build_route">Create</string>
 	<string name="dialog_routing_download_and_build_cross_route">Would you like to download the map and create a more optimal route spanning more than one map?</string>
 	<string name="dialog_routing_download_cross_route">Download the map to create a more optimal route that crosses the edge of this map.</string>
@@ -860,10 +860,6 @@
 	<string name="whats_new_next_button">Next</string>
 	<string name="whats_new_night_caption">Night Mode Navigation</string>
 	<string name="whats_new_night_body">To facilitate using MAPS.ME when driving in the dark, we have added night mode. It switches on automatically after sunset.</string>
-	<!-- «Add place» button in place page. -->
-	<string name="pp_place_add">Add place</string>
-	<!-- «Edit place» button in place page. -->
-	<string name="pp_place_edit">Edit place</string>
 	<string name="editor_time_add">Add Schedule</string>
 	<string name="editor_time_delete">Delete Schedule</string>
 	<!-- Text for allday switch. -->
@@ -886,4 +882,60 @@
 	<string name="download_all">Download all</string>
 	<string name="delete_all">Delete all</string>
 	<string name="autodownload">Auto-download</string>
+	<!-- Place Page opening hours text -->
+	<string name="closed_now">Closed now</string>
+	<!-- Place Page opening hours text -->
+	<string name="daily">Daily</string>
+	<string name="twentyfour_seven">24/7</string>
+	<string name="day_off_today">Day off today</string>
+	<string name="day_off">Day off</string>
+	<string name="today">Today</string>
+	<string name="sunrise_to_sunset">From sunrise to sunset</string>
+	<string name="add_opening_hours">Add opening hours</string>
+	<string name="edit_opening_hours">Edit opening hours</string>
+	<string name="profile">Profile</string>
+	<string name="no_osm_account">Don\&#39;t have OpenStreetMap account?</string>
+	<string name="register_at_openstreetmap">Register at OpenStreetMap</string>
+	<string name="login">Log In</string>
+	<string name="password">Password</string>
+	<string name="forgot_password">Forgot password?</string>
+	<!-- Forgot Password dialog title -->
+	<string name="restore_password">Restore password</string>
+	<string name="enter_email_address_to_reset_password">Enter the email address you used during registration and we will send you the link to reset your password.</string>
+	<string name="reset_password">Reset Password</string>
+	<string name="username">Username</string>
+	<string name="osm_account">OSM Account</string>
+	<string name="logout">Log Out</string>
+	<string name="login_and_edit_map_motivation_message">Log in and edit objects on the map, and we will make them available for millions of users. Let’s make the world better together.</string>
+	<string name="not_sent">Not Sent</string>
+	<!-- Information text: "Last upload 11.01.2016" -->
+	<string name="last_upload">Last Upload</string>
+	<!-- The number of changes made. As in "changes: 123". -->
+	<string name="changes">changes</string>
+	<!-- Motivates user to login/register, title above login buttons. -->
+	<string name="you_have_edited_your_first_object">You’ve edited your first object!</string>
+	<string name="thank_you">Thank You</string>
+	<string name="login_with_openstreetmap">Log in at www.openstreetmap.org</string>
+	<string name="edit_place">Edit Place</string>
+	<string name="place_name">Place Name</string>
+	<string name="place_name_caption">Enter the name as it is on the sign of the place</string>
+	<!-- title above languages list cells in the editor, below editable name text field. -->
+	<string name="other_languages">Other Languages</string>
+	<!-- small button to open list with names in different languages -->
+	<string name="show_more">Show More</string>
+	<!-- small button to close list with names in different languages -->
+	<string name="show_less">Show Less</string>
+	<string name="add_language">Add a language</string>
+	<string name="address">Address</string>
+	<string name="street">Street</string>
+	<!-- Editable House Number text field (in address block). -->
+	<string name="house">House</string>
+	<string name="details">Details</string>
+	<!-- Text field to enter non-existing street name, below list of known streets around -->
+	<string name="add_street">Add a street</string>
+	<string name="choose_language">Choose a language</string>
+	<string name="choose_street">Choose a street</string>
+	<string name="postal_code">Postal Code</string>
+	<!-- login text field -->
+	<string name="email_or_username">Email or username</string>
 </resources>
diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings
index 24f7456725..770f82ab5f 100644
--- a/iphone/Maps/ar.lproj/Localizable.strings
+++ b/iphone/Maps/ar.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "رسالة";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "البريد الالكتروني";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "اعبر هذه الحدود دائمًا";
 
-"dialog_routing_not_now" = "ليس الآن";
+"not_now" = "ليس الآن";
 
 "dialog_routing_build_route" = "إنشاء";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "لتسهيل استخدام MAPS.ME أثناء القيادة في الظلام، فقد أضفنا وضع التجول الليلي. إنه يعمل تلقائيا بعد غروب الشمس.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "إضافة جدول";
 
 "editor_time_delete" = "حذف جدول";
@@ -1394,3 +1388,103 @@
 "delete_all" = "حذف الكل";
 
 "autodownload" = "التنزيل التلقائي";
+
+/* Place Page opening hours text */
+"closed_now" = "مغلق الآن";
+
+/* Place Page opening hours text */
+"daily" = "يوميا";
+
+"twentyfour_seven" = "ليلا ونهارا";
+
+"day_off_today" = "اليوم عطلة";
+
+"day_off" = "عطلة";
+
+"today" = "اليوم";
+
+"sunrise_to_sunset" = "من الشروق إلى المغيب";
+
+"add_opening_hours" = "اضف ساعات عمل";
+
+"edit_opening_hours" = "حرر ساعات عمل";
+
+"profile" = "الملف الشخصي";
+
+"no_osm_account" = "ليس لديك حساب في OpenStreetMap؟";
+
+"register_at_openstreetmap" = "التسجيل";
+
+"login" = "تسجيل الدخول";
+
+"password" = "كلمة المرور";
+
+"forgot_password" = "هل نسيت كلمة المرور؟";
+
+/* Forgot Password dialog title */
+"restore_password" = "استعادة كلمة المرور";
+
+"enter_email_address_to_reset_password" = "أدخل عنوان البريد الإلكتروني الذي استخدمته عند التسجيل وسنرسل لك رابط لتجديد كلمة المرور";
+
+"reset_password" = "إعادة تعيين كلمة المرور";
+
+"username" = "اسم المستخدم";
+
+"osm_account" = "حساب OSM";
+
+"logout" = "تسجيل الخروج";
+
+"login_and_edit_map_motivation_message" = "قم بتسجيل الدخول وعدل البيانات الخاصة بالمكان على الخريطة وسنجعلها متاحة لملايين المستخدمين الآخرين. لنجعل العالم أفضل معا.";
+
+"not_sent" = "لم ترسل";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "تغييرات";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "لقد قمت بتعديلك الأول!";
+
+"thank_you" = "شكرا لك";
+
+"login_with_openstreetmap" = "قم بتسجيل الدخول في www.openstreetmap.org";
+
+"edit_place" = "تعديل المكان";
+
+"place_name" = "اسم المكان";
+
+"place_name_caption" = "أدخل الاسم كما هو مبين على الإشارة الخاصة بالمكان";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "إضافة لغة";
+
+"address" = "العنوان";
+
+"street" = "الشارع";
+
+/* Editable House Number text field (in address block). */
+"house" = "المبني";
+
+"details" = "التفاصيل";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "إضافة شارع";
+
+"choose_language" = "اختر اللغة";
+
+"choose_street" = "اختر الشارع";
+
+"postal_code" = "الرمز البريدي";
+
+/* login text field */
+"email_or_username" = "البريد الإلكتروني أو اسم المستخدم";
diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings
index 030060a7e2..d7d6247560 100644
--- a/iphone/Maps/cs.lproj/Localizable.strings
+++ b/iphone/Maps/cs.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Zpráva";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-mail";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Vždy překročit tuto hranici";
 
-"dialog_routing_not_now" = "Nyní ne";
+"not_now" = "Nyní ne";
 
 "dialog_routing_build_route" = "Vytvořit";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Přidali jsme noční režim, abyste mohli MAPS.ME používat při řízení v noci. Zapíná se automaticky po západu slunce.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Přidat rozvrh";
 
 "editor_time_delete" = "Smazat rozvrh";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Odstranit vše";
 
 "autodownload" = "Automaticky stahovat";
+
+/* Place Page opening hours text */
+"closed_now" = "Nyní je zavřeno";
+
+/* Place Page opening hours text */
+"daily" = "Denně";
+
+"twentyfour_seven" = "Den a noc";
+
+"day_off_today" = "Dnes je den volna";
+
+"day_off" = "Den volna";
+
+"today" = "Dnes";
+
+"sunrise_to_sunset" = "Od úsvitu do soumraku";
+
+"add_opening_hours" = "Přidat otevírací dobu";
+
+"edit_opening_hours" = "Upravit otevírací dobu";
+
+"profile" = "Profil";
+
+"no_osm_account" = "Nemáte účet u OpenStreetMap?";
+
+"register_at_openstreetmap" = "Registrace";
+
+"login" = "Přihlásit se";
+
+"password" = "Heslo";
+
+"forgot_password" = "Zapomenuté heslo?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Obnovit heslo";
+
+"enter_email_address_to_reset_password" = "Zadejte emailovou adresu, kterou jste používali během registrace a my Vám pošleme odkaz, abyste mohli obnovit svoje heslo.";
+
+"reset_password" = "Resetovat heslo";
+
+"username" = "Uživatelské jméno";
+
+"osm_account" = "Účet OSM";
+
+"logout" = "Odhlášení";
+
+"login_and_edit_map_motivation_message" = "Přihlaste se a editujte informace o objektech na mapě a my je zpřístupníme miliónům dalších uživatelů. Udělejme společně svět dokonalejším místem.";
+
+"not_sent" = "Neposláno";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "změn";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Editovali jste svůj první objekt!";
+
+"thank_you" = "Děkujeme Vám";
+
+"login_with_openstreetmap" = "Log in at www.openstreetmap.org";
+
+"edit_place" = "Upravit místo";
+
+"place_name" = "Název místa";
+
+"place_name_caption" = "Zadejte název, jak je uveden na vývěsním štítu místa";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Přidat jazyk";
+
+"address" = "Adresa";
+
+"street" = "Ulice";
+
+/* Editable House Number text field (in address block). */
+"house" = "Budova";
+
+"details" = "Podrobnosti";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Přidat ulici";
+
+"choose_language" = "Zvolit jazyk";
+
+"choose_street" = "Zvolit ulici";
+
+"postal_code" = "PSČ";
+
+/* login text field */
+"email_or_username" = "E-mail nebo uživatelské jméno";
diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings
index 47a19f2009..a532882aad 100644
--- a/iphone/Maps/da.lproj/Localizable.strings
+++ b/iphone/Maps/da.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Besked";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-mail";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Kryds altid denne grænse";
 
-"dialog_routing_not_now" = "Ikke nu";
+"not_now" = "Ikke nu";
 
 "dialog_routing_build_route" = "Opret";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "For at hjælpe med brugen af MAPS.ME ved kørsel om natten har vi tilføjet nattilstand. Den slår automatisk til efter solnedgang.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Tilføj tidsplan";
 
 "editor_time_delete" = "Slet tidsplan";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Slet alle";
 
 "autodownload" = "Automatisk download";
+
+/* Place Page opening hours text */
+"closed_now" = "Lukket nu";
+
+/* Place Page opening hours text */
+"daily" = "Daglig";
+
+"twentyfour_seven" = "Dag og nat";
+
+"day_off_today" = "Fridag i dag";
+
+"day_off" = "Fridag";
+
+"today" = "I dag";
+
+"sunrise_to_sunset" = "Fra solopgang til solnedgang";
+
+"add_opening_hours" = "Tilføj arbejdstid";
+
+"edit_opening_hours" = "Rediger arbejdstid";
+
+"profile" = "Profil";
+
+"no_osm_account" = "Ingen konto på OpenStreetMap?";
+
+"register_at_openstreetmap" = "Tilmeld dig";
+
+"login" = "Log ind";
+
+"password" = "Adgangskode";
+
+"forgot_password" = "Glemt adgangskode?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Genopret adgangskode";
+
+"enter_email_address_to_reset_password" = "Indtast den e-mailadresse du anvendte under tilmelding, så sender vi dig linket til at forny din adgangskode.";
+
+"reset_password" = "Nulstil adgangskode";
+
+"username" = "Brugernavn";
+
+"osm_account" = "OSM-konto";
+
+"logout" = "Log ud";
+
+"login_and_edit_map_motivation_message" = "Log ind og rediger oplysninger for objekter på kortet, så sørger vi for, at de er tilgængelige for millioner af andre brugere. Lad os sammen gøre verden bedre.";
+
+"not_sent" = "Ikke sendt";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "ændringer";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Du har redigeret dit første objekt!";
+
+"thank_you" = "Mange tak";
+
+"login_with_openstreetmap" = "Log ind på www.openstreetmap.org";
+
+"edit_place" = "Redigér stedet";
+
+"place_name" = "Navn på sted";
+
+"place_name_caption" = "Indtast navnet, som det står på skiltet for stedet";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Tilføj et sprog";
+
+"address" = "Adresse";
+
+"street" = "Gade";
+
+/* Editable House Number text field (in address block). */
+"house" = "Bygning";
+
+"details" = "Oplysninger";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Tilføj en gade";
+
+"choose_language" = "Vælg et sprog";
+
+"choose_street" = "Vælg en gade";
+
+"postal_code" = "Postnummer";
+
+/* login text field */
+"email_or_username" = "E-mail eller brugernavn";
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index 0e9a89cef9..ee38073d3b 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Nachricht";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-Mail";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Diese Grenze immer überschreiten";
 
-"dialog_routing_not_now" = "Nicht jetzt";
+"not_now" = "Nicht jetzt";
 
 "dialog_routing_build_route" = "Erstellen";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Um die Nutzung von MAPS.ME beim Fahren im Dunkeln zu erleichtern, haben wir den Nachtmodus hinzugefügt. Dieser wird automatisch nach Sonnenuntergang aktiviert.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Zeitplan hinzufügen";
 
 "editor_time_delete" = "Zeitplan löschen";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Alle löschen";
 
 "autodownload" = "Automatisch Herunterladen";
+
+/* Place Page opening hours text */
+"closed_now" = "Jetzt geschlossen";
+
+/* Place Page opening hours text */
+"daily" = "Täglich";
+
+"twentyfour_seven" = "Tag und Nacht";
+
+"day_off_today" = "Heute Ruhetag";
+
+"day_off" = "Ruhetag";
+
+"today" = "Heute";
+
+"sunrise_to_sunset" = "Von Sonnenauf- bis Sonnenuntergang";
+
+"add_opening_hours" = "Geschäftszeiten hinzufügen";
+
+"edit_opening_hours" = "Geschäftszeiten bearbeiten";
+
+"profile" = "Profil";
+
+"no_osm_account" = "Kein Konto in OpenStreetMap?";
+
+"register_at_openstreetmap" = "Registrieren";
+
+"login" = "Anmelden";
+
+"password" = "Passwort";
+
+"forgot_password" = "Passwort vergessen?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Passwort wiederherstellen";
+
+"enter_email_address_to_reset_password" = "Geben Sie bitte die E-Mail-Adresse ein, die Sie zur Registrierung verwendet haben. Wir senden Ihnen dann den Link zur Erneuerung Ihres Passworts.";
+
+"reset_password" = "Passwort zurücksetzen";
+
+"username" = "Benutzername";
+
+"osm_account" = "OSM Konto";
+
+"logout" = "Abmelden";
+
+"login_and_edit_map_motivation_message" = "Anmelden und Informationen zu den Objekten auf der Karte bearbeiten. Wir werden sie für Millionen von anderen Nutzern verfügbar machen. Lassen Sie uns zusammen die Welt verbessern.";
+
+"not_sent" = "Nicht gesendet";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "Änderungen";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Sie haben Ihr erstes Objekt bearbeitet!";
+
+"thank_you" = "Danke";
+
+"login_with_openstreetmap" = "Anmelden bei www.openstreetmap.org";
+
+"edit_place" = "Platz bearbeiten";
+
+"place_name" = "Name des Platzes";
+
+"place_name_caption" = "Geben Sie den Namen ein, der auf dem Schild des Platzes steht";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Eine Sprache hinzufügen";
+
+"address" = "Adresse";
+
+"street" = "Straße";
+
+/* Editable House Number text field (in address block). */
+"house" = "Gebäude";
+
+"details" = "Einzelheiten";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Eine Straße hinzufügen";
+
+"choose_language" = "Eine Sprache wählen";
+
+"choose_street" = "Eine Straße wählen";
+
+"postal_code" = "Postleitzahl";
+
+/* login text field */
+"email_or_username" = "E-Mail oder Benutzername";
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index c69936cac4..7bafd24824 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -431,8 +431,8 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Message";
 
-/* Share by email button text */
-"email" = "E-mail";
+/* Share by email button text, also used in editor. */
+"email" = "Email";
 
 /* Copy Link */
 "copy_link" = "Copy Link";
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Always cross this boundary";
 
-"dialog_routing_not_now" = "Not Now";
+"not_now" = "Not Now";
 
 "dialog_routing_build_route" = "Create";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "To facilitate using MAPS.ME when driving in the dark, we have added night mode. It switches on automatically after sunset.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Add Schedule";
 
 "editor_time_delete" = "Delete Schedule";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Delete all";
 
 "autodownload" = "Auto-download";
+
+/* Place Page opening hours text */
+"closed_now" = "Closed now";
+
+/* Place Page opening hours text */
+"daily" = "Daily";
+
+"twentyfour_seven" = "24/7";
+
+"day_off_today" = "Day off today";
+
+"day_off" = "Day off";
+
+"today" = "Today";
+
+"sunrise_to_sunset" = "From sunrise to sunset";
+
+"add_opening_hours" = "Add opening hours";
+
+"edit_opening_hours" = "Edit opening hours";
+
+"profile" = "Profile";
+
+"no_osm_account" = "Don't have OpenStreetMap account?";
+
+"register_at_openstreetmap" = "Register at OpenStreetMap";
+
+"login" = "Log In";
+
+"password" = "Password";
+
+"forgot_password" = "Forgot password?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Restore password";
+
+"enter_email_address_to_reset_password" = "Enter the email address you used during registration and we will send you the link to reset your password.";
+
+"reset_password" = "Reset Password";
+
+"username" = "Username";
+
+"osm_account" = "OSM Account";
+
+"logout" = "Log Out";
+
+"login_and_edit_map_motivation_message" = "Log in and edit objects on the map, and we will make them available for millions of users. Let’s make the world better together.";
+
+"not_sent" = "Not Sent";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "changes";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "You’ve edited your first object!";
+
+"thank_you" = "Thank You";
+
+"login_with_openstreetmap" = "Log in at www.openstreetmap.org";
+
+"edit_place" = "Edit Place";
+
+"place_name" = "Place Name";
+
+"place_name_caption" = "Enter the name as it is on the sign of the place";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Add a language";
+
+"address" = "Address";
+
+"street" = "Street";
+
+/* Editable House Number text field (in address block). */
+"house" = "House";
+
+"details" = "Details";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Add a street";
+
+"choose_language" = "Choose a language";
+
+"choose_street" = "Choose a street";
+
+"postal_code" = "Postal Code";
+
+/* login text field */
+"email_or_username" = "Email or username";
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index 137a6c6b16..43f533c91a 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Mensaje";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "Correo electrónico";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Cruzar siempre este límite";
 
-"dialog_routing_not_now" = "No ahora";
+"not_now" = "No ahora";
 
 "dialog_routing_build_route" = "Crear";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Para facilitar el uso de MAPS.ME al conducir en la oscuridad, hemos añadido el modo nocturno. Este se activa automáticamente tras el atardecer.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Añadir horario";
 
 "editor_time_delete" = "Eliminar horario";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Eliminar todos";
 
 "autodownload" = "Descarga automática";
+
+/* Place Page opening hours text */
+"closed_now" = "Cerrado ahora";
+
+/* Place Page opening hours text */
+"daily" = "Diario";
+
+"twentyfour_seven" = "Día y noche";
+
+"day_off_today" = "Día libre hoy";
+
+"day_off" = "Día libre";
+
+"today" = "Hoy";
+
+"sunrise_to_sunset" = "Del amanecer al atardecer";
+
+"add_opening_hours" = "Añadir horas comerciales";
+
+"edit_opening_hours" = "Editar las horas comerciales";
+
+"profile" = "Perfil";
+
+"no_osm_account" = "¿No tienes cuenta en OpenStreetMap?";
+
+"register_at_openstreetmap" = "Registrarse";
+
+"login" = "Iniciar sesión";
+
+"password" = "Contraseña";
+
+"forgot_password" = "¿Has olvidado tu contraseña?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Restaurar contraseña";
+
+"enter_email_address_to_reset_password" = "Introduce la dirección de correo electrónico que utilizaste durante el registro y te enviaremos el enlace para restaurar tu contraseña.";
+
+"reset_password" = "Restablecer contraseña";
+
+"username" = "Usuario";
+
+"osm_account" = "Cuenta OSM";
+
+"logout" = "Cerrar sesión";
+
+"login_and_edit_map_motivation_message" = "Inicia sesión y edita la información de los objetos en el mapa y los pondremos a disposición de millones de otros usuarios. Hagamos de este mundo un lugar mejor.";
+
+"not_sent" = "No enviado";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "cambios";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "¡Has editado tu primer objeto!";
+
+"thank_you" = "Gracias";
+
+"login_with_openstreetmap" = "Iniciar sesión en www.openstreetmap.org";
+
+"edit_place" = "Editar el lugar";
+
+"place_name" = "Nombre del lugar";
+
+"place_name_caption" = "Introduce el nombre como está en la señal del lugar";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Añadir un idioma";
+
+"address" = "Dirección";
+
+"street" = "Calle";
+
+/* Editable House Number text field (in address block). */
+"house" = "Edificio";
+
+"details" = "Detalles";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Añadir una calle";
+
+"choose_language" = "Elegir un idioma";
+
+"choose_street" = "Elegir una calle";
+
+"postal_code" = "Código postal";
+
+/* login text field */
+"email_or_username" = "Correo electrónico o usuario";
diff --git a/iphone/Maps/fi.lproj/Localizable.strings b/iphone/Maps/fi.lproj/Localizable.strings
index 8699b00e4f..2585a368eb 100644
--- a/iphone/Maps/fi.lproj/Localizable.strings
+++ b/iphone/Maps/fi.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Viesti";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "Sähköposti";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Ylitä aina tämä raja";
 
-"dialog_routing_not_now" = "Ei nyt";
+"not_now" = "Ei nyt";
 
 "dialog_routing_build_route" = "Luo";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Olemme lisänneet yötilan helpottaaksemme MAPS.ME:n käyttöä pimeällä ajettaessa. Se menee automaattisesti päälle auringonlaskun jälkeen.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Lisää aikataulu";
 
 "editor_time_delete" = "Poista aikataulu";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Poista kaikki";
 
 "autodownload" = "Lataa automaattisesti";
+
+/* Place Page opening hours text */
+"closed_now" = "Suljettu nyt";
+
+/* Place Page opening hours text */
+"daily" = "Päivittäin";
+
+"twentyfour_seven" = "Päivin ja öin";
+
+"day_off_today" = "Vapaapäivä tänään";
+
+"day_off" = "Vapaapäivä";
+
+"today" = "Tänään";
+
+"sunrise_to_sunset" = "Auringonnoususta auringonlaskuun";
+
+"add_opening_hours" = "Lisää aukioloajat";
+
+"edit_opening_hours" = "Muokkaa aukioloaikoja";
+
+"profile" = "Profiili";
+
+"no_osm_account" = "Eikö sinulla ole tiliä OpenStreetMap?";
+
+"register_at_openstreetmap" = "Rekisteröidy";
+
+"login" = "Kirjaudu sisään";
+
+"password" = "Salasana";
+
+"forgot_password" = "Unohtuiko salasana?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Palauta salasana";
+
+"enter_email_address_to_reset_password" = "Syötä rekisteröitymisessä käyttämäsi sähköpostiosoite, niin lähetämme sinulle linkin salasanasi vaihtamista varten.";
+
+"reset_password" = "Aseta salasana uudelleen";
+
+"username" = "Käyttäjänimi";
+
+"osm_account" = "OSM-tili";
+
+"logout" = "Kirjaudu ulos";
+
+"login_and_edit_map_motivation_message" = "Kirjaudu sisään ja muokkaa kartan kohteiden tietoja, ja me asetamme kohteet miljoonien muiden käyttäjien saataville. Tehdään maailmasta yhdessä parempi paikka.";
+
+"not_sent" = "Ei lähetetty";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "muutosta";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Olet muokannut ensimmäistä kohdettasi!";
+
+"thank_you" = "Kiitos";
+
+"login_with_openstreetmap" = "Kirjaudu sisään osoitteessa www.openstreetmap.org";
+
+"edit_place" = "Muokkaa sijaintia";
+
+"place_name" = "Paikan nimi";
+
+"place_name_caption" = "Syötä paikan nimi siinä muodossa kun se kyltissä on";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Lisää kieli";
+
+"address" = "Osoite";
+
+"street" = "Katu";
+
+/* Editable House Number text field (in address block). */
+"house" = "Rakennus";
+
+"details" = "Lisätiedot";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Lisää katu";
+
+"choose_language" = "Valitse kieli";
+
+"choose_street" = "Valitse katu";
+
+"postal_code" = "Postikoodi";
+
+/* login text field */
+"email_or_username" = "Sähköposti tai käyttäjätunnus";
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index 49e4445d88..91e4a8ac20 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -431,8 +431,8 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Message";
 
-/* Share by email button text */
-"email" = "Courriel";
+/* Share by email button text, also used in editor. */
+"email" = "E-mail";
 
 /* Copy Link */
 "copy_link" = "Copier le lien";
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Toujours dépasser ce cadre";
 
-"dialog_routing_not_now" = "Pas maintenant";
+"not_now" = "Pas maintenant";
 
 "dialog_routing_build_route" = "Créer";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Pour faciliter l'utilisation de MAPS.ME en conduisant dans l'obscurité, nous avons ajouté le mode nuit. Il se met automatiquement en marche après le coucher du soleil.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Ajouter au planning";
 
 "editor_time_delete" = "Supprimer du planning";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Supprimer tout";
 
 "autodownload" = "Téléchargement automatique";
+
+/* Place Page opening hours text */
+"closed_now" = "Fermé actuellement";
+
+/* Place Page opening hours text */
+"daily" = "Tous les jours";
+
+"twentyfour_seven" = "Jour et nuit";
+
+"day_off_today" = "Jour de fermeture aujourd'hui";
+
+"day_off" = "Jour de fermeture";
+
+"today" = "Aujourd'hui";
+
+"sunrise_to_sunset" = "Du lever au coucher du soleil";
+
+"add_opening_hours" = "Ajouter les heures d'ouverture";
+
+"edit_opening_hours" = "Modifier les heures d'ouverture";
+
+"profile" = "Profil";
+
+"no_osm_account" = "Vous n'avez pas de compte sur OpenStreetMap?";
+
+"register_at_openstreetmap" = "Inscription";
+
+"login" = "Connexion";
+
+"password" = "Mot de passe";
+
+"forgot_password" = "Mot de passe oublié ?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Réinitialiser le mot de passe";
+
+"enter_email_address_to_reset_password" = "Entrez l'adresse e-mail que vous avez utilisé lors de l'inscription et nous vous ferons parvenir le lien pour renouveler votre mot de passe.";
+
+"reset_password" = "Réinitialiser le mot de passe";
+
+"username" = "Nom d'utilisateur";
+
+"osm_account" = "Compte OSM";
+
+"logout" = "Déconnexion";
+
+"login_and_edit_map_motivation_message" = "Connectez-vous et modifiez les informations des objets présents sur la carte et nous allons les rendre disponibles pour des millions d'autres utilisateurs. Rendons le monde meilleur ensemble.";
+
+"not_sent" = "Non envoyé";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "modifications";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Vous avez modifié votre premier objet!";
+
+"thank_you" = "Merci";
+
+"login_with_openstreetmap" = "Connectez-vous sur www.openstreetmap.org";
+
+"edit_place" = "Modifier le lieu";
+
+"place_name" = "Nom du lieu";
+
+"place_name_caption" = "Saisissez le nom tel qu'il apparaît sur le panneau du lieu";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Ajouter une langue";
+
+"address" = "Adresse";
+
+"street" = "Rue";
+
+/* Editable House Number text field (in address block). */
+"house" = "Immeuble";
+
+"details" = "Détails";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Ajouter une rue";
+
+"choose_language" = "Choisir une langue";
+
+"choose_street" = "Choisir une rue";
+
+"postal_code" = "Code postal";
+
+/* login text field */
+"email_or_username" = "E-mail ou nom d'utilisateur";
diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings
index 5ed76e1434..eedb9852e9 100644
--- a/iphone/Maps/hu.lproj/Localizable.strings
+++ b/iphone/Maps/hu.lproj/Localizable.strings
@@ -431,8 +431,8 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Üzenet";
 
-/* Share by email button text */
-"email" = "Email";
+/* Share by email button text, also used in editor. */
+"email" = "E-mail";
 
 /* Copy Link */
 "copy_link" = "Hivatkozás másolása";
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Mindig haladjon át ezen a határon";
 
-"dialog_routing_not_now" = "Most nem";
+"not_now" = "Most nem";
 
 "dialog_routing_build_route" = "Létrehozás";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "A MAPS.ME használatának sötétben való vezetés közbeni elősegítése érdekében hozzáadtuk a funkciókhoz az éjszakai módot. Naplemente után automatikusan bekapcsol.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Időrend felvitele";
 
 "editor_time_delete" = "Időrend törlése";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Összes térkép törlése";
 
 "autodownload" = "Automatikus letöltés";
+
+/* Place Page opening hours text */
+"closed_now" = "Most zárva";
+
+/* Place Page opening hours text */
+"daily" = "Naponta";
+
+"twentyfour_seven" = "Nappal és éjszaka";
+
+"day_off_today" = "Ma szabadnap";
+
+"day_off" = "Szabadnap";
+
+"today" = "Ma";
+
+"sunrise_to_sunset" = "Napkeltétől napnyugtáig";
+
+"add_opening_hours" = "Nyitvatartás hozzáadása";
+
+"edit_opening_hours" = "Nyitvatartás szerkesztése";
+
+"profile" = "Profil";
+
+"no_osm_account" = "Nem rendelkezel még OpenStreetMap-felhasználói fiókkal?";
+
+"register_at_openstreetmap" = "Regisztráció";
+
+"login" = "Bejelentkezés";
+
+"password" = "Jelszó";
+
+"forgot_password" = "Elfelejtett jelszó?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Jelszó visszaállítása";
+
+"enter_email_address_to_reset_password" = "Add meg a regisztrációkor használt e-mail-címedet és elküldjük neked a jelszavad megújításához szükséges linket.";
+
+"reset_password" = "Jelszó visszaállítása";
+
+"username" = "Felhasználónév";
+
+"osm_account" = "OSM-felhasználói fiók";
+
+"logout" = "Kijelentkezés";
+
+"login_and_edit_map_motivation_message" = "Jelentkezz be és szerkeszd az egyes objektumokhoz tartozó információkat a térképen, valamint tedd őket elérhetővé több millió felhasználó számára.";
+
+"not_sent" = "Nincs elküldve";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "változtatás";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Szerkesztetted az első objektumod!";
+
+"thank_you" = "Köszönjük";
+
+"login_with_openstreetmap" = "Jelentkezz be a www.openstreetmap.org oldalon";
+
+"edit_place" = "Hely szerkesztése";
+
+"place_name" = "Hely neve";
+
+"place_name_caption" = "Add meg a nevet, ami a helyet jelzi";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Nyelv hozzáadása";
+
+"address" = "Cím";
+
+"street" = "Utca";
+
+/* Editable House Number text field (in address block). */
+"house" = "Épület";
+
+"details" = "Részletek";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Utca hozzáadása";
+
+"choose_language" = "Nyelv kiválasztása";
+
+"choose_street" = "Utca kiválasztása";
+
+"postal_code" = "Irányítószám";
+
+/* login text field */
+"email_or_username" = "E-mail vagy felhasználónév";
diff --git a/iphone/Maps/id.lproj/Localizable.strings b/iphone/Maps/id.lproj/Localizable.strings
index 6fcb4687c5..9c57f7b872 100644
--- a/iphone/Maps/id.lproj/Localizable.strings
+++ b/iphone/Maps/id.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Pesan";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "Surel";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Selalu lewati batas ini";
 
-"dialog_routing_not_now" = "Jangan Sekarang";
+"not_now" = "Jangan Sekarang";
 
 "dialog_routing_build_route" = "Buat";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Untuk memfasilitasi penggunaan MAPS.ME saat berkendara dalam gelap, kami telah menambahkan mode malam. Mode ini diaktifkan secara otomatis setelah matahari terbenam.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Tambah Jadwal";
 
 "editor_time_delete" = "Hapus Jadwal";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Hapus semua";
 
 "autodownload" = "Unduhan otomatis";
+
+/* Place Page opening hours text */
+"closed_now" = "Sekarang Tutup";
+
+/* Place Page opening hours text */
+"daily" = "Setiap Hari";
+
+"twentyfour_seven" = "siang dan malam";
+
+"day_off_today" = "Hari ini libur";
+
+"day_off" = "Libur";
+
+"today" = "Hari ini";
+
+"sunrise_to_sunset" = "Dari matahari terbit sampai matahari terbenam";
+
+"add_opening_hours" = "Tambah jam kerja";
+
+"edit_opening_hours" = "Sunting jam kerja";
+
+"profile" = "Profil";
+
+"no_osm_account" = "Tidak ada akun di OpenStreetMap?";
+
+"register_at_openstreetmap" = "Mendaftar";
+
+"login" = "Masuk";
+
+"password" = "Kata sandi";
+
+"forgot_password" = "Lupa kata sandi?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Pulihkan kata sandi";
+
+"enter_email_address_to_reset_password" = "Masukkan alamat surek yang Anda gunakan pada saat pendaftaran dan kami akan mengirim tautan untuk memperbarui kata sandi Anda.";
+
+"reset_password" = "Atur ulang kata sandi";
+
+"username" = "Nama pengguna";
+
+"osm_account" = "Akun OSM";
+
+"logout" = "Keluar";
+
+"login_and_edit_map_motivation_message" = "Masuk dan sunting informasi objek pada peta dan kami akan membuatnya tersedia bagi jutaan pengguna lain. Mari kita menjadikan dunia lebih baik bersama-sama.";
+
+"not_sent" = "Tidak terkirim";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "perubahan";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Anda menyunting objek pertama Anda!";
+
+"thank_you" = "Terima kasih";
+
+"login_with_openstreetmap" = "Masuk di www.openstreetmap.org";
+
+"edit_place" = "Sunting tempat";
+
+"place_name" = "Nama tempat";
+
+"place_name_caption" = "Masukkan nama seperti pada tanda tempat";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Tambahkan bahasa";
+
+"address" = "Alamat";
+
+"street" = "Jalan";
+
+/* Editable House Number text field (in address block). */
+"house" = "Bangunan";
+
+"details" = "Detail";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Tambahkan jalan";
+
+"choose_language" = "Pilih bahasa";
+
+"choose_street" = "Pilih jalan";
+
+"postal_code" = "Kode Pos";
+
+/* login text field */
+"email_or_username" = "Surel atau nama pengguna";
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index b9f2c44dc9..40212f9fa6 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Messaggio";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-mail";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Oltrepassa sempre questo limite";
 
-"dialog_routing_not_now" = "Non ora";
+"not_now" = "Non ora";
 
 "dialog_routing_build_route" = "Crea";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Per poter utilizzare al meglio MAPS.ME di sera o di notte, abbiamo aggiunto la modalità notturna. L'applicazione passerà automaticamente a questa modalità dopo il tramonto.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Aggiungi orari";
 
 "editor_time_delete" = "Elimina orari";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Elimina tutti";
 
 "autodownload" = "Scaricamento automatico";
+
+/* Place Page opening hours text */
+"closed_now" = "Ora chiuso";
+
+/* Place Page opening hours text */
+"daily" = "Tutti i giorni";
+
+"twentyfour_seven" = "Giorno e notte";
+
+"day_off_today" = "Oggi giorno di riposo";
+
+"day_off" = "Giorno di riposo";
+
+"today" = "Oggi";
+
+"sunrise_to_sunset" = "Dall'alba al tramonto";
+
+"add_opening_hours" = "Aggiungi orari di apertura";
+
+"edit_opening_hours" = "Modifica orari di apertura";
+
+"profile" = "Profilo";
+
+"no_osm_account" = "Non hai un account su OpenStreetMap?";
+
+"register_at_openstreetmap" = "Registrati";
+
+"login" = "Accedi";
+
+"password" = "Password";
+
+"forgot_password" = "Hai dimenticato la password?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Ripristina password";
+
+"enter_email_address_to_reset_password" = "Inserisci l'indirizzo email utilizzato durante la registrazione e ti invieremo un link per recuperare la password.";
+
+"reset_password" = "Reimpostare password";
+
+"username" = "Nome utente";
+
+"osm_account" = "Account OSM";
+
+"logout" = "Esci";
+
+"login_and_edit_map_motivation_message" = "Accedi e modifica le informazioni degli oggetti sulla mappa e noi provvederemo a renderli disponibili a milioni di altri utenti. Creiamo un mondo migliore assieme.";
+
+"not_sent" = "Non inviato";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "modifiche";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Hai modificato il tuo primo oggetto!";
+
+"thank_you" = "Grazie";
+
+"login_with_openstreetmap" = "Accedi su www.openstreetmap.org";
+
+"edit_place" = "Modifica il luogo";
+
+"place_name" = "Nome del luogo";
+
+"place_name_caption" = "Inserisci il nome così com'è scritto sul segnale del luogo";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Aggiungi una lingua";
+
+"address" = "Indirizzo";
+
+"street" = "Via";
+
+/* Editable House Number text field (in address block). */
+"house" = "Edificio";
+
+"details" = "Dettagli";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Aggiungi una strada";
+
+"choose_language" = "Scegli una lingua";
+
+"choose_street" = "Scegli una strada";
+
+"postal_code" = "Codice postale";
+
+/* login text field */
+"email_or_username" = "E-mail o nome utente";
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index 8877b96e32..26e601a085 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "メッセージ";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "Eメール";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "常にこの境界を越える";
 
-"dialog_routing_not_now" = "あとで";
+"not_now" = "あとで";
 
 "dialog_routing_build_route" = "作成する";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "MAPS.MEを夜間の運転中に使いやすくするため、夜間モードを追加しました。日の入り後に自動的に切り替わります。";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "スケジュール追加";
 
 "editor_time_delete" = "スケジュール削除";
@@ -1394,3 +1388,103 @@
 "delete_all" = "すべて削除";
 
 "autodownload" = "自動ダウンロード";
+
+/* Place Page opening hours text */
+"closed_now" = "現在閉店";
+
+/* Place Page opening hours text */
+"daily" = "毎日";
+
+"twentyfour_seven" = "昼と夜";
+
+"day_off_today" = "今日は休み";
+
+"day_off" = "休み";
+
+"today" = "今日は";
+
+"sunrise_to_sunset" = "日の出から日没まで";
+
+"add_opening_hours" = "営業時間を追加";
+
+"edit_opening_hours" = "営業時間を編集";
+
+"profile" = "プロフィール";
+
+"no_osm_account" = "OpenStreetMapのアカウントがありませんか？";
+
+"register_at_openstreetmap" = "登録";
+
+"login" = "ログイン";
+
+"password" = "パスワード";
+
+"forgot_password" = "パスワードをお忘れですか？";
+
+/* Forgot Password dialog title */
+"restore_password" = "パスワードをf復元";
+
+"enter_email_address_to_reset_password" = "登録の際に使用したメールアドレスを入力してください。パスワードを更新するリンクをお送りします。";
+
+"reset_password" = "パスワードをリセット";
+
+"username" = "ユーザー名";
+
+"osm_account" = "OSMアカウント";
+
+"logout" = "ログアウト";
+
+"login_and_edit_map_motivation_message" = "ログインしてマップ上のオブジェクトの詳細を編集すると、何百万人もの他のユーザーがその情報を利用できるようになります。一緒により良い世界を作りましょう。";
+
+"not_sent" = "送信されませんでした";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "つの変更点";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "初めてオブジェクトを編集しました！";
+
+"thank_you" = "ありがとうございます";
+
+"login_with_openstreetmap" = "www.openstreetmap.orgでログインしてください";
+
+"edit_place" = "場所を編集";
+
+"place_name" = "場所の名前";
+
+"place_name_caption" = "この場所の看板通りに名前を入力してください";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "言語を追加";
+
+"address" = "住所";
+
+"street" = "通り";
+
+/* Editable House Number text field (in address block). */
+"house" = "建物";
+
+"details" = "詳細";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "通りを追加";
+
+"choose_language" = "言語を選択";
+
+"choose_street" = "通りを選択";
+
+"postal_code" = "郵便番号";
+
+/* login text field */
+"email_or_username" = "メールアドレスまたはユーザー名";
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index 88a8e0bb59..22c2fe56dc 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "메시지";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "이메일";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "항상 이 경계 통과";
 
-"dialog_routing_not_now" = "나중에";
+"not_now" = "나중에";
 
 "dialog_routing_build_route" = "만들기";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "어두운 곳에서 운전할 때 MAPS.ME를 사용하는 걸 용이하게 하려면, 야간 모드에 추가됩니다. 이는 일몰 후 자동으로 전환됩니다.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "스케줄 추가";
 
 "editor_time_delete" = "스케줄 삭제";
@@ -1394,3 +1388,103 @@
 "delete_all" = "모두 삭제";
 
 "autodownload" = "자동 다운로드";
+
+/* Place Page opening hours text */
+"closed_now" = "지금 닫힘";
+
+/* Place Page opening hours text */
+"daily" = "일별";
+
+"twentyfour_seven" = "24 시간";
+
+"day_off_today" = "오늘 휴가";
+
+"day_off" = "휴가";
+
+"today" = "오늘";
+
+"sunrise_to_sunset" = "일출에서 일몰로";
+
+"add_opening_hours" = "영업일 추가";
+
+"edit_opening_hours" = "영업일 편집";
+
+"profile" = "프로필";
+
+"no_osm_account" = "OpenStreetMap에서 계정이 없습니까?";
+
+"register_at_openstreetmap" = "등록";
+
+"login" = "로그인";
+
+"password" = "암호";
+
+"forgot_password" = "암호를 잊으 셨나요?";
+
+/* Forgot Password dialog title */
+"restore_password" = "암호 복원";
+
+"enter_email_address_to_reset_password" = "등록시 사용한 이메일 주소를 입력하면 암호를 갱신하도록 링크를 전송할 것입니다.";
+
+"reset_password" = "비밀번호 재 설정";
+
+"username" = "사용자 이름";
+
+"osm_account" = "OSM 계정";
+
+"logout" = "로그 아웃";
+
+"login_and_edit_map_motivation_message" = "로그인하고 지도 상의 개체 정보를 편집하면 다른 수백만 명의 사용자가 사용할 수 있도록 하겠습니다. 함께 더 나은 세상으로 만들어 봅시다.";
+
+"not_sent" = "전송되지 않음";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "가지 변경";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "로그인하고 전 세계 수백만 사람들을 위해 변화를 더하십시오!";
+
+"thank_you" = "고맙습니다.";
+
+"login_with_openstreetmap" = "www.openstreetmap.org에 로그인";
+
+"edit_place" = "장소 편집";
+
+"place_name" = "지명";
+
+"place_name_caption" = "이 장소의 기호와 같이 이름 입력";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "언어 추가";
+
+"address" = "주소";
+
+"street" = "거리";
+
+/* Editable House Number text field (in address block). */
+"house" = "건물";
+
+"details" = "세부 정보";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "거리 추가";
+
+"choose_language" = "언어 선택";
+
+"choose_street" = "거리 선택";
+
+"postal_code" = "우편 번호";
+
+/* login text field */
+"email_or_username" = "이메일 또는 사용자 이름";
diff --git a/iphone/Maps/nb.lproj/Localizable.strings b/iphone/Maps/nb.lproj/Localizable.strings
index bdcb461257..ca4a5de299 100644
--- a/iphone/Maps/nb.lproj/Localizable.strings
+++ b/iphone/Maps/nb.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Melding";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-post";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Kryss alltid denne grensen";
 
-"dialog_routing_not_now" = "Ikke nå";
+"not_now" = "Ikke nå";
 
 "dialog_routing_build_route" = "Opprett";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "For å tilrettelegge bruk av MAPS.ME under mørkekjøring har vi lagt til funksjonen nattmodus. Funksjonen skrues automatisk på etter solnedgang.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Legg til tidsrom";
 
 "editor_time_delete" = "Slett tidsrom";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Slett alle";
 
 "autodownload" = "Automatisk nedlasting";
+
+/* Place Page opening hours text */
+"closed_now" = "Lukket nå";
+
+/* Place Page opening hours text */
+"daily" = "Daglig";
+
+"twentyfour_seven" = "Dag og natt";
+
+"day_off_today" = "Fridag i dag";
+
+"day_off" = "Fridag";
+
+"today" = "I dag";
+
+"sunrise_to_sunset" = "Fra morgen til kveld";
+
+"add_opening_hours" = "Legg til åpningstider";
+
+"edit_opening_hours" = "Rediger åpningstider";
+
+"profile" = "Profil";
+
+"no_osm_account" = "Har du ingen konto hos OpenStreetMap?";
+
+"register_at_openstreetmap" = "Registrer deg";
+
+"login" = "Logg inn";
+
+"password" = "Passord";
+
+"forgot_password" = "Glemt passordet?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Gjenopprett passordet";
+
+"enter_email_address_to_reset_password" = "Skriv inn e-postadressen du brukte ved registreringen, så vil vi sende deg en kobling for å fornye passordet ditt.";
+
+"reset_password" = "Tilbakestill passord";
+
+"username" = "Brukernavn";
+
+"osm_account" = "OSM-konto";
+
+"logout" = "Logg ut";
+
+"login_and_edit_map_motivation_message" = "Logg deg inn og rediger informasjonen til objektene på kartet, så vil vi gjøre den tilgjengelig for millioner av andre brukere. La oss gjøre verden bedre sammen.";
+
+"not_sent" = "Ikke sendt";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "endringer";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Du har redigert ditt første objekt!";
+
+"thank_you" = "Takk skal du ha";
+
+"login_with_openstreetmap" = "Logg deg inn på www.openstreetmap.org";
+
+"edit_place" = "Rediger stedet";
+
+"place_name" = "Stedsnavn";
+
+"place_name_caption" = "Skriv inn navnet slik det står på stedets navneskilt";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Legg til et språk";
+
+"address" = "Adresse";
+
+"street" = "Gate";
+
+/* Editable House Number text field (in address block). */
+"house" = "Bygning";
+
+"details" = "Detaljer";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Legg til en gate";
+
+"choose_language" = "Velg et språk";
+
+"choose_street" = "Velg en gate";
+
+"postal_code" = "Postnummer";
+
+/* login text field */
+"email_or_username" = "E-postadresse eller brukernavn";
diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings
index 1dd3d15a51..dd4f9979d2 100644
--- a/iphone/Maps/nl.lproj/Localizable.strings
+++ b/iphone/Maps/nl.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Bericht";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-mail";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Deze grens altijd overschrijden";
 
-"dialog_routing_not_now" = "Niet nu";
+"not_now" = "Niet nu";
 
 "dialog_routing_build_route" = "Samenstellen";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Om het gebruik van MAPS.ME te vergemakkelijken tijdens het rijden in het donker, hebben we de nachtmodus toegevoegd. Deze wordt automatisch ingeschakeld na zonsondergang.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Schema toevoegen";
 
 "editor_time_delete" = "Schema verwijderen";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Alles verwijderen";
 
 "autodownload" = "Automatische download";
+
+/* Place Page opening hours text */
+"closed_now" = "Nu gesloten";
+
+/* Place Page opening hours text */
+"daily" = "Dagelijks";
+
+"twentyfour_seven" = "Nacht en dag";
+
+"day_off_today" = "Vrije dag vandaag";
+
+"day_off" = "Vrije dag";
+
+"today" = "Vandaag";
+
+"sunrise_to_sunset" = "Van zonsopgang tot zonsondergang";
+
+"add_opening_hours" = "Openingsuren toevoegen";
+
+"edit_opening_hours" = "Openingsuren bewerken";
+
+"profile" = "Profiel";
+
+"no_osm_account" = "Geen account bij OpenStreetMap?";
+
+"register_at_openstreetmap" = "Registeren";
+
+"login" = "Log in";
+
+"password" = "Wachtwoord";
+
+"forgot_password" = "Wachtwoord vergeten?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Wachtwoord herstellen";
+
+"enter_email_address_to_reset_password" = "Voer het e-mailadres in dat u heeft gebruikt tijdens de registratie, dan sturen wij u de link om uw wachtwoord te vernieuwen.";
+
+"reset_password" = "Wachtwoord resetten";
+
+"username" = "Gebruikersnaam";
+
+"osm_account" = "OSM-account";
+
+"logout" = "Uitloggen";
+
+"login_and_edit_map_motivation_message" = "Log in en bewerk gegevens van de objecten op de kaart, dan zullen wij ze beschikbaar maken voor miljoenen andere gebruikers. Laten we samen de wereld beter maken.";
+
+"not_sent" = "Niet verzonden";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "wijzigingen";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Je hebt je eerste object aangepast!";
+
+"thank_you" = "Dank je wel";
+
+"login_with_openstreetmap" = "Log in op www.openstreetmap.org";
+
+"edit_place" = "De locatie bewerken";
+
+"place_name" = "Locatienaam";
+
+"place_name_caption" = "Voer de naam in zoals die op het bord van de locatie wordt weergegeven";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Een taal toevoegen";
+
+"address" = "Adres";
+
+"street" = "Straat";
+
+/* Editable House Number text field (in address block). */
+"house" = "Gebouw";
+
+"details" = "Details";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Een straat toevoegen";
+
+"choose_language" = "Een taal kiezen";
+
+"choose_street" = "Een straat kiezen";
+
+"postal_code" = "Postcode";
+
+/* login text field */
+"email_or_username" = "E-mailadres of gebruikersnaam";
diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings
index fd0246ef7f..4a628ee905 100644
--- a/iphone/Maps/pl.lproj/Localizable.strings
+++ b/iphone/Maps/pl.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Wiadomość";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-mail";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Zawsze przekraczaj tę granicę";
 
-"dialog_routing_not_now" = "Nie teraz";
+"not_now" = "Nie teraz";
 
 "dialog_routing_build_route" = "Wyznacz";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Aby umożliwić korzystanie z MAPS.ME podczas prowadzenia po zmroku, dodaliśmy tryb nocny. Włącza się on automatycznie po zachodzie słońca.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Dodaj harmonogram";
 
 "editor_time_delete" = "Usuń harmonogram";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Usuń wszystkie";
 
 "autodownload" = "Automatyczne pobieranie";
+
+/* Place Page opening hours text */
+"closed_now" = "Nieczynne";
+
+/* Place Page opening hours text */
+"daily" = "Codziennie";
+
+"twentyfour_seven" = "Dzień i noc";
+
+"day_off_today" = "Dziś dzień wolny";
+
+"day_off" = "Dzień wolny";
+
+"today" = "Dzisiaj";
+
+"sunrise_to_sunset" = "Od wschodu do zachodu słońca";
+
+"add_opening_hours" = "Dodaj godziny otwarcia";
+
+"edit_opening_hours" = "Edytuj godziny otwarcia";
+
+"profile" = "Profil";
+
+"no_osm_account" = "Nie masz konta w OpenStreetMap?";
+
+"register_at_openstreetmap" = "Zarejestruj się";
+
+"login" = "Zaloguj się";
+
+"password" = "Hasło";
+
+"forgot_password" = "Nie pamiętasz hasła?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Przypomnij hasło";
+
+"enter_email_address_to_reset_password" = "Wpisz adres e-mail, którego użyto podczas rejestracji, a prześlemy Ci link do ponownego utworzenia hasła.";
+
+"reset_password" = "Resetuj hasło";
+
+"username" = "Nazwa użytkownika";
+
+"osm_account" = "Konto OSM";
+
+"logout" = "Wyloguj";
+
+"login_and_edit_map_motivation_message" = "Zaloguj się i edytuj dane obiektów na mapie, a my udostępnimy je milionom innych użytkowników. Razem możemy poprawić świat.";
+
+"not_sent" = "Nie wysłano";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "zmian";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Edycja Twojego pierwszego obiektu zakończona!";
+
+"thank_you" = "Dziękujemy";
+
+"login_with_openstreetmap" = "Zaloguj się na www.openstreetmap.org";
+
+"edit_place" = "Edytuj miejsce";
+
+"place_name" = "Nazwa miejsca";
+
+"place_name_caption" = "Wpisz nazwę, która znajduje się na szyldzie miejsca";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Dodaj język";
+
+"address" = "Adres";
+
+"street" = "Ulica";
+
+/* Editable House Number text field (in address block). */
+"house" = "Numer";
+
+"details" = "Szczegóły";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Dodaj ulicę";
+
+"choose_language" = "Wybierz język";
+
+"choose_street" = "Wybierz ulicę";
+
+"postal_code" = "Kod pocztowy";
+
+/* login text field */
+"email_or_username" = "E-mail lub nazwa użytkownika";
diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings
index ba78944e8b..3a0c57a3d3 100644
--- a/iphone/Maps/pt.lproj/Localizable.strings
+++ b/iphone/Maps/pt.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Mensagem";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-mail";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Sempre cruzar esse limite";
 
-"dialog_routing_not_now" = "Agora Não";
+"not_now" = "Agora Não";
 
 "dialog_routing_build_route" = "Traçar";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Para facilitar o uso do MAPS.ME ao dirigir no escuro, adicionamos o modo noturno. Ele é acionado automaticamente após o pôr do sol.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Adicionar Horário";
 
 "editor_time_delete" = "Eliminar Horário";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Excluir todos";
 
 "autodownload" = "Download automático";
+
+/* Place Page opening hours text */
+"closed_now" = "Fechado agora";
+
+/* Place Page opening hours text */
+"daily" = "Diariamente";
+
+"twentyfour_seven" = "Dia e noite";
+
+"day_off_today" = "Dia de folga hoje";
+
+"day_off" = "Dia de folga";
+
+"today" = "Hoje";
+
+"sunrise_to_sunset" = "Do amanhecer ao anoitecer";
+
+"add_opening_hours" = "Adicionar horário de funcionamento";
+
+"edit_opening_hours" = "Editar horário de funcionamento";
+
+"profile" = "Perfil";
+
+"no_osm_account" = "Sem conta no OpenStreetMap?";
+
+"register_at_openstreetmap" = "Cadastrar-se";
+
+"login" = "Acessar";
+
+"password" = "Senha";
+
+"forgot_password" = "Esqueceu sua senha?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Recuperar senha";
+
+"enter_email_address_to_reset_password" = "Digite o endereço de e-mail que você usou ao cadastrar-se, e nós lhe enviaremos o link para renovar a sua senha.";
+
+"reset_password" = "Redefinir senha";
+
+"username" = "Nome de usuário";
+
+"osm_account" = "Conta OSM";
+
+"logout" = "Encerrar sessão";
+
+"login_and_edit_map_motivation_message" = "Acesse e edite informações dos objetos no mapa e eles serão disponibilizados para milhões de outros usuários. Vamos melhorar o mundo juntos.";
+
+"not_sent" = "Não enviado";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "alterações";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Você editou o seu primeiro objeto!";
+
+"thank_you" = "Obrigado";
+
+"login_with_openstreetmap" = "Acessar em www.openstreetmap.org";
+
+"edit_place" = "Editar o local";
+
+"place_name" = "Nome do local";
+
+"place_name_caption" = "Insira o nome da forma que está na placa do local";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Adicionar um idioma";
+
+"address" = "Endereço";
+
+"street" = "Rua";
+
+/* Editable House Number text field (in address block). */
+"house" = "Edifício";
+
+"details" = "Detalhes";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Adicionar uma rua";
+
+"choose_language" = "Escolher um idioma";
+
+"choose_street" = "Escolher uma rua";
+
+"postal_code" = "Código postal";
+
+/* login text field */
+"email_or_username" = "E-mail ou nome de usuário";
diff --git a/iphone/Maps/ro.lproj/Localizable.strings b/iphone/Maps/ro.lproj/Localizable.strings
index c205cdff6f..122806d46c 100644
--- a/iphone/Maps/ro.lproj/Localizable.strings
+++ b/iphone/Maps/ro.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Tin nhắn";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-mail";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Întotdeauna să se treacă această limită";
 
-"dialog_routing_not_now" = "Nu acum";
+"not_now" = "Nu acum";
 
 "dialog_routing_build_route" = "Creare";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Pentru a facilita utilizarea MAPS.ME atunci când conduceți noaptea, am adăugat modul nocturn. Acesta pornește automat după apusul soarelui.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Adăugare planificare";
 
 "editor_time_delete" = "Eliminare planificare";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Ștergere toate";
 
 "autodownload" = "Descărcare automată";
+
+/* Place Page opening hours text */
+"closed_now" = "Închis acum";
+
+/* Place Page opening hours text */
+"daily" = "Zilnic";
+
+"twentyfour_seven" = "Zi și noapte";
+
+"day_off_today" = "Zi liberă azi";
+
+"day_off" = "Zi liberă";
+
+"today" = "Azi";
+
+"sunrise_to_sunset" = "De la răsărit până la apus";
+
+"add_opening_hours" = "Adăugare ore de funcționare";
+
+"edit_opening_hours" = "Editare ore de funcționare";
+
+"profile" = "Profil";
+
+"no_osm_account" = "Nu aveți un cont în OpenStreetMap?";
+
+"register_at_openstreetmap" = "Înregistrați-vă";
+
+"login" = "Autentificare";
+
+"password" = "Parolă";
+
+"forgot_password" = "Ați uitat parola?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Recuperare parolă";
+
+"enter_email_address_to_reset_password" = "Introduceți adresa de e-mail pe care ați utilizat-o în momentul înregistrării, iar noi vă vom trimite link-ul pentru a vă reînnoi parola.";
+
+"reset_password" = "Resetare parolă";
+
+"username" = "Nume de utilizator";
+
+"osm_account" = "Cont OSM";
+
+"logout" = "Ieșire";
+
+"login_and_edit_map_motivation_message" = "Autentificați-vă și editați informația despre obiectele de pe hartă, iar noi le vom face disponibile pentru milioane de alți utilizatori. Să facem împreună lumea mai bună.";
+
+"not_sent" = "Nu a fost trimis";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "modificări";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Ați editat primul dvs. obiect!";
+
+"thank_you" = "Vă mulțumim";
+
+"login_with_openstreetmap" = "Autentificați-vă pe www.openstreetmap.org";
+
+"edit_place" = "Editați loc";
+
+"place_name" = "Denumire loc";
+
+"place_name_caption" = "Introduceți denumirea astfel cum apare aceasta pe semnul locului";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Adăugare limbă";
+
+"address" = "Adresă";
+
+"street" = "Stradă";
+
+/* Editable House Number text field (in address block). */
+"house" = "Clădire";
+
+"details" = "Detalii";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Adăugare stradă";
+
+"choose_language" = "Alegeți o limbă";
+
+"choose_street" = "Alegeți o stradă";
+
+"postal_code" = "Cod postal";
+
+/* login text field */
+"email_or_username" = "Adresa de e-mail sau numele de utilizator";
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index 4206230b86..afddff30e3 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Сообщение";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-mail";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Всегда пересекать эту границу";
 
-"dialog_routing_not_now" = "Не сейчас";
+"not_now" = "Не сейчас";
 
 "dialog_routing_build_route" = "Построить";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Для удобства использования MAPS.ME во время вождения автомобиля в темное время суток мы добавили ночной режим. Он запускается автоматически после захода солнца.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Добавить место";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Редактировать место";
-
 "editor_time_add" = "Добавить расписание";
 
 "editor_time_delete" = "Удалить расписание";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Удалить все";
 
 "autodownload" = "Автоматическая загрузка";
+
+/* Place Page opening hours text */
+"closed_now" = "Сейчас закрыто";
+
+/* Place Page opening hours text */
+"daily" = "Ежедневно";
+
+"twentyfour_seven" = "Круглосуточно";
+
+"day_off_today" = "Сегодня выходной";
+
+"day_off" = "Выходной";
+
+"today" = "Сегодня";
+
+"sunrise_to_sunset" = "От рассвета до заката";
+
+"add_opening_hours" = "Добавить время работы";
+
+"edit_opening_hours" = "Редактировать время работы";
+
+"profile" = "Профиль";
+
+"no_osm_account" = "Не зарегистрированы в OpenStreetMap?";
+
+"register_at_openstreetmap" = "Зарегистрироваться";
+
+"login" = "Войти";
+
+"password" = "Пароль";
+
+"forgot_password" = "Забыли пароль?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Восстановление пароля";
+
+"enter_email_address_to_reset_password" = "Введите почтовый ящик, который вы использовали для регистрации, и мы вышлем на него ссылку для сброса пароля.";
+
+"reset_password" = "Cбросить пароль";
+
+"username" = "Имя пользователя";
+
+"osm_account" = "OSM Аккаунт";
+
+"logout" = "Выйти";
+
+"login_and_edit_map_motivation_message" = "Авторизуйтесь и редактируйте информацию об объектах на карте. А мы сделаем её доступной для миллионов пользователей. Улучшим мир вместе!";
+
+"not_sent" = "Не отправлено";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Последняя отправка";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "правок";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Вы отредактировали свой первый объект!";
+
+"thank_you" = "Спасибо";
+
+"login_with_openstreetmap" = "Войти через www.openstreetmap.org";
+
+"edit_place" = "Редактировать место";
+
+"place_name" = "Название";
+
+"place_name_caption" = "Введите название, как на вывеске или табличке";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Другие языки";
+
+/* small button to open list with names in different languages */
+"show_more" = "Показать больше";
+
+/* small button to close list with names in different languages */
+"show_less" = "Показать меньше";
+
+"add_language" = "Добавить язык";
+
+"address" = "Адрес";
+
+"street" = "Улица";
+
+/* Editable House Number text field (in address block). */
+"house" = "Дом";
+
+"details" = "Подробнее";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Добавить улицу";
+
+"choose_language" = "Выбрать язык";
+
+"choose_street" = "Выбрать улицу";
+
+"postal_code" = "Почтовый индекс";
+
+/* login text field */
+"email_or_username" = "Эл. почта или имя пользователя";
diff --git a/iphone/Maps/sk.lproj/Localizable.strings b/iphone/Maps/sk.lproj/Localizable.strings
index cd3ded279d..fd1d9c2a6f 100644
--- a/iphone/Maps/sk.lproj/Localizable.strings
+++ b/iphone/Maps/sk.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Správa";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-mail";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Vždy prekročiť túto hranicu";
 
-"dialog_routing_not_now" = "Nie teraz";
+"not_now" = "Nie teraz";
 
 "dialog_routing_build_route" = "Vytvoriť";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Na uľahčenie použitia MAPS.ME pri jazde za tmy sme pridali nočný režim. Automaticky sa zapne po západe slnka.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Pridať rozvrh";
 
 "editor_time_delete" = "Zmazať rozvrh";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Vymazať všetky";
 
 "autodownload" = "Automaticky stiahnuť";
+
+/* Place Page opening hours text */
+"closed_now" = "Teraz zatvorené";
+
+/* Place Page opening hours text */
+"daily" = "Denne";
+
+"twentyfour_seven" = "Deň a noc";
+
+"day_off_today" = "Dnes deň voľna";
+
+"day_off" = "Deň voľna";
+
+"today" = "Dnes";
+
+"sunrise_to_sunset" = "Od východu do západu slnka";
+
+"add_opening_hours" = "Pridať otváracie hodiny";
+
+"edit_opening_hours" = "Upraviť otváracie hodiny";
+
+"profile" = "Profil";
+
+"no_osm_account" = "Nemáte účet v OpenStreetMap?";
+
+"register_at_openstreetmap" = "Zaregistrovať sa";
+
+"login" = "Prihlásiť sa";
+
+"password" = "Heslo";
+
+"forgot_password" = "Zabudli ste heslo?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Obnovenie hesla";
+
+"enter_email_address_to_reset_password" = "Zadajte e-mailovú adresu, ktorú ste použili pri registrácii, a my Vám zašleme odkaz na obnovenie hesla.";
+
+"reset_password" = "Obnoviť heslo";
+
+"username" = "Používateľské meno";
+
+"osm_account" = "OSM účet";
+
+"logout" = "Odhlásiť sa";
+
+"login_and_edit_map_motivation_message" = "Prihláste sa a upravte informácie o objektoch na mape, a my ich sprístupníme miliónom ďalších používateľov. Urobme svet spoločne lepším.";
+
+"not_sent" = "Neodoslaný";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "zmien";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Upravili ste svoj prvý objekt!";
+
+"thank_you" = "Ďakujeme Vám";
+
+"login_with_openstreetmap" = "Prihláste sa na adrese www.openstreetmap.org";
+
+"edit_place" = "Upraviť miesto";
+
+"place_name" = "Názov miesta";
+
+"place_name_caption" = "Zadajte skutočný názov miesta";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Pridať jazyk";
+
+"address" = "Adresa";
+
+"street" = "Ulica";
+
+/* Editable House Number text field (in address block). */
+"house" = "Budova";
+
+"details" = "Podrobnosti";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Pridať ulicu";
+
+"choose_language" = "Vybrať jazyk";
+
+"choose_street" = "Vybrať ulicu";
+
+"postal_code" = "PSČ";
+
+/* login text field */
+"email_or_username" = "E-mail alebo používateľské meno";
diff --git a/iphone/Maps/sv.lproj/Localizable.strings b/iphone/Maps/sv.lproj/Localizable.strings
index b3fc82f602..a61cdff0f7 100644
--- a/iphone/Maps/sv.lproj/Localizable.strings
+++ b/iphone/Maps/sv.lproj/Localizable.strings
@@ -431,8 +431,8 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Meddelande";
 
-/* Share by email button text */
-"email" = "E-mail";
+/* Share by email button text, also used in editor. */
+"email" = "E-post";
 
 /* Copy Link */
 "copy_link" = "Kopiera Länk";
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Korsa alltid den här gränsen";
 
-"dialog_routing_not_now" = "Inte nu";
+"not_now" = "Inte nu";
 
 "dialog_routing_build_route" = "Skapa";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "För att underlätta användandet av MAPS.ME under mörkerkörning har vi lagt till nattläget. Det slås automatiskt på efter att solen gått ned.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Lägg till schema";
 
 "editor_time_delete" = "Ta bort schema";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Radera alla";
 
 "autodownload" = "Automatisk nedladdning";
+
+/* Place Page opening hours text */
+"closed_now" = "Stängt just nu";
+
+/* Place Page opening hours text */
+"daily" = "Dagligen";
+
+"twentyfour_seven" = "dag och natt";
+
+"day_off_today" = "Stängt idag";
+
+"day_off" = "Stängt";
+
+"today" = "Idag";
+
+"sunrise_to_sunset" = "Från gryning till skymning";
+
+"add_opening_hours" = "Lägg till öppettider";
+
+"edit_opening_hours" = "Redigera öppettider";
+
+"profile" = "Profil";
+
+"no_osm_account" = "Inget konto hos OpenStreetMap?";
+
+"register_at_openstreetmap" = "Registrera";
+
+"login" = "Logga in";
+
+"password" = "Lösenord";
+
+"forgot_password" = "Glömt lösenord?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Återställ lösenord?";
+
+"enter_email_address_to_reset_password" = "Mata in e-postadressen som du använde vid registrering så skickar vi en återställningslänk till dig.";
+
+"reset_password" = "återställ lösenord";
+
+"username" = "Användarnamn";
+
+"osm_account" = "OSM-konto";
+
+"logout" = "Logga ut";
+
+"login_and_edit_map_motivation_message" = "Logga in och redigera informationen om objekten på kartan så kommer vi att göra ändringarna tillgängliga för miljontals andra användare. Låt oss göra världen bättre tillsammans.";
+
+"not_sent" = "Ej skickat";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "ändringar";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Du har redigerat ditt första objekt!";
+
+"thank_you" = "Tack";
+
+"login_with_openstreetmap" = "Logga in på www.openstreetmap.org";
+
+"edit_place" = "Ändra platsen";
+
+"place_name" = "Platsens namn";
+
+"place_name_caption" = "Skriv in namnet så som det står på platsens skylt";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Lägg till ett språk";
+
+"address" = "Adress";
+
+"street" = "Gata";
+
+/* Editable House Number text field (in address block). */
+"house" = "Byggnad";
+
+"details" = "Detaljer";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Lägg till en gata";
+
+"choose_language" = "Välj ett språk";
+
+"choose_street" = "Välj en gata";
+
+"postal_code" = "Postkod";
+
+/* login text field */
+"email_or_username" = "E-postadress eller användarnamn";
diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings
index dfb3c1c55a..4a087e89a5 100644
--- a/iphone/Maps/th.lproj/Localizable.strings
+++ b/iphone/Maps/th.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "ข้อความ";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "อีเมล";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "ข้ามขอบเขตนี้เสมอ";
 
-"dialog_routing_not_now" = "ไว้คราวหลัง";
+"not_now" = "ไว้คราวหลัง";
 
 "dialog_routing_build_route" = "สร้าง";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "เราได้เพิ่มโหมดกลางคืนเพื่อส่งเสริมการใช้ MAPS.ME เมื่อคุณกำลังขับรถในสภาพมืด จะมีการเปิดใช้โหมดนี้โดยอัตโนมัติหลังจากพระอาทิตย์ตก";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "เพิ่มวัน";
 
 "editor_time_delete" = "ลบวัน";
@@ -1394,3 +1388,103 @@
 "delete_all" = "ลบทั้งหมด";
 
 "autodownload" = "ดาวน์โหลดอัตโนมัติ";
+
+/* Place Page opening hours text */
+"closed_now" = "ปิดตอนนี้";
+
+/* Place Page opening hours text */
+"daily" = "ทุกวัน";
+
+"twentyfour_seven" = "ทั้งกลางวันและกลางคืน";
+
+"day_off_today" = "ปิดในวันนี้";
+
+"day_off" = "วันปิด";
+
+"today" = "วันนี้";
+
+"sunrise_to_sunset" = "ตั้งแต่พระอาทิตย์ขึ้นจนพระอาทิตย์ตก";
+
+"add_opening_hours" = "เพิ่มชั่วโมงทำการ";
+
+"edit_opening_hours" = "แก้ไขชั่วโมงทำการ";
+
+"profile" = "โปรไฟล์";
+
+"no_osm_account" = "ไม่มีบัญชีใน OpenStreetMap?";
+
+"register_at_openstreetmap" = "ลงทะเบียน";
+
+"login" = "ล็อกอิน";
+
+"password" = "รหัสผ่าน";
+
+"forgot_password" = "ลืมรหัสผ่าน?";
+
+/* Forgot Password dialog title */
+"restore_password" = "เรียกคืนรหัสผ่าน";
+
+"enter_email_address_to_reset_password" = "ใส่ที่อยู่อีเมลที่คุณใช้ระหว่างการลงทะเบียนแล้วเราจะส่งลิงก์ไปยังคุณเพื่อต่ออายุรหัสผ่านของคุณ";
+
+"reset_password" = "ตั้งรหัสผ่านใหม่";
+
+"username" = "ชื่อผู้ใช้";
+
+"osm_account" = "บัญชี OSM";
+
+"logout" = "ออกจากระบบ";
+
+"login_and_edit_map_motivation_message" = "ล็อกอินและแก้ไขข้อมูลวัตถุบนแผนที่ และเราจะทำให้มันสามารถใช้งานได้สำหรับผู้ใช้ท่านอื่น ๆ อีกนับล้าน มาช่วยกันทำให้โลกดียิ่งขึ้นร่วมกัน";
+
+"not_sent" = "ไม่มีการส่ง";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "การเปลี่ยนแปลง";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "คุณได้แก้ไขวัตถุแรกของคุณ!";
+
+"thank_you" = "ขอบพระคุณ";
+
+"login_with_openstreetmap" = "ล็อกอินที่ www.openstreetmap.org";
+
+"edit_place" = "แก้ไขสถานที่";
+
+"place_name" = "ชื่อสถานที่";
+
+"place_name_caption" = "ใส่ชื่อเนื่องจากมันอยู่บนสัญลักษณ์ของสถานที่";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "เพิ่มภาษา";
+
+"address" = "ที่อยู่";
+
+"street" = "ถนน";
+
+/* Editable House Number text field (in address block). */
+"house" = "อาคาร";
+
+"details" = "รายละเอียด";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "เพิ่มถนน";
+
+"choose_language" = "เลือกภาษา";
+
+"choose_street" = "เลือกถนน";
+
+"postal_code" = "รหัสไปรษณีย์";
+
+/* login text field */
+"email_or_username" = "อีเมลหรือชื่อผู้ใช้";
diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings
index c45e63064f..403917731d 100644
--- a/iphone/Maps/tr.lproj/Localizable.strings
+++ b/iphone/Maps/tr.lproj/Localizable.strings
@@ -431,8 +431,8 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Mesaj";
 
-/* Share by email button text */
-"email" = "E-Posta";
+/* Share by email button text, also used in editor. */
+"email" = "E-posta";
 
 /* Copy Link */
 "copy_link" = "Bağlantıyı Kopyala";
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Bu sınırı her zaman geçin";
 
-"dialog_routing_not_now" = "Şimdi Değil";
+"not_now" = "Şimdi Değil";
 
 "dialog_routing_build_route" = "Oluşturun";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Karanlıkta sürerken MAPS.ME kullanmayı kolaylaştırmak için gece modunu ekledik. Gün batımından sonra otomatik olarak devreye girer.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Plan Ekle";
 
 "editor_time_delete" = "Planı Sil";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Tümünü sil";
 
 "autodownload" = "Otomatik indir";
+
+/* Place Page opening hours text */
+"closed_now" = "Şu anda kapalı";
+
+/* Place Page opening hours text */
+"daily" = "Günlük";
+
+"twentyfour_seven" = "Gündüz ve gece";
+
+"day_off_today" = "Bugün izin günü";
+
+"day_off" = "İzin günü";
+
+"today" = "Bugün";
+
+"sunrise_to_sunset" = "Güneşin doğuşundan batışına kadar";
+
+"add_opening_hours" = "İş saatlerini ekle";
+
+"edit_opening_hours" = "İş saatlerini düzenle";
+
+"profile" = "Profil";
+
+"no_osm_account" = "OpenStreetMap' hesabın yok mu?";
+
+"register_at_openstreetmap" = "Kaydol";
+
+"login" = "Oturum aç";
+
+"password" = "Şifre";
+
+"forgot_password" = "Şifreni mi unuttun?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Şifreyi yenile";
+
+"enter_email_address_to_reset_password" = "Kayıt sırasında kullandığınız e-posta adresini girin ve şifrenizi yenileyeceğiniz bağlantıyı gönderelim.";
+
+"reset_password" = "Parolayı sıfırla";
+
+"username" = "Kullanıcı Adı";
+
+"osm_account" = "OSM Hesabı";
+
+"logout" = "Oturumu kapat";
+
+"login_and_edit_map_motivation_message" = "Oturum aç ve haritada nesne bilgilerini düzenleyip diğer milyonlarca kullanıcıya aç. Birlikte dünyayı daha iyi bir yer haline getirelim.";
+
+"not_sent" = "Gönderilmedi";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "değişiklik";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "İlk nesneni düzenledin!";
+
+"thank_you" = "Teşekkür ederiz";
+
+"login_with_openstreetmap" = "www.openstreetmap.org adresinden oturum aç";
+
+"edit_place" = "Yeri düzenle";
+
+"place_name" = "Yer ismi";
+
+"place_name_caption" = "Yerin adını tabelada olduğu şekliyle girin";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Bir dil ekle";
+
+"address" = "Adres";
+
+"street" = "Sokak";
+
+/* Editable House Number text field (in address block). */
+"house" = "Bina";
+
+"details" = "Detaylar";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Bir sokak ekle";
+
+"choose_language" = "Bir dil seç";
+
+"choose_street" = "Bir sokak seç";
+
+"postal_code" = "Posta kodu";
+
+/* login text field */
+"email_or_username" = "E-posta veya kullanıcı adı";
diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings
index 6caaeaf95d..eb9d94d894 100644
--- a/iphone/Maps/uk.lproj/Localizable.strings
+++ b/iphone/Maps/uk.lproj/Localizable.strings
@@ -431,8 +431,8 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Повідомлення";
 
-/* Share by email button text */
-"email" = "Електронна пошта";
+/* Share by email button text, also used in editor. */
+"email" = "Ел. пошта";
 
 /* Copy Link */
 "copy_link" = "Копіювати посилання";
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Завжди перетинати цю межу";
 
-"dialog_routing_not_now" = "Не зараз";
+"not_now" = "Не зараз";
 
 "dialog_routing_build_route" = "Побудувати";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Для зручності використання MAPS.ME під час водіння автомобіля в темну пору доби ми додали нічний режим. Він запускається автоматично після заходу сонця.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Додати розклад";
 
 "editor_time_delete" = "Видалити розклад";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Видалити всі";
 
 "autodownload" = "Автоматичне завантаження";
+
+/* Place Page opening hours text */
+"closed_now" = "Зараз закрито";
+
+/* Place Page opening hours text */
+"daily" = "Щоденно";
+
+"twentyfour_seven" = "Цілодобово";
+
+"day_off_today" = "Сьогодні вихідний";
+
+"day_off" = "Вихідний";
+
+"today" = "Сьогодні";
+
+"sunrise_to_sunset" = "Від світанку до заходу";
+
+"add_opening_hours" = "Додати години роботи";
+
+"edit_opening_hours" = "Редагувати години роботи";
+
+"profile" = "Профіль";
+
+"no_osm_account" = "Не зареєстровані в OpenStreetMap?";
+
+"register_at_openstreetmap" = "Зареєструватися";
+
+"login" = "Увійти";
+
+"password" = "Пароль";
+
+"forgot_password" = "Забули пароль?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Відновити пароль";
+
+"enter_email_address_to_reset_password" = "Введіть адресу ел. пошти, яку ви використали під час реєстрації і ми надішлемо вам посилання для відновлення паролю.";
+
+"reset_password" = "Змінити пароль";
+
+"username" = "Ім'я користувача";
+
+"osm_account" = "Обліковий запис OSM";
+
+"logout" = "Вийти";
+
+"login_and_edit_map_motivation_message" = "Увійдіть та редагуйте інформацію про об'єкти на карті, і ми зробимо їх доступними для мільйонів інших користувачів. Давайте зробимо світ кращим разом.";
+
+"not_sent" = "Не надіслано";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "змін";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Ви редагували свій перший об'єкт!";
+
+"thank_you" = "Дякуємо";
+
+"login_with_openstreetmap" = "Увійдіть на www.openstreetmap.org";
+
+"edit_place" = "Редагувати місце";
+
+"place_name" = "Назва";
+
+"place_name_caption" = "Введіть назву, як на вивісці або табличці";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Додати мову";
+
+"address" = "Адреса";
+
+"street" = "Вулиця";
+
+/* Editable House Number text field (in address block). */
+"house" = "Будинок";
+
+"details" = "Детальніше";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Додати вулицю";
+
+"choose_language" = "Вибрати мову";
+
+"choose_street" = "Вибрати вулицю";
+
+"postal_code" = "Поштовий індекс";
+
+/* login text field */
+"email_or_username" = "Ел. пошта або ім'я користувача";
diff --git a/iphone/Maps/vi.lproj/Localizable.strings b/iphone/Maps/vi.lproj/Localizable.strings
index a19f2fe2e5..f72d969a5f 100644
--- a/iphone/Maps/vi.lproj/Localizable.strings
+++ b/iphone/Maps/vi.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "Tin nhắn";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "E-mail";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "Luôn đi qua ranh giới này";
 
-"dialog_routing_not_now" = "Lúc khác";
+"not_now" = "Lúc khác";
 
 "dialog_routing_build_route" = "Tạo";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "Để tạo điều kiện sử dụng MAPS.ME khi lái xe trong đêm tối, chúng tôi đã thêm chế độ ban đêm. Nó tự động mở sau khi mặt trời lặn.";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "Thêm lịch biểu";
 
 "editor_time_delete" = "Xóa lịch biểu";
@@ -1394,3 +1388,103 @@
 "delete_all" = "Xóa tất cả";
 
 "autodownload" = "Tự động tải về";
+
+/* Place Page opening hours text */
+"closed_now" = "Hiện đã đóng";
+
+/* Place Page opening hours text */
+"daily" = "Hàng ngày";
+
+"twentyfour_seven" = "ngày và đêm";
+
+"day_off_today" = "Nghỉ hôm nay";
+
+"day_off" = "Ngày nghỉ";
+
+"today" = "Hôm nay";
+
+"sunrise_to_sunset" = "Từ bình minh đến hoàng hôn";
+
+"add_opening_hours" = "Thêm giờ làm việc";
+
+"edit_opening_hours" = "Sửa giờ làm việc";
+
+"profile" = "Hồ sơ";
+
+"no_osm_account" = "Bạn chưa có tài khoản tại OpenStreetMap ư?";
+
+"register_at_openstreetmap" = "Đăng ký";
+
+"login" = "Đăng nhập";
+
+"password" = "Mật khẩu";
+
+"forgot_password" = "Quên mật khẩu?";
+
+/* Forgot Password dialog title */
+"restore_password" = "Khôi phục mật khẩu";
+
+"enter_email_address_to_reset_password" = "Nhập địa chỉ email bạn đã sử dụng trong quá trình đăng ký và chúng tôi sẽ gửi cho bạn liên kết để tạo mới mật khẩu của bạn.";
+
+"reset_password" = "đặt lại mật khẩu";
+
+"username" = "Tên đăng nhập";
+
+"osm_account" = "Tài khoản OSM";
+
+"logout" = "Đăng xuất";
+
+"login_and_edit_map_motivation_message" = "Đăng nhập và chỉnh sửa thông tin của các đối tượng trên bản đồ và chúng tôi sẽ hiển thị chúng cho hàng triệu người dùng khác. Hãy cùng nhau làm cho thế giới tốt đẹp hơn.";
+
+"not_sent" = "Chưa được gửi";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "thay đổi";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "Bạn đã chỉnh sửa đối tượng đầu tiên của mình!";
+
+"thank_you" = "Cảm ơn bạn";
+
+"login_with_openstreetmap" = "Đăng nhập tại www.openstreetmap.org";
+
+"edit_place" = "Chỉnh sửa địa điểm";
+
+"place_name" = "Tên địa điểm";
+
+"place_name_caption" = "Nhập tên như nó trên dấu hiệu của địa điểm";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "Thêm ngôn ngữ";
+
+"address" = "Địa chỉ";
+
+"street" = "Đường";
+
+/* Editable House Number text field (in address block). */
+"house" = "Tòa nhà";
+
+"details" = "Chi tiết";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "Thêm con đường";
+
+"choose_language" = "Đã chọn ngôn ngữ";
+
+"choose_street" = "Đã chọn con đường";
+
+"postal_code" = "Mã bưu chính";
+
+/* login text field */
+"email_or_username" = "E-mail hoặc tên người dùng";
diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings
index 1b589b7a64..28581dca7d 100644
--- a/iphone/Maps/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "消息";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "邮件";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "始终跨越此边界线";
 
-"dialog_routing_not_now" = "现在不用";
+"not_now" = "现在不用";
 
 "dialog_routing_build_route" = "创建";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "为了便于天黑行驶时使用MAPS.ME，我们增加了夜间模式。该模式在日落之后会自动开启。";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "添加计划";
 
 "editor_time_delete" = "删除计划";
@@ -1394,3 +1388,103 @@
 "delete_all" = "删除全部";
 
 "autodownload" = "自动下载";
+
+/* Place Page opening hours text */
+"closed_now" = "现在关门";
+
+/* Place Page opening hours text */
+"daily" = "每天";
+
+"twentyfour_seven" = "白天和黑夜";
+
+"day_off_today" = "今天休息日";
+
+"day_off" = "休息日";
+
+"today" = "今天";
+
+"sunrise_to_sunset" = "从日出到日落";
+
+"add_opening_hours" = "添加工作时间";
+
+"edit_opening_hours" = "编辑工作时间";
+
+"profile" = "资料";
+
+"no_osm_account" = "OpenStreetMap上没有账户吗？";
+
+"register_at_openstreetmap" = "注册";
+
+"login" = "登录";
+
+"password" = "密码";
+
+"forgot_password" = "忘记密码";
+
+/* Forgot Password dialog title */
+"restore_password" = "恢复密码";
+
+"enter_email_address_to_reset_password" = "输入您在注册时所用的邮箱地址，我们会给您发送链接更新密码";
+
+"reset_password" = "重置密码";
+
+"username" = "用户名";
+
+"osm_account" = "OSM账户";
+
+"logout" = "登出";
+
+"login_and_edit_map_motivation_message" = "登录并编辑地图上的物品信息，我们就会让数百万其他用户看到。";
+
+"not_sent" = "让我们共同把世界变得更美好。";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "次改变";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "您已编辑您的第一件物品！";
+
+"thank_you" = "谢谢您";
+
+"login_with_openstreetmap" = "登录到www.openstreetmap.org";
+
+"edit_place" = "编辑地点";
+
+"place_name" = "地点名";
+
+"place_name_caption" = "输入地点标志上的名称";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "添加语言";
+
+"address" = "地址";
+
+"street" = "街道";
+
+/* Editable House Number text field (in address block). */
+"house" = "楼房";
+
+"details" = "细节";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "添加街道";
+
+"choose_language" = "选择语言";
+
+"choose_street" = "选择街道";
+
+"postal_code" = "邮政编码";
+
+/* login text field */
+"email_or_username" = "邮箱或用户名";
diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings
index 35f21e1e63..15731776fc 100644
--- a/iphone/Maps/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings
@@ -431,7 +431,7 @@
 /* iOS share by Message button text (including SMS) */
 "message" = "消息";
 
-/* Share by email button text */
+/* Share by email button text, also used in editor. */
 "email" = "電子郵件";
 
 /* Copy Link */
@@ -1236,7 +1236,7 @@
 
 "dialog_routing_always_cross_that_border" = "一律跨越邊界。";
 
-"dialog_routing_not_now" = "先不要";
+"not_now" = "先不要";
 
 "dialog_routing_build_route" = "產生";
 
@@ -1348,12 +1348,6 @@
 
 "whats_new_night_body" = "為了便於天黑行駛時使用MAPS.ME，我們增加了夜間模式。該模式在日落之後會自動開啟。";
 
-/* «Add place» button in place page. */
-"pp_place_add" = "Add place";
-
-/* «Edit place» button in place page. */
-"pp_place_edit" = "Edit place";
-
 "editor_time_add" = "新增排程";
 
 "editor_time_delete" = "刪除排程";
@@ -1394,3 +1388,103 @@
 "delete_all" = "刪除全部";
 
 "autodownload" = "自動下載";
+
+/* Place Page opening hours text */
+"closed_now" = "現在關門";
+
+/* Place Page opening hours text */
+"daily" = "每天";
+
+"twentyfour_seven" = "白天和黑夜";
+
+"day_off_today" = "今天休息日";
+
+"day_off" = "休息日";
+
+"today" = "今天";
+
+"sunrise_to_sunset" = "從日出到日落";
+
+"add_opening_hours" = "添加工作時間";
+
+"edit_opening_hours" = "編輯工作時間";
+
+"profile" = "資料";
+
+"no_osm_account" = "OpenStreetMap上沒有賬戶嗎？";
+
+"register_at_openstreetmap" = "註冊";
+
+"login" = "登錄";
+
+"password" = "密碼";
+
+"forgot_password" = "忘記密碼";
+
+/* Forgot Password dialog title */
+"restore_password" = "恢復密碼";
+
+"enter_email_address_to_reset_password" = "輸入您在註冊時所用的郵箱地址，我們會給您發送鏈接更新密碼";
+
+"reset_password" = "重置密碼";
+
+"username" = "用戶名";
+
+"osm_account" = "OSM賬戶";
+
+"logout" = "登出";
+
+"login_and_edit_map_motivation_message" = "登錄並編輯地圖上的物品信息，我們就會讓數百萬其他用戶看到。";
+
+"not_sent" = "讓我們共同把世界變得更美好。";
+
+/* Information text: "Last upload 11.01.2016" */
+"last_upload" = "Last Upload";
+
+/* The number of changes made. As in "changes: 123". */
+"changes" = "次改變";
+
+/* Motivates user to login/register, title above login buttons. */
+"you_have_edited_your_first_object" = "您已編輯您的第一件物品！";
+
+"thank_you" = "謝謝您";
+
+"login_with_openstreetmap" = "登錄到www.openstreetmap.org";
+
+"edit_place" = "編輯地點";
+
+"place_name" = "地點名稱";
+
+"place_name_caption" = "依照地點標牌輸入名稱";
+
+/* title above languages list cells in the editor, below editable name text field. */
+"other_languages" = "Other Languages";
+
+/* small button to open list with names in different languages */
+"show_more" = "Show More";
+
+/* small button to close list with names in different languages */
+"show_less" = "Show Less";
+
+"add_language" = "添加語言";
+
+"address" = "地址";
+
+"street" = "街道";
+
+/* Editable House Number text field (in address block). */
+"house" = "樓房";
+
+"details" = "詳細資訊";
+
+/* Text field to enter non-existing street name, below list of known streets around */
+"add_street" = "添加街道";
+
+"choose_language" = "選擇語言";
+
+"choose_street" = "選擇街道";
+
+"postal_code" = "郵政編碼";
+
+/* login text field */
+"email_or_username" = "郵箱或用戶名";
diff --git a/tizen/MapsWithMe/res/ces-CZ.xml b/tizen/MapsWithMe/res/ces-CZ.xml
index f6c9a10794..7537cb9b4a 100644
--- a/tizen/MapsWithMe/res/ces-CZ.xml
+++ b/tizen/MapsWithMe/res/ces-CZ.xml
@@ -91,7 +91,7 @@
 	<text id="IDS_SHARE">Sdílet</text>
 	<!-- iOS share by Message button text (including SMS) -->
 	<text id="IDS_MESSAGE">Zpráva</text>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<text id="IDS_EMAIL">E-mail</text>
 	<!-- Copy Link -->
 	<text id="IDS_COPY_LINK">Zkopírovat odkaz</text>
diff --git a/tizen/MapsWithMe/res/deu-DE.xml b/tizen/MapsWithMe/res/deu-DE.xml
index ae2b5e1afe..c8e792e30f 100644
--- a/tizen/MapsWithMe/res/deu-DE.xml
+++ b/tizen/MapsWithMe/res/deu-DE.xml
@@ -93,7 +93,7 @@
 	<text id="IDS_SHARE">Teilen</text>
 	<!-- iOS share by Message button text (including SMS) -->
 	<text id="IDS_MESSAGE">Nachricht</text>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<text id="IDS_EMAIL">E-Mail</text>
 	<!-- Copy Link -->
 	<text id="IDS_COPY_LINK">Link kopieren</text>
diff --git a/tizen/MapsWithMe/res/eng-GB.xml b/tizen/MapsWithMe/res/eng-GB.xml
index b2a8a3bc47..c61fba9144 100644
--- a/tizen/MapsWithMe/res/eng-GB.xml
+++ b/tizen/MapsWithMe/res/eng-GB.xml
@@ -93,8 +93,8 @@
 	<text id="IDS_SHARE">Share</text>
 	<!-- iOS share by Message button text (including SMS) -->
 	<text id="IDS_MESSAGE">Message</text>
-	<!-- Share by email button text -->
-	<text id="IDS_EMAIL">E-mail</text>
+	<!-- Share by email button text, also used in editor. -->
+	<text id="IDS_EMAIL">Email</text>
 	<!-- Copy Link -->
 	<text id="IDS_COPY_LINK">Copy Link</text>
 	<!-- Used for bookmark editing -->
diff --git a/tizen/MapsWithMe/res/fra-FR.xml b/tizen/MapsWithMe/res/fra-FR.xml
index ea8395a527..045c2d19f1 100644
--- a/tizen/MapsWithMe/res/fra-FR.xml
+++ b/tizen/MapsWithMe/res/fra-FR.xml
@@ -93,8 +93,8 @@
 	<text id="IDS_SHARE">Partager</text>
 	<!-- iOS share by Message button text (including SMS) -->
 	<text id="IDS_MESSAGE">Message</text>
-	<!-- Share by email button text -->
-	<text id="IDS_EMAIL">Courriel</text>
+	<!-- Share by email button text, also used in editor. -->
+	<text id="IDS_EMAIL">E-mail</text>
 	<!-- Copy Link -->
 	<text id="IDS_COPY_LINK">Copier le lien</text>
 	<!-- Used for bookmark editing -->
diff --git a/tizen/MapsWithMe/res/ita-IT.xml b/tizen/MapsWithMe/res/ita-IT.xml
index 170bd36781..bbbf896e41 100644
--- a/tizen/MapsWithMe/res/ita-IT.xml
+++ b/tizen/MapsWithMe/res/ita-IT.xml
@@ -91,7 +91,7 @@
 	<text id="IDS_SHARE">Condividi</text>
 	<!-- iOS share by Message button text (including SMS) -->
 	<text id="IDS_MESSAGE">Messaggio</text>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<text id="IDS_EMAIL">E-mail</text>
 	<!-- Copy Link -->
 	<text id="IDS_COPY_LINK">Copia link</text>
diff --git a/tizen/MapsWithMe/res/pol-PL.xml b/tizen/MapsWithMe/res/pol-PL.xml
index cd382500cb..9aef8e04d6 100644
--- a/tizen/MapsWithMe/res/pol-PL.xml
+++ b/tizen/MapsWithMe/res/pol-PL.xml
@@ -91,7 +91,7 @@
 	<text id="IDS_SHARE">Udostępnij</text>
 	<!-- iOS share by Message button text (including SMS) -->
 	<text id="IDS_MESSAGE">Wiadomość</text>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<text id="IDS_EMAIL">E-mail</text>
 	<!-- Copy Link -->
 	<text id="IDS_COPY_LINK">Kopiuj link</text>
diff --git a/tizen/MapsWithMe/res/por-PT.xml b/tizen/MapsWithMe/res/por-PT.xml
index 63427ef29f..290672c5d1 100644
--- a/tizen/MapsWithMe/res/por-PT.xml
+++ b/tizen/MapsWithMe/res/por-PT.xml
@@ -91,7 +91,7 @@
 	<text id="IDS_SHARE">Partilhar</text>
 	<!-- iOS share by Message button text (including SMS) -->
 	<text id="IDS_MESSAGE">Mensagem</text>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<text id="IDS_EMAIL">E-mail</text>
 	<!-- Copy Link -->
 	<text id="IDS_COPY_LINK">Copiar hiperligação</text>
diff --git a/tizen/MapsWithMe/res/rus-RU.xml b/tizen/MapsWithMe/res/rus-RU.xml
index 2cbb814789..8068c118f5 100644
--- a/tizen/MapsWithMe/res/rus-RU.xml
+++ b/tizen/MapsWithMe/res/rus-RU.xml
@@ -93,7 +93,7 @@
 	<text id="IDS_SHARE">Поделиться</text>
 	<!-- iOS share by Message button text (including SMS) -->
 	<text id="IDS_MESSAGE">Сообщение</text>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<text id="IDS_EMAIL">E-mail</text>
 	<!-- Copy Link -->
 	<text id="IDS_COPY_LINK">Скопировать ссылку</text>
diff --git a/tizen/MapsWithMe/res/spa-ES.xml b/tizen/MapsWithMe/res/spa-ES.xml
index acc50bd1d4..b2f4019d5d 100644
--- a/tizen/MapsWithMe/res/spa-ES.xml
+++ b/tizen/MapsWithMe/res/spa-ES.xml
@@ -87,7 +87,7 @@
 	<text id="IDS_SHARE">Compartir</text>
 	<!-- iOS share by Message button text (including SMS) -->
 	<text id="IDS_MESSAGE">Mensaje</text>
-	<!-- Share by email button text -->
+	<!-- Share by email button text, also used in editor. -->
 	<text id="IDS_EMAIL">Correo electrónico</text>
 	<!-- Copy Link -->
 	<text id="IDS_COPY_LINK">Copiar enlace</text>
diff --git a/tizen/MapsWithMe/res/ukr-UA.xml b/tizen/MapsWithMe/res/ukr-UA.xml
index 510948bbc9..d5e9605bb8 100644
--- a/tizen/MapsWithMe/res/ukr-UA.xml
+++ b/tizen/MapsWithMe/res/ukr-UA.xml
@@ -93,8 +93,8 @@
 	<text id="IDS_SHARE">Подiлитись</text>
 	<!-- iOS share by Message button text (including SMS) -->
 	<text id="IDS_MESSAGE">Повідомлення</text>
-	<!-- Share by email button text -->
-	<text id="IDS_EMAIL">Електронна пошта</text>
+	<!-- Share by email button text, also used in editor. -->
+	<text id="IDS_EMAIL">Ел. пошта</text>
 	<!-- Copy Link -->
 	<text id="IDS_COPY_LINK">Копіювати посилання</text>
 	<!-- Used for bookmark editing -->