[android] Rebase fixes for Add support for check_date & check_date:opening_hours

Following from https://codeberg.org/comaps/comaps/pulls/1572
Also add script for easy transfer of strings across modules

Signed-off-by: Harry Bond <me@hbond.xyz>

android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java

@@ -22,7 +22,6 @@ import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
 import app.organicmaps.sdk.util.DateUtils;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -180,7 +179,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
             else
               openTime = tt.workingTimespan.toWideString();
 
-            refreshTodayOpeningHours(resources.getString(R.string.today), openTime, color);
+            refreshTodayOpeningHours(resources.getString(app.organicmaps.sdk.R.string.today), openTime, color);
             refreshTodayNonBusinessTime(tt.closedTimespans);
 
             break;

android/app/src/main/res/values-af/strings.xml

@@ -397,7 +397,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Vandag gesluit</string>
     <string name="day_off">Gesluit</string>
-    <string name="today">Vandag</string>
     <string name="opens_in">Open oor %s</string>
     <string name="closes_in">Sluit oor %s</string>
     <string name="closed">Gesluit</string>

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

@@ -423,7 +423,6 @@
     <string name="twentyfour_seven">٢٤/٧(ليلاً ونهاراً)</string>
     <string name="day_off_today">مغلق اليوم</string>
     <string name="day_off">مغلق</string>
-    <string name="today">اليوم</string>
     <string name="opens_in">يفتح بعد %s</string>
     <string name="closes_in">يغلق في غضون %s</string>
     <string name="closed">مغلق</string>

android/app/src/main/res/values-ast/strings.xml

@@ -31,7 +31,6 @@
     <string name="no_available">Non</string>
     <string name="yes">Sí</string>
     <string name="yes_available">Sí</string>
-    <string name="today">Güei</string>
     <string name="export_file">Esportar KMZ</string>
     <string name="no">Non</string>
     <string name="network">Rede: %s</string>

android/app/src/main/res/values-az/strings.xml

@@ -415,7 +415,6 @@
     <string name="twentyfour_seven">7/24</string>
     <string name="day_off_today">Bu gün bağlıdır</string>
     <string name="day_off">Bağlı</string>
-    <string name="today">Bu gün</string>
     <string name="opens_in">%s sonra açılır</string>
     <string name="closes_in">%s sonra bağlanır</string>
     <string name="closed">Bağlı</string>

android/app/src/main/res/values-be/strings.xml

@@ -409,7 +409,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Сёння закрыта</string>
     <string name="day_off">Закрыта</string>
-    <string name="today">Сёння</string>
     <string name="opens_in">Адчыняецца праз %s</string>
     <string name="closes_in">Зачыняецца праз %s</string>
     <string name="closed">Закрыта</string>

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

@@ -389,7 +389,6 @@
     <string name="twentyfour_seven">24 часа</string>
     <string name="day_off_today">Затворено днес</string>
     <string name="day_off">Затворено</string>
-    <string name="today">Днес</string>
     <string name="closed">Затворено</string>
     <string name="edit_opening_hours">Редакция на работното време</string>
     <string name="no_osm_account">Нямате акаунт в OpenStreetMap?</string>

android/app/src/main/res/values-bn/strings.xml

@@ -240,7 +240,6 @@
     <string name="editor_report_problem_under_construction_title">রক্ষণাবেক্ষণের জন্য বন্ধ</string>
     <string name="editor_report_problem_duplicate_place_title">ডুপ্লিকেট জায়গা</string>
     <string name="day_off_today">আজকে বন্ধ</string>
-    <string name="today">আজকে</string>
     <string name="opens_in">%s-এর মধ্যে খুলবে</string>
     <string name="closes_in">%s-এর মধ্যে বন্ধ হবে</string>
     <string name="no_osm_account">আপনার ওপেনস্ট্রিটম্যাপ অ্যাকাউন্ট নেই?</string>

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

@@ -415,7 +415,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Avui és tancat</string>
     <string name="day_off">Tancat</string>
