Merge remote-tracking branch 'origin/fix_edit_future_occurrences' into fix_edit_future_occurrences
This commit is contained in:
commit
04cc2b5371
3 changed files with 7 additions and 7 deletions
|
@ -70,7 +70,7 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'com.github.SimpleMobileTools:Simple-Commons:8da9e09034'
|
implementation 'com.github.SimpleMobileTools:Simple-Commons:4c83ec8740'
|
||||||
implementation 'androidx.multidex:multidex:2.0.1'
|
implementation 'androidx.multidex:multidex:2.0.1'
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
||||||
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
|
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<string name="monthly_daily_view">Monthly + daily view</string>
|
<string name="monthly_daily_view">Monthly + daily view</string>
|
||||||
<string name="yearly_view">Tampilan tahun</string>
|
<string name="yearly_view">Tampilan tahun</string>
|
||||||
<string name="simple_event_list">Daftar acara</string>
|
<string name="simple_event_list">Daftar acara</string>
|
||||||
<string name="no_upcoming_events">No upcoming events.</string>
|
<string name="no_upcoming_events">Tidak ada acara mendatang.</string>
|
||||||
<string name="go_to_today">Buka hari ini</string>
|
<string name="go_to_today">Buka hari ini</string>
|
||||||
<string name="go_to_date">Buka tanggal</string>
|
<string name="go_to_date">Buka tanggal</string>
|
||||||
<!-- Widget titles -->
|
<!-- Widget titles -->
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
<string name="duplicate_task">Gandakan tugas</string>
|
<string name="duplicate_task">Gandakan tugas</string>
|
||||||
<string name="mark_completed">Tandai sebagai selesai</string>
|
<string name="mark_completed">Tandai sebagai selesai</string>
|
||||||
<string name="mark_incomplete">Tandai sebagai belum selesai</string>
|
<string name="mark_incomplete">Tandai sebagai belum selesai</string>
|
||||||
<string name="task_color">Task color</string>
|
<string name="task_color">Warna tugas</string>
|
||||||
<!-- Event Repetition -->
|
<!-- Event Repetition -->
|
||||||
<string name="repetition">Perulangan</string>
|
<string name="repetition">Perulangan</string>
|
||||||
<string name="no_repetition">Tidak ada perulangan</string>
|
<string name="no_repetition">Tidak ada perulangan</string>
|
||||||
|
@ -181,7 +181,7 @@
|
||||||
<string name="replace_description_with_location">Ganti deskripsi acara dengan lokasi</string>
|
<string name="replace_description_with_location">Ganti deskripsi acara dengan lokasi</string>
|
||||||
<string name="display_description_or_location">Tampilkan deskripsi atau lokasi</string>
|
<string name="display_description_or_location">Tampilkan deskripsi atau lokasi</string>
|
||||||
<string name="delete_all_events">Hapus semua acara</string>
|
<string name="delete_all_events">Hapus semua acara</string>
|
||||||
<string name="delete_all_events_and_tasks">Delete all events and tasks</string>
|
<string name="delete_all_events_and_tasks">Hapus semua acara dan catatan</string>
|
||||||
<string name="delete_all_events_confirmation">Apakah Anda yakin ingin menghapus semua acara dan tugas\? Tindakan ini tidak akan menghapus kategori dan pengaturan lainnya.</string>
|
<string name="delete_all_events_confirmation">Apakah Anda yakin ingin menghapus semua acara dan tugas\? Tindakan ini tidak akan menghapus kategori dan pengaturan lainnya.</string>
|
||||||
<string name="show_a_grid">Tampilkan grid</string>
|
<string name="show_a_grid">Tampilkan grid</string>
|
||||||
<string name="loop_reminders">Ulangi pengingat sampai dihentikan</string>
|
<string name="loop_reminders">Ulangi pengingat sampai dihentikan</string>
|
||||||
|
@ -282,4 +282,4 @@
|
||||||
Haven't found some strings? There's more at
|
Haven't found some strings? There's more at
|
||||||
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
|
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
|
||||||
-->
|
-->
|
||||||
</resources>
|
</resources>
|
|
@ -5,7 +5,7 @@ buildscript {
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
jcenter()
|
mavenCentral()
|
||||||
maven { url "https://plugins.gradle.org/m2" }
|
maven { url "https://plugins.gradle.org/m2" }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ buildscript {
|
||||||
allprojects {
|
allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
jcenter()
|
mavenCentral()
|
||||||
maven { url "https://jitpack.io" }
|
maven { url "https://jitpack.io" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue