diff --git a/README.md b/README.md
index fe71c69d5..81a849b5d 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,11 @@
 
 A simple calendar with events and a customizable widget.
 
-An offline calendar without any other calendar integration. You can easily create recurring events and setup reminders, it can also display week numbers.
+A simple calendar with optional CalDAV synchronization. You can easily create recurring events and setup reminders, it can also display week numbers.
 
-Contains a resizable 4x4 widget where you can customize the color of the text, as well as the alpha and the color of the background.
+Contains a monthly view and an event list widget where you can customize the color of the text, as well as the alpha and the color of the background.
 
-Contains no ads or unnecessary permissions. It is fully open-source, provides customizable colors.
+Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors.
 
 The Storage permission is needed only for exporting or importing events from .ics files.
 
diff --git a/app/build.gradle b/app/build.gradle
index 2da62d372..e8c358022 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,7 +46,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:4.1.7'
+    implementation 'com.simplemobiletools:commons:4.3.27'
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'com.facebook.stetho:stetho:1.5.0'
     implementation 'com.android.support:multidex:1.0.3'
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index 42eef0c2d..a6894ada9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -17,6 +17,7 @@ import com.simplemobiletools.calendar.helpers.*
 import com.simplemobiletools.calendar.helpers.Formatter
 import com.simplemobiletools.calendar.models.CalDAVCalendar
 import com.simplemobiletools.calendar.models.Event
