diff --git a/app/build.gradle b/app/build.gradle index 05b358dc6..bcbefa764 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,7 +42,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.6.16' + implementation 'com.simplemobiletools:commons:3.7.1' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.android.support:multidex:1.0.2' diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index f9b4cde97..a1d94296c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -525,14 +525,14 @@ class MainActivity : SimpleActivity(), NavigationListener { Thread { val events = dbHelper.getEventsToExport(exportPastEvents).filter { eventTypes.contains(it.eventType.toString()) } if (events.isEmpty()) { - toast(R.string.no_events_for_exporting) + toast(R.string.no_entries_for_exporting) } else { toast(R.string.exporting) IcsExporter().exportEvents(this, file, events as ArrayList) { toast(when (it) { - IcsExporter.ExportResult.EXPORT_OK -> R.string.events_exported_successfully - IcsExporter.ExportResult.EXPORT_PARTIAL -> R.string.exporting_some_events_failed - else -> R.string.exporting_events_failed + IcsExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful + IcsExporter.ExportResult.EXPORT_PARTIAL -> R.string.exporting_some_entries_failed + else -> R.string.exporting_failed }) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt index a0411d2cf..19e47ba21 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt @@ -53,9 +53,9 @@ class ImportEventsDialog(val activity: SimpleActivity, val path: String, val cal private fun handleParseResult(result: IcsImporter.ImportResult) { activity.toast(when (result) { - IMPORT_OK -> R.string.events_imported_successfully - IMPORT_PARTIAL -> R.string.importing_some_events_failed - else -> R.string.importing_events_failed + IMPORT_OK -> R.string.importing_successful + IMPORT_PARTIAL -> R.string.importing_some_entries_failed + else -> R.string.importing_failed }) callback(result != IMPORT_FAIL) } diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index 48cf58bf6..1894efd26 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -136,24 +136,14 @@ - Oc\'h enporzhiañ... - Oc\'h ezporzhiañ... Enporzhiañ darvoudoù Ezporzhiañ darvoudoù Enporzhiañ darvoudoù adalek ur restr .ics Ezporzhiañ darvoudoù betek ur restr .ics - Enporzhiet eo bet an darvoudoù gant berzh - Ezporzhiet eo bet an darvoudoù gant berzh - C\'hwitadenn en ur enporzhiañ an darvoudoù - C\'hwitadenn en ur ezporzhiañ an darvoudoù - C\'hwitadenn en ur enporzhiañ ul lodenn eus an darvoudoù - C\'hwitadenn en ur ezporzhiañ ul lodenn eus an darvoudoù Doare darvoud dre ziouer - N\'eus bet kavet darvoud ebet da enporzhiañ Ezporzhiañ an darvoudoù tremenet ivez Enkorfañ doareoù an darvoudoù ivez Anv ar restr (hep .ics) - Hep titl Titl diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e2cfdf25a..23562d2bc 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -143,24 +143,14 @@ - Importování… - Exportování… Import událostí Export událostí Importovat kalendář ze souboru .ics Exportovat kalendář do souboru .ics - Kalendář byl importován úspěšně - Kalendář byl exportován úspěšně - Import kalendáře se nezdařil - Export kalendáře se nezdařil - Import některých událostí se nezdařil - Export některých událostí se nezdařil Defaultní typ události - Nebyly nalezeny žádné události pro export Export i minulých událostí Zahrnout typy událostí Název souboru (bez .ics) - Bez názvu Název diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 470511047..9949d4c6b 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -136,24 +136,14 @@ - Importerer… - Eksporterer… Importer begivenheder Eksporter begivenheder Importer begivenheder fra en ics-fil Eksporter begivenheder til en ics-fil - Begivenhederne er importeret - Begivenhederne er eksporteret - Importen mislykkedes - Eksporten mislykkedes - Import af visse begivenheder mislykkedes - Eksport af visse begivenheder mislykkedes Standard type begivenhed - Der blev ikke fundet nogen begivenheder til eksport Eksporter også tidligere begivenheder Inkluder begivenhedstyper Filnavn (uden .ics) - Ingen titel Titel diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2a984408b..e16b7ddc3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -136,24 +136,14 @@ - Importiere… - Exportiere… Importiere Termine Exportiere Termine Importiere Termine aus .ics Datei Exportiere Termine als .ics Datei - Termine erfolgreich importiert - Termine erfolgreich exportiert - Termine importieren fehlgeschlagen - Termine exportieren fehlgeschlagen - Einige Termine wurden nicht erfolgreich importiert - Einige Termine wurden nicht erfolgreich exportiert Standard-Termin-Typ - Keine Termine zum exportieren gefunden Vergangene Termine auch exportieren Beziehe Termintypen mit ein Dateiname (ohne .ics) - Kein Titel Titel diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 14b08a02a..31921dc7d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -136,24 +136,14 @@ - Importando… - Exportando… Importar eventos Exportar eventos Importar eventos desde un archivo .ics Exportar eventos desde un archivo .ics - Eventos se han importado con éxito - Eventos se han exportado con éxito - Error al importar eventos - Error al exportar eventos - Error al importar algunos eventos - Error al exportar algunos eventos Tipo de evento predeterminado - No se han encontrado eventos para exportar Exportar también eventos pasados Incluir tipos de evento Nombre del archivo (sin .ics) - Sin título Título diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 618af0224..3aa9753ed 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -136,24 +136,14 @@ - Importer… - Exporter… Importer des événements Exporter des événements Importer des événements depuis un fichier .ics Exporter des événements vers un fichier .ics - Événements importés avec succès - Événements exportés avec succès - Import des événements échoué - Export des événements échoué - L\'import de certains événements a échoué - L\'export de certains événements a échoué Type d\'événement par défaut - Aucun événement trouvé pour export Exporter aussi les événements passés Inclure les types d\'événement Nom de fichier (sans .ics) - Pas de titre Titre diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 95d13bd51..1297a8f58 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -137,24 +137,14 @@ - Importing… - Exporting… Import events Export events Import events from an .ics file Export events to an .ics file - Events imported successfully - Events have been exported successfully - Importing events failed - Exporting events failed - Importing some events failed - Exporting some events failed Default event type - No events for exporting have been found Export past events too Include event types Filename (without .ics) - No title शीर्षक diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 0002df522..62c21a955 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -136,24 +136,14 @@ - Importing… - Exporting… Import events Export events Import events from an .ics file Export events to an .ics file - Events imported successfully - Events have been exported successfully - Importing events failed - Exporting events failed - Importing some events failed - Exporting some events failed Default event type - No events for exporting have been found Export past events too Include event types Filename (without .ics) - No title Név diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c41443f19..72c7fbe95 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -136,24 +136,14 @@ - Importing… - Exporting… Import events Export events Import events from an .ics file Export events to an .ics file - Events imported successfully - Events have been exported successfully - Importing events failed - Exporting events failed - Importing some events failed - Exporting some events failed Default event type - No events for exporting have been found Export past events too Include event types Filename (without .ics) - No title Titolo diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 9533493eb..78dc0907c 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -137,24 +137,14 @@ - Importing… - Exporting… ייבוא אירועים Export events Import events from an .ics file Export events to an .ics file - האירועים יובאו בהצלחה - Events have been exported successfully - Importing events failed - Exporting events failed - Importing some events failed - Exporting some events failed Default event type - No events for exporting have been found Export past events too Include event types Filename (without .ics) - No title כותרת diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ffec53f5d..38f7c5bb3 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -136,24 +136,14 @@ - Importing… - Exporting… Import events Export events Import events from an .ics file Export events to an .ics file - Events imported successfully - Events have been exported successfully - Importing events failed - Exporting events failed - Importing some events failed - Exporting some events failed Default event type - No events for exporting have been found Export past events too Include event types Filename (without .ics) - No title タイトル diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 347169fa4..8787397b6 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -136,24 +136,14 @@ - 가져 오는 중… - 내보내는 중… 이벤트들 가져 오기 이벤트들 내보내기 .ics 파일에서 이벤트들 가져오기 .ics 파일로 이벤트들 내보내기 - 이벤트들을 성공적으로 가져왔습니다 - 이벤트들을 성공적으로 내보냈습니다 - 이벤트들을 가져오는데 실패 - 이벤트들을 내보내는데 실패 - 일부 이벤트들을 가져오는데 실패 - 일부 이벤트들을 내보내는데 실패 기본 이벤트 유형 - 내보낼 이벤트가 없습니다 과거 이벤트들 내보내기 이벤트 유형 포함 파일이름 (.ics 없이) - 제목 없음 제목 diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b5a0465ce..874e22216 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -136,24 +136,14 @@ - Importerer… - Eksporterer… Importer hendelser Eksporter hendelser Importer hendelser fra en .ics-fil Eksporter hendelser til en .ics-fil - Hendelser er vellykket importert - Hendelser er vellykket eksportert - Importering av hendelser feilet - Eksportering av hendelser feilet - Importering av noen hendelser feilet - Eksportering av noen hendelser feilet Standard hendelsestype - Ingen hendelser for eksportering er funnet Eksporter fortidige hendelser også Inkluder hendelsestyper Filnavn (uten .ics) - Ingen tittel Tittel diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 02ce8951a..3341a156b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -136,24 +136,14 @@ - Importeren… - Exporteren… Afspraken importeren Afspraken exporteren Afspraken uit een .ics-bestand importeren Afspraken naar een .ics-bestand exporteren - Afspraken zijn geïmporteerd - Afspraken zijn geëxporteerd - Fout bij importeren van afspraken - Fout bij exporteren van afspraken - Sommige afspraken konden niet worden geïmporteerd - Sommige afspraken konden niet worden geëxporteerd Standaard afspraaktype - Geen te exporteren afspraken gevonden Afspraken uit verleden ook exporteren Afspraaktypes weergeven Bestandsnaam (zonder .ics) - Geen titel Titel diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 5ff39b084..4c36d4234 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -136,24 +136,14 @@ - Importerer… - Eksporterer… Importer hendelser Eksporter hendelser Importer hendelser fra en .ics-fil Eksporter hendelser til en .ics-fil - Hendelser er vellykket importert - Hendelser er vellykket eksportert - Importering av hendelser feilet - Eksportering av hendelser feilet - Importering av noen hendelser feilet - Eksportering av noen hendelser feilet Standard hendelsestype - Ingen hendelser for eksportering er funnet Eksporter fortidige hendelser også Inkluder hendelsestyper Filnavn (uten .ics) - Ingen tittel Tittel diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 3e8f92997..118d775b9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -141,24 +141,14 @@ - Importuję… - Eksportuję… Importuj wydarzenia Eksportuj wydarzenia Importuj wydarzenia z pliku .ics Eksportuj wydarzenia do pliku .ics - Wydarzenia zostały zaimportowane - Wydarzenia zostały wyeksportowane - Importowanie wydarzeń nie powiodło się - Eksportowanie wydarzeń nie powiodło się - Importowanie niektórych wydarzeń nie powiodło się - Eksportowanie niektórych wydarzeń nie powiodło się Domyślny typ wydarzenia - Nie znalazłem wydarzeń do wyeksportowania Eksportuj także wydarzenia z przeszłości Dołącz typy wydarzeń Nazwa pliku (bez końcówki \".ics\") - Brak tytułu Tytuł diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 656812e33..47931f0da 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -136,24 +136,14 @@ - Importing… - Exporting… Importar eventos Exportar eventos Importar eventos de um arquivo .ics Export events to an .ics file - Eventos importados com sucesso - Events have been exported successfully - Falha de importação - Exporting events failed - Alguns eventos não foram importados - Exporting some events failed Tipo de evento padrão - No events for exporting have been found Export past events too Include event types Filename (without .ics) - No title Título diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a2a71d7a4..af3ad87ed 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -136,24 +136,14 @@ - A importar… - A exportar… Importar eventos Exportar eventos Importar eventos de um ficheiro .ics Exportar eventos para um ficheiro .ics - Eventos importados com sucesso - Eventos exportados com sucesso - Falha de importação - Falha de exportação - Alguns eventos não foram importados - Alguns eventos não foram exportados Tipo de evento padrão - Não existem eventos para exportação Exportar eventos antigos Incluir tipos de eventos Nome do ficheiro (sem .ics) - Sem título Título diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1873a49a9..4a01fe348 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -150,24 +150,14 @@ - Импорт… - Экспорт… Импорт событий Экспорт событий Импорт событий из файла .ics Экспорт событий в файл .ics - События успешно импортированы - События успешно экспортированы - Не удалось импортировать события - Не удалось экспортировать события - Не удалось импортировать некоторые события - Не удалось экспортировать некоторые события Тип события по умолчанию - Не найдено событий для экспорта Экспортировать прошедшие события Включать типы событий Имя файла (без .ics) - Без заголовка Заголовок diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index ef7a29fc3..c8c124389 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -143,24 +143,14 @@ - Importujem… - Exportujem… Importovať udalosti Exportovať udalosti Importovať udalosti z .ics súboru Exportovať udalosti do .ics súboru - Udalosti boli úspešne importované - Udalosti boli úspešne exportované - Importovanie udalostí zlyhalo - Exportovanie udalostí zlyhalo - Importovanie niektorých udalostí zlyhalo - Exportovanie niektorých udalostí zlyhalo Predvolený typ udalosti - Nenašli sa žiadne udalosti na exportovanie Exportovať aj minulé udalosti Zahrnúť typy udalostí Názov súboru (bez .ics) - Bez názvu Názov diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a401834d5..c42e90257 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -136,24 +136,14 @@ - Importerar… - Exporterar… Importera händelser Exportera händelser Importera händelser från en .ics-fil Exportera händelser till en .ics-fil - Händelser har importerats - Händelser har exporterats - Händelser kunde inte importeras - Händelser kunde inte exporteras - Vissa händelser kunde inte importeras - Vissa händelser kunde inte exporteras Standardhändelsetyp - Inga händelser har hittats för exportering Exportera även tidigare händelser Inkludera händelsetyper Filnamn (utan .ics) - Ingen titel Titel diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index dba5b2d2b..9dad077ff 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -136,24 +136,14 @@ - Importing… - Exporting… Olayları içe aktar Olayları dışa aktar Bir .ics dosyasından olayları içe aktar Etkinlikleri bir .ics dosyasına aktarın - Olaylar başarıyla içe aktarıldı - Olaylar başarıyla dışa aktarıldı - Etkinlikler içe aktarma başarısız - Olayları dışa aktarma başarısız - Bazı etkinlikleri içe aktarma başarısız - Bazı etkinlikleri dışa aktarma başarısız Varsayılan olay türü - Dışa aktarmak için etkinlik bulunamadı Geçmişteki etkinlikleri de dışa aktar Include event types Filename (without .ics) - No title Başlık diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aa89180c3..7c1c27b32 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -136,24 +136,14 @@ - Importing… - Exporting… Import events Export events Import events from an .ics file Export events to an .ics file - Events have been imported successfully - Events have been exported successfully - Importing events failed - Exporting events failed - Importing some events failed - Exporting some events failed Default event type - No events for exporting have been found Export past events too Include event types Filename (without .ics) - No title Title