-    <string name="today">Avui</string>
     <string name="opens_in">Obre en %s</string>
     <string name="closes_in">Tanca en %s</string>
     <string name="closed">Tancat</string>

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

@@ -408,7 +408,6 @@
     <string name="twentyfour_seven">Nonstop</string>
     <string name="day_off_today">Dnes zavřeno</string>
     <string name="day_off">Zavřeno</string>
-    <string name="today">Dnes</string>
     <string name="closed">Zavřeno</string>
     <string name="edit_opening_hours">Upravit otevírací dobu</string>
     <string name="no_osm_account">Nemáte účet u OpenStreetMap?</string>

android/app/src/main/res/values-cy/strings.xml

@@ -32,7 +32,6 @@
     <string name="editor_time_close">Ar gau</string>
     <string name="subway">Tanlwybr</string>
     <string name="downloader_retry">Ailgeisio</string>
-    <string name="today">Heddiw</string>
     <string name="button_plan">Cynllunio</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="list">Rhestr</string>

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

@@ -404,7 +404,6 @@
     <string name="twentyfour_seven">Døgnet rundt</string>
     <string name="day_off_today">Lukket i dag</string>
     <string name="day_off">Lukket</string>
-    <string name="today">I dag</string>
     <string name="closed">Lukket</string>
     <string name="edit_opening_hours">Rediger åbningstid</string>
     <string name="no_osm_account">Har du ikke OpenStreetMap-konto?</string>

android/app/src/main/res/values-de/strings.xml

@@ -413,7 +413,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Heute geschlossen</string>
     <string name="day_off">Geschlossen</string>
-    <string name="today">Heute</string>
     <string name="opens_in">Öffnet in %s</string>
     <string name="closes_in">Schließt in %s</string>
     <string name="closed">Geschlossen</string>

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

@@ -415,7 +415,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Κλειστό σήμερα</string>
     <string name="day_off">Κλειστό</string>
-    <string name="today">Σήμερα</string>
     <string name="opens_in">Ανοίγει σε %s</string>
     <string name="closes_in">Κλείνει σε %s</string>
     <string name="closed">Κλειστό</string>

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

@@ -417,7 +417,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Cerrado hoy</string>
     <string name="day_off">Cerrado</string>
-    <string name="today">Hoy</string>
     <string name="opens_in">Abre en %s</string>
     <string name="closes_in">Cierra en %s</string>
     <string name="closed">Cerrado</string>

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

@@ -409,7 +409,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Täna suletud</string>
     <string name="day_off">Suletud</string>
-    <string name="today">Täna</string>
     <string name="opens_in">Avatakse %s möödumisel</string>
     <string name="closes_in">Suletakse %s möödumisel</string>
     <string name="closed">Suletud</string>

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

@@ -415,7 +415,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Gaur atseden eguna</string>
     <string name="day_off">Itxita</string>
-    <string name="today">Gaur</string>
     <string name="opens_in">%s barru irekiko da</string>
     <string name="closes_in">%s barru itxiko da</string>
     <string name="closed">Itxita</string>

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

@@ -394,7 +394,6 @@
     <string name="twentyfour_seven">شبانه روزی</string>
     <string name="day_off_today">امروز تعطیل است</string>
     <string name="day_off">تعطیل است</string>
-    <string name="today">امروز</string>
     <string name="closed">تعطیل</string>
     <string name="edit_opening_hours">ویرایش ساعت کاری</string>
     <string name="no_osm_account">آیا حساب OpenStreetMap ندارید؟</string>

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

@@ -416,7 +416,6 @@
     <string name="twentyfour_seven">Päivin ja öin</string>
     <string name="day_off_today">Suljettu tänään</string>
     <string name="day_off">Suljettu</string>
-    <string name="today">Tänään</string>
     <string name="opens_in">Avautuu %s kuluttua</string>
     <string name="closes_in">Sulkeutuu %s kuluttua</string>
     <string name="closed">Suljettu</string>

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

@@ -417,7 +417,6 @@
     <string name="twentyfour_seven">24/24 et 7/7</string>
     <string name="day_off_today">Fermé aujourd\'hui</string>
     <string name="day_off">Fermé</string>
