diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java index feba8b7ee..7165a1e10 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java +++ b/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; diff --git a/android/app/src/main/res/values-af/strings.xml b/android/app/src/main/res/values-af/strings.xml index 5c3de3c02..5615a257e 100644 --- a/android/app/src/main/res/values-af/strings.xml +++ b/android/app/src/main/res/values-af/strings.xml @@ -397,7 +397,6 @@ 24/7 Vandag gesluit Gesluit - Vandag Open oor %s Sluit oor %s Gesluit diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml index 739abe09f..f08610d20 100644 --- a/android/app/src/main/res/values-ar/strings.xml +++ b/android/app/src/main/res/values-ar/strings.xml @@ -423,7 +423,6 @@ ٢٤/٧(ليلاً ونهاراً) مغلق اليوم مغلق - اليوم يفتح بعد %s يغلق في غضون %s مغلق diff --git a/android/app/src/main/res/values-ast/strings.xml b/android/app/src/main/res/values-ast/strings.xml index 8b2dfbfdc..37c4e795d 100644 --- a/android/app/src/main/res/values-ast/strings.xml +++ b/android/app/src/main/res/values-ast/strings.xml @@ -31,7 +31,6 @@ Non - Güei Esportar KMZ Non Rede: %s diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml index fdd3e568a..904e776c9 100644 --- a/android/app/src/main/res/values-az/strings.xml +++ b/android/app/src/main/res/values-az/strings.xml @@ -415,7 +415,6 @@ 7/24 Bu gün bağlıdır Bağlı - Bu gün %s sonra açılır %s sonra bağlanır Bağlı diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml index a63aee166..2f5d4dd60 100644 --- a/android/app/src/main/res/values-be/strings.xml +++ b/android/app/src/main/res/values-be/strings.xml @@ -409,7 +409,6 @@ 24/7 Сёння закрыта Закрыта - Сёння Адчыняецца праз %s Зачыняецца праз %s Закрыта diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml index 8aa446325..e497822fc 100644 --- a/android/app/src/main/res/values-bg/strings.xml +++ b/android/app/src/main/res/values-bg/strings.xml @@ -389,7 +389,6 @@ 24 часа Затворено днес Затворено - Днес Затворено Редакция на работното време Нямате акаунт в OpenStreetMap? diff --git a/android/app/src/main/res/values-bn/strings.xml b/android/app/src/main/res/values-bn/strings.xml index 3c8850785..b83caf8f7 100644 --- a/android/app/src/main/res/values-bn/strings.xml +++ b/android/app/src/main/res/values-bn/strings.xml @@ -240,7 +240,6 @@ রক্ষণাবেক্ষণের জন্য বন্ধ ডুপ্লিকেট জায়গা আজকে বন্ধ - আজকে %s-এর মধ্যে খুলবে %s-এর মধ্যে বন্ধ হবে আপনার ওপেনস্ট্রিটম্যাপ অ্যাকাউন্ট নেই? diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml index c64b5e8da..b7da16bf8 100644 --- a/android/app/src/main/res/values-ca/strings.xml +++ b/android/app/src/main/res/values-ca/strings.xml @@ -415,7 +415,6 @@ 24/7 Avui és tancat Tancat - Avui Obre en %s Tanca en %s Tancat diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml index 255d2837d..c4fb65397 100644 --- a/android/app/src/main/res/values-cs/strings.xml +++ b/android/app/src/main/res/values-cs/strings.xml @@ -408,7 +408,6 @@ Nonstop Dnes zavřeno Zavřeno - Dnes Zavřeno Upravit otevírací dobu Nemáte účet u OpenStreetMap? diff --git a/android/app/src/main/res/values-cy/strings.xml b/android/app/src/main/res/values-cy/strings.xml index 168f247ab..b6d469521 100644 --- a/android/app/src/main/res/values-cy/strings.xml +++ b/android/app/src/main/res/values-cy/strings.xml @@ -32,7 +32,6 @@ Ar gau Tanlwybr Ailgeisio - Heddiw Cynllunio https://comaps.app/ Rhestr diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml index 8a53b1d73..2ad5c2d31 100644 --- a/android/app/src/main/res/values-da/strings.xml +++ b/android/app/src/main/res/values-da/strings.xml @@ -404,7 +404,6 @@ Døgnet rundt Lukket i dag Lukket - I dag Lukket Rediger åbningstid Har du ikke OpenStreetMap-konto? diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml index f4bf5b4ae..417a875e0 100644 --- a/android/app/src/main/res/values-de/strings.xml +++ b/android/app/src/main/res/values-de/strings.xml @@ -413,7 +413,6 @@ 24/7 Heute geschlossen Geschlossen - Heute Öffnet in %s Schließt in %s Geschlossen diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml index 856590065..8ce93e6dc 100644 --- a/android/app/src/main/res/values-el/strings.xml +++ b/android/app/src/main/res/values-el/strings.xml @@ -415,7 +415,6 @@ 24/7 Κλειστό σήμερα Κλειστό - Σήμερα Ανοίγει σε %s Κλείνει σε %s Κλειστό diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml index 33446615f..ca71e7439 100644 --- a/android/app/src/main/res/values-es/strings.xml +++ b/android/app/src/main/res/values-es/strings.xml @@ -417,7 +417,6 @@ 24/7 Cerrado hoy Cerrado - Hoy Abre en %s Cierra en %s Cerrado diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml index 841855021..08992cfb6 100644 --- a/android/app/src/main/res/values-et/strings.xml +++ b/android/app/src/main/res/values-et/strings.xml @@ -409,7 +409,6 @@ 24/7 Täna suletud Suletud - Täna Avatakse %s möödumisel Suletakse %s möödumisel Suletud diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml index 3f57059a3..90bafcc4a 100644 --- a/android/app/src/main/res/values-eu/strings.xml +++ b/android/app/src/main/res/values-eu/strings.xml @@ -415,7 +415,6 @@ 24/7 Gaur atseden eguna Itxita - Gaur %s barru irekiko da %s barru itxiko da Itxita diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml index 954451d3e..c8912f5ae 100644 --- a/android/app/src/main/res/values-fa/strings.xml +++ b/android/app/src/main/res/values-fa/strings.xml @@ -394,7 +394,6 @@ شبانه روزی امروز تعطیل است تعطیل است - امروز تعطیل ویرایش ساعت کاری آیا حساب OpenStreetMap ندارید؟ diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml index 9012dc848..ee71cebd4 100644 --- a/android/app/src/main/res/values-fi/strings.xml +++ b/android/app/src/main/res/values-fi/strings.xml @@ -416,7 +416,6 @@ Päivin ja öin Suljettu tänään Suljettu - Tänään Avautuu %s kuluttua Sulkeutuu %s kuluttua Suljettu diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml index fdc6e91ee..6c25774a4 100644 --- a/android/app/src/main/res/values-fr/strings.xml +++ b/android/app/src/main/res/values-fr/strings.xml @@ -417,7 +417,6 @@ 24/24 et 7/7 Fermé aujourd\'hui Fermé - Aujourd\'hui Ouvert dans %s Ferme dans %s Fermé diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml index 853476776..7ff6a329c 100644 --- a/android/app/src/main/res/values-gl/strings.xml +++ b/android/app/src/main/res/values-gl/strings.xml @@ -489,7 +489,6 @@ https://comaps.app/gl/ Compras Distancia - Hoxe Baño Desactivado Cociña diff --git a/android/app/src/main/res/values-gsw/strings.xml b/android/app/src/main/res/values-gsw/strings.xml index 920883e3e..056a54f70 100644 --- a/android/app/src/main/res/values-gsw/strings.xml +++ b/android/app/src/main/res/values-gsw/strings.xml @@ -360,7 +360,6 @@ 24/7 Hüt zue Zue - Hüt Öffnet i %s Schlüüst i %s Zue diff --git a/android/app/src/main/res/values-hr/strings.xml b/android/app/src/main/res/values-hr/strings.xml index d7b36e5fe..62e773e15 100644 --- a/android/app/src/main/res/values-hr/strings.xml +++ b/android/app/src/main/res/values-hr/strings.xml @@ -103,7 +103,6 @@ Privatnost Nikada Odbaci - Danas Lozinka Detalji Politika privatnosti diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml index 7003916b5..7ec9f63d7 100644 --- a/android/app/src/main/res/values-hu/strings.xml +++ b/android/app/src/main/res/values-hu/strings.xml @@ -408,7 +408,6 @@ 24/7 Ma zárva Zárva - Ma Zárva Nyitvatartás szerkesztése Nem rendelkezik még felhasználói fiókkal az OpenStreetMapen? diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml index 68acb114d..7d04267f5 100644 --- a/android/app/src/main/res/values-in/strings.xml +++ b/android/app/src/main/res/values-in/strings.xml @@ -402,7 +402,6 @@ siang dan malam Tutup hari ini Tutup - Hari ini Tutup Sunting jam kerja Tidak ada akun di OpenStreetMap? diff --git a/android/app/src/main/res/values-is/strings.xml b/android/app/src/main/res/values-is/strings.xml index 94094887d..58cb72ec9 100644 --- a/android/app/src/main/res/values-is/strings.xml +++ b/android/app/src/main/res/values-is/strings.xml @@ -45,7 +45,6 @@ Daglega 24/7 Lokað í dag - Í dag Opnar eftir %s Lokar eftir %s Lokað diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml index 6cdb510b7..d4d436925 100644 --- a/android/app/src/main/res/values-it/strings.xml +++ b/android/app/src/main/res/values-it/strings.xml @@ -411,7 +411,6 @@ 24/7 Oggi chiuso Chiuso - Oggi Apre tra %s Chiude tra %s Chiuso diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml index 70e971821..756477e92 100644 --- a/android/app/src/main/res/values-iw/strings.xml +++ b/android/app/src/main/res/values-iw/strings.xml @@ -409,7 +409,6 @@ 24/7 סגור היום סגור - היום נפתח עוד %s נסגר עוד %s סגור diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml index 4f3ef943e..962f59e21 100644 --- a/android/app/src/main/res/values-ja/strings.xml +++ b/android/app/src/main/res/values-ja/strings.xml @@ -419,7 +419,6 @@ 昼と夜 本日終業 終業 - 今日は あと %s に営業 あと %s に閉店 閉店 diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml index 3c8efe7b8..867693ea9 100644 --- a/android/app/src/main/res/values-ko/strings.xml +++ b/android/app/src/main/res/values-ko/strings.xml @@ -402,7 +402,6 @@ 24 시간 오늘 영업 종료됨 종료됨 - 오늘 닫음 영업일 편집 OpenStreetMap에서 계정이 없습니까? diff --git a/android/app/src/main/res/values-lt/strings.xml b/android/app/src/main/res/values-lt/strings.xml index 93cc47a5a..500f12265 100644 --- a/android/app/src/main/res/values-lt/strings.xml +++ b/android/app/src/main/res/values-lt/strings.xml @@ -403,7 +403,6 @@ 24×7 Šiandien uždaryta Uždaryta - Šiandien Atsidaro už %s Užsidaro už %s Uždaryta diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml index b8c8f057f..dfb69af04 100644 --- a/android/app/src/main/res/values-lv/strings.xml +++ b/android/app/src/main/res/values-lv/strings.xml @@ -415,7 +415,6 @@ 24/7 Šodien slēgts Slēgts - Šodien Atveras pēc %s Slēgts pēc %s Slēgts diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml index 39e3a60e6..e1429f8b9 100644 --- a/android/app/src/main/res/values-mr/strings.xml +++ b/android/app/src/main/res/values-mr/strings.xml @@ -395,7 +395,6 @@ २४/७ आज बंद बंद - आज बंद व्यवसायाची वेळ संपादित करा OpenStreetMap खाते नाही? diff --git a/android/app/src/main/res/values-mt/strings.xml b/android/app/src/main/res/values-mt/strings.xml index ef9c45127..0f71f36fe 100644 --- a/android/app/src/main/res/values-mt/strings.xml +++ b/android/app/src/main/res/values-mt/strings.xml @@ -474,7 +474,6 @@ Iva Le In-noti tad-dejta tal-mappa tiegħek - Illum Midja Soċjali Aġġorna l-Mapep Daħħal indirizz tal-web, kont, jew isem tal-paġna validu ta ’Facebook diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml index 5d5de11c6..dc1210df0 100644 --- a/android/app/src/main/res/values-nb/strings.xml +++ b/android/app/src/main/res/values-nb/strings.xml @@ -415,7 +415,6 @@ Dag og natt Fridag i dag Fridag - I dag Åpner om %s Stenger om %s Stengt diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml index c35efd3c3..7b8fd0d16 100644 --- a/android/app/src/main/res/values-nl/strings.xml +++ b/android/app/src/main/res/values-nl/strings.xml @@ -413,7 +413,6 @@ 24/7 Vandaag gesloten Gesloten - Vandaag Opent over %s Sluit over %s Gesloten diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml index 1d990e3b2..153f5906b 100644 --- a/android/app/src/main/res/values-pl/strings.xml +++ b/android/app/src/main/res/values-pl/strings.xml @@ -417,7 +417,6 @@ 24/7 Dziś nieczynne Nieczynne - Dzisiaj Otwarcie za %s Zamknięcie za %s Zamknięte diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml index 48618d48b..26098d376 100644 --- a/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/android/app/src/main/res/values-pt-rBR/strings.xml @@ -376,7 +376,6 @@ 24 horas por dia Fechado hoje Fechado - Hoje Abre em %s Fecha em %s Fechado diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml index 22f02faae..8819a3302 100644 --- a/android/app/src/main/res/values-pt/strings.xml +++ b/android/app/src/main/res/values-pt/strings.xml @@ -411,7 +411,6 @@ 24 horas por dia Fechado hoje Fechado - Hoje Fechado Editar horário de funcionamento Não tem uma conta no OpenStreetMap? diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml index fe4592c64..dfb5f2d87 100644 --- a/android/app/src/main/res/values-ro/strings.xml +++ b/android/app/src/main/res/values-ro/strings.xml @@ -409,7 +409,6 @@ 24/7 Închis astăzi Închis - Azi Deschide în %s Închide în %s Închis diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml index b2aef9705..bc8bc3003 100644 --- a/android/app/src/main/res/values-ru/strings.xml +++ b/android/app/src/main/res/values-ru/strings.xml @@ -417,7 +417,6 @@ Круглосуточно Сегодня закрыто Закрыто - Сегодня Открывается через %s Закроется через %s Закрыто diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml index 658ad713e..dfad87cbb 100644 --- a/android/app/src/main/res/values-sk/strings.xml +++ b/android/app/src/main/res/values-sk/strings.xml @@ -413,7 +413,6 @@ Deň a noc Dnes deň voľna Zatvorené - Dnes Otvoria o %s Zatvoria o %s Zatvorené diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml index 38a75c194..d31ed4b6e 100644 --- a/android/app/src/main/res/values-sr/strings.xml +++ b/android/app/src/main/res/values-sr/strings.xml @@ -410,7 +410,6 @@ 24/7 Данас не ради Затворено - Данас Отвара се за %s Затвара се за %s Затворено diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml index ae7bd0680..ee2b18d4a 100644 --- a/android/app/src/main/res/values-sv/strings.xml +++ b/android/app/src/main/res/values-sv/strings.xml @@ -402,7 +402,6 @@ Dygnet runt Stängt idag Stängt - Idag Stängt Redigera öppettider Inget konto hos OpenStreetMap? diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml index 177d0563f..b85723d35 100644 --- a/android/app/src/main/res/values-th/strings.xml +++ b/android/app/src/main/res/values-th/strings.xml @@ -402,7 +402,6 @@ ทั้งกลางวันและกลางคืน วันนี้ปิด ปิด - วันนี้ ปิด แก้ไขชั่วโมงทำการ ไม่มีบัญชีใน OpenStreetMap? diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml index 8ff60ee43..8deda4940 100644 --- a/android/app/src/main/res/values-tr/strings.xml +++ b/android/app/src/main/res/values-tr/strings.xml @@ -413,7 +413,6 @@ 7/24 Bugün kapalı Kapalı - Bugün %s sonra açılıyor %s sonra kapanıyor Kapalı diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml index 4c64c8a2b..b4ca03c34 100644 --- a/android/app/src/main/res/values-uk/strings.xml +++ b/android/app/src/main/res/values-uk/strings.xml @@ -417,7 +417,6 @@ Цілодобово Сьогодні зачинено Зачинено - Сьогодні Відкривається через %s Зачиняється через %s Зачинено diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml index 3e66e9800..65175ab80 100644 --- a/android/app/src/main/res/values-vi/strings.xml +++ b/android/app/src/main/res/values-vi/strings.xml @@ -402,7 +402,6 @@ ngày và đêm Nghỉ hôm nay Ngày nghỉ - Hôm nay Đã đóng Sửa giờ làm việc Bạn chưa có tài khoản tại OpenStreetMap ư? diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml index 706e6571e..e5a78a871 100644 --- a/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/android/app/src/main/res/values-zh-rTW/strings.xml @@ -423,7 +423,6 @@ 24/7 全天候營業 今天不營業 不營業 - 今天 將於 %s 後開業 將於 %s 後歇業 已停止營業 diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml index d85827400..55541a6da 100644 --- a/android/app/src/main/res/values-zh/strings.xml +++ b/android/app/src/main/res/values-zh/strings.xml @@ -423,7 +423,6 @@ 24/7 全天候营业 今天不营业 不营业 - 今天 将于 %s 后开业 将于 %s 后歇业 已停止营业 diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index baf8593c8..eba896155 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -462,7 +462,6 @@ 24/7 Closed today Closed - Today Opens in %s Closes in %s Closed @@ -470,14 +469,6 @@ Confirmed %s Existence confirmed %s - Yesterday - %s days ago - %s week ago - %s weeks ago - %s month ago - %s months ago - %s year ago - %s years ago Edit business hours Don\'t have an OpenStreetMap account? Register at OpenStreetMap diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java index bc445cb63..0f561a517 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java +++ b/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) diff --git a/android/sdk/src/main/res/values-af/strings.xml b/android/sdk/src/main/res/values-af/strings.xml index 999ba058f..a1047d469 100644 --- a/android/sdk/src/main/res/values-af/strings.xml +++ b/android/sdk/src/main/res/values-af/strings.xml @@ -36,4 +36,5 @@ Beperkte toegang Privaat Aanlyn wysiging + Vandag diff --git a/android/sdk/src/main/res/values-ar/strings.xml b/android/sdk/src/main/res/values-ar/strings.xml index 5cf3964e6..56ea72d29 100644 --- a/android/sdk/src/main/res/values-ar/strings.xml +++ b/android/sdk/src/main/res/values-ar/strings.xml @@ -36,4 +36,5 @@ مسموح الوصول بشكل محدود خاص التعديل باستخدام الإنترنت + اليوم diff --git a/android/sdk/src/main/res/values-ast/strings.xml b/android/sdk/src/main/res/values-ast/strings.xml index fedc5670a..b9ddfa263 100644 --- a/android/sdk/src/main/res/values-ast/strings.xml +++ b/android/sdk/src/main/res/values-ast/strings.xml @@ -9,4 +9,5 @@ km GB m + Güei diff --git a/android/sdk/src/main/res/values-az/strings.xml b/android/sdk/src/main/res/values-az/strings.xml index 842bda15a..c2ea48fa9 100644 --- a/android/sdk/src/main/res/values-az/strings.xml +++ b/android/sdk/src/main/res/values-az/strings.xml @@ -35,4 +35,5 @@ Məhdud giriş Gizli Onlayn redaktə + Bu gün diff --git a/android/sdk/src/main/res/values-be/strings.xml b/android/sdk/src/main/res/values-be/strings.xml index a021045bd..762416816 100644 --- a/android/sdk/src/main/res/values-be/strings.xml +++ b/android/sdk/src/main/res/values-be/strings.xml @@ -36,4 +36,5 @@ Абмежаваны доступ Прыватны Рэдагаванне анлайн + Сёння diff --git a/android/sdk/src/main/res/values-bg/strings.xml b/android/sdk/src/main/res/values-bg/strings.xml index 3df9166a8..c81b12023 100644 --- a/android/sdk/src/main/res/values-bg/strings.xml +++ b/android/sdk/src/main/res/values-bg/strings.xml @@ -31,4 +31,5 @@ Карта памет Външно споделено хранилище Вътрешно споделено хранилище + Днес diff --git a/android/sdk/src/main/res/values-bn/strings.xml b/android/sdk/src/main/res/values-bn/strings.xml index e12b2381a..8275283e5 100644 --- a/android/sdk/src/main/res/values-bn/strings.xml +++ b/android/sdk/src/main/res/values-bn/strings.xml @@ -10,4 +10,5 @@ ওয়াইফাই অভ্যন্তরীণ শেয়ার্ড স্টোরেজ ডাক কোড + আজকে diff --git a/android/sdk/src/main/res/values-ca/strings.xml b/android/sdk/src/main/res/values-ca/strings.xml index ddfa3ca0b..f8982d919 100644 --- a/android/sdk/src/main/res/values-ca/strings.xml +++ b/android/sdk/src/main/res/values-ca/strings.xml @@ -35,4 +35,5 @@ Edició en línia MB GB + Avui diff --git a/android/sdk/src/main/res/values-cs/strings.xml b/android/sdk/src/main/res/values-cs/strings.xml index 3af3648a9..93f03ac2d 100644 --- a/android/sdk/src/main/res/values-cs/strings.xml +++ b/android/sdk/src/main/res/values-cs/strings.xml @@ -31,4 +31,5 @@ Interní sdílené úložiště Interní soukromé úložiště Externí sdílené úložiště + Dnes diff --git a/android/sdk/src/main/res/values-cy/strings.xml b/android/sdk/src/main/res/values-cy/strings.xml index d474df213..e63a76610 100644 --- a/android/sdk/src/main/res/values-cy/strings.xml +++ b/android/sdk/src/main/res/values-cy/strings.xml @@ -18,4 +18,5 @@ Mynediad cyhoeddus Mynediad cyfyngedig Golygu ar-lein + Heddiw diff --git a/android/sdk/src/main/res/values-da/strings.xml b/android/sdk/src/main/res/values-da/strings.xml index 5c09ff0b4..6b9d4c7a1 100644 --- a/android/sdk/src/main/res/values-da/strings.xml +++ b/android/sdk/src/main/res/values-da/strings.xml @@ -31,4 +31,5 @@ Intern delt lagerplads SD-kort Ekstern delt lagerplads + I dag diff --git a/android/sdk/src/main/res/values-de/strings.xml b/android/sdk/src/main/res/values-de/strings.xml index bab1077b0..938aa7cc9 100644 --- a/android/sdk/src/main/res/values-de/strings.xml +++ b/android/sdk/src/main/res/values-de/strings.xml @@ -35,4 +35,5 @@ Online bearbeiten GB MB + Heute diff --git a/android/sdk/src/main/res/values-el/strings.xml b/android/sdk/src/main/res/values-el/strings.xml index 2ecc52de4..52e4b22a1 100644 --- a/android/sdk/src/main/res/values-el/strings.xml +++ b/android/sdk/src/main/res/values-el/strings.xml @@ -34,4 +34,5 @@ Online επεξεργασία MB μι + Σήμερα diff --git a/android/sdk/src/main/res/values-es/strings.xml b/android/sdk/src/main/res/values-es/strings.xml index 5fd9a4e39..a8e43e5c7 100644 --- a/android/sdk/src/main/res/values-es/strings.xml +++ b/android/sdk/src/main/res/values-es/strings.xml @@ -35,4 +35,5 @@ Edición en línea MB GB + Hoy diff --git a/android/sdk/src/main/res/values-et/strings.xml b/android/sdk/src/main/res/values-et/strings.xml index 8d52680e9..408e974fa 100644 --- a/android/sdk/src/main/res/values-et/strings.xml +++ b/android/sdk/src/main/res/values-et/strings.xml @@ -35,4 +35,5 @@ Võrgupõhine muutmine MB GB + Täna diff --git a/android/sdk/src/main/res/values-eu/strings.xml b/android/sdk/src/main/res/values-eu/strings.xml index 633403bdc..c03a1f2de 100644 --- a/android/sdk/src/main/res/values-eu/strings.xml +++ b/android/sdk/src/main/res/values-eu/strings.xml @@ -35,4 +35,5 @@ Sarean editatzen MB GB + Gaur diff --git a/android/sdk/src/main/res/values-fa/strings.xml b/android/sdk/src/main/res/values-fa/strings.xml index a757016f4..c3df06136 100644 --- a/android/sdk/src/main/res/values-fa/strings.xml +++ b/android/sdk/src/main/res/values-fa/strings.xml @@ -28,4 +28,5 @@ دسترسی محدود خصوصی ویرایش آنلاین + امروز diff --git a/android/sdk/src/main/res/values-fi/strings.xml b/android/sdk/src/main/res/values-fi/strings.xml index b353b0d80..b3722ce12 100644 --- a/android/sdk/src/main/res/values-fi/strings.xml +++ b/android/sdk/src/main/res/values-fi/strings.xml @@ -36,4 +36,5 @@ Rajoitettu pääsy Yksityinen Nettimuokkaus + Tänään diff --git a/android/sdk/src/main/res/values-fr/strings.xml b/android/sdk/src/main/res/values-fr/strings.xml index 1ab32bf83..a4b6c8b43 100644 --- a/android/sdk/src/main/res/values-fr/strings.xml +++ b/android/sdk/src/main/res/values-fr/strings.xml @@ -36,4 +36,5 @@ Accès limité Privé Édition en ligne + Aujourd\'hui diff --git a/android/sdk/src/main/res/values-gl/strings.xml b/android/sdk/src/main/res/values-gl/strings.xml index 96b0d6013..2f36d2e52 100644 --- a/android/sdk/src/main/res/values-gl/strings.xml +++ b/android/sdk/src/main/res/values-gl/strings.xml @@ -22,4 +22,5 @@ Wifi Tarxeta SD Punto do mapa + Hoxe diff --git a/android/sdk/src/main/res/values-gsw/strings.xml b/android/sdk/src/main/res/values-gsw/strings.xml index 970677800..aa413426e 100644 --- a/android/sdk/src/main/res/values-gsw/strings.xml +++ b/android/sdk/src/main/res/values-gsw/strings.xml @@ -22,4 +22,5 @@ ft Iigang Öffentliche Zuegriff + Hüt diff --git a/android/sdk/src/main/res/values-hr/strings.xml b/android/sdk/src/main/res/values-hr/strings.xml index a9240fa1c..161838bcb 100644 --- a/android/sdk/src/main/res/values-hr/strings.xml +++ b/android/sdk/src/main/res/values-hr/strings.xml @@ -7,4 +7,5 @@ Privatno MB GB + Danas diff --git a/android/sdk/src/main/res/values-hu/strings.xml b/android/sdk/src/main/res/values-hu/strings.xml index 2c9c5ab4e..15b30dab6 100644 --- a/android/sdk/src/main/res/values-hu/strings.xml +++ b/android/sdk/src/main/res/values-hu/strings.xml @@ -35,4 +35,5 @@ Szerkesztés online MB GB + Ma diff --git a/android/sdk/src/main/res/values-in/strings.xml b/android/sdk/src/main/res/values-in/strings.xml index 0a5197af9..23956eadd 100644 --- a/android/sdk/src/main/res/values-in/strings.xml +++ b/android/sdk/src/main/res/values-in/strings.xml @@ -27,4 +27,5 @@ Akses terbatas Pribadi Pengeditan online + Hari ini diff --git a/android/sdk/src/main/res/values-is/strings.xml b/android/sdk/src/main/res/values-is/strings.xml index f4dd81318..640efdc02 100644 --- a/android/sdk/src/main/res/values-is/strings.xml +++ b/android/sdk/src/main/res/values-is/strings.xml @@ -22,4 +22,5 @@ Punktur á korti Kort fyrir neðanjarðarlest er ekki tiltækt Breytingar á netinu + Í dag diff --git a/android/sdk/src/main/res/values-it/strings.xml b/android/sdk/src/main/res/values-it/strings.xml index dafb6afc3..eaf7b5237 100644 --- a/android/sdk/src/main/res/values-it/strings.xml +++ b/android/sdk/src/main/res/values-it/strings.xml @@ -30,4 +30,5 @@ Scheda SD MB GB + Oggi diff --git a/android/sdk/src/main/res/values-iw/strings.xml b/android/sdk/src/main/res/values-iw/strings.xml index 3e934ab01..24e4c70fa 100644 --- a/android/sdk/src/main/res/values-iw/strings.xml +++ b/android/sdk/src/main/res/values-iw/strings.xml @@ -33,4 +33,5 @@ עריכה אונליין GB MB + היום diff --git a/android/sdk/src/main/res/values-ja/strings.xml b/android/sdk/src/main/res/values-ja/strings.xml index 63399ce22..e4c754cb5 100644 --- a/android/sdk/src/main/res/values-ja/strings.xml +++ b/android/sdk/src/main/res/values-ja/strings.xml @@ -35,4 +35,5 @@ オンライン編集 GB MB + 今日は diff --git a/android/sdk/src/main/res/values-ko/strings.xml b/android/sdk/src/main/res/values-ko/strings.xml index 3b5c1dff3..25f91ce08 100644 --- a/android/sdk/src/main/res/values-ko/strings.xml +++ b/android/sdk/src/main/res/values-ko/strings.xml @@ -27,4 +27,5 @@ 온라인 수정 GB MB + 오늘 diff --git a/android/sdk/src/main/res/values-lt/strings.xml b/android/sdk/src/main/res/values-lt/strings.xml index 8028092bf..5af60bb01 100644 --- a/android/sdk/src/main/res/values-lt/strings.xml +++ b/android/sdk/src/main/res/values-lt/strings.xml @@ -36,4 +36,5 @@ Ribota prieiga Privatus Taisymas internete + Šiandien diff --git a/android/sdk/src/main/res/values-lv/strings.xml b/android/sdk/src/main/res/values-lv/strings.xml index eb4d41475..286444044 100644 --- a/android/sdk/src/main/res/values-lv/strings.xml +++ b/android/sdk/src/main/res/values-lv/strings.xml @@ -34,4 +34,5 @@ Punkts kartē GB MB + Šodien diff --git a/android/sdk/src/main/res/values-mr/strings.xml b/android/sdk/src/main/res/values-mr/strings.xml index 259f8f8af..501b93dba 100644 --- a/android/sdk/src/main/res/values-mr/strings.xml +++ b/android/sdk/src/main/res/values-mr/strings.xml @@ -25,4 +25,5 @@ मर्यादित प्रवेश खाजगी ऑनलाइन संपादन + आज diff --git a/android/sdk/src/main/res/values-mt/strings.xml b/android/sdk/src/main/res/values-mt/strings.xml index 679f717ad..465d7e600 100644 --- a/android/sdk/src/main/res/values-mt/strings.xml +++ b/android/sdk/src/main/res/values-mt/strings.xml @@ -23,4 +23,5 @@ Privat Editjar onlajn Aċċess pubbliku + Illum diff --git a/android/sdk/src/main/res/values-nb/strings.xml b/android/sdk/src/main/res/values-nb/strings.xml index b914a090e..956e623c3 100644 --- a/android/sdk/src/main/res/values-nb/strings.xml +++ b/android/sdk/src/main/res/values-nb/strings.xml @@ -36,4 +36,5 @@ Privat Redigering på nett GB + I dag diff --git a/android/sdk/src/main/res/values-nl/strings.xml b/android/sdk/src/main/res/values-nl/strings.xml index 7adda9261..8a29a1297 100644 --- a/android/sdk/src/main/res/values-nl/strings.xml +++ b/android/sdk/src/main/res/values-nl/strings.xml @@ -35,4 +35,5 @@ Wordt online bewerkt GB MB + Vandaag diff --git a/android/sdk/src/main/res/values-pl/strings.xml b/android/sdk/src/main/res/values-pl/strings.xml index 2b4fac4b8..1f922993a 100644 --- a/android/sdk/src/main/res/values-pl/strings.xml +++ b/android/sdk/src/main/res/values-pl/strings.xml @@ -35,4 +35,5 @@ Edytowane online MB GB + Dzisiaj diff --git a/android/sdk/src/main/res/values-pt-rBR/strings.xml b/android/sdk/src/main/res/values-pt-rBR/strings.xml index 29dffc7fd..f1ba6ec63 100644 --- a/android/sdk/src/main/res/values-pt-rBR/strings.xml +++ b/android/sdk/src/main/res/values-pt-rBR/strings.xml @@ -35,4 +35,5 @@ Edição online MB GB + Hoje diff --git a/android/sdk/src/main/res/values-pt/strings.xml b/android/sdk/src/main/res/values-pt/strings.xml index fe83d9824..fb33442c5 100644 --- a/android/sdk/src/main/res/values-pt/strings.xml +++ b/android/sdk/src/main/res/values-pt/strings.xml @@ -31,4 +31,5 @@ GB Armazenamento interno partilhado Cartão SD + Hoje diff --git a/android/sdk/src/main/res/values-ro/strings.xml b/android/sdk/src/main/res/values-ro/strings.xml index 8870784d0..61e86a712 100644 --- a/android/sdk/src/main/res/values-ro/strings.xml +++ b/android/sdk/src/main/res/values-ro/strings.xml @@ -23,4 +23,5 @@ Acces privat Personal Modifică online + Azi diff --git a/android/sdk/src/main/res/values-ru/strings.xml b/android/sdk/src/main/res/values-ru/strings.xml index cd20064d9..b2d44b730 100644 --- a/android/sdk/src/main/res/values-ru/strings.xml +++ b/android/sdk/src/main/res/values-ru/strings.xml @@ -36,4 +36,5 @@ Ограниченный доступ Личный Редактируется онлайн + Сегодня diff --git a/android/sdk/src/main/res/values-sk/strings.xml b/android/sdk/src/main/res/values-sk/strings.xml index e3c5d3784..7bfe71f0d 100644 --- a/android/sdk/src/main/res/values-sk/strings.xml +++ b/android/sdk/src/main/res/values-sk/strings.xml @@ -33,4 +33,5 @@ Obmedzený prístup Súkromné Online úprava + Dnes diff --git a/android/sdk/src/main/res/values-sr/strings.xml b/android/sdk/src/main/res/values-sr/strings.xml index a09c3e9a9..86eccf5ab 100644 --- a/android/sdk/src/main/res/values-sr/strings.xml +++ b/android/sdk/src/main/res/values-sr/strings.xml @@ -34,4 +34,5 @@ ГБ МБ Тачка на мапи + Данас diff --git a/android/sdk/src/main/res/values-sv/strings.xml b/android/sdk/src/main/res/values-sv/strings.xml index 15c863d21..aaef84b6f 100644 --- a/android/sdk/src/main/res/values-sv/strings.xml +++ b/android/sdk/src/main/res/values-sv/strings.xml @@ -30,4 +30,5 @@ Internt, privat lagringsutrymme GB MB + Idag diff --git a/android/sdk/src/main/res/values-th/strings.xml b/android/sdk/src/main/res/values-th/strings.xml index d27ea69a2..516772b98 100644 --- a/android/sdk/src/main/res/values-th/strings.xml +++ b/android/sdk/src/main/res/values-th/strings.xml @@ -28,4 +28,5 @@ ส่วนตัว การแก้ไขทางออนไลน์ GB + วันนี้ diff --git a/android/sdk/src/main/res/values-tr/strings.xml b/android/sdk/src/main/res/values-tr/strings.xml index b7c1dcc42..184079b2c 100644 --- a/android/sdk/src/main/res/values-tr/strings.xml +++ b/android/sdk/src/main/res/values-tr/strings.xml @@ -36,4 +36,5 @@ Gizli Çevrimiçi düzenleme GB + Bugün diff --git a/android/sdk/src/main/res/values-uk/strings.xml b/android/sdk/src/main/res/values-uk/strings.xml index 33ea53430..ef9993029 100644 --- a/android/sdk/src/main/res/values-uk/strings.xml +++ b/android/sdk/src/main/res/values-uk/strings.xml @@ -36,4 +36,5 @@ Приватний доступ Особистий Редагується онлайн + Сьогодні diff --git a/android/sdk/src/main/res/values-vi/strings.xml b/android/sdk/src/main/res/values-vi/strings.xml index e4aa269bd..4fc6d0bcf 100644 --- a/android/sdk/src/main/res/values-vi/strings.xml +++ b/android/sdk/src/main/res/values-vi/strings.xml @@ -27,4 +27,5 @@ Chỉnh sửa trực tuyến GB MB + Hôm nay diff --git a/android/sdk/src/main/res/values-zh-rTW/strings.xml b/android/sdk/src/main/res/values-zh-rTW/strings.xml index 688a7a72f..59dd03b97 100644 --- a/android/sdk/src/main/res/values-zh-rTW/strings.xml +++ b/android/sdk/src/main/res/values-zh-rTW/strings.xml @@ -36,4 +36,5 @@ 不允許進入的私人空間 私人 線上編輯 + 今天 diff --git a/android/sdk/src/main/res/values-zh/strings.xml b/android/sdk/src/main/res/values-zh/strings.xml index 278b32f73..216e6e599 100644 --- a/android/sdk/src/main/res/values-zh/strings.xml +++ b/android/sdk/src/main/res/values-zh/strings.xml @@ -36,4 +36,5 @@ 不允许访问的私人空间 私人 在线编辑 + 今天 diff --git a/android/sdk/src/main/res/values/strings.xml b/android/sdk/src/main/res/values/strings.xml index 0f0dd45ff..037ea6dc5 100644 --- a/android/sdk/src/main/res/values/strings.xml +++ b/android/sdk/src/main/res/values/strings.xml @@ -36,4 +36,13 @@ Limited access Private Online editing + Today + Yesterday + %s days ago + %s week ago + %s weeks ago + %s month ago + %s months ago + %s year ago + %s years ago diff --git a/tools/unix/android_transfer_string.sh b/tools/unix/android_transfer_string.sh new file mode 100755 index 000000000..ee1c9391b --- /dev/null +++ b/tools/unix/android_transfer_string.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +# Prompt for input +read -p "From module: " from_module +read -p "To module: " to_module +read -p "String resource name: " string_name + +# Find all strings.xml files in the from module +strings_files=$(find "$from_module/src/main/res" -type f -name "strings.xml") + +# Loop through each strings.xml file +for from_file in $strings_files; do + # Extract the exact line (preserves backslashes) + string_line=$(grep -oP ".*?" "$from_file") + + # Skip if string not found + if [[ -z "$string_line" ]]; then + continue + fi + + # Determine the value folder path + relative_path="${from_file#$from_module/src/main/res/}" # e.g., values-de/strings.xml + to_file="$to_module/src/main/res/$relative_path" + + # Ensure the destination directory exists + to_dir=$(dirname "$to_file") + mkdir -p "$to_dir" + + # Add or create the string in the destination file + if [[ -f "$to_file" ]]; then + # Add string if not already present + if ! grep -q "name=\"$string_name\"" "$to_file"; then + # Safely insert the raw string line + sed -i.bak "/<\/resources>/i \ \ \ \ $string_line" "$to_file" + echo "Added '$string_name' to $to_file" + else + echo "'$string_name' already exists in $to_file" + fi + else + # Create a new strings.xml + cat > "$to_file" < + $string_line + +EOF + echo "Created $to_file with '$string_name'" + fi + + # Remove the string from the source file + sed -i.bak "/.*<\/string>/d" "$from_file" + + # Cleanup backup files + rm -f "$from_file.bak" "$to_file.bak" +done