+import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
@@ -101,7 +102,17 @@ class EventActivity : SimpleActivity() {
         event_repetition_rule_holder.setOnClickListener { showRepetitionRuleDialog() }
         event_repetition_limit_holder.setOnClickListener { showRepetitionTypePicker() }
 
-        event_reminder_1.setOnClickListener { showReminder1Dialog() }
+        event_reminder_1.setOnClickListener {
+            if (config.wasAlarmWarningShown) {
+                showReminder1Dialog()
+            } else {
+                ConfirmationDialog(this, messageId = R.string.reminder_warning, positive = R.string.ok, negative = 0) {
+                    config.wasAlarmWarningShown = true
+                    showReminder1Dialog()
+                }
+            }
+        }
+
         event_reminder_2.setOnClickListener { showReminder2Dialog() }
         event_reminder_3.setOnClickListener { showReminder3Dialog() }
 
@@ -146,7 +157,9 @@ class EventActivity : SimpleActivity() {
         event_title.setText(mEvent.title)
         event_location.setText(mEvent.location)
         event_description.setText(mEvent.description)
-        event_description.movementMethod = LinkMovementMethod.getInstance()
+        if (event_description.value.isNotEmpty()) {
+            event_description.movementMethod = LinkMovementMethod.getInstance()
+        }
 
         mReminder1Minutes = mEvent.reminder1Minutes
         mReminder2Minutes = mEvent.reminder2Minutes
@@ -175,7 +188,9 @@ class EventActivity : SimpleActivity() {
             event_title.setText(intent.getStringExtra("title"))
             event_location.setText(intent.getStringExtra("eventLocation"))
             event_description.setText(intent.getStringExtra("description"))
-            event_description.movementMethod = LinkMovementMethod.getInstance()
+            if (event_description.value.isNotEmpty()) {
+                event_description.movementMethod = LinkMovementMethod.getInstance()
+            }
         } else {
             val startTS = intent.getIntExtra(NEW_EVENT_START_TS, 0)
             val dateTime = Formatter.getDateTimeFromTS(startTS)
@@ -616,9 +631,9 @@ class EventActivity : SimpleActivity() {
         }
 
         val reminders = sortedSetOf(mReminder1Minutes, mReminder2Minutes, mReminder3Minutes).filter { it != REMINDER_OFF }
-        val reminder1 = reminders.getOrElse(0, { REMINDER_OFF })
-        val reminder2 = reminders.getOrElse(1, { REMINDER_OFF })
-        val reminder3 = reminders.getOrElse(2, { REMINDER_OFF })
+        val reminder1 = reminders.getOrElse(0) { REMINDER_OFF }
+        val reminder2 = reminders.getOrElse(1) { REMINDER_OFF }
+        val reminder3 = reminders.getOrElse(2) { REMINDER_OFF }
 
         config.apply {
             defaultReminderMinutes = reminder1
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
index df198de7a..0e7f12da2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
@@ -58,6 +58,7 @@ class SettingsActivity : SimpleActivity() {
         setupWeeklyEnd()
         setupVibrate()
         setupReminderSound()
+        setupReminderAudioStream()
         setupUseSameSnooze()
         setupLoopReminders()
         setupSnoozeTime()
@@ -295,7 +296,7 @@ class SettingsActivity : SimpleActivity() {
         settings_reminder_sound.text = config.reminderSoundTitle
 
         settings_reminder_sound_holder.setOnClickListener {
-            SelectAlarmSoundDialog(this, config.reminderSoundUri, AudioManager.STREAM_ALARM, GET_RINGTONE_URI, ALARM_SOUND_TYPE_NOTIFICATION, false,
+            SelectAlarmSoundDialog(this, config.reminderSoundUri, config.reminderAudioStream, GET_RINGTONE_URI, ALARM_SOUND_TYPE_NOTIFICATION, false,
                     onAlarmPicked = {
                         if (it != null) {
                             updateReminderSound(it)
@@ -315,6 +316,27 @@ class SettingsActivity : SimpleActivity() {
         settings_reminder_sound.text = alarmSound.title
     }
 
+    private fun setupReminderAudioStream() {
+        settings_reminder_audio_stream.text = getAudioStreamText()
+        settings_reminder_audio_stream_holder.setOnClickListener {
+            val items = arrayListOf(
+                    RadioItem(AudioManager.STREAM_ALARM, res.getString(R.string.alarm_stream)),
+                    RadioItem(AudioManager.STREAM_SYSTEM, res.getString(R.string.system_stream)),
+                    RadioItem(AudioManager.STREAM_NOTIFICATION, res.getString(R.string.notification_stream)))
+
+            RadioGroupDialog(this@SettingsActivity, items, config.reminderAudioStream) {
+                config.reminderAudioStream = it as Int
+                settings_reminder_audio_stream.text = getAudioStreamText()
+            }
+        }
+    }
+
+    private fun getAudioStreamText() = getString(when (config.reminderAudioStream) {
+        AudioManager.STREAM_ALARM -> R.string.alarm_stream
+        AudioManager.STREAM_SYSTEM -> R.string.system_stream
+        else -> R.string.notification_stream
+    })
+
     private fun setupVibrate() {
         settings_vibrate.isChecked = config.vibrateOnReminder
         settings_vibrate_holder.setOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt
index aa949f3ab..2bd308693 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt
@@ -36,10 +36,10 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList<Event>, r
 
     override fun prepareActionMode(menu: Menu) {}
 
-    override fun prepareItemSelection(view: View) {}
+    override fun prepareItemSelection(viewHolder: ViewHolder) {}
 
-    override fun markItemSelection(select: Boolean, view: View?) {
-        view?.event_item_frame?.isSelected = select
+    override fun markViewHolderSelection(select: Boolean, viewHolder: ViewHolder?) {
+        viewHolder?.itemView?.event_item_frame?.isSelected = select
     }
 
     override fun actionItemPressed(id: Int) {
@@ -51,11 +51,13 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList<Event>, r
 
     override fun getSelectableItemCount() = events.size
 
+    override fun getIsItemSelectable(position: Int) = true
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.event_item_day_view, parent)
 
     override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
         val event = events[position]
-        val view = holder.bindView(event) { itemView, layoutPosition ->
+        val view = holder.bindView(event, true, true) { itemView, layoutPosition ->
             setupView(itemView, event)
         }
         bindViewHolder(holder, position, view)
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt
index c9aa81d38..43cda31b9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt
@@ -62,10 +62,10 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList<ListIt
 
     override fun prepareActionMode(menu: Menu) {}
 
-    override fun prepareItemSelection(view: View) {}
+    override fun prepareItemSelection(viewHolder: ViewHolder) {}
 
-    override fun markItemSelection(select: Boolean, view: View?) {
-        view?.event_item_frame?.isSelected = select
+    override fun markViewHolderSelection(select: Boolean, viewHolder: ViewHolder?) {
+        viewHolder?.itemView?.event_item_frame?.isSelected = select
     }
 
     override fun actionItemPressed(id: Int) {
@@ -77,6 +77,8 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList<ListIt
 
     override fun getSelectableItemCount() = listItems.filter { it is ListEvent }.size
 
+    override fun getIsItemSelectable(position: Int) = listItems[position] is ListEvent
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyRecyclerViewAdapter.ViewHolder {
         val layoutId = when (viewType) {
             ITEM_EVENT -> R.layout.event_list_item
@@ -88,7 +90,7 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList<ListIt
 
     override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
         val listItem = listItems[position]
-        val view = holder.bindView(listItem, allowLongClick) { itemView, layoutPosition ->
+        val view = holder.bindView(listItem, true, allowLongClick) { itemView, layoutPosition ->
             if (listItem is ListSection) {
                 setupListSection(itemView, listItem, position)
             } else if (listItem is ListEvent) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt
index 97553d605..d8fcf08bb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt
@@ -31,10 +31,10 @@ class ManageEventTypesAdapter(activity: SimpleActivity, val eventTypes: ArrayLis
 
     override fun prepareActionMode(menu: Menu) {}
 
-    override fun prepareItemSelection(view: View) {}
+    override fun prepareItemSelection(viewHolder: ViewHolder) {}
 
-    override fun markItemSelection(select: Boolean, view: View?) {
-        view?.event_item_frame?.isSelected = select
+    override fun markViewHolderSelection(select: Boolean, viewHolder: ViewHolder?) {
+        viewHolder?.itemView?.event_item_frame?.isSelected = select
     }
 
     override fun actionItemPressed(id: Int) {
@@ -45,11 +45,13 @@ class ManageEventTypesAdapter(activity: SimpleActivity, val eventTypes: ArrayLis
 
     override fun getSelectableItemCount() = eventTypes.size
 
+    override fun getIsItemSelectable(position: Int) = true
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_event_type, parent)
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val eventType = eventTypes[position]
-        val view = holder.bindView(eventType) { itemView, layoutPosition ->
+        val view = holder.bindView(eventType, true, true) { itemView, layoutPosition ->
             setupView(itemView, eventType)
         }
         bindViewHolder(holder, position, view)
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
index 4a0319c3c..c9b2a6f46 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
@@ -11,7 +11,6 @@ import android.content.Intent
 import android.content.res.Resources
 import android.database.ContentObserver
 import android.media.AudioAttributes
-import android.media.AudioManager
 import android.net.Uri
 import android.os.Bundle
 import android.provider.CalendarContract
@@ -200,7 +199,7 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
         val audioAttributes = AudioAttributes.Builder()
                 .setUsage(AudioAttributes.USAGE_ALARM)
                 .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                .setLegacyStreamType(AudioManager.STREAM_ALARM)
+                .setLegacyStreamType(config.reminderAudioStream)
                 .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED)
                 .build()
 
@@ -228,7 +227,7 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
             .setPriority(NotificationCompat.PRIORITY_MAX)
             .setDefaults(Notification.DEFAULT_LIGHTS)
             .setAutoCancel(true)
-            .setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM)
+            .setSound(Uri.parse(soundUri), config.reminderAudioStream)
             .setChannelId(channelId)
             .addAction(R.drawable.ic_snooze, getString(R.string.snooze), getSnoozePendingIntent(this, event))
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
index 4e80731a5..a5d17c122 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
@@ -1,6 +1,7 @@
 package com.simplemobiletools.calendar.helpers
 
 import android.content.Context
+import android.media.AudioManager
 import com.simplemobiletools.calendar.R
 import com.simplemobiletools.calendar.extensions.scheduleCalDAVSync
 import com.simplemobiletools.commons.extensions.getDefaultAlarmTitle
@@ -94,6 +95,10 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getInt(LAST_USED_LOCAL_EVENT_TYPE_ID, DBHelper.REGULAR_EVENT_TYPE_ID)
         set(lastUsedLocalEventTypeId) = prefs.edit().putInt(LAST_USED_LOCAL_EVENT_TYPE_ID, lastUsedLocalEventTypeId).apply()
 
+    var reminderAudioStream: Int
+        get() = prefs.getInt(REMINDER_AUDIO_STREAM, AudioManager.STREAM_ALARM)
+        set(reminderAudioStream) = prefs.edit().putInt(REMINDER_AUDIO_STREAM, reminderAudioStream).apply()
+
     var replaceDescription: Boolean
         get() = prefs.getBoolean(REPLACE_DESCRIPTION, false)
         set(replaceDescription) = prefs.edit().putBoolean(REPLACE_DESCRIPTION, replaceDescription).apply()
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
index cfcf35e2f..3107f0e96 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
@@ -53,6 +53,7 @@ const val LOOP_REMINDERS = "loop_reminders"
 const val DIM_PAST_EVENTS = "dim_past_events"
 const val LAST_SOUND_URI = "last_sound_uri"
 const val LAST_REMINDER_CHANNEL_ID = "last_reminder_channel_ID"
+const val REMINDER_AUDIO_STREAM = "reminder_audio_stream"
 
 // repeat_rule for monthly and yearly repetition
 const val REPEAT_SAME_DAY = 1                           // i.e. 25th every month, or 3rd june (if yearly repetition)
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthView.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthView.kt
index 6cf0494ce..39ed95476 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthView.kt
@@ -124,7 +124,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
         }
 
         addWeekDayLetters(canvas)
-        if (showWeekNumbers) {
+        if (showWeekNumbers && days.isNotEmpty()) {
             addWeekNumbers(canvas)
         }
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 1cbb9b137..1fd52386b 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -246,6 +246,40 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/settings_reminder_audio_stream_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:paddingBottom="@dimen/activity_margin"
+            android:paddingLeft="@dimen/normal_margin"
+            android:paddingRight="@dimen/normal_margin"
+            android:paddingTop="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_reminder_audio_stream_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/settings_reminder_audio_stream"
+                android:layout_toStartOf="@+id/settings_reminder_audio_stream"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingRight="@dimen/medium_margin"
+                android:text="@string/reminder_stream"/>
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_reminder_audio_stream"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginEnd="@dimen/small_margin"
+                android:layout_marginRight="@dimen/small_margin"
+                android:background="@null"
+                android:clickable="false"/>
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/settings_use_same_snooze_holder"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index fca53db25..db21c0533 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 383383936..4f30c4e7c 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 27a2dbd41..2bb24c6a0 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index aba991e5c..4e8da2128 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Fortsæt påmindelser indtil jeg stopper dem</string>
     <string name="dim_past_events">Nedton gamle begivenheder</string>
     <string name="events">Begivenheder</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1809832c8..93798cbea 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Erinnerungen wiederholen bis sie verworfen werden</string>
     <string name="dim_past_events">Vergangene Termine ausgrauen</string>
     <string name="events">Termine</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 48add30eb..ba2b0af9c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 02462868c..5e5a4bbc4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Boucles de rappel jusqu\'à ce qu\'il soit rejeté</string>
     <string name="dim_past_events">Diminuer l\'affichage des événements passés</string>
     <string name="events">Evénements</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 1559926d4..516ca0c06 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index ce50644eb..103cd4ec0 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -160,6 +160,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 836667195..3da823e2b 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index ac2a39aec..2137739fb 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 704a30c9c..586bd010e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 00fdcd70c..7d09cba56 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -160,6 +160,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 44358fbf6..48b87be10 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -3,30 +3,30 @@
     <string name="app_name">シンプル カレンダー</string>
     <string name="app_launcher_name">カレンダー</string>
     <string name="change_view">ビューの変更</string>
-    <string name="daily_view">Daily view</string>
-    <string name="weekly_view">Weekly view</string>
-    <string name="monthly_view">月ビュー</string>
-    <string name="yearly_view">年ビュー</string>
-    <string name="simple_event_list">シンプル イベント リスト</string>
-    <string name="no_upcoming_events">Seems like you don\'t have any upcoming events.</string>
-    <string name="go_to_today">Go to today</string>
+    <string name="daily_view">日</string>
+    <string name="weekly_view">週</string>
+    <string name="monthly_view">月</string>
+    <string name="yearly_view">年</string>
+    <string name="simple_event_list">シンプル 予定 リスト</string>
+    <string name="no_upcoming_events">今後の予定はありません。</string>
+    <string name="go_to_today">今日へ移動</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">カレンダー月</string>
-    <string name="widget_list">カレンダー イベント リスト</string>
+    <string name="widget_list">カレンダー 予定 リスト</string>
 
     <!-- Event -->
-    <string name="event">イベント</string>
-    <string name="edit_event">イベントを編集</string>
-    <string name="new_event">新しいイベント</string>
-    <string name="create_new_event">Create a new event</string>
-    <string name="duplicate_event">Duplicate event</string>
+    <string name="event">予定</string>
+    <string name="edit_event">予定を編集</string>
+    <string name="new_event">新しい予定</string>
+    <string name="create_new_event">新しい予定を作成</string>
+    <string name="duplicate_event">予定を複製</string>
     <string name="title_empty">タイトルは空にできません</string>
-    <string name="end_before_start">イベントの終了は開始よりも前にできません</string>
-    <string name="event_added">イベントを正常に追加しました</string>
-    <string name="event_updated">イベントを正常に更新しました</string>
-    <string name="filter_events_by_type">Filter events by type</string>
-    <string name="please_fill_location">Please fill in a location to be shown on a map</string>
+    <string name="end_before_start">予定の終了は開始よりも前にできません</string>
+    <string name="event_added">予定を正常に追加しました</string>
+    <string name="event_updated">予定を正常に更新しました</string>
+    <string name="filter_events_by_type">種類によって予定をフィルタリング</string>
+    <string name="please_fill_location">地図上に表示する場所を入力してください</string>
     <string name="public_event_notification_text">An event is upcoming</string>
 
     <!-- Event Repetition -->
@@ -36,9 +36,9 @@
     <string name="weekly">毎週</string>
     <string name="monthly">毎月</string>
     <string name="yearly">毎年</string>
-    <string name="weeks_raw">weeks</string>
-    <string name="months_raw">months</string>
-    <string name="years_raw">years</string>
+    <string name="weeks_raw">週</string>
+    <string name="months_raw">月</string>
+    <string name="years_raw">年</string>
     <string name="repeat_till">Repeat till</string>
     <string name="forever">Forever</string>
     <string name="event_is_repeatable">The event is repeatable</string>
@@ -80,52 +80,52 @@
     <string name="last_f">last</string>
 
     <!-- Birthdays -->
-    <string name="birthdays">Birthdays</string>
-    <string name="add_birthdays">Add contact birthdays</string>
-    <string name="no_birthdays">No birthdays have been found</string>
-    <string name="birthdays_added">Birthdays added successfully</string>
+    <string name="birthdays">誕生日</string>
+    <string name="add_birthdays">連絡先の誕生日を追加</string>
+    <string name="no_birthdays">誕生日は見つかりませんでした</string>
+    <string name="birthdays_added">誕生日が正常に追加されました</string>
 
     <!-- Anniversaries -->
-    <string name="anniversaries">Anniversaries</string>
-    <string name="add_anniversaries">Add contact anniversaries</string>
-    <string name="no_anniversaries">No anniversaries have been found</string>
-    <string name="anniversaries_added">Anniversaries added successfully</string>
+    <string name="anniversaries">記念日</string>
+    <string name="add_anniversaries">連絡先の記念日を追加</string>
+    <string name="no_anniversaries">記念日は見つかりませんでした</string>
+    <string name="anniversaries_added">記念日が正常に追加されました</string>
 
     <!-- Event Reminders -->
     <string name="reminder">リマインダー</string>
     <string name="before">前</string>
     <string name="add_another_reminder">Add another reminder</string>
-    <string name="event_reminders">Event reminders</string>
+    <string name="event_reminders">予定のリマインダー</string>
 
     <!-- Export / Import -->
-    <string name="import_events">Import events</string>
-    <string name="export_events">Export events</string>
-    <string name="import_events_from_ics">Import events from an .ics file</string>
-    <string name="export_events_to_ics">Export events to an .ics file</string>
-    <string name="default_event_type">Default event type</string>
-    <string name="export_past_events_too">Export past events too</string>
-    <string name="include_event_types">Include event types</string>
-    <string name="filename_without_ics">Filename (without .ics)</string>
-    <string name="override_event_types">Override event types in the file</string>
+    <string name="import_events">予定をインポート</string>
+    <string name="export_events">予定をエクスポート</string>
+    <string name="import_events_from_ics">.ics ファイルから予定をインポートする</string>
+    <string name="export_events_to_ics">.ics ファイルに予定をエクスポートする</string>
+    <string name="default_event_type">既定の予定の種類</string>
+    <string name="export_past_events_too">過去の予定もエクスポートする</string>
+    <string name="include_event_types">予定の種類を含める</string>
+    <string name="filename_without_ics">ファイル名 (.ics を除く)</string>
+    <string name="override_event_types">ファイル内の予定の種類を上書きする</string>
 
     <!-- Event details -->
     <string name="title">タイトル</string>
-    <string name="location">Location</string>
+    <string name="location">場所</string>
     <string name="description">説明</string>
-    <string name="all_day">All-day</string>
+    <string name="all_day">終日</string>
 
     <!-- Weekly view -->
-    <string name="week">Week</string>
+    <string name="week">週</string>
 
     <!-- Event types -->
-    <string name="event_types">Event types</string>
-    <string name="add_new_type">Add a new type</string>
-    <string name="edit_type">Edit type</string>
-    <string name="type_already_exists">Type with this title already exists</string>
-    <string name="color">Color</string>
-    <string name="regular_event">Regular event</string>
+    <string name="event_types">予定の種類</string>
+    <string name="add_new_type">新しい種類を追加</string>
+    <string name="edit_type">種類を編集</string>
+    <string name="type_already_exists">このタイトルの種類は既に存在します</string>
+    <string name="color">色</string>
+    <string name="regular_event">通常の予定</string>
     <string name="cannot_delete_default_type">Default event type cannot be deleted</string>
-    <string name="select_event_type">Select an event type</string>
+    <string name="select_event_type">予定の種類を選択</string>
     <string name="move_events_into_default">Move affected events into the default event type</string>
     <string name="remove_affected_events">Permanently remove affected events</string>
     <string name="unsync_caldav_calendar">To remove a CalDAV calendar you have to unsynchronize it</string>
@@ -140,7 +140,7 @@
     <string name="importing_holidays_failed">Importing holidays failed</string>
 
     <!-- Settings -->
-    <string name="manage_event_types">Manage event types</string>
+    <string name="manage_event_types">予定の種類を管理</string>
     <string name="start_day_at">Start day at</string>
     <string name="end_day_at">End day at</string>
     <string name="week_numbers">週番号を表示</string>
@@ -157,20 +157,24 @@
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
     <string name="show_a_grid">Show a grid</string>
     <string name="loop_reminders">Loop reminders until dismissed</string>
-    <string name="dim_past_events">Dim past events</string>
-    <string name="events">Events</string>
+    <string name="dim_past_events">過去の予定を薄い色で表示</string>
+    <string name="events">予定</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
-    <string name="select_caldav_calendars">Select calendars to sync</string>
-    <string name="manage_synced_calendars">Manage synced calendars</string>
-    <string name="store_locally_only">Store locally only</string>
-    <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
-    <string name="refreshing">Refreshing…</string>
-    <string name="refreshing_complete">Refreshing complete</string>
-    <string name="editing_calendar_failed">Editing calendar failed</string>
-    <string name="syncing">Syncing…</string>
-    <string name="synchronization_completed">Sync completed</string>
+    <string name="select_caldav_calendars">同期するカレンダーを選択</string>
+    <string name="manage_synced_calendars">同期したカレンダーの管理</string>
+    <string name="store_locally_only">端末内にのみ保存</string>
+    <string name="refresh_caldav_calendars">CalDAVカレンダーを更新</string>
+    <string name="refreshing">更新中…</string>
+    <string name="refreshing_complete">更新が完了しました</string>
+    <string name="editing_calendar_failed">カレンダーを編集できませんでした</string>
+    <string name="syncing">同期中…</string>
+    <string name="synchronization_completed">同期が完了しました</string>
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every last Sunday" -->
@@ -202,17 +206,17 @@
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
-    <string name="app_short_description">イベント、カスタマイズ可能なウィジェットのあるシンプルなカレンダー。広告はありません。</string>
+    <string name="app_short_description">予定、カスタマイズ可能なウィジェットのあるシンプルなカレンダー。広告はありません。</string>
     <string name="app_long_description">
-        他のカレンダーとは統合されていないオフラインカレンダー。 簡単に定期的なイベントを作成し、リマインダーを設定することができます。また、週番号も表示することができます。
+        CalDAVとの同期オプションも備えた、シンプルなカレンダー。 簡単に定期的な予定を作成し、リマインダーを設定することができます。また、週番号も表示することができます。
 
-        サイズ変更が可能な 4x4 ウィジェットが含まれており、文字の色や背景のアルファや色をカスタマイズすることができます。
+        サイズ変更が可能な 4x4 ウィジェットが含まれており、文字色や背景色、透明度をカスタマイズすることができます。
 
-        広告や不要なアクセス許可は含まれていません。 完全にオープンソースで、ダークテーマも提供しています。
+        広告や不要なアクセス権限は含まれていません。 完全にオープンソースで、ダークテーマも提供しています。
 
-        The Storage permission is needed only for exporting or importing events from .ics files.
+        ストレージへのアクセス権限は、.icsファイルから予定をインポート/エクスポートするために必要です。
 
-        The Contacts permission is used only at importing contact birthdays and anniversaries.
+        連絡先へのアクセス権限は、誕生日や記念日をインポートするために必要です。
 
         このアプリは、大きな一連のアプリの一つです。 他のアプリは https://www.simplemobiletools.com で見つけることができます
     </string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ad792ac2e..991b68727 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 288fd384e..5557925a6 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 06dde0ddc..462b718b3 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Gjenta påminnelser inntil avvist</string>
     <string name="dim_past_events">Dim tidligere hendelser</string>
     <string name="events">Hendelser</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 535b4cf99..20a43670a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Herinneringen blijven herhalen totdat ze zijn uitgezet</string>
     <string name="dim_past_events">Afgelopen afspraken dimmen</string>
     <string name="events">Afspraken</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 193a20550..390dd1ee2 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 23ce2b7a4..5d9508508 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Prosty Kalendarz</string>
-    <string name="app_launcher_name">Prosty Kalendarz</string>
+    <string name="app_name">Prosty kalendarz</string>
+    <string name="app_launcher_name">Prosty kalendarz</string>
     <string name="change_view">Zmień widok</string>
     <string name="daily_view">Dzień</string>
     <string name="weekly_view">Tydzień</string>
@@ -19,15 +19,15 @@
     <string name="event">Wydarzenie</string>
     <string name="edit_event">Edytuj wydarzenie</string>
     <string name="new_event">Nowe wydarzenie</string>
-    <string name="create_new_event">Create a new event</string>
-    <string name="duplicate_event">Duplicate event</string>
+    <string name="create_new_event">Utwórz nowe wydarzenie</string>
+    <string name="duplicate_event">Skopiuj wydarzenie</string>
     <string name="title_empty">Tytuł nie może być pusty</string>
     <string name="end_before_start">Wydarzenie nie może zakończyć się wcześniej, niż się zaczyna</string>
     <string name="event_added">Wydarzenie zostało dodane</string>
     <string name="event_updated">Wydarzenie zostało zaktualizowane</string>
     <string name="filter_events_by_type">Filtruj wydarzenia według typu</string>
     <string name="please_fill_location">Wpisz lokalizację, która ma być pokazana na mapie</string>
-    <string name="public_event_notification_text">An event is upcoming</string>
+    <string name="public_event_notification_text">Nadchodzi wydarzenie</string>
 
     <!-- Event Repetition -->
     <string name="repetition">Powtórzenie</string>
@@ -44,7 +44,7 @@
     <string name="event_is_repeatable">Wydarzenie jest powtarzalne</string>
     <string name="selection_contains_repetition">Wybór zawiera powtarzające się wydarzenia</string>
     <string name="delete_one_only">Usuń tylko wybrane wystąpienie</string>
-    <string name="delete_future_occurrences">Delete this and all future occurrences</string>
+    <string name="delete_future_occurrences">Usuń to i wyszystkie przyszłe wystąpienia</string>
     <string name="delete_all_occurrences">Usuń wszystkie wystąpienia</string>
     <string name="update_one_only">Zaktualizuj tylko wybrane wystąpienia</string>
     <string name="update_all_occurrences">Zaktualizuj wszystkie wystąpienia</string>
@@ -106,7 +106,7 @@
     <string name="export_past_events_too">Eksportuj także wydarzenia z przeszłości</string>
     <string name="include_event_types">Dołącz typy wydarzeń</string>
     <string name="filename_without_ics">Nazwa pliku (bez końcówki \".ics\")</string>
-    <string name="override_event_types">Override event types in the file</string>
+    <string name="override_event_types">Nadpisz typy wydarzeń w pliku</string>
 
     <!-- Event details -->
     <string name="title">Tytuł</string>
@@ -135,7 +135,7 @@
     <string name="add_holidays">Dodaj święto</string>
     <string name="national_holidays">Święta państwowe</string>
     <string name="religious_holidays">Święta religijne</string>
-    <string name="holidays_imported_successfully">Holidays have been successfully imported into the \"Holidays\" event type</string>
+    <string name="holidays_imported_successfully">Święta zostały pomyślnie zaimportowane do kategorii wydarzeń \"Święta\"</string>
     <string name="importing_some_holidays_failed">Importowanie niektórych świąt nie powiodło się</string>
     <string name="importing_holidays_failed">Importowanie świąt nie powiodło się</string>
 
@@ -155,10 +155,14 @@
     <string name="replace_description_with_location">Zamieniaj opis wydarzenia na lokalizację</string>
     <string name="delete_all_events">Usuń wszystkie wydarzenia</string>
     <string name="delete_all_events_confirmation">Czy na pewno mam usunąć wszystkie wydarzenia? Nie naruszy to typów wydarzeń i innych ustawień.</string>
-    <string name="show_a_grid">Show a grid</string>
-    <string name="loop_reminders">Loop reminders until dismissed</string>
-    <string name="dim_past_events">Dim past events</string>
-    <string name="events">Events</string>
+    <string name="show_a_grid">Pokazuj siatkę</string>
+    <string name="loop_reminders">Powtarzaj przypomnienia aż do ich wyłączenia</string>
+    <string name="dim_past_events">Przyciemniaj przeszłe wydarzenia</string>
+    <string name="events">Wydarzenia</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ef86efa1c..6884411cf 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -3,7 +3,7 @@
     <string name="app_name">Simple Calendar</string>
     <string name="app_launcher_name">Calendário</string>
     <string name="change_view">Mudar vista</string>
-    <string name="daily_view">Daily view</string>
+    <string name="daily_view">Vista diária</string>
     <string name="weekly_view">Vista semanal</string>
     <string name="monthly_view">Vista mensal</string>
     <string name="yearly_view">Vista anual</string>
@@ -19,15 +19,15 @@
     <string name="event">Evento</string>
     <string name="edit_event">Editar evento</string>
     <string name="new_event">Novo evento</string>
-    <string name="create_new_event">Create a new event</string>
+    <string name="create_new_event">Crie um novo evento</string>
     <string name="duplicate_event">Duplicate event</string>
     <string name="title_empty">O título não pode ficar vazio</string>
     <string name="end_before_start">O evento não pode terminar antes de iniciar</string>
     <string name="event_added">Evento adicionado com sucesso</string>
     <string name="event_updated">Evento atualizado com sucesso</string>
     <string name="filter_events_by_type">Filtrar eventos por tipo</string>
-    <string name="please_fill_location">Please fill in a location to be shown on a map</string>
-    <string name="public_event_notification_text">An event is upcoming</string>
+    <string name="please_fill_location">Por favor, preencha um local para ser mostrado em um mapa</string>
+    <string name="public_event_notification_text">Um evento está próximo</string>
 
     <!-- Event Repetition -->
     <string name="repetition">Repetição</string>
@@ -41,10 +41,10 @@
     <string name="years_raw">anos</string>
     <string name="repeat_till">Repetir até</string>
     <string name="forever">Eternamente</string>
-    <string name="event_is_repeatable">The event is repeatable</string>
+    <string name="event_is_repeatable">O evento é repetitivo</string>
     <string name="selection_contains_repetition">A seleção contém eventos recorrentes</string>
     <string name="delete_one_only">Apagar a ocorrência selecionada</string>
-    <string name="delete_future_occurrences">Delete this and all future occurrences</string>
+    <string name="delete_future_occurrences">Exclua essa e todas as ocorrências futuras</string>
     <string name="delete_all_occurrences">Apagar todas as ocorrências</string>
     <string name="update_one_only">Atualizar a ocorrência selecionada</string>
     <string name="update_all_occurrences">Atualizar todas as ocorrências</string>
@@ -56,12 +56,12 @@
     <string name="repeat_on">Repetir</string>
     <string name="every_day">Todo dia</string>
     <string name="selected_days">Em dias selecionados</string>
-    <string name="the_same_day">The same day</string>
-    <string name="the_last_day">The last day</string>
-    <string name="repeat_on_the_same_day_monthly">Repeat on the same day each month</string>
-    <string name="repeat_on_the_last_day_monthly">Repeat on the last day of the month</string>
-    <string name="repeat_on_the_same_day_yearly">Repeat on the same day every year</string>
-    <string name="repeat_every_m">Repeat every</string>
+    <string name="the_same_day">O mesmo dia</string>
+    <string name="the_last_day">O último dia</string>
+    <string name="repeat_on_the_same_day_monthly">Repita no mesmo dia a cada mês</string>
+    <string name="repeat_on_the_last_day_monthly">Repita no último dia do mês</string>
+    <string name="repeat_on_the_same_day_yearly">Repita no mesmo dia todos os anos</string>
+    <string name="repeat_every_m">Repita todos</string>
     <string name="every_m">A cada</string>
     <string name="first_m">primeiro</string>
     <string name="second_m">segundo</string>
@@ -71,46 +71,46 @@
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every first Sunday" -->
-    <string name="repeat_every_f">Repeat every</string>
-    <string name="every_f">Every</string>
-    <string name="first_f">first</string>
-    <string name="second_f">second</string>
-    <string name="third_f">third</string>
-    <string name="fourth_f">fourth</string>
-    <string name="last_f">last</string>
+    <string name="repeat_every_f">Repita todos</string>
+    <string name="every_f">todo</string>
+    <string name="first_f">primeiro</string>
+    <string name="second_f">segundo</string>
+    <string name="third_f">terceiro</string>
+    <string name="fourth_f">quarto</string>
+    <string name="last_f">ultimo</string>
 
     <!-- Birthdays -->
-    <string name="birthdays">Birthdays</string>
-    <string name="add_birthdays">Add contact birthdays</string>
-    <string name="no_birthdays">No birthdays have been found</string>
-    <string name="birthdays_added">Birthdays added successfully</string>
+    <string name="birthdays">Aniversários</string>
+    <string name="add_birthdays">Adicionar aniversários dos contatos</string>
+    <string name="no_birthdays">Nenhum aniversário foi encontrado</string>
+    <string name="birthdays_added">Aniversários adicionados com sucesso</string>
 
     <!-- Anniversaries -->
-    <string name="anniversaries">Anniversaries</string>
-    <string name="add_anniversaries">Add contact anniversaries</string>
-    <string name="no_anniversaries">No anniversaries have been found</string>
-    <string name="anniversaries_added">Anniversaries added successfully</string>
+    <string name="anniversaries">Aniversários</string>
+    <string name="add_anniversaries">Adicionar aniversários dos contatos</string>
+    <string name="no_anniversaries">Nenhum aniversário foi encontrado</string>
+    <string name="anniversaries_added">Aniversários adicionados com sucesso</string>
 
     <!-- Event Reminders -->
     <string name="reminder">Lembrete</string>
     <string name="before">antes</string>
     <string name="add_another_reminder">Adicionar outro lembrete</string>
-    <string name="event_reminders">Event reminders</string>
+    <string name="event_reminders">Lembretes de eventos</string>
 
     <!-- Export / Import -->
     <string name="import_events">Importar eventos</string>
     <string name="export_events">Exportar eventos</string>
     <string name="import_events_from_ics">Importar eventos de um arquivo .ics</string>
-    <string name="export_events_to_ics">Export events to an .ics file</string>
+    <string name="export_events_to_ics">Exportar eventos para um arquivo .ics</string>
     <string name="default_event_type">Tipo de evento padrão</string>
-    <string name="export_past_events_too">Export past events too</string>
-    <string name="include_event_types">Include event types</string>
-    <string name="filename_without_ics">Filename (without .ics)</string>
-    <string name="override_event_types">Override event types in the file</string>
+    <string name="export_past_events_too">Exportar eventos passados também</string>
+    <string name="include_event_types">Incluir tipos de eventos</string>
+    <string name="filename_without_ics">Nome do arquivo (sem .ics)</string>
+    <string name="override_event_types">Substituir os tipos de eventos no arquivo</string>
 
     <!-- Event details -->
     <string name="title">Título</string>
-    <string name="location">Location</string>
+    <string name="location">Localização</string>
     <string name="description">Descrição</string>
     <string name="all_day">O dia todo</string>
 
@@ -126,18 +126,18 @@
     <string name="regular_event">Evento regular</string>
     <string name="cannot_delete_default_type">O tipo de evento padrão não pode ser apagado</string>
     <string name="select_event_type">Selecione um tipo de evento</string>
-    <string name="move_events_into_default">Move affected events into the default event type</string>
-    <string name="remove_affected_events">Permanently remove affected events</string>
-    <string name="unsync_caldav_calendar">To remove a CalDAV calendar you have to unsynchronize it</string>
+    <string name="move_events_into_default">Mover eventos afetados para o tipo de evento padrão</string>
+    <string name="remove_affected_events">Remover permanentemente eventos afetados</string>
+    <string name="unsync_caldav_calendar">Para remover um calendário do CalDAV, você deve desassincroná-lo</string>
 
     <!-- Holidays -->
-    <string name="holidays">Holidays</string>
-    <string name="add_holidays">Add holidays</string>
-    <string name="national_holidays">National holidays</string>
-    <string name="religious_holidays">Religious holidays</string>
-    <string name="holidays_imported_successfully">Holidays have been successfully imported into the \"Holidays\" event type</string>
-    <string name="importing_some_holidays_failed">Importing some events failed</string>
-    <string name="importing_holidays_failed">Importing holidays failed</string>
+    <string name="holidays">Ferias</string>
+    <string name="add_holidays">Adicionar Ferias</string>
+    <string name="national_holidays">feriados nacionais</string>
+    <string name="religious_holidays">Feriados religiosos</string>
+    <string name="holidays_imported_successfully">Os feriados foram importados com sucesso para o tipo de evento \ "Feriados \"</string>
+    <string name="importing_some_holidays_failed">A importação de alguns eventos falhou</string>
+    <string name="importing_holidays_failed">A importação de feriados falhou</string>
 
     <!-- Settings -->
     <string name="manage_event_types">Gerenciar tipos de eventos</string>
@@ -150,37 +150,41 @@
     <string name="no_ringtone_selected">Nenhum</string>
     <string name="day_end_before_start">O dia final não pode ser antes do início</string>
     <string name="caldav_sync">CalDAV sync</string>
-    <string name="event_lists">Event lists</string>
-    <string name="display_past_events">Display events from the past</string>
-    <string name="replace_description_with_location">Replace event description with location</string>
-    <string name="delete_all_events">Delete all events</string>
-    <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
-    <string name="show_a_grid">Show a grid</string>
-    <string name="loop_reminders">Loop reminders until dismissed</string>
-    <string name="dim_past_events">Dim past events</string>
-    <string name="events">Events</string>
+    <string name="event_lists">Listas de eventos</string>
+    <string name="display_past_events">Exibir eventos do passado</string>
+    <string name="replace_description_with_location">Substituir descrição do evento por localização</string>
+    <string name="delete_all_events">Delete todos eventos</string>
+    <string name="delete_all_events_confirmation">Tem certeza de que deseja excluir todos os eventos? Isso deixará seus tipos de eventos e outras configurações intactas.</string>
+    <string name="show_a_grid">Mostrar uma grid</string>
+    <string name="loop_reminders">Lembretes de loop até que seja dispensado</string>
+    <string name="dim_past_events">Escurecer passado eventos</string>
+    <string name="events">Eventos</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
-    <string name="select_caldav_calendars">Select calendars to sync</string>
-    <string name="manage_synced_calendars">Manage synced calendars</string>
-    <string name="store_locally_only">Store locally only</string>
-    <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
-    <string name="refreshing">Refreshing…</string>
-    <string name="refreshing_complete">Refreshing complete</string>
-    <string name="editing_calendar_failed">Editing calendar failed</string>
-    <string name="syncing">Syncing…</string>
-    <string name="synchronization_completed">Sync completed</string>
+    <string name="select_caldav_calendars">Selecione calendários para sincronizar</string>
+    <string name="manage_synced_calendars">Gerenciar calendários sincronizados</string>
+    <string name="store_locally_only">Armazenar apenas localmente</string>
+    <string name="refresh_caldav_calendars">Recarregar Calendarios CalDAV </string>
+    <string name="refreshing">Recarregando…</string>
+    <string name="refreshing_complete">Carregamento completo</string>
+    <string name="editing_calendar_failed">O calendário de edição falhou</string>
+    <string name="syncing">Sincronizando…</string>
+    <string name="synchronization_completed">Sincronização completa</string>
 
     <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
     <!-- used in repetition, like "Every last Sunday" -->
-    <string name="monday_alt">Monday</string>
-    <string name="tuesday_alt">Tuesday</string>
-    <string name="wednesday_alt">Wednesday</string>
-    <string name="thursday_alt">Thursday</string>
-    <string name="friday_alt">Friday</string>
-    <string name="saturday_alt">Saturday</string>
-    <string name="sunday_alt">Sunday</string>
+    <string name="monday_alt">Segunda</string>
+    <string name="tuesday_alt">Terça</string>
+    <string name="wednesday_alt">Quarta</string>
+    <string name="thursday_alt">Quinta</string>
+    <string name="friday_alt">Sexta</string>
+    <string name="saturday_alt">Sabado</string>
+    <string name="sunday_alt">Domingo</string>
 
     <!-- List widget config example events -->
     <string name="sample_title_1">Ir ao ginásio</string>
@@ -193,12 +197,12 @@
     <string name="sample_title_5">Beber um café</string>
 
     <!-- FAQ -->
-    <string name="faq_1_title">How can I remove the holidays imported via the \"Add holidays\" button?</string>
-    <string name="faq_1_text">Holidays created that way are inserted in a new event type called \"Holidays\". You can go in Settings -> Manage Event Types,
-        long press the given event type and delete it by selecting the trashbin.</string>
-    <string name="faq_2_title">Can I sync my events via Google Calendar, or other service supporting CalDAV?</string>
-    <string name="faq_2_text">Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers.
-        In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid.</string>
+    <string name="faq_1_title">Como posso remover os feriados importados por meio do botão \ "Adicionar feriados \"?</string>
+    <string name="faq_1_text">Os feriados criados dessa maneira são inseridos em um novo tipo de evento chamado \ "Feriados \". Você pode ir em Configurações -> Gerenciar tipos de eventos,
+         pressione e segure o tipo de evento fornecido e exclua-o selecionando a lixeira.</string>
+    <string name="faq_2_title">Posso sincronizar meus eventos por meio do Google Agenda ou de outro serviço de suporte CalDAV?</string>
+    <string name="faq_2_text">Sim, basta ativar \ "CalDAV sync \" nas configurações do aplicativo e selecionar os calendários que você deseja sincronizar. No entanto, você precisará de algum aplicativo de terceiros que manipule a sincronização entre o dispositivo e os servidores.
+         Caso você queira sincronizar um calendário do Google, o aplicativo oficial do Google Agenda fará o trabalho. Para outros calendários, você precisará de um adaptador de sincronização de terceiros, por exemplo, o DAVdroid.</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
@@ -212,7 +216,7 @@
 
         A permissão de armazenamento é necessária apenas para importar eventos dos arquivos .ics.
 
-        The Contacts permission is used only at importing contact birthdays and anniversaries.
+        A permissão de Contatos é usada apenas na importação de aniversários e aniversários de contato.
 
         Este aplicativo é apenas parte de um conjunto mais vasto de aplicações. Saiba mais em https://www.simplemobiletools.com
     </string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index e3d17b06b..a57999d63 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Mostrar lembretes até serem descartados</string>
     <string name="dim_past_events">Desvanecer eventos passados</string>
     <string name="events">Eventos</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7817ab5d4..164bd2db4 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Циклические напоминания до отключения</string>
     <string name="dim_past_events">Прошедшие события отображать тусклыми</string>
     <string name="events">События</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 19984115b..d9f0734a8 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Opakovať pripomienky až po odstránenie</string>
     <string name="dim_past_events">Stlmiť minulé udalosti</string>
     <string name="events">Udalosti</string>
+    <string name="reminder_stream">Zvukový kanál používaný pripomienkami</string>
+    <string name="system_stream">Systémový</string>
+    <string name="alarm_stream">Výstražný</string>
+    <string name="notification_stream">Pripomienkový</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 2755888aa..c576607f7 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Upprepa påminnelser tills de tas bort</string>
     <string name="dim_past_events">Tona ned tidigare händelser</string>
     <string name="events">Händelser</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 8adb9cdad..7ee8ac3cb 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -44,7 +44,7 @@
     <string name="event_is_repeatable">Etkinlik tekrarlanabilir</string>
     <string name="selection_contains_repetition">Seçim tekrarlanan etkinlikleri içeriyor</string>
     <string name="delete_one_only">Yalnızca seçilen etkinlikleri sil</string>
-    <string name="delete_future_occurrences">Delete this and all future occurrences</string>
+    <string name="delete_future_occurrences">Bu ve gelecekteki tüm etkinlikleri sil</string>
     <string name="delete_all_occurrences">Tüm tekrarlanan etkinlikleri sil</string>
     <string name="update_one_only">Yalnızca seçilen etkinlikleri güncelle</string>
     <string name="update_all_occurrences">Tüm etkinlikleri güncelle</string>
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Kapatılana kadar hatırlatıcıları tekrarla</string>
     <string name="dim_past_events">Geçmiş etkinlikleri karart</string>
     <string name="events">Etkinlikler</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 40206d891..b2abb6e9b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -44,7 +44,7 @@
     <string name="event_is_repeatable">這是個重複活動</string>
     <string name="selection_contains_repetition">選擇的項目含有重複活動</string>
     <string name="delete_one_only">只刪除選擇的事件</string>
-    <string name="delete_future_occurrences">Delete this and all future occurrences</string>
+    <string name="delete_future_occurrences">刪除這個及全部未來的事件</string>
     <string name="delete_all_occurrences">刪除全部事件</string>
     <string name="update_one_only">只更新選擇的事件</string>
     <string name="update_all_occurrences">更新全部事件</string>
@@ -159,6 +159,10 @@
     <string name="loop_reminders">不斷重複提醒直到解除</string>
     <string name="dim_past_events">淡化過去的活動</string>
     <string name="events">活動</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 07033f025..3deb45e6d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -159,6 +159,10 @@
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="events">Events</string>
+    <string name="reminder_stream">Audio stream used by reminders</string>
+    <string name="system_stream">System</string>
+    <string name="alarm_stream">Alarm</string>
+    <string name="notification_stream">Notification</string>
 
     <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
diff --git a/build.gradle b/build.gradle
index 7cbfad621..ce1386288 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.41'
+    ext.kotlin_version = '1.2.50'
 
     repositories {
         jcenter()