-    <string name="today">Aujourd\'hui</string>
     <string name="opens_in">Ouvert dans %s</string>
     <string name="closes_in">Ferme dans %s</string>
     <string name="closed">Fermé</string>

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

@@ -489,7 +489,6 @@
     <string name="translated_om_site_url">https://comaps.app/gl/</string>
     <string name="category_shopping">Compras</string>
     <string name="placepage_distance">Distancia</string>
-    <string name="today">Hoxe</string>
     <string name="category_toilet">Baño</string>
     <string name="off">Desactivado</string>
     <string name="cuisine">Cociña</string>

android/app/src/main/res/values-gsw/strings.xml

@@ -360,7 +360,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Hüt zue</string>
     <string name="day_off">Zue</string>
-    <string name="today">Hüt</string>
     <string name="opens_in">Öffnet i %s</string>
     <string name="closes_in">Schlüüst i %s</string>
     <string name="closed">Zue</string>

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

@@ -103,7 +103,6 @@
     <string name="privacy">Privatnost</string>
     <string name="power_managment_setting_never">Nikada</string>
     <string name="editor_reset_edits_button">Odbaci</string>
-    <string name="today">Danas</string>
     <string name="password">Lozinka</string>
     <string name="details">Detalji</string>
     <string name="privacy_policy">Politika privatnosti</string>

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

@@ -408,7 +408,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Ma zárva</string>
     <string name="day_off">Zárva</string>
-    <string name="today">Ma</string>
     <string name="closed">Zárva</string>
     <string name="edit_opening_hours">Nyitvatartás szerkesztése</string>
     <string name="no_osm_account">Nem rendelkezik még felhasználói fiókkal az OpenStreetMapen?</string>

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

@@ -402,7 +402,6 @@
     <string name="twentyfour_seven">siang dan malam</string>
     <string name="day_off_today">Tutup hari ini</string>
     <string name="day_off">Tutup</string>
-    <string name="today">Hari ini</string>
     <string name="closed">Tutup</string>
     <string name="edit_opening_hours">Sunting jam kerja</string>
     <string name="no_osm_account">Tidak ada akun di OpenStreetMap?</string>

android/app/src/main/res/values-is/strings.xml

@@ -45,7 +45,6 @@
     <string name="daily">Daglega</string>
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Lokað í dag</string>
-    <string name="today">Í dag</string>
     <string name="opens_in">Opnar eftir %s</string>
     <string name="closes_in">Lokar eftir %s</string>
     <string name="closed">Lokað</string>

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

@@ -411,7 +411,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Oggi chiuso</string>
     <string name="day_off">Chiuso</string>
-    <string name="today">Oggi</string>
     <string name="opens_in">Apre tra %s</string>
     <string name="closes_in">Chiude tra %s</string>
     <string name="closed">Chiuso</string>

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

@@ -409,7 +409,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">סגור היום</string>
     <string name="day_off">סגור</string>
-    <string name="today">היום</string>
     <string name="opens_in">נפתח עוד %s</string>
     <string name="closes_in">נסגר עוד %s</string>
     <string name="closed">סגור</string>

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

@@ -419,7 +419,6 @@
     <string name="twentyfour_seven">昼と夜</string>
     <string name="day_off_today">本日終業</string>
     <string name="day_off">終業</string>
-    <string name="today">今日は</string>
     <string name="opens_in">あと %s に営業</string>
     <string name="closes_in">あと %s に閉店</string>
     <string name="closed">閉店</string>

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

@@ -402,7 +402,6 @@
     <string name="twentyfour_seven">24 시간</string>
     <string name="day_off_today">오늘 영업 종료됨</string>
     <string name="day_off">종료됨</string>
-    <string name="today">오늘</string>
     <string name="closed">닫음</string>
     <string name="edit_opening_hours">영업일 편집</string>
     <string name="no_osm_account">OpenStreetMap에서 계정이 없습니까?</string>

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

@@ -403,7 +403,6 @@
     <string name="twentyfour_seven">24×7</string>
     <string name="day_off_today">Šiandien uždaryta</string>
     <string name="day_off">Uždaryta</string>
-    <string name="today">Šiandien</string>
     <string name="opens_in">Atsidaro už %s</string>
     <string name="closes_in">Užsidaro už %s</string>
     <string name="closed">Uždaryta</string>

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

@@ -415,7 +415,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Šodien slēgts</string>
     <string name="day_off">Slēgts</string>
-    <string name="today">Šodien</string>
     <string name="opens_in">Atveras pēc %s</string>
     <string name="closes_in">Slēgts pēc %s</string>
     <string name="closed">Slēgts</string>

android/app/src/main/res/values-mr/strings.xml

@@ -395,7 +395,6 @@
     <string name="twentyfour_seven">२४/७</string>
     <string name="day_off_today">आज बंद</string>
     <string name="day_off">बंद</string>
-    <string name="today">आज</string>
     <string name="closed">बंद</string>
     <string name="edit_opening_hours">व्यवसायाची वेळ संपादित करा</string>
     <string name="no_osm_account">OpenStreetMap खाते नाही?</string>

android/app/src/main/res/values-mt/strings.xml

@@ -474,7 +474,6 @@
     <string name="yes">Iva</string>
     <string name="no">Le</string>
     <string name="editor_osm_notes">In-noti tad-dejta tal-mappa tiegħek</string>
-    <string name="today">Illum</string>
     <string name="social_media">Midja Soċjali</string>
     <string name="downloader_update_maps">Aġġorna l-Mapep</string>
     <string name="error_enter_correct_facebook_page">Daħħal indirizz tal-web, kont, jew isem tal-paġna validu ta ’Facebook</string>

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

@@ -415,7 +415,6 @@
     <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="opens_in">Åpner om %s</string>
     <string name="closes_in">Stenger om %s</string>
     <string name="closed">Stengt</string>

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

@@ -413,7 +413,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Vandaag gesloten</string>
     <string name="day_off">Gesloten</string>
-    <string name="today">Vandaag</string>
     <string name="opens_in">Opent over %s</string>
     <string name="closes_in">Sluit over %s</string>
     <string name="closed">Gesloten</string>

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

@@ -417,7 +417,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Dziś nieczynne</string>
     <string name="day_off">Nieczynne</string>
-    <string name="today">Dzisiaj</string>
     <string name="opens_in">Otwarcie za %s</string>
     <string name="closes_in">Zamknięcie za %s</string>
     <string name="closed">Zamknięte</string>

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

@@ -376,7 +376,6 @@
     <string name="twentyfour_seven">24 horas por dia</string>
     <string name="day_off_today">Fechado hoje</string>
     <string name="day_off">Fechado</string>
-    <string name="today">Hoje</string>
     <string name="opens_in">Abre em %s</string>
     <string name="closes_in">Fecha em %s</string>
     <string name="closed">Fechado</string>

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

@@ -411,7 +411,6 @@
     <string name="twentyfour_seven">24 horas por dia</string>
     <string name="day_off_today">Fechado hoje</string>
     <string name="day_off">Fechado</string>
-    <string name="today">Hoje</string>
     <string name="closed">Fechado</string>
     <string name="edit_opening_hours">Editar horário de funcionamento</string>
     <string name="no_osm_account">Não tem uma conta no OpenStreetMap?</string>

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

@@ -409,7 +409,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Închis astăzi</string>
     <string name="day_off">Închis</string>
-    <string name="today">Azi</string>
     <string name="opens_in">Deschide în %s</string>
     <string name="closes_in">Închide în %s</string>
     <string name="closed">Închis</string>

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

@@ -417,7 +417,6 @@
     <string name="twentyfour_seven">Круглосуточно</string>
     <string name="day_off_today">Сегодня закрыто</string>
     <string name="day_off">Закрыто</string>
-    <string name="today">Сегодня</string>
     <string name="opens_in">Открывается через %s</string>
     <string name="closes_in">Закроется через %s</string>
     <string name="closed">Закрыто</string>

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

@@ -413,7 +413,6 @@
     <string name="twentyfour_seven">Deň a noc</string>
     <string name="day_off_today">Dnes deň voľna</string>
     <string name="day_off">Zatvorené</string>
-    <string name="today">Dnes</string>
     <string name="opens_in">Otvoria o %s</string>
     <string name="closes_in">Zatvoria o %s</string>
     <string name="closed">Zatvorené</string>

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

@@ -410,7 +410,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Данас не ради</string>
     <string name="day_off">Затворено</string>
-    <string name="today">Данас</string>
     <string name="opens_in">Отвара се за %s</string>
     <string name="closes_in">Затвара се за %s</string>
     <string name="closed">Затворено</string>

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

@@ -402,7 +402,6 @@
     <string name="twentyfour_seven">Dygnet runt</string>
     <string name="day_off_today">Stängt idag</string>
     <string name="day_off">Stängt</string>
-    <string name="today">Idag</string>
     <string name="closed">Stängt</string>
     <string name="edit_opening_hours">Redigera öppettider</string>
     <string name="no_osm_account">Inget konto hos OpenStreetMap?</string>

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

@@ -402,7 +402,6 @@
     <string name="twentyfour_seven">ทั้งกลางวันและกลางคืน</string>
     <string name="day_off_today">วันนี้ปิด</string>
     <string name="day_off">ปิด</string>
-    <string name="today">วันนี้</string>
     <string name="closed">ปิด</string>
     <string name="edit_opening_hours">แก้ไขชั่วโมงทำการ</string>
     <string name="no_osm_account">ไม่มีบัญชีใน OpenStreetMap?</string>

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

@@ -413,7 +413,6 @@
     <string name="twentyfour_seven">7/24</string>
     <string name="day_off_today">Bugün kapalı</string>
     <string name="day_off">Kapalı</string>
-    <string name="today">Bugün</string>
     <string name="opens_in">%s sonra açılıyor</string>
     <string name="closes_in">%s sonra kapanıyor</string>
     <string name="closed">Kapalı</string>

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

@@ -417,7 +417,6 @@
     <string name="twentyfour_seven">Цілодобово</string>
     <string name="day_off_today">Сьогодні зачинено</string>
     <string name="day_off">Зачинено</string>
-    <string name="today">Сьогодні</string>
     <string name="opens_in">Відкривається через %s</string>
     <string name="closes_in">Зачиняється через %s</string>
     <string name="closed">Зачинено</string>

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

@@ -402,7 +402,6 @@
     <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="closed">Đã đóng</string>
     <string name="edit_opening_hours">Sửa giờ làm việc</string>
     <string name="no_osm_account">Bạn chưa có tài khoản tại OpenStreetMap ư?</string>

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

@@ -423,7 +423,6 @@
     <string name="twentyfour_seven">24/7 全天候營業</string>
     <string name="day_off_today">今天不營業</string>
     <string name="day_off">不營業</string>
-    <string name="today">今天</string>
     <string name="opens_in">將於 %s 後開業</string>
     <string name="closes_in">將於 %s 後歇業</string>
     <string name="closed">已停止營業</string>

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

@@ -423,7 +423,6 @@
     <string name="twentyfour_seven">24/7 全天候营业</string>
     <string name="day_off_today">今天不营业</string>
     <string name="day_off">不营业</string>
-    <string name="today">今天</string>
     <string name="opens_in">将于 %s 后开业</string>
     <string name="closes_in">将于 %s 后歇业</string>
     <string name="closed">已停止营业</string>

android/app/src/main/res/values/strings.xml

@@ -462,7 +462,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Closed today</string>
     <string name="day_off">Closed</string>
-    <string name="today">Today</string>
     <string name="opens_in">Opens in %s</string>
     <string name="closes_in">Closes in %s</string>
     <string name="closed">Closed</string>
@@ -470,14 +469,6 @@
     <string name="hours_confirmed_time_ago">Confirmed %s</string>
     <!-- Used on the place page for the last checked date, eg. "Existence confirmed two weeks ago" -->
     <string name="existence_confirmed_time_ago">Existence confirmed %s</string>
-    <string name="yesterday">Yesterday</string>
-    <string name="days_ago">%s days ago</string>
-    <string name="week_ago">%s week ago</string>
-    <string name="weeks_ago">%s weeks ago</string>
-    <string name="month_ago">%s month ago</string>
-    <string name="months_ago">%s months ago</string>
-    <string name="year_ago">%s year ago</string>
-    <string name="years_ago">%s years ago</string>
     <string name="edit_opening_hours">Edit business hours</string>
     <string name="no_osm_account">Don\'t have an OpenStreetMap account?</string>
     <string name="register_at_openstreetmap">Register at OpenStreetMap</string>

android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java

@@ -10,7 +10,7 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
-import app.organicmaps.R;
+import app.organicmaps.sdk.R;
 
 public final class DateUtils
 {
@@ -40,9 +40,9 @@ public final class DateUtils
     int days = (int) (LocalDate.now().toEpochDay() - LocalDate.parse(dateString, formatter).toEpochDay());
 
     if (days == 0)
-      return resources.getString(R.string.today);
+      return resources.getString(R.string.today).toLowerCase();
     if (days == 1)
-      return resources.getString(R.string.yesterday);
+      return resources.getString(R.string.yesterday).toLowerCase();
     if (days < 7)
       return  resources.getString(R.string.days_ago, Integer.toString(days));
     if (days < 30)

android/sdk/src/main/res/values-af/strings.xml

@@ -36,4 +36,5 @@
     <string name="limited_access">Beperkte toegang</string>
     <string name="not_shared">Privaat</string>
     <string name="access_rules_author_only">Aanlyn wysiging</string>
+    <string name="today">Vandag</string>
 </resources>

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

@@ -36,4 +36,5 @@
     <string name="limited_access">مسموح الوصول بشكل محدود</string>
     <string name="not_shared">خاص</string>
     <string name="access_rules_author_only">التعديل باستخدام الإنترنت</string>
+    <string name="today">اليوم</string>
 </resources>

android/sdk/src/main/res/values-ast/strings.xml

@@ -9,4 +9,5 @@
     <string name="km">km</string>
     <string name="gb">GB</string>
     <string name="m">m</string>
+    <string name="today">Güei</string>
 </resources>

android/sdk/src/main/res/values-az/strings.xml

@@ -35,4 +35,5 @@
     <string name="limited_access">Məhdud giriş</string>
     <string name="not_shared">Gizli</string>
     <string name="access_rules_author_only">Onlayn redaktə</string>
+    <string name="today">Bu gün</string>
 </resources>

android/sdk/src/main/res/values-be/strings.xml

@@ -36,4 +36,5 @@
     <string name="limited_access">Абмежаваны доступ</string>
     <string name="not_shared">Прыватны</string>
     <string name="access_rules_author_only">Рэдагаванне анлайн</string>
+    <string name="today">Сёння</string>
 </resources>

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

@@ -31,4 +31,5 @@
     <string name="maps_storage_removable">Карта памет</string>
     <string name="maps_storage_external">Външно споделено хранилище</string>
     <string name="maps_storage_shared">Вътрешно споделено хранилище</string>
+    <string name="today">Днес</string>
 </resources>

android/sdk/src/main/res/values-bn/strings.xml

@@ -10,4 +10,5 @@
     <string name="category_wifi">ওয়াইফাই</string>
     <string name="maps_storage_shared">অভ্যন্তরীণ শেয়ার্ড স্টোরেজ</string>
     <string name="postal_code">ডাক কোড</string>
+    <string name="today">আজকে</string>
 </resources>

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

@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Edició en línia</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Avui</string>
 </resources>

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

@@ -31,4 +31,5 @@
     <string name="maps_storage_shared">Interní sdílené úložiště</string>
     <string name="maps_storage_internal">Interní soukromé úložiště</string>
     <string name="maps_storage_external">Externí sdílené úložiště</string>
+    <string name="today">Dnes</string>
 </resources>

android/sdk/src/main/res/values-cy/strings.xml

@@ -18,4 +18,5 @@
     <string name="public_access">Mynediad cyhoeddus</string>
     <string name="limited_access">Mynediad cyfyngedig</string>
     <string name="access_rules_author_only">Golygu ar-lein</string>
+    <string name="today">Heddiw</string>
 </resources>

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

@@ -31,4 +31,5 @@
     <string name="maps_storage_shared">Intern delt lagerplads</string>
     <string name="maps_storage_removable">SD-kort</string>
     <string name="maps_storage_external">Ekstern delt lagerplads</string>
+    <string name="today">I dag</string>
 </resources>

android/sdk/src/main/res/values-de/strings.xml

@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Online bearbeiten</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">Heute</string>
 </resources>

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

@@ -34,4 +34,5 @@
     <string name="access_rules_author_only">Online επεξεργασία</string>
     <string name="mb">MB</string>
     <string name="mi">μι</string>
+    <string name="today">Σήμερα</string>
 </resources>

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

@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Edición en línea</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Hoy</string>
 </resources>

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

@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Võrgupõhine muutmine</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Täna</string>
 </resources>

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

@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Sarean editatzen</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Gaur</string>
 </resources>

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

@@ -28,4 +28,5 @@
     <string name="limited_access">دسترسی محدود</string>
     <string name="not_shared">خصوصی</string>
     <string name="access_rules_author_only">ویرایش آنلاین</string>
+    <string name="today">امروز</string>
 </resources>

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

@@ -36,4 +36,5 @@
     <string name="limited_access">Rajoitettu pääsy</string>
     <string name="not_shared">Yksityinen</string>
     <string name="access_rules_author_only">Nettimuokkaus</string>
+    <string name="today">Tänään</string>
 </resources>

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

@@ -36,4 +36,5 @@
     <string name="limited_access">Accès limité</string>
     <string name="not_shared">Privé</string>
     <string name="access_rules_author_only">Édition en ligne</string>
+    <string name="today">Aujourd\'hui</string>
 </resources>

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

@@ -22,4 +22,5 @@
     <string name="category_wifi">Wifi</string>
     <string name="maps_storage_removable">Tarxeta SD</string>
     <string name="core_placepage_unknown_place">Punto do mapa</string>
+    <string name="today">Hoxe</string>
 </resources>

android/sdk/src/main/res/values-gsw/strings.xml

@@ -22,4 +22,5 @@
     <string name="ft">ft</string>
     <string name="core_entrance">Iigang</string>
     <string name="public_access">Öffentliche Zuegriff</string>
+    <string name="today">Hüt</string>
 </resources>

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

@@ -7,4 +7,5 @@
     <string name="not_shared">Privatno</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Danas</string>
 </resources>

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

@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Szerkesztés online</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Ma</string>
 </resources>

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

@@ -27,4 +27,5 @@
     <string name="limited_access">Akses terbatas</string>
     <string name="not_shared">Pribadi</string>
     <string name="access_rules_author_only">Pengeditan online</string>
+    <string name="today">Hari ini</string>
 </resources>

android/sdk/src/main/res/values-is/strings.xml

@@ -22,4 +22,5 @@
     <string name="core_placepage_unknown_place">Punktur á korti</string>
     <string name="subway_data_unavailable">Kort fyrir neðanjarðarlest er ekki tiltækt</string>
     <string name="access_rules_author_only">Breytingar á netinu</string>
+    <string name="today">Í dag</string>
 </resources>

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

@@ -30,4 +30,5 @@
     <string name="maps_storage_removable">Scheda SD</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Oggi</string>
 </resources>

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

@@ -33,4 +33,5 @@
     <string name="access_rules_author_only">עריכה אונליין</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">היום</string>
 </resources>

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

@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">オンライン編集</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">今日は</string>
 </resources>

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

@@ -27,4 +27,5 @@
     <string name="access_rules_author_only">온라인 수정</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">오늘</string>
 </resources>

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

@@ -36,4 +36,5 @@
     <string name="limited_access">Ribota prieiga</string>
     <string name="not_shared">Privatus</string>
     <string name="access_rules_author_only">Taisymas internete</string>
+    <string name="today">Šiandien</string>
 </resources>

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

@@ -34,4 +34,5 @@
     <string name="core_placepage_unknown_place">Punkts kartē</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">Šodien</string>
 </resources>

android/sdk/src/main/res/values-mr/strings.xml

@@ -25,4 +25,5 @@
     <string name="limited_access">मर्यादित प्रवेश</string>
     <string name="not_shared">खाजगी</string>
     <string name="access_rules_author_only">ऑनलाइन संपादन</string>
+    <string name="today">आज</string>
 </resources>

android/sdk/src/main/res/values-mt/strings.xml

@@ -23,4 +23,5 @@
     <string name="not_shared">Privat</string>
     <string name="access_rules_author_only">Editjar onlajn</string>
     <string name="public_access">Aċċess pubbliku</string>
+    <string name="today">Illum</string>
 </resources>

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

@@ -36,4 +36,5 @@
     <string name="not_shared">Privat</string>
     <string name="access_rules_author_only">Redigering på nett</string>
     <string name="gb">GB</string>
+    <string name="today">I dag</string>
 </resources>

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

@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Wordt online bewerkt</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">Vandaag</string>
 </resources>

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

@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Edytowane online</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Dzisiaj</string>
 </resources>

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

@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Edição online</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Hoje</string>
 </resources>

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

@@ -31,4 +31,5 @@
     <string name="gb">GB</string>
     <string name="maps_storage_shared">Armazenamento interno partilhado</string>
     <string name="maps_storage_removable">Cartão SD</string>
+    <string name="today">Hoje</string>
 </resources>

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

@@ -23,4 +23,5 @@
     <string name="limited_access">Acces privat</string>
     <string name="not_shared">Personal</string>
     <string name="access_rules_author_only">Modifică online</string>
+    <string name="today">Azi</string>
 </resources>

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

@@ -36,4 +36,5 @@
     <string name="limited_access">Ограниченный доступ</string>
     <string name="not_shared">Личный</string>
     <string name="access_rules_author_only">Редактируется онлайн</string>
+    <string name="today">Сегодня</string>
 </resources>

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

@@ -33,4 +33,5 @@
     <string name="limited_access">Obmedzený prístup</string>
     <string name="not_shared">Súkromné</string>
     <string name="access_rules_author_only">Online úprava</string>
+    <string name="today">Dnes</string>
 </resources>

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

@@ -34,4 +34,5 @@
     <string name="gb">ГБ</string>
     <string name="mb">МБ</string>
     <string name="core_placepage_unknown_place">Тачка на мапи</string>
+    <string name="today">Данас</string>
 </resources>

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

@@ -30,4 +30,5 @@
     <string name="maps_storage_internal">Internt, privat lagringsutrymme</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">Idag</string>
 </resources>

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

@@ -28,4 +28,5 @@
     <string name="not_shared">ส่วนตัว</string>
     <string name="access_rules_author_only">การแก้ไขทางออนไลน์</string>
     <string name="gb">GB</string>
+    <string name="today">วันนี้</string>
 </resources>

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

@@ -36,4 +36,5 @@
     <string name="not_shared">Gizli</string>
     <string name="access_rules_author_only">Çevrimiçi düzenleme</string>
     <string name="gb">GB</string>
+    <string name="today">Bugün</string>
 </resources>

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

@@ -36,4 +36,5 @@
     <string name="limited_access">Приватний доступ</string>
     <string name="not_shared">Особистий</string>
     <string name="access_rules_author_only">Редагується онлайн</string>
+    <string name="today">Сьогодні</string>
 </resources>

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

@@ -27,4 +27,5 @@
     <string name="access_rules_author_only">Chỉnh sửa trực tuyến</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">Hôm nay</string>
 </resources>

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

@@ -36,4 +36,5 @@
     <string name="limited_access">不允許進入的私人空間</string>
     <string name="not_shared">私人</string>
     <string name="access_rules_author_only">線上編輯</string>
+    <string name="today">今天</string>
 </resources>