diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cbd84c54ab93c0cc04329db842eb4621563f94ab..5d26e6ab8c7c6e240500a5d813fe7caba67c8647 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 /* //device/apps/Calendar/AndroidManifest.xml
 **
 ** Copyright 2006, The Android Open Source Project
@@ -19,10 +18,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="foundation.e.calendar"
-    android:installLocation="auto"
-    android:versionCode="20"
-    android:versionName="1.0.18">
-<!--         android:sharedUserLabel="@string/app_label"> -->
+    android:installLocation="auto">
+    <!--         android:sharedUserLabel="@string/app_label"> -->
 
     <!--
        NOTE: and original-package cannot be used, since the Eclair
@@ -31,22 +28,23 @@
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-    <application android:name="com.android.calendar.CalendarApplication"
+    <application
+        android:name="com.android.calendar.CalendarApplication"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/standalone_app_label"
-        android:taskAffinity="ws.xsoh.etar.task"
         android:requiredAccountType="*"
-        android:usesCleartextTraffic="false"
-        android:theme="@style/CalendarAppTheme">
+        android:taskAffinity="ws.xsoh.etar.task"
+        android:theme="@style/CalendarAppTheme"
+        android:usesCleartextTraffic="false">
 
         <activity
             android:name="com.android.calendar.AllInOneActivity"
@@ -56,6 +54,7 @@
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.APP_CALENDAR" />
@@ -63,18 +62,22 @@
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="time/epoch" />
                 <data android:host="com.android.calendar" />
-                <data android:scheme="content"/>
+                <data android:scheme="content" />
             </intent-filter>
         </activity>
 
-        <activity-alias android:name="com.android.calendar.LaunchActivity"
+        <activity-alias
+            android:name="com.android.calendar.LaunchActivity"
             android:exported="true"
-            android:targetActivity="com.android.calendar.AllInOneActivity">
-        </activity-alias>
+            android:targetActivity="com.android.calendar.AllInOneActivity"/>
 
-        <activity android:name="com.android.calendar.EventInfoActivity"
+        <activity android:name="com.android.calendar.AboutActivity"/>
+
+        <activity
+            android:name="com.android.calendar.EventInfoActivity"
             android:parentActivityName="com.android.calendar.AllInOneActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -85,26 +88,31 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.item/event" />
             </intent-filter>
-            <meta-data android:name="android.support.PARENT_ACTIVITY"
-                android:value="PsiClass:AllInOneActivity" />
-        </activity>
 
-        <activity android:name="com.android.calendar.event.EditEventActivity"
-            android:theme="@style/Base.CalendarAppThemeWithActionBar">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.android.calendar.AllInOneActivity" />
         </activity>
 
-        <activity-alias android:name="com.android.calendar.EditEventActivity"
+        <activity
+            android:name="com.android.calendar.event.EditEventActivity"
+            android:theme="@style/Base.CalendarAppThemeWithActionBar"></activity>
+
+        <activity-alias
+            android:name="com.android.calendar.EditEventActivity"
             android:exported="true"
             android:targetActivity="com.android.calendar.event.EditEventActivity">
             <intent-filter>
                 <action android:name="android.intent.action.EDIT" />
                 <action android:name="android.intent.action.INSERT" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.item/event" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.EDIT" />
                 <action android:name="android.intent.action.INSERT" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.dir/event" />
             </intent-filter>
@@ -116,11 +124,11 @@
             android:label="@string/app_label"
             android:theme="@android:style/Theme.NoDisplay">
 
-            <intent-filter
-               android:priority="50">
-               <action android:name="android.intent.action.VIEW" />
-               <category android:name="android.intent.category.DEFAULT" />
-               <category android:name="android.intent.category.BROWSABLE" />
+            <intent-filter android:priority="50">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
                     android:host="www.google.com"
@@ -141,23 +149,16 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.android.calendar.selectcalendars.SelectVisibleCalendarsActivity"
-            android:label="@string/select_visible_calendars_title"
-            android:theme="@style/Base.CalendarAppThemeWithActionBar" />
-
-        <activity android:name="com.android.calendar.selectcalendars.SelectSyncedCalendarsMultiAccountActivity"
-            android:label="@string/select_synced_calendars_title"
-            android:theme="@style/Base.CalendarAppThemeWithActionBar" />
-
         <activity
-            android:name="com.android.calendar.CalendarSettingsActivity"
+            android:name="com.android.calendar.settings.SettingsActivity"
             android:label="@string/preferences_title"
             android:parentActivityName="com.android.calendar.AllInOneActivity" />
 
         <!-- Declarations for search -->
         <!-- Make all activities a searchable context -->
-        <meta-data android:name="android.app.default_searchable"
-            android:value="com.android.calendar.SearchActivity"/>
+        <meta-data
+            android:name="android.app.default_searchable"
+            android:value="com.android.calendar.SearchActivity" />
 
         <activity
             android:name="com.android.calendar.SearchActivity"
@@ -167,17 +168,21 @@
             android:theme="@style/CalendarTheme.WithActionBar"
             android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="android.intent.action.SEARCH"/>
+                <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
-            <meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
         </activity>
 
-        <activity android:name="com.android.calendar.ImportActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:launchMode="singleTop">
-             <intent-filter>
+        <activity
+            android:name="com.android.calendar.ImportActivity"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:scheme="content" />
                 <data android:scheme="file" />
                 <data android:mimeType="text/x-vcalendar" />
@@ -192,7 +197,7 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
+                android:resource="@xml/provider_paths" />
         </provider>
 
         <!--<provider android:name="com.android.calendar.CalendarRecentSuggestionsProvider"
@@ -223,20 +228,23 @@
             <intent-filter>
                 <action android:name="android.intent.action.EVENT_REMINDER" />
                 <action android:name="android.intent.action.TIME_SET" />
+
                 <data android:scheme="content" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.PROVIDER_CHANGED"/>
-                <data android:scheme="content"/>
-                <data android:host="com.android.calendar"/>
+                <action android:name="android.intent.action.PROVIDER_CHANGED" />
+
+                <data android:scheme="content" />
+                <data android:host="com.android.calendar" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name="com.android.calendar.alerts.GlobalDismissManager"
-                  android:exported="false" />
+        <receiver
+            android:name="com.android.calendar.alerts.GlobalDismissManager"
+            android:exported="false" />
 
         <service android:name="com.android.calendar.alerts.AlertService" />
 
diff --git a/LICENSE.apache2 b/LICENSE.apache2
new file mode 100644
index 0000000000000000000000000000000000000000..c5b1efa7aac764ae6d8da63476a2d5cec02a6a5d
--- /dev/null
+++ b/LICENSE.apache2
@@ -0,0 +1,190 @@
+
+   Copyright (c) 2005-2008, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
diff --git a/build.gradle b/build.gradle
index c77989bec08b12f0788c2de4b713e0c0cadd5b30..ee145ddd9b98afd4b5bc0f0d59613d708f80c47c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,14 @@
 buildscript {
+    ext.kotlin_version = '1.3.61'
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
-
+        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
     }
 }
 
@@ -18,7 +20,7 @@ allprojects {
 }
 
 project(':external:calendar') {
-    apply plugin: 'android-library'
+    apply plugin: 'com.android.library'
 
     android {
         compileSdkVersion 29
@@ -49,41 +51,7 @@ project(':external:calendar') {
 }
 
 project(':external:colorpicker') {
-    apply plugin: 'android-library'
-
-    android {
-        compileSdkVersion 29
-        buildToolsVersion '29.0.2'
-
-        defaultConfig {
-            minSdkVersion 19
-            targetSdkVersion 29
-        }
-
-        sourceSets {
-                main {
-                    manifest.srcFile 'AndroidManifest.xml'
-                    java.srcDirs = ['src']
-                    resources.srcDirs = ['src']
-                    aidl.srcDirs = ['src']
-                    renderscript.srcDirs = ['src']
-                    res.srcDirs = ['res']
-                    assets.srcDirs = ['assets']
-            }
-        }
-
-        lintOptions {
-            abortOnError false
-        }
-    }
-}
-
-project(':external:datetimepicker') {
-    apply plugin: 'android-library'
-
-    dependencies {
-        implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    }
+    apply plugin: 'com.android.library'
 
     android {
         compileSdkVersion 29
@@ -113,7 +81,7 @@ project(':external:datetimepicker') {
 }
 
 project(':external:timezonepicker') {
-    apply plugin: 'android-library'
+    apply plugin: 'com.android.library'
 
     dependencies {
         implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -146,7 +114,7 @@ project(':external:timezonepicker') {
 }
 
 project(':external:chips') {
-    apply plugin: 'android-library'
+    apply plugin: 'com.android.library'
 
     android {
         compileSdkVersion 29
@@ -177,13 +145,21 @@ project(':external:chips') {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 dependencies {
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1"
+
+    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.0.0'
+
     implementation project(':external:calendar')
     implementation project(':external:colorpicker')
-    implementation project(':external:datetimepicker')
     implementation project(':external:timezonepicker')
     implementation project(':external:chips')
 }
@@ -195,6 +171,9 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
+        versionCode 23
+        versionName "1.0.21"
+        applicationId "foundation.e.calendar"
     }
 
     useLibrary 'org.apache.http.legacy'
@@ -211,6 +190,17 @@ android {
         }
     }
 
+    buildTypes {
+        release {
+            // TODO: could be enabled for ProGuard minimization
+            minifyEnabled false
+        }
+
+        debug {
+            minifyEnabled false
+        }
+    }
+
     /*
      * To sign release build, create file gradle.properties in ~/.gradle/ with this content:
      *
@@ -224,7 +214,7 @@ android {
             project.hasProperty('signingKeyAlias') &&
             project.hasProperty('signingKeyPassword')) {
         println "Found sign properties in gradle.properties! Signing build…"
-
+        
         signingConfigs {
             release {
                 storeFile file(signingStoreLocation)
diff --git a/gradle.properties b/gradle.properties
index 5465fec0ecadbf086fce0db92293c8f1d5f720ff..2bd9388fafc1e6646929f58589c13ee9434d095b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,16 @@
+## For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+#Mon Sep 16 20:34:11 CEST 2019
 android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
+org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000000000000000000000000000000000000..36caafacb7188aea8285f81c6b2849870fbe005a
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat Jan 11 14:20:57 CET 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
diff --git a/metadata/ar-AR/changelogs/21.txt b/metadata/ar-AR/changelogs/21.txt
new file mode 100644
index 0000000000000000000000000000000000000000..97112053b700240e07f0b6ebd658eb211a1d28ae
--- /dev/null
+++ b/metadata/ar-AR/changelogs/21.txt
@@ -0,0 +1,2 @@
+- عدة إصلاحات.
+- ترجمات جديدة.
\ No newline at end of file
diff --git a/metadata/ar-AR/changelogs/22.txt b/metadata/ar-AR/changelogs/22.txt
new file mode 100644
index 0000000000000000000000000000000000000000..be459838a4157a576c816203b8b47f81082031ce
--- /dev/null
+++ b/metadata/ar-AR/changelogs/22.txt
@@ -0,0 +1,7 @@
+- إمكانية إضافة تقاويم محلية (غير متصلة بالإنترنت).
+- إضافة اختصار لإضافة الأحداث الجديدة.
+- تحسين تصميم التفضيلات.
+- قائمة اختيار الوقت والتاريخ بحلة جديدة.
+- تحويل رخصة التطبيق إلى GPLv3.
+- عدة إصلاحات.
+- ترجمات جديدة.
\ No newline at end of file
diff --git a/metadata/ar-AR/changelogs/23.txt b/metadata/ar-AR/changelogs/23.txt
new file mode 100644
index 0000000000000000000000000000000000000000..182e5ebad04996bf7c24368c770ef33cc67a770b
--- /dev/null
+++ b/metadata/ar-AR/changelogs/23.txt
@@ -0,0 +1,2 @@
+- إصلاح عرض الاختيارات.
+- إضافة لغات جديدة.
diff --git a/metadata/de-DE/changelogs/21.txt b/metadata/de-DE/changelogs/21.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8df7553178fa7c1eabefdda6b3c0bcd5ca9b2448
--- /dev/null
+++ b/metadata/de-DE/changelogs/21.txt
@@ -0,0 +1,2 @@
+- Fehlerbehebungen.
+- Neue Übersetzungen.
\ No newline at end of file
diff --git a/metadata/de-DE/changelogs/22.txt b/metadata/de-DE/changelogs/22.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ee4b9d4f0bc4f1823a07d367573374896ffa58cb
--- /dev/null
+++ b/metadata/de-DE/changelogs/22.txt
@@ -0,0 +1,7 @@
+- Erstellen lokaler Kalender.
+- Verknüfung für neue Einträge.
+- Neue Einstellungsansicht.
+- Neue Dialoge zur Auswahl der Zeit.
+- Lizenzwechsel zu GPLv3.
+- Fehlerbehebungen.
+- Neue Übersetzungen.
\ No newline at end of file
diff --git a/metadata/de-DE/changelogs/23.txt b/metadata/de-DE/changelogs/23.txt
new file mode 100644
index 0000000000000000000000000000000000000000..df131f61f6f1dea4c83f435218c540d92d572743
--- /dev/null
+++ b/metadata/de-DE/changelogs/23.txt
@@ -0,0 +1,2 @@
+- Bugfix für Anzeige der Optionen.
+- Neue Übersetzungen.
diff --git a/metadata/en-US/changelogs/21.txt b/metadata/en-US/changelogs/21.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9a26da20615cb9bb8adcfe724704c284e187a947
--- /dev/null
+++ b/metadata/en-US/changelogs/21.txt
@@ -0,0 +1,2 @@
+- Bugfixes.
+- New translations.
\ No newline at end of file
diff --git a/metadata/en-US/changelogs/22.txt b/metadata/en-US/changelogs/22.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2e40ef98c7019951d27d43877c527ce0c3450226
--- /dev/null
+++ b/metadata/en-US/changelogs/22.txt
@@ -0,0 +1,7 @@
+- Add offline calender.
+- Add shortcut for new event.
+- New preferences design.
+- New datetime picker.
+- Switch license to GPLv3.
+- Bugfixes.
+- New translations.
\ No newline at end of file
diff --git a/metadata/en-US/changelogs/23.txt b/metadata/en-US/changelogs/23.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7d7c450bd866e9abc29c257fd03595cf7318abf3
--- /dev/null
+++ b/metadata/en-US/changelogs/23.txt
@@ -0,0 +1,2 @@
+- Bugfix for options display.
+- New translations.
diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt
index 3990b0da62a3a525123b6832df82fb15c9f0d589..66ab10568c4af3ba5ec2247f68d861c63d726914 100644
--- a/metadata/en-US/full_description.txt
+++ b/metadata/en-US/full_description.txt
@@ -1,11 +1,11 @@
 Features:
 - Month view.
-- Week, day & agenda view.
-- Uses Android calendar sync. Works with Google Calendar, Exchange..etc.
-- Material design.
-- Dark & Light Theme.
-- Free, open source and absolutely no Ads.
-- Support sharing calendars via ics and the ability to import/export from sdcard.
+- Week, day and agenda view.
+- Uses Android calendar sync. Works with Google Calendar, Exchange, etc.
+- Material Design.
+- Dark and light theme.
+- Free, open source and absolutely no ads.
+- Support sharing calendars via ICS and the ability to import/export from SD card.
 
-Bugs & feedback: https://github.com/Etar-Group/Etar-Calendar/issues
-Source Code: https://github.com/Etar-Group/Etar-Calendar
+Bugs and feedback: https://github.com/Etar-Group/Etar-Calendar/issues
+Source code: https://github.com/Etar-Group/Etar-Calendar
diff --git a/metadata/en-US/images/phoneScreenshots/p1.png b/metadata/en-US/images/phoneScreenshots/p1.png
index b1d7a9146ec306fc095e397017d958838acdb140..44a67803f750508099e53a97dfdd560c32f1e8e7 100644
Binary files a/metadata/en-US/images/phoneScreenshots/p1.png and b/metadata/en-US/images/phoneScreenshots/p1.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/p2.png b/metadata/en-US/images/phoneScreenshots/p2.png
index cf1a2c1f43bcb1acb3b3778d2b2174c86ac039d5..c11a4b8a687ad242757fd575ec730c08dbc895a2 100644
Binary files a/metadata/en-US/images/phoneScreenshots/p2.png and b/metadata/en-US/images/phoneScreenshots/p2.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/p3.png b/metadata/en-US/images/phoneScreenshots/p3.png
index 04adc01cb52b09a501448b683d3ac5cec4708d61..f2e8ca2761f071009343af5a140b746a8001bb48 100644
Binary files a/metadata/en-US/images/phoneScreenshots/p3.png and b/metadata/en-US/images/phoneScreenshots/p3.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/p4.png b/metadata/en-US/images/phoneScreenshots/p4.png
index b2955490c8d42f8cf735200d9ac199c0caa986cc..b933dff915f890f85a241fa319673fbac2bdc351 100644
Binary files a/metadata/en-US/images/phoneScreenshots/p4.png and b/metadata/en-US/images/phoneScreenshots/p4.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/p5.png b/metadata/en-US/images/phoneScreenshots/p5.png
index 3d13760c039264c1a1d89786753ef5b85c2ad351..46bcf4aae2cf8d4c83e8dcccf5c8402b1d2c889b 100644
Binary files a/metadata/en-US/images/phoneScreenshots/p5.png and b/metadata/en-US/images/phoneScreenshots/p5.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/t1.png b/metadata/en-US/images/phoneScreenshots/t1.png
index 9a0fd4dedab911e27a76ef7c378046ac9b4b9efa..5c9ebe428288f4f8b977dc73146e491def6668c5 100644
Binary files a/metadata/en-US/images/phoneScreenshots/t1.png and b/metadata/en-US/images/phoneScreenshots/t1.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/t2.png b/metadata/en-US/images/phoneScreenshots/t2.png
index 58468efdc5b58b0a0e92ea25e49acc4245f0740d..86cd1ed96561abbca54fa419d62e32dcad78529f 100644
Binary files a/metadata/en-US/images/phoneScreenshots/t2.png and b/metadata/en-US/images/phoneScreenshots/t2.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/t3.png b/metadata/en-US/images/phoneScreenshots/t3.png
index 69ebe8f3144d1af8fcc0ae75c0dd93d3fe4f57be..e6e31b4b93a24d8860def39ee42222b7c04525ec 100644
Binary files a/metadata/en-US/images/phoneScreenshots/t3.png and b/metadata/en-US/images/phoneScreenshots/t3.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/t4.png b/metadata/en-US/images/phoneScreenshots/t4.png
index abd1312d941ba1b44707a1f8a48cf3b275682e98..a50c731c9d13188d1d01e67d4021504cb1b5eaec 100644
Binary files a/metadata/en-US/images/phoneScreenshots/t4.png and b/metadata/en-US/images/phoneScreenshots/t4.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/t5.png b/metadata/en-US/images/phoneScreenshots/t5.png
index 457674397b3fdb913cb289236325b4dd54dce852..03f999cba42140efc2d5c7e252234459aa683888 100644
Binary files a/metadata/en-US/images/phoneScreenshots/t5.png and b/metadata/en-US/images/phoneScreenshots/t5.png differ
diff --git a/metadata/en-US/images/tenInchScreenshots/1.png b/metadata/en-US/images/tenInchScreenshots/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b794bee22ed663f8ce1729a1a78f88abd58d536f
Binary files /dev/null and b/metadata/en-US/images/tenInchScreenshots/1.png differ
diff --git a/metadata/en-US/images/tenInchScreenshots/2.png b/metadata/en-US/images/tenInchScreenshots/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5e7e5ef9e0350a4757327af5f58c6786a1364f7
Binary files /dev/null and b/metadata/en-US/images/tenInchScreenshots/2.png differ
diff --git a/metadata/en-US/images/tenInchScreenshots/3.png b/metadata/en-US/images/tenInchScreenshots/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..79f7c6787c919691394fc6efca44b25f17202374
Binary files /dev/null and b/metadata/en-US/images/tenInchScreenshots/3.png differ
diff --git a/metadata/en-US/images/tenInchScreenshots/4.png b/metadata/en-US/images/tenInchScreenshots/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb1aa21be64464adf353212358755462f8a39c67
Binary files /dev/null and b/metadata/en-US/images/tenInchScreenshots/4.png differ
diff --git a/metadata/en-US/images/tenInchScreenshots/5.png b/metadata/en-US/images/tenInchScreenshots/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..38cedc5b9cca26a49594dee4521619bdfc9c0bdf
Binary files /dev/null and b/metadata/en-US/images/tenInchScreenshots/5.png differ
diff --git a/metadata/en_fdroid.png b/metadata/en_fdroid.png
index 89161aea00a3b5145466cfa68b494ff0c2b18735..afa603cf6df6cb9f13a4d4cd568e279caa5b0e6e 100644
Binary files a/metadata/en_fdroid.png and b/metadata/en_fdroid.png differ
diff --git a/metadata/en_google_play.png b/metadata/en_google_play.png
index d873e84eaa079c642d21b56b35575f0c42f08a50..c77b7464b049c7d6666155c61df5f486f241f760 100644
Binary files a/metadata/en_google_play.png and b/metadata/en_google_play.png differ
diff --git a/project.properties b/project.properties
index e341ddfbcc0af82933e5e8ae3d4d60f8ae5b5b49..8c5c68e853dc1cf63166f62e057f149b40f3413c 100644
--- a/project.properties
+++ b/project.properties
@@ -16,5 +16,4 @@ android.library=false
 android.library.reference.1=external/ex/chips
 android.library.reference.2=external/calendar
 android.library.reference.3=external/colorpicker
-android.library.reference.4=external/datetimepicker
 android.library.reference.5=external/timezonepicker
diff --git a/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png b/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png
deleted file mode 100644
index 9c5147efc96653173a7a2c46864144a5486c678a..0000000000000000000000000000000000000000
Binary files a/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png b/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png
deleted file mode 100644
index a257e26ddb5c97809bc7294030981211e6498fe7..0000000000000000000000000000000000000000
Binary files a/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/switch_thumb_holo_light_v2.9.png b/res/drawable-hdpi/switch_thumb_holo_light_v2.9.png
deleted file mode 100644
index 9b16618c7462f3d012da132a99eae4213d8c9d12..0000000000000000000000000000000000000000
Binary files a/res/drawable-hdpi/switch_thumb_holo_light_v2.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png b/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png
deleted file mode 100644
index ea54380fc4ce96ded6bba67d4bb1723537c4cfdb..0000000000000000000000000000000000000000
Binary files a/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png b/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png
deleted file mode 100644
index 3d7c236abb742d7a9d7cb1e72d17bcf30890c82e..0000000000000000000000000000000000000000
Binary files a/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png b/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png
deleted file mode 100644
index 82f05d623bdadf0a54fa4dbe9bc7b4c4655d3b77..0000000000000000000000000000000000000000
Binary files a/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/switch_thumb_holo_light_v2.9.png b/res/drawable-mdpi/switch_thumb_holo_light_v2.9.png
deleted file mode 100644
index b3cee3f7e76860bc6698d0e06f224aa362013293..0000000000000000000000000000000000000000
Binary files a/res/drawable-mdpi/switch_thumb_holo_light_v2.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png b/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png
deleted file mode 100644
index 670dc2e99a1b720f31120d3285c14292424a2396..0000000000000000000000000000000000000000
Binary files a/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-sw600dp/ic_menu_today_holo_light.webp b/res/drawable-sw600dp/ic_menu_today_holo_light.webp
deleted file mode 100644
index ab8df57769047566ed27d3aeb231916758a3b13f..0000000000000000000000000000000000000000
Binary files a/res/drawable-sw600dp/ic_menu_today_holo_light.webp and /dev/null differ
diff --git a/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png b/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png
deleted file mode 100644
index ca48bd866c2de51b9266bb8ed99a48f0a7257713..0000000000000000000000000000000000000000
Binary files a/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png b/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png
deleted file mode 100644
index c3d80f0eb33fccb012fcf57cd12391fd74731a20..0000000000000000000000000000000000000000
Binary files a/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/switch_thumb_holo_light_v2.9.png b/res/drawable-xhdpi/switch_thumb_holo_light_v2.9.png
deleted file mode 100644
index 39592ac80bf27ff6af7c18b15fe50732c4c92555..0000000000000000000000000000000000000000
Binary files a/res/drawable-xhdpi/switch_thumb_holo_light_v2.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png b/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png
deleted file mode 100644
index 4acb32b1933965edafd1566c95536d9bee6a52ec..0000000000000000000000000000000000000000
Binary files a/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png and /dev/null differ
diff --git a/res/drawable/circle.xml b/res/drawable/circle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2af16fdf43b8a2697f115bfd8c99e6c26cd156ed
--- /dev/null
+++ b/res/drawable/circle.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/circle_outline.xml b/res/drawable/circle_outline.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e902972369a25e095c5911e88748af3600a6f009
--- /dev/null
+++ b/res/drawable/circle_outline.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_create_dark.xml b/res/drawable/ic_create_dark.xml
new file mode 100644
index 0000000000000000000000000000000000000000..46462b57260d4227f22b10e58562ea2e1030a681
--- /dev/null
+++ b/res/drawable/ic_create_dark.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/res/drawable/ic_create_light.xml b/res/drawable/ic_create_light.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a9fec7080d764dd970a5195147d1efea98e6fc08
--- /dev/null
+++ b/res/drawable/ic_create_light.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/res/drawable/ic_description_dark.xml b/res/drawable/ic_description_dark.xml
new file mode 100644
index 0000000000000000000000000000000000000000..302bb4af1a03b4caa9d72991fa03ee540606b6e8
--- /dev/null
+++ b/res/drawable/ic_description_dark.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
+</vector>
diff --git a/res/drawable/ic_description_light.xml b/res/drawable/ic_description_light.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cfbd75e8775ed12cff2ab6ebd26c0f50e2fa9ce0
--- /dev/null
+++ b/res/drawable/ic_description_light.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
+</vector>
diff --git a/res/drawable/ic_info.xml b/res/drawable/ic_info.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6c7bd8c800de986fd41dcd171ff53997f9ad97fe
--- /dev/null
+++ b/res/drawable/ic_info.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/res/drawable/ic_info_outline_dark.xml b/res/drawable/ic_info_outline_dark.xml
new file mode 100755
index 0000000000000000000000000000000000000000..af0d4d067a587ea43697027863688b6cead6b5e2
--- /dev/null
+++ b/res/drawable/ic_info_outline_dark.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+</vector>
diff --git a/res/drawable/ic_info_outline_light.xml b/res/drawable/ic_info_outline_light.xml
new file mode 100755
index 0000000000000000000000000000000000000000..f52a15fb6200729bc53e049f69d7b8a9aae5af27
--- /dev/null
+++ b/res/drawable/ic_info_outline_light.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+</vector>
diff --git a/res/drawable/ic_menu_select_visible_calendars.xml b/res/drawable/ic_menu_select_visible_calendars.xml
deleted file mode 100644
index 6478d1bc2e29f7e4d4417ae0da08194abc9325c5..0000000000000000000000000000000000000000
--- a/res/drawable/ic_menu_select_visible_calendars.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20,13H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1zM7,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM20,3H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1zM7,9c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
-</vector>
diff --git a/res/drawable/ic_sync_off_dark.xml b/res/drawable/ic_sync_off_dark.xml
new file mode 100644
index 0000000000000000000000000000000000000000..965a592a8658e295796342b7687a0c4258ebe116
--- /dev/null
+++ b/res/drawable/ic_sync_off_dark.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M20,4H14V10L16.24,7.76C17.32,8.85 18,10.34 18,12C18,13 17.75,13.94 17.32,14.77L18.78,16.23C19.55,15 20,13.56 20,12C20,9.79 19.09,7.8 17.64,6.36L20,4M2.86,5.41L5.22,7.77C4.45,9 4,10.44 4,12C4,14.21 4.91,16.2 6.36,17.64L4,20H10V14L7.76,16.24C6.68,15.15 6,13.66 6,12C6,11 6.25,10.06 6.68,9.23L14.76,17.31C14.5,17.44 14.26,17.56 14,17.65V19.74C14.79,19.53 15.54,19.2 16.22,18.78L18.58,21.14L19.85,19.87L4.14,4.14L2.86,5.41M10,6.35V4.26C9.2,4.47 8.45,4.8 7.77,5.22L9.23,6.68C9.5,6.56 9.73,6.44 10,6.35Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_sync_off_light.xml b/res/drawable/ic_sync_off_light.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d677bc209225327c90fc4d1b526139a31721e2ae
--- /dev/null
+++ b/res/drawable/ic_sync_off_light.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M20,4H14V10L16.24,7.76C17.32,8.85 18,10.34 18,12C18,13 17.75,13.94 17.32,14.77L18.78,16.23C19.55,15 20,13.56 20,12C20,9.79 19.09,7.8 17.64,6.36L20,4M2.86,5.41L5.22,7.77C4.45,9 4,10.44 4,12C4,14.21 4.91,16.2 6.36,17.64L4,20H10V14L7.76,16.24C6.68,15.15 6,13.66 6,12C6,11 6.25,10.06 6.68,9.23L14.76,17.31C14.5,17.44 14.26,17.56 14,17.65V19.74C14.79,19.53 15.54,19.2 16.22,18.78L18.58,21.14L19.85,19.87L4.14,4.14L2.86,5.41M10,6.35V4.26C9.2,4.47 8.45,4.8 7.77,5.22L9.23,6.68C9.5,6.56 9.73,6.44 10,6.35Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/switch_thumb.xml b/res/drawable/switch_thumb.xml
index 87c51e31fb37ce68995a2c0176955ba80970eade..f843d5325cf526065b03b8f2f20d863e7cb482e7 100644
--- a/res/drawable/switch_thumb.xml
+++ b/res/drawable/switch_thumb.xml
@@ -18,16 +18,16 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" >
         <shape android:shape="oval">
-            <solid android:color="#467fda" />
-            <size android:width="20dp" />
-            <size android:height="20dp"/>
+            <solid android:color="#36b5e4" />
+            <size android:width="25dp" />
+            <size android:height="25dp"/>
         </shape>
     </item>
     <item android:state_checked="false" >
         <shape android:shape="oval">
             <solid android:color="#5b5b5b" />
-            <size android:width="40dp" />
-            <size android:height="35dp"/>
+            <size android:width="25dp" />
+            <size android:height="25dp"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/res/layout-sw600dp/edit_event_1.xml b/res/layout-sw600dp/edit_event_1.xml
index d14df6bada4a1d565c19f9ae4db40543ae31b6fe..f3d8f00aa80232731dd5061f82ccfc7d85266820 100644
--- a/res/layout-sw600dp/edit_event_1.xml
+++ b/res/layout-sw600dp/edit_event_1.xml
@@ -113,7 +113,6 @@
             android:id="@+id/title"
             style="@style/TextAppearance.EditEvent_Value"
             android:layout_width="wrap_content"
-            android:capitalize="sentences"
             android:focusable="true"
             android:hint="@string/hint_what"
             android:inputType="textAutoCorrect|textCapSentences" />
@@ -385,7 +384,6 @@
             android:id="@+id/description"
             style="@style/TextAppearance.EditEvent_Value"
             android:layout_width="wrap_content"
-            android:capitalize="sentences"
             android:hint="@string/hint_description"
             android:inputType="textAutoCorrect|textCapSentences|textMultiLine" />
     </TableRow>
diff --git a/res/layout/about.xml b/res/layout/about.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c1291de56e551a8ecf479a569b9c7f576cdc8927
--- /dev/null
+++ b/res/layout/about.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:layout_gravity="center"
+                android:layout_margin="16dp"
+                android:src="@mipmap/ic_launcher" />
+
+            <LinearLayout
+                android:id="@+id/infoLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:paddingLeft="16dp"
+                android:paddingTop="8dp"
+                android:paddingRight="16dp"
+                android:paddingBottom="8dp">
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="10dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/preferences_app_info_title"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                    <TextView
+                        android:id="@+id/app_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/preferences_app_info" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/versionLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:paddingLeft="16dp"
+                android:paddingTop="8dp"
+                android:paddingRight="16dp"
+                android:paddingBottom="8dp">
+
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="10dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/preferences_build_version"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                    <TextView
+                        android:id="@+id/version"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Version" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/forkInfoLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:paddingLeft="16dp"
+                android:paddingTop="8dp"
+                android:paddingRight="16dp"
+                android:paddingBottom="8dp">
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="10dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/preferences_about_app"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/licenseLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:paddingLeft="16dp"
+                android:paddingTop="8dp"
+                android:paddingRight="16dp"
+                android:paddingBottom="8dp">
+
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="10dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/preferences_licence"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/authorsLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:paddingLeft="16dp"
+                android:paddingTop="8dp"
+                android:paddingRight="16dp"
+                android:paddingBottom="8dp">
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="10dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/preferences_authors"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/sourceLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:paddingLeft="16dp"
+                android:paddingTop="8dp"
+                android:paddingRight="16dp"
+                android:paddingBottom="8dp">
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="10dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/preferences_source_code"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/privacyLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:paddingLeft="16dp"
+                android:paddingTop="8dp"
+                android:paddingRight="16dp"
+                android:paddingBottom="8dp">
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="10dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/preferences_privacy_policy"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/termsLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:paddingLeft="16dp"
+                android:paddingTop="8dp"
+                android:paddingRight="16dp"
+                android:paddingBottom="8dp">
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="10dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/preferences_service_terms"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>
diff --git a/res/layout/account_calendars.xml b/res/layout/account_calendars.xml
deleted file mode 100644
index ac0fbae8adf4a67b2533d8ea36c93329cf466055..0000000000000000000000000000000000000000
--- a/res/layout/account_calendars.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/calendars"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <TextView android:id="@+id/account_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_gravity="center"
-        style="?android:attr/textAppearanceMedium" />
-
-    <Button android:id="@+id/sync_settings"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@android:string/ok" />
-
-    <include android:id="@+id/calendar_list" layout="@android:layout/list_content"/>
-
-</LinearLayout>
diff --git a/res/layout/account_item.xml b/res/layout/account_item.xml
deleted file mode 100644
index 2b4068b233264b75279b6be1f632e9e77bb1475c..0000000000000000000000000000000000000000
--- a/res/layout/account_item.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/scrollbarSize">
-    <TextView
-        android:id="@+id/account"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:paddingTop="6dip"
-        style="?android:attr/textAppearanceLarge"
-        android:duplicateParentState="true" />
-    <TextView
-        android:id="@+id/account_type"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:maxLines="2"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:duplicateParentState="true" />
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/add_offline_calendar_dialog.xml b/res/layout/add_offline_calendar_dialog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3fd9a087fabeebae212e2164986480c73c412864
--- /dev/null
+++ b/res/layout/add_offline_calendar_dialog.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/offline_calendar_name_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/preferences_list_add_offline_name">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/offline_calendar_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+</LinearLayout>
diff --git a/res/layout/all_in_one_material.xml b/res/layout/all_in_one_material.xml
index 237c8e2ed80207c43c1067351cf0a1a922af7a85..84eccdc9d888fa29dc91ed8aa5ef2fc2e6b452de 100644
--- a/res/layout/all_in_one_material.xml
+++ b/res/layout/all_in_one_material.xml
@@ -8,8 +8,7 @@
     android:fitsSystemWindows="true"
     tools:context="com.android.calendar.AllInOneActivity">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/res/layout/calendar_sync_item.xml b/res/layout/calendar_sync_item.xml
deleted file mode 100644
index 02c2c5ce877a428c8b19e7dec2d0ff20bc6c6a8f..0000000000000000000000000000000000000000
--- a/res/layout/calendar_sync_item.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:layout_marginRight="6dip"
-    android:layout_marginTop="6dip"
-    android:layout_marginBottom="6dip">
-
-    <com.android.calendar.selectcalendars.CalendarColorSquare
-        android:id="@+id/color"
-        android:layout_height="32dip"
-        android:layout_width="32dip"
-        android:layout_marginLeft="13dip"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="@string/calendar_square_color_picker_description"
-        style="?android:attr/quickContactBadgeStyleWindowMedium" />
-
-    <LinearLayout
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_marginLeft="8dip"
-        android:orientation="vertical"
-        android:layout_gravity="center_vertical">
-
-        <TextView
-            android:id="@+id/calendar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            style="?android:attr/textAppearanceMedium"
-            android:duplicateParentState="true" />
-
-        <TextView
-            android:id="@+id/status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:duplicateParentState="true" />
-    </LinearLayout>
-
-    <CheckBox
-        android:id="@+id/sync"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="4dip"
-        android:layout_marginRight="14dip"
-        android:contentDescription="@string/accessibility_sync_cal"
-        android:clickable="false"
-        android:longClickable="false"
-        android:focusable="false" />
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/recurrencepicker.xml b/res/layout/recurrencepicker.xml
index 9ca402a297b45967e999aacee94a456d9204a899..a63f4d05a77b2df904effb8c8a4db2d4af36ff39 100644
--- a/res/layout/recurrencepicker.xml
+++ b/res/layout/recurrencepicker.xml
@@ -54,21 +54,20 @@
                         android:id="@+id/freqSpinner"
                         style="@style/TextAppearance.RecurrencePickerStyle"
                         android:layout_weight="1"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
                         android:entries="@array/recurrence_freq"
-                        android:gravity="left"
+                        android:gravity="start"
                         android:padding="0dp" />
 
                     <Switch
                         android:id="@+id/repeat_switch"
-                        android:layout_weight="0.04"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:thumb="@drawable/switch_thumb"
-                        android:layout_marginLeft="4dp" />
+                        android:layout_marginStart="4dp" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -87,7 +86,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="start"
-                        android:paddingLeft="4dp" >
+                        android:paddingStart="4dp" >
 
                         <TextView
                             android:id="@+id/intervalPreText"
@@ -189,7 +188,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="start"
                         android:orientation="horizontal"
-                        android:paddingLeft="0dp" >
+                        android:paddingStart="0dp" >
 
                         <Spinner
                             android:id="@+id/endSpinner"
@@ -197,10 +196,10 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
-                            android:layout_marginLeft="-4dp"
-                            android:layout_marginRight="8dp"
+                            android:layout_marginStart="-4dp"
+                            android:layout_marginEnd="8dp"
                             android:entries="@array/recurrence_freq"
-                            android:gravity="left|center_vertical"
+                            android:gravity="start|center_vertical"
                             android:padding="0dp" />
 
                         <EditText
@@ -243,8 +242,8 @@
                             android:layout_marginTop="3dp"
                             android:layout_marginLeft="0dp"
                             android:layout_marginRight="0dp"
-                            android:paddingLeft="12dp"
-                            android:paddingRight="16dp"
+                            android:paddingStart="12dp"
+                            android:paddingEnd="16dp"
                             android:paddingBottom="8dp"
                             android:visibility="gone" />
                     </LinearLayout>
diff --git a/res/layout/select_calendars_multi_accounts_fragment.xml b/res/layout/select_calendars_multi_accounts_fragment.xml
deleted file mode 100644
index f46009850a56a12ce50e097b92086cad68787f34..0000000000000000000000000000000000000000
--- a/res/layout/select_calendars_multi_accounts_fragment.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-    <LinearLayout
-        android:id="@+id/calendars"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <ExpandableListView
-            android:id="@android:id/list"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:clickable="true"
-            android:layout_weight="1" />
-        <LinearLayout android:id="@+id/loading"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:visibility="gone">
-
-            <ProgressBar
-                style="?android:attr/progressBarStyle"
-                android:indeterminate="true"
-                android:layout_width="32dp"
-                android:layout_height="32dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLargeInverse"
-                android:textColor="@android:color/black"
-                android:layout_marginBottom="1dip"
-                android:paddingLeft="5dip"
-                android:text="@string/loading"/>
-
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            style="@android:style/Holo.ButtonBar">
-            <Button
-                android:id="@+id/btn_discard"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@android:string/cancel" />
-            <Button
-                android:id="@+id/btn_done"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@android:string/ok" />
-        </LinearLayout>
-    </LinearLayout>
-</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/res/layout/timezone_footer.xml b/res/layout/timezone_footer.xml
deleted file mode 100644
index 9ac1a6f0b09daf30fda53c1ae283b33369b063eb..0000000000000000000000000000000000000000
--- a/res/layout/timezone_footer.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
- <!-- Copyright (C) 2010 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/timezone_footer"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="10dip"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip"
-    style="?android:attr/textAppearanceMedium" />
diff --git a/res/menu/calendar_view.xml b/res/menu/calendar_view.xml
index 60f5233f55389c9060ad3ec5098696f55df0fd65..ce8df6d5d43df2bcca2e6c7cf3222dda1e5ccf35 100644
--- a/res/menu/calendar_view.xml
+++ b/res/menu/calendar_view.xml
@@ -22,15 +22,16 @@
 
     </group>
     <group android:id="@+id/navigation_subheader" android:checkableBehavior="none">
-        <item
-            android:id="@+id/action_select_visible_calendars"
-            android:icon="@drawable/ic_menu_select_visible_calendars"
-            android:title="@string/menu_select_visible_calendars" />
         <item
             android:id="@+id/action_settings"
             android:alphabeticShortcut="s"
             android:icon="@drawable/ic_menu_settings"
             android:title="@string/menu_preferences" />
 
+        <item
+            android:id="@+id/action_about"
+            android:icon="@drawable/ic_info"
+            android:title="@string/menu_about_preferences" />
+
     </group>
 </menu>
diff --git a/res/menu/settings_title_bar.xml b/res/menu/settings_title_bar.xml
deleted file mode 100644
index 30ed1edd6fa656757f557f47ba0e7b512f9f7d46..0000000000000000000000000000000000000000
--- a/res/menu/settings_title_bar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/action_add_account"
-        android:alphabeticShortcut="a"
-        android:title="@string/add_account"
-        android:showAsAction="withText|always" />
-</menu>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 0a0aa1485d5ef070855a89b886a22440a3f348d4..7e25ac335915886af9e16e0305b7ee6347c5d589 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Beskikbaar"</item>
     <item msgid="2064426942462573474">"Voorlopig"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"eerste"</item>
-    <item msgid="5631923029483854900">"sekonde"</item>
-    <item msgid="148935502975250973">"derde"</item>
-    <item msgid="5124200797326669172">"vierde"</item>
-    <item msgid="7564374178324652137">"laaste"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Geen reaksie nie"</item>
     <item msgid="3724434080904437698">"Ja"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Hierdie en toekomstige gebeure"</item>
     <item msgid="7833229563617435430">"Alle gebeurtenisse"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Hierdie en toekomstige gebeurtenisse"</item>
-    <item msgid="6315440193748139854">"Alle gebeurtenisse"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Slegs hierdie gebeurtenis"</item>
     <item msgid="140670561403965380">"Alle gebeurtenisse in die reeks"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ab483823c2eb93bbdcf442730635b2b74361f4ae..83e2aa9e28a1ebc48918862833c42be9cbea1f51 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalender"</string>
     <string name="what_label" msgid="1933578391985810049">"Wat"</string>
     <string name="where_label" msgid="3472482206065595118">"Waar"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Môre"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Vandag om <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Môre om <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Herhaling"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Titelloos)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minuut"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minute"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 uur"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> uur"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 dag"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dae"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"week <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minuut"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minute"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 uur"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> uur"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 dag"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dae"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"week <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Herlaai"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Wys dag"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Vee gebeurtenis uit"</string>
     <string name="goto_today" msgid="9162136434410891230">"Vandag"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Instellings"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalenders om te wys"</string>
     <string name="search" msgid="550656004486017426">"Soek"</string>
     <string name="hide_controls" msgid="830320505938520882">"Versteek kontroles"</string>
     <string name="show_controls" msgid="715520586028062621">"Wys kontroles"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalenders om te wys"</string>
-    <string name="synced" msgid="7913940305983383493">"gesinkroniseer"</string>
-    <string name="not_synced" msgid="4275114941801829419">"nie gesinkroniseer nie"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Hierdie rekening word nie gesinkroniseer nie, dus mag jou kalenders dalk nie op datum wees nie."</string>
-    <string name="accounts" msgid="849401841083180306">"Rekeninge en sinkronisering"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Kalenders om te sinkroniseer"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Kalenders om te sinkroniseer"</string>
     <string name="hint_what" msgid="709155115005044531">"Geleentheidnaam"</string>
     <string name="hint_where" msgid="4972598001033801974">"Ligging"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Van"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Heeldag"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalender"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Wys alle"</string>
     <string name="description_label" msgid="7193475046717505855">"Beskrywing"</string>
     <string name="presence_label" msgid="6169724148441175862">"Wys my as"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privaatheid"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Voeg herinnering by"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Geen kalenders nie"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Voordat jy \'n gebeurtenis kan byvoeg, moet jy minstens een Kalender-rekening by jou toestel voeg en \'n kalender sigbaar maak. Raak Voeg Rekekning By om \'n rekening by te voeg (as jy sopas \'n rekening bygevoeg het, wag tot dit klaar gesinkroniseer het en probeer weer). Of raak Kanselleer en maak seker dat ten minste een kalender sigbaar is."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalender werk beter met \'n rekening "\n\n"•Verky toegang tot een vanaf enige webblaaier"\n"•Rugsteun jou dienste veilig"</string>
     <string name="add_account" msgid="1669072099756774952">"Voeg rekening by"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalender:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organiseerder:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Bel"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Kitsantwoorde"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Redigeer verstek antwoorde wanneer jy aan gaste e-pos stuur"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Redigeer kitsantwoorde"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Kitsantwoord"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Kies vinnige reaksie"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Kon nie \'n e-posprogram vind nie"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Is net \'n paar minute laat."</item>
-    <item msgid="6215158751728689832">"Ek is oor ongeveer 10 minute daar."</item>
-    <item msgid="4485794001743679338">"Begin solank sonder my."</item>
-    <item msgid="8036557974294987511">"Jammer, ek kan nie meer kom nie. Ons sal moet herskeduleer."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Is net \'n paar minute laat."</item>
+        <item msgid="6215158751728689832">"Ek is oor ongeveer 10 minute daar."</item>
+        <item msgid="4485794001743679338">"Begin solank sonder my."</item>
+        <item msgid="8036557974294987511">"Jammer, ek kan nie meer kom nie. Ons sal moet herskeduleer."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Skryf jou eie"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organiseerder:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Herinneringe"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Vee uit"</string>
     <string name="save_label" msgid="2133599104834432589">"Klaar"</string>
     <string name="discard_label" msgid="2394623883289782541">"Kanselleer"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Sluimer almal"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Maak almal toe"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Sluimer"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Eenmalige gebeurtenis"</string>
     <string name="endByDate" msgid="7654221304929538201">"; tot <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; vir een keer"</item>
-    <item quantity="other" msgid="4855496837834652446">"; vir <xliff:g id="NUMBER">%d</xliff:g> kere"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Daagliks"</item>
-    <item quantity="other" msgid="5455230727715859264">"Elke <xliff:g id="NUMBER">%d</xliff:g> dae"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; vir een keer"</item>
+        <item quantity="other" msgid="4855496837834652446">"; vir <xliff:g id="NUMBER">%d</xliff:g> kere"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Daagliks"</item>
+        <item quantity="other" msgid="5455230727715859264">"Elke <xliff:g id="NUMBER">%d</xliff:g> dae"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Elke weeksdag (Ma-Vr)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Weekliks op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Elke <xliff:g id="NUMBER">%1$d</xliff:g> weke op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Weekliks op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Elke <xliff:g id="NUMBER">%1$d</xliff:g> weke op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Maandeliks"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Jaarliks"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Maandeliks (op dag <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Jaarliks (op <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Gepasmaak (kan nie op foon pasmaak nie)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Verander slegs hierdie gebeurtenis"</string>
     <string name="modify_all" msgid="4421657265864209041">"Verander alle gebeure in die reeks"</string>
@@ -173,8 +158,6 @@
     <string name="delete_this_event_title" msgid="518402946676919384">"Vee hierdie gebeurtenis uit?"</string>
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"Vee <xliff:g id="EVENTTITLE">%s</xliff:g> uit?"</string>
     <string name="change_response_title" msgid="7704714776070974984">"Verander antwoord"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"Algemene instellings"</string>
-    <string name="menu_about_preferences" msgid="6124375438237674973">Kalender ongeveer</string>
     <string name="preferences_title" msgid="8045855493262131773">"Instellings"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Instelling vir Kalender-aansig"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Kennisgewings en onthounotas"</string>
@@ -195,23 +178,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Wys kalenders en gebeurtenisse in jou tuistydsone wanneer jy reis"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Tuistydsone"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Wys weeknommer"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Meer oor"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Bouweergawe"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Geen komende kalendergebeurtenisse nie"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Eksperimenteel"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Onthounotas"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Slaan herinneringe oor"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Slaan onthounotas oor"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Stil ure"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Maak onthounotas vir geleenthede stil gedurende gespesifiseerde tyd."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Stil ure-begintyd"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Stil ure-eindtyd"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Ontfouting"</string>
     <string name="copy_db" msgid="437691290566699292">"Stuur databasis"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Deursoek tans <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Verwyder deelnemer"</string>
@@ -224,55 +199,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Voeg herinnering by"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Verwyder herinnering"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Voeg deelnemer by"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sinkroniseer kalender"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Heeldag-gebeurtenis"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Herhaling"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Herinneringstyd"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Herinneringstipe"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Wys my as"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privaatheid"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Kalender-kennisgewing"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Laat kennisgewing sluimer"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Stuur e-pos aan gaste"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Nuwe gebeurtenis"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Gebeurtenis <xliff:g id="ITEM_INDEX">%1$s</xliff:g> van <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 gebeurtenis"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> gebeurtenisse"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 gebeurtenis"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> gebeurtenisse"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 gebeurtenis"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> gebeurtenisse"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 gebeurtenis"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> gebeurtenisse"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Geselekteerde gebeurtenis"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"Moet NIE merk NIE -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Herhaal"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Herhaal nooit nie"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Elke <xliff:g id="COUNT">%d</xliff:g> dag"</item>
-    <item quantity="other" msgid="707566499994398250">"Elke <xliff:g id="COUNT">%d</xliff:g> dae"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Elke <xliff:g id="COUNT">%d</xliff:g> week"</item>
-    <item quantity="other" msgid="7094801039989237061">"Elke <xliff:g id="COUNT">%d</xliff:g> weke"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Elke <xliff:g id="COUNT">%d</xliff:g> maand"</item>
-    <item quantity="other" msgid="5419723710346646523">"Elke <xliff:g id="COUNT">%d</xliff:g> maande"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Elke <xliff:g id="COUNT">%d</xliff:g> jaar"</item>
-    <item quantity="other" msgid="5678653649746562060">"Elke <xliff:g id="COUNT">%d</xliff:g> jaar"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Elke <xliff:g id="COUNT">%d</xliff:g> dag"</item>
+        <item quantity="other" msgid="707566499994398250">"Elke <xliff:g id="COUNT">%d</xliff:g> dae"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Elke <xliff:g id="COUNT">%d</xliff:g> week"</item>
+        <item quantity="other" msgid="7094801039989237061">"Elke <xliff:g id="COUNT">%d</xliff:g> weke"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Elke <xliff:g id="COUNT">%d</xliff:g> maand"</item>
+        <item quantity="other" msgid="5419723710346646523">"Elke <xliff:g id="COUNT">%d</xliff:g> maande"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Elke <xliff:g id="COUNT">%d</xliff:g> jaar"</item>
+        <item quantity="other" msgid="5678653649746562060">"Elke <xliff:g id="COUNT">%d</xliff:g> jaar"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"op dieselfde dag elke maand"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Vir altyd"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Tot \'n datum"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Tot <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Vir \'n aantal geleenthede"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Vir <xliff:g id="EVENT_COUNT">%d</xliff:g> geleentheid"</item>
-    <item quantity="other" msgid="8779598489398048259">"Vir <xliff:g id="EVENT_COUNT">%d</xliff:g> geleenthede"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Vir <xliff:g id="EVENT_COUNT">%d</xliff:g> geleentheid"</item>
+        <item quantity="other" msgid="8779598489398048259">"Vir <xliff:g id="EVENT_COUNT">%d</xliff:g> geleenthede"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"verander einddatum"</string>
   <string name="visibility_default">Verstek</string>
   <string name="visibility_private">Privaat</string>
@@ -290,5 +257,6 @@
     <string name="preferences_licence">lisensie</string>
     <string name="preferences_privacy_policy">Privaatheidsbeleid</string>
   <string name="preferences_service_terms">Diensvoorwaardes</string>
+    <string name="menu_about_preferences">Kalender ongeveer</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 4cee8a769e78757c9e8e149bb74c0bd717990945..737e7ef49f86d63d62926ed7298cb7f3d7e516ae 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"የሚገኝ"</item>
     <item msgid="2064426942462573474">"ጊዜያዊ"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"አንደኛ"</item>
-    <item msgid="5631923029483854900">"ሁለተኛ"</item>
-    <item msgid="148935502975250973">"ሦስተኛ"</item>
-    <item msgid="5124200797326669172">"አራተኛ"</item>
-    <item msgid="7564374178324652137">"መጨረሻ"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"ምንም  ምላሽ የለም"</item>
     <item msgid="3724434080904437698">"አዎ"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"ይሄ እና የወደፊት ክስተቶች"</item>
     <item msgid="7833229563617435430">"ሁሉም ክስተቶች"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"ይህ&amp; የወደፊት ዝግጅቶች"</item>
-    <item msgid="6315440193748139854">"ሁሉም ክስተቶች"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"ይህ ክስተት ብቻ"</item>
     <item msgid="140670561403965380">"ሁሉም ዝግጅቶች በተከታታይ"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 37a37dcb2d973d2531d945d362ce7de08e247f3b..b44040f6ec43b0ca3d59a207cfa1754ab200d004 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"የቀን መቁጠሪያ"</string>
     <string name="what_label" msgid="1933578391985810049">"ምን"</string>
     <string name="where_label" msgid="3472482206065595118">"የት"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"ነገ"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"ዛሬ <xliff:g id="TIME_INTERVAL">%s</xliff:g> ላይ"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"ነገ <xliff:g id="TIME_INTERVAL">%s</xliff:g> ላይ"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>፣ <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"ድግግሞሽ"</string>
     <string name="no_title_label" msgid="302177118061368042">"(አርእስት አልባ)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> ደቂቃዎች"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> ደቂቃዎች"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> ሰዓቶች"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> ቀን"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"ሳምንት <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> ደቂቃዎች"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> ደቂቃዎች"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> ሰዓቶች"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> ቀን"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"ሳምንት <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"አድስ"</string>
     <string name="show_day_view" msgid="5782512782605466016">"ቀን አሳይ"</string>
     <string name="agenda_view" msgid="5566084759423843245">"አጀንዳ"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"ክስተት ሰርዝ"</string>
     <string name="goto_today" msgid="9162136434410891230">"ዛሬ"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"ቅንብሮች"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"የቀን መቁጠሪያ ለማሳየት"</string>
     <string name="search" msgid="550656004486017426">"ፍለጋ"</string>
     <string name="hide_controls" msgid="830320505938520882">"መቆጣጠሪያዎች ደብቅ"</string>
     <string name="show_controls" msgid="715520586028062621">"ቁጥጥሮችን አሳይ"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"የቀን መቁጠሪያ ለማሳየት"</string>
-    <string name="synced" msgid="7913940305983383493">"አሳምሯል"</string>
-    <string name="not_synced" msgid="4275114941801829419">"አላሳመረም"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"ይህ መለያ አልሰመረም እና የቀን መቁጠሪያህ የጊዜው ላይሆን ይችላል።"</string>
-    <string name="accounts" msgid="849401841083180306">"መለያዎች &amp; አስምር"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"የቀን መቁጠሪያ ለማመሳሰያ"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"የቀን መቁጠሪያ ለአስምር"</string>
     <string name="hint_what" msgid="709155115005044531">"የዝግጅት ስም"</string>
     <string name="hint_where" msgid="4972598001033801974">"ስፍራ"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"ከ"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"ሙሉ ቀን"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"የቀን መቁጠሪያ"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"ሁሉንም አሳይ"</string>
     <string name="description_label" msgid="7193475046717505855">"መግለጫ"</string>
     <string name="presence_label" msgid="6169724148441175862">"እንደ አሳየኝ"</string>
     <string name="privacy_label" msgid="9215031965259597335">"ግላዊነት"</string>
     <string name="reminders_label" msgid="7292389181815525676">"ማስታወሻ አክል"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"ምንም ቀንመቁጠሪያ ዎች የለዎትም"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"ክስተት ከማከልህ በፊት ቢያንስ አንድ የቀን መቁጠሪያ መለያ ወደ መሳሪያህ ማከል እና የቀን መቁጠሪያውን የሚታይ ማድረግ አለብህ:: መለያ ለማከል መለያ አክል የሚለውን ንካ (መለያ ያከልክ ከሆነ ማመሳስል እስኪጨርስ ድረስ ጠብቀውና እንደገና ሞክር):: ወይም ተወው የሚለውን ንካ እና ቢያንስ አንድ የቀን መቁጠሪያ የሚታይ መሆኑን አረጋግጥ::"</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"የቀን መቁጠሪያዎች በGoogle መለያ የተሻለ ይሰራሉ።"\n\n"• ከማንኛውም የድረ ማሰሻ ላይ ይድረሱበት።"\n"• ዝግጅቶችዎን በደንብ ያስጠብቁ"</string>
     <string name="add_account" msgid="1669072099756774952">"መለያ አክል"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"የቀን አቆጣጠር:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"አዘጋጅ፡"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"ደውል"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"ፈጣን ምላሾች"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"ለእንግዶች ኢሜይል ሲላክ ነባሪ ምላሾችን አርትዕ"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"ፈጣን ምላሾችን አርትዕ"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"ፈጣን ምላሽ"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"ፈጣን ምላሽ ምረጥ"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"የኢሜይል ፕሮግራም ማግኘት አልተቻለም"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"ደርሻለሁ አንድ ሁለት ደቂቃ ጠብቀኝ።"</item>
-    <item msgid="6215158751728689832">"በ10 ደቂቃ ውስጥ እደርሳለሁ።"</item>
-    <item msgid="4485794001743679338">"እኔን አትጠብቁኝ፣ ጀምሩ።"</item>
-    <item msgid="8036557974294987511">"ይቅርታ ልደርስ አልችልም። ለሌላ ጊዜ ቀጠሮ ማስያዝ ይኖርብናል።"</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"ደርሻለሁ አንድ ሁለት ደቂቃ ጠብቀኝ።"</item>
+        <item msgid="6215158751728689832">"በ10 ደቂቃ ውስጥ እደርሳለሁ።"</item>
+        <item msgid="4485794001743679338">"እኔን አትጠብቁኝ፣ ጀምሩ።"</item>
+        <item msgid="8036557974294987511">"ይቅርታ ልደርስ አልችልም። ለሌላ ጊዜ ቀጠሮ ማስያዝ ይኖርብናል።"</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"የእራስዎን ይጻፉ…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"አዘጋጅ፡"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"ማስታወሻዎች"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"ሰርዝ"</string>
     <string name="save_label" msgid="2133599104834432589">"ተከናውኗል"</string>
     <string name="discard_label" msgid="2394623883289782541">"ይቅር"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"ሁሉንም አቆይ"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"እንቢበል"</string>
     <string name="snooze_label" msgid="1515893621063224666">"ማሸለብ"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"የአንድ ጊዜ ክስተት"</string>
     <string name="endByDate" msgid="7654221304929538201">"፤ እስከ <xliff:g id="DATE">%s</xliff:g> ድረስ"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"፤ ለአንድ ጊዜ"</item>
-    <item quantity="other" msgid="4855496837834652446">"፤ ለ<xliff:g id="NUMBER">%d</xliff:g> ጊዜያት"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"ዕለታዊ"</item>
-    <item quantity="other" msgid="5455230727715859264">"በየ<xliff:g id="NUMBER">%d</xliff:g> ቀናት"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"፤ ለአንድ ጊዜ"</item>
+        <item quantity="other" msgid="4855496837834652446">"፤ ለ<xliff:g id="NUMBER">%d</xliff:g> ጊዜያት"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"ዕለታዊ"</item>
+        <item quantity="other" msgid="5455230727715859264">"በየ<xliff:g id="NUMBER">%d</xliff:g> ቀናት"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"በአዘቦት ቀን(ሰኞ-አርብ)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"በየሳምንቱ <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> ላይ"</item>
-    <item quantity="other" msgid="2857390143157377867">"በየ<xliff:g id="NUMBER">%1$d</xliff:g> ሳምንቱ <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> ላይ"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"በየሳምንቱ <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> ላይ"</item>
+        <item quantity="other" msgid="2857390143157377867">"በየ<xliff:g id="NUMBER">%1$d</xliff:g> ሳምንቱ <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> ላይ"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"ወርሃዊ"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"በየአመቱ"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"በየወሩ(በ<xliff:g id="DAY_OF_MONTH">%s</xliff:g>ቀን)"</string>
-    <string name="yearly" msgid="8576208380302949002">"በየአመቱ(በ<xliff:g id="DATES">%s</xliff:g>"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"ብጁ....(ስልክ ላይ ማበጀት አይቻልም)"</string>
     <string name="modify_event" msgid="5982876409997142690">"ይህንን ክስተት ብቻ ለውጥ"</string>
     <string name="modify_all" msgid="4421657265864209041">"በተከታታይ ውስጥ ያሉ ክስተቶችን ለውጥ።"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"ሲጓዙ የቀን መቁጠሪያዎችን እና የክስተት ሰዓቶችን በሀገርዎ ሰዓት ሰቅ ውስጥ ያሳዩ"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"የሀገር ሰዓት ሰቅ"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"የሣምንት ቁጥር አሳይ"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"ስለ"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"የግንባታ ሥሪት"</string>
-    <string name="gadget_title" msgid="939918875331310945">"የቀን አቆጣጠር"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"በቅርቡ ምንም ክስተቶች የሉም"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"የሙከራ"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"ማስታወሻዎች"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"ማስታወሻዎችን ዝለል"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"ማስታወሻዎችን ዝለል"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"የጸጥታ ሰዓታት"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"የጸጥታ ክስተት ማስታወሻዎች በተገለጸው ጊዜ ላይ።"</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"የጸጥታ ሰዓታት መጀመሪያ ጊዜ"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"የጸጥታ ሰዓታት ማብቂያ ጊዜ"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"ስህተት በማስወገድ ላይ"</string>
     <string name="copy_db" msgid="437691290566699292">"የውሂብ ጎታ ላክ"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"በመፈለግ ላይ<xliff:g id="DOMAIN">%s</xliff:g>..."</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"ተካፋይ አስወግድ"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"ማስታወሻ አክል"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"ማስታወሻ አስወግድ"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"ተሳታፊ አክል"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"የቀን አቆጣጠር አስምር"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"የሙሉ ቀን ክስተት"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"ድግግሞሽ"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"የማስታወሻ አይነት"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"የማስታወሻ ጊዜ"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"አሳየኝ እንደ"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"ግላዊነት"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"የቀን መቁጠሪያ ማሳወቂያዎች"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"የማሳወቂያ ድምፅ"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"ለእንግዶች ኢሜይል ላክ"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ አዲስ ክስተት"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"ክስተት <xliff:g id="ITEM_INDEX">%1$s</xliff:g>ከ<xliff:g id="ITEM_COUNT">%2$s</xliff:g>"</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 ክስተት"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> ክስተቶች"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 ክስተት"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> ክስተቶች"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 ክስተት"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> ክስተቶች"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 ክስተት"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> ክስተቶች"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"የተመረጠ ክስተት"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"ምልክት እንዳታደርግበት -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"ድገም"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"በጭራሽ አይደገምም"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"በየ<xliff:g id="COUNT">%d</xliff:g> ቀን"</item>
-    <item quantity="other" msgid="707566499994398250">"በየ<xliff:g id="COUNT">%d</xliff:g> ቀን"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"በየ<xliff:g id="COUNT">%d</xliff:g> ሳምንት"</item>
-    <item quantity="other" msgid="7094801039989237061">"በየ<xliff:g id="COUNT">%d</xliff:g> ሳምንት"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"በየ<xliff:g id="COUNT">%d</xliff:g> ወር"</item>
-    <item quantity="other" msgid="5419723710346646523">"በየ<xliff:g id="COUNT">%d</xliff:g> ወር"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"በየ<xliff:g id="COUNT">%d</xliff:g> ዓመት"</item>
-    <item quantity="other" msgid="5678653649746562060">"በየ<xliff:g id="COUNT">%d</xliff:g> ዓመት"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"በየ<xliff:g id="COUNT">%d</xliff:g> ቀን"</item>
+        <item quantity="other" msgid="707566499994398250">"በየ<xliff:g id="COUNT">%d</xliff:g> ቀን"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"በየ<xliff:g id="COUNT">%d</xliff:g> ሳምንት"</item>
+        <item quantity="other" msgid="7094801039989237061">"በየ<xliff:g id="COUNT">%d</xliff:g> ሳምንት"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"በየ<xliff:g id="COUNT">%d</xliff:g> ወር"</item>
+        <item quantity="other" msgid="5419723710346646523">"በየ<xliff:g id="COUNT">%d</xliff:g> ወር"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"በየ<xliff:g id="COUNT">%d</xliff:g> ዓመት"</item>
+        <item quantity="other" msgid="5678653649746562060">"በየ<xliff:g id="COUNT">%d</xliff:g> ዓመት"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"በየወሩ በተመሳሳዩ ቀን ላይ"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"ለዘለዓለም"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"እስከ አንድ ቀን ድረስ"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"እስከ <xliff:g id="DATE">%s</xliff:g> ድረስ"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"ለተወሰነ የክስተቶች ብዛት"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"ለ<xliff:g id="EVENT_COUNT">%d</xliff:g> ክስተት"</item>
-    <item quantity="other" msgid="8779598489398048259">"ለ<xliff:g id="EVENT_COUNT">%d</xliff:g> ክስተቶች"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"ለ<xliff:g id="EVENT_COUNT">%d</xliff:g> ክስተት"</item>
+        <item quantity="other" msgid="8779598489398048259">"ለ<xliff:g id="EVENT_COUNT">%d</xliff:g> ክስተቶች"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"የመጨረሻውን ቀን ቀይር"</string>
     <string name="visibility_default">ነባሪ</string>
   <string name="visibility_private">የግል</string>
@@ -285,4 +254,4 @@
     <string name="preferences_privacy_policy">የግላዊነት ፖሊሲ</string>
   <string name="preferences_service_terms">የአገልግሎት ውሎች</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 44409a151d8137f2ab403602bdfbd6ca0f3bfecb..b20ed1f8c587cf5a48a0e5308a2737bca96daa72 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"متواجد"</item>
     <item msgid="2064426942462573474">"مبدئي"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"أول"</item>
-    <item msgid="5631923029483854900">"ثانية"</item>
-    <item msgid="148935502975250973">"الثالث"</item>
-    <item msgid="5124200797326669172">"الرابع"</item>
-    <item msgid="7564374178324652137">"الأخير"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"لا استجابة"</item>
     <item msgid="3724434080904437698">"نعم"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"هذا الحدث والأحداث المستقبلية"</item>
     <item msgid="7833229563617435430">"جميع الأحداث"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"هذا الحدث والأحداث المستقبلية"</item>
-    <item msgid="6315440193748139854">"جميع الأحداث"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"هذا الحدث فقط"</item>
     <item msgid="140670561403965380">"جميع الأحداث في سلسلة الأحداث"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 424fdc35125db0a6c2430867fbc99577efe167bc..8a8726b90c2f41565bee9387d2d1d13dc3c31388 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -12,9 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
-     -->
-
-    <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+     --><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"التقويم"</string>
     <string name="what_label" msgid="1933578391985810049">"الحدث"</string>
     <string name="where_label" msgid="3472482206065595118">"المكان"</string>
@@ -25,7 +23,9 @@
     <string name="tomorrow" msgid="614434811813859237">"غدًا"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"اليوم في <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"غدًا في <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>، <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"التكرار"</string>
     <string name="no_title_label" msgid="302177118061368042">"(بلا عنوان)"</string>
     <plurals name="Nminutes">
@@ -59,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"حذف حدث"</string>
     <string name="goto_today" msgid="9162136434410891230">"اليوم"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"الإعدادات"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"عرض تقاويم"</string>
     <string name="search" msgid="550656004486017426">"بحث"</string>
     <string name="hide_controls" msgid="830320505938520882">"إخفاء عناصر التحكم"</string>
     <string name="show_controls" msgid="715520586028062621">"عرض عناصر التحكم"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"التقاويم المطلوب عرضها"</string>
-    <string name="synced" msgid="7913940305983383493">"تمت مزامنته"</string>
-    <string name="not_synced" msgid="4275114941801829419">"لم تتم مزامنته"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"لم تتم مزامنة هذا الحساب ولذلك قد لا تكون تقويماتك محدثة."</string>
-    <string name="accounts" msgid="849401841083180306">"الحسابات والمزامنة"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"التقاويم المطلوب مزامنتها"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"التقاويم المطلوب مزامنتها"</string>
     <string name="hint_what" msgid="709155115005044531">"اسم الحدث"</string>
     <string name="hint_where" msgid="4972598001033801974">"الموقع"</string>
@@ -87,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"من"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"اليوم كله"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"التقويم"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"عرض الكل"</string>
     <string name="description_label" msgid="7193475046717505855">"الوصف"</string>
     <string name="presence_label" msgid="6169724148441175862">"حالتي المعروضة هي"</string>
     <string name="privacy_label" msgid="9215031965259597335">"الخصوصية"</string>
     <string name="reminders_label" msgid="7292389181815525676">"إضافة تذكير"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"بلا تقاويم"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"قبل أن تتمكن من إضافة حدث، يتعين عليك إضافة حساب تقويم واحد على الأقل إلى جهازك وجعل أحد التقويمات مرئيًا. يمكنك لمس \"إضافة حساب\" لإضافة حساب (إذا أضفت حسابًا، فانتظر حتى تكتمل عملية مزامنته وحاول مرة أخرى). أو يمكنك لمس \"إلغاء\" والتأكد من أن تقويمًا واحدًا على الأقل مرئي."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"يعمل التقويم بشكل أفضل مع حساب Google.‏"\n\n"• يمكنك الدخول إليه من أي متصفح ويب"\n"• يمكنك نسخ أحداثك احتياطيًا بشكل آمن"</string>
     <string name="add_account" msgid="1669072099756774952">"إضافة حساب"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"التقويم:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"المنظِّم:"</string>
@@ -115,7 +106,6 @@
     <string name="call_label" msgid="2960328220008869083">"اتصال"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"الردود السريعة"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"تعديل الردود الافتراضية في المراسلة الإلكترونية للمدعوين"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"تعديل الردود السريعة"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"رد سريع"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"اختيار رد سريع"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"أخفق العثور على برنامج بريد إلكتروني"</string>
@@ -140,7 +130,6 @@
     <string name="delete_label" msgid="874742811918030739">"حذف"</string>
     <string name="save_label" msgid="2133599104834432589">"تم"</string>
     <string name="discard_label" msgid="2394623883289782541">"إلغاء"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"غفوة مؤقتة للكل"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"استبعاد الكل"</string>
     <string name="snooze_label" msgid="1515893621063224666">"غفوة"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"حدث لمرة واحدة"</string>
@@ -160,8 +149,6 @@
     </plurals>
     <string name="monthly" msgid="4587116285383048586">"شهريًا"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"سنويًا"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"شهريًا ( يوم <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"سنويًا (بتاريخ <xliff:g id="DATES">%s</xliff:g>)"</string>
     <string name="custom" msgid="4137468716966004993" product="default">"مخصص (يتعذر التخصيص على الهاتف)"</string>
     <string name="modify_event" msgid="5982876409997142690">"تغيير هذا الحدث فقط"</string>
     <string name="modify_all" msgid="4421657265864209041">"تغيير جميع الأحداث في سلسلة الأحداث"</string>
@@ -193,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"لعرض التقويمات وأوقات الأحداث في المنطقة الزمنية الأساسية أثناء السفر"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"المنطقة الزمنية الأساسية"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"إظهار رقم الأسبوع"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"حول"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"نسخة الإصدار"</string>
-    <string name="gadget_title" msgid="939918875331310945">"التقويم"</string>
     <plurals name="month_more_events">
         <item msgid="8971334808414201327" quantity="one">"1+"</item>
         <item msgid="1997405398178470838" quantity="other">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
     </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"لا توجد أحداث تقويم قادمة"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"إصدار تجريبي"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"التذكيرات"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"تخطي التذكيرات"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"تخطي التذكيرات"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"ساعات الهدوء"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"رسائل تذكير صامتة بالأحداث خلال وقت محدد."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"وقت بدء ساعات الهدوء"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"وقت انتهاء ساعات الهدوء"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"تصحيح الأخطاء"</string>
     <string name="copy_db" msgid="437691290566699292">"إرسال قاعدة البيانات"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"جارِ البحث في <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"إزالة أحد الحضور"</string>
@@ -222,16 +201,11 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"إضافة تذكير"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"إزالة التذكير"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"إضافة أحد الحضور"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"مزامنة التقويم"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"حدث اليوم كله"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"التكرار"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"وقت التذكير"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"نوع التذكير"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"حالتي المعروضة هي"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"الخصوصية"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"إشعار التقويم"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"إشعار الغفوة"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"إرسال بريد إلكتروني إلى المدعوين"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ حدث جديد"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"الحدث <xliff:g id="ITEM_INDEX">%1$s</xliff:g> من <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
     <plurals name="Nevents">
@@ -243,9 +217,6 @@
         <item msgid="3609243840882275136" quantity="other">"+<xliff:g id="COUNT">%d</xliff:g> من الأحداث"</item>
     </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"حدث محدد"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"لا تحدد -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"التكرار"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"لا يتكرر"</string>
     <plurals name="recurrence_interval_daily">
         <item msgid="1205422710088692631" quantity="one">"كل <xliff:g id="COUNT">%d</xliff:g> يوم"</item>
         <item msgid="707566499994398250" quantity="other">"كل <xliff:g id="COUNT">%d</xliff:g> يوم"</item>
@@ -309,8 +280,8 @@
     <string name="default_start_title">العرض الافتراضي</string>
     <string name="cal_import_menu_title">استيراد حدث</string>
     <string name="cal_nothing_to_import">لا شيء للاستيراد</string>
-    <string name="view_details">عرض التفاصيل</string>
+    <string name="display_options">عرض التفاصيل</string>
     <string name="display_time">عرض الوقت</string>
     <string name="display_location">عرض الموقع</string>
     <string name="show_time_no">لا تظهر الوقت</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 092bddc8b3fda5164becba301e369a78c659c77c..59303ed00c4bbb08ebf60b64ca3d5b7a048938df 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Даступны"</item>
     <item msgid="2064426942462573474">"Часова"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"першы"</item>
-    <item msgid="5631923029483854900">"другі"</item>
-    <item msgid="148935502975250973">"трэці"</item>
-    <item msgid="5124200797326669172">"чацвёрты"</item>
-    <item msgid="7564374178324652137">"апошні"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Няма адказу"</item>
     <item msgid="3724434080904437698">"Так"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Гэта і будучыя мерапрыемствы"</item>
     <item msgid="7833229563617435430">"Усе падзеі"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Гэтыя i будучыя падзеі"</item>
-    <item msgid="6315440193748139854">"Усе падзеі"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Толькі гэта мерапрыемства"</item>
     <item msgid="140670561403965380">"Усе падзеі ў серыі"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2fc0bdac8f659c2fd6be52154dce0fd3e3a3a653..fbcc85dcc81f9c1e1fbdda0d4ed98f0243b1672f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -76,16 +76,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Выдаліць падзею"</string>
     <string name="goto_today" msgid="9162136434410891230">"Сёння"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Налады"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">Календары</string>
     <string name="search" msgid="550656004486017426">"Пошук"</string>
     <string name="hide_controls" msgid="830320505938520882">"Схаваць кіраванне"</string>
     <string name="show_controls" msgid="715520586028062621">"Паказаць кіраванне"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Календары для адлюстравання"</string>
-    <string name="synced" msgid="7913940305983383493">"сінхранізаваныя"</string>
-    <string name="not_synced" msgid="4275114941801829419">"не сінхранізаваны"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Гэты ўліковы запіс не сінхранізаваны, i вашыя календары маглi састарэць."</string>
-    <string name="accounts" msgid="849401841083180306">"Уліковыя запісы і сінхранізацыя"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Календары для сiнхранiзацыi"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Календары для сінхранізацыі"</string>
     <string name="hint_what" msgid="709155115005044531">"Назва падзеі"</string>
     <string name="hint_where" msgid="4972598001033801974">Месца</string>
@@ -104,14 +97,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Ад"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Увесь дзень"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Каляндар"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Паказаць усё"</string>
     <string name="description_label" msgid="7193475046717505855">"Апісанне"</string>
     <string name="presence_label" msgid="6169724148441175862">"Паказваць як"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Прыватнасць"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Дадаць напамін"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Няма календароў"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Перш чым дадаваць мерапрыемствы, трэба дадаць хаця б адзін улiковы запiс Calendar на прыладу і зрабіць каляндар бачным. Нацiснiце \"Дадаць улiковы запiс\" (калi вы толькi што дадалi яго, пачакайце, пакуль скончыцца сiнхранiзацыя i паўтарыце спробу). Цi выберыце \"Адмянiць\", каб упэўнiцца, што як мiнiмум адзiн каляндар бачны."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Служба Calendar лепш працуе з уліковым запісам Google."\n\n"•Доступ да яе можна атрымаць з любога вэб-браўзэра"\n"•Выканайце рэзервовае капіяванне сваiх мерапрыемстваў"</string>
     <string name="add_account" msgid="1669072099756774952">"Дадаць уліковы запіс"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Каляндар:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Арганізатар:"</string>
@@ -132,7 +123,6 @@
     <string name="call_label" msgid="2960328220008869083">"Выклік"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Хуткія адказы"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Змяніць адказы па змаўчанні пры адпраўцы электронных лістоў гасцям"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Рэд. хутк. адказы"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Хуткі адказ"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Выбраць хуткі адказ"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Не атрымалася знайсці паштовую праграму"</string>
@@ -157,7 +147,6 @@
     <string name="delete_label" msgid="874742811918030739">"Выдаліць"</string>
     <string name="save_label" msgid="2133599104834432589">"Гатова"</string>
     <string name="discard_label" msgid="2394623883289782541">"Адмена"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Адкласці ўсе"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Адмяніць усё"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Адкласці"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Аднаразовая падзея"</string>
@@ -183,8 +172,6 @@
     </plurals>
     <string name="monthly" msgid="4587116285383048586">"Штомесяц"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Штогод"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Штомесяц (у дзень <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Штогод (па <xliff:g id="DATES">%s</xliff:g>)"</string>
     <string name="custom" product="default" msgid="4137468716966004993">"Карыстальніцкія (не атрымліваецца наладзіць на тэлефоне)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Змяніць толькі гэта мерапрыемства"</string>
     <string name="modify_all" msgid="4421657265864209041">Змяніць усе падзеі ў серыі</string>
@@ -216,9 +203,7 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Адлюстроўваць календары і падзеі у вашым хатнім гадзінным поясе падчас падарожжа"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Хатні гадзінны пояс"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Паказаць нумар тыдня"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Звесткі"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Версія зборкі"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Каляндар"</string>
     <plurals name="month_more_events">
         <item quantity="one">+1</item>
         <item quantity="few">+<xliff:g id="NUMBER">%d</xliff:g>
@@ -228,14 +213,8 @@
     </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Няма падзей календара, якія павiнны адбыцца"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Эксперыментальнае"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Напаміны"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Прапусціць нагадванні"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Прапусціць нагадванні"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Ціхія гадзіны"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Сцiшыць напамiны ў паказаны час."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Час пачатку цiхiх гадзiн"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Сцiшыць канцы гадзіны часу"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Адладка"</string>
     <string name="copy_db" msgid="437691290566699292">"Адправіць базу дадзеных"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">Пошук <xliff:g id="DOMAIN">%s</xliff:g>…</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Выдаліць удзельніка"</string>
@@ -248,16 +227,11 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Дадаць напамін"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Выдаліць напамін"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Дадаць удзельніка"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Сінхранізаваць каляндар"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Цэлы дзень"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">Паўтарэнне</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Дата напаміну"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Тып напаміну"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Паказваць як"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Канфідэнцыяльнасть"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Апавяшчэннi календара"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Адключыць апавяшчэнне"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Напiсаць гасцям"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Новае мерапрыемства"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Падзея <xliff:g id="ITEM_INDEX">%1$s</xliff:g> з <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
     <plurals name="Nevents">
@@ -273,9 +247,6 @@
         <item quantity="many">+<xliff:g id="count">%d</xliff:g> падзей</item>
     </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Выдзеленыя мерапрыемствы"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"НЕ правяраць -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Паўтарыць"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Ніколі не паўтараецца"</string>
     <plurals name="recurrence_interval_daily">
         <item quantity="one">Кожны <xliff:g id="COUNT">%d</xliff:g> дзень</item>
         <item quantity="few">Кожныя <xliff:g id="COUNT">%d</xliff:g> дні</item>
@@ -316,12 +287,6 @@
     <string name="preferences_dark_theme">Цёмная</string>
     <string name="preferences_black_theme">Чорная</string>
     <string name="preferences_color">Асноўны колер</string>
-    <string name="preferences_color_teal">бірузовы</string>
-    <string name="preferences_color_blue">сіні</string>
-    <string name="preferences_color_orange">памаранчавы</string>
-    <string name="preferences_color_green">зялёны</string>
-    <string name="preferences_color_red">чырвоны</string>
-    <string name="preferences_color_purple">фіялетавы</string>
     <string name="preferences_color_pick">Асноўны колер</string>
     <string name="preferences_days_per_week_title">Дзён у тыдні</string>
     <string name="preferences_days_per_week_dialog">Дзён у тыдні</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 72aad36000056d5d7e431a7a04a9ecba6acf6f53..d253a9215d54c135f65947f1d268a6d5c59e8af2 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"На разположение"</item>
     <item msgid="2064426942462573474">"Колебливо"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"първо"</item>
-    <item msgid="5631923029483854900">"второ"</item>
-    <item msgid="148935502975250973">"трето"</item>
-    <item msgid="5124200797326669172">"четвърто"</item>
-    <item msgid="7564374178324652137">"посл."</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Няма отговор"</item>
     <item msgid="3724434080904437698">"Да"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Това и бъдещи събития"</item>
     <item msgid="7833229563617435430">"Всички събития"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Това и бъдещи събития"</item>
-    <item msgid="6315440193748139854">"Всички събития"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Само това събитие"</item>
     <item msgid="140670561403965380">"Всички събития в поредицата"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f2ec5cb61b08ca03d1f5b0a61309eba6d9032d78..18bece5778f200b660d43f754d75b89fecd6a358 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Календар"</string>
     <string name="what_label" msgid="1933578391985810049">"Какво"</string>
     <string name="where_label" msgid="3472482206065595118">"Къде"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Утре"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Днес от <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Утре от <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Повторение"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Без заглавие)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 минута"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> минути"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 мин"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> мин"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 час"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> часа"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 ден"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> дни"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"СЕДМИЦА <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 минута"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> минути"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 мин"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> мин"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 час"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> часа"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 ден"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> дни"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"СЕДМИЦА <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Опресняване"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Показване на деня"</string>
     <string name="agenda_view" msgid="5566084759423843245">"График"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Изтриване на събитие"</string>
     <string name="goto_today" msgid="9162136434410891230">"Днес"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Настройки"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Календари"</string>
     <string name="search" msgid="550656004486017426">"Търсене"</string>
     <string name="hide_controls" msgid="830320505938520882">"Контроли: Скриване"</string>
     <string name="show_controls" msgid="715520586028062621">"Контроли: Показване"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Календари за показване"</string>
-    <string name="synced" msgid="7913940305983383493">"синхронизирано"</string>
-    <string name="not_synced" msgid="4275114941801829419">"не е синхронизирано"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Този профил не е синхронизиран, затова е възможно календарите ви да не са актуални."</string>
-    <string name="accounts" msgid="849401841083180306">"Профили и синхронизиране"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Календари за синхронизиране"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Календари за синхронизиране"</string>
     <string name="hint_what" msgid="709155115005044531">"Име на събитието"</string>
     <string name="hint_where" msgid="4972598001033801974">"Местоположение"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"От"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Цял ден"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Календар"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Показване на всички"</string>
     <string name="description_label" msgid="7193475046717505855">"Описание"</string>
     <string name="presence_label" msgid="6169724148441175862">"Показване като"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Поверителност"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Добавяне: Напомняне"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Няма календари"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Преди да можете да добавите събитие, в устройството трябва да има поне един профил в Google Календар и да направите видим календар. За целта докоснете „Добавяне на профил“ (ако току-що сте направили това, изчакайте синхронизирането да завърши и опитайте отново). Или докоснете „Отказ“ и се уверете, че поне един календар е видим."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Приложението Календар работи по-добре с профил в Google."\n\n"• Осъществявайте достъп до него от всеки уеб браузър."\n"• Създавайте надеждни резервни копия на събитията си."</string>
     <string name="add_account" msgid="1669072099756774952">"Добавяне на профил"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Календар:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Организатор:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Обаждане"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Бързи отговори"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Редакт. на отговорите по подразб. при изпращ. на имейли до гостите"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Бързи отг.: Редакт."</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Бърз отговор"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Изберете бърз отговор"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Намирането на програма за електронна поща не бе успешно"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Ще закъснея няколко минути."</item>
-    <item msgid="6215158751728689832">"Ще пристигна след около 10 минути."</item>
-    <item msgid="4485794001743679338">"Можете да започнете без мен."</item>
-    <item msgid="8036557974294987511">"За съжаление няма да успея. Ще трябва да пренасрочим събитието."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Ще закъснея няколко минути."</item>
+        <item msgid="6215158751728689832">"Ще пристигна след около 10 минути."</item>
+        <item msgid="4485794001743679338">"Можете да започнете без мен."</item>
+        <item msgid="8036557974294987511">"За съжаление няма да успея. Ще трябва да пренасрочим събитието."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Напишете свой собствен…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Организатор:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Напомняния"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Изтриване"</string>
     <string name="save_label" msgid="2133599104834432589">"Готово"</string>
     <string name="discard_label" msgid="2394623883289782541">"Отказ"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Отлагане на всички"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Отхвърляне на всички"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Отлагане"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Еднократно събитие"</string>
     <string name="endByDate" msgid="7654221304929538201">"– до <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"– по един път"</item>
-    <item quantity="other" msgid="4855496837834652446">"– по <xliff:g id="NUMBER">%d</xliff:g> пъти"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Ежедневно"</item>
-    <item quantity="other" msgid="5455230727715859264">"На всеки <xliff:g id="NUMBER">%d</xliff:g> дни"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"– по един път"</item>
+        <item quantity="other" msgid="4855496837834652446">"– по <xliff:g id="NUMBER">%d</xliff:g> пъти"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Ежедневно"</item>
+        <item quantity="other" msgid="5455230727715859264">"На всеки <xliff:g id="NUMBER">%d</xliff:g> дни"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Всеки делничен ден (пн – пт)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Ежеседмично в/ъв <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"На всеки <xliff:g id="NUMBER">%1$d</xliff:g> седмици в/ъв <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Ежеседмично в/ъв <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"На всеки <xliff:g id="NUMBER">%1$d</xliff:g> седмици в/ъв <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Всеки месец"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Всяка година"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Всеки месец (на <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Всяка година (на <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Персонализирано (не може да се извърши от телефон)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Промяна само на това събитие"</string>
     <string name="modify_all" msgid="4421657265864209041">"Промяна на всички събития в поредицата"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Показва календарите и събитията с часовата ви зона у дома, когато сте на път"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Часова зона у дома"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Показване на номера на седмицата"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Информация"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Версия"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Календар"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Няма предстоящи събития от календара"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Експериментални"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Напомняния"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Напомняния: Пропускане"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Напомняния: Пропускане"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Време за тишина"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Заглушаване на напомнянията за събития в посочения интервал от време."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Начален час за тишина"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Краен час за тишина"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Отстраняване на грешки"</string>
     <string name="copy_db" msgid="437691290566699292">"Изпращане на базата от данни"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Търси се <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Премахване на участник"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Добавяне на напомняне"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Премахване на напомнянето"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Добавяне на участник"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Синхронизиране на календара"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Целодневно събитие"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Повторение"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Час за напомняне"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Тип напомняне"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Показване като"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Поверителност"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Известие от Календар"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Отлагане на известието"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Изпращане на имейл до гостите"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Ново събитие"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Събитие <xliff:g id="ITEM_INDEX">%1$s</xliff:g> от <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 събитие"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> събития"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+ 1 събитие"</item>
-    <item quantity="other" msgid="3609243840882275136">"+ <xliff:g id="COUNT">%d</xliff:g> събития"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 събитие"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> събития"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+ 1 събитие"</item>
+        <item quantity="other" msgid="3609243840882275136">"+ <xliff:g id="COUNT">%d</xliff:g> събития"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Избрано събитие"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"НЕ отмятайте –&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Повтаряне"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Без повтаряне"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"На <xliff:g id="COUNT">%d</xliff:g> ден"</item>
-    <item quantity="other" msgid="707566499994398250">"На <xliff:g id="COUNT">%d</xliff:g> дни"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"На <xliff:g id="COUNT">%d</xliff:g> седмица"</item>
-    <item quantity="other" msgid="7094801039989237061">"На <xliff:g id="COUNT">%d</xliff:g> седмици"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"На <xliff:g id="COUNT">%d</xliff:g> месец"</item>
-    <item quantity="other" msgid="5419723710346646523">"На <xliff:g id="COUNT">%d</xliff:g> месеца"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"На <xliff:g id="COUNT">%d</xliff:g> година"</item>
-    <item quantity="other" msgid="5678653649746562060">"На <xliff:g id="COUNT">%d</xliff:g> години"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"На <xliff:g id="COUNT">%d</xliff:g> ден"</item>
+        <item quantity="other" msgid="707566499994398250">"На <xliff:g id="COUNT">%d</xliff:g> дни"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"На <xliff:g id="COUNT">%d</xliff:g> седмица"</item>
+        <item quantity="other" msgid="7094801039989237061">"На <xliff:g id="COUNT">%d</xliff:g> седмици"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"На <xliff:g id="COUNT">%d</xliff:g> месец"</item>
+        <item quantity="other" msgid="5419723710346646523">"На <xliff:g id="COUNT">%d</xliff:g> месеца"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"На <xliff:g id="COUNT">%d</xliff:g> година"</item>
+        <item quantity="other" msgid="5678653649746562060">"На <xliff:g id="COUNT">%d</xliff:g> години"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"на същия ден всеки месец"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Винаги"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"До дадена дата"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"До <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"За даден брой събития"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"За <xliff:g id="EVENT_COUNT">%d</xliff:g> събитие"</item>
-    <item quantity="other" msgid="8779598489398048259">"За <xliff:g id="EVENT_COUNT">%d</xliff:g> събития"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"За <xliff:g id="EVENT_COUNT">%d</xliff:g> събитие"</item>
+        <item quantity="other" msgid="8779598489398048259">"За <xliff:g id="EVENT_COUNT">%d</xliff:g> събития"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"промяна на крайната дата"</string>
     <string name="visibility_default">Стандартно</string>
   <string name="visibility_private">Частно</string>
@@ -285,4 +254,4 @@
     <string name="preferences_privacy_policy">Политика за поверителност</string>
   <string name="preferences_service_terms">Условия за ползване</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 2cf338f528b9416f27b9800bd39f3ad0d7700b1b..de21e74d88ef928bef92d1f045ecf3277eb6c90e 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Disponible"</item>
     <item msgid="2064426942462573474">"Provisional"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"primer"</item>
-    <item msgid="5631923029483854900">"segon"</item>
-    <item msgid="148935502975250973">"tercer"</item>
-    <item msgid="5124200797326669172">"quart"</item>
-    <item msgid="7564374178324652137">"darrer"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Cap resposta"</item>
     <item msgid="3724434080904437698">"Sí"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Aquest esdeveniment i esdeveniments futurs"</item>
     <item msgid="7833229563617435430">"Tots els esdeveniments"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Aquest i els esdeveniments futurs"</item>
-    <item msgid="6315440193748139854">"Tots els esdeveniments"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Només aquest esdeveniment"</item>
     <item msgid="140670561403965380">"Tots els esdeveniments de la sèrie"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fbcb40b0ffe5066edf7980500c4e6d2e44f8ce0a..160e2052c1bb66915a3c6f6a01f286f75567dfca 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Calendari"</string>
     <string name="what_label" msgid="1933578391985810049">"Què"</string>
     <string name="where_label" msgid="3472482206065595118">"On"</string>
@@ -26,28 +23,28 @@
     <string name="tomorrow" msgid="614434811813859237">"Demà"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Avui a les <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Demà a les <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g></string>
     <string name="repeats_label" msgid="7414023871434593196">"Repetició"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Sense títol)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minut"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minuts"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 hora"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> hores"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 dia"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dies"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"setmana <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minut"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minuts"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 hora"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> hores"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 dia"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dies"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"setmana <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Actualitza"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Mostra el dia"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
@@ -60,16 +57,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Suprimeix l\'esdeveniment"</string>
     <string name="goto_today" msgid="9162136434410891230">"Avui"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Configuració"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Calendaris"</string>
     <string name="search" msgid="550656004486017426">"Cerca"</string>
     <string name="hide_controls" msgid="830320505938520882">"Amaga els controls"</string>
     <string name="show_controls" msgid="715520586028062621">"Mostra els controls"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Calendaris"</string>
-    <string name="synced" msgid="7913940305983383493">"sincronitzat"</string>
-    <string name="not_synced" msgid="4275114941801829419">"no sincronitzat"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Aquest compte no s\'està sincronitzant, de manera que és possible que els calendaris no estiguin actualitzats."</string>
-    <string name="accounts" msgid="849401841083180306">"Comptes i sincronització"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Calendaris per sincronitzar"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Calendaris per sincronitzar"</string>
     <string name="hint_what" msgid="709155115005044531">"Nom de l\'esdeveniment"</string>
     <string name="hint_where" msgid="4972598001033801974">"Ubicació"</string>
@@ -77,7 +67,7 @@
     <string name="hint_attendees" msgid="1650488163176888480">"Convidats"</string>
     <string name="creating_event" msgid="7516249252554059980">"S\'ha creat un esdeveniment."</string>
     <string name="saving_event" msgid="7694181017411177226">"S\'ha desat l\'esdeveniment."</string>
-    <string name="empty_event" msgid="9018699257414338634">"Esdeveniment buit no creat"</string>
+    <string name="empty_event" msgid="9018699257414338634">Esdeveniment buit no creat.</string>
     <string name="creating_event_with_guest" msgid="5758688413124191931">"S\'enviaran les invitacions."</string>
     <string name="saving_event_with_guest" msgid="9184584438475689577">"S\'enviaran les actualitzacions."</string>
     <string name="create_event_dialog_save" msgid="1080859798521717414">"Desa"</string>
@@ -88,14 +78,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"De"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Tot el dia"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Calendari"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Mostra-ho tot"</string>
     <string name="description_label" msgid="7193475046717505855">"Descripció"</string>
     <string name="presence_label" msgid="6169724148441175862">"Mostra\'m com a"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privadesa"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Afegeix recordatori"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"No hi ha cap calendari"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Per poder afegir un esdeveniment, has d\'afegir com a mínim un compte de Calendar al dispositiu i fer que un calendari estigui visible. Toca Afegeix un compte per afegir un compte (si n\'acabes d\'afegir un, espera fins que s\'hagi acabat de sincronitzar i torna-ho a provar). O bé toca Cancel·la i assegura\'t que almenys un calendari estigui visible."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Calendar funciona millor amb un Compte."\n\n"• Accedeix-hi des de qualsevol navegador web"\n"• Crea una còpia de seguretat dels teus esdeveniments"</string>
     <string name="add_account" msgid="1669072099756774952">"Afegeix un compte"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Calendari:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organitzador:"</string>
@@ -116,16 +104,15 @@
     <string name="call_label" msgid="2960328220008869083">"Truca"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Respostes ràpides"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Edita respostes predeterminades en enviar correus als convidats"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Edita resp. ràpid."</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Resposta ràpida"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Tria una resposta ràpida"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"No s\'ha pogut trobar un programa de correu electrònic"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Arribaré uns quants minuts tard."</item>
-    <item msgid="6215158751728689832">"Arribaré d\'aquí a 10 minuts."</item>
-    <item msgid="4485794001743679338">"Comenceu sense mi."</item>
-    <item msgid="8036557974294987511">"No hi puc assistir, deixem-ho per a un altre moment."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Arribaré uns quants minuts tard."</item>
+        <item msgid="6215158751728689832">"Arribaré d\'aquí a 10 minuts."</item>
+        <item msgid="4485794001743679338">"Comenceu sense mi."</item>
+        <item msgid="8036557974294987511">"No hi puc assistir, deixem-ho per a un altre moment."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Escriu la teva…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organitz.:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Recordatoris"</string>
@@ -141,29 +128,25 @@
     <string name="delete_label" msgid="874742811918030739">"Suprimeix"</string>
     <string name="save_label" msgid="2133599104834432589">"Fet"</string>
     <string name="discard_label" msgid="2394623883289782541">"Cancel·la"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Repeteix-les totes"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Omet-les totes"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Posposa"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Esdeveniment únic"</string>
     <string name="endByDate" msgid="7654221304929538201">"; fins al dia <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; una vegada"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> vegades"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Diàriament"</item>
-    <item quantity="other" msgid="5455230727715859264">"Cada <xliff:g id="NUMBER">%d</xliff:g> dies"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; una vegada"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> vegades"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Diàriament"</item>
+        <item quantity="other" msgid="5455230727715859264">"Cada <xliff:g id="NUMBER">%d</xliff:g> dies"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Entre setmana (Dl.-Dv.)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Setmanalment el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Cada <xliff:g id="NUMBER">%1$d</xliff:g> setmanes el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Setmanalment el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Cada <xliff:g id="NUMBER">%1$d</xliff:g> setmanes el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Mensualment"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anualment"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Mensualment (el dia <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Anualment (el <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Personalitzat (no es pot personalitzar al telèfon)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Canvia només aquest esdeveniment"</string>
     <string name="modify_all" msgid="4421657265864209041">"Canvia tots els esdeveniments de la sèrie"</string>
@@ -195,23 +178,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"En viatjar, mostra calendaris i esdeveniments en l\'hora local"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Zona horària local"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostra el número de setmana"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Quant a"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versió de compilació"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Calendari"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"No hi ha cap esdeveniment del calendari proper"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimental"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Recordatoris"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Omet els recordatoris"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Omissió dels recordatoris"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Hores de silenci"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Silencia els recordatoris d\'esdeveniments durant els períodes de temps especificats."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Hora inicial del silenci"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Hora final del silenci"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Depuració"</string>
     <string name="copy_db" msgid="437691290566699292">"Envia la base de dades"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"S\'està cercant <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Elimina un assistent"</string>
@@ -224,69 +199,110 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Afegeix un recordatori"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Elimina el recordatori"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Afegeix un assistent"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sincronitza el calendari"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Esdeveniment de tot el dia"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Repetició"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Temps de recordatori"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Tipus de recordatori"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Mostra\'m com a"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privadesa"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Notificacions de calendari"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Posposa la notificació"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Notifica per correu electrònic als convidats"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Esdeveniment nou"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Esdeveniment <xliff:g id="ITEM_INDEX">%1$s</xliff:g> de <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 esdeveniment"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> esdeveniments"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 esdeveniment"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> esdeveniments"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 esdeveniment"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> esdeveniments"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 esdeveniment"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> esdeveniments"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Esdeveniment seleccionat"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NO activis -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Repeteix"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"No es repeteix mai"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Cada <xliff:g id="COUNT">%d</xliff:g> dia"</item>
-    <item quantity="other" msgid="707566499994398250">"Cada <xliff:g id="COUNT">%d</xliff:g> dies"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Cada <xliff:g id="COUNT">%d</xliff:g> setmana"</item>
-    <item quantity="other" msgid="7094801039989237061">"Cada <xliff:g id="COUNT">%d</xliff:g> setmanes"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Cada <xliff:g id="COUNT">%d</xliff:g> mes"</item>
-    <item quantity="other" msgid="5419723710346646523">"Cada <xliff:g id="COUNT">%d</xliff:g> mesos"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Cada <xliff:g id="COUNT">%d</xliff:g> any"</item>
-    <item quantity="other" msgid="5678653649746562060">"Cada <xliff:g id="COUNT">%d</xliff:g> anys"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Cada <xliff:g id="COUNT">%d</xliff:g> dia"</item>
+        <item quantity="other" msgid="707566499994398250">"Cada <xliff:g id="COUNT">%d</xliff:g> dies"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Cada <xliff:g id="COUNT">%d</xliff:g> setmana"</item>
+        <item quantity="other" msgid="7094801039989237061">"Cada <xliff:g id="COUNT">%d</xliff:g> setmanes"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Cada <xliff:g id="COUNT">%d</xliff:g> mes"</item>
+        <item quantity="other" msgid="5419723710346646523">"Cada <xliff:g id="COUNT">%d</xliff:g> mesos"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Cada <xliff:g id="COUNT">%d</xliff:g> any"</item>
+        <item quantity="other" msgid="5678653649746562060">"Cada <xliff:g id="COUNT">%d</xliff:g> anys"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"el mateix dia de cada mes"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Sempre"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Fins a una data"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Fins al dia <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Per a alguns esdeveniments"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Per a <xliff:g id="EVENT_COUNT">%d</xliff:g> esdeveniment"</item>
-    <item quantity="other" msgid="8779598489398048259">"Per a <xliff:g id="EVENT_COUNT">%d</xliff:g> esdeveniments"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Per a <xliff:g id="EVENT_COUNT">%d</xliff:g> esdeveniment"</item>
+        <item quantity="other" msgid="8779598489398048259">"Per a <xliff:g id="EVENT_COUNT">%d</xliff:g> esdeveniments"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"canvia la data de finalització"</string>
     <string name="visibility_default">Predeterminada</string>
-  <string name="visibility_private">Privat</string>
-  <string name="visibility_public">Públic</string>
-  <string name="preferences_alerts_custom_snooze_delay_title">Demana el retard entre repeticions en els recordatoris</string>
-  <string name="preferences_alerts_custom_snooze_delay_summary_on">Demana el retard entre repeticions en cada recordatori</string>
-  <string name="preferences_alerts_custom_snooze_delay_summary_off">Utilitza sempre el retard entre repeticions predefinit</string>
-  <string name="snooze_delay_dialog_title">Fixa el retard de la repetició</string>
-  <string name="preferences_default_snooze_delay_title">Temps de retard de la repetició predefinit</string>
-  <string name="preferences_default_snooze_delay_dialog">Retard de la repetició predefinit</string>
-    <string name="preferences_about_app">El calendari es bifurca des d\'Etar-Calendar</string>
+  <string name="preferences_about_app">El calendari es bifurca des d\'Etar-Calendar</string>
     <string name="preferences_authors">Autors</string>
   <string name="preferences_source_code">Codi font</string>
   <string name="preferences_licence">Llicència</string>
     <string name="preferences_privacy_policy">Política de privadesa</string>
   <string name="preferences_service_terms">Termes del servei</string>
-</resources>
+    <string name="visibility_private">Privat</string>
+    <string name="visibility_public">Públic</string>
+    <string name="preferences_alerts_custom_snooze_delay_title">Demana el retard entre repeticions en els recordatoris</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_on">Demana el retard entre repeticions en cada recordatori</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_off">Utilitza sempre el retard entre repeticions predefinit</string>
+    <string name="snooze_delay_dialog_title">Fixa el retard de la repetició</string>
+    <string name="preferences_default_snooze_delay_title">Temps de retard de la repetició predefinit</string>
+    <string name="preferences_default_snooze_delay_dialog">Retard de la repetició predefinit</string>
+    <string name="goto_date">Ves a…</string>
+    <string name="rsvp_accepted">Ha respost sí.</string>
+    <string name="rsvp_tentative">Ha respost potser.</string>
+    <string name="rsvp_declined">Ha respost no.</string>
+    <string name="preferences_theme">Tema</string>
+    <string name="preferences_light_theme">Clar</string>
+    <string name="preferences_dark_theme">Fosc</string>
+    <string name="preferences_black_theme">Negre</string>
+    <string name="preferences_color">Color primari</string>
+    <string name="preferences_color_pick">Color primari</string>
+    <string name="preferences_days_per_week_title">Dies per setmana</string>
+    <string name="preferences_days_per_week_dialog">Dies per setmana</string>
+    <string name="preferences_default_event_duration_title">Duració d\'esdeveniment per defecte</string>
+    <string name="preferences_issues">Reporta problema</string>
+    <string name="user_rejected_calendar_write_permission">Etar requereix permisos per a llegir i escriure al calendari per a funcionar correctament. Si us plau, prova-ho de nou.</string>
+    <string name="calendar_permission_not_granted">Ho sentim, aquesta característica no pot funcionar. Etar requereix permisos per a llegir i escriure al calendari per a funcionar correctament</string>
+    <string name="visibility_confidential">Confidencial</string>
+    <string name="zero_minutes">0 minuts</string>
+    <string name="fifteen_minutes">15 minuts</string>
+    <string name="thirty_minutes">30 minuts</string>
+    <string name="one_hour">1 hora</string>
+    <string name="one_and_a_half_hours">1.5 hores</string>
+    <string name="two_hours">2 hores</string>
+    <string name="share_label">Comparteix</string>
+    <string name="no_map">No hi ha aplicació de mapes instal·lada</string>
+    <string name="default_start_title">Vista per defecte</string>
+    <string name="default_start_last">Vista utilitzada prèviament</string>
+    <string name="error_generating_ics">S\'han trobat problemes mentre es compartia l\'esdeveniment</string>
+    <string name="cal_share_intent_title">Envia l\'esdeveniment a:</string>
+    <string name="cal_export_event_sdcard_title">Exporta a la targeta SD</string>
+    <string name="cal_export_succ_msg">Esdeveniment exportat satisfactòriament: %1s</string>
+    <string name="cal_import_menu_title">Importar l\'esdeveniment</string>
+    <string name="cal_nothing_to_import">No hi ha res per a importar</string>
+    <string name="cal_import_error_msg">L\'importació a calendari ha fallat</string>
+    <string name="cal_import_error_date_msg">No s\'ha pogut entendre la data proporcionada: %s</string>
+    <string name="cal_pick_ics">Escull un fitxer per a importar</string>
+    <string name="view_settings">Configuració de visualització</string>
+    <string name="preferences_month_view_portrait">Disseny de vista mensual (vertical)</string>
+    <string name="preferences_month_view_landscape">Disseny de vista mensual (horitzontal)</string>
+    <string name="display_options">Veure detalls</string>
+    <string name="display_time">Mostra l\'hora</string>
+    <string name="display_location">Mostra la ubicació</string>
+    <string name="show_time_no">No mostrar l\'hora</string>
+    <string name="show_time_start">Només l\'hora d\'inici</string>
+    <string name="show_time_start_end">Hora d\'inici i finalització</string>
+    <string name="show_time_start_end_below">Hora d\'inici i de finalització sota l\'esdeveniment</string>
+    <string name="maximum_number_of_lines">Número màxim de línies a l\'esdeveniment</string>
+    <string name="foreground_notification_channel_name">Sincronització d\'alertes</string>
+    <string name="foreground_notification_channel_description">És necessari una notificació principal per sincronitzar el servei intern d\'alertes; silencieu-la</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index d2f12c6be062f5b7a2a2545546cbe2f7cf9bf719..7da21bad9bb7e6773fef226a8b6f4d53b145fbb6 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"K dispozici"</item>
     <item msgid="2064426942462573474">"Možná"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"1."</item>
-    <item msgid="5631923029483854900">"2."</item>
-    <item msgid="148935502975250973">"3."</item>
-    <item msgid="5124200797326669172">"4."</item>
-    <item msgid="7564374178324652137">"poslední"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Žádná odpověď"</item>
     <item msgid="3724434080904437698">"Ano"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Tato a budoucí události"</item>
     <item msgid="7833229563617435430">"Všechny události"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Tato a budoucí události"</item>
-    <item msgid="6315440193748139854">"Všechny události"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Pouze tato událost"</item>
     <item msgid="140670561403965380">"Všechny události série"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 10525f7a340ccb6bae9b39732226091bca59f6aa..ebcff350d29c5629b4e100d7ff6c45539fa3a0ca 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalendář"</string>
     <string name="what_label" msgid="1933578391985810049">"Co"</string>
     <string name="where_label" msgid="3472482206065595118">"Kde"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Zítra"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Dnes v <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Zítra v <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Opakování"</string>
     <string name="no_title_label" msgid="302177118061368042">"(bez názvu)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minuta"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minut"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 hodina"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> hod."</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 den"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dnů"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>. týden"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minuta"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minut"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 hodina"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> hod."</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 den"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dnů"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>. týden"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Aktualizovat"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Zobrazit den"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Smazat událost"</string>
     <string name="goto_today" msgid="9162136434410891230">"Dnes"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Nastavení"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalendáře k zobrazení"</string>
     <string name="search" msgid="550656004486017426">"Hledat"</string>
     <string name="hide_controls" msgid="830320505938520882">"Skrýt ovládací prvky"</string>
     <string name="show_controls" msgid="715520586028062621">"Zobrazit ovládací prvky"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Zobrazení kalendářů"</string>
-    <string name="synced" msgid="7913940305983383493">"synchronizován"</string>
-    <string name="not_synced" msgid="4275114941801829419">"není synchronizován"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Tento účet není synchronizován, proto kalendáře nemusí být aktuální."</string>
-    <string name="accounts" msgid="849401841083180306">"Účty a synchronizace"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Synchronizace kalendářů"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Synchronizace kalendářů"</string>
     <string name="hint_what" msgid="709155115005044531">"Název události"</string>
     <string name="hint_where" msgid="4972598001033801974">"Místo"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Od"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Celý den"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalendář"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Zobrazit vše"</string>
     <string name="description_label" msgid="7193475046717505855">"Popis"</string>
     <string name="presence_label" msgid="6169724148441175862">"Zobrazit mě jako"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Soukromá/Veřejná"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Přidat připomenutí"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Žádné kalendáře"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Před přidáním události je nutné přidat do zařízení alespoň jeden účet s kalendářem a zobrazit ho. Chcete-li přidat účet, klepněte na tlačítko Přidat účet (pokud jste účet právě přidali, počkejte na dokončení synchronizace a zkuste to znovu). Případně se dotkněte tlačítka Zrušit a zkontrolujte, zda je zobrazen alespoň jeden kalendář."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalendář funguje lépe s účtem Google."\n\n"\u2022 Přístup z jakéhokoliv webového prohlížeče"\n"\u2022 Bezpečné zálohování událostí"</string>
     <string name="add_account" msgid="1669072099756774952">"Přidat účet"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalendář:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organizátor:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Volat"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Rychlé odpovědi"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Změňte Výchozí odpovědi pro zasílání emailů hostům"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Změnit rychlé odpovědi"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Rychlá odpověď"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Vyberte rychlou odpověď"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Nepodařilo se najít e-mailovou aplikaci"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Opozdím se o několik minut."</item>
-    <item msgid="6215158751728689832">"Jsem tam za 10 minut."</item>
-    <item msgid="4485794001743679338">"Začněte beze mne."</item>
-    <item msgid="8036557974294987511">"Lituji, nestíhám. Naplánujeme to na jindy."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Opozdím se o několik minut."</item>
+        <item msgid="6215158751728689832">"Jsem tam za 10 minut."</item>
+        <item msgid="4485794001743679338">"Začněte beze mne."</item>
+        <item msgid="8036557974294987511">"Lituji, nestíhám. Naplánujeme to na jindy."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="7265035125070482285">"Vlastní zpráva\u2026"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organizátor:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Připomenutí"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Smazat"</string>
     <string name="save_label" msgid="2133599104834432589">"Hotovo"</string>
     <string name="discard_label" msgid="2394623883289782541">"Zrušit"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Odložit vše"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Zavřít vše"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Odložit"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Jednorázová událost"</string>
     <string name="endByDate" msgid="7654221304929538201">"; do <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; jednorázově"</item>
-    <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g>krát"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Denně"</item>
-    <item quantity="other" msgid="5455230727715859264">"Jednou za <xliff:g id="NUMBER">%d</xliff:g> d."</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; jednorázově"</item>
+        <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g>krát"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Denně"</item>
+        <item quantity="other" msgid="5455230727715859264">"Jednou za <xliff:g id="NUMBER">%d</xliff:g> d."</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Každý pracovní den (po–pá)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Každý týden v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Jednou za <xliff:g id="NUMBER">%1$d</xliff:g> týd. v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Každý týden v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Jednou za <xliff:g id="NUMBER">%1$d</xliff:g> týd. v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Měsíčně"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Ročně"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Měsíčně (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. den)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Ročně (<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Vlastní (nelze upravit v telefonu)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Změnit pouze tuto událost"</string>
     <string name="modify_all" msgid="4421657265864209041">"Změnit všechny události v sérii"</string>
@@ -173,8 +158,6 @@
     <string name="delete_this_event_title" msgid="518402946676919384">"Smazat tuto událost?"</string>
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"Smazat <xliff:g id="EVENTTITLE">%s</xliff:g>?"</string>
     <string name="change_response_title" msgid="7704714776070974984">"Změnit odpověď"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"Obecná nastavení"</string>
-    <string name="menu_about_preferences" msgid="6124375438237674973">Kalendář o</string>
     <string name="preferences_title" msgid="8045855493262131773">"Nastavení"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Nastavení zobrazení kalendáře"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Oznámení a připomenutí"</string>
@@ -195,23 +178,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Kalendáře a události se vždy zobrazí v domovském časovém pásmu"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Domovské časové pásmo"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Zobrazovat číslo týdne"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"O aplikaci"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Verze sestavení"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalendář"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Žádné nadcházející události"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimentální"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Připomenutí"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Přeskakování upomínek"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Přeskakování upomínek"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Ztišení"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Ztišit připomenutí událostí během zadaného času."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Začátek ztišení"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Konec ztišení"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Ladění"</string>
     <string name="copy_db" msgid="437691290566699292">"Odeslat databázi"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Vyhledávání na webu <xliff:g id="DOMAIN">%s</xliff:g>\u2026"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Odebrat účastníka"</string>
@@ -224,55 +199,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Přidat připomenutí"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Odebrat připomenutí"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Přidat účastníka"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Synchronizovat kalendář"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Celodenní událost"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Opakování"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Čas připomenutí"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Typ připomenutí"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Zobrazit mě jako"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Veřejná/soukromá"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Upozornění kalendáře"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Odložit upozornění"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Poslat e-mail hostům"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"Přidat novou událost"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Událost <xliff:g id="ITEM_INDEX">%1$s</xliff:g> z <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 událost"</item>
-    <item quantity="other" msgid="6093072093209431078">"Události: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+ 1 událost"</item>
-    <item quantity="other" msgid="3609243840882275136">"+ další události (<xliff:g id="COUNT">%d</xliff:g>)"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 událost"</item>
+        <item quantity="other" msgid="6093072093209431078">"Události: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+ 1 událost"</item>
+        <item quantity="other" msgid="3609243840882275136">"+ další události (<xliff:g id="COUNT">%d</xliff:g>)"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Vybraná událost"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"Nezaškrtávejte –&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Opakování"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Neopakuje se"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Jednou za <xliff:g id="COUNT">%d</xliff:g> d."</item>
-    <item quantity="other" msgid="707566499994398250">"Jednou za <xliff:g id="COUNT">%d</xliff:g> d."</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Jednou za <xliff:g id="COUNT">%d</xliff:g> týd."</item>
-    <item quantity="other" msgid="7094801039989237061">"Jednou za <xliff:g id="COUNT">%d</xliff:g> týd."</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Jednou za <xliff:g id="COUNT">%d</xliff:g> měs."</item>
-    <item quantity="other" msgid="5419723710346646523">"Jedno za <xliff:g id="COUNT">%d</xliff:g> měs."</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Jednou za <xliff:g id="COUNT">%d</xliff:g> r."</item>
-    <item quantity="other" msgid="5678653649746562060">"Jednou za <xliff:g id="COUNT">%d</xliff:g> r."</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Jednou za <xliff:g id="COUNT">%d</xliff:g> d."</item>
+        <item quantity="other" msgid="707566499994398250">"Jednou za <xliff:g id="COUNT">%d</xliff:g> d."</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Jednou za <xliff:g id="COUNT">%d</xliff:g> týd."</item>
+        <item quantity="other" msgid="7094801039989237061">"Jednou za <xliff:g id="COUNT">%d</xliff:g> týd."</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Jednou za <xliff:g id="COUNT">%d</xliff:g> měs."</item>
+        <item quantity="other" msgid="5419723710346646523">"Jedno za <xliff:g id="COUNT">%d</xliff:g> měs."</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Jednou za <xliff:g id="COUNT">%d</xliff:g> r."</item>
+        <item quantity="other" msgid="5678653649746562060">"Jednou za <xliff:g id="COUNT">%d</xliff:g> r."</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"měsíčně tentýž den"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Navždy"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Do určitého data"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Do <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Po určitý počet událostí"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Pro <xliff:g id="EVENT_COUNT">%d</xliff:g> událost"</item>
-    <item quantity="other" msgid="8779598489398048259">"Pro následující počet událostí: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Pro <xliff:g id="EVENT_COUNT">%d</xliff:g> událost"</item>
+        <item quantity="other" msgid="8779598489398048259">"Pro následující počet událostí: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"změnit datum ukončení"</string>
     <string name="visibility_default">Výchozí nastavení</string>
   <string name="visibility_private">Soukromá</string>
@@ -289,4 +256,5 @@
   <string name="preferences_licence">Licence</string>
     <string name="preferences_privacy_policy">Zásady ochrany osobních údajů</string>
     <string name="preferences_service_terms">Podmínky služby</string>
-</resources>
+    <string name="menu_about_preferences">Kalendář o</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index 946689070f4fe1bd7c5b2ae194c8be7ab6a66164..6450285c14f3ac382abab4af93f6a110257e6fdd 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -20,61 +20,42 @@
     <plurals name="Nminutes">
         <item quantity="zero">Dim munudau</item>
         <item quantity="one">1 munud</item>
-        <item quantity="two">
-            <xliff:g id="count">%d</xliff:g> funud</item>
-        <item quantity="few">
-            <xliff:g id="count">%d</xliff:g> munud</item>
-        <item quantity="many">
-            <xliff:g id="count">%d</xliff:g> munud</item>
-        <item quantity="other">
-            <xliff:g id="count">%d</xliff:g> munud</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> funud</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> munud</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> munud</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> munud</item>
     </plurals>
     <plurals name="Nmins">
-        <item quantity="zero">0 mun</item>
-        <item quantity="one">1 mun</item>
-        <item quantity="two">2 fun</item>
-        <item quantity="few">
-            <xliff:g id="count">%d</xliff:g> mun</item>
-        <item quantity="many">
-            <xliff:g id="count">%d</xliff:g> mun</item>
-        <item quantity="other">
-            <xliff:g id="count">%d</xliff:g> mun</item>
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> mun</item>
+        <item quantity="one">1 fun</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> fun</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> mun</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> mun</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> mun</item>
     </plurals>
     <plurals name="Nhours">
-        <item quantity="zero">0 awr</item>
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> oriau</item>
         <item quantity="one">1 awr</item>
-        <item quantity="two">2 awr</item>
-        <item quantity="few">
-            <xliff:g id="count">%d</xliff:g> awr</item>
-        <item quantity="many">
-            <xliff:g id="count">%d</xliff:g> awr</item>
-        <item quantity="other">
-            <xliff:g id="count">%d</xliff:g> awr</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> awr</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> awr</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> awr</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> awr</item>
     </plurals>
     <plurals name="Ndays">
-        <item quantity="zero">0 diwrnodau</item>
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> diwrnodoau</item>
         <item quantity="one">1 diwrnod</item>
-        <item quantity="two">2 ddiwrnod</item>
-        <item quantity="few">
-            <xliff:g id="count">%d</xliff:g> diwrnod</item>
-        <item quantity="many">
-            <xliff:g id="count">%d</xliff:g> diwrnod</item>
-        <item quantity="other">
-            <xliff:g id="count">%d</xliff:g> diwrnod</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> ddiwrnod</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> diwrnod</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> diwrnod</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> diwrnod</item>
     </plurals>
     <plurals name="weekN">
-        <item quantity="zero">wythnos <xliff:g id="count">%d</xliff:g>
-        </item>
-        <item quantity="one">wythnos <xliff:g id="count">%d</xliff:g>
-        </item>
-        <item quantity="two">wythnos <xliff:g id="count">%d</xliff:g>
-        </item>
-        <item quantity="few">wythnos <xliff:g id="count">%d</xliff:g>
-        </item>
-        <item quantity="many">wythnos <xliff:g id="count">%d</xliff:g>
-        </item>
-        <item quantity="other">wythnos <xliff:g id="count">%d</xliff:g>
-        </item>
+        <item quantity="zero">wythnos <xliff:g id="count">%d</xliff:g></item>
+        <item quantity="one">wythnos <xliff:g id="count">%d</xliff:g></item>
+        <item quantity="two">wythnos <xliff:g id="count">%d</xliff:g></item>
+        <item quantity="few">wythnos <xliff:g id="count">%d</xliff:g></item>
+        <item quantity="many">wythnos <xliff:g id="count">%d</xliff:g></item>
+        <item quantity="other">wythnos <xliff:g id="count">%d</xliff:g></item>
     </plurals>
     <string name="calendar_refresh">Ail-gysoni</string>
     <string name="show_day_view">Dangos diwrnod</string>
@@ -90,17 +71,10 @@
     <string name="goto_today">Heddiw</string>
     <string name="goto_date">Mynd i…</string>
     <string name="menu_preferences">Gosodiadau</string>
-    <string name="menu_select_visible_calendars">Calendrau i\'w dangos</string>
     <string name="search">Chwilio</string>
     <string name="hide_controls">Cuddio rheolaeth</string>
     <string name="show_controls">Dangos rheolaeth</string>
     <string name="view_settings">Gweld gosodiadau</string>
-    <string name="select_visible_calendars_title">Calendrau i\'w dangos</string>
-    <string name="synced">cysoniwyd</string>
-    <string name="not_synced">heb ei gysoni</string>
-    <string name="acct_not_synced">Dyw\'r cyfrif hwn ddim yn cael ei gysoni felly mae\'n bosib na fydd dy galendrau yn gyfredol.</string>
-    <string name="accounts">Cyfrifon a chysoni</string>
-    <string name="select_synced_calendars_title">Calendrau i\'w cysoni</string>
     <string name="select_synced_calendars_button">Calendrau i\'w cysoni</string>
     <string name="hint_what">Enw digwyddiad</string>
     <string name="hint_where">Lleoliad</string>
@@ -122,17 +96,12 @@
     <string name="edit_event_from_label">Oddi wrth</string>
     <string name="edit_event_all_day_label">Trwy\'r dydd</string>
     <string name="edit_event_calendar_label">Calendr</string>
-    <string name="edit_event_show_all">Dangos y cwbl</string>
     <string name="description_label">Disgrifiad</string>
     <string name="presence_label">Fy nangos fel</string>
     <string name="privacy_label">Preifatrwydd</string>
     <string name="reminders_label">Ychwanegu nodyn atgoffa</string>
     <string name="no_syncable_calendars">Dim calendrau</string>
     <string name="no_calendars_found">Cyn medru ychwanegu digwyddiad, rhaid ychwanegu o leiaf un cyfrif Calendr i dy ddyfais a gwneud calendr yn weladwy. Tapia Creu Cyfrif i ychwanegu cyfrif (os wyt ti newydd ychwanegu cyfrif, rho gynnig arall arni ar ôl aros iddo gysoni). Neu tapia Diddymu a sicrhau bod o leiaf un calendr yn weladwy.</string>
-    <string name="create_an_account_desc">Mae Calendr yn gweithio orau gyda chyfrif.
-\n
-\n• Cael mynediad at dy galendr trwy unrhyw borwr
-\n• Cadw copi wrth gefn o dy ddigwyddiadau</string>
     <string name="add_account">Ychwanegu cyfrif</string>
     <string name="view_event_calendar_label">Calendr:</string>
     <string name="view_event_organizer_label">Trefnydd:</string>
@@ -154,7 +123,6 @@
     <string name="call_label">Galw</string>
     <string name="quick_response_settings">Atebion cyflym</string>
     <string name="quick_response_settings_summary">Golygu\'r atebion cyflym wrth ebostio gwesteion</string>
-    <string name="quick_response_settings_title">Golygu atebion cyflym</string>
     <string name="quick_response_settings_edit_title">Ateb cyflym</string>
     <string name="quick_response_dialog_title">Dewisa ateb cyflym</string>
     <string name="quick_response_email_failed">Methwyd â chanfod ap e-bost</string>
@@ -178,7 +146,6 @@
     <string name="delete_label">Dileu</string>
     <string name="save_label">Iawn</string>
     <string name="discard_label">Diddymu</string>
-    <string name="snooze_all_label">Hepiau yn cwbl</string>
     <string name="dismiss_all_label">Diystyru\'r cwbl</string>
     <string name="snooze_label">Hepian</string>
     <string name="does_not_repeat">Digwyddiad un tro</string>
@@ -217,8 +184,6 @@
     </plurals>
     <string name="monthly">Misol</string>
     <string name="yearly_plain">Blynyddol</string>
-    <string name="monthly_on_day">Misol (ar ddiwrnod <xliff:g id="day_of_month">%s</xliff:g>)</string>
-    <string name="yearly">Blynyddol (ar <xliff:g id="dates">%s</xliff:g>)</string>
     <string name="custom" product="default">Addasedig (methu addasu ar ffôn)</string>
     <string name="modify_event">Newid y digwyddiad hwn yn unig</string>
     <string name="modify_all">Newid pob digwyddiad yn y gyfres</string>
@@ -243,7 +208,7 @@
     <string name="preferences_reminder_title">Hysbysiadau a nodiadau atgoffa</string>
     <string name="preferences_hide_declined_title">Cuddio pob digwyddiad gwrthodwyd</string>
     <string name="default_start_title">Golwg arferol</string>
-    <string name="view_details">Gweld manylion</string>
+    <string name="display_options">Gweld manylion</string>
     <string name="display_time">Dangos amser</string>
     <string name="display_location">Dangos lleoliad</string>
     <string name="default_start_last">Golwg a ddefnyddiwyd gynt</string>
@@ -272,10 +237,8 @@
     <string name="snooze_delay_dialog_title">Gosod oediad hepian</string>
     <string name="preferences_default_snooze_delay_title">Hyd oediad hepian arferol</string>
     <string name="preferences_default_snooze_delay_dialog">Oediad hepian arferol</string>
-    <string name="preferences_about_title">Ynghylch</string>
     <string name="preferences_build_version">Fersiwn adeiledd</string>
     <string name="preferences_issues">Rhoi gwybod am wallau</string>
-    <string name="gadget_title">Calendr</string>
     <plurals name="month_more_events">
         <item quantity="zero">dim</item>
         <item quantity="one">+1</item>
@@ -290,14 +253,8 @@
     </plurals>
     <string name="gadget_no_events">Dim digwyddiadau calendr yn dod yn fuan</string>
     <string name="preferences_experimental_category">Arbrofol</string>
-    <string name="preferences_reminders_category">Nodiadau atgoffa</string>
     <string name="preferences_reminders_responded_label">Neidio Nodiadau Atgoffa</string>
     <string name="preferences_reminders_responded_dialog">Neidio Nodiadau Atgoffa</string>
-    <string name="preferences_reminders_quiet_hours_label">Oriau tawelwch</string>
-    <string name="preferences_reminders_quiet_hours_description">Peidio â chwarae sain hysbysiadau atgoffa am ddigwyddiadau yn ystod yr amser tawelwch.</string>
-    <string name="preferences_reminders_quiet_hours_start">Dechrau amser tawelwch</string>
-    <string name="preferences_reminders_quiet_hours_end">Diwedd amser tawelwch</string>
-    <string name="preferences_debug_category">Dadfygio</string>
     <string name="copy_db">Anfon y gronfa ddata</string>
     <string name="directory_searching_fmt">Yn chwilio <xliff:g id="domain">%s</xliff:g>…</string>
     <string name="accessibility_remove_attendee">Tynnu\'r cyfranogwr</string>
@@ -310,16 +267,11 @@
     <string name="accessibility_add_reminder">Ychwanegu nodyn atgoffa</string>
     <string name="accessibility_remove_reminder">Tynnu nodyn atgoffa</string>
     <string name="accessibility_add_attendee">Ychwanegu cyfranogwr</string>
-    <string name="accessibility_sync_cal">Cysoni calendr</string>
     <string name="accessibility_all_day">Digwyddiad trwy\'r dydd</string>
-    <string name="accessibility_repeats">Ail-adrodd</string>
     <string name="accessibility_reminder_time">Amser atgoffa</string>
     <string name="accessibility_reminder_type">Dull atgoffa</string>
     <string name="accessibility_reminder_showmeas">Fy nangos fel</string>
     <string name="accessibility_reminder_privacy">Preifatrwydd</string>
-    <string name="accessibility_cal_notification">Hysbysiad Calendr</string>
-    <string name="accessibility_snooze_notification">Hepian Hysbysiad</string>
-    <string name="accessibility_email_notification">Ebostio gwesteion</string>
     <string name="day_view_new_event_hint">+ Digwyddiad newydd</string>
     <string name="template_announce_item_index">Digwyddiad <xliff:g id="item_index">%1$s</xliff:g> o <xliff:g id="item_count">%2$s</xliff:g>.</string>
     <plurals name="Nevents">
@@ -343,9 +295,6 @@
         <item quantity="other">+<xliff:g id="count">%d</xliff:g> digwyddiad</item>
     </plurals>
     <string name="acessibility_selected_marker_description">Digwyddiad a ddewisir</string>
-    <string name="do_not_check">PEIDIER â dewis -&gt;</string>
-    <string name="recurrence_dialog_title">Ail-adrodd</string>
-    <string name="recurrence_dialog_title_never">Byth yn ailadrodd</string>
     <plurals name="recurrence_interval_daily">
         <item quantity="zero">Byth</item>
         <item quantity="one">Pob dydd</item>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index d19d7f83ae80ca8b2d044c953724c4f3fca4e5de..2c03b9f1b7ca4aa000c7fa998da59b1407ef3330 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Ledig"</item>
     <item msgid="2064426942462573474">"Foreløbig"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"først"</item>
-    <item msgid="5631923029483854900">"anden"</item>
-    <item msgid="148935502975250973">"tredje"</item>
-    <item msgid="5124200797326669172">"fjerde"</item>
-    <item msgid="7564374178324652137">"sidst"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Intet svar"</item>
     <item msgid="3724434080904437698">"Ja"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Denne og fremtidige begivenheder"</item>
     <item msgid="7833229563617435430">"Alle begivenheder"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Denne og fremtidige begivenheder"</item>
-    <item msgid="6315440193748139854">"Alle begivenheder"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Kun denne begivenhed"</item>
     <item msgid="140670561403965380">"Alle begivenheder i serien"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c2deba05beabe5f7dfd8c12adcae32e82f0facbc..1094a2d05dcc3bbee1056dd13f40ed8cb5a7ff9a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalender"</string>
     <string name="what_label" msgid="1933578391985810049">"Hvad"</string>
     <string name="where_label" msgid="3472482206065595118">"Hvor"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"I morgen"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"I dag kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"I morgen kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Gentagelse"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Ingen titel)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minut"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minutter"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min."</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min."</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 time"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> timer"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 dag"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dage"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"uge <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minut"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minutter"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min."</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min."</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 time"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> timer"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 dag"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dage"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"uge <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Opdater"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Vis dag"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Slet begivenhed"</string>
     <string name="goto_today" msgid="9162136434410891230">"I dag"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Indstillinger"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalendere"</string>
     <string name="search" msgid="550656004486017426">"Søg"</string>
     <string name="hide_controls" msgid="830320505938520882">"Skjul knapper"</string>
     <string name="show_controls" msgid="715520586028062621">"Vis knapper"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalendere til visning"</string>
-    <string name="synced" msgid="7913940305983383493">"synkroniseret"</string>
-    <string name="not_synced" msgid="4275114941801829419">"ikke synkroniseret"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Denne konto synkroniseres ikke, og dine kalendere er muligvis ikke opdaterede."</string>
-    <string name="accounts" msgid="849401841083180306">"Konti og synkronisering"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Kalendere til synkronisering"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Kalendere til synkronisering"</string>
     <string name="hint_what" msgid="709155115005044531">"Begivenhedens navn"</string>
     <string name="hint_where" msgid="4972598001033801974">"Placering"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Fra"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Hele dagen"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalender"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Vis alle"</string>
     <string name="description_label" msgid="7193475046717505855">"Beskrivelse"</string>
     <string name="presence_label" msgid="6169724148441175862">"Vis mig som"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Fortrolighed"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Tilføj påmindelse"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Der er ingen kalendere"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Før du kan tilføje en begivenhed, skal du tilføje mindst én Kalender-konto til din enhed og gøre en kalender synlig. Tryk på Tilføj konto for at tilføje en konto (hvis du lige har tilføjet en konto, så vent til den er færdig med at synkronisere, og prøv så igen). Eller tryk på Annuller, og sørg for, at mindst én kalender er synlig."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalender fungerer bedre med en konto."\n\n"• Få adgang til den fra enhver webbrowser"\n"• Sikkerhedskopier dine begivenheder på sikker vis"</string>
     <string name="add_account" msgid="1669072099756774952">"Tilføj konto"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalender:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organisator:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Ring op"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Hurtige svar"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Rediger standardsvar, der kan sendes til gæster"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Ret hurtige svar"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Hurtigt svar"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Vælg hurtigt svar"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"E-mailprogrammet kunne ikke findes"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Er kun et par minutter forsinket."</item>
-    <item msgid="6215158751728689832">"Er der om ca. 10 minutter."</item>
-    <item msgid="4485794001743679338">"Gå bare i gang uden mig."</item>
-    <item msgid="8036557974294987511">"Jeg kan desværre ikke nå det. Vi bliver nødt til at lave en ny aftale."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Er kun et par minutter forsinket."</item>
+        <item msgid="6215158751728689832">"Er der om ca. 10 minutter."</item>
+        <item msgid="4485794001743679338">"Gå bare i gang uden mig."</item>
+        <item msgid="8036557974294987511">"Jeg kan desværre ikke nå det. Vi bliver nødt til at lave en ny aftale."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Skriv dit eget…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organisator:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Påmindelser"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Slet"</string>
     <string name="save_label" msgid="2133599104834432589">"Gem"</string>
     <string name="discard_label" msgid="2394623883289782541">"Annuller"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Sæt alle i slumretilstand"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Annuller alle"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Udskyd"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Én gang"</string>
     <string name="endByDate" msgid="7654221304929538201">", indtil den <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">", én gang"</item>
-    <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g> gange"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Dagligt"</item>
-    <item quantity="other" msgid="5455230727715859264">"Hver <xliff:g id="NUMBER">%d</xliff:g>. dag"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">", én gang"</item>
+        <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g> gange"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Dagligt"</item>
+        <item quantity="other" msgid="5455230727715859264">"Hver <xliff:g id="NUMBER">%d</xliff:g>. dag"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Hverdage (man.-fre.)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Ugentligt om <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Hver <xliff:g id="NUMBER">%1$d</xliff:g>. uge om <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Ugentligt om <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Hver <xliff:g id="NUMBER">%1$d</xliff:g>. uge om <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Månedligt"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Årligt"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Månedligt (den <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Årligt (den <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Tilpasset (kan ikke tilpasses på telefon)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Rediger kun denne begivenhed"</string>
     <string name="modify_all" msgid="4421657265864209041">"Rediger alle begivenheder i rækken"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Viser kalenderbegivenheder i din tidszone, når du rejser"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Egen tidszone"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Vis ugenummer"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Om"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Version"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Ingen kommende kalenderbegivenheder"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Eksperimenterende"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Påmindelser"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Spring påmindelser over"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Spring påmindelser over"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Stille timer"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Slå lyden fra begivenhedspåmindelser i den angivne tid."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Starttid for stille timer"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Sluttid for stille timer"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Fejlfinding"</string>
     <string name="copy_db" msgid="437691290566699292">"Send database"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Søger efter <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Fjern deltager"</string>
@@ -224,16 +201,11 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Tilføj påmindelse"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Fjern påmindelse"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Tilføj deltager"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Synkroniser kalender"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Heldagsbegivenhed"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Gentagelse"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Tidspunkt for påmindelse"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Påmindelsestype"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Vis mig som"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Fortrolighed"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Kalendermeddelelse"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Snooze underretning"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Send e-mail til gæster"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Ny begivenhed"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Begivenhed <xliff:g id="ITEM_INDEX">%1$s</xliff:g> ud af <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
   <plurals name="Nevents">
@@ -245,34 +217,31 @@
     <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> begivenheder"</item>
   </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Valgt begivenhed"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"UNDLAD at markere -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Gentag"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Gentages aldrig"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"<xliff:g id="COUNT">%d</xliff:g> gang om dagen"</item>
-    <item quantity="other" msgid="707566499994398250">"Hver <xliff:g id="COUNT">%d</xliff:g>. dag"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"<xliff:g id="COUNT">%d</xliff:g> gang om ugen"</item>
-    <item quantity="other" msgid="7094801039989237061">"Hver <xliff:g id="COUNT">%d</xliff:g>. uge"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"<xliff:g id="COUNT">%d</xliff:g> gang om måneden"</item>
-    <item quantity="other" msgid="5419723710346646523">"Hver <xliff:g id="COUNT">%d</xliff:g>. måned"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"<xliff:g id="COUNT">%d</xliff:g> gang om året"</item>
-    <item quantity="other" msgid="5678653649746562060">"Hvert <xliff:g id="COUNT">%d</xliff:g>. år"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"<xliff:g id="COUNT">%d</xliff:g> gang om dagen"</item>
+        <item quantity="other" msgid="707566499994398250">"Hver <xliff:g id="COUNT">%d</xliff:g>. dag"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"<xliff:g id="COUNT">%d</xliff:g> gang om ugen"</item>
+        <item quantity="other" msgid="7094801039989237061">"Hver <xliff:g id="COUNT">%d</xliff:g>. uge"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"<xliff:g id="COUNT">%d</xliff:g> gang om måneden"</item>
+        <item quantity="other" msgid="5419723710346646523">"Hver <xliff:g id="COUNT">%d</xliff:g>. måned"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"<xliff:g id="COUNT">%d</xliff:g> gang om året"</item>
+        <item quantity="other" msgid="5678653649746562060">"Hvert <xliff:g id="COUNT">%d</xliff:g>. år"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"samme dag hver måned"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"For altid"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Frem til en bestemt dato"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Indtil <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Et antal gange"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"For <xliff:g id="EVENT_COUNT">%d</xliff:g> begivenhed"</item>
-    <item quantity="other" msgid="8779598489398048259">"For <xliff:g id="EVENT_COUNT">%d</xliff:g> begivenheder"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"For <xliff:g id="EVENT_COUNT">%d</xliff:g> begivenhed"</item>
+        <item quantity="other" msgid="8779598489398048259">"For <xliff:g id="EVENT_COUNT">%d</xliff:g> begivenheder"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"skift slutdato"</string>
     <string name="visibility_default">Standard</string>
   <string name="visibility_private">Privat</string>
@@ -289,4 +258,4 @@
   <string name="preferences_licence">licens</string>
     <string name="preferences_privacy_policy">Beskyttelse politik</string>
     <string name="preferences_service_terms">Servicevilkår</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 38d6a4e1d20eb87b4aeb1e13856389afc37580e9..4be03cc1432e70e34c168ef39ed57a437794bd6d 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -78,13 +78,6 @@
     <item msgid="6228387173725732140">"Verfügbar"</item>
     <item msgid="2064426942462573474">"Mit Vorbehalt"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"1."</item>
-    <item msgid="5631923029483854900">"2."</item>
-    <item msgid="148935502975250973">"3."</item>
-    <item msgid="5124200797326669172">"4."</item>
-    <item msgid="7564374178324652137">"letzten"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Keine Antwort"</item>
     <item msgid="3724434080904437698">"Ja"</item>
@@ -96,10 +89,6 @@
     <item msgid="1536401639805370405">"Dieser und zukünftige Termine"</item>
     <item msgid="7833229563617435430">"Alle Termine"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Dieser und zukünftige Termine"</item>
-    <item msgid="6315440193748139854">"Alle Termine"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Nur diesen Termin"</item>
     <item msgid="140670561403965380">"Alle Termine in der Reihe"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9a730a127c448391bdb897285c9801075e9fbea6..68ab3ebe714f8de082d226363eb9bbbe871837bf 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -23,30 +23,28 @@
     <string name="tomorrow" msgid="614434811813859237">"Morgen"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Heute, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Morgen, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g></string>
     <string name="repeats_label" msgid="7414023871434593196">"Wiederholung"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Kein Titel)"</string>
     <plurals name="Nminutes">
-        <item quantity="one">Eine Minute</item>
-        <item quantity="other">
-            <xliff:g id="COUNT">%d</xliff:g> Minuten</item>
+        <item quantity="one">1 Minute</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> Minuten</item>
     </plurals>
     <plurals name="Nmins">
         <item quantity="one">1 Min.</item>
-        <item quantity="other">
-            <xliff:g id="COUNT">%d</xliff:g> Min.</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> Min.</item>
     </plurals>
     <plurals name="Nhours">
-        <item quantity="one" msgid="4793697728599296830">"1 Stunde"</item>
-        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> Stunden"</item>
+        <item quantity="one">1 Stunde</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> Stunden</item>
     </plurals>
     <plurals name="Ndays">
         <item quantity="one">1 Tag</item>
-        <item quantity="other">
-            <xliff:g id="COUNT">%d</xliff:g> Tage</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> Tage</item>
     </plurals>
     <plurals name="weekN">
-        <item quantity="other" msgid="8085184869561028365">"Woche <xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="one">Woche <xliff:g id="count">%d</xliff:g></item>
+        <item quantity="other">Woche <xliff:g id="count">%d</xliff:g></item>
     </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Aktualisieren"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Tag anzeigen"</string>
@@ -60,16 +58,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Termin löschen"</string>
     <string name="goto_today" msgid="9162136434410891230">"Heute"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Einstellungen"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Anzuzeigende Kalender"</string>
     <string name="search" msgid="550656004486017426">"Suche"</string>
     <string name="hide_controls" msgid="830320505938520882">"Steuerelemente aus"</string>
     <string name="show_controls" msgid="715520586028062621">"Steuerelemente ein"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Anzuzeigende Kalender"</string>
-    <string name="synced" msgid="7913940305983383493">"Synchronisiert"</string>
-    <string name="not_synced" msgid="4275114941801829419">"Nicht synchronisiert"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Dieses Konto wird nicht synchronisiert. Ihre Kalender sind möglicherweise nicht aktuell."</string>
-    <string name="accounts" msgid="849401841083180306">"Konten &amp; Synchronisierung"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Zu synchronisierende Kalender"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Zu synchronisierende Kalender"</string>
     <string name="hint_what" msgid="709155115005044531">"Terminname"</string>
     <string name="hint_where" msgid="4972598001033801974">"Ort"</string>
@@ -88,14 +79,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Von"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Ganztägig"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalender"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Alle anzeigen"</string>
     <string name="description_label" msgid="7193475046717505855">"Beschreibung"</string>
     <string name="presence_label" msgid="6169724148441175862">"Mein Status"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Datenschutz"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Erinnerung hinzufügen"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Keine Kalender"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Damit Sie einen Termin hinzufügen können, müssen Sie mindestens ein Kalender-Konto zu Ihrem Gerät hinzufügen und einen Kalender sichtbar machen. Tippen Sie zum Hinzufügen eines Kontos auf \"Konto hinzufügen\". Falls Sie gerade ein Konto hinzugefügt haben, warten Sie, bis die Synchronisierung abgeschlossen ist, und versuchen Sie es dann erneut. Sie können auch auf \"Abbrechen\" tippen und sich vergewissern, dass mindestens ein Kalender sichtbar ist."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Etar Kalender funktioniert besser mit einem Konto."\n\n"• Zugriff über jeden beliebigen Browser"\n"• Sichern von Terminen mit Schutzfunktion"</string>
     <string name="add_account" msgid="1669072099756774952">"Konto hinzufügen"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalender:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">Organisator:</string>
@@ -111,15 +100,14 @@
     <string name="email_guests_label" msgid="8772030932155305903">"E-Mail an Gäste senden"</string>
     <string name="email_organizer_label" msgid="7178059542798074813">"E-Mail an Organisator senden"</string>
     <string name="email_picker_label" msgid="4808253965057791781">"E-Mail über"</string>
-    <string name="event_not_found" msgid="8356864185947582727">"Ereignis nicht gefunden"</string>
+    <string name="event_not_found" msgid="8356864185947582727">Ereignis nicht gefunden.</string>
     <string name="map_label" msgid="8795383535586556038">"Karte"</string>
     <string name="call_label" msgid="2960328220008869083">"Anrufen"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Kurzantworten"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Standardantworten beim Senden von E-Mails an Gäste bearbeiten"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Kurzantworten bearbeiten"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Kurzantwort"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Kurzantwort auswählen"</string>
-    <string name="quick_response_email_failed" msgid="5544066405231853245">"Das E-Mail-Programm konnte nicht gefunden werden."</string>
+    <string name="quick_response_email_failed" msgid="5544066405231853245">Es konnte kein E-Mail-Programm gefunden werden</string>
     <string-array name="quick_response_defaults">
         <item msgid="1524421198348168403">"Bin einige Minuten verspätet"</item>
         <item msgid="6215158751728689832">"Bin in etwa 10 Minuten da"</item>
@@ -141,7 +129,6 @@
     <string name="delete_label" msgid="874742811918030739">"Löschen"</string>
     <string name="save_label" msgid="2133599104834432589">"Fertig"</string>
     <string name="discard_label" msgid="2394623883289782541">"Abbrechen"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Später erinnern"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Alle schließen"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Später erinnern"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Einmaliger Termin"</string>
@@ -161,8 +148,6 @@
     </plurals>
     <string name="monthly" msgid="4587116285383048586">"Monatlich"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Jährlich"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Monatlich (am <xliff:g id="DAY_OF_MONTH">%s</xliff:g>.)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Jährlich (am <xliff:g id="DATES">%s</xliff:g>)"</string>
     <string name="custom" product="default" msgid="4137468716966004993">"Benutzerdefiniert (Anpassung über Telefon nicht möglich)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Nur diesen Termin ändern"</string>
     <string name="modify_all" msgid="4421657265864209041">"Alle Termine in dieser Serie ändern"</string>
@@ -182,7 +167,7 @@
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Woche beginnt am"</string>
     <string name="preferences_clear_search_history_title" msgid="6619916370215282982">"Suchverlauf löschen"</string>
     <string name="preferences_clear_search_history_summary" msgid="7864674093455778158">"Alle Suchen aus dem Verlauf entfernen"</string>
-    <string name="search_history_cleared" msgid="1536707558435227567">"Suchverlauf gelöscht"</string>
+    <string name="search_history_cleared" msgid="1536707558435227567">Suchverlauf gelöscht.</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Benachrichtigungen"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibration"</string>
     <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Töne"</string>
@@ -194,23 +179,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Zeigt unterwegs Kalender-/Terminzeiten in Heimatzeitzone"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Heimatzeitzone"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">Kalenderwoche anzeigen</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Details"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">Version</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
     <plurals name="month_more_events">
-        <item quantity="one" msgid="8971334808414201327">"+1"</item>
-        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+        <item quantity="one">+1</item>
+        <item quantity="other">+<xliff:g id="number">%d</xliff:g></item>
     </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Keine anstehenden Termine"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimentell"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Erinnerungen"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Erinnerungen überspringen"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Erinnerungen überspringen"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Ruhezeit"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Terminerinnerung zu bestimmten Zeiten stummschalten"</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Start der Ruhezeit"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Ende der Ruhezeit"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Debugging"</string>
     <string name="copy_db" msgid="437691290566699292">"Datenbank senden"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"<xliff:g id="DOMAIN">%s</xliff:g> wird durchsucht…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Teilnehmer entfernen"</string>
@@ -223,45 +200,37 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Erinnerung hinzufügen"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Erinnerung entfernen"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Teilnehmer hinzufügen"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Kalender synchronisieren"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Ganztägiger Termin"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Wiederholung"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Erinnerungszeit"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Art der Erinnerung"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Mein Status"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Datenschutz"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Kalenderbenachrichtigung"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Später erinnern"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"E-Mail an Gäste senden"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ neuer Termin"</string>
-    <string name="template_announce_item_index" msgid="4067877800670753110">"Termin <xliff:g id="ITEM_INDEX">%1$s</xliff:g> von <xliff:g id="ITEM_COUNT">%2$s</xliff:g>"</string>
+    <string name="template_announce_item_index" msgid="4067877800670753110">Termin <xliff:g id="ITEM_INDEX">%1$s</xliff:g> von <xliff:g id="ITEM_COUNT">%2$s</xliff:g>.</string>
     <plurals name="Nevents">
-        <item quantity="one" msgid="5230907142214104485">"1 Ereignis"</item>
-        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> Ereignisse"</item>
+        <item quantity="one">1 Ereignis</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> Ereignisse</item>
     </plurals>
     <plurals name="N_remaining_events">
-        <item quantity="one" msgid="431585781647034528">"+1 Termin"</item>
-        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> Termine"</item>
+        <item quantity="one">+1 Termin</item>
+        <item quantity="other">+<xliff:g id="count">%d</xliff:g> Termine</item>
     </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Ausgewähltes Ereignis"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NICHT aktivieren -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Wiederholen"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Einmaliger Termin"</string>
     <plurals name="recurrence_interval_daily">
-        <item quantity="one" msgid="1205422710088692631">"Nach <xliff:g id="COUNT">%d</xliff:g> Tag"</item>
-        <item quantity="other" msgid="707566499994398250">"Alle <xliff:g id="COUNT">%d</xliff:g> Tage"</item>
+        <item quantity="one">Nach <xliff:g id="count">%d</xliff:g> Tag</item>
+        <item quantity="other">Alle <xliff:g id="count">%d</xliff:g> Tage</item>
     </plurals>
     <plurals name="recurrence_interval_weekly">
-        <item quantity="one" msgid="4948681635464488351">"Nach <xliff:g id="COUNT">%d</xliff:g> Woche"</item>
-        <item quantity="other" msgid="7094801039989237061">"Alle <xliff:g id="COUNT">%d</xliff:g> Wochen"</item>
+        <item quantity="one">Nach <xliff:g id="count">%d</xliff:g> Woche</item>
+        <item quantity="other">Alle <xliff:g id="count">%d</xliff:g> Wochen</item>
     </plurals>
     <plurals name="recurrence_interval_monthly">
-        <item quantity="one" msgid="4768178401603139718">"Nach <xliff:g id="COUNT">%d</xliff:g> Monat"</item>
-        <item quantity="other" msgid="5419723710346646523">"Alle <xliff:g id="COUNT">%d</xliff:g> Monate"</item>
+        <item quantity="one">Nach <xliff:g id="count">%d</xliff:g> Monat</item>
+        <item quantity="other">Alle <xliff:g id="count">%d</xliff:g> Monate</item>
     </plurals>
     <plurals name="recurrence_interval_yearly">
-        <item quantity="one" msgid="5819562634008179102">"Nach <xliff:g id="COUNT">%d</xliff:g> Jahr"</item>
-        <item quantity="other" msgid="5678653649746562060">"Alle <xliff:g id="COUNT">%d</xliff:g> Jahre"</item>
+        <item quantity="one">Nach <xliff:g id="count">%d</xliff:g> Jahr</item>
+        <item quantity="other">Alle <xliff:g id="count">%d</xliff:g> Jahre</item>
     </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"am gleichen Tag des Monats"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Dauerhaft"</string>
@@ -291,12 +260,12 @@
     <string name="cal_nothing_to_import">Nichts zu importieren</string>
     <string name="cal_import_menu_title">Importiere Termin</string>
     <string name="cal_import_error_msg">Import zum Kalender ist fehlgeschlagen</string>
-    <string name="cal_import_error_date_msg">Konnte Datum nicht erkennen: %s</string>
+    <string name="cal_import_error_date_msg">Datum konnte nicht erkannt werden: %s</string>
     <string name="cal_export_succ_msg">Termin erfolgreich exportiert: %1s</string>
     <string name="cal_export_event_sdcard_title">Export auf SD-Karte</string>
-    <string name="rsvp_accepted">Zugesagt</string>
-    <string name="rsvp_declined">Abgelehnt</string>
-    <string name="rsvp_tentative">Vielleicht</string>
+    <string name="rsvp_accepted">Zugesagt.</string>
+    <string name="rsvp_declined">Abgelehnt.</string>
+    <string name="rsvp_tentative">Vielleicht.</string>
     <string name="preferences_issues">Fehler melden</string>
     <string name="preferences_black_theme">Schwarz</string>
     <string name="visibility_default">Standard</string>
@@ -321,10 +290,10 @@
     <string name="view_settings">Ansichtseinstellungen</string>
     <string name="preferences_month_view_portrait">Monatsansicht (Portrait)</string>
     <string name="preferences_month_view_landscape">Monatsansicht (Landscape)</string>
-    <string name="view_details">Details anzeigen</string>
+    <string name="display_options">Anzeigeoptionen</string>
     <string name="display_time">Zeit anzeigen</string>
     <string name="display_location">Ort anzeigen</string>
-    <string name="show_time_no">Nein</string>
+    <string name="show_time_no">Zeit nicht anzeigen</string>
     <string name="show_time_start">Nur Startzeit</string>
     <string name="show_time_start_end">Start- und Endzeit</string>
     <string name="show_time_start_end_below">Start- und Endzeit unterhalb des Termins</string>
@@ -336,5 +305,38 @@
     <string name="preferences_service_terms">Nutzungsbedingungen</string>
     <string name="maximum_number_of_lines">Maximale Zeilenanzahl pro Kalendereintrag</string>
     <string name="foreground_notification_channel_name">Alarm Synchronisation</string>
-    <string name="foreground_notification_channel_description">Benachrichtigung welche für die interne Alarm Synchronisation benötigt wird. Bitte stumm schalten</string>
-</resources>
+    <string name="foreground_notification_channel_description">Vordergrundbenachrichtigung für die interne Alarmsynchronisation erforderlich. Bitte stumm schalten</string>
+    <string name="cal_import_error_time_zone_msg">Zeitzone konnte nicht erkannt werden: %s</string>
+    <string name="preferences_calendar_account">%1$s Konto</string>
+    <string name="preferences_calendar_delete">Kalender löschen</string>
+    <string name="preferences_calendar_display_name">Namen ändern</string>
+    <string name="preferences_calendar_color">Farbe</string>
+    <string name="preferences_calendar_visible">Ereignisse anzeigen</string>
+    <string name="preferences_calendar_synchronize">Kalender synchronisieren</string>
+    <string name="preferences_list_calendar_summary_sync_off">Nicht synchronisiert</string>
+    <string name="preferences_list_calendar_summary_invisible">Ereignisse werden nicht angezeigt</string>
+    <string name="preferences_list_general">Allgemeine Einstellungen</string>
+    <string name="preferences_list_add_offline">Offline-Kalender hinzufügen</string>
+    <string name="preferences_list_add_offline_title">Offline-Kalender hinzufügen</string>
+    <string name="preferences_list_add_offline_error_empty">Geben Sie einen Kalendernamen ein!</string>
+    <string name="preferences_list_add_offline_message">Offline-Kalender sind NICHT mit einem Cloud-Service synchronisiert und nur auf Ihrem Telefon verfügbar.</string>
+    <string name="preferences_list_add_offline_button">Kalender hinzufügen</string>
+    <string name="preferences_list_add_offline_name">Name</string>
+    <string name="preferences_list_add_offline_cancel">Abbrechen</string>
+    <string name="preferences_calendar_color_warning_title">Warnung</string>
+    <string name="preferences_calendar_color_warning_button">Ich verstehe</string>
+    <string name="preferences_calendar_delete_message">Wollen Sie diesen Kalender wirklich löschen\?</string>
+    <string name="preferences_calendar_delete_delete">Kalender löschen</string>
+    <string name="preferences_calendar_delete_cancel">Abbrechen</string>
+    <string name="preferences_menu_about">Über Etar</string>
+    <string name="offline_account_name">Offline-Kalender</string>
+    <string name="preferences_calendar_color_warning_message">Die Änderung der Farbe kann zurückgesetzt werden, wenn der Kalender erneut synchronisiert wird.
+\n
+\nIn DAVx⁵ kann \'Kalenderfarben verwalten\' deaktiviert werden, um dies zu verhindern.</string>
+    <string name="preferences_list_add_remote">Kalender hinzufügen (CalDAV)</string>
+    <string name="app_copyright">© 2015-<xliff:g>%s</xliff:g> The Etar Project. Teile davon © 2005-<xliff:g>%s</xliff:g> The Android Open Source Project.</string>
+    <string name="authors">Autoren</string>
+    <string name="changelog">Änderungsübersicht</string>
+    <string name="license">Lizenz</string>
+    <string name="source_code">Quelle</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 49ef0f370a7a1590bb6b11fc620c5ec21137d6b4..91ae6975ed38f180a6aafcd55c8629678a533aad 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Διαθέσιμος/η"</item>
     <item msgid="2064426942462573474">"Αβέβαιη παρουσία"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"πρώτο"</item>
-    <item msgid="5631923029483854900">"δεύτερο"</item>
-    <item msgid="148935502975250973">"τρίτο"</item>
-    <item msgid="5124200797326669172">"τέταρτο"</item>
-    <item msgid="7564374178324652137">"τελευταία"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Καμία απάντηση"</item>
     <item msgid="3724434080904437698">"Ναι"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Αυτό και τα μελλοντικά συμβάντα"</item>
     <item msgid="7833229563617435430">"Όλα τα συμβάντα"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Αυτά &amp; τα μελλοντικά συμβάντα"</item>
-    <item msgid="6315440193748139854">"Όλα τα συμβάντα"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Μόνο αυτό το συμβάν"</item>
     <item msgid="140670561403965380">"Όλα τα συμβάντα στη σειρά"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0db320e02317b8cb89fe6b3406e19e511bab6300..e2b9448cafb9d12c9275b2915b5f4e9eab36d64b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Ημερολόγιο"</string>
     <string name="what_label" msgid="1933578391985810049">"Τι"</string>
     <string name="where_label" msgid="3472482206065595118">"Που"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Αύριο"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Σήμερα στις <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Αύριο στις <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Επανάληψη"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Χωρίς τίτλο)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 λεπτό"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> λεπτά"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 λεπτό"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> λεπτά"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 ώρα"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> ώρες"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 ημέρα"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> ημέρες"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"ΕΒΔΟΜΑΔΑ <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 λεπτό"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> λεπτά"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 λεπτό"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> λεπτά"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 ώρα"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> ώρες"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 ημέρα"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> ημέρες"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"ΕΒΔΟΜΑΔΑ <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Ανανέωση"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Εμφάνιση ημέρας"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Ατζέντα"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Διαγραφή συμβάντος"</string>
     <string name="goto_today" msgid="9162136434410891230">"Σήμερα"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Ρυθμίσεις"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Ημερολόγια"</string>
     <string name="search" msgid="550656004486017426">"Αναζήτηση"</string>
     <string name="hide_controls" msgid="830320505938520882">"Απόκρ. στοιχ. ελέγχ."</string>
     <string name="show_controls" msgid="715520586028062621">"Εμφ. στοιχ. ελέγχου"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Ημερολόγια για εμφάνιση"</string>
-    <string name="synced" msgid="7913940305983383493">"συγχρονίστηκε"</string>
-    <string name="not_synced" msgid="4275114941801829419">"δεν συγχρονίστηκε"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Δεν εκτελείται συγχρονισμός αυτού του λογαριασμού και ενδέχεται να μην είναι ενημερωμένα τα ημερολόγια."</string>
-    <string name="accounts" msgid="849401841083180306">"Λογαριασμοί και συγχρονισμός"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Ημερολόγια για συγχρονισμό"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Ημερολόγια για συγχρονισμό"</string>
     <string name="hint_what" msgid="709155115005044531">"Όνομα συμβάντος"</string>
     <string name="hint_where" msgid="4972598001033801974">"Τοποθεσία"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Από"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Ολοήμερο"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Ημερολόγιο"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Εμφάνιση όλων"</string>
     <string name="description_label" msgid="7193475046717505855">"Περιγραφή"</string>
     <string name="presence_label" msgid="6169724148441175862">"Να εμφανίζομαι ως"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Απόρρητο"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Προσθήκη υπενθύμισης"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Δεν υπάρχουν ημερολόγια"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Για να μπορέσετε να προσθέσετε ένα συμβάν, πρέπει να προσθέσετε στη συσκευή σας τουλάχιστον έναν λογαριασμό στο Ημερολόγιο και  να κάνετε το ημερολόγιο ορατό. Αγγίξτε την επιλογή \"Προσθήκη λογαριασμού\" για να προσθέσετε έναν λογαριασμό (σε περίπτωση που μόλις προσθέσατε έναν λογαριασμό, περιμένετε να ολοκληρωθεί ο συγχρονισμός του και προσπαθήστε ξανά). Εναλλακτικά, αγγίξτε την επιλογή \"Ακύρωση\" και βεβαιωθείτε ότι τουλάχιστον ένα ημερολόγιο είναι ορατό."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Το Ημερολόγιο λειτουργεί καλύτερα με έναν Λογαριασμό Google."\n\n"• Αποκτήστε πρόσβαση σε αυτό από οποιοδήποτε πρόγραμμα περιήγησης ιστού"\n"• Δημιουργήστε αντίγραφα ασφαλείας των συμβάντων σας"</string>
     <string name="add_account" msgid="1669072099756774952">"Προσθήκη λογαριασμού"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Ημερολόγιο:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Διοργανωτής:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Κλήση"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Γρήγορες απαντήσεις"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Επεξ.προεπ.απ.κατά την αποστ.μην.ηλ.ταχ.στους καλεσμ."</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Επεξ.γρήγ.απαντ,"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Γρήγορη απάντηση"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Επιλογή γρήγορης απάντησης"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Αποτυχία εύρεσης προγράμματος ηλεκτρονικού ταχυδρομείου"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Άφιξη με μια μικρή καθυστέρηση."</item>
-    <item msgid="6215158751728689832">"Θα είμαι εκεί σε 10 λεπτά."</item>
-    <item msgid="4485794001743679338">"Προχωρήστε και συνεχίστε χωρίς εμένα."</item>
-    <item msgid="8036557974294987511">"Λυπάμαι, δεν θα καταφέρω να παρευρεθώ. Θα πρέπει να επαναπρογραμματίσουμε τη συνάντηση."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Άφιξη με μια μικρή καθυστέρηση."</item>
+        <item msgid="6215158751728689832">"Θα είμαι εκεί σε 10 λεπτά."</item>
+        <item msgid="4485794001743679338">"Προχωρήστε και συνεχίστε χωρίς εμένα."</item>
+        <item msgid="8036557974294987511">"Λυπάμαι, δεν θα καταφέρω να παρευρεθώ. Θα πρέπει να επαναπρογραμματίσουμε τη συνάντηση."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Συντάξτε τη δική σας…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Διοργανωτής:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Υπενθυμίσεις"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Διαγραφή"</string>
     <string name="save_label" msgid="2133599104834432589">"Τέλος"</string>
     <string name="discard_label" msgid="2394623883289782541">"Ακύρωση"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Αναβολή όλων"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Παράβλεψη όλων"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Αναβολή"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Συμβάν που δεν επαναλαμβάνεται"</string>
     <string name="endByDate" msgid="7654221304929538201">"; έως τις <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; για μία φορά"</item>
-    <item quantity="other" msgid="4855496837834652446">"; για <xliff:g id="NUMBER">%d</xliff:g> φορές"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Ημερησίως"</item>
-    <item quantity="other" msgid="5455230727715859264">"Κάθε <xliff:g id="NUMBER">%d</xliff:g> ημέρες"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; για μία φορά"</item>
+        <item quantity="other" msgid="4855496837834652446">"; για <xliff:g id="NUMBER">%d</xliff:g> φορές"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Ημερησίως"</item>
+        <item quantity="other" msgid="5455230727715859264">"Κάθε <xliff:g id="NUMBER">%d</xliff:g> ημέρες"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Καθημερινά (Δευ-Παρ)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Κάθε εβδομάδα, μέρα <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Κάθε εβδομάδες <xliff:g id="NUMBER">%1$d</xliff:g>, μέρες <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Κάθε εβδομάδα, μέρα <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Κάθε εβδομάδες <xliff:g id="NUMBER">%1$d</xliff:g>, μέρες <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Μηνιαία"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Ετήσια"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Κάθε μήνα (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Κάθε χρόνο (<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Προσαρμοσμένο (δεν είναι δυνατή η προσαρμογή στο τηλέφωνο)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Αλλαγή μόνο αυτού του συμβάντος"</string>
     <string name="modify_all" msgid="4421657265864209041">"Αλλαγή όλων των συμβάντων στη σειρά."</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Προβ.ημερ. και ωρών εκδηλ. στη βασ.ζώνη ώρας όταν ταξιδεύετε"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Βασική ζώνη ώρας"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Εμφάνιση αριθμού εβδομάδας"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Σχετικά με"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Έκδοση Build"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Ημερολόγιο"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Δεν υπάρχουν προσεχή συμβάντα ημερολογίου"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Σε πειραματικό στάδιο"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Υπενθυμίσεις"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Παράβλεψη υπενθυμίσεων"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Παράβλεψη υπενθυμίσεων"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Σίγαση"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Σίγαση υπενθυμίσεων συμβάντων κατά τη διάρκεια καθορισμένου χρονικού διαστήματος."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Ώρα έναρξης σίγασης"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Χρόνος λήξης σίγασης"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Εντοπισμός σφαλμάτων"</string>
     <string name="copy_db" msgid="437691290566699292">"Αποστολή βάσης δεδομένων"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Αναζήτηση <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Κατάργηση συμμετέχοντα"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Προσθήκη υπενθύμισης"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Κατάργηση υπενθύμισης"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Προσθήκη συμμετέχοντος"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Συγχρονισμός ημερολογίου"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Ολοήμερο συμβάν"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Επανάληψη"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Ώρα υπενθύμισης"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Τύπος υπενθύμισης"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Να εμφανίζομαι ως"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Απόρρητο"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Ειδοποίηση ημερολογίου"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Αναβολή ειδοποίησης"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου σε προσκεκλημένους"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Νέο συμβάν"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Συμβάντα <xliff:g id="ITEM_INDEX">%1$s</xliff:g> από <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 συμβάν"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> συμβάντα"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 συμβάν"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> συμβάντα"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 συμβάν"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> συμβάντα"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 συμβάν"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> συμβάντα"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Επιλεγμένο συμβάν"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"ΜΗΝ επιλέξετε -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Επανάληψη"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Δεν επαναλαμβάνεται"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Κάθε <xliff:g id="COUNT">%d</xliff:g> ημέρα"</item>
-    <item quantity="other" msgid="707566499994398250">"Κάθε <xliff:g id="COUNT">%d</xliff:g> ημέρες"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Κάθε <xliff:g id="COUNT">%d</xliff:g> εβδομάδα"</item>
-    <item quantity="other" msgid="7094801039989237061">"Κάθε <xliff:g id="COUNT">%d</xliff:g> εβδομάδες"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Κάθε <xliff:g id="COUNT">%d</xliff:g> μήνα"</item>
-    <item quantity="other" msgid="5419723710346646523">"Κάθε <xliff:g id="COUNT">%d</xliff:g> μήνες"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Κάθε <xliff:g id="COUNT">%d</xliff:g> έτος"</item>
-    <item quantity="other" msgid="5678653649746562060">"Κάθε <xliff:g id="COUNT">%d</xliff:g> έτη"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Κάθε <xliff:g id="COUNT">%d</xliff:g> ημέρα"</item>
+        <item quantity="other" msgid="707566499994398250">"Κάθε <xliff:g id="COUNT">%d</xliff:g> ημέρες"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Κάθε <xliff:g id="COUNT">%d</xliff:g> εβδομάδα"</item>
+        <item quantity="other" msgid="7094801039989237061">"Κάθε <xliff:g id="COUNT">%d</xliff:g> εβδομάδες"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Κάθε <xliff:g id="COUNT">%d</xliff:g> μήνα"</item>
+        <item quantity="other" msgid="5419723710346646523">"Κάθε <xliff:g id="COUNT">%d</xliff:g> μήνες"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Κάθε <xliff:g id="COUNT">%d</xliff:g> έτος"</item>
+        <item quantity="other" msgid="5678653649746562060">"Κάθε <xliff:g id="COUNT">%d</xliff:g> έτη"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"ίδια ημέρα κάθε μήνα"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Για πάντα"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Μέχρι μια ορισμένη ημ/νία"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Έως τις <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Για έναν αριθμό συμβάντων"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Για <xliff:g id="EVENT_COUNT">%d</xliff:g> συμβάν"</item>
-    <item quantity="other" msgid="8779598489398048259">"Για <xliff:g id="EVENT_COUNT">%d</xliff:g> συμβάντα"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Για <xliff:g id="EVENT_COUNT">%d</xliff:g> συμβάν"</item>
+        <item quantity="other" msgid="8779598489398048259">"Για <xliff:g id="EVENT_COUNT">%d</xliff:g> συμβάντα"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"αλλαγή ημερομηνίας λήξης"</string>
     <string name="visibility_default">Προεπιλογή</string>
   <string name="visibility_private">Ιδιωτικό</string>
@@ -289,4 +258,4 @@
   <string name="preferences_licence">Άδεια</string>
     <string name="preferences_privacy_policy">Πολιτική απορρήτου</string>
     <string name="preferences_service_terms">Οροι χρήσης</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index e101b5fb65aeee5a19a68d4013782ba7f9918cc1..e2ecabc4cc2a42c0e6ee7d2fd4cae3c3a0461dca 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Available"</item>
     <item msgid="2064426942462573474">"Tentative"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"first"</item>
-    <item msgid="5631923029483854900">"second"</item>
-    <item msgid="148935502975250973">"third"</item>
-    <item msgid="5124200797326669172">"fourth"</item>
-    <item msgid="7564374178324652137">"last"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"No response"</item>
     <item msgid="3724434080904437698">"Yes"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"This and future events"</item>
     <item msgid="7833229563617435430">"All events"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"This &amp; future events"</item>
-    <item msgid="6315440193748139854">"All events"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Only this event"</item>
     <item msgid="140670561403965380">"All events in the series"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 16e71ae1785c66eb75734a8088e761b6cf79ee92..0fa890871a89204704c3d3fd53c42b05348015ad 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Calendar"</string>
     <string name="what_label" msgid="1933578391985810049">"What"</string>
     <string name="where_label" msgid="3472482206065595118">"Where"</string>
@@ -25,28 +23,28 @@
     <string name="tomorrow" msgid="614434811813859237">"Tomorrow"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Today at <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Tomorrow at <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g></string>
     <string name="repeats_label" msgid="7414023871434593196">"Repetition"</string>
     <string name="no_title_label" msgid="302177118061368042">"(No title)"</string>
-  <plurals name="Nminutes">
-    <item msgid="4871052965772159239" quantity="one">"1 minute"</item>
-    <item msgid="5644461630927544936" quantity="other">"<xliff:g id="COUNT">%d</xliff:g> minutes"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item msgid="9191090668359663663" quantity="one">"1 min"</item>
-    <item msgid="9175648445939148974" quantity="other">"<xliff:g id="COUNT">%d</xliff:g> mins"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item msgid="4793697728599296830" quantity="one">"1 hour"</item>
-    <item msgid="4477841052001760620" quantity="other">"<xliff:g id="COUNT">%d</xliff:g> hours"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item msgid="5988137255732166573" quantity="one">"1 day"</item>
-    <item msgid="1709378992389618261" quantity="other">"<xliff:g id="COUNT">%d</xliff:g> days"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item msgid="8085184869561028365" quantity="other">"week <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item msgid="4871052965772159239" quantity="one">"1 minute"</item>
+        <item msgid="5644461630927544936" quantity="other">"<xliff:g id="COUNT">%d</xliff:g> minutes"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item msgid="9191090668359663663" quantity="one">"1 min"</item>
+        <item msgid="9175648445939148974" quantity="other">"<xliff:g id="COUNT">%d</xliff:g> mins"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item msgid="4793697728599296830" quantity="one">"1 hour"</item>
+        <item msgid="4477841052001760620" quantity="other">"<xliff:g id="COUNT">%d</xliff:g> hours"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item msgid="5988137255732166573" quantity="one">"1 day"</item>
+        <item msgid="1709378992389618261" quantity="other">"<xliff:g id="COUNT">%d</xliff:g> days"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item msgid="8085184869561028365" quantity="other">"week <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Refresh"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Show day"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
@@ -59,16 +57,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Delete event"</string>
     <string name="goto_today" msgid="9162136434410891230">"Today"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Settings"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Calendars to display"</string>
     <string name="search" msgid="550656004486017426">"Search"</string>
     <string name="hide_controls" msgid="830320505938520882">"Hide controls"</string>
     <string name="show_controls" msgid="715520586028062621">"Show controls"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Calendars to display"</string>
-    <string name="synced" msgid="7913940305983383493">"synced"</string>
-    <string name="not_synced" msgid="4275114941801829419">"not synced"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"This account isn\'t being synced, so your calendars may not be up to date."</string>
-    <string name="accounts" msgid="849401841083180306">"Accounts &amp; sync"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Calendars to sync"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Calendars to sync"</string>
     <string name="hint_what" msgid="709155115005044531">"Event name"</string>
     <string name="hint_where" msgid="4972598001033801974">"Location"</string>
@@ -87,14 +78,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"From"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"All day"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Calendar"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Show all"</string>
     <string name="description_label" msgid="7193475046717505855">"Description"</string>
     <string name="presence_label" msgid="6169724148441175862">"Show me as"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privacy"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Add reminder"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"No calendars"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Before you can add an event, you must add at least one Calendar account to your device and make a calendar visible. Touch Add Account to add an account (if you\'ve just added an account, wait for it to finish syncing and try again). Or touch Cancel and make sure that at least one calendar is visible."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Calendar works better with an Account."\n\n"• Access it from any web browser"\n"• Back up your events securely"</string>
     <string name="add_account" msgid="1669072099756774952">"Add account"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Calendar:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organiser:"</string>
@@ -115,16 +104,15 @@
     <string name="call_label" msgid="2960328220008869083">"Call"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Quick responses"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Edit default responses when emailing guests"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Edit quick responses"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Quick response"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Choose quick response"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Failed to find an email programme"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Running just a couple of minutes late."</item>
-    <item msgid="6215158751728689832">"Be there in about 10 minutes."</item>
-    <item msgid="4485794001743679338">"Go ahead and start without me."</item>
-    <item msgid="8036557974294987511">"Sorry, I can\'t make it. We\'ll have to reschedule."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Running just a couple of minutes late."</item>
+        <item msgid="6215158751728689832">"Be there in about 10 minutes."</item>
+        <item msgid="4485794001743679338">"Go ahead and start without me."</item>
+        <item msgid="8036557974294987511">"Sorry, I can\'t make it. We\'ll have to reschedule."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Write your own…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organiser:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Reminders"</string>
@@ -140,32 +128,28 @@
     <string name="delete_label" msgid="874742811918030739">"Delete"</string>
     <string name="save_label" msgid="2133599104834432589">"Done"</string>
     <string name="discard_label" msgid="2394623883289782541">"Cancel"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Snooze all"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Dismiss all"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Snooze"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"One-time event"</string>
     <string name="endByDate" msgid="7654221304929538201">"; until <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item msgid="3727754565990691816" quantity="one">"; for one time"</item>
-    <item msgid="4855496837834652446" quantity="other">"; for <xliff:g id="NUMBER">%d</xliff:g> times"</item>
-  </plurals>
-  <plurals name="daily">
-    <item msgid="5169052946627480942" quantity="one">"Daily"</item>
-    <item msgid="5455230727715859264" quantity="other">"Every <xliff:g id="NUMBER">%d</xliff:g> days"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item msgid="3727754565990691816" quantity="one">"; for one time"</item>
+        <item msgid="4855496837834652446" quantity="other">"; for <xliff:g id="NUMBER">%d</xliff:g> times"</item>
+    </plurals>
+    <plurals name="daily">
+        <item msgid="5169052946627480942" quantity="one">"Daily"</item>
+        <item msgid="5455230727715859264" quantity="other">"Every <xliff:g id="NUMBER">%d</xliff:g> days"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Every weekday (Mon–Fri)"</string>
-  <plurals name="weekly">
-    <item msgid="5463021019301453273" quantity="one">"Weekly on <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item msgid="2857390143157377867" quantity="other">"Every <xliff:g id="NUMBER">%1$d</xliff:g> weeks on <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item msgid="5463021019301453273" quantity="one">"Weekly on <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item msgid="2857390143157377867" quantity="other">"Every <xliff:g id="NUMBER">%1$d</xliff:g> weeks on <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Monthly"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Yearly"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Monthly (on day <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Yearly (on <xliff:g id="DATES">%s</xliff:g>)"</string>
-
-  <string name="custom" msgid="4137468716966004993" product="default">"Customise (can\'t customise on phone)"</string>
+    <string name="custom" msgid="4137468716966004993" product="default">"Customise (can\'t customise on phone)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Change only this event"</string>
-    <string name="modify_all" msgid="4421657265864209041">"Change all events in the series."</string>
+    <string name="modify_all" msgid="4421657265864209041">Change all events in the series</string>
     <string name="modify_all_following" msgid="3017428541066390380">"Change this and all future events"</string>
     <string name="new_event_dialog_label" msgid="7553105224561147916">"New event"</string>
     <string name="new_event_dialog_option" msgid="6154657379574669371">"New event"</string>
@@ -173,7 +157,7 @@
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"Delete <xliff:g id="EVENTTITLE">%s</xliff:g>?"</string>
     <string name="change_response_title" msgid="7704714776070974984">"Change response"</string>
     <string name="menu_general_preferences" msgid="2812705323334260708">"General settings"</string>
-  <string name="menu_about_preferences" msgid="6124375438237674973">Calendar about</string>
+    <string name="menu_about_preferences" msgid="6124375438237674973">Calendar about</string>
     <string name="preferences_title" msgid="8045855493262131773">"Settings"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Calendar view setting"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Notifications &amp; reminders"</string>
@@ -194,23 +178,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Displays calendars and event times in your home time zone when travelling"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Home time zone"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Show week number"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"About"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Build version"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Calendar"</string>
-  <plurals name="month_more_events">
-    <item msgid="8971334808414201327" quantity="one">"+1"</item>
-    <item msgid="1997405398178470838" quantity="other">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item msgid="8971334808414201327" quantity="one">"+1"</item>
+        <item msgid="1997405398178470838" quantity="other">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"No upcoming calendar events"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimental"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Reminders"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Skip Reminders"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Skip Reminders"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Quiet hours"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Silence event reminders during specified time."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Quiet hours start time"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Quiet hours end time"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Debugging"</string>
     <string name="copy_db" msgid="437691290566699292">"Send database"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Searching <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Remove attendee"</string>
@@ -223,55 +199,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Add reminder"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Remove reminder"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Add attendee"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sync calendar"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"All-day event"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Repetition"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Reminder time"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Reminder type"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Show me as"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privacy"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Calendar Notification"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Snooze Notification"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Email guests"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ New event"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Event <xliff:g id="ITEM_INDEX">%1$s</xliff:g> of <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item msgid="5230907142214104485" quantity="one">"1 event"</item>
-    <item msgid="6093072093209431078" quantity="other">"<xliff:g id="COUNT">%d</xliff:g> events"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item msgid="431585781647034528" quantity="one">"+1 event"</item>
-    <item msgid="3609243840882275136" quantity="other">"+<xliff:g id="COUNT">%d</xliff:g> events"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item msgid="5230907142214104485" quantity="one">"1 event"</item>
+        <item msgid="6093072093209431078" quantity="other">"<xliff:g id="COUNT">%d</xliff:g> events"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item msgid="431585781647034528" quantity="one">"+1 event"</item>
+        <item msgid="3609243840882275136" quantity="other">"+<xliff:g id="COUNT">%d</xliff:g> events"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Selected event"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"Do NOT check -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Repeat"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Never repeats"</string>
-  <plurals name="recurrence_interval_daily">
-    <item msgid="1205422710088692631" quantity="one">"Every <xliff:g id="COUNT">%d</xliff:g> day"</item>
-    <item msgid="707566499994398250" quantity="other">"Every <xliff:g id="COUNT">%d</xliff:g> days"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item msgid="4948681635464488351" quantity="one">"Every <xliff:g id="COUNT">%d</xliff:g> week"</item>
-    <item msgid="7094801039989237061" quantity="other">"Every <xliff:g id="COUNT">%d</xliff:g> weeks"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item msgid="4768178401603139718" quantity="one">"Every <xliff:g id="COUNT">%d</xliff:g> month"</item>
-    <item msgid="5419723710346646523" quantity="other">"Every <xliff:g id="COUNT">%d</xliff:g> months"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item msgid="5819562634008179102" quantity="one">"Every <xliff:g id="COUNT">%d</xliff:g> year"</item>
-    <item msgid="5678653649746562060" quantity="other">"Every <xliff:g id="COUNT">%d</xliff:g> years"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item msgid="1205422710088692631" quantity="one">"Every <xliff:g id="COUNT">%d</xliff:g> day"</item>
+        <item msgid="707566499994398250" quantity="other">"Every <xliff:g id="COUNT">%d</xliff:g> days"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item msgid="4948681635464488351" quantity="one">"Every <xliff:g id="COUNT">%d</xliff:g> week"</item>
+        <item msgid="7094801039989237061" quantity="other">"Every <xliff:g id="COUNT">%d</xliff:g> weeks"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item msgid="4768178401603139718" quantity="one">"Every <xliff:g id="COUNT">%d</xliff:g> month"</item>
+        <item msgid="5419723710346646523" quantity="other">"Every <xliff:g id="COUNT">%d</xliff:g> months"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item msgid="5819562634008179102" quantity="one">"Every <xliff:g id="COUNT">%d</xliff:g> year"</item>
+        <item msgid="5678653649746562060" quantity="other">"Every <xliff:g id="COUNT">%d</xliff:g> years"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"on the same day each month"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Forever"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Until a date"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Until <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"For a number of events"</string>
-  <plurals name="recurrence_end_count">
-    <item msgid="1400782968090516215" quantity="one">"For <xliff:g id="EVENT_COUNT">%d</xliff:g> event"</item>
-    <item msgid="8779598489398048259" quantity="other">"For <xliff:g id="EVENT_COUNT">%d</xliff:g> events"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item msgid="1400782968090516215" quantity="one">"For <xliff:g id="EVENT_COUNT">%d</xliff:g> event"</item>
+        <item msgid="8779598489398048259" quantity="other">"For <xliff:g id="EVENT_COUNT">%d</xliff:g> events"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"change end date"</string>
     <string name="visibility_default">Default</string>
   <string name="visibility_private">Private</string>
@@ -283,4 +251,4 @@
     <string name="preferences_privacy_policy">Privacy policy</string>
     <string name="preferences_service_terms">Terms of service</string>
     <string name="share_label">Partilhar</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index a4f8997d9a294b6bf747c05d064fd87fd7b53bdd..e43310a0ad555599cd608b2035cbf31a635b1590 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Disponible"</item>
     <item msgid="2064426942462573474">"Provisional"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"primer"</item>
-    <item msgid="5631923029483854900">"segundo"</item>
-    <item msgid="148935502975250973">"tercer"</item>
-    <item msgid="5124200797326669172">"cuarto"</item>
-    <item msgid="7564374178324652137">"último"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Sin respuesta"</item>
     <item msgid="3724434080904437698">"Sí"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Este y futuros eventos"</item>
     <item msgid="7833229563617435430">"Todos los eventos"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Este y eventos futuros"</item>
-    <item msgid="6315440193748139854">"Todos los eventos"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Solo este evento"</item>
     <item msgid="140670561403965380">"Todos los eventos en la serie"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5f4e55fe2ab84e1dd43b1d0f57e79e3351a47a25..96eda47a35951e03ea71c1f491c0d69aa1d96d92 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Calendario"</string>
     <string name="what_label" msgid="1933578391985810049">"Qué"</string>
     <string name="where_label" msgid="3472482206065595118">"Dónde"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Mañana"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Hoy a la hora <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Mañana a la hora <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Repetición"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Sin título)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minuto"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minutos"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min."</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> mins"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 hora"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> horas"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"un día"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> días"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"semana <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minuto"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minutos"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min."</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> mins"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 hora"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> horas"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"un día"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> días"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"semana <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Actualizar"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Mostrar día"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Eliminar evento"</string>
     <string name="goto_today" msgid="9162136434410891230">"Hoy"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Configuración"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Calendarios"</string>
     <string name="search" msgid="550656004486017426">"Buscar"</string>
     <string name="hide_controls" msgid="830320505938520882">"Ocultar los controles"</string>
     <string name="show_controls" msgid="715520586028062621">"Mostrar los controles"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Calendarios para mostrar"</string>
-    <string name="synced" msgid="7913940305983383493">"sincronizada"</string>
-    <string name="not_synced" msgid="4275114941801829419">"no sincronizada"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Puede que tus calendarios no estén actualizados ya que la sincronización de esta cuenta no se está realizando."</string>
-    <string name="accounts" msgid="849401841083180306">"Cuentas y sincronización"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Sincronización de calendarios"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Sincronización de calendarios"</string>
     <string name="hint_what" msgid="709155115005044531">"Nombre del evento"</string>
     <string name="hint_where" msgid="4972598001033801974">"Ubicación"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Desde"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Todo el día"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Calendario"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Mostrar todos"</string>
     <string name="description_label" msgid="7193475046717505855">"Descripción"</string>
     <string name="presence_label" msgid="6169724148441175862">"Mostrarme como"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privacidad"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Agregar recordatorio"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"No hay calendarios"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Para poder agregar un evento, primero debes agregar al menos una cuenta de Calendar a tu dispositivo y hacer visible un calendario. Para ello, toca Agregar cuenta (si acabas de agregar una cuenta, aguarda a que finalice su sincronización y vuelve a intentarlo). También puedes tocar Cancelar y asegurarte de que pueda verse al menos un calendario."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Calendario funciona mejor con una cuenta."\n\n" Accede desde cualquier navegador web."\n" Crea copias de seguridad de tus eventos de manera segura."</string>
     <string name="add_account" msgid="1669072099756774952">"Agregar cuenta"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Calendario:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organizador:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Llamar"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Respuestas rápidas"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Editar respuestas predeterminadas para enviar por correo"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Editar res. rápida"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Respuesta rápida"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Elige una respuesta rápida"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Error al buscar un programa de correo"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Con un par de minutos de retraso."</item>
-    <item msgid="6215158751728689832">"Estaré allí en unos 10 minutos."</item>
-    <item msgid="4485794001743679338">"Comienza sin mí."</item>
-    <item msgid="8036557974294987511">"No podré reunirme. Tendremos que programar otra reunión."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Con un par de minutos de retraso."</item>
+        <item msgid="6215158751728689832">"Estaré allí en unos 10 minutos."</item>
+        <item msgid="4485794001743679338">"Comienza sin mí."</item>
+        <item msgid="8036557974294987511">"No podré reunirme. Tendremos que programar otra reunión."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Escribe tu propia respuesta…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organizador:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Recordatorios"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Eliminar"</string>
     <string name="save_label" msgid="2133599104834432589">"Finalizar"</string>
     <string name="discard_label" msgid="2394623883289782541">"Cancelar"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Posponer todos"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Descartar todos"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Posponer"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Evento único"</string>
     <string name="endByDate" msgid="7654221304929538201">"; hasta el <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; por una sola vez"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> por vez/veces"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Diariamente"</item>
-    <item quantity="other" msgid="5455230727715859264">"Cada <xliff:g id="NUMBER">%d</xliff:g> día/s"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; por una sola vez"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> por vez/veces"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Diariamente"</item>
+        <item quantity="other" msgid="5455230727715859264">"Cada <xliff:g id="NUMBER">%d</xliff:g> día/s"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Semanalmente (lun. a vie.)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Semanalmente el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Cada <xliff:g id="NUMBER">%1$d</xliff:g> semana/s el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Semanalmente el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Cada <xliff:g id="NUMBER">%1$d</xliff:g> semana/s el <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Mensual"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anual"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Mensualmente (el día <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Anualmente (el <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Personalizado (no se puede personalizar en el teléfono)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Cambiar solo este evento"</string>
     <string name="modify_all" msgid="4421657265864209041">"Cambiar todos los eventos de esta serie"</string>
@@ -173,8 +158,6 @@
     <string name="delete_this_event_title" msgid="518402946676919384">"¿Deseas eliminar este evento?"</string>
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"¿Deseas eliminar <xliff:g id="EVENTTITLE">%s</xliff:g>?"</string>
     <string name="change_response_title" msgid="7704714776070974984">"Cambiar respuesta"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"Configuración general"</string>
-    <string name="menu_about_preferences" msgid="6124375438237674973">"Calendario Acerca de "</string>
     <string name="preferences_title" msgid="8045855493262131773">"Configuración"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Configuración de vista de calendario"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Notificaciones y recordatorios"</string>
@@ -195,23 +178,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Mostrar calendarios y horarios de eventos en tu zona horaria local al viajar"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Zona horaria local"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostrar número de semana"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Acerca de"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versión de compilación"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Calendario"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"No hay próximos eventos en el calendario"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimental"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Recordatorios"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Omitir recordatorios"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Omitir recordatorios"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Horas de silencio"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Silenciar recordatorios de eventos durante un tiempo especificado"</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Inicio horas de silencio"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Final horas de silencio"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Depuración"</string>
     <string name="copy_db" msgid="437691290566699292">"Enviar base de datos"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Buscando <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Eliminar asistente"</string>
@@ -224,67 +199,51 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Agregar recordatorio"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Eliminar recordatorio"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Agregar asistente"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sincronizar calendario"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Evento de todo el día"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Repetición"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Hora del recordatorio"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Tipo de recordatorio"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Mostrar como"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privacidad"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Notificación de Calendario"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Posponer notificación"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Enviar correo a invitados"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Evento nuevo"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Evento <xliff:g id="ITEM_INDEX">%1$s</xliff:g> de <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 evento"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> eventos"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 evento"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> eventos"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 evento"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> eventos"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 evento"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> eventos"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Evento seleccionado"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NO selecciones -&gt;."</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Repetir"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"No se repite"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Cada <xliff:g id="COUNT">%d</xliff:g> día"</item>
-    <item quantity="other" msgid="707566499994398250">"Cada <xliff:g id="COUNT">%d</xliff:g> días"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Cada <xliff:g id="COUNT">%d</xliff:g> semana"</item>
-    <item quantity="other" msgid="7094801039989237061">"Cada <xliff:g id="COUNT">%d</xliff:g> semanas"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Cada <xliff:g id="COUNT">%d</xliff:g> mes"</item>
-    <item quantity="other" msgid="5419723710346646523">"Cada <xliff:g id="COUNT">%d</xliff:g> meses"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Cada <xliff:g id="COUNT">%d</xliff:g> año"</item>
-    <item quantity="other" msgid="5678653649746562060">"Cada <xliff:g id="COUNT">%d</xliff:g> años"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Cada <xliff:g id="COUNT">%d</xliff:g> día"</item>
+        <item quantity="other" msgid="707566499994398250">"Cada <xliff:g id="COUNT">%d</xliff:g> días"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Cada <xliff:g id="COUNT">%d</xliff:g> semana"</item>
+        <item quantity="other" msgid="7094801039989237061">"Cada <xliff:g id="COUNT">%d</xliff:g> semanas"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Cada <xliff:g id="COUNT">%d</xliff:g> mes"</item>
+        <item quantity="other" msgid="5419723710346646523">"Cada <xliff:g id="COUNT">%d</xliff:g> meses"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Cada <xliff:g id="COUNT">%d</xliff:g> año"</item>
+        <item quantity="other" msgid="5678653649746562060">"Cada <xliff:g id="COUNT">%d</xliff:g> años"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"el mismo día cada mes"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Siempre"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Hasta una fecha"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Hasta <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"En ciertos eventos"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"En <xliff:g id="EVENT_COUNT">%d</xliff:g> evento"</item>
-    <item quantity="other" msgid="8779598489398048259">"En <xliff:g id="EVENT_COUNT">%d</xliff:g> eventos"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"En <xliff:g id="EVENT_COUNT">%d</xliff:g> evento"</item>
+        <item quantity="other" msgid="8779598489398048259">"En <xliff:g id="EVENT_COUNT">%d</xliff:g> eventos"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"cambiar la fecha final"</string>
     <string name="visibility_default">Predeterminado</string>
-  <string name="visibility_private">Privado</string>
-  <string name="visibility_public">Público</string>
-    <string name="preferences_about_app">El calendario se bifurca de Etar-Calendar</string>
-    <string name="preferences_authors">Autores</string>
-  <string name="preferences_source_code">Código fuente</string>
-  <string name="preferences_licence">Licencia</string>
-    <string name="preferences_privacy_policy">Política de privacidad</string>
-    <string name="preferences_service_terms">Términos de servicio</string>
-
-
+    <string name="visibility_private">Privado</string>
+    <string name="visibility_public">Público</string>
     <string name="goto_date">Ir a…</string>
     <string name="rsvp_accepted">Respondido afirmativo.</string>
     <string name="rsvp_tentative">Respondido tal vez.</string>
@@ -305,7 +264,7 @@
     <string name="view_settings">Ver ajustes</string>
     <string name="preferences_month_view_portrait">Vista de mes (Vertical)</string>
     <string name="preferences_month_view_landscape">Vista de mes (Apaisado)</string>
-    <string name="view_details">Ver detalles</string>
+    <string name="display_options">Ver detalles</string>
     <string name="display_time">Mostrar horario</string>
     <string name="display_location">Mostrar ubicación</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 2a93ef061a73de2fa5dea69b8d830ed0e71ea7d8..e68f93c9aee3f2fc29eff7ef83d13b27f590c98a 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Disponible"</item>
     <item msgid="2064426942462573474">"Provisional"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"primer"</item>
-    <item msgid="5631923029483854900">"segundo"</item>
-    <item msgid="148935502975250973">"tercer"</item>
-    <item msgid="5124200797326669172">"cuarto"</item>
-    <item msgid="7564374178324652137">"último"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Sin respuesta"</item>
     <item msgid="3724434080904437698">"Sí"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Este y otros eventos posteriores"</item>
     <item msgid="7833229563617435430">"Todos los eventos"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Este y otros eventos posteriores"</item>
-    <item msgid="6315440193748139854">"Todos los eventos"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Solo este evento"</item>
     <item msgid="140670561403965380">"Todos los eventos de la serie"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1610ee0d9e7d0ae20d53cef6b9fab0bb2fa6d9ff..4160074f8ab6a492ea798000807ab62a8ddf2b4a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -23,7 +23,9 @@
     <string name="tomorrow" msgid="614434811813859237">"Mañana"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Hoy a las <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Mañana a las <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Repetición"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Sin título)"</string>
     <plurals name="Nminutes">
@@ -31,8 +33,9 @@
         <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minutos"</item>
     </plurals>
     <plurals name="Nmins">
-        <item quantity="one" msgid="9191090668359663663">"1 minuto"</item>
-        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> minutos"</item>
+        <item quantity="one">1 min.</item>
+        <item quantity="other">
+            <xliff:g id="COUNT">%d</xliff:g> mins.</item>
     </plurals>
     <plurals name="Nhours">
         <item quantity="one" msgid="4793697728599296830">"1 hora"</item>
@@ -43,7 +46,9 @@
         <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> días"</item>
     </plurals>
     <plurals name="weekN">
-        <item quantity="other" msgid="8085184869561028365">"semana <xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="one">Etiqueta para mostrar la semana del año [CHAR LIMIT=16]</item>
+        <item quantity="other">semana <xliff:g id="count">%d</xliff:g>
+        </item>
     </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Actualizar"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Mostrar día"</string>
@@ -57,24 +62,17 @@
     <string name="event_delete" msgid="2386667193277770442">"Eliminar evento"</string>
     <string name="goto_today" msgid="9162136434410891230">"Hoy"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Ajustes"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Calendarios visibles"</string>
     <string name="search" msgid="550656004486017426">"Buscar"</string>
     <string name="hide_controls" msgid="830320505938520882">"Ocultar controles"</string>
     <string name="show_controls" msgid="715520586028062621">"Mostrar controles"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Calendarios"</string>
-    <string name="synced" msgid="7913940305983383493">"sincronizado"</string>
-    <string name="not_synced" msgid="4275114941801829419">"no sincronizado"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Esta cuenta no está sincronizada, por lo que es posible que tus calendarios no estén actualizados."</string>
-    <string name="accounts" msgid="849401841083180306">"Cuentas y sincronización"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Calendarios para sincronizar"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Calendarios para sincronizar"</string>
     <string name="hint_what" msgid="709155115005044531">"Nombre del evento"</string>
     <string name="hint_where" msgid="4972598001033801974">"Ubicación"</string>
     <string name="hint_description" msgid="1910143586169033232">"Descripción"</string>
     <string name="hint_attendees" msgid="1650488163176888480">"Invitados"</string>
-    <string name="creating_event" msgid="7516249252554059980">"Evento creado"</string>
-    <string name="saving_event" msgid="7694181017411177226">"Evento guardado"</string>
-    <string name="empty_event" msgid="9018699257414338634">"Evento vacío no creado"</string>
+    <string name="creating_event" msgid="7516249252554059980">Evento creado.</string>
+    <string name="saving_event" msgid="7694181017411177226">Evento guardado.</string>
+    <string name="empty_event" msgid="9018699257414338634">Evento vacío no creado.</string>
     <string name="creating_event_with_guest" msgid="5758688413124191931">"Se enviarán las invitaciones."</string>
     <string name="saving_event_with_guest" msgid="9184584438475689577">"Se enviarán las actualizaciones."</string>
     <string name="create_event_dialog_save" msgid="1080859798521717414">"Guardar"</string>
@@ -85,14 +83,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Desde"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Todo el día"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Calendario"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Mostrar todo"</string>
     <string name="description_label" msgid="7193475046717505855">"Descripción"</string>
     <string name="presence_label" msgid="6169724148441175862">"Mostrarme como"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privacidad"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Añadir recordatorio"</string>
-    <string name="no_syncable_calendars" msgid="7019488867045436129">"No hay calendarios."</string>
+    <string name="no_syncable_calendars" msgid="7019488867045436129">No hay calendarios</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Para añadir eventos, añade al menos una cuenta de Calendar al dispositivo y haz visible un calendario. Para ello, toca Añadir cuenta (si ya lo has hecho, espera a que finalice la sincronización y vuelve a intentarlo). También puedes tocar Cancelar y comprobar que al menos un calendario sea visible."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"La aplicación Calendario funciona mejor con una cuenta."\n\n"• Accede a tu calendario desde cualquier navegador web."\n"• Haz copias de seguridad de tus eventos de forma segura."</string>
     <string name="add_account" msgid="1669072099756774952">"Añadir cuenta"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Calendario:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organizador:"</string>
@@ -113,7 +109,6 @@
     <string name="call_label" msgid="2960328220008869083">"Llamar"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Respuestas rápidas"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Editar respuestas predeterminadas al enviar correos electrónicos a los invitados"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Editar respuestas rápidas"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Respuesta rápida"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Seleccionar respuesta rápida"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Error al buscar un programa de correo electrónico"</string>
@@ -138,7 +133,6 @@
     <string name="delete_label" msgid="874742811918030739">"Eliminar"</string>
     <string name="save_label" msgid="2133599104834432589">"Listo"</string>
     <string name="discard_label" msgid="2394623883289782541">"Cancelar"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Posponer recordatorios"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Descartar todo"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Posponer"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Evento único"</string>
@@ -158,8 +152,6 @@
     </plurals>
     <string name="monthly" msgid="4587116285383048586">"Mensualmente"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anualmente"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Cada mes (el día <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Cada año (el <xliff:g id="DATES">%s</xliff:g>)"</string>
     <string name="custom" product="default" msgid="4137468716966004993">"Personalizar (no se puede personalizar en el teléfono)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Cambiar solo este evento"</string>
     <string name="modify_all" msgid="4421657265864209041">"Cambiar todos los eventos de la serie"</string>
@@ -191,23 +183,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Mostrar calendarios y eventos en la hora local al viajar"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Zona horaria local"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostrar número de semana"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Acerca de"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versión de la compilación"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Calendario"</string>
     <plurals name="month_more_events">
         <item quantity="one" msgid="8971334808414201327">"+1"</item>
         <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
     </plurals>
-    <string name="gadget_no_events" msgid="5209110911088302855">"No hay futuros eventos en el calendario."</string>
+    <string name="gadget_no_events" msgid="5209110911088302855">No hay eventos futuros en el calendario</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimental"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Recordatorios"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Omitir recordatorios"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Omitir recordatorios"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Horas de silencio"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Silenciar recordatorios de eventos durante un tiempo especificado"</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Inicio horas de silencio"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Final horas de silencio"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Depuración"</string>
     <string name="copy_db" msgid="437691290566699292">"Enviar base de datos"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Buscando <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Eliminar asistente"</string>
@@ -220,30 +204,23 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Añadir recordatorio"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Eliminar recordatorio"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Añadir asistente"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sincronizar calendario"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Todo el día"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Repetición"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Duración del recordatorio"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Tipo de recordatorio"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Mostrarme como"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privacidad"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Notificación de Calendar"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Posponer notificación"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Escribir a invitados"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"Añadir evento"</string>
-    <string name="template_announce_item_index" msgid="4067877800670753110">"Evento <xliff:g id="ITEM_INDEX">%1$s</xliff:g> de <xliff:g id="ITEM_COUNT">%2$s</xliff:g>"</string>
+    <string name="template_announce_item_index" msgid="4067877800670753110">Evento <xliff:g id="item_index">%1$s</xliff:g> de <xliff:g id="item_count">%2$s</xliff:g>.</string>
     <plurals name="Nevents">
-        <item quantity="one" msgid="5230907142214104485">"1 evento"</item>
-        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> eventos"</item>
+        <item quantity="one">1 evento.</item>
+        <item quantity="other">
+            <xliff:g id="COUNT">%d</xliff:g> eventos.</item>
     </plurals>
     <plurals name="N_remaining_events">
-        <item quantity="one" msgid="431585781647034528">"+1 evento"</item>
-        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> eventos"</item>
+        <item quantity="one">+1 evento</item>
+        <item quantity="other">+<xliff:g id="COUNT">%d</xliff:g> eventos</item>
     </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Evento seleccionado"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NO seleccionar -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Repetir"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"No se repite"</string>
     <plurals name="recurrence_interval_daily">
         <item quantity="one" msgid="1205422710088692631">"Cada <xliff:g id="COUNT">%d</xliff:g> día"</item>
         <item quantity="other" msgid="707566499994398250">"Cada <xliff:g id="COUNT">%d</xliff:g> días"</item>
@@ -273,7 +250,6 @@
     <string name="no_map">No hay app de mapas instalado</string>
     <string name="error_generating_ics">Problemas encontrados al compartir evento</string>
     <string name="user_rejected_calendar_write_permission">Etar requiere permisos para leer y escribir en el calendario para que funcione adecuadamente. Por favor intenté de nuevo.</string>
-    <string name="standalone_app_label">Etar</string>
     <string name="cal_export_event_sdcard_title">Exporta a tarjeta SD</string>
     <string name="cal_export_succ_msg">Evento exportado satisfactoriamente: %1s</string>
     <string name="cal_import_error_msg">Importando a calendario falló</string>
@@ -281,7 +257,7 @@
     <string name="cal_nothing_to_import">Nada para importar</string>
     <string name="cal_pick_ics">Elige un archivo para importar</string>
     <string name="cal_share_intent_title">Envía evento a:</string>
-    <string name="calendar_permission_not_granted">Lamentamos que esta</string>
+    <string name="calendar_permission_not_granted">Lo siento, esta característica no puede funcionar.\nEtar requiere permisos de lectura y escritura en el calendario para funcionar correctamente</string>
     <string name="default_start_last">Vista previamente utilizada</string>
     <string name="default_start_title">Vista de</string>
     <string name="goto_date">Ir a…</string>
@@ -290,9 +266,9 @@
     <string name="preferences_dark_theme">Oscuro</string>
     <string name="preferences_days_per_week_dialog">Días por semana</string>
     <string name="preferences_days_per_week_title">Días por semana</string>
-    <string name="rsvp_accepted">\"Respondió si.\"</string>
-    <string name="rsvp_declined">\"Respondió no.\"</string>
-    <string name="rsvp_tentative">\"Respondió quizás.\"</string>
+    <string name="rsvp_accepted">Respondió sí.</string>
+    <string name="rsvp_declined">Respondió no.</string>
+    <string name="rsvp_tentative">Respondió quizás.</string>
     <string name="share_label">Compartir</string>
     <string name="visibility_default">Predeterminado</string>
     <string name="visibility_private">Privado</string>
@@ -324,7 +300,7 @@
     <string name="view_settings">Ajustes de visualización</string>
     <string name="preferences_month_view_portrait">Diseño de vista mensual (vertical)</string>
     <string name="preferences_month_view_landscape">Diseño de vista mensual (horizontal)</string>
-    <string name="view_details">Ver detalles</string>
+    <string name="display_options">Ver detalles</string>
     <string name="display_time">Mostrar hora</string>
     <string name="display_location">Mostrar ubicación</string>
     <string name="show_time_no">No mostrar la hora</string>
@@ -335,4 +311,36 @@
     <string name="maximum_number_of_lines">Número máximo de líneas en el evento</string>
     <string name="foreground_notification_channel_name">Sincronizar alerta</string>
     <string name="foreground_notification_channel_description">Se requiere notificación en primer plano para sincronizar la alerta interna. Por favor, silenciar</string>
+    <string name="cal_import_error_time_zone_msg">No entiendo la zona horaria proporcionada: %s</string>
+    <string name="preferences_calendar_account">Cuenta %1$s</string>
+    <string name="preferences_calendar_delete">Borrar calendario</string>
+    <string name="preferences_calendar_display_name">Cambiar nombre</string>
+    <string name="preferences_calendar_color">Color</string>
+    <string name="preferences_calendar_visible">Mostrar eventos</string>
+    <string name="preferences_calendar_synchronize">Sincronizar este calendario</string>
+    <string name="preferences_list_calendar_summary_sync_off">No sincronizado</string>
+    <string name="preferences_list_calendar_summary_invisible">No se están mostrando los eventos</string>
+    <string name="preferences_list_general">Configuración general</string>
+    <string name="preferences_list_add_remote">Añadir calendario remoto (CalDAV)</string>
+    <string name="preferences_list_add_offline">Añadir calendario fuera de línea</string>
+    <string name="preferences_list_add_offline_title">Añadir calendario fuera de línea</string>
+    <string name="preferences_list_add_offline_error_empty">¡Entrar nombre de calendario!</string>
+    <string name="preferences_list_add_offline_message">Los calendarios fuera de línea NO están sincronizados con un servicio en la nube y están disponibles solo en tu teléfono.</string>
+    <string name="preferences_list_add_offline_button">Añadir calendario</string>
+    <string name="preferences_list_add_offline_name">Nombre</string>
+    <string name="preferences_list_add_offline_cancel">Cancelar</string>
+    <string name="preferences_calendar_color_warning_title">Advertencia</string>
+    <string name="preferences_calendar_color_warning_button">Entiendo</string>
+    <string name="preferences_calendar_delete_message">¿Realmente quieres borrar este calendario\?</string>
+    <string name="preferences_calendar_delete_delete">Borrar calendario</string>
+    <string name="preferences_calendar_delete_cancel">Cancelar</string>
+    <string name="preferences_menu_about">Acerca de Etar</string>
+    <string name="offline_account_name">Calendario fuera de línea</string>
+    <string name="preferences_calendar_color_warning_message">El cambio de color se puede revertir cuando se sincronice el calendario de nuevo.
+\n
+\nSe puede deshabilitar la opción \'Gestión de colores de calendarios\' de DAVx⁵ para prevenir esto.</string>
+    <string name="authors">Autores</string>
+    <string name="changelog">Registro de cambios</string>
+    <string name="license">Licencia</string>
+    <string name="source_code">Fuente</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 59c72256934414e00ec06724028ced5c5fea6106..6c7aa51f34675bff422eaa8cc6fe747010ffcb73 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Saadaval"</item>
     <item msgid="2064426942462573474">"Katseline"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"esimene"</item>
-    <item msgid="5631923029483854900">"sekund"</item>
-    <item msgid="148935502975250973">"kolmas"</item>
-    <item msgid="5124200797326669172">"neljas"</item>
-    <item msgid="7564374178324652137">"viimane"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Vastust pole"</item>
     <item msgid="3724434080904437698">"Jah"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"See sündmus ja tulevased sündmused"</item>
     <item msgid="7833229563617435430">"Kõik sündmused"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"See ja tulevased sündmused"</item>
-    <item msgid="6315440193748139854">"Kõik sündmused"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Ainult see sündmus"</item>
     <item msgid="140670561403965380">"Kõik seerias olevad sündmused"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 63cf633e26d6dfca5151d826fee14de5b44c3b14..3bf7b93004cf56134d408ede42cb2b03be78f183 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalender"</string>
     <string name="what_label" msgid="1933578391985810049">"Mis?"</string>
     <string name="where_label" msgid="3472482206065595118">"Kus"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Homme"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Täna kell <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Homme kell <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Kordamine"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Pealkiri puudub)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minut"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minutit"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 tund"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> tundi"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 päev"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> päeva"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"Nädal: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minut"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minutit"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 tund"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> tundi"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 päev"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> päeva"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"Nädal: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Värskenda"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Kuva päev"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Päevakord"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Kustuta sündmus"</string>
     <string name="goto_today" msgid="9162136434410891230">"Täna"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Seaded"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kuvatavad kalendrid"</string>
     <string name="search" msgid="550656004486017426">"Otsing"</string>
     <string name="hide_controls" msgid="830320505938520882">"Peida juhtelemendid"</string>
     <string name="show_controls" msgid="715520586028062621">"Kuva juhtelement"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kuvatavad kalendrid"</string>
-    <string name="synced" msgid="7913940305983383493">"sünkroonitud"</string>
-    <string name="not_synced" msgid="4275114941801829419">"pole sünkroonitud"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Seda kontot ei sünkroonita, seega ei pruugi teie kalendrid olla värskendatud."</string>
-    <string name="accounts" msgid="849401841083180306">"Kontod ja sünkroonimine"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Sünkroonitavad kalendrid"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Sünkroonitavad kalendrid"</string>
     <string name="hint_what" msgid="709155115005044531">"Sündmuse nimi"</string>
     <string name="hint_where" msgid="4972598001033801974">"Asukoht"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Alates"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Kogu päev"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalender"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Kuva kõik"</string>
     <string name="description_label" msgid="7193475046717505855">"Kirjeldus"</string>
     <string name="presence_label" msgid="6169724148441175862">"Kuva mind olekus"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privaatsus"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Lisa meeldetuletus"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Kalendrid puuduvad"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Enne kui saate lisada sündmusi, peate seadmesse lisama vähemalt ühe kalendri konto ja muutma kalendri nähtavaks. Konto lisamiseks puudutage käsku Lisa konto (kui lisasite äsja konto, oodake, kuni see lõpetab sünkroonimise, ja proovige uuesti). Teise võimalusena puudutage käsku Tühista ja veenduge, et vähemalt üks kalender on nähtav."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Calendar töötab Google\'i kontoga paremini."\n\n"• Pääsete selle juurde igast veebibrauserist."\n"• Varundage sündmusi turvaliselt."</string>
     <string name="add_account" msgid="1669072099756774952">"Lisa konto"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalender:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Korraldaja:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Helista"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Kiirvastused"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Vastuste muutmine"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Kiirvast. muutmine"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Kiirvastus"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Kiirvastuse valimine"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Meiliprogrammi leidmine ebaõnnestus"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Jääb paar minutit hiljaks."</item>
-    <item msgid="6215158751728689832">"Olge umbes 10 minuti pärast valmis."</item>
-    <item msgid="4485794001743679338">"Alusta ilma minuta."</item>
-    <item msgid="8036557974294987511">"Kahjuks ma ei jõua. Peame ajakava üle vaatama."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Jääb paar minutit hiljaks."</item>
+        <item msgid="6215158751728689832">"Olge umbes 10 minuti pärast valmis."</item>
+        <item msgid="4485794001743679338">"Alusta ilma minuta."</item>
+        <item msgid="8036557974294987511">"Kahjuks ma ei jõua. Peame ajakava üle vaatama."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Kirjutage ise …"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Korraldaja:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Meeldetuletused"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Kustuta"</string>
     <string name="save_label" msgid="2133599104834432589">"Valmis"</string>
     <string name="discard_label" msgid="2394623883289782541">"Tühista"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Lükka kõik edasi"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Loobu kõigist"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Lükka edasi"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Ühekordne sündmus"</string>
     <string name="endByDate" msgid="7654221304929538201">"; kuni <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; ühe korra"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> korda"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Iga päev"</item>
-    <item quantity="other" msgid="5455230727715859264">"Iga <xliff:g id="NUMBER">%d</xliff:g> päeva järel"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; ühe korra"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> korda"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Iga päev"</item>
+        <item quantity="other" msgid="5455230727715859264">"Iga <xliff:g id="NUMBER">%d</xliff:g> päeva järel"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Igal tööpäeval (E–R)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Iga nädal: <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Iga <xliff:g id="NUMBER">%1$d</xliff:g> nädala tagant: <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Iga nädal: <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Iga <xliff:g id="NUMBER">%1$d</xliff:g> nädala tagant: <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Iga kuu"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Iga aasta"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Igakuine (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. kuupäeval)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Iga-aastane (<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Kohandatud (ei saa kohandada telefonis)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Muutke ainult seda sündmust"</string>
     <string name="modify_all" msgid="4421657265864209041">"Muutke kõiki seeria sündmusi"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Kuvab reisides kalendrid ja sündmuste ajad koduse aja järgi"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Kodune ajavöönd"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Nädala numbri kuvamine"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Teave"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Järguversioon"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Tulevasi kalendrisündmusi pole"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Eksperimentaalne"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Meeldetuletused"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Jäta meeldetul. vahele"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Jäta meeldetul. vahele"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Vaikusetunnid"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Vaigista sündmuse meeldetuletused määratud ajal."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Vaikusetundide alguse aeg"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Vaikusetundide lõpu aeg"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Silumine"</string>
     <string name="copy_db" msgid="437691290566699292">"Saatke andmebaas"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Domeeni <xliff:g id="DOMAIN">%s</xliff:g> otsimine ..."</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Eemalda osaleja"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Lisa meeldetuletus"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Eemalda meeldetuletus"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Lisa osaleja"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sünkrooni kalender"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Kogupäevasündmus"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Kordamine"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Meeldetuletuse aeg"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Meeldetuletuse tüüp"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Kuva mind olekus"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privaatsus"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Kalendriteatised"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Lükka teatis edasi"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Saada külalistele meil"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Uus sündmus"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Sündmus <xliff:g id="ITEM_INDEX">%1$s</xliff:g>/<xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 sündmus"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> sündmust"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 sündmus"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> sündmust"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 sündmus"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> sündmust"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 sündmus"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> sündmust"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Valitud sündmus"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"ÄRGE märkige -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Kordamine"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Ei kordu kunagi"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Iga <xliff:g id="COUNT">%d</xliff:g> päeva tagant"</item>
-    <item quantity="other" msgid="707566499994398250">"Iga <xliff:g id="COUNT">%d</xliff:g> päeva tagant"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Iga <xliff:g id="COUNT">%d</xliff:g> nädala tagant"</item>
-    <item quantity="other" msgid="7094801039989237061">"Iga <xliff:g id="COUNT">%d</xliff:g> nädala tagant"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Iga <xliff:g id="COUNT">%d</xliff:g> kuu tagant"</item>
-    <item quantity="other" msgid="5419723710346646523">"Iga <xliff:g id="COUNT">%d</xliff:g> kuu tagant"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Iga <xliff:g id="COUNT">%d</xliff:g> aasta tagant"</item>
-    <item quantity="other" msgid="5678653649746562060">"Iga <xliff:g id="COUNT">%d</xliff:g> aasta tagant"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Iga <xliff:g id="COUNT">%d</xliff:g> päeva tagant"</item>
+        <item quantity="other" msgid="707566499994398250">"Iga <xliff:g id="COUNT">%d</xliff:g> päeva tagant"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Iga <xliff:g id="COUNT">%d</xliff:g> nädala tagant"</item>
+        <item quantity="other" msgid="7094801039989237061">"Iga <xliff:g id="COUNT">%d</xliff:g> nädala tagant"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Iga <xliff:g id="COUNT">%d</xliff:g> kuu tagant"</item>
+        <item quantity="other" msgid="5419723710346646523">"Iga <xliff:g id="COUNT">%d</xliff:g> kuu tagant"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Iga <xliff:g id="COUNT">%d</xliff:g> aasta tagant"</item>
+        <item quantity="other" msgid="5678653649746562060">"Iga <xliff:g id="COUNT">%d</xliff:g> aasta tagant"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"iga kuu samal päeval"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Igavesti"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Kuni kuupäevani"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Kuni <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Sündmust korratakse"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> sündmuse puhul"</item>
-    <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> sündmuse puhul"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> sündmuse puhul"</item>
+        <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> sündmuse puhul"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"lõppkuupäeva muutmine"</string>
     <string name="visibility_default">Vaikeseade</string>
   <string name="visibility_private">Privaatne</string>
@@ -283,4 +252,4 @@
   <string name="preferences_licence">Litsents</string>
     <string name="preferences_privacy_policy">Privaatsuseeskirjad</string>
     <string name="preferences_service_terms">Kasutustingimused</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d3707f0d5e11f93142934ccf3263087ef499b4ba..ea29cc2546565a227d26c16eb4b823eaa7dc127c 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -27,17 +27,10 @@
     <string name="goto_today">Gaur</string>
     <string name="goto_date">Joan…</string>
     <string name="menu_preferences">Ezarpenak</string>
-    <string name="menu_select_visible_calendars">Bistaratzeko egutegiak</string>
     <string name="search">Bilatu</string>
     <string name="hide_controls">Ezkutatu kontrolak</string>
     <string name="show_controls">Erakutsi kontrolak</string>
     <string name="view_settings">Ikusi ezarpenak</string>
-    <string name="select_visible_calendars_title">Bistaratzeko egutegiak</string>
-    <string name="synced">Sinkronizatuta</string>
-    <string name="not_synced">Ez sinkronizatuta</string>
-    <string name="acct_not_synced">Kontu hau ez dago sinkronizatzen, beraz zure egutegia ez da eguneratuta egongo.</string>
-    <string name="accounts">Kontua eta Sinkronizazioa</string>
-    <string name="select_synced_calendars_title">Sinkronizatzeko egutegiak</string>
     <string name="select_synced_calendars_button">Sinkronizatzeko egutegiak</string>
     <string name="hint_what">Gertaera izena</string>
     <string name="hint_where">Kokapena</string>
@@ -59,16 +52,11 @@
     <string name="edit_event_from_label">Noiztik</string>
     <string name="edit_event_all_day_label">Egun osoa</string>
     <string name="edit_event_calendar_label">Egutegia</string>
-    <string name="edit_event_show_all">Erakutsi guztiak</string>
     <string name="description_label">Deskribapena</string>
     <string name="presence_label">Erakutsi horrela</string>
     <string name="privacy_label">Pribatutasuna</string>
     <string name="reminders_label">Gehitu jakinarazpena</string>
     <string name="no_syncable_calendars">Egutegirik ez</string>
-    <string name="create_an_account_desc">Egutegiek Kontu batekin hobeto funtzionatzen dute.
-\n
-\n• Edozein web nabigatzailetik atzitu
-\n• Gertaeren babes-kopia segurua egin</string>
     <string name="add_account">Gehitu kontua</string>
     <string name="view_event_calendar_label">Egutegia:</string>
     <string name="view_event_organizer_label">Antolatzailea:</string>
@@ -90,7 +78,6 @@
     <string name="call_label">Deitu</string>
     <string name="quick_response_settings">Erantzun azkarrak</string>
     <string name="quick_response_settings_summary">Editatu erantzun lehenetsiak gonbidatuei mezua bidaltzerakoan</string>
-    <string name="quick_response_settings_title">Editatu erantzun azkarrak</string>
     <string name="quick_response_settings_edit_title">Erantzun azkarra</string>
     <string name="quick_response_dialog_title">Aukera erantzun azkarra</string>
     <string name="quick_response_email_failed">Errorea e-posta programa bilatzean</string>
@@ -113,7 +100,6 @@
     <string name="delete_label">Ezabatu</string>
     <string name="save_label">Gorde</string>
     <string name="discard_label">Utzi</string>
-    <string name="snooze_all_label">Utzi gerorako guztiak</string>
     <string name="dismiss_all_label">Baztertu guztiak</string>
     <string name="snooze_label">Utzi gerorako</string>
     <plurals name="endByCount">
@@ -128,8 +114,6 @@
     <string name="every_weekday">Lanegun guztietan (Al-Ol)</string>
     <string name="monthly">Hilabetero</string>
     <string name="yearly_plain">Urtero</string>
-    <string name="monthly_on_day">Hilabetero (<xliff:g id="day_of_month">%s</xliff:g>. egunean)</string>
-    <string name="yearly">Urtero (<xliff:g id="dates">%s</xliff:g>)</string>
     <string name="modify_event">Aldatu bakarrik gertaera hau</string>
     <string name="modify_all">Aldatu gertaera guztiak serie honetan</string>
     <string name="modify_all_following">Aldatu gertaera hau eta etorkizunekoak</string>
@@ -138,8 +122,6 @@
     <string name="delete_this_event_title">Ezabatu gertaera hau\?</string>
     <string name="delete_recurring_event_title">Ezabatu <xliff:g id="eventtitle">%s</xliff:g>\?</string>
     <string name="change_response_title">Aldatu erantzuna</string>
-    <string name="menu_general_preferences">Ezarpen orokorrak</string>
-    <string name="menu_about_preferences">Egutegiari buruz</string>
     <string name="preferences_title">Ezarpenak</string>
     <string name="preferences_general_title">Egutegi ikuspegiaren ezarpenak</string>
     <string name="preferences_month_view_portrait">Hilabete ikuspegi diseinua (Bertikala)</string>
@@ -153,7 +135,7 @@
     <string name="preferences_reminder_title">Jakinarazpenak eta abisuak</string>
     <string name="preferences_hide_declined_title">Ezkutatu baztertutako gertaerak</string>
     <string name="default_start_title">Ikuspegi lehenetsia</string>
-    <string name="view_details">Ikuspegi Xehetasunak</string>
+    <string name="display_options">Ikuspegi Xehetasunak</string>
     <string name="display_time">Erakutsi Ordua</string>
     <string name="display_location">Erakutsi Kokapena</string>
     <string name="default_start_last">Aurretik erabilitako ikuspegia</string>
@@ -176,18 +158,11 @@
     <string name="preferences_home_tz_title">Tokiko ordu-zona</string>
     <string name="preferences_show_week_num_title">Erakutsi aste zenbakia</string>
     <string name="preferences_alerts_custom_snooze_delay_title">Galdetu utzi gerokorako atzerapen oroitzapena</string>
-    <string name="preferences_about_title">Honi buruz</string>
     <string name="preferences_build_version">Konpilazio bertsioa</string>
     <string name="preferences_issues">Arazoen berri eman</string>
-    <string name="gadget_title">Egutegia</string>
     <string name="preferences_experimental_category">Esperimentala</string>
-    <string name="preferences_reminders_category">Abisuak</string>
     <string name="preferences_reminders_responded_label">Saltatu Abisuak</string>
     <string name="preferences_reminders_responded_dialog">Saltatu Abisuak</string>
-    <string name="preferences_reminders_quiet_hours_label">Ordu isilak</string>
-    <string name="preferences_reminders_quiet_hours_start">Ordu isilen hasiera ordua</string>
-    <string name="preferences_reminders_quiet_hours_end">Ordu isilen bukaera ordua</string>
-    <string name="preferences_debug_category">Arazten</string>
     <string name="copy_db">Bidali datu-basea</string>
     <string name="directory_searching_fmt">Bilatzen <xliff:g id="domain">%s</xliff:g>…</string>
     <string name="accessibility_remove_attendee">Ezabatu parte-hartzailea</string>
@@ -200,21 +175,13 @@
     <string name="accessibility_add_reminder">Gehitu abisua</string>
     <string name="accessibility_remove_reminder">Ezabatu abisua</string>
     <string name="accessibility_add_attendee">Gehitu parte-hartzailea</string>
-    <string name="accessibility_sync_cal">Sinkronizatu egutegia</string>
     <string name="accessibility_all_day">Egun osoko gertaera</string>
-    <string name="accessibility_repeats">Errepikapena</string>
     <string name="accessibility_reminder_time">Errepikapen ordua</string>
     <string name="accessibility_reminder_type">Errepikapen mota</string>
     <string name="accessibility_reminder_showmeas">Erakutsi honela</string>
     <string name="accessibility_reminder_privacy">Pribatutasuna</string>
-    <string name="accessibility_cal_notification">Egutegi Jakinarazpena</string>
-    <string name="accessibility_snooze_notification">Gerorako utzi Jakinarazpena</string>
-    <string name="accessibility_email_notification">Gonbidatuen helbide elektronikoak</string>
     <string name="day_view_new_event_hint">+ Gertaera berria</string>
     <string name="acessibility_selected_marker_description">Aukeratutako gertaera</string>
-    <string name="do_not_check">EZ markatu -&gt;</string>
-    <string name="recurrence_dialog_title">Errepikatu</string>
-    <string name="recurrence_dialog_title_never">Ez errepikatu inoiz</string>
     <string name="recurrence_month_pattern_by_day">egun berean hilabetero</string>
     <string name="recurrence_end_continously">Beti</string>
     <string name="recurrence_end_date_label">Data arte</string>
@@ -274,9 +241,10 @@
             <xliff:g id="count">%d</xliff:g> egun</item>
     </plurals>
     <plurals name="weekN">
-        <item quantity="one">1. Astea</item>
+        <item quantity="one">
+            <xliff:g id="count">%d</xliff:g>. astea</item>
         <item quantity="other">
-            <xliff:g id="count">%d</xliff:g>. Astea</item>
+            <xliff:g id="count">%d</xliff:g>. astea</item>
     </plurals>
     <string name="no_calendars_found">Gertaera bat gehitu aurretik, gutxienez Egutegi bat gehitu behar duzu zure gailuan eta egutegia ikusgarri bezala markatu. Ukitu Gehitu Kontua kontu bat gehitzeko (kontu bat gehitu baduzu, itxaron sinkronizazioa bukatu arte eta saiatu berriz). Edo ukitu Utzi eta ziurtatu gutxienez egutegi bat dagoela ikusgarri.</string>
     <string name="show_newer_events">Ukitu gertaerak ikusteko <xliff:g id="newest_search_range">%1$s</xliff:g> baino geroago</string>
@@ -288,7 +256,7 @@
             <xliff:g id="number">%1$d</xliff:g> astero <xliff:g id="days_of_week">%2$s</xliff:g>(e)tan</item>
     </plurals>
     <string name="custom" product="default">Pertsonalizatua (ezin da pertsonalizatu telefonoan)</string>
-    <string name="preferences_use_home_tz_descrip">Bidaiatzen zaudela zure etxeko ordu-zonan egutegiak eta gertaerak erakusten ditu.</string>
+    <string name="preferences_use_home_tz_descrip">Bidaiatzen zaudela zure etxeko ordu-zonan egutegiak eta gertaerak erakusten ditu</string>
     <string name="preferences_alerts_custom_snooze_delay_summary_on">Galdetu utzi gerokorako atzerapen oroitzapena, jakinarazpenentan</string>
     <string name="preferences_alerts_custom_snooze_delay_summary_off">Erabili beti errepikapen atzerapen lehenetsia</string>
     <string name="snooze_delay_dialog_title">Ezarri errepikapen atzerapena</string>
@@ -300,7 +268,6 @@
         </item>
     </plurals>
     <string name="gadget_no_events">Ez dago hurrengo egutegiko gertaerarik</string>
-    <string name="preferences_reminders_quiet_hours_description">Isildu gertaera gogorarazlea zehaztutako denbora bitartean.</string>
     <string name="template_announce_item_index">Gertaera <xliff:g id="item_index">%1$s</xliff:g>
         <xliff:g id="item_count">%2$s</xliff:g>(e)tik.</string>
     <plurals name="Nevents">
@@ -309,29 +276,33 @@
             <xliff:g id="count">%d</xliff:g> gertaerak</item>
     </plurals>
     <plurals name="N_remaining_events">
-        <item quantity="one">+1 gertaera</item>
-        <item quantity="other">+<xliff:g id="count">%d</xliff:g> gertaerak</item>
+        <item quantity="one">+ gertaera 1</item>
+        <item quantity="other">+<xliff:g id="count">%d</xliff:g> gertaera</item>
     </plurals>
     <plurals name="recurrence_interval_daily">
         <item quantity="one">Egunero</item>
         <item quantity="other">
-            <xliff:g id="count">%d</xliff:g> egunero</item>
+            <xliff:g id="count">%d</xliff:g> egunetik behin</item>
     </plurals>
     <plurals name="recurrence_interval_weekly">
         <item quantity="one">Astero</item>
         <item quantity="other">
-            <xliff:g id="count">%d</xliff:g> astero</item>
+            <xliff:g id="count">%d</xliff:g> asterik behik</item>
     </plurals>
     <plurals name="recurrence_interval_monthly">
         <item quantity="one">Hilabetero</item>
         <item quantity="other">
-            <xliff:g id="count">%d</xliff:g> hilabetero</item>
+            <xliff:g id="count">%d</xliff:g> hilabeterik behin</item>
     </plurals>
     <plurals name="recurrence_interval_yearly">
         <item quantity="one">Urtero</item>
         <item quantity="other">
-            <xliff:g id="count">%d</xliff:g> urtero</item>
+            <xliff:g id="count">%d</xliff:g> urterik behin</item>
     </plurals>
     <string name="recurrence_end_count_label">Zenbait gertaerentzako</string>
     <string name="show_time_start_end_below">Hasiera eta bukaera denbora gertaera azpian</string>
+    <string name="maximum_number_of_lines">Gertaeraren gehieneko lerro kopurua</string>
+    <string name="foreground_notification_channel_name">Alerta-sinkronizazioa</string>
+    <string name="foreground_notification_channel_description">Lehen planoko jakinarazpena beharrezkoa da barne alertak sinkronizatzeko. Mesedez, isildu</string>
+    <string name="cal_import_error_time_zone_msg">Ezin da emandako denbora-zona ulertu: %s</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 22575fa3be86f1465758244940470796d1017220..0b45c15a65b2ee7fdf72d61e20f93f904a8a0bd0 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"موجود"</item>
     <item msgid="2064426942462573474">"احتمالی"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"ابتدا"</item>
-    <item msgid="5631923029483854900">"ثانیه"</item>
-    <item msgid="148935502975250973">"سومین"</item>
-    <item msgid="5124200797326669172">"چهارمین"</item>
-    <item msgid="7564374178324652137">"آخرین"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"بدون پاسخ"</item>
     <item msgid="3724434080904437698">"بله"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"این رویداد و رویدادهای آینده"</item>
     <item msgid="7833229563617435430">"همه رویدادها"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"این و رویدادهای آینده"</item>
-    <item msgid="6315440193748139854">"همه رویدادها"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"فقط این رویداد"</item>
     <item msgid="140670561403965380">"همه رویدادهای موجود در این مجموعه"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0b60cfbe25841d844d2bfbded538694ea077defe..25c7ef1d008de8c51e8e0a072358b00cee4ca664 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"تقویم"</string>
     <string name="what_label" msgid="1933578391985810049">"چه چیزی"</string>
     <string name="where_label" msgid="3472482206065595118">"کجا"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"فردا"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"امروز در <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"فردا در <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>، <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"تکرار"</string>
     <string name="no_title_label" msgid="302177118061368042">"(بدون عنوان)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"۱ دقیقه"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> دقیقه"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"۱ دقیقه"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> دقیقه"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"۱ ساعت"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> ساعت"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"۱ روز"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> روز"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"هفته <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"۱ دقیقه"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> دقیقه"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"۱ دقیقه"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> دقیقه"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"۱ ساعت"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> ساعت"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"۱ روز"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> روز"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"هفته <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"تازه کردن"</string>
     <string name="show_day_view" msgid="5782512782605466016">"نمایش روز"</string>
     <string name="agenda_view" msgid="5566084759423843245">"دستور جلسه"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"حذف رویداد"</string>
     <string name="goto_today" msgid="9162136434410891230">"امروز"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"تنظیمات"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"تقویم‌ها برای نمایش"</string>
     <string name="search" msgid="550656004486017426">"جستجو"</string>
     <string name="hide_controls" msgid="830320505938520882">"مخفی کردن کنترل ها"</string>
     <string name="show_controls" msgid="715520586028062621">"نمایش کنترل ها"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"تقویم‌های موردنظر برای نمایش"</string>
-    <string name="synced" msgid="7913940305983383493">"همگام‌سازی شده"</string>
-    <string name="not_synced" msgid="4275114941801829419">"همگام‌سازی نشده"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"این حساب همگام نمی‌شود، بنابراین تقویم‌های شما ممکن است به روز نباشند."</string>
-    <string name="accounts" msgid="849401841083180306">"حساب‌ها و همگام‌سازی"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"تقویم‌های موردنظر برای همگام‌سازی"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"تقویم‌ها برای همگام‌سازی"</string>
     <string name="hint_what" msgid="709155115005044531">"نام رویداد"</string>
     <string name="hint_where" msgid="4972598001033801974">"مکان"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"از"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"همه روز"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"تقویم"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"نمایش همه"</string>
     <string name="description_label" msgid="7193475046717505855">"توضیح"</string>
     <string name="presence_label" msgid="6169724148441175862">"نمایش من به‌عنوان"</string>
     <string name="privacy_label" msgid="9215031965259597335">"رازداری"</string>
     <string name="reminders_label" msgid="7292389181815525676">"افزودن یادآور"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"تقویمی موجود نیست"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"قبل از اینکه بتوانید یک رویداد اضافه کنید، باید حداقل یک حساب تقویم به دستگاه خود اضافه کرده و تقویمی را قابل مشاهده کنید. برای افزودن یک حساب، \"افزودن حساب\" را لمس کنید (اگر بتازگی حسابی اضافه کرده‌اید، منتظر بمانید تا همگامسازی آن تمام شود و سپس دوباره امتحان کنید). همچنین می‌توانید \"لغو\" را لمس کرده و اطمینان حاصل کنید که حداقل یک تقویم قابل مشاهده است."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Calendar با یک حساب Google بهتر کار می‌کند."\n\n"• از هر مرورگر وب به آن دسترسی دارید"\n"• از رویدادهای خود به طور امن پشتیبان تهیه کنید"</string>
     <string name="add_account" msgid="1669072099756774952">"افزودن حساب"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"تقویم:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"سازمان دهنده:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"تماس"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"پاسخ‌های سریع"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"ویرایش پاسخ‌های پیش‌فرض هنگام ارسال ایمیل به مهمان‌ها"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"ویرایش پاسخ‌های سریع"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"پاسخ سریع"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"انتخاب پاسخ سریع"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"برنامه ایمیل یافت نشد"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"با تأخیر چند دقیقه‌ای اجرا می‌شود."</item>
-    <item msgid="6215158751728689832">"۱۰ دقیقه دیگر آنجا خواهم بود."</item>
-    <item msgid="4485794001743679338">"دست به کار شوید و بدون من شروع کنید."</item>
-    <item msgid="8036557974294987511">"با عرض پوزش، نمی‌توانم این را ایجاد کنم. باید دوباره برنامه‌ریزی کنیم."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"با تأخیر چند دقیقه‌ای اجرا می‌شود."</item>
+        <item msgid="6215158751728689832">"۱۰ دقیقه دیگر آنجا خواهم بود."</item>
+        <item msgid="4485794001743679338">"دست به کار شوید و بدون من شروع کنید."</item>
+        <item msgid="8036557974294987511">"با عرض پوزش، نمی‌توانم این را ایجاد کنم. باید دوباره برنامه‌ریزی کنیم."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"نوشتن ..."</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"سازمان دهنده:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"یادآورها"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"حذف"</string>
     <string name="save_label" msgid="2133599104834432589">"انجام شد"</string>
     <string name="discard_label" msgid="2394623883289782541">"لغو"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"تعویق همه"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"رد کردن همه"</string>
     <string name="snooze_label" msgid="1515893621063224666">"تعویق"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"رویداد یک بار"</string>
     <string name="endByDate" msgid="7654221304929538201">"؛ تا <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"؛ برای یکبار"</item>
-    <item quantity="other" msgid="4855496837834652446">"؛ برای <xliff:g id="NUMBER">%d</xliff:g> بار"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"روزانه"</item>
-    <item quantity="other" msgid="5455230727715859264">"هر <xliff:g id="NUMBER">%d</xliff:g> روز"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"؛ برای یکبار"</item>
+        <item quantity="other" msgid="4855496837834652446">"؛ برای <xliff:g id="NUMBER">%d</xliff:g> بار"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"روزانه"</item>
+        <item quantity="other" msgid="5455230727715859264">"هر <xliff:g id="NUMBER">%d</xliff:g> روز"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"هر روز هفته (دوشنبه-جمعه)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"هفتگی در روزهای <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"هر <xliff:g id="NUMBER">%1$d</xliff:g> در روزهای <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"هفتگی در روزهای <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"هر <xliff:g id="NUMBER">%1$d</xliff:g> در روزهای <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"ماهانه"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"سالانه"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"ماهانه (در روز <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"سالانه (در <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"سفارشی (سفارشی کردن در تلفن امکان‌پذیر نیست)"</string>
     <string name="modify_event" msgid="5982876409997142690">"فقط این رویداد تغییر داده شود"</string>
     <string name="modify_all" msgid="4421657265864209041">"همه رویدادهای موجود در مجموعه‌ها تغییر داده شود"</string>
@@ -173,8 +158,6 @@
     <string name="delete_this_event_title" msgid="518402946676919384">"این رویداد حذف شود؟"</string>
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"<xliff:g id="EVENTTITLE">%s</xliff:g> حذف شود؟"</string>
     <string name="change_response_title" msgid="7704714776070974984">"تغییر پاسخ"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"تنظیمات عمومی"</string>
-    <string name="menu_about_preferences" msgid="6124375438237674973">تقویم درباره</string>
     <string name="preferences_title" msgid="8045855493262131773">"تنظیمات"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"تنظیم نمای تقویم"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"اعلان‌ها و یادآورها"</string>
@@ -195,23 +178,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"تقویم‌ها و زمان رویداد را حتی هنگام مسافرت به منطقهٔ زمانی مبدأ شما نمایش می‌دهد"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"منطقهٔ زمانی مبدأ"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"شماره هفته نمایش"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"درباره"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"نسخه ساخت"</string>
-    <string name="gadget_title" msgid="939918875331310945">"تقویم"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"رویداد تقویمی برای روزهای آینده وجود ندارد"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"آزمایشی"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"یادآورها"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"ردکردن یادآورها"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"ردکردن یادآورها"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"ساعات سکوت"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"یادآورهای رویداد در طول زمان خاصی بیصدا شوند."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"زمان شروع ساعات سکوت"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"زمان پایان ساعات سکوت"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"اشکال‌زدایی"</string>
     <string name="copy_db" msgid="437691290566699292">"ارسال پایگاه داده"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"در حال جستجو <xliff:g id="DOMAIN">%s</xliff:g>..."</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"حذف شرکت کنندگان"</string>
@@ -224,55 +199,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"افزودن یادآور"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"حذف یادآور"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"اضافه کردن شرکت کنندگان"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"همگام‌سازی تقویم"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"رویداد کل روز"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"تکرار"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"زمان یادآور"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"نوع یادآور"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"نمایش من به صورت"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"حریم خصوصی"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"اعلان‌های تقویم"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"اعلان تعویق"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"ارسال ایمیل به مهمانان"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ رویداد جدید"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"رویداد <xliff:g id="ITEM_INDEX">%1$s</xliff:g> از <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 رویداد"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> رویداد"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"1+ کردن رویداد"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> رویداد"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 رویداد"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> رویداد"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"1+ کردن رویداد"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> رویداد"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"رویداد انتخاب شده"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"علامت نزنید -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"تکرار"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"هرگز تکرار نمی‌شود"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"هر <xliff:g id="COUNT">%d</xliff:g> روز"</item>
-    <item quantity="other" msgid="707566499994398250">"هر <xliff:g id="COUNT">%d</xliff:g> روز"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"هر <xliff:g id="COUNT">%d</xliff:g> هفته"</item>
-    <item quantity="other" msgid="7094801039989237061">"هر <xliff:g id="COUNT">%d</xliff:g> هفته"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"هر <xliff:g id="COUNT">%d</xliff:g> ماه"</item>
-    <item quantity="other" msgid="5419723710346646523">"هر <xliff:g id="COUNT">%d</xliff:g> ماه"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"هر <xliff:g id="COUNT">%d</xliff:g> سال"</item>
-    <item quantity="other" msgid="5678653649746562060">"هر <xliff:g id="COUNT">%d</xliff:g> سال"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"هر <xliff:g id="COUNT">%d</xliff:g> روز"</item>
+        <item quantity="other" msgid="707566499994398250">"هر <xliff:g id="COUNT">%d</xliff:g> روز"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"هر <xliff:g id="COUNT">%d</xliff:g> هفته"</item>
+        <item quantity="other" msgid="7094801039989237061">"هر <xliff:g id="COUNT">%d</xliff:g> هفته"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"هر <xliff:g id="COUNT">%d</xliff:g> ماه"</item>
+        <item quantity="other" msgid="5419723710346646523">"هر <xliff:g id="COUNT">%d</xliff:g> ماه"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"هر <xliff:g id="COUNT">%d</xliff:g> سال"</item>
+        <item quantity="other" msgid="5678653649746562060">"هر <xliff:g id="COUNT">%d</xliff:g> سال"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"در یک روز معین از هر ماه"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"همیشه"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"تا یک تاریخ معین"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"تا <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"برای تعدادی از رویدادها"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"برای <xliff:g id="EVENT_COUNT">%d</xliff:g> رویداد"</item>
-    <item quantity="other" msgid="8779598489398048259">"برای <xliff:g id="EVENT_COUNT">%d</xliff:g> رویداد"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"برای <xliff:g id="EVENT_COUNT">%d</xliff:g> رویداد"</item>
+        <item quantity="other" msgid="8779598489398048259">"برای <xliff:g id="EVENT_COUNT">%d</xliff:g> رویداد"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"تغییر تاریخ پایان"</string>
     <string name="visibility_default">پیش‌فرض</string>
   <string name="visibility_private">خصوصی</string>
@@ -283,4 +250,5 @@
   <string name="preferences_licence">مجوز</string>
     <string name="preferences_privacy_policy">خط مشی رازداری</string>
     <string name="preferences_service_terms">شرایط استفاده از خدمات</string>
-</resources>
+    <string name="menu_about_preferences">تقویم درباره</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 0f49074900ce11975354182812d3383358c5ef91..3e46ca7e70817fc1684c8ab726f784c6e3bd5c6d 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Tavoitettavissa"</item>
     <item msgid="2064426942462573474">"Alustava"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"ensimmäinen"</item>
-    <item msgid="5631923029483854900">"sekunti"</item>
-    <item msgid="148935502975250973">"kolmas"</item>
-    <item msgid="5124200797326669172">"neljäs"</item>
-    <item msgid="7564374178324652137">"viimeinen"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Ei vastausta"</item>
     <item msgid="3724434080904437698">"Kyllä"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Tämä ja tulevat tapahtumat"</item>
     <item msgid="7833229563617435430">"Kaikki tapahtumat"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Tämä ja tulevat tapahtumat"</item>
-    <item msgid="6315440193748139854">"Kaikki tapahtumat"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Vain tämä tapahtuma"</item>
     <item msgid="140670561403965380">"Kaikki toistokerrat"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f7067ccfcb221d1b6fdaaba1672bac68baa5b108..4d48b64ac02c4d883634bfa81e1a61192c9c71a0 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalenteri"</string>
     <string name="what_label" msgid="1933578391985810049">"Mitä"</string>
     <string name="where_label" msgid="3472482206065595118">"Missä"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Huomenna"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Tänään klo <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Huomenna klo <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Toisto"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Ei otsikkoa)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minuutti"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minuuttia"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 tunti"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> tuntia"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 päivä"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> päivää"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"viikko <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minuutti"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minuuttia"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 tunti"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> tuntia"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 päivä"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> päivää"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"viikko <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Päivitä"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Näytä päivä"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Tapahtumat"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Poista tapahtuma"</string>
     <string name="goto_today" msgid="9162136434410891230">"Tämä päivä"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Asetukset"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Näytett. kalenterit"</string>
     <string name="search" msgid="550656004486017426">"Haku"</string>
     <string name="hide_controls" msgid="830320505938520882">"Piilota toiminnot"</string>
     <string name="show_controls" msgid="715520586028062621">"Näytä toiminnot"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Näytettävät kalenterit"</string>
-    <string name="synced" msgid="7913940305983383493">"synkronoitu"</string>
-    <string name="not_synced" msgid="4275114941801829419">"ei synkronoitu"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Tätä tiliä ei synkronoida. Kalenterisi eivät välttämättä ole ajan tasalla."</string>
-    <string name="accounts" msgid="849401841083180306">"Tilit ja synkronointi"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Synkronoitavat kalenterit"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Synkronoitavat kalenterit"</string>
     <string name="hint_what" msgid="709155115005044531">"Tapahtuman nimi"</string>
     <string name="hint_where" msgid="4972598001033801974">"Sijainti"</string>
@@ -77,7 +69,7 @@
     <string name="hint_attendees" msgid="1650488163176888480">"Vieraat"</string>
     <string name="creating_event" msgid="7516249252554059980">"Tapahtuma luotu."</string>
     <string name="saving_event" msgid="7694181017411177226">"Tapahtuma tallennettu."</string>
-    <string name="empty_event" msgid="9018699257414338634">"Tyhjää tapahtumaa ei voi luoda"</string>
+    <string name="empty_event" msgid="9018699257414338634">Tyhjää tapahtumaa ei luotu.</string>
     <string name="creating_event_with_guest" msgid="5758688413124191931">"Kutsut lähetetään."</string>
     <string name="saving_event_with_guest" msgid="9184584438475689577">"Päivitykset lähetetään."</string>
     <string name="create_event_dialog_save" msgid="1080859798521717414">"Tallenna"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Alkupvm"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Koko päivä"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalenteri"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Näytä kaikki"</string>
     <string name="description_label" msgid="7193475046717505855">"Kuvaus"</string>
     <string name="presence_label" msgid="6169724148441175862">"Näytä että olen"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Tietosuoja"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Lisää muistutus"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Ei kalentereita"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Ennen kuin voit lisätä tapahtuman, sinun on lisättävä laitteeseen vähintään yksi kalenteritili ja otettava kalenteri näkyviin. Lisää tili koskettamalla Lisää tili (jos olet jo lisännyt tilin, odota synkronoinnin valmistumista ja yritä uudelleen). Tai kosketa Peruuta ja varmista, että vähintään yksi kalenteri on näkyvissä."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalenteri toimii paremmin Google-tilin kanssa."\n\n"• Käytä kalenteriasi millä tahansa selaimella"\n"• Varmuuskopioi tapahtumasi turvallisesti"</string>
     <string name="add_account" msgid="1669072099756774952">"Lisää tili"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalenteri:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Järjestäjä:"</string>
@@ -115,17 +105,16 @@
     <string name="map_label" msgid="8795383535586556038">"Kartta"</string>
     <string name="call_label" msgid="2960328220008869083">"Soita"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Pikavastaukset"</string>
-    <string name="quick_response_settings_summary" msgid="7878304729027355604">"Muokkaa pikavast."</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Muokkaa pikavast."</string>
+    <string name="quick_response_settings_summary" msgid="7878304729027355604">Muokkaa vakiovastauksia vieraille</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Pikavastaus"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Valitse pikavastaus"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Sähköpostiohjelmia ei löytynyt"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Myöhästyn muutaman minuutin."</item>
-    <item msgid="6215158751728689832">"Olen paikalla noin 10 minuutin kuluttua."</item>
-    <item msgid="4485794001743679338">"Voitte aloittaa ilman minua."</item>
-    <item msgid="8036557974294987511">"En pääse paikalle. Sovitaanko uusi aika?"</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Myöhästyn muutaman minuutin."</item>
+        <item msgid="6215158751728689832">"Olen paikalla noin 10 minuutin kuluttua."</item>
+        <item msgid="4485794001743679338">"Voitte aloittaa ilman minua."</item>
+        <item msgid="8036557974294987511">"En pääse paikalle. Sovitaanko uusi aika?"</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Kirjoita oma…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Järjestäjä:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Muistutukset"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Poista"</string>
     <string name="save_label" msgid="2133599104834432589">"Valmis"</string>
     <string name="discard_label" msgid="2394623883289782541">"Peruuta"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Kaikki torkkutilaan"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Ohita kaikki"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Torkku"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Yksittäinen tapahtuma"</string>
     <string name="endByDate" msgid="7654221304929538201">"<xliff:g id="DATE">%s</xliff:g> saakka"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"yhden kerran"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> kertaa"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Päivittäin"</item>
-    <item quantity="other" msgid="5455230727715859264">"Joka <xliff:g id="NUMBER">%d</xliff:g>. päivä"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"yhden kerran"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> kertaa"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Päivittäin"</item>
+        <item quantity="other" msgid="5455230727715859264">"Joka <xliff:g id="NUMBER">%d</xliff:g>. päivä"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Joka arkipäivä (ma–pe)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Viikoittain joka <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g> viikon välein joka <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Viikoittain joka <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g> viikon välein joka <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Kuukausittain"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Vuosittain"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Kuukausittain (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. päivänä)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Vuosittain (<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Muokattu (ei voi muokata puhelimessa)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Muuta vain tämä tapahtuma"</string>
     <string name="modify_all" msgid="4421657265864209041">"Muuta tapahtuman kaikki toistokerrat"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Näyttää kalenterit ja tapahtumien ajat oman aikavyöhykkeesi ajassa matkustaessasi"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Kotiaikavyöhyke"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Näytä viikon numero"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Tietoja"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Ohjelmistoversio"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalenteri"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Ei tulevia kalenteritapahtumia"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Kokeellinen"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Muistutukset"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Ohita muistutukset"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Ohita muistutukset"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Hiljainen aika"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Hiljentää tapahtumamuistutukset määritettynä aikana."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Hiljaisen ajan alkaminen"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Hiljaisen ajan loppuminen"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Vianetsintä"</string>
     <string name="copy_db" msgid="437691290566699292">"Lähetä tietokanta"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Haetaan <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Poista osallistuja"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Lisää muistutus"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Poista muistutus"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Lisää osallistuja"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Synkronoi Kalenteri"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Koko päivän tapahtuma"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Toisto"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Muistutuksen aika"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Muistutuksen tyyppi"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Näytä että olen"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Yksityisyys"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Kalenteri-ilmoitus"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Torkuta ilmoitus"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Lähetä sähköposti osallistujille"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Uusi tapahtuma"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Tapahtuma <xliff:g id="ITEM_INDEX">%1$s</xliff:g> / <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 tapahtuma"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> tapahtumaa"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+ 1 tapahtuma"</item>
-    <item quantity="other" msgid="3609243840882275136">"+ <xliff:g id="COUNT">%d</xliff:g> tapahtumaa"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 tapahtuma"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> tapahtumaa"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+ 1 tapahtuma"</item>
+        <item quantity="other" msgid="3609243840882275136">"+ <xliff:g id="COUNT">%d</xliff:g> tapahtumaa"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Valittu tapahtuma"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"ÄLÄ valitse -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Toisto"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Ei toistu"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"<xliff:g id="COUNT">%d</xliff:g> päivän välein"</item>
-    <item quantity="other" msgid="707566499994398250">"<xliff:g id="COUNT">%d</xliff:g> päivän välein"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"<xliff:g id="COUNT">%d</xliff:g> viikon välein"</item>
-    <item quantity="other" msgid="7094801039989237061">"<xliff:g id="COUNT">%d</xliff:g> viikon välein"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"<xliff:g id="COUNT">%d</xliff:g> kuukauden välein"</item>
-    <item quantity="other" msgid="5419723710346646523">"<xliff:g id="COUNT">%d</xliff:g> kuukauden välein"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"<xliff:g id="COUNT">%d</xliff:g> vuoden välein"</item>
-    <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g> vuoden välein"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"<xliff:g id="COUNT">%d</xliff:g> päivän välein"</item>
+        <item quantity="other" msgid="707566499994398250">"<xliff:g id="COUNT">%d</xliff:g> päivän välein"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"<xliff:g id="COUNT">%d</xliff:g> viikon välein"</item>
+        <item quantity="other" msgid="7094801039989237061">"<xliff:g id="COUNT">%d</xliff:g> viikon välein"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"<xliff:g id="COUNT">%d</xliff:g> kuukauden välein"</item>
+        <item quantity="other" msgid="5419723710346646523">"<xliff:g id="COUNT">%d</xliff:g> kuukauden välein"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"<xliff:g id="COUNT">%d</xliff:g> vuoden välein"</item>
+        <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g> vuoden välein"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"samana päiv. joka kk"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Ikuisesti"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Tiettyyn päivään saakka"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"<xliff:g id="DATE">%s</xliff:g> saakka"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Useita kertoja"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> tapahtuman ajan"</item>
-    <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> tapahtuman ajan"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> tapahtuman ajan"</item>
+        <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> tapahtuman ajan"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"muuta lopetuspäivää"</string>
     <string name="visibility_default">Oletus</string>
 
@@ -335,7 +304,7 @@
     <string name="view_settings">Näytä asetukset</string>
     <string name="preferences_month_view_portrait">Kuukausinäkymän asettelu (pysty)</string>
     <string name="preferences_month_view_landscape">Kuukausinäkymän asettelu (vaaka)</string>
-    <string name="view_details">Näkymän yksityiskohdat</string>
+    <string name="display_options">Näkymän yksityiskohdat</string>
     <string name="display_time">Näytä aika</string>
     <string name="display_location">Näytä sijainti</string>
     <string name="show_time_no">Älä näytä aikaa</string>
@@ -343,4 +312,4 @@
     <string name="show_time_start_end">Aloitus- ja päättymisaika</string>
     <string name="show_time_start_end_below">Aloitus- ja päättymisaika tapahtuman alapuolella</string>
     <string name="maximum_number_of_lines">Suurin sallittu rivimäärä tapahtumalle</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 392de2893fa9eaf62cb963d1333c294c3da6f928..6e94b9178e26b84e80222f4b86e7bc30b3d1e7c2 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Disponible"</item>
     <item msgid="2064426942462573474">"À confirmer"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"1er"</item>
-    <item msgid="5631923029483854900">"2e"</item>
-    <item msgid="148935502975250973">"3e"</item>
-    <item msgid="5124200797326669172">"4e"</item>
-    <item msgid="7564374178324652137">"dernier"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Aucune réponse"</item>
     <item msgid="3724434080904437698">"Oui"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Cet événement et les suivants"</item>
     <item msgid="7833229563617435430">"Tous les événements"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Cet événement et les suivants"</item>
-    <item msgid="6315440193748139854">"Tous les événements"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Uniquement cet événement"</item>
     <item msgid="140670561403965380">"Tous les événements de la série"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 182e345eb249537168fbeed908b605174091400a..9227eca7ed2a5058b24f8f6276302ed8a6819c24 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,299 +12,293 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Agenda"</string>
     <string name="what_label" msgid="1933578391985810049">"Objet"</string>
     <string name="where_label" msgid="3472482206065595118">"Lieu"</string>
     <string name="when_label" msgid="894636567327261599">"Date"</string>
     <string name="timezone_label" msgid="3988530993300431650">"Fuseau horaire"</string>
     <string name="attendees_label" msgid="2971281641565729725">"Invités"</string>
-    <string name="today" msgid="8577375020252453006">"Aujourd\'hui"</string>
+    <string name="today" msgid="8577375020252453006">Aujourd’hui</string>
     <string name="tomorrow" msgid="614434811813859237">"Demain"</string>
-    <string name="today_at_time_fmt" msgid="1981279213130049736">"Aujourd\'hui, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="today_at_time_fmt" msgid="1981279213130049736">Aujourd’hui, <xliff:g id="TIME_INTERVAL">%s</xliff:g></string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Demain, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>,
+\n<xliff:g id="time_interval">%2$s</xliff:g></string>
     <string name="repeats_label" msgid="7414023871434593196">"Fréquence"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Sans titre)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minute"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minutes"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 heure"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> heures"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 jour"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> jours"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"semaine <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one">1 minute</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> minutes</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one">1 min</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> min</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one">1 h</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> h</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one">1 jour</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> jours</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="one">semaine <xliff:g id="count">%d</xliff:g></item>
+        <item quantity="other">semaine <xliff:g id="count">%d</xliff:g></item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Actualiser"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Afficher le jour"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
     <string name="day_view" msgid="4467754504843584437">"Jour"</string>
     <string name="week_view" msgid="6775043022159508060">"Semaine"</string>
     <string name="month_view" msgid="7287101431749285412">"Mois"</string>
-    <string name="event_view" msgid="7621353079385122317">"Afficher l\'événement"</string>
-    <string name="event_create" msgid="6941040556709110617">"Nouvel événement"</string>
-    <string name="event_edit" msgid="4006961928830064662">"Modifier l\'événement"</string>
-    <string name="event_delete" msgid="2386667193277770442">"Supprimer l\'événement"</string>
-    <string name="goto_today" msgid="9162136434410891230">"Aujourd\'hui"</string>
-    <string name="goto_date">"Aller au…"</string>    
+    <string name="event_view" msgid="7621353079385122317">Afficher l’évènement</string>
+    <string name="event_create" msgid="6941040556709110617">Nouvel évènement</string>
+    <string name="event_edit" msgid="4006961928830064662">Modifier l’évènement</string>
+    <string name="event_delete" msgid="2386667193277770442">Supprimer l’événement</string>
+    <string name="goto_today" msgid="9162136434410891230">Aujourd’hui</string>
+    <string name="goto_date">"Aller au…"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Paramètres"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Agendas à afficher"</string>
     <string name="search" msgid="550656004486017426">"Rechercher"</string>
-    <string name="hide_controls" msgid="830320505938520882">"Masquer commandes"</string>
-    <string name="show_controls" msgid="715520586028062621">"Afficher commandes"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Agendas à afficher"</string>
-    <string name="synced" msgid="7913940305983383493">"synchronisé"</string>
-    <string name="not_synced" msgid="4275114941801829419">"non synchronisé"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Ce compte n\'est pas synchronisé. Il est possible que vos agendas ne soient pas à jour."</string>
-    <string name="accounts" msgid="849401841083180306">"Comptes et synchro"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Agendas à synchroniser"</string>
+    <string name="hide_controls" msgid="830320505938520882">Masquer les commandes</string>
+    <string name="show_controls" msgid="715520586028062621">Afficher les commandes</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Agendas à synchroniser"</string>
-    <string name="hint_what" msgid="709155115005044531">"Nom de l\'événement"</string>
+    <string name="hint_what" msgid="709155115005044531">Nom de l’évènement</string>
     <string name="hint_where" msgid="4972598001033801974">"Lieu"</string>
     <string name="hint_description" msgid="1910143586169033232">"Description"</string>
     <string name="hint_attendees" msgid="1650488163176888480">"Invités"</string>
-    <string name="creating_event" msgid="7516249252554059980">"Événement créé."</string>
-    <string name="saving_event" msgid="7694181017411177226">"Événement enregistré."</string>
-    <string name="empty_event" msgid="9018699257414338634">"Événement vide non créé."</string>
+    <string name="creating_event" msgid="7516249252554059980">Évènement créé.</string>
+    <string name="saving_event" msgid="7694181017411177226">Évènement enregistré.</string>
+    <string name="empty_event" msgid="9018699257414338634">Évènement vide non créé.</string>
     <string name="creating_event_with_guest" msgid="5758688413124191931">"Les invitations vont être envoyées."</string>
     <string name="saving_event_with_guest" msgid="9184584438475689577">"Les mises à jour vont être envoyées."</string>
     <string name="create_event_dialog_save" msgid="1080859798521717414">"Enregistrer"</string>
-    <string name="alert_title" msgid="7869592820853066853">"Notifications de l\'agenda"</string>
-    <string name="event_info_title" msgid="56024222340421620">"Afficher l\'événement"</string>
+    <string name="alert_title" msgid="7869592820853066853">Notifications de l’agenda</string>
+    <string name="event_info_title" msgid="56024222340421620">Afficher l’évènement</string>
     <string name="event_info_title_invite" msgid="9160326363769403865">"Invitation à une réunion"</string>
     <string name="edit_event_to_label" msgid="795012981218062421">"Au"</string>
     <string name="edit_event_from_label" msgid="174999102612666115">"Du"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Journée entière"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Agenda"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Tout afficher"</string>
     <string name="description_label" msgid="7193475046717505855">"Description"</string>
     <string name="presence_label" msgid="6169724148441175862">"Ma disponibilité"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Confidentialité"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Ajouter un rappel"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Aucun agenda"</string>
-    <string name="no_calendars_found" msgid="8968682716053492187">"Avant d\'ajouter un événement, vous devez ajouter au moins un compte Google Agenda à votre appareil et activer la visibilité de cet agenda. Pour cela, appuyez sur \"Ajouter un compte\", ou sur \"Annuler\" si vous pensez qu\'au moins un agenda est activé (vérifiez que c\'est bien le cas). Si vous venez d\'ajouter un compte, patientez jusqu\'à la fin de la synchronisation, puis réessayez."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Tirez le meilleur parti de Google Agenda en utilisant un compte Google."\n\n"• Accédez-y depuis n\'importe quel navigateur Web. "\n"• Sauvegardez vos événements en toute sécurité."</string>
+    <string name="no_calendars_found" msgid="8968682716053492187">Avant d’ajouter un évènement, vous devez ajouter au moins un agenda à votre appareil et activer sa visibilité. Pour cela, appuyez sur « Ajouter un compte », ou sur « Annuler » si vous pensez qu’au moins un agenda est visible (vérifiez que c’est bien le cas). Si vous venez d’ajouter un compte, patientez jusqu’à la fin de la synchronisation, puis réessayez.</string>
     <string name="add_account" msgid="1669072099756774952">"Ajouter un compte"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Agenda :"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organisateur :"</string>
-    <string name="choose_event_color_label" msgid="2192923501857428854">"Sélectionnez la couleur de l\'événement"</string>
-    <string name="event_color_picker_dialog_title" msgid="4631938661655159511">"Couleur de l\'événement"</string>
-    <string name="event_color_set_to_default" msgid="3447218820785647967">"Choisir la couleur de l\'agenda par défaut"</string>
-    <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">"Couleur de l\'agenda"</string>
+    <string name="choose_event_color_label" msgid="2192923501857428854">Sélectionner la couleur de l’évènement</string>
+    <string name="event_color_picker_dialog_title" msgid="4631938661655159511">Couleur de l’évènement</string>
+    <string name="event_color_set_to_default" msgid="3447218820785647967">Choisir la couleur de l’agenda par défaut</string>
+    <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">Couleur de l’agenda</string>
     <string name="calendar_square_color_picker_description" msgid="7430468363525563483">"Sélecteur de couleur"</string>
-    <string name="view_event_response_label" msgid="8382281658458798329">"Participer ?"</string>
+    <string name="view_event_response_label" msgid="8382281658458798329">Participer \?</string>
     <string name="response_yes" msgid="2027484304899988350">"Oui"</string>
     <string name="response_maybe" msgid="7791500973627841695">"Peut-être"</string>
     <string name="response_no" msgid="561911691884148136">"Non"</string>
-    <string name="email_guests_label" msgid="8772030932155305903">"Envoyer un e-mail aux invités"</string>
-    <string name="email_organizer_label" msgid="7178059542798074813">"Envoyer un e-mail à l\'organisateur"</string>
-    <string name="email_picker_label" msgid="4808253965057791781">"Envoyer un e-mail via"</string>
-    <string name="event_not_found" msgid="8356864185947582727">"Événement introuvable."</string>
+    <string name="email_guests_label" msgid="8772030932155305903">Envoyer un courriel aux invités</string>
+    <string name="email_organizer_label" msgid="7178059542798074813">Envoyer un courriel à l’organisateur</string>
+    <string name="email_picker_label" msgid="4808253965057791781">Envoyer un courriel via</string>
+    <string name="event_not_found" msgid="8356864185947582727">Évènement non trouvé.</string>
     <string name="map_label" msgid="8795383535586556038">"Plan"</string>
     <string name="call_label" msgid="2960328220008869083">"Appeler"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Réponses rapides"</string>
-    <string name="quick_response_settings_summary" msgid="7878304729027355604">"Modifier réponses par défaut lors d\'envoi d\'e-mails aux invités"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Modif. rép. rapides"</string>
+    <string name="quick_response_settings_summary" msgid="7878304729027355604">Modifier les réponses par défaut lors d’envoi de courriels aux invités</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Réponse rapide"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Sélectionner une réponse rapide"</string>
-    <string name="quick_response_email_failed" msgid="5544066405231853245">"Impossible de trouver un programme de messagerie électronique."</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Désolé, j\'aurai quelques minutes de retard."</item>
-    <item msgid="6215158751728689832">"Désolé, j\'arrive dans 10 minutes environ."</item>
-    <item msgid="4485794001743679338">"Commencez sans moi."</item>
-    <item msgid="8036557974294987511">"Désolé, je ne peux pas venir. Nous allons devoir reporter."</item>
-  </string-array>
-    <string name="quick_response_custom_msg" msgid="8792374208224108798">"Réponse personnalisée"</string>
+    <string name="quick_response_email_failed" msgid="5544066405231853245">Impossible de trouver une application de courrier électronique</string>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Désolé, j\'aurai quelques minutes de retard."</item>
+        <item msgid="6215158751728689832">"Désolé, j\'arrive dans 10 minutes environ."</item>
+        <item msgid="4485794001743679338">"Commencez sans moi."</item>
+        <item msgid="8036557974294987511">"Désolé, je ne peux pas venir. Nous allons devoir reporter."</item>
+    </string-array>
+    <string name="quick_response_custom_msg" msgid="8792374208224108798">Réponse personnalisée…</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organisateur :"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Rappels"</string>
-    <string name="agenda_today" msgid="5965841338467422191">"aujourd\'hui, <xliff:g id="DATE">%1$s</xliff:g>"</string>
+    <string name="agenda_today" msgid="5965841338467422191">aujourd’hui, <xliff:g id="DATE">%1$s</xliff:g></string>
     <string name="agenda_yesterday" msgid="4170964206728599693">"hier, <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="agenda_tomorrow" msgid="3893625470780723605">"demain, <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="loading" msgid="3772533493214331230">"Chargement…"</string>
-    <string name="show_older_events" msgid="5140647493681439926">"Appuyez sur l\'écran pour afficher les événements avant le <xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
-    <string name="show_newer_events" msgid="2604638815440163080">"Appuyez sur l\'écran pour afficher les événements après le <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
+    <string name="show_older_events" msgid="5140647493681439926">Appuyez pour afficher les évènements avant le <xliff:g id="oldest_search_range">%1$s</xliff:g></string>
+    <string name="show_newer_events" msgid="2604638815440163080">Appuyez pour afficher les évènements après le <xliff:g id="newest_search_range">%1$s</xliff:g></string>
     <string name="search_title" msgid="8898015280250716254">"Rechercher dans mes agendas"</string>
-    <string name="edit_event_label" msgid="7413222956349977161">"Infos"</string>
+    <string name="edit_event_label" msgid="7413222956349977161">Détails</string>
     <string name="edit_label" msgid="8934331258435656534">"Modifier"</string>
     <string name="delete_label" msgid="874742811918030739">"Supprimer"</string>
     <string name="save_label" msgid="2133599104834432589">"OK"</string>
     <string name="discard_label" msgid="2394623883289782541">"Annuler"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Tout répéter"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Tout supprimer"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Répéter"</string>
-    <string name="does_not_repeat" msgid="1877681921029738999">"Événement ponctuel"</string>
-    <string name="endByDate" msgid="7654221304929538201">"; jusqu\'au <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; une seule fois"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> fois"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Quotidien"</item>
-    <item quantity="other" msgid="5455230727715859264">"Tous les <xliff:g id="NUMBER">%d</xliff:g> jours"</item>
-  </plurals>
-    <string name="every_weekday" msgid="5896574838353902978">"Jours ouvrés (lun–ven)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Hebdomadaire (le <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
-    <item quantity="other" msgid="2857390143157377867">"Toutes les <xliff:g id="NUMBER">%1$d</xliff:g> semaines le <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
-    <string name="monthly" msgid="4587116285383048586">"Tous les mois"</string>
-    <string name="yearly_plain" msgid="3652692085322162449">"Tous les ans"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Mensuel (le <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Annuel (le <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
+    <string name="does_not_repeat" msgid="1877681921029738999">Évènement ponctuel</string>
+    <string name="endByDate" msgid="7654221304929538201">; jusqu’au <xliff:g id="date">%s</xliff:g></string>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; une seule fois"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> fois"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Quotidien"</item>
+        <item quantity="other" msgid="5455230727715859264">"Tous les <xliff:g id="NUMBER">%d</xliff:g> jours"</item>
+    </plurals>
+    <string name="every_weekday" msgid="5896574838353902978">Jours en semaine (lun–ven)</string>
+    <plurals name="weekly">
+        <item quantity="one">Hebdomadaire, le <xliff:g id="days_of_week">%2$s</xliff:g></item>
+        <item quantity="other">Toutes les <xliff:g id="number">%1$d</xliff:g> semaines le <xliff:g id="days_of_week">%2$s</xliff:g></item>
+    </plurals>
+    <string name="monthly" msgid="4587116285383048586">Mensuellement</string>
+    <string name="yearly_plain" msgid="3652692085322162449">Annuellement</string>
     <string name="custom" product="default" msgid="4137468716966004993">"Personnalisé (non paramétrable depuis le téléphone)"</string>
-    <string name="modify_event" msgid="5982876409997142690">"Modifier uniquement cet événement"</string>
-    <string name="modify_all" msgid="4421657265864209041">"Modifier tous les événements de la série"</string>
-    <string name="modify_all_following" msgid="3017428541066390380">"Modifier cet événement et tous les suivants"</string>
-    <string name="new_event_dialog_label" msgid="7553105224561147916">"Nouvel événement"</string>
-    <string name="new_event_dialog_option" msgid="6154657379574669371">"Nouvel événement"</string>
-    <string name="delete_this_event_title" msgid="518402946676919384">"Supprimer cet événement ?"</string>
-    <string name="delete_recurring_event_title" msgid="5609046778422180206">"Supprimer l\'événement \"<xliff:g id="EVENTTITLE">%s</xliff:g>\" ?"</string>
+    <string name="modify_event" msgid="5982876409997142690">Modifier uniquement cet évènement</string>
+    <string name="modify_all" msgid="4421657265864209041">Modifier tous les évènements de la série</string>
+    <string name="modify_all_following" msgid="3017428541066390380">Modifier cet évènement et tous les suivants</string>
+    <string name="new_event_dialog_label" msgid="7553105224561147916">Nouvel évènement</string>
+    <string name="new_event_dialog_option" msgid="6154657379574669371">Nouvel évènement</string>
+    <string name="delete_this_event_title" msgid="518402946676919384">Supprimer cet évènement \?</string>
+    <string name="delete_recurring_event_title" msgid="5609046778422180206">Supprimer <xliff:g id="eventtitle">%s</xliff:g> \?</string>
     <string name="change_response_title" msgid="7704714776070974984">"Modifier la réponse"</string>
     <string name="menu_general_preferences" msgid="2812705323334260708">"Paramètres généraux"</string>
     <string name="menu_about_preferences" msgid="6124375438237674973">Calendrier à propos</string>
     <string name="preferences_title" msgid="8045855493262131773">"Paramètres"</string>
-    <string name="preferences_general_title" msgid="2069075513760573117">"Paramètres d\'affichage de l\'agenda"</string>
+    <string name="preferences_general_title" msgid="2069075513760573117">Paramètres d’affichage de l’agenda</string>
     <string name="preferences_theme">Thème</string>
     <string name="preferences_light_theme">Clair</string>
     <string name="preferences_dark_theme">Sombre</string>
     <string name="preferences_black_theme">Noir</string>
     <string name="preferences_color">Couleur principale</string>
-    <string name="preferences_color_teal">Turquoise</string>
-    <string name="preferences_color_blue">Bleu</string>
-    <string name="preferences_color_orange">Orange</string>
-    <string name="preferences_color_green">Vert</string>
-    <string name="preferences_color_red">Rouge</string>
-    <string name="preferences_color_purple">Violet</string>
     <string name="preferences_color_pick">Couleur principale</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Notifications et rappels"</string>
-    <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Masquer événements refusés"</string>
-    <string name="preferences_week_start_day_title" msgid="4619489296444901622">"1er jour de la semaine :"</string>
-    <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"1er jour de la semaine :"</string>
+    <string name="preferences_hide_declined_title" msgid="1849295943669890034">Masquer les évènements refusés</string>
+    <string name="preferences_week_start_day_title" msgid="4619489296444901622">La semaine débute le</string>
+    <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">La semaine débute le</string>
     <string name="preferences_days_per_week_title">Jours par semaine</string>
     <string name="preferences_days_per_week_dialog">Jours par semaine</string>
-    <string name="preferences_clear_search_history_title" msgid="6619916370215282982">"Effacer historique des recherches"</string>
+    <string name="preferences_clear_search_history_title" msgid="6619916370215282982">Effacer l’historique de recherche</string>
     <string name="preferences_clear_search_history_summary" msgid="7864674093455778158">"Supprimer toutes les recherches effectuées"</string>
-    <string name="search_history_cleared" msgid="1536707558435227567">"Historique des recherches effacé."</string>
+    <string name="search_history_cleared" msgid="1536707558435227567">Historique de recherche effacé.</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notifications"</string>
-    <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibreur"</string>
+    <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">Vibrer</string>
     <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Sonnerie"</string>
-    <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Notification dans pop-up"</string>
-    <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Rappel par défaut"</string>
-    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Rappel par défaut"</string>
+    <string name="preferences_alerts_popup_title" msgid="6643468203670475296">Bulle de notification</string>
+    <string name="preferences_default_reminder_title" msgid="5188861433342733905">Temps de rappel par défaut</string>
+    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">Temps de rappel par défaut</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
     <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Mon fuseau horaire"</string>
-    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Afficher les agendas et les événements dans votre fuseau horaire habituel, même en  déplacement"</string>
+    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">Afficher les agendas et les évènements dans votre fuseau horaire habituel, même en déplacement</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Mon fuseau horaire"</string>
-    <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Afficher numéro semaine"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"À propos"</string>
+    <string name="preferences_show_week_num_title" msgid="5280734329664503461">Afficher le numéro de semaine</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Version"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Agenda"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+ 1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+ <xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
-    <string name="gadget_no_events" msgid="5209110911088302855">"Aucun événement à venir"</string>
+    <plurals name="month_more_events">
+        <item quantity="one">+1</item>
+        <item quantity="other">+<xliff:g id="NUMBER">%d</xliff:g></item>
+    </plurals>
+    <string name="gadget_no_events" msgid="5209110911088302855">Aucun évènement à venir</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Test"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Rappels"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Ignorer les rappels"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Ignorer les rappels"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Heures coupure du son"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Couper le son des rappels d\'événements pendant certaines heures"</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Heure début coupure son"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Heure fin coupure son"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Débogage"</string>
     <string name="copy_db" msgid="437691290566699292">"Envoyer la base de données"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Recherche en cours dans <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
-    <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Supprimer participant"</string>
+    <string name="accessibility_remove_attendee" msgid="7082751172654698863">Supprimer le participant</string>
     <string name="accessibility_pick_start_date" msgid="3926641487042699037">"Date de début"</string>
     <string name="accessibility_pick_start_time" msgid="4913428100936555149">"Heure de début"</string>
     <string name="accessibility_pick_end_date" msgid="5624250196618643922">"Date de fin"</string>
     <string name="accessibility_pick_end_time" msgid="7120310166355224941">"Heure de fin"</string>
     <string name="accessibility_pick_time_zone" msgid="7155465783500323811">"Fuseau horaire"</string>
-    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">"Répéter l\'événement"</string>
+    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">Répéter l’évènement</string>
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Ajouter un rappel"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Supprimer le rappel"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Ajouter un participant"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Synchroniser l\'agenda"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Toute la journée"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Récurrence"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Heure de rappel"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Type de rappel"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Ma disponibilité"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Confidentialité"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Notification de l\'agenda"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Notification de répétition d\'alarme"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Envoyer un e-mail aux invités"</string>
-    <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Nouvel événement"</string>
-    <string name="template_announce_item_index" msgid="4067877800670753110">"Événement <xliff:g id="ITEM_INDEX">%1$s</xliff:g> sur <xliff:g id="ITEM_COUNT">%2$s</xliff:g>"</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 événement"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> événements"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 événement"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> événements"</item>
-  </plurals>
-    <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Événement sélectionné"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"Ne PAS cocher -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Répéter"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Ne jamais répéter"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Tous les <xliff:g id="COUNT">%d</xliff:g> jour"</item>
-    <item quantity="other" msgid="707566499994398250">"Tous les <xliff:g id="COUNT">%d</xliff:g> jours"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Toutes les <xliff:g id="COUNT">%d</xliff:g> semaine"</item>
-    <item quantity="other" msgid="7094801039989237061">"Toutes les <xliff:g id="COUNT">%d</xliff:g> semaines"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Tous les <xliff:g id="COUNT">%d</xliff:g> mois"</item>
-    <item quantity="other" msgid="5419723710346646523">"Tous les <xliff:g id="COUNT">%d</xliff:g> mois"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Tous les <xliff:g id="COUNT">%d</xliff:g> an"</item>
-    <item quantity="other" msgid="5678653649746562060">"Tous les <xliff:g id="COUNT">%d</xliff:g> ans"</item>
-  </plurals>
+    <string name="day_view_new_event_hint" msgid="2131483437911536229">+ Nouvel évènement</string>
+    <string name="template_announce_item_index" msgid="4067877800670753110">Évènement <xliff:g id="item_index">%1$s</xliff:g> sur <xliff:g id="item_count">%2$s</xliff:g>.</string>
+    <plurals name="Nevents">
+        <item quantity="one">1 évènement</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> évènements</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one">+1 évènement</item>
+        <item quantity="other">+<xliff:g id="count">%d</xliff:g> évènements</item>
+    </plurals>
+    <string name="acessibility_selected_marker_description" msgid="3010149843148810768">Évènement sélectionné</string>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one">Tous les jours</item>
+        <item quantity="other">Tous les <xliff:g id="COUNT">%d</xliff:g> jours</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one">Toutes les semaines</item>
+        <item quantity="other">Toutes les <xliff:g id="COUNT">%d</xliff:g> semaines</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one">Tous les mois</item>
+        <item quantity="other">Tous les <xliff:g id="count">%d</xliff:g> mois</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one">Tous les ans</item>
+        <item quantity="other">Tous les <xliff:g id="COUNT">%d</xliff:g> ans</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"le même jour chaque mois"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Toujours"</string>
-    <string name="recurrence_end_date_label" msgid="4142791438636994952">"Jusqu\'à une certaine date"</string>
-    <string name="recurrence_end_date" msgid="3693751578164711701">"Jusqu\'au <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="recurrence_end_count_label" msgid="1233883668293087977">"Pour une série d\'événements"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Pour <xliff:g id="EVENT_COUNT">%d</xliff:g> événement"</item>
-    <item quantity="other" msgid="8779598489398048259">"Pour <xliff:g id="EVENT_COUNT">%d</xliff:g> événements"</item>
-  </plurals>
+    <string name="recurrence_end_date_label" msgid="4142791438636994952">Jusqu’à une date</string>
+    <string name="recurrence_end_date" msgid="3693751578164711701">Jusqu’au <xliff:g id="DATE">%s</xliff:g></string>
+    <string name="recurrence_end_count_label" msgid="1233883668293087977">Pour une série d’évènements</string>
+    <plurals name="recurrence_end_count">
+        <item quantity="one">Pour <xliff:g id="EVENT_COUNT">%d</xliff:g> évènement</item>
+        <item quantity="other">Pour <xliff:g id="EVENT_COUNT">%d</xliff:g> évènements</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"modifier la date de fin"</string>
     <string name="visibility_default">Par défaut</string>
-  <string name="visibility_private">Privé</string>
-  <string name="visibility_public">Public</string>
+    <string name="visibility_private">Privé</string>
+    <string name="visibility_public">Public</string>
     <string name="visibility_confidential">Confidentiel</string>
-  <string name="preferences_alerts_custom_snooze_delay_title">Demander un délai de répétition</string>
-  <string name="preferences_alerts_custom_snooze_delay_summary_on">Demander le délai de répétition à chaque rappel</string>
-  <string name="preferences_alerts_custom_snooze_delay_summary_off">Toujours utiliser le délai de répétition par défaut</string>
-  <string name="snooze_delay_dialog_title">Définir le délai de répétition</string>
-  <string name="preferences_default_snooze_delay_title">Délai de répétition par défaut</string>
-  <string name="preferences_default_snooze_delay_dialog">Délai par défaut</string>
-  <string name="default_start_title">Vue par défaut</string>
-  <string name="default_start_last">Dernière vue utilisée</string>
-    <string name="preferences_about_app">Le calendrier est issu d\'Etar-Calendar</string>
-    <string name="preferences_authors">Auteurs</string>
-  <string name="preferences_source_code">Code source</string>
-  <string name="preferences_licence">Licence</string>
-    <string name="preferences_privacy_policy">Politique de confidentialité</string>
-    <string name="preferences_service_terms">Conditions d\'utilisation</string>
-</resources>
+    <string name="preferences_alerts_custom_snooze_delay_title">Demander un délai de répétition</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_on">Demander le délai de répétition à chaque rappel</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_off">Toujours utiliser le délai de répétition par défaut</string>
+    <string name="snooze_delay_dialog_title">Définir le délai de répétition</string>
+    <string name="preferences_default_snooze_delay_title">Délai de répétition par défaut</string>
+    <string name="preferences_default_snooze_delay_dialog">Délai par défaut</string>
+    <string name="default_start_title">Vue par défaut</string>
+    <string name="default_start_last">Dernière vue utilisée</string>
+    <string name="share_label">Partager</string>
+    <string name="view_settings">Paramètres d’affichage</string>
+    <string name="no_map">Aucune application de cartographie n’est installée</string>
+    <string name="preferences_month_view_portrait">Disposition de la vue du mois (Portrait)</string>
+    <string name="preferences_month_view_landscape">Disposition de la vue du mois (Paysage)</string>
+    <string name="display_options">Voir les détails</string>
+    <string name="display_time">Affichage de l’heure</string>
+    <string name="display_location">Affichage du lieu</string>
+    <string name="preferences_default_event_duration_title">Durée d’événement par défaut</string>
+    <string name="preferences_issues">Signaler des problèmes</string>
+    <string name="user_rejected_calendar_write_permission">Etar requiert les droits de lecture et d’écriture de l’agenda pour fonctionner correctement. Veuillez réessayer.</string>
+    <string name="calendar_permission_not_granted">Désolé cette fonctionnalité ne peut pas fonctionner. Etar requiert les droits de lecture et d’écriture de l’agenda pour fonctionner correctement</string>
+    <string name="zero_minutes">0 minute</string>
+    <string name="fifteen_minutes">15 minutes</string>
+    <string name="thirty_minutes">30 minutes</string>
+    <string name="one_hour">1 heure</string>
+    <string name="one_and_a_half_hours">1,5 heures</string>
+    <string name="two_hours">2 heures</string>
+    <string name="error_generating_ics">Problèmes rencontrés lors du partage de l’évènement</string>
+    <string name="cal_share_intent_title">Envoyer l’évènement à :</string>
+    <string name="cal_export_event_sdcard_title">Exporter sur la carte SD</string>
+    <string name="cal_export_succ_msg">Évènement exporté avec succès : %1s</string>
+    <string name="cal_import_menu_title">Importer évènement</string>
+    <string name="cal_nothing_to_import">Rien à importer</string>
+    <string name="cal_import_error_msg">L’importation dans l’agenda a échoué</string>
+    <string name="cal_pick_ics">Choisissez le fichier à importer</string>
+    <string name="show_time_no">Ne pas afficher l’heure</string>
+    <string name="show_time_start">Heure de début seulement</string>
+    <string name="show_time_start_end">Heure de début et de fin</string>
+    <string name="rsvp_accepted">A accepté.</string>
+    <string name="rsvp_tentative">Répondu peut-être.</string>
+    <string name="rsvp_declined">A refusé.</string>
+    <string name="cal_import_error_date_msg">Impossible d’interpréter la date donnée : %s</string>
+    <string name="show_time_start_end_below">Heure de début et de fin au-dessous de l’évènement</string>
+    <string name="maximum_number_of_lines">Nombre maximum de lignes par évènement</string>
+    <string name="foreground_notification_channel_name">Alerte de synchronisation</string>
+    <string name="foreground_notification_channel_description">La synchronisation d’alerte interne nécessite les notifications au premier plan. Veuillez mettre en sourdine</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index ff0cacf9dffba5d8945720fae044b941514f9a58..254e4023dbcd12ebd459be446a8716e60c746997 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"उपलब्ध"</item>
     <item msgid="2064426942462573474">"अस्‍थायी"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"पहला"</item>
-    <item msgid="5631923029483854900">"सेकंड"</item>
-    <item msgid="148935502975250973">"तीसरा"</item>
-    <item msgid="5124200797326669172">"चौथा"</item>
-    <item msgid="7564374178324652137">"अंतिम"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"कोई प्रतिसाद नहीं"</item>
     <item msgid="3724434080904437698">"हां"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"यह और आगामी ईवेंट"</item>
     <item msgid="7833229563617435430">"सभी ईवेंट"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"यह और भविष्य के ईवेंट"</item>
-    <item msgid="6315440193748139854">"सभी ईवेंट"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"केवल यह ईवेंट"</item>
     <item msgid="140670561403965380">"श्रृंखला में सभी ईवेंट"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5d6d4e9e8369d8066a8d3e8ff434e590717530ad..1f10b779fd3c3f7e877dd11bf2dbb649275f1128 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"कैलेंडर"</string>
     <string name="what_label" msgid="1933578391985810049">"क्या"</string>
     <string name="where_label" msgid="3472482206065595118">"कहां"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"आने वाला कल"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"आज <xliff:g id="TIME_INTERVAL">%s</xliff:g> पर"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"कल <xliff:g id="TIME_INTERVAL">%s</xliff:g> पर"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"दोहराव"</string>
     <string name="no_title_label" msgid="302177118061368042">"(कोई शीर्षक नहीं)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 मिनट"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> मिनट"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 मिनट"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> मि"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 घंटा"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> घंटे"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 दिन"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> दिन"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g> सप्ताह"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 मिनट"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> मिनट"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 मिनट"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> मि"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 घंटा"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> घंटे"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 दिन"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> दिन"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g> सप्ताह"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"रीफ़्रेश करें"</string>
     <string name="show_day_view" msgid="5782512782605466016">"दिन दिखाएं"</string>
     <string name="agenda_view" msgid="5566084759423843245">"कार्यसूची"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"ईवेंट हटाएं"</string>
     <string name="goto_today" msgid="9162136434410891230">"आज"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"सेटिंग"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"प्रदर्शित करने के लिए कैलेंडर"</string>
     <string name="search" msgid="550656004486017426">"खोज"</string>
     <string name="hide_controls" msgid="830320505938520882">"नियंत्रण छुपाएं"</string>
     <string name="show_controls" msgid="715520586028062621">"नियंत्रण दिखाएं"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"प्रदर्शित करने के लिए कैलेंडर"</string>
-    <string name="synced" msgid="7913940305983383493">"समन्वयन किया गया"</string>
-    <string name="not_synced" msgid="4275114941801829419">"समन्वयन नहीं किया गया"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"यह खाता समन्वयित नहीं किया जा रहा है, इसलिए हो सकता है आपके कैलेंडर अद्यतित न हों."</string>
-    <string name="accounts" msgid="849401841083180306">"खाते और समन्वयन"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"समन्‍वयि‍त करने के लि‍ए कैलेंडर"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"समन्‍वयि‍त करने के लि‍ए कैलेंडर"</string>
     <string name="hint_what" msgid="709155115005044531">"ईवेंट का नाम"</string>
     <string name="hint_where" msgid="4972598001033801974">"स्थान"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"इस दिनांक से"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"सभी दिन"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"कैलेंडर"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"सभी दिखाएं"</string>
     <string name="description_label" msgid="7193475046717505855">"वर्णन"</string>
     <string name="presence_label" msgid="6169724148441175862">"मुझे इस रूप में दिखाएं"</string>
     <string name="privacy_label" msgid="9215031965259597335">"गोपनीयता"</string>
     <string name="reminders_label" msgid="7292389181815525676">"अनुस्मारक जोड़ें"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"कोई कैलेंडर नहीं"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"आप कोई ईवेंट जोड़ें उसके पहले, आपको अपने उपकरण में कम से कम एक कैलेंडर खाता जोड़ना होगा और कैलेंडर को दृश्यमान बनाना होगा. कोई खाता जोड़ने के लिए खाता जोड़ें स्पर्श करें (यदि आपने अभी कोई खाता जोड़ा है, तो इसका समन्वयन पूरा होने की प्रतीक्षा करें और पुन: प्रयास करें). या रद्द करें स्पर्श करें और सुनिश्चित करें कि कम से कम एक कैलेंडर दृश्यमान है."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Google खाते के साथ कैलेंडर बेहतर तरीके से कार्य करता है."\n\n"• किसी भी वेब ब्राउज़र से इस पर पहुंचें"\n"• सुरक्षि‍त रूप से अपने ईवेंट का बैकअप लें"</string>
     <string name="add_account" msgid="1669072099756774952">"खाता जोड़ें"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"कैलेंडर:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"आयोजक:"</string>
@@ -116,23 +106,22 @@
     <string name="call_label" msgid="2960328220008869083">"कॉल करें"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"त्वरित प्रतिसाद"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"जब अतिथि को ईमेल करें तो डिफ़ॉल्‍ट प्रतिसाद संपादित करें"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"त्वरित प्रतिसाद संपादित करें"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"त्वरित प्रतिसाद"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"त्‍वरित प्रतिसाद चुनें"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"ईमेल प्रोग्राम ढूंढने में विफल रहा"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"केवल कुछ मिनटों के विलंब से चल रहा है."</item>
-    <item msgid="6215158751728689832">"लगभग 10 मिनट में वहां पहुंचें."</item>
-    <item msgid="4485794001743679338">"आगे बढ़ें और मेरे बिना प्रारंभ करें."</item>
-    <item msgid="8036557974294987511">"क्षमा करें, मुझसे यह कार्य नहीं हो पा रहा है. हमें पुन: शेड्यूल करना होगा."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"केवल कुछ मिनटों के विलंब से चल रहा है."</item>
+        <item msgid="6215158751728689832">"लगभग 10 मिनट में वहां पहुंचें."</item>
+        <item msgid="4485794001743679338">"आगे बढ़ें और मेरे बिना प्रारंभ करें."</item>
+        <item msgid="8036557974294987511">"क्षमा करें, मुझसे यह कार्य नहीं हो पा रहा है. हमें पुन: शेड्यूल करना होगा."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"अपना स्वयं का लिखें…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"आयोजक:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"अनुस्मारक"</string>
     <string name="agenda_today" msgid="5965841338467422191">"आज, <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="agenda_yesterday" msgid="4170964206728599693">"कल, <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="agenda_tomorrow" msgid="3893625470780723605">"कल, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="loading" msgid="3772533493214331230">"लोड हो रहा है..."</string>
+    <string name="loading" msgid="3772533493214331230">लोड हो रहा है…</string>
     <string name="show_older_events" msgid="5140647493681439926">"<xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g> से पहले के ईवेंट देखने के लिए स्पर्श करें"</string>
     <string name="show_newer_events" msgid="2604638815440163080">"<xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g> के बाद के ईवेंट देखने के लिए स्पर्श करें"</string>
     <string name="search_title" msgid="8898015280250716254">"मेरे कैलेंडर में खोजें"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"हटाएं"</string>
     <string name="save_label" msgid="2133599104834432589">"पूर्ण"</string>
     <string name="discard_label" msgid="2394623883289782541">"रद्द करें"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"सभी स्नूज़ करें"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"सभी खारिज करें"</string>
     <string name="snooze_label" msgid="1515893621063224666">"स्‍नूज़ करें"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"एक-बार का ईवेंट"</string>
     <string name="endByDate" msgid="7654221304929538201">"; <xliff:g id="DATE">%s</xliff:g> तक"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; एक बार के लिए"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> बार के लिए"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"दैनिक"</item>
-    <item quantity="other" msgid="5455230727715859264">"प्रत्‍येक <xliff:g id="NUMBER">%d</xliff:g> दिन"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; एक बार के लिए"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> बार के लिए"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"दैनिक"</item>
+        <item quantity="other" msgid="5455230727715859264">"प्रत्‍येक <xliff:g id="NUMBER">%d</xliff:g> दिन"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"प्रत्‍येक कार्य-दिवस (सोम–शुक्र)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> को साप्ताहिक रूप से"</item>
-    <item quantity="other" msgid="2857390143157377867">"हर <xliff:g id="NUMBER">%1$d</xliff:g> सप्ताह में <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> को"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> को साप्ताहिक रूप से"</item>
+        <item quantity="other" msgid="2857390143157377867">"हर <xliff:g id="NUMBER">%1$d</xliff:g> सप्ताह में <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> को"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"मासिक"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"वार्षिक"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"मासिक (इस दिन <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"वार्षिक (दिनांक <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"कस्टम (फ़ोन पर कस्टमाइज़ नहीं किया जा सकता)"</string>
     <string name="modify_event" msgid="5982876409997142690">"केवल यह ईवेंट बदलें"</string>
     <string name="modify_all" msgid="4421657265864209041">"श्रृंखला के सभी ईवेंट बदलें"</string>
@@ -173,8 +158,6 @@
     <string name="delete_this_event_title" msgid="518402946676919384">"यह ईवेंट हटाएं?"</string>
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"<xliff:g id="EVENTTITLE">%s</xliff:g> हटाएं?"</string>
     <string name="change_response_title" msgid="7704714776070974984">"प्रतिसाद बदलें"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"सामान्य सेटिंग"</string>
-    <string name="menu_about_preferences" msgid="6124375438237674973">"कैलेंडर के बारे में"</string>
     <string name="preferences_title" msgid="8045855493262131773">"सेटिंग"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"कैलेंडर दृश्य सेटिंग"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"सूचनाएं और अनुस्मारक"</string>
@@ -195,25 +178,18 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"यात्रा के समय आपके घरेलू समय क्षेत्र में कैलेंडर और ईवेंट समय प्रदर्शित करता है"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"घरेलू समय क्षेत्र"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"सप्ताह संख्या दिखाएं"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"इसके बारे में"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"बिल्ड संस्करण"</string>
-    <string name="gadget_title" msgid="939918875331310945">"कैलेंडर"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"कोई आगामी कैलेंडर ईवेंट नहीं"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"प्रयोगात्मक"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"अनुस्मारक"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"अनुस्मारक छोड़ें"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"अनुस्मारक छोड़ें"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"मौन घंटे"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"विशिष्ट समय में ईवेंट अनुस्मारकों को मौन करें."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"मौन घंटों का प्रारंभ समय"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"मौन घंटों का समाप्ति समय"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"डीबग करना"</string>
     <string name="copy_db" msgid="437691290566699292">"डेटाबेस भेजें"</string>
-    <string name="directory_searching_fmt" msgid="1232037509095606687">"<xliff:g id="DOMAIN">%s</xliff:g> खोज रहा है..."</string>
+    <string name="directory_searching_fmt" msgid="1232037509095606687">
+        <xliff:g id="DOMAIN">%s</xliff:g> खोज रहा है…</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"अतिथि निकालें"</string>
     <string name="accessibility_pick_start_date" msgid="3926641487042699037">"प्रारंभ दिनांक"</string>
     <string name="accessibility_pick_start_time" msgid="4913428100936555149">"प्रारंभ समय"</string>
@@ -224,55 +200,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"अनुस्मारक जोड़ें"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"अनुस्मारक निकालें"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"अतिथि जोड़ें"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"कैलेंडर समन्वयन करें"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"पूरे दिन का ईवेंट"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"दोहराव"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"अनुस्मारक समय"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"अनुस्मारक का प्रकार"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"मुझे इस रूप में दिखाएं"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"गोपनीयता"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"कैलेंडर सूचना"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"सूचना स्‍नूज़ करें"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"अतिथियों को ईमेल करें"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ नया ईवेंट"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"<xliff:g id="ITEM_COUNT">%2$s</xliff:g> में से <xliff:g id="ITEM_INDEX">%1$s</xliff:g> ईवेंट."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 ईवेंट"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> ईवेंट"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 ईवेंट"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> ईवेंट"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 ईवेंट"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> ईवेंट"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 ईवेंट"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> ईवेंट"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"चयनित ईवेंट"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"चेक न करें -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"दोहराएं"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"कभी न दोहराएं"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> दिन में"</item>
-    <item quantity="other" msgid="707566499994398250">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> दिन में"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> सप्ताह में"</item>
-    <item quantity="other" msgid="7094801039989237061">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> सप्ताह में"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> माह में"</item>
-    <item quantity="other" msgid="5419723710346646523">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> माह में"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> वर्ष में"</item>
-    <item quantity="other" msgid="5678653649746562060">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> वर्ष में"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> दिन में"</item>
+        <item quantity="other" msgid="707566499994398250">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> दिन में"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> सप्ताह में"</item>
+        <item quantity="other" msgid="7094801039989237061">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> सप्ताह में"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> माह में"</item>
+        <item quantity="other" msgid="5419723710346646523">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> माह में"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> वर्ष में"</item>
+        <item quantity="other" msgid="5678653649746562060">"प्रत्येक <xliff:g id="COUNT">%d</xliff:g> वर्ष में"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"प्रत्येक माह उसी दिन"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"हमेशा"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"इस दिनांक तक"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"<xliff:g id="DATE">%s</xliff:g> तक"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"कई ईवेंट के लिए"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> ईवेंट के लिए"</item>
-    <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> ईवेंट के लिए"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> ईवेंट के लिए"</item>
+        <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> ईवेंट के लिए"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"समाप्ति दिनांक बदलें"</string>
     <string name="visibility_default">डिफ़ॉल्ट</string>
   <string name="visibility_private">निजी</string>
@@ -283,4 +251,4 @@
   <string name="preferences_licence">लाइसेंस</string>
     <string name="preferences_privacy_policy">गोपनीयता नीति</string>
     <string name="preferences_service_terms">सेवा की शर्तें</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 1edac148619f2a72cbfe09a98dccc28d1bfb5e5f..5444a8c5892b41bbbacf06f350e90b4d3dfcb1a6 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Dostupan"</item>
     <item msgid="2064426942462573474">"Privremena"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"prvo"</item>
-    <item msgid="5631923029483854900">"drugi"</item>
-    <item msgid="148935502975250973">"treće"</item>
-    <item msgid="5124200797326669172">"četvrto"</item>
-    <item msgid="7564374178324652137">"posljednje"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Nema odgovora"</item>
     <item msgid="3724434080904437698">"Da"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Ovaj i budući događaji"</item>
     <item msgid="7833229563617435430">"Svi događaji"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Ovaj i budući događaji"</item>
-    <item msgid="6315440193748139854">"Svi događaji"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Samo ovaj događaj"</item>
     <item msgid="140670561403965380">"Svi događaji u nizu"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index cf15055320d868b3df79032464f19ece1d2db629..0068c463fc36d763a2a154aee0f60f4b542998fb 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,42 +12,45 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalendar"</string>
     <string name="what_label" msgid="1933578391985810049">"Što"</string>
     <string name="where_label" msgid="3472482206065595118">"Gdje"</string>
-    <string name="when_label" msgid="894636567327261599">"Kad"</string>
+    <string name="when_label" msgid="894636567327261599">Kada</string>
     <string name="timezone_label" msgid="3988530993300431650">"Vremenska zona"</string>
     <string name="attendees_label" msgid="2971281641565729725">"Gosti"</string>
     <string name="today" msgid="8577375020252453006">"Danas"</string>
     <string name="tomorrow" msgid="614434811813859237">"Sutra"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Danas u <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Sutra u <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g></string>
     <string name="repeats_label" msgid="7414023871434593196">"Ponavljanje"</string>
     <string name="no_title_label" msgid="302177118061368042">"(bez naslova)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minuta"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minuta"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 minuta"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> minuta"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 sat"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> sati"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 dan"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dana"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"tjedan <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one">1 minuta</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> minute</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> minuta</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one">1 min</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> min</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> min</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one">1 sat</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> sata</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> sati</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one">1 dan</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> dana</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> dana</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g>. tjedan</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g>. tjedan</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g>. tjedan</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Osvježi"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Prikaži dan"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Raspored"</string>
@@ -60,16 +63,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Izbriši događaj"</string>
     <string name="goto_today" msgid="9162136434410891230">"Danas"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Postavke"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalendari za prikaz"</string>
     <string name="search" msgid="550656004486017426">"Pretraži"</string>
     <string name="hide_controls" msgid="830320505938520882">"Sakrij kontrole"</string>
     <string name="show_controls" msgid="715520586028062621">"Prikaži kontrole"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalendari za prikaz"</string>
-    <string name="synced" msgid="7913940305983383493">"sinkronizirano"</string>
-    <string name="not_synced" msgid="4275114941801829419">"nije sinkronizirano"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Ovaj se račun ne sinkronizira pa vaši kalendari možda nisu ažurni."</string>
-    <string name="accounts" msgid="849401841083180306">"Računi &amp; sinkronizacija"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Kalendari za sinkronizaciju"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Kalendari za sinkronizaciju"</string>
     <string name="hint_what" msgid="709155115005044531">"Naziv događaja"</string>
     <string name="hint_where" msgid="4972598001033801974">"Mjesto"</string>
@@ -79,60 +75,57 @@
     <string name="saving_event" msgid="7694181017411177226">"Događaj je spremljen."</string>
     <string name="empty_event" msgid="9018699257414338634">"Nije stvoren prazan događaj."</string>
     <string name="creating_event_with_guest" msgid="5758688413124191931">"Pozivnice će biti poslane."</string>
-    <string name="saving_event_with_guest" msgid="9184584438475689577">"Ažuriranje će biti poslano."</string>
+    <string name="saving_event_with_guest" msgid="9184584438475689577">Ažuriranja će biti poslana.</string>
     <string name="create_event_dialog_save" msgid="1080859798521717414">"Spremi"</string>
     <string name="alert_title" msgid="7869592820853066853">"Obavijesti kalendara"</string>
     <string name="event_info_title" msgid="56024222340421620">"Prikaži događaj"</string>
     <string name="event_info_title_invite" msgid="9160326363769403865">"Pozivnica za sastanak"</string>
-    <string name="edit_event_to_label" msgid="795012981218062421">"Prima:"</string>
-    <string name="edit_event_from_label" msgid="174999102612666115">"Šalje:"</string>
+    <string name="edit_event_to_label" msgid="795012981218062421">Do</string>
+    <string name="edit_event_from_label" msgid="174999102612666115">Od</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Cijeli dan"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalendar"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Pokaži sve"</string>
     <string name="description_label" msgid="7193475046717505855">"Opis"</string>
-    <string name="presence_label" msgid="6169724148441175862">"Prikaži me kao"</string>
+    <string name="presence_label" msgid="6169724148441175862">Prikaži me kao</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privatnost"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Dodavanje podsjetnika"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Nema kalendara"</string>
-    <string name="no_calendars_found" msgid="8968682716053492187">"Prije nego što ćete moći dodati događaj morate dodati barem jedan račun usluge Kalendar na svoj uređaj i kalendar učiniti vidljivim. Da biste dodali račun, dodirnite Dodaj račun (ako ste upravo dodali račun, pričekajte dovrši sinkronizaciju i pokušajte ponovno) ili dodirnite Odustani i provjerite je li barem jedan kalendar vidljiv."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalendar radi bolje s Google računom."\n\n"• Pristupite mu iz bilo kojeg web-preglednika."\n"• Stvorite sigurnosnu kopiju svojih događaja."</string>
-    <string name="add_account" msgid="1669072099756774952">"Dodavanje računa"</string>
+    <string name="no_calendars_found" msgid="8968682716053492187">Prije nego što ćeš moći dodati događaj moraš dodati barem jedan račun za kalendar na svoj uređaj i kalendar učiniti vidljivim. Za dodavanje računa, dodirni „Dodaj račun” (ako si upravo dodao/la račun, pričekaj dovršavanje sinkronizacije i pokušaj ponovo) ili dodirni „Odustani” i provjeri, je li barem jedan kalendar vidljiv.</string>
+    <string name="add_account" msgid="1669072099756774952">Dodaj račun</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalendar:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organizator:"</string>
-    <string name="choose_event_color_label" msgid="2192923501857428854">"Odabir boje za događaj"</string>
+    <string name="choose_event_color_label" msgid="2192923501857428854">Odaberi boju za događaj</string>
     <string name="event_color_picker_dialog_title" msgid="4631938661655159511">"Boja za događaj"</string>
     <string name="event_color_set_to_default" msgid="3447218820785647967">"Postavi na zadanu boju kalendara"</string>
     <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">"Boja kalendara"</string>
     <string name="calendar_square_color_picker_description" msgid="7430468363525563483">"Odabir boje"</string>
-    <string name="view_event_response_label" msgid="8382281658458798329">"Sudionici?"</string>
+    <string name="view_event_response_label" msgid="8382281658458798329">Sudjelovati\?</string>
     <string name="response_yes" msgid="2027484304899988350">"Da"</string>
     <string name="response_maybe" msgid="7791500973627841695">"Možda"</string>
     <string name="response_no" msgid="561911691884148136">"Ne"</string>
-    <string name="email_guests_label" msgid="8772030932155305903">"Slanje e-poruke gostima"</string>
-    <string name="email_organizer_label" msgid="7178059542798074813">"Organizator e-poruka"</string>
-    <string name="email_picker_label" msgid="4808253965057791781">"Obavijesti e-poštom"</string>
+    <string name="email_guests_label" msgid="8772030932155305903">Pošalji e-poruku gostima</string>
+    <string name="email_organizer_label" msgid="7178059542798074813">Pošalji e-poruku organizatoru</string>
+    <string name="email_picker_label" msgid="4808253965057791781">Pošalji e-poruku s</string>
     <string name="event_not_found" msgid="8356864185947582727">"Događaj nije pronađen."</string>
     <string name="map_label" msgid="8795383535586556038">"Karta"</string>
     <string name="call_label" msgid="2960328220008869083">"Poziv"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Brzi odgovori"</string>
-    <string name="quick_response_settings_summary" msgid="7878304729027355604">"Uređivanje zad. odgovora pri slanju gostima"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Uredi brze odgovore"</string>
+    <string name="quick_response_settings_summary" msgid="7878304729027355604">Uredi standardne odgovore za e-poruke gostima</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Brzi odgovor"</string>
-    <string name="quick_response_dialog_title" msgid="2681309456412199207">"Odaberite brzi odgovor"</string>
-    <string name="quick_response_email_failed" msgid="5544066405231853245">"Traženje programa e-pošte nije uspjelo"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Kasni samo nekoliko minuta."</item>
-    <item msgid="6215158751728689832">"Budite tamo za oko 10 minuta."</item>
-    <item msgid="4485794001743679338">"Samo naprijed, počnite bez mene."</item>
-    <item msgid="8036557974294987511">"Žao mi je, ne mogu stići. Moramo promijeniti dogovor."</item>
-  </string-array>
-    <string name="quick_response_custom_msg" msgid="8792374208224108798">"Napišite vlastiti…"</string>
+    <string name="quick_response_dialog_title" msgid="2681309456412199207">Odaberi brzi odgovor</string>
+    <string name="quick_response_email_failed" msgid="5544066405231853245">E-mail program nije pronađen</string>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Kasni samo nekoliko minuta."</item>
+        <item msgid="6215158751728689832">"Budite tamo za oko 10 minuta."</item>
+        <item msgid="4485794001743679338">"Samo naprijed, počnite bez mene."</item>
+        <item msgid="8036557974294987511">"Žao mi je, ne mogu stići. Moramo promijeniti dogovor."</item>
+    </string-array>
+    <string name="quick_response_custom_msg" msgid="8792374208224108798">Napiši vlastiti …</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organizator:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Podsjetnici"</string>
     <string name="agenda_today" msgid="5965841338467422191">"danas, <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="agenda_yesterday" msgid="4170964206728599693">"jučer, <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="agenda_tomorrow" msgid="3893625470780723605">"sutra, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="loading" msgid="3772533493214331230">"Učitavanje…"</string>
+    <string name="loading" msgid="3772533493214331230">Učitavanje …</string>
     <string name="show_older_events" msgid="5140647493681439926">"Dodirnite da biste vidjeli događaje prije <xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
     <string name="show_newer_events" msgid="2604638815440163080">"Dodirnite da biste vidjeli događaje nakon <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
     <string name="search_title" msgid="8898015280250716254">"Pretraži moje kalendare"</string>
@@ -141,33 +134,32 @@
     <string name="delete_label" msgid="874742811918030739">"Izbriši"</string>
     <string name="save_label" msgid="2133599104834432589">"Gotovo"</string>
     <string name="discard_label" msgid="2394623883289782541">"Odustani"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Odgoda svih alarma"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Odbaci sve"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Odgodi alarm"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Jednokratni događaj"</string>
     <string name="endByDate" msgid="7654221304929538201">"; do <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; jedanput"</item>
-    <item quantity="other" msgid="4855496837834652446">"; toliko puta: <xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Dnevno"</item>
-    <item quantity="other" msgid="5455230727715859264">"Svakih toliko dana: <xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
-    <string name="every_weekday" msgid="5896574838353902978">"Svaki dan u tjednu (pon–pet)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Svaki tjedan, <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Svaki <xliff:g id="NUMBER">%1$d</xliff:g>. tjedan, <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one">; jedanput</item>
+        <item quantity="few">; <xliff:g id="number">%d</xliff:g> puta</item>
+        <item quantity="other">; <xliff:g id="number">%d</xliff:g> puta</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one">Dnevno</item>
+        <item quantity="few">Svaka <xliff:g id="number">%d</xliff:g> dana</item>
+        <item quantity="other">Svakih <xliff:g id="number">%d</xliff:g> dana</item>
+    </plurals>
+    <string name="every_weekday" msgid="5896574838353902978">Svaki dan u tjednu (pon – pet)</string>
+    <plurals name="weekly">
+        <item quantity="one">Tjedno u <xliff:g id="days_of_week">%2$s</xliff:g></item>
+        <item quantity="few">Svaka <xliff:g id="number">%1$d</xliff:g> tjedna u <xliff:g id="days_of_week">%2$s</xliff:g></item>
+        <item quantity="other">Svakih <xliff:g id="number">%1$d</xliff:g> tjedana u <xliff:g id="days_of_week">%2$s</xliff:g></item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Mjesečno"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Godišnje"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Mjesečno (na dan <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Godišnje (na dan <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Prilagođeno (prilagođavanje na telefonu nije moguće)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Promijeni samo ovaj događaj"</string>
     <string name="modify_all" msgid="4421657265864209041">"Promijeni sve događaje u nizu"</string>
-    <string name="modify_all_following" msgid="3017428541066390380">"Promijeni ovaj i sve buduće događaje"</string>
+    <string name="modify_all_following" msgid="3017428541066390380">Promijeni ovaj događaj i sve buduće</string>
     <string name="new_event_dialog_label" msgid="7553105224561147916">"Novi događaj"</string>
     <string name="new_event_dialog_option" msgid="6154657379574669371">"Novi događaj"</string>
     <string name="delete_this_event_title" msgid="518402946676919384">"Izbrisati ovaj događaj?"</string>
@@ -181,160 +173,180 @@
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Sakrij odbijene događaje"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Tjedan počinje u"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Tjedan počinje u"</string>
-    <string name="preferences_clear_search_history_title" msgid="6619916370215282982">"Očisti povijest pretraživanja"</string>
+    <string name="preferences_clear_search_history_title" msgid="6619916370215282982">Obriši povijest pretraživanja</string>
     <string name="preferences_clear_search_history_summary" msgid="7864674093455778158">"Uklonite sva poduzeta pretraživanja"</string>
-    <string name="search_history_cleared" msgid="1536707558435227567">"Povijest pretraživanja obrisana je."</string>
+    <string name="search_history_cleared" msgid="1536707558435227567">Povijest pretraživanja je obrisana.</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Obavijesti"</string>
-    <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibracija"</string>
+    <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">Vibriranje</string>
     <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Zvuk"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Skočna obavijest"</string>
-    <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Zadano vrijeme podsjetnika"</string>
-    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Zadano vrijeme podsjetnika"</string>
+    <string name="preferences_default_reminder_title" msgid="5188861433342733905">Standardno vrijeme podsjetnika</string>
+    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">Standardno vrijeme podsjetnika</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
     <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Upotrijebi dom. vr. zonu"</string>
-    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Prikazuje kalendare i vremenike vaše vrem. zone dok putujete"</string>
+    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">Prikazuje kalendare i vrijeme događaja u tvojoj vremenskoj zoni dok putuješ</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Domaća vremenska zona"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Prikaži broj tjedna"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"O"</string>
-    <string name="preferences_build_version" msgid="8242471883413502068">"Međuverzija"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalendar"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
-    <string name="gadget_no_events" msgid="5209110911088302855">"Nema skorih događaja kalendara"</string>
+    <string name="preferences_build_version" msgid="8242471883413502068">Verzija izdanja</string>
+    <plurals name="month_more_events">
+        <item quantity="one">+1</item>
+        <item quantity="few">+<xliff:g id="number">%d</xliff:g></item>
+        <item quantity="other">+<xliff:g id="number">%d</xliff:g></item>
+    </plurals>
+    <string name="gadget_no_events" msgid="5209110911088302855">Nema predstojećih događaja</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Eksperimentalno"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Podsjetnici"</string>
-    <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Preskakanje podsjetnika"</string>
-    <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Preskakanje podsjetnika"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Tiho razdoblje"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Utišavanje podsjetnika za događaje tijekom navedenog vremena."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Početak tihog razdoblja"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Završetak tihog razdoblja"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Uklanjanje pogrešaka"</string>
-    <string name="copy_db" msgid="437691290566699292">"Pošaljite bazu podataka"</string>
-    <string name="directory_searching_fmt" msgid="1232037509095606687">"Pretraživanje <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+    <string name="preferences_reminders_responded_label" msgid="1196570678238475838">Zanemari podsjetnike</string>
+    <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">Zanemari podsjetnike</string>
+    <string name="copy_db" msgid="437691290566699292">Pošalji bazu podataka</string>
+    <string name="directory_searching_fmt" msgid="1232037509095606687">Pretraživanje <xliff:g id="DOMAIN">%s</xliff:g> …</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Ukloni sudionika"</string>
     <string name="accessibility_pick_start_date" msgid="3926641487042699037">"Datum početka"</string>
     <string name="accessibility_pick_start_time" msgid="4913428100936555149">"Vrijeme početka"</string>
     <string name="accessibility_pick_end_date" msgid="5624250196618643922">"Datum završetka"</string>
     <string name="accessibility_pick_end_time" msgid="7120310166355224941">"Vrijeme završetka"</string>
     <string name="accessibility_pick_time_zone" msgid="7155465783500323811">"Vremenska zona"</string>
-    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">"Ponavljanje događaja"</string>
+    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">Ponovi događaj</string>
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Dodaj podsjetnik"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Ukloni podsjetnik"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Dodaj sudionika"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sinkronizacija kalendara"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Cjelodnevni događaj"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Ponavljanje"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Vrijeme podsjetnika"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Vrsta podsjetnika"</string>
-    <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Prikaži me kao:"</string>
+    <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">Prikaži me kao</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privatnost"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Obavijesti Kalendara"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Odgodi obavijest"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Pošalji e-poruku gostima"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Novi događaj"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"<xliff:g id="ITEM_INDEX">%1$s</xliff:g> od <xliff:g id="ITEM_COUNT">%2$s</xliff:g> događaja."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 događaj"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> događaja"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"još 1 događaj"</item>
-    <item quantity="other" msgid="3609243840882275136">"još ovoliko događaja: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one">1 događaj</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> događaja</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> događaja</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one">+ 1 događaj</item>
+        <item quantity="few">+<xliff:g id="count">%d</xliff:g> događaja</item>
+        <item quantity="other">+<xliff:g id="count">%d</xliff:g> događaja</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Odabrani događaj"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NE provjeravaj -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Ponovi"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Ne ponavlja se nikad"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Svakog <xliff:g id="COUNT">%d</xliff:g>. dana"</item>
-    <item quantity="other" msgid="707566499994398250">"Svakog <xliff:g id="COUNT">%d</xliff:g>. dana"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Svakog <xliff:g id="COUNT">%d</xliff:g>. tjedna"</item>
-    <item quantity="other" msgid="7094801039989237061">"Svakog <xliff:g id="COUNT">%d</xliff:g>. tjedna"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Svakog <xliff:g id="COUNT">%d</xliff:g>. mjeseca"</item>
-    <item quantity="other" msgid="5419723710346646523">"Svakog <xliff:g id="COUNT">%d</xliff:g>. mjeseca"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Svake <xliff:g id="COUNT">%d</xliff:g>. godine"</item>
-    <item quantity="other" msgid="5678653649746562060">"Svake <xliff:g id="COUNT">%d</xliff:g>. godine"</item>
-  </plurals>
-    <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"na isti dan svakog mjeseca"</string>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one">Svaki <xliff:g id="count">%d</xliff:g> dan</item>
+        <item quantity="few">Svaka <xliff:g id="count">%d</xliff:g> dana</item>
+        <item quantity="other">Svakih <xliff:g id="count">%d</xliff:g> dana</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one">Svaki <xliff:g id="count">%d</xliff:g> tjedan</item>
+        <item quantity="few">Svaka <xliff:g id="count">%d</xliff:g> tjedna</item>
+        <item quantity="other">Svakih <xliff:g id="count">%d</xliff:g> tjedna</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one">Svaki <xliff:g id="count">%d</xliff:g> mjesec</item>
+        <item quantity="few">Svaka <xliff:g id="count">%d</xliff:g> mjeseca</item>
+        <item quantity="other">Svakih <xliff:g id="count">%d</xliff:g> mjeseci</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one">Svake <xliff:g id="count">%d</xliff:g> godine</item>
+        <item quantity="few">Svake <xliff:g id="count">%d</xliff:g> godine</item>
+        <item quantity="other">Svakih <xliff:g id="count">%d</xliff:g> godina</item>
+    </plurals>
+    <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">istog dana svakog mjeseca</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Zauvijek"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Do datuma"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Do <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="recurrence_end_count_label" msgid="1233883668293087977">"Za ovoliko događaja"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Za ovoliko događaja: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="8779598489398048259">"Za ovoliko događaja: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-  </plurals>
-    <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"promjena datuma završetka"</string>
-    <string name="visibility_default">Zadano</string>
-  <string name="visibility_private">Privatno</string>
-  <string name="visibility_public">Javno</string>
-    <string name="preferences_about_app">Kalendar je forkiran iz Etar-Kalendara</string>
-    <string name="preferences_authors">autori</string>
-  <string name="preferences_source_code">Izvorni kod</string>
-  <string name="preferences_licence">licenca</string>
-    <string name="preferences_privacy_policy">Pravila o privatnosti</string>
-  <string name="preferences_service_terms">Uvjeti pružanja usluge</string>
-
-
-    <string name="goto_date">Idi na…</string>
+    <string name="recurrence_end_count_label" msgid="1233883668293087977">Ovoliko puta</string>
+    <plurals name="recurrence_end_count">
+        <item quantity="one"><xliff:g id="event_count">%d</xliff:g> puta</item>
+        <item quantity="few"><xliff:g id="event_count">%d</xliff:g> puta</item>
+        <item quantity="other"><xliff:g id="event_count">%d</xliff:g> puta</item>
+    </plurals>
+    <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">promijeni datum završetka</string>
+    <string name="visibility_default">Standardno</string>
+    <string name="visibility_private">Privatno</string>
+    <string name="visibility_public">Javno</string>
+    <string name="goto_date">Idi na …</string>
     <string name="rsvp_accepted">Odgovoreno: Da.</string>
     <string name="rsvp_tentative">Odgovoreno: Možda.</string>
     <string name="rsvp_declined">Odgovoreno: Ne.</string>
-    <string name="preferences_theme">Tema</string>
-    <string name="preferences_light_theme">Svijetla</string>
-    <string name="preferences_dark_theme">Tamna</string>
-    <string name="preferences_black_theme">Crna</string>
+    <string name="preferences_theme">Dizajn</string>
+    <string name="preferences_light_theme">Svijetlo</string>
+    <string name="preferences_dark_theme">Tamno</string>
+    <string name="preferences_black_theme">Crno</string>
     <string name="preferences_color">Osnovna boja</string>
     <string name="preferences_color_pick">Osnovna boja</string>
-    <string name="preferences_days_per_week_title">Dana tjedno</string>
-    <string name="preferences_days_per_week_dialog">Dana tjedno</string>
-    <string name="preferences_default_event_duration_title">Zadano trajanje događaja</string>
+    <string name="preferences_days_per_week_title">Dana u tjednu</string>
+    <string name="preferences_days_per_week_dialog">Dana u tjednu</string>
+    <string name="preferences_default_event_duration_title">Standardno trajanje događaja</string>
     <string name="preferences_issues">Prijavi probleme</string>
-    <string name="user_rejected_calendar_write_permission">Da bi radio ispravno Etar zahtijeva dozvolu za čitanje i pisanje kalendara. Pokušajte ponovo.</string>
-    <string name="calendar_permission_not_granted">Žao mi je ovo ne može raditi. Da bi radio ispravno Etar zahtijeva dozvolu za čitanje i pisanje kalendara.</string>
+    <string name="user_rejected_calendar_write_permission">Da bi ispravno radio, Etar mora imati dozvolu za čitanje i pisanje kalendara. Pokušaj ponovo.</string>
+    <string name="calendar_permission_not_granted">Ova funkcija nažalost ne radi. Da bi ispravno radio, Etar mora imati dozvolu za čitanje i pisanje kalendara</string>
     <string name="visibility_confidential">Povjerljivo</string>
     <string name="zero_minutes">0 minuta</string>
     <string name="fifteen_minutes">15 minuta</string>
     <string name="thirty_minutes">30 minuta</string>
     <string name="one_hour">1 sat</string>
-    <string name="one_and_a_half_hours">1.5 sat</string>
+    <string name="one_and_a_half_hours">sat i pol</string>
     <string name="two_hours">2 sata</string>
     <string name="share_label">Dijeli</string>
     <string name="no_map">Aplikacija za karte nije instalirana</string>
-    <string name="default_start_title">Pretpostavljeni pregled</string>
-    <string name="default_start_last">Prethodno korišten pregled</string>
+    <string name="default_start_title">Standardni pregled</string>
+    <string name="default_start_last">Prethodno korišteni pregled</string>
     <string name="preferences_alerts_custom_snooze_delay_title">Pitaj za odgodu podsjetnika</string>
     <string name="preferences_alerts_custom_snooze_delay_summary_on">Pitaj za odgodu kad god se pojavi podsjetnik za odgodu</string>
-    <string name="preferences_alerts_custom_snooze_delay_summary_off">Uvijek koristi zadanu odgodu</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_off">Uvijek koristi standardnu odgodu</string>
     <string name="snooze_delay_dialog_title">Postavi odgodu</string>
-    <string name="preferences_default_snooze_delay_title">Vrijeme zaadane odgode</string>
-    <string name="preferences_default_snooze_delay_dialog">Zadana odgoda</string>
-    <string name="error_generating_ics">Došlo je do problema za vrijeme dijeljenja događaja</string>
+    <string name="preferences_default_snooze_delay_title">Standardno vrijeme odgode</string>
+    <string name="preferences_default_snooze_delay_dialog">Standardna odgoda</string>
+    <string name="error_generating_ics">Došlo je do problema tijekom dijeljenja događaja</string>
     <string name="cal_share_intent_title">Pošalji događaj za:</string>
     <string name="cal_export_event_sdcard_title">Prebaci na SD karticu</string>
     <string name="cal_export_succ_msg">Događaj je uspješno prebačen: %1s</string>
     <string name="cal_import_menu_title">Uvezi događaj</string>
     <string name="cal_nothing_to_import">Nema se što uvesti</string>
     <string name="cal_import_error_msg">Uvoz u kalendar nije uspio</string>
-    <string name="cal_import_error_date_msg">Ne razumijem ovaj datum: %s</string>
+    <string name="cal_import_error_date_msg">Nerazumljiv datum: %s</string>
     <string name="cal_pick_ics">Odaberi datoteku za uvoz</string>
-    <string name="view_settings">Postavke</string>
+    <string name="view_settings">Pogledaj postavke</string>
     <string name="preferences_month_view_portrait">Mjesečni pregled (Uspravno)</string>
     <string name="preferences_month_view_landscape">Mjesečni pregled (Položeno)</string>
-    <string name="view_details">Detalji</string>
-    <string name="display_time">Prikaži Vrijeme</string>
-    <string name="display_location">Prikaži Lokaciju</string>
+    <string name="display_options">Detalji</string>
+    <string name="display_time">Prikaži vrijeme</string>
+    <string name="display_location">Prikaži lokaciju</string>
     <string name="show_time_no">Ne</string>
     <string name="show_time_start">Samo vrijeme početka</string>
     <string name="show_time_start_end">Vrijeme početka i završetka</string>
     <string name="show_time_start_end_below">Vrijeme početka i završetka ispod događaja</string>
-</resources>
+    <string name="maximum_number_of_lines">Maksimalan broj redaka u događaju</string>
+    <string name="foreground_notification_channel_name">Sinkronizacija alarma</string>
+    <string name="foreground_notification_channel_description">Neophodna obavijest za unutarnju sinkronizaciju alarma. Isključi zvuk</string>
+    <string name="cal_import_error_time_zone_msg">Nerazumljiva vremenska zona: %s</string>
+    <string name="preferences_calendar_account">%1$s račun</string>
+    <string name="preferences_calendar_delete">Izbriši kalendar</string>
+    <string name="preferences_calendar_display_name">Promijeni ime</string>
+    <string name="preferences_calendar_color">Boja</string>
+    <string name="preferences_calendar_visible">Prikaži događaje</string>
+    <string name="preferences_calendar_synchronize">Sinkroniziraj ovaj kalendar</string>
+    <string name="preferences_list_calendar_summary_sync_off">Nije sinkronizirano</string>
+    <string name="preferences_list_calendar_summary_invisible">Događaji se ne prikazuju</string>
+    <string name="preferences_list_general">Opće postavke</string>
+    <string name="preferences_list_add_remote">Dodaj udaljeni kalendar (CalDAV)</string>
+    <string name="preferences_list_add_offline">Dodaj izvanmrežni kalendar</string>
+    <string name="preferences_list_add_offline_title">Dodaj izvanmrežni kalendar</string>
+    <string name="preferences_list_add_offline_error_empty">Upiši ime kalendara!</string>
+    <string name="preferences_list_add_offline_message">Izvanmrežni kalendari se NE sinkroniziraju s uslugom oblaka i dostupni su samo na tvom telefonu.</string>
+    <string name="preferences_list_add_offline_button">Dodaj kalendar</string>
+    <string name="preferences_list_add_offline_name">Ime</string>
+    <string name="preferences_list_add_offline_cancel">Odustani</string>
+    <string name="preferences_calendar_color_warning_title">Upozorenje</string>
+    <string name="preferences_calendar_color_warning_message">Promjena boje se može poništiti kad se kalendar ponovo sinkronizira.
+\n
+\nU DAVx⁵ je moguće deaktivirati „Upravljanje bojama kalendara”, kako bi se to spriječilo.</string>
+    <string name="preferences_calendar_color_warning_button">Razumijem</string>
+    <string name="preferences_calendar_delete_message">Zaista želiš izbrisati ovaj kalendar\?</string>
+    <string name="preferences_calendar_delete_delete">Izbriši kalendar</string>
+    <string name="preferences_calendar_delete_cancel">Odustani</string>
+    <string name="preferences_menu_about">Informacije o Etaru</string>
+    <string name="offline_account_name">Izvanmrežni kalendar</string>
+    <string name="app_copyright">© 2015. – <xliff:g>%s</xliff:g>. The Etar Project. Dijelovi © 2005. – <xliff:g>%s</xliff:g>. The Android Open Source Project.</string>
+    <string name="authors">Autori</string>
+    <string name="changelog">Zapis promjena</string>
+    <string name="license">Licenca</string>
+    <string name="source_code">Izvor</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index f70e864344e014d43eb527500aaa24c7d6a5a84b..374cc98eba411cdc8f1d4689a133cc1ec4c39f8b 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Elérhető"</item>
     <item msgid="2064426942462573474">"Kísérleti"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"első"</item>
-    <item msgid="5631923029483854900">"másodperc"</item>
-    <item msgid="148935502975250973">"harmadik"</item>
-    <item msgid="5124200797326669172">"negyedik"</item>
-    <item msgid="7564374178324652137">"utolsó"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Nincs válasz"</item>
     <item msgid="3724434080904437698">"Igen"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"A jelen és a jövőbeli események"</item>
     <item msgid="7833229563617435430">"Összes esemény"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"A jelenlegi és a további események"</item>
-    <item msgid="6315440193748139854">"Összes esemény"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Csak a jelen esemény"</item>
     <item msgid="140670561403965380">"A sorozat összes eseményére"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 995c737bb684bdb6923b33fd43759385c916df94..86b08d00e76fbe050a18f3d805bf6788d93e8779 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Naptár"</string>
     <string name="what_label" msgid="1933578391985810049">"Cím"</string>
     <string name="where_label" msgid="3472482206065595118">"Hol"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Holnap"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Ma <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Holnap <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Ismétlés"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Nincs cím)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 perc"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> perc"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 p"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> p"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 óra"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> óra"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 nap"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> nap"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>. hét"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 perc"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> perc"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 p"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> p"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 óra"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> óra"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 nap"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> nap"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>. hét"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Frissítés"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Nap megjelenítése"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Napló"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Esemény törlése"</string>
     <string name="goto_today" msgid="9162136434410891230">"Ma"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Beállítások"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Naptárak"</string>
     <string name="search" msgid="550656004486017426">"Keresés"</string>
     <string name="hide_controls" msgid="830320505938520882">"Vezérlők elrejtése"</string>
     <string name="show_controls" msgid="715520586028062621">"Vezérlők megjelenít."</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Megjelenítendő naptárak"</string>
-    <string name="synced" msgid="7913940305983383493">"szinkronizálva"</string>
-    <string name="not_synced" msgid="4275114941801829419">"nincs szinkronizálva"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Ez a fiók nincs szinkronizálva, ezért nem biztos, hogy a naptár naprakész."</string>
-    <string name="accounts" msgid="849401841083180306">"Fiókok és szinkronizálás"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Szinkronizálni kívánt naptárak"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Szinkronizálni kívánt naptárak"</string>
     <string name="hint_what" msgid="709155115005044531">"Esemény neve"</string>
     <string name="hint_where" msgid="4972598001033801974">"Hely"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Kezdete:"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Egész nap"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Naptár"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Összes megjelenítése"</string>
     <string name="description_label" msgid="7193475046717505855">"Leírás"</string>
     <string name="presence_label" msgid="6169724148441175862">"Állapotjelzés"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Adatvédelem"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Emlékeztető hozzáad."</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Nincs naptár"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Esemény hozzáadása előtt adjon hozzá legalább egy Naptárfiókot a készülékhez, és tegye láthatóvá a naptárat. Érintse meg a \"Fiók hozzáadása\" lehetőséget fiók hozzáadásához (ha épp most adott hozzá egy fiókot, akkor várja meg a szinkronizálás végét, majd próbálkozzon újra). Vagy érintse meg a Mégse lehetőséget, és bizonyosodjon meg, hogy legalább egy naptár látható."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"A Naptár jobban működik egy Google Fiókkal."\n\n"• Bármilyen bőngészőből elérheti"\n"• Biztonsági másolatot készíthet programjairól."</string>
     <string name="add_account" msgid="1669072099756774952">"Fiók hozzáadása"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Naptár:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Szervező:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Hívás"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Gyors válaszok"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Válaszok szerkesztése vendég e-mailek küldésekor"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Gyors válaszok szerkesztése"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Gyors válasz"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Válassza ki a gyors választ"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Nem sikerült megtalálni a levelezőprogramot"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Csak pár percet késik."</item>
-    <item msgid="6215158751728689832">"Legyen ott körülbelül 10 perc alatt."</item>
-    <item msgid="4485794001743679338">"Kezdjék el nélkülem."</item>
-    <item msgid="8036557974294987511">"Sajnálom, nem érek oda. Kénytelenek leszünk átütemezni."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Csak pár percet késik."</item>
+        <item msgid="6215158751728689832">"Legyen ott körülbelül 10 perc alatt."</item>
+        <item msgid="4485794001743679338">"Kezdjék el nélkülem."</item>
+        <item msgid="8036557974294987511">"Sajnálom, nem érek oda. Kénytelenek leszünk átütemezni."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Saját válasz írása..."</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Szervező:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Emlékeztetők"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Törlés"</string>
     <string name="save_label" msgid="2133599104834432589">"Kész"</string>
     <string name="discard_label" msgid="2394623883289782541">"Mégse"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Az összes halasztása"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Az összes törlése"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Szundi"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Egyszeri esemény"</string>
     <string name="endByDate" msgid="7654221304929538201">"; eddig – <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; egyszer"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> alkalommal"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Naponta"</item>
-    <item quantity="other" msgid="5455230727715859264">"<xliff:g id="NUMBER">%d</xliff:g> naponta"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; egyszer"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> alkalommal"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Naponta"</item>
+        <item quantity="other" msgid="5455230727715859264">"<xliff:g id="NUMBER">%d</xliff:g> naponta"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Minden hétköznap (hétfő–péntek)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Hetente – <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>i napon"</item>
-    <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g> hetente – <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>i napon"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Hetente – <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>i napon"</item>
+        <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g> hetente – <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>i napon"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Havi"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Évente"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Havonta (a(z) <xliff:g id="DAY_OF_MONTH">%s</xliff:g>. napon)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Évente (nap: <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Egyéni... (telefonon nem állítható be)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Csak a jelen esemény módosítása"</string>
     <string name="modify_all" msgid="4421657265864209041">"A sorozat összes eseményének módosítása"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Naptárak és események megjelenítése utazás közben az otthoni idő szerint"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Otthoni időzóna"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Hét számának megjelenítése"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Névjegy"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Build verziószáma"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Naptár"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Nincsenek közelgő események a naptárban"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Kísérleti"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Emlékeztetők"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Emlékeztetők kihagyása"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Emlékeztetők kihagyása"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Néma időtartam"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Eseményemlékeztető némítása egy adott időszakban."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Néma időtartam eleje"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Néma időtartam vége"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Hibakeresés"</string>
     <string name="copy_db" msgid="437691290566699292">"Adatbázis küldése"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Keresés <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Résztvevő eltávolítása"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Emlékeztető hozzáadása"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Emlékeztető törlése"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Résztvevő hozzáadása"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Naptár szinkronizálása"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Egész napos esemény"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Ismétlés"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Emlékeztető ideje"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Emlékeztető típusa"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Állapotjelzés"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Adatvédelem"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Naptárértesítés"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Szundi funkció -- értesítés"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"E-mail küldése a résztvevőknek"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Új esemény"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"<xliff:g id="ITEM_COUNT">%2$s</xliff:g>/<xliff:g id="ITEM_INDEX">%1$s</xliff:g> esemény."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 esemény"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> esemény"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 esemény"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> esemény"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 esemény"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> esemény"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 esemény"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> esemény"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Kiválasztott esemény"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NE jelölje be -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Ismétlődés"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Soha nem ismétli"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"<xliff:g id="COUNT">%d</xliff:g> naponta"</item>
-    <item quantity="other" msgid="707566499994398250">"<xliff:g id="COUNT">%d</xliff:g> naponta"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"<xliff:g id="COUNT">%d</xliff:g> hetente"</item>
-    <item quantity="other" msgid="7094801039989237061">"<xliff:g id="COUNT">%d</xliff:g> hetente"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"<xliff:g id="COUNT">%d</xliff:g> havonta"</item>
-    <item quantity="other" msgid="5419723710346646523">"<xliff:g id="COUNT">%d</xliff:g> havonta"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"<xliff:g id="COUNT">%d</xliff:g> évente"</item>
-    <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g> évente"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"<xliff:g id="COUNT">%d</xliff:g> naponta"</item>
+        <item quantity="other" msgid="707566499994398250">"<xliff:g id="COUNT">%d</xliff:g> naponta"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"<xliff:g id="COUNT">%d</xliff:g> hetente"</item>
+        <item quantity="other" msgid="7094801039989237061">"<xliff:g id="COUNT">%d</xliff:g> hetente"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"<xliff:g id="COUNT">%d</xliff:g> havonta"</item>
+        <item quantity="other" msgid="5419723710346646523">"<xliff:g id="COUNT">%d</xliff:g> havonta"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"<xliff:g id="COUNT">%d</xliff:g> évente"</item>
+        <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g> évente"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"havonta ugyanakkor"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Végtelenszer"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Meghatározott dátumig"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Záró dátum: <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Adott számú alkalommal"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> eseményhez"</item>
-    <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> eseményhez"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> eseményhez"</item>
+        <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> eseményhez"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"befejezés dátumának módosítása"</string>
     <string name="visibility_default">Alapértelmezett</string>
   <string name="visibility_private">Privát</string>
@@ -290,4 +259,4 @@
     <string name="preferences_privacy_policy">Adatvédelmi irányelvek</string>
     <string name="preferences_service_terms">Szolgáltatási feltételek</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 8c5b13c4f66fcecb0fe8e218fec3bd9d7b40007e..2b14b16c0aea5edacc3c87c5322c677772f24ba3 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Tersedia"</item>
     <item msgid="2064426942462573474">"Sementara"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"pertama"</item>
-    <item msgid="5631923029483854900">"kedua"</item>
-    <item msgid="148935502975250973">"ketiga"</item>
-    <item msgid="5124200797326669172">"keempat"</item>
-    <item msgid="7564374178324652137">"terakhir"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Tidak ada tanggapan"</item>
     <item msgid="3724434080904437698">"Ya"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Acara saat ini dan di masa mendatang"</item>
     <item msgid="7833229563617435430">"Semua acara"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Acara &amp; mendatang ini"</item>
-    <item msgid="6315440193748139854">"Semua acara"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Hanya acara ini"</item>
     <item msgid="140670561403965380">"Semua acara dalam rangkaian"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 386f54c0e1491078e4d6715f11ecd4c7e44ce8e9..3ab6fa5c502e2c415edff290722743a85c013a03 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,42 +12,35 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalender"</string>
-    <string name="what_label" msgid="1933578391985810049">"Apa"</string>
-    <string name="where_label" msgid="3472482206065595118">"Di mana"</string>
-    <string name="when_label" msgid="894636567327261599">"Kapan"</string>
+    <string name="what_label" msgid="1933578391985810049">Judul</string>
+    <string name="where_label" msgid="3472482206065595118">Lokasi</string>
+    <string name="when_label" msgid="894636567327261599">Waktu</string>
     <string name="timezone_label" msgid="3988530993300431650">"Zona waktu"</string>
     <string name="attendees_label" msgid="2971281641565729725">"Tamu"</string>
     <string name="today" msgid="8577375020252453006">"Hari ini"</string>
     <string name="tomorrow" msgid="614434811813859237">"Besok"</string>
-    <string name="today_at_time_fmt" msgid="1981279213130049736">"Hari ini pada pukul <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Besok pada pukul <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="repeats_label" msgid="7414023871434593196">"Perulangan"</string>
+    <string name="today_at_time_fmt" msgid="1981279213130049736">Hari ini pada jam <xliff:g id="time_interval">%s</xliff:g></string>
+    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">Besok pada jam <xliff:g id="time_interval">%s</xliff:g></string>
+    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g></string>
+    <string name="repeats_label" msgid="7414023871434593196">Pengulangan</string>
     <string name="no_title_label" msgid="302177118061368042">"(Tanpa judul)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 menit"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> menit"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 menit"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> menit"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 jam"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> jam"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 hari"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> hari"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"minggu <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> menit</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> mnt</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> jam</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> hari</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other">minggu <xliff:g id="count">%d</xliff:g></item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Segarkan"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Tampilkan hari"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
@@ -56,20 +49,13 @@
     <string name="month_view" msgid="7287101431749285412">"Bulan"</string>
     <string name="event_view" msgid="7621353079385122317">"Lihat acara"</string>
     <string name="event_create" msgid="6941040556709110617">"Acara baru"</string>
-    <string name="event_edit" msgid="4006961928830064662">"Edit acara"</string>
+    <string name="event_edit" msgid="4006961928830064662">Sunting acara</string>
     <string name="event_delete" msgid="2386667193277770442">"Hapus acara"</string>
     <string name="goto_today" msgid="9162136434410891230">"Hari ini"</string>
-    <string name="menu_preferences" msgid="9120238479503233925">"Setelan"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalender untuk ditampilkan"</string>
-    <string name="search" msgid="550656004486017426">"Telusuri"</string>
+    <string name="menu_preferences" msgid="9120238479503233925">Pengaturan</string>
+    <string name="search" msgid="550656004486017426">Cari</string>
     <string name="hide_controls" msgid="830320505938520882">"Sembunyikan kontrol"</string>
     <string name="show_controls" msgid="715520586028062621">"Tampilkan kontrol"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalender untuk ditampilkan"</string>
-    <string name="synced" msgid="7913940305983383493">"disinkronkan"</string>
-    <string name="not_synced" msgid="4275114941801829419">"tidak disinkronkan"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Akun ini belum disinkronkan, kalender Anda mungkin tidak mutakhir."</string>
-    <string name="accounts" msgid="849401841083180306">"Sinkronisasi &amp; akun"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Kalender untuk disinkronkan"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Kalender untuk disinkronkan"</string>
     <string name="hint_what" msgid="709155115005044531">"Nama acara"</string>
     <string name="hint_where" msgid="4972598001033801974">"Lokasi"</string>
@@ -81,206 +67,258 @@
     <string name="creating_event_with_guest" msgid="5758688413124191931">"Undangan akan dikirim."</string>
     <string name="saving_event_with_guest" msgid="9184584438475689577">"Pembaruan akan dikirim."</string>
     <string name="create_event_dialog_save" msgid="1080859798521717414">"Simpan"</string>
-    <string name="alert_title" msgid="7869592820853066853">"Pemberitahuan kalender"</string>
+    <string name="alert_title" msgid="7869592820853066853">Notifikasi kalender</string>
     <string name="event_info_title" msgid="56024222340421620">"Lihat acara"</string>
     <string name="event_info_title_invite" msgid="9160326363769403865">"Undangan rapat"</string>
-    <string name="edit_event_to_label" msgid="795012981218062421">"Kepada"</string>
-    <string name="edit_event_from_label" msgid="174999102612666115">"Dari"</string>
+    <string name="edit_event_to_label" msgid="795012981218062421">Berakhir</string>
+    <string name="edit_event_from_label" msgid="174999102612666115">Mulai</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Seharian"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalender"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Tampilkan semua"</string>
     <string name="description_label" msgid="7193475046717505855">"Deskripsi"</string>
-    <string name="presence_label" msgid="6169724148441175862">"Tampilkan saya sebagai"</string>
-    <string name="privacy_label" msgid="9215031965259597335">"Privasi"</string>
-    <string name="reminders_label" msgid="7292389181815525676">"Tambahkan pengingat"</string>
-    <string name="no_syncable_calendars" msgid="7019488867045436129">"Tak ada kalender"</string>
-    <string name="no_calendars_found" msgid="8968682716053492187">"Sebelum Anda dapat menambahkan suatu acara, Anda harus menambahkan setidaknya satu akun Kalender ke perangkat dan membuat kalender terlihat. Sentuh Tambahkan Akun untuk menambah akun (jika Anda baru saja menambahkan akun, tunggu sampai akun ini selesai disinkronkan dan coba lagi). Atau sentuh Batalkan dan pastikan setidaknya satu kalender terlihat."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalender bekerja lebih baik dengan Akun."\n\n"• Akses dari browser web mana pun"\n"• Cadangkan acara Anda dengan aman"</string>
-    <string name="add_account" msgid="1669072099756774952">"Tambahkan akun"</string>
+    <string name="presence_label" msgid="6169724148441175862">Tmplkan sy sbg</string>
+    <string name="privacy_label" msgid="9215031965259597335">Pribadi</string>
+    <string name="reminders_label" msgid="7292389181815525676">Tambah pengingat</string>
+    <string name="no_syncable_calendars" msgid="7019488867045436129">Tidak ada kalender</string>
+    <string name="no_calendars_found" msgid="8968682716053492187">Sebelum anda bisa menambahkan acara, anda harus menambahkan setidaknya satu akun Kalender ke perangkat dan buat kalender terlihat. Sentuh Tambah Akun untuk menambah akun (jika anda baru saja menambahkan akun, tunggu sampai akun selesai disinkronkan dan coba lagi). Atau sentuh Batal dan pastikan setidaknya satu kalender terlihat.</string>
+    <string name="add_account" msgid="1669072099756774952">Tambah akun</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalender:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Penyelenggara:"</string>
     <string name="choose_event_color_label" msgid="2192923501857428854">"Pilih warna acara"</string>
     <string name="event_color_picker_dialog_title" msgid="4631938661655159511">"Warna Acara"</string>
-    <string name="event_color_set_to_default" msgid="3447218820785647967">"Setel ke warna default kalendar"</string>
+    <string name="event_color_set_to_default" msgid="3447218820785647967">Setel sebagai warna baku kalendar</string>
     <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">"Warna Kalender"</string>
     <string name="calendar_square_color_picker_description" msgid="7430468363525563483">"Pemilih warna"</string>
     <string name="view_event_response_label" msgid="8382281658458798329">"Datang?"</string>
     <string name="response_yes" msgid="2027484304899988350">"Ya"</string>
     <string name="response_maybe" msgid="7791500973627841695">"Mungkin"</string>
     <string name="response_no" msgid="561911691884148136">"Tidak"</string>
-    <string name="email_guests_label" msgid="8772030932155305903">"Kirim email ke tamu"</string>
-    <string name="email_organizer_label" msgid="7178059542798074813">"Pengelola email"</string>
-    <string name="email_picker_label" msgid="4808253965057791781">"Email dengan"</string>
+    <string name="email_guests_label" msgid="8772030932155305903">Kirim surel ke tamu</string>
+    <string name="email_organizer_label" msgid="7178059542798074813">Kirim surel ke penyelenggara</string>
+    <string name="email_picker_label" msgid="4808253965057791781">Kirim surel dengan</string>
     <string name="event_not_found" msgid="8356864185947582727">"Acara tidak ditemukan."</string>
     <string name="map_label" msgid="8795383535586556038">"Peta"</string>
     <string name="call_label" msgid="2960328220008869083">"Panggil"</string>
-    <string name="quick_response_settings" msgid="6776151690686068278">"Tanggapan cepat"</string>
-    <string name="quick_response_settings_summary" msgid="7878304729027355604">"Edit tanggapan default saat meng-email tamu"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Edit tanggapan cpt"</string>
-    <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Tanggapan cepat"</string>
-    <string name="quick_response_dialog_title" msgid="2681309456412199207">"Pilih tanggapan cepat"</string>
-    <string name="quick_response_email_failed" msgid="5544066405231853245">"Gagal menemukan program email"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Dijalankan terlambat beberapa menit."</item>
-    <item msgid="6215158751728689832">"Tiba dalam waktu sekitar 10 menit."</item>
-    <item msgid="4485794001743679338">"Silakan mulai tanpa saya."</item>
-    <item msgid="8036557974294987511">"Maaf, saya tidak bisa. Kita harus menjadwalkan ulang."</item>
-  </string-array>
-    <string name="quick_response_custom_msg" msgid="8792374208224108798">"Tulis respons Anda sendiri…"</string>
-    <string name="event_info_organizer" msgid="9138683335394832629">"Pnylenggara:"</string>
+    <string name="quick_response_settings" msgid="6776151690686068278">Respons cepat</string>
+    <string name="quick_response_settings_summary" msgid="7878304729027355604">Sunting respons baku saat mengirim surel ke tamu</string>
+    <string name="quick_response_settings_edit_title" msgid="6260055523174081930">Respons cepat</string>
+    <string name="quick_response_dialog_title" msgid="2681309456412199207">Pilih respons cepat</string>
+    <string name="quick_response_email_failed" msgid="5544066405231853245">Gagal menemukan program surel</string>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Dijalankan terlambat beberapa menit."</item>
+        <item msgid="6215158751728689832">"Tiba dalam waktu sekitar 10 menit."</item>
+        <item msgid="4485794001743679338">"Silakan mulai tanpa saya."</item>
+        <item msgid="8036557974294987511">"Maaf, saya tidak bisa. Kita harus menjadwalkan ulang."</item>
+    </string-array>
+    <string name="quick_response_custom_msg" msgid="8792374208224108798">Tulis respons anda sendiri…</string>
+    <string name="event_info_organizer" msgid="9138683335394832629">Pelaksana:</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Pengingat"</string>
-    <string name="agenda_today" msgid="5965841338467422191">"hari ini, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="agenda_yesterday" msgid="4170964206728599693">"kemarin, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="agenda_tomorrow" msgid="3893625470780723605">"besok, <xliff:g id="DATE">%1$s</xliff:g>"</string>
+    <string name="agenda_today" msgid="5965841338467422191">hari ini, <xliff:g id="date">%1$s</xliff:g>
+    </string>
+    <string name="agenda_yesterday" msgid="4170964206728599693">kemarin, <xliff:g id="date">%1$s</xliff:g>
+    </string>
+    <string name="agenda_tomorrow" msgid="3893625470780723605">besok, <xliff:g id="date">%1$s</xliff:g>
+    </string>
     <string name="loading" msgid="3772533493214331230">"Memuat…"</string>
-    <string name="show_older_events" msgid="5140647493681439926">"Sentuh untuk melihat acara sebelum <xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
-    <string name="show_newer_events" msgid="2604638815440163080">"Sentuh untuk melihat acara setelah <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
-    <string name="search_title" msgid="8898015280250716254">"Telusuri kalender saya"</string>
+    <string name="show_older_events" msgid="5140647493681439926">Sentuh untuk melihat acara sebelum <xliff:g id="oldest_search_range">%1$s</xliff:g>
+    </string>
+    <string name="show_newer_events" msgid="2604638815440163080">Sentuh untuk melihat acara setelah <xliff:g id="newest_search_range">%1$s</xliff:g>
+    </string>
+    <string name="search_title" msgid="8898015280250716254">Cari kalender saya</string>
     <string name="edit_event_label" msgid="7413222956349977161">"Detail"</string>
-    <string name="edit_label" msgid="8934331258435656534">"Edit"</string>
+    <string name="edit_label" msgid="8934331258435656534">Sunting</string>
     <string name="delete_label" msgid="874742811918030739">"Hapus"</string>
     <string name="save_label" msgid="2133599104834432589">"Selesai"</string>
     <string name="discard_label" msgid="2394623883289782541">"Batal"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Tunda semua"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Tutup semua"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Tunda"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Acara sekali"</string>
-    <string name="endByDate" msgid="7654221304929538201">"; sampai <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; sekali saja"</item>
-    <item quantity="other" msgid="4855496837834652446">"; untuk <xliff:g id="NUMBER">%d</xliff:g> kali"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Harian"</item>
-    <item quantity="other" msgid="5455230727715859264">"Setiap <xliff:g id="NUMBER">%d</xliff:g> hari"</item>
-  </plurals>
+    <string name="endByDate" msgid="7654221304929538201">; sampai <xliff:g id="date">%s</xliff:g>
+    </string>
+    <plurals name="endByCount">
+        <item quantity="other">; selama <xliff:g id="number">%d</xliff:g> kali</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="other">Setiap <xliff:g id="number">%d</xliff:g> hari</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Setiap hari kerja (Sen–Jum)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Mingguan setiap <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Setiap <xliff:g id="NUMBER">%1$d</xliff:g> minggu hari <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="other">Setiap <xliff:g id="number">%1$d</xliff:g> minggu pada hari <xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Bulanan"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Tahunan"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Bulanan (pada hari <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Tahunan (pada <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
-    <string name="custom" product="default" msgid="4137468716966004993">"Khusus (tidak dapat mengubahsuai pada ponsel)"</string>
+    <string name="custom" product="default" msgid="4137468716966004993">Khusus (tidak bisa diubah di ponsel)</string>
     <string name="modify_event" msgid="5982876409997142690">"Ubah acara ini saja"</string>
     <string name="modify_all" msgid="4421657265864209041">"Ubah semua acara dalam rangkaian"</string>
-    <string name="modify_all_following" msgid="3017428541066390380">"Ubah acara saat ini dan di masa mendatang"</string>
+    <string name="modify_all_following" msgid="3017428541066390380">Ubah acara saat ini dan mendatang</string>
     <string name="new_event_dialog_label" msgid="7553105224561147916">"Acara baru"</string>
     <string name="new_event_dialog_option" msgid="6154657379574669371">"Acara baru"</string>
     <string name="delete_this_event_title" msgid="518402946676919384">"Hapus acara ini?"</string>
-    <string name="delete_recurring_event_title" msgid="5609046778422180206">"Hapus <xliff:g id="EVENTTITLE">%s</xliff:g>?"</string>
-    <string name="change_response_title" msgid="7704714776070974984">"Ubah tanggapan"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"Setelan umum"</string>
-    <string name="menu_about_preferences" msgid="6124375438237674973">Kalender tentang</string>
-    <string name="preferences_title" msgid="8045855493262131773">"Setelan"</string>
-    <string name="preferences_general_title" msgid="2069075513760573117">"Setelan tampilan kalender"</string>
-    <string name="preferences_reminder_title" msgid="5199606534191180129">"Pemberitahuan &amp; pengingat"</string>
+    <string name="delete_recurring_event_title" msgid="5609046778422180206">Hapus <xliff:g id="eventtitle">%s</xliff:g>\?</string>
+    <string name="change_response_title" msgid="7704714776070974984">Ubah respons</string>
+    <string name="preferences_title" msgid="8045855493262131773">Pengaturan</string>
+    <string name="preferences_general_title" msgid="2069075513760573117">Pengaturan tampilan kalender</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">Notifikasi &amp; pengingat</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Sembunyikan acara yang ditolak"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Minggu dimulai pada"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Minggu dimulai pada"</string>
-    <string name="preferences_clear_search_history_title" msgid="6619916370215282982">"Hapus riwayat penelusuran"</string>
-    <string name="preferences_clear_search_history_summary" msgid="7864674093455778158">"Hapus semua penelusuran yang telah Anda lakukan"</string>
-    <string name="search_history_cleared" msgid="1536707558435227567">"Riwayat penelusuran dihapus."</string>
-    <string name="preferences_alerts_title" msgid="6636088008103904020">"Pemberitahuan"</string>
+    <string name="preferences_clear_search_history_title" msgid="6619916370215282982">Hapus riwayat pencarian</string>
+    <string name="preferences_clear_search_history_summary" msgid="7864674093455778158">Hapus semua pencarian yang telah anda lakukan</string>
+    <string name="search_history_cleared" msgid="1536707558435227567">Riwayat pencarian dihapus.</string>
+    <string name="preferences_alerts_title" msgid="6636088008103904020">Notifikasi</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Getar"</string>
     <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Suara"</string>
-    <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Pemberitahuan munculan"</string>
-    <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Waktu pengingat default"</string>
-    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Waktu pengingat default"</string>
+    <string name="preferences_alerts_popup_title" msgid="6643468203670475296">Notifikasi munculan</string>
+    <string name="preferences_default_reminder_title" msgid="5188861433342733905">Waktu pengingat baku</string>
+    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">Waktu pengingat baku</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
-    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Gunakan zona waktu domestik"</string>
-    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Tampilkan kalender dan waktu acara dalam zona waktu domestik ketika melakukan perjalanan"</string>
-    <string name="preferences_home_tz_title" msgid="6680000444088818578">"Zona waktu domestik"</string>
+    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">Gunakan zona waktu domestik</string>
+    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">Tampilkan kalender dan waktu dalam zona waktu domestik saat bepergian</string>
+    <string name="preferences_home_tz_title" msgid="6680000444088818578">Zona waktu domestik</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Tampilkan angka minggu"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Tentang"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versi bentukan"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="other">+<xliff:g id="number">%d</xliff:g></item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Tidak ada acara kalender yang akan datang"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Eksperimental"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Pengingat"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Lewati Pengingat"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Lewati Pengingat"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Jam tenang"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Bisukan pengingat acara selama waktu tertentu."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Waktu mulai jam tenang"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Waktu akhir jam tenang"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Debugging"</string>
     <string name="copy_db" msgid="437691290566699292">"Kirim basis data"</string>
-    <string name="directory_searching_fmt" msgid="1232037509095606687">"Menelusuri <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+    <string name="directory_searching_fmt" msgid="1232037509095606687">Mencari <xliff:g id="domain">%s</xliff:g>…</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Hapus tamu"</string>
     <string name="accessibility_pick_start_date" msgid="3926641487042699037">"Tanggal mulai"</string>
     <string name="accessibility_pick_start_time" msgid="4913428100936555149">"Waktu mulai"</string>
-    <string name="accessibility_pick_end_date" msgid="5624250196618643922">"Tanggal akhir"</string>
-    <string name="accessibility_pick_end_time" msgid="7120310166355224941">"Waktu akhir"</string>
+    <string name="accessibility_pick_end_date" msgid="5624250196618643922">Tanggal selesai</string>
+    <string name="accessibility_pick_end_time" msgid="7120310166355224941">Waktu selesai</string>
     <string name="accessibility_pick_time_zone" msgid="7155465783500323811">"Zona waktu"</string>
-    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">"Acara yang diulang"</string>
-    <string name="accessibility_add_reminder" msgid="2267950744060950152">"Tambahkan pengingat"</string>
+    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">Acara berulang</string>
+    <string name="accessibility_add_reminder" msgid="2267950744060950152">Tambah pengingat</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Hapus pengingat"</string>
-    <string name="accessibility_add_attendee" msgid="5654014177472600916">"Tambahkan tamu"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sinkronkan kalender"</string>
+    <string name="accessibility_add_attendee" msgid="5654014177472600916">Tambah tamu</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Acara sepanjang hari"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Perulangan"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Waktu pengingat"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Jenis pengingat"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Tampilkan saya sebagai"</string>
-    <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privasi"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Pemberitahuan Kalender"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Tunda Pemberitahuan"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Kirim email ke tamu"</string>
+    <string name="accessibility_reminder_privacy" msgid="8669288484484022771">Pribadi</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Acara baru"</string>
-    <string name="template_announce_item_index" msgid="4067877800670753110">"Acara <xliff:g id="ITEM_INDEX">%1$s</xliff:g> dari <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 acara"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> acara"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 acara"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> acara"</item>
-  </plurals>
-    <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Acara terpilih"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"JANGAN dicentang -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Ulangi"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Jangan diulang"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"<xliff:g id="COUNT">%d</xliff:g> hari sekali"</item>
-    <item quantity="other" msgid="707566499994398250">"<xliff:g id="COUNT">%d</xliff:g> hari sekali"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"<xliff:g id="COUNT">%d</xliff:g> minggu sekali"</item>
-    <item quantity="other" msgid="7094801039989237061">"<xliff:g id="COUNT">%d</xliff:g> minggu sekali"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"<xliff:g id="COUNT">%d</xliff:g> bulan sekali"</item>
-    <item quantity="other" msgid="5419723710346646523">"<xliff:g id="COUNT">%d</xliff:g> bulan sekali"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"<xliff:g id="COUNT">%d</xliff:g> tahun sekali"</item>
-    <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g> tahun sekali"</item>
-  </plurals>
-    <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"bulanan-hari yg sama"</string>
+    <string name="template_announce_item_index" msgid="4067877800670753110">Acara <xliff:g id="item_index">%1$s</xliff:g> dari <xliff:g id="item_count">%2$s</xliff:g>.</string>
+    <plurals name="Nevents">
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> acara</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="other">+<xliff:g id="count">%d</xliff:g> acara</item>
+    </plurals>
+    <string name="acessibility_selected_marker_description" msgid="3010149843148810768">Acara yang dipilih</string>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="other">Setiap <xliff:g id="count">%d</xliff:g> hari</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="other">Setiap <xliff:g id="count">%d</xliff:g> minggu</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="other">Setiap <xliff:g id="count">%d</xliff:g> bulan</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="other">Setiap <xliff:g id="count">%d</xliff:g> tahun</item>
+    </plurals>
+    <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">hari yang sama setiap bulan</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Selamanya"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Sampai tanggal tertentu"</string>
-    <string name="recurrence_end_date" msgid="3693751578164711701">"Sampai <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="recurrence_end_count_label" msgid="1233883668293087977">"Untuk sejumlah acara"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Untuk <xliff:g id="EVENT_COUNT">%d</xliff:g> acara"</item>
-    <item quantity="other" msgid="8779598489398048259">"Untuk <xliff:g id="EVENT_COUNT">%d</xliff:g> acara"</item>
-  </plurals>
-    <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"ubah tanggal akhir"</string>
-    <string name="visibility_default">Default</string>
-  <string name="visibility_private">Pribadi</string>
-  <string name="visibility_public">Umum</string>
-    <string name="preferences_about_app">Kalender bercabang dari Etar-Calendar</string>
-    <string name="preferences_authors">Penulis</string>
-  <string name="preferences_source_code">Kode sumber</string>
-  <string name="preferences_licence">Lisensi</string>
-    <string name="preferences_privacy_policy">Kebijakan privasi</string>
-    <string name="preferences_service_terms">Ketentuan layanan</string>
-</resources>
+    <string name="recurrence_end_date" msgid="3693751578164711701">Sampai <xliff:g id="date">%s</xliff:g>
+    </string>
+    <string name="recurrence_end_count_label" msgid="1233883668293087977">Beberapa kali acara</string>
+    <plurals name="recurrence_end_count">
+        <item quantity="other">Sampai <xliff:g id="event_count">%d</xliff:g> acara</item>
+    </plurals>
+    <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">ubah tanggal selesai</string>
+    <string name="visibility_default">Bawaan</string>
+    <string name="visibility_private">Pribadi</string>
+    <string name="visibility_public">Publik</string>
+    <string name="goto_date">Kunjungi…</string>
+    <string name="rsvp_accepted">Merespons ya.</string>
+    <string name="rsvp_tentative">Merespons mungkin.</string>
+    <string name="rsvp_declined">Merespons tidak.</string>
+    <string name="preferences_theme">Tema</string>
+    <string name="preferences_light_theme">Terang</string>
+    <string name="preferences_dark_theme">Gelap</string>
+    <string name="preferences_black_theme">Hitam</string>
+    <string name="preferences_color">Warna Utama</string>
+    <string name="preferences_color_pick">Warna utama</string>
+    <string name="preferences_days_per_week_title">Hari per minggu</string>
+    <string name="preferences_days_per_week_dialog">Hari per minggu</string>
+    <string name="preferences_default_event_duration_title">Durasi baku acara</string>
+    <string name="preferences_issues">Laporkan masalah</string>
+    <string name="user_rejected_calendar_write_permission">Etar membutuhkan izin kalender agar bisa bekerja dengan baik. Silakan coba lagi.</string>
+    <string name="calendar_permission_not_granted">Maaf, fitur ini tidak bisa dilakukan. Etar membutuhkan izin kalender agar bisa bekerja dengan baik</string>
+    <string name="visibility_confidential">Rahasia</string>
+    <string name="zero_minutes">0 menit</string>
+    <string name="fifteen_minutes">15 menit</string>
+    <string name="thirty_minutes">30 menit</string>
+    <string name="one_hour">1 jam</string>
+    <string name="one_and_a_half_hours">1,5 jam</string>
+    <string name="two_hours">2 jam</string>
+    <string name="share_label">Bagikan</string>
+    <string name="no_map">Tidak ada aplikasi peta yang terpasang</string>
+    <string name="default_start_title">Tampilan baku</string>
+    <string name="default_start_last">Tampilan yang sebelumnya digunakan</string>
+    <string name="preferences_alerts_custom_snooze_delay_title">Tanyakan waktu tunda pengingat</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_on">Tanyakan waktu tunda setiap menunda pengingat</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_off">Selalu gunakan waktu tunda baku</string>
+    <string name="snooze_delay_dialog_title">Tetapkan waktu tunda</string>
+    <string name="preferences_default_snooze_delay_title">Waktu tunda baku</string>
+    <string name="preferences_default_snooze_delay_dialog">Waktu tunda baku</string>
+    <string name="error_generating_ics">Terjadi kesalahan saat berbagi acara</string>
+    <string name="cal_share_intent_title">Kirim acara ke:</string>
+    <string name="cal_export_event_sdcard_title">Ekspor ke kartu SD</string>
+    <string name="cal_export_succ_msg">Acara berhasil diekspor: %1s</string>
+    <string name="cal_import_menu_title">Impor acara</string>
+    <string name="cal_nothing_to_import">Tidak ada yang diimpor</string>
+    <string name="cal_import_error_msg">Gagal mengimpor ke kalender</string>
+    <string name="cal_import_error_date_msg">Tidak bisa validasi tanggal yang masukkan: %s</string>
+    <string name="cal_pick_ics">Pilih berkas untuk diimpor</string>
+    <string name="view_settings">Tampilkan pengaturan</string>
+    <string name="preferences_month_view_portrait">Tata letak tampilan bulan (Potret)</string>
+    <string name="preferences_month_view_landscape">Tata letak tampilan bulan (Lanskap)</string>
+    <string name="display_options">Detail tampilan</string>
+    <string name="display_time">Tampilkan waktu</string>
+    <string name="display_location">Tampilkan lokasi</string>
+    <string name="show_time_no">Jangan tampilkan waktu</string>
+    <string name="show_time_start">Hanya waktu mulai</string>
+    <string name="show_time_start_end">Waktu mulai dan selesai</string>
+    <string name="show_time_start_end_below">Waktu mulai dan selesai di bawah acara</string>
+    <string name="maximum_number_of_lines">Jumlah baris maks. acara</string>
+    <string name="cal_import_error_time_zone_msg">Tidak bisa memvalidasi zona waktu yang diimpor: %s</string>
+    <string name="preferences_calendar_account">%1$s akun</string>
+    <string name="preferences_calendar_delete">Hapus kalender</string>
+    <string name="preferences_calendar_display_name">Ubah nama</string>
+    <string name="preferences_calendar_color">Warna</string>
+    <string name="preferences_calendar_visible">Tampilkan acara</string>
+    <string name="preferences_calendar_synchronize">Sinkronkan kalender ini</string>
+    <string name="preferences_list_calendar_summary_sync_off">Tidak disinkronisasi</string>
+    <string name="preferences_list_calendar_summary_invisible">Acara tidak ditampilkan</string>
+    <string name="preferences_list_general">Pengaturan umum</string>
+    <string name="preferences_list_add_remote">Tambah kalender (CalDav)</string>
+    <string name="preferences_list_add_offline">Tambah kalender luring</string>
+    <string name="preferences_list_add_offline_title">Tambah kalender luring</string>
+    <string name="preferences_list_add_offline_error_empty">Masukkan nama kalender!</string>
+    <string name="preferences_list_add_offline_message">Kalender luring TIDAK disinkronkan ke layanan cloud dan hanya tersedia pada perangkat anda.</string>
+    <string name="preferences_list_add_offline_button">Tambah kalender</string>
+    <string name="preferences_list_add_offline_name">Nama</string>
+    <string name="preferences_list_add_offline_cancel">Batal</string>
+    <string name="preferences_calendar_color_warning_title">Peringatan</string>
+    <string name="preferences_calendar_color_warning_message">Perubahan warna mungkin akan disetel ulang saat kalender disinkronkan lagi.
+\n
+\nDi DAVx⁵ \'Kelola warna kalender\' bisa dinonaktifkan untuk mencegah hal ini.</string>
+    <string name="preferences_calendar_color_warning_button">Saya mengerti</string>
+    <string name="preferences_calendar_delete_message">Apakah anda benar-benar ingin menghapus kalender ini\?</string>
+    <string name="preferences_calendar_delete_delete">Hapus kalender</string>
+    <string name="preferences_calendar_delete_cancel">Batal</string>
+    <string name="preferences_menu_about">Tentang Etar</string>
+    <string name="offline_account_name">Kalender Luring</string>
+    <string name="authors">Pengembang</string>
+    <string name="changelog">Catatan perubahan</string>
+    <string name="license">Lisensi</string>
+    <string name="source_code">Sumber</string>
+    <string name="menu_about_preferences">Kalender tentang</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 8e3dcacdc814da05616cc997fd0a8e5c6f9008ce..b10b02993bdfb1b3f09af75f7b55006635b41aea 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Disponibile"</item>
     <item msgid="2064426942462573474">"Tentativo"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"primo"</item>
-    <item msgid="5631923029483854900">"secondo"</item>
-    <item msgid="148935502975250973">"terzo"</item>
-    <item msgid="5124200797326669172">"quarto"</item>
-    <item msgid="7564374178324652137">"ultimo"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Nessuna risposta"</item>
     <item msgid="3724434080904437698">"Sì"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Questo e gli eventi futuri"</item>
     <item msgid="7833229563617435430">"Tutti gli eventi"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Questo e gli eventi futuri"</item>
-    <item msgid="6315440193748139854">"Tutti gli eventi"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Solo questo evento"</item>
     <item msgid="140670561403965380">"Tutti gli eventi nella serie"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0412d12d1484733f57cf0ac3c1da4667ec72e47a..0d00cf234b677f6dc1886301cf11fcede737b523 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -21,9 +21,11 @@
     <string name="attendees_label" msgid="2971281641565729725">"Invitati"</string>
     <string name="today" msgid="8577375020252453006">"Oggi"</string>
     <string name="tomorrow" msgid="614434811813859237">"Domani"</string>
-    <string name="today_at_time_fmt" msgid="1981279213130049736">Oggi alle <xliff:g id="time_interval">%s</xliff:g></string>
-    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">Domani alle <xliff:g id="time_interval">%s</xliff:g></string>
-    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g></string>
+    <string name="today_at_time_fmt" msgid="1981279213130049736">"Oggi alle <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Domani alle <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Ripetizione"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Senza titolo)"</string>
     <plurals name="Nminutes">
@@ -31,8 +33,8 @@
         <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minuti"</item>
     </plurals>
     <plurals name="Nmins">
-        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+        <item quantity="one">1 minuto</item>
+        <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> minuti</item>
     </plurals>
     <plurals name="Nhours">
         <item quantity="one" msgid="4793697728599296830">"1 ora"</item>
@@ -43,8 +45,8 @@
         <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> giorni"</item>
     </plurals>
     <plurals name="weekN">
-        <item quantity="one">settimana <xliff:g id="count">%d</xliff:g></item>
-        <item quantity="other">settimane <xliff:g id="count">%d</xliff:g></item>
+        <item quantity="one">settimana <xliff:g id="COUNT">%d</xliff:g></item>
+        <item quantity="other">settimana <xliff:g id="COUNT">%d</xliff:g></item>
     </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Aggiorna"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Mostra giorno"</string>
@@ -54,27 +56,20 @@
     <string name="month_view" msgid="7287101431749285412">"Mese"</string>
     <string name="event_view" msgid="7621353079385122317">"Visualizza evento"</string>
     <string name="event_create" msgid="6941040556709110617">"Nuovo evento"</string>
-    <string name="event_edit" msgid="4006961928830064662">Modifica evento</string>
+    <string name="event_edit" msgid="4006961928830064662">"Modifica  evento"</string>
     <string name="event_delete" msgid="2386667193277770442">"Elimina evento"</string>
     <string name="goto_today" msgid="9162136434410891230">"Oggi"</string>
     <string name="goto_date">"Vai al…"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Impostazioni"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Calendari da visualizzare"</string>
     <string name="search" msgid="550656004486017426">"Cerca"</string>
     <string name="hide_controls" msgid="830320505938520882">"Nascondi controlli"</string>
     <string name="show_controls" msgid="715520586028062621">"Mostra controlli"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Calendari da visualizzare"</string>
-    <string name="synced" msgid="7913940305983383493">sincronizzato</string>
-    <string name="not_synced" msgid="4275114941801829419">non sincronizzato</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"L\'account non viene sincronizzato quindi i calendari potrebbero non essere aggiornati."</string>
-    <string name="accounts" msgid="849401841083180306">"Account e sincronizzazione"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Calendari da sincronizzare"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Calendari da sincronizzare"</string>
     <string name="hint_what" msgid="709155115005044531">"Nome evento"</string>
     <string name="hint_where" msgid="4972598001033801974">"Luogo"</string>
     <string name="hint_description" msgid="1910143586169033232">"Descrizione"</string>
     <string name="hint_attendees" msgid="1650488163176888480">"Invitati"</string>
-    <string name="creating_event" msgid="7516249252554059980">"Evento creato"</string>
+    <string name="creating_event" msgid="7516249252554059980">Evento creato.</string>
     <string name="saving_event" msgid="7694181017411177226">"Evento salvato."</string>
     <string name="empty_event" msgid="9018699257414338634">"Evento vuoto non creato."</string>
     <string name="creating_event_with_guest" msgid="5758688413124191931">"Gli inviti verranno inviati."</string>
@@ -90,14 +85,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Da"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Tutto il giorno"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Calendario"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Mostra tutto"</string>
     <string name="description_label" msgid="7193475046717505855">"Descrizione"</string>
     <string name="presence_label" msgid="6169724148441175862">"Imposta il mio stato su"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privacy"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Aggiungi promemoria"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Nessun calendario"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Prima di poter aggiungere un evento, devi aggiungere almeno un account Calendar al dispositivo e impostare un calendario come visibile. Tocca Aggiungi account per aggiungere un account (se hai appena aggiunto un account, attendi che venga completata la sincronizzazione e riprova). In alternativa, tocca Annulla e assicurati che sia visibile almeno un calendario."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"L\'applicazione Calendario funziona meglio con un account."\n\n"• Puoi accedervi da qualsiasi browser web"\n"• Effettua il backup dei tuoi eventi in modo sicuro"</string>
     <string name="add_account" msgid="1669072099756774952">"Aggiungi account"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Calendario:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Agenda:"</string>
@@ -118,7 +111,6 @@
     <string name="call_label" msgid="2960328220008869083">"Chiama"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Risposte rapide"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Modifica risposte predefinite in caso di email agli invitati"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Modifica risposte rapide"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Risposta rapida"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Scegli risposta rapida"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Reperimento di un programma di posta elettronica non riuscito"</string>
@@ -134,7 +126,7 @@
     <string name="agenda_today" msgid="5965841338467422191">"oggi, <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="agenda_yesterday" msgid="4170964206728599693">"ieri, <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="agenda_tomorrow" msgid="3893625470780723605">"domani, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="loading" msgid="3772533493214331230">Sto caricando…</string>
+    <string name="loading" msgid="3772533493214331230">Caricamento…</string>
     <string name="show_older_events" msgid="5140647493681439926">"Tocca per visualizzare eventi precedenti a: <xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
     <string name="show_newer_events" msgid="2604638815440163080">"Tocca per visualizzare eventi successivi a: <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
     <string name="search_title" msgid="8898015280250716254">"Cerca nei miei calendari"</string>
@@ -143,7 +135,6 @@
     <string name="delete_label" msgid="874742811918030739">"Elimina"</string>
     <string name="save_label" msgid="2133599104834432589">"Salva"</string>
     <string name="discard_label" msgid="2394623883289782541">"Annulla"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Posticipa tutto"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Ignora tutto"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Posticipa"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Evento occasionale"</string>
@@ -163,8 +154,6 @@
     </plurals>
     <string name="monthly" msgid="4587116285383048586">"Ogni mese"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Ogni anno"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Ogni mese (il <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Ogni anno (il <xliff:g id="DATES">%s</xliff:g>)"</string>
     <string name="custom" product="default" msgid="4137468716966004993">"Personalizzato (impossibile personalizzare sul telefono)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Modifica solo questo evento"</string>
     <string name="modify_all" msgid="4421657265864209041">"Modifica tutti gli eventi nella serie"</string>
@@ -201,26 +190,18 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Mostra calendari e orari nel fuso orario di casa quando sono in viaggio"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Fuso orario di casa"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostra numero settimana"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Informazioni"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versione build"</string>
     <string name="preferences_issues">Segnala problemi</string>
-    <string name="gadget_title" msgid="939918875331310945">"Calendario"</string>
     <plurals name="month_more_events">
         <item quantity="one" msgid="8971334808414201327">"+1"</item>
         <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
     </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Nessun evento di calendario imminente"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Sperimentali"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Promemoria"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Salta promemoria"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Salta promemoria"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Orari disattivazione audio"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Disattiva audio promemoria eventi durante orario specificato."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Inizio orari disatt. audio"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Fine orari disattiv. audio"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Debug"</string>
     <string name="copy_db" msgid="437691290566699292">"Invia database"</string>
-    <string name="directory_searching_fmt" msgid="1232037509095606687">"Ricerca in <xliff:g id="DOMAIN">%s</xliff:g> in corso..."</string>
+    <string name="directory_searching_fmt" msgid="1232037509095606687">Cercando <xliff:g id="domain">%s</xliff:g>…</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Rimuovi partecipante"</string>
     <string name="accessibility_pick_start_date" msgid="3926641487042699037">"Data inizio"</string>
     <string name="accessibility_pick_start_time" msgid="4913428100936555149">"Ora di inizio"</string>
@@ -231,16 +212,11 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Aggiungi promemoria"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Rimuovi il promemoria"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Aggiungi partecipante"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sincronizza calendario"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Evento di una giornata"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Ripetizione"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Orario promemoria"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Tipo di promemoria"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Imposta il mio stato su"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privacy"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Notifica calendario"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Posticipa notifica"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Invia email a ospiti"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Nuovo evento"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Evento <xliff:g id="ITEM_INDEX">%1$s</xliff:g> di <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
     <plurals name="Nevents">
@@ -252,24 +228,21 @@
         <item quantity="other" msgid="3609243840882275136">"Altri <xliff:g id="COUNT">%d</xliff:g> eventi"</item>
     </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Evento selezionato"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NON controllare -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Ripeti"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Nessuna ripetizione"</string>
     <plurals name="recurrence_interval_daily">
-        <item quantity="one" msgid="1205422710088692631">"Ogni <xliff:g id="COUNT">%d</xliff:g> giorni"</item>
-        <item quantity="other" msgid="707566499994398250">"Ogni <xliff:g id="COUNT">%d</xliff:g> giorni"</item>
+        <item quantity="one">Ogni <xliff:g id="count">%d</xliff:g> giorno</item>
+        <item quantity="other">Ogni <xliff:g id="COUNT">%d</xliff:g> giorni</item>
     </plurals>
     <plurals name="recurrence_interval_weekly">
         <item quantity="one" msgid="4948681635464488351">"Ogni <xliff:g id="COUNT">%d</xliff:g> settimana"</item>
         <item quantity="other" msgid="7094801039989237061">"Ogni <xliff:g id="COUNT">%d</xliff:g> settimane"</item>
     </plurals>
     <plurals name="recurrence_interval_monthly">
-        <item quantity="one" msgid="4768178401603139718">"Ogni <xliff:g id="COUNT">%d</xliff:g> mesi"</item>
-        <item quantity="other" msgid="5419723710346646523">"Ogni <xliff:g id="COUNT">%d</xliff:g> mesi"</item>
+        <item quantity="one">Ogni <xliff:g id="COUNT">%d</xliff:g> mese</item>
+        <item quantity="other">Ogni <xliff:g id="COUNT">%d</xliff:g> mesi</item>
     </plurals>
     <plurals name="recurrence_interval_yearly">
-        <item quantity="one" msgid="5819562634008179102">"Ogni <xliff:g id="COUNT">%d</xliff:g> anni"</item>
-        <item quantity="other" msgid="5678653649746562060">"Ogni <xliff:g id="COUNT">%d</xliff:g> anni"</item>
+        <item quantity="one">Ogni <xliff:g id="COUNT">%d</xliff:g> anno</item>
+        <item quantity="other">Ogni <xliff:g id="COUNT">%d</xliff:g> anni</item>
     </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"lo stesso giorno ogni mese"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Sempre"</string>
@@ -307,7 +280,7 @@
     <string name="preferences_color">Colore Principale</string>
     <string name="preferences_color_pick">Colore principale</string>
     <string name="default_start_title">Vista predefinita</string>
-    <string name="view_details">Vedi Dettagli</string>
+    <string name="display_options">Vedi Dettagli</string>
     <string name="display_time">Mostra Ora</string>
     <string name="display_location">Mostra Luogo</string>
     <string name="default_start_last">Vista utilizzata in precedenza</string>
@@ -336,4 +309,15 @@
     <string name="foreground_notification_channel_name">Sincronizza Allarme</string>
     <string name="foreground_notification_channel_description">Notifica in primo piano richiesta per la sincronizzazione dell\'allarme interna. Per favore silenziala</string>
     <string name="cal_import_error_time_zone_msg">Non sono in grado di capire il fuso orario: %s</string>
+    <string name="preferences_calendar_color">Colore</string>
+    <string name="preferences_calendar_synchronize">Sincronizza questo calendario</string>
+    <string name="preferences_list_calendar_summary_sync_off">Non sincronizzato</string>
+    <string name="preferences_list_general">Impostazioni generali</string>
+    <string name="preferences_list_add_remote">Aggiungi calendario remoto (CalDAV)</string>
+    <string name="preferences_list_add_offline">Aggiungi calendario offline</string>
+    <string name="offline_account_name">Calendario offline</string>
+    <string name="authors">Autori</string>
+    <string name="changelog"></string>
+    <string name="license">Licenza</string>
+    <string name="source_code">Codice sorgente</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 63195c861bf50ef5e5fae10d173545af912a3a75..44a5ced1f5ccdb74134823785744a9caab7c32dd 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"זמין"</item>
     <item msgid="2064426942462573474">"לא סופי"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"ראשון"</item>
-    <item msgid="5631923029483854900">"שני"</item>
-    <item msgid="148935502975250973">"שלישי"</item>
-    <item msgid="5124200797326669172">"רביעי"</item>
-    <item msgid="7564374178324652137">"אחרון"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"אין תגובה"</item>
     <item msgid="3724434080904437698">"כן"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"אירוע זה ואירועים עתידיים"</item>
     <item msgid="7833229563617435430">"כל האירועים"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"אירוע זה ואירועים עתידיים"</item>
-    <item msgid="6315440193748139854">"כל האירועים"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"אירוע זה בלבד"</item>
     <item msgid="140670561403965380">"כל האירועים בסדרה"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4f3ee1962cb1f07f342042fed369fa483f4fc969..875a0e851a86e9ecacc00d2ab0eab0ca229a1521 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,11 +12,8 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="5452708708398908131">"יומן"</string>
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="5452708708398908131">לוח שנה</string>
     <string name="what_label" msgid="1933578391985810049">"מה"</string>
     <string name="where_label" msgid="3472482206065595118">"היכן"</string>
     <string name="when_label" msgid="894636567327261599">"מתי"</string>
@@ -24,53 +21,75 @@
     <string name="attendees_label" msgid="2971281641565729725">"אורחים"</string>
     <string name="today" msgid="8577375020252453006">"היום"</string>
     <string name="tomorrow" msgid="614434811813859237">"מחר"</string>
-    <string name="today_at_time_fmt" msgid="1981279213130049736">"היום ב-<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"מחר ב-<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="today_at_time_fmt" msgid="1981279213130049736">היום ב־<xliff:g id="time_interval">%s</xliff:g>
+    </string>
+    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">מחר ב־<xliff:g id="time_interval">%s</xliff:g>
+    </string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"חזרה"</string>
     <string name="no_title_label" msgid="302177118061368042">"(אין כותרת)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"דקה אחת"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> דקות"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"דקה אחת"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> דקות"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"שעה אחת"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> שעות"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"יום אחד"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> ימים"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"שבוע <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-    <string name="calendar_refresh" msgid="6172731193680500025">"רענן"</string>
-    <string name="show_day_view" msgid="5782512782605466016">"הצג יום"</string>
+    <plurals name="Nminutes">
+        <item quantity="one">This is the label for a 1-minute reminder.1 דקה</item>
+        <item quantity="two">
+            <xliff:g id="COUNT">%d</xliff:g> דקות</item>
+        <item quantity="many">
+            <xliff:g id="COUNT">%d</xliff:g> דקות</item>
+        <item quantity="other">
+            <xliff:g id="COUNT">%d</xliff:g> דקות</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one">דקה אחת</item>
+        <item quantity="two">
+            <xliff:g id="COUNT">%d</xliff:g> דקות</item>
+        <item quantity="many">
+            <xliff:g id="COUNT">%d</xliff:g> דקות</item>
+        <item quantity="other">
+            <xliff:g id="COUNT">%d</xliff:g> דקות</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one">שעה אחת</item>
+        <item quantity="two">שעתיים</item>
+        <item quantity="many">
+            <xliff:g id="COUNT">%d</xliff:g> שעות</item>
+        <item quantity="other">
+            <xliff:g id="COUNT">%d</xliff:g> שעות</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one">יום אחד</item>
+        <item quantity="two">יומיים</item>
+        <item quantity="many">
+            <xliff:g id="COUNT">%d</xliff:g> ימים</item>
+        <item quantity="other">
+            <xliff:g id="COUNT">%d</xliff:g> ימים</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="one">שבוע <xliff:g id="count">%d</xliff:g>
+        </item>
+        <item quantity="two">שבוע <xliff:g id="count">%d</xliff:g>
+        </item>
+        <item quantity="many">שבוע <xliff:g id="count">%d</xliff:g>
+        </item>
+        <item quantity="other">שבוע <xliff:g id="count">%d</xliff:g>
+        </item>
+    </plurals>
+    <string name="calendar_refresh" msgid="6172731193680500025">רענן</string>
+    <string name="show_day_view" msgid="5782512782605466016">הצג יום</string>
     <string name="agenda_view" msgid="5566084759423843245">"סדר יום"</string>
     <string name="day_view" msgid="4467754504843584437">"יום"</string>
     <string name="week_view" msgid="6775043022159508060">"שבוע"</string>
     <string name="month_view" msgid="7287101431749285412">"חודש"</string>
-    <string name="event_view" msgid="7621353079385122317">"הצג אירוע"</string>
+    <string name="event_view" msgid="7621353079385122317">הצג אירוע</string>
     <string name="event_create" msgid="6941040556709110617">"אירוע חדש"</string>
-    <string name="event_edit" msgid="4006961928830064662">"ערוך אירוע"</string>
-    <string name="event_delete" msgid="2386667193277770442">"מחק אירוע"</string>
+    <string name="event_edit" msgid="4006961928830064662">ערוך אירוע</string>
+    <string name="event_delete" msgid="2386667193277770442">מחק אירוע</string>
     <string name="goto_today" msgid="9162136434410891230">"היום"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"הגדרות"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"יומנים להצגה"</string>
-    <string name="search" msgid="550656004486017426">"חפש"</string>
-    <string name="hide_controls" msgid="830320505938520882">"הסתר פקדים"</string>
-    <string name="show_controls" msgid="715520586028062621">"הצג פקדים"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"לוחות שנה להצגה"</string>
-    <string name="synced" msgid="7913940305983383493">"מסונכרן"</string>
-    <string name="not_synced" msgid="4275114941801829419">"לא מסונכרן"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"חשבון זה אינו מסונכרן כך שייתכן שלוחות השנה שלך אינם מעודכנים."</string>
-    <string name="accounts" msgid="849401841083180306">"חשבונות וסינכרון"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"לוחות שנה לסינכרון"</string>
-    <string name="select_synced_calendars_button" msgid="8890542984949996251">"יומנים לסינכרון"</string>
+    <string name="search" msgid="550656004486017426">חפש</string>
+    <string name="hide_controls" msgid="830320505938520882">הסתר פקדים</string>
+    <string name="show_controls" msgid="715520586028062621">הצג פקדים</string>
+    <string name="select_synced_calendars_button" msgid="8890542984949996251">לוחות שנה לסנכרון</string>
     <string name="hint_what" msgid="709155115005044531">"שם אירוע"</string>
     <string name="hint_where" msgid="4972598001033801974">"מיקום"</string>
     <string name="hint_description" msgid="1910143586169033232">"תיאור"</string>
@@ -78,92 +97,101 @@
     <string name="creating_event" msgid="7516249252554059980">"האירוע נוצר."</string>
     <string name="saving_event" msgid="7694181017411177226">"האירוע נשמר."</string>
     <string name="empty_event" msgid="9018699257414338634">"האירוע הריק לא נוצר."</string>
-    <string name="creating_event_with_guest" msgid="5758688413124191931">"הזמנות יישלחו."</string>
+    <string name="creating_event_with_guest" msgid="5758688413124191931">הזמנות תישלחנה.</string>
     <string name="saving_event_with_guest" msgid="9184584438475689577">"עדכונים יישלחו."</string>
-    <string name="create_event_dialog_save" msgid="1080859798521717414">"שמור"</string>
-    <string name="alert_title" msgid="7869592820853066853">"התראות של יומן"</string>
-    <string name="event_info_title" msgid="56024222340421620">"הצג אירוע"</string>
+    <string name="create_event_dialog_save" msgid="1080859798521717414">שמירה</string>
+    <string name="alert_title" msgid="7869592820853066853">התראות של לוח שנה</string>
+    <string name="event_info_title" msgid="56024222340421620">הצגת אירוע</string>
     <string name="event_info_title_invite" msgid="9160326363769403865">"הזמנה לפגישה"</string>
     <string name="edit_event_to_label" msgid="795012981218062421">"עד"</string>
-    <string name="edit_event_from_label" msgid="174999102612666115">"מ:"</string>
+    <string name="edit_event_from_label" msgid="174999102612666115">מ־</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"כל היום"</string>
-    <string name="edit_event_calendar_label" msgid="4556498359505856900">"יומן"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"הצג הכל"</string>
+    <string name="edit_event_calendar_label" msgid="4556498359505856900">לוח שנה</string>
     <string name="description_label" msgid="7193475046717505855">"תיאור"</string>
-    <string name="presence_label" msgid="6169724148441175862">"הצג אותי כ"</string>
+    <string name="presence_label" msgid="6169724148441175862">להציג אותי בתור</string>
     <string name="privacy_label" msgid="9215031965259597335">"פרטיות"</string>
-    <string name="reminders_label" msgid="7292389181815525676">"הוסף תזכורת"</string>
+    <string name="reminders_label" msgid="7292389181815525676">הוספת תזכורת</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"אין לוחות שנה"</string>
-    <string name="no_calendars_found" msgid="8968682716053492187">"לפני שתוכל להוסיף אירוע, עליך להוסיף למכשיר לפחות חשבון \'יומן Google\' אחד ולהגדיר לוח שנה אחד כגלוי. גע באפשרות \'הוסף חשבון\' כדי להוסיף חשבון (אם זה עתה הוספת חשבון, המתן להשלמת תהליך הסינכרון שלו ונסה שוב). לחלופין, גע באפשרות \'ביטול\' וודא שלפחות לוח שנה אחד מוגדר כגלוי."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"\'יומן Google\' עובד טוב יותר עם חשבון Google‏."\n\n"• גישה מכל דפדפן אינטרנט"\n"• גיבוי האירועים באופן מאובטח"</string>
-    <string name="add_account" msgid="1669072099756774952">"הוסף חשבון"</string>
-    <string name="view_event_calendar_label" msgid="6126231656338241140">"יומן:"</string>
-    <string name="view_event_organizer_label" msgid="2753151795647402277">"מארגן:"</string>
-    <string name="choose_event_color_label" msgid="2192923501857428854">"בחר צבע אירוע"</string>
+    <string name="no_calendars_found" msgid="8968682716053492187">לפני שיתאפשר לך להוסיף אירוע, עליך להוסיף חשבון לוח שנה אחד לפחות למכשיר שלך ושלוח השנה הזה יהיה גלוי. יש לגעת בהוספת חשבון כדי להוסיף חשבון (אם הרגע הוספת חשבון, יש להמתין לסיום סנכרונו ואז לנסות שוב. לחלופין, לגעת בביטול ולוודא שלפחות לוח שנה אחד זמין.</string>
+    <string name="add_account" msgid="1669072099756774952">הוספת חשבון</string>
+    <string name="view_event_calendar_label" msgid="6126231656338241140">לוח שנה:</string>
+    <string name="view_event_organizer_label" msgid="2753151795647402277">ארגון:</string>
+    <string name="choose_event_color_label" msgid="2192923501857428854">בחירת צבע אירוע</string>
     <string name="event_color_picker_dialog_title" msgid="4631938661655159511">"צבע אירוע"</string>
-    <string name="event_color_set_to_default" msgid="3447218820785647967">"הגדר כצבע ברירת המחדל של לוח השנה"</string>
+    <string name="event_color_set_to_default" msgid="3447218820785647967">הגדרה כצבע בררת המחדל של לוח השנה</string>
     <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">"צבע לוח שנה"</string>
     <string name="calendar_square_color_picker_description" msgid="7430468363525563483">"בוחר צבעים"</string>
     <string name="view_event_response_label" msgid="8382281658458798329">"משתתף?"</string>
     <string name="response_yes" msgid="2027484304899988350">"כן"</string>
     <string name="response_maybe" msgid="7791500973627841695">"אולי"</string>
     <string name="response_no" msgid="561911691884148136">"לא"</string>
-    <string name="email_guests_label" msgid="8772030932155305903">"שלח דוא\"ל לאורחים"</string>
-    <string name="email_organizer_label" msgid="7178059542798074813">"שלח דוא\"ל למארגן"</string>
-    <string name="email_picker_label" msgid="4808253965057791781">"שלח הודעת דוא\"ל באמצעות"</string>
+    <string name="email_guests_label" msgid="8772030932155305903">שליחת דוא״ל לאורחים</string>
+    <string name="email_organizer_label" msgid="7178059542798074813">שליחת דוא״ל לגוף המארגן</string>
+    <string name="email_picker_label" msgid="4808253965057791781">שליחת דוא״ל באמצעות</string>
     <string name="event_not_found" msgid="8356864185947582727">"האירוע לא נמצא."</string>
     <string name="map_label" msgid="8795383535586556038">"מפה"</string>
     <string name="call_label" msgid="2960328220008869083">"שיחה"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"תגובות מהירות"</string>
-    <string name="quick_response_settings_summary" msgid="7878304729027355604">"ערוך תגובות ברירת מחדל בעת שליחת דוא\"ל לאורחים"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"ערוך תגובות מהירות"</string>
+    <string name="quick_response_settings_summary" msgid="7878304729027355604">עריכת תגובות בררת מחדל בדוא״ל שיישלח לאורחים</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"תגובה מהירה"</string>
-    <string name="quick_response_dialog_title" msgid="2681309456412199207">"בחר תגובה מהירה"</string>
-    <string name="quick_response_email_failed" msgid="5544066405231853245">"חיפוש תוכנית דוא\"ל נכשל"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"אאחר רק בכמה דקות."</item>
-    <item msgid="6215158751728689832">"אגיע בערך עוד 10 דקות."</item>
-    <item msgid="4485794001743679338">"תתחילו בלעדי."</item>
-    <item msgid="8036557974294987511">"סליחה, לא אצליח להגיע. נצטרך לקבוע מועד חדש."</item>
-  </string-array>
-    <string name="quick_response_custom_msg" msgid="8792374208224108798">"כתוב אחת משלך…"</string>
-    <string name="event_info_organizer" msgid="9138683335394832629">"מארגן:"</string>
+    <string name="quick_response_dialog_title" msgid="2681309456412199207">בחירת תגובה מהירה</string>
+    <string name="quick_response_email_failed" msgid="5544066405231853245">איתור תכנית דוא״ל נכשל</string>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"אאחר רק בכמה דקות."</item>
+        <item msgid="6215158751728689832">"אגיע בערך עוד 10 דקות."</item>
+        <item msgid="4485794001743679338">"תתחילו בלעדי."</item>
+        <item msgid="8036557974294987511">"סליחה, לא אצליח להגיע. נצטרך לקבוע מועד חדש."</item>
+    </string-array>
+    <string name="quick_response_custom_msg" msgid="8792374208224108798">יצירת תגובה משלך…</string>
+    <string name="event_info_organizer" msgid="9138683335394832629">ארגון:</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"תזכורות"</string>
-    <string name="agenda_today" msgid="5965841338467422191">"היום, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="agenda_yesterday" msgid="4170964206728599693">"אתמול, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="agenda_tomorrow" msgid="3893625470780723605">"מחר, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="loading" msgid="3772533493214331230">"טוען..."</string>
-    <string name="show_older_events" msgid="5140647493681439926">"גע כדי להציג אירועים לפני <xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
-    <string name="show_newer_events" msgid="2604638815440163080">"גע כדי להציג אירועים אחרי <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
-    <string name="search_title" msgid="8898015280250716254">"חפש ביומנים שלי"</string>
+    <string name="agenda_today" msgid="5965841338467422191">היום, <xliff:g id="date">%1$s</xliff:g>
+    </string>
+    <string name="agenda_yesterday" msgid="4170964206728599693">אתמול, <xliff:g id="date">%1$s</xliff:g>
+    </string>
+    <string name="agenda_tomorrow" msgid="3893625470780723605">מחר, <xliff:g id="date">%1$s</xliff:g>
+    </string>
+    <string name="loading" msgid="3772533493214331230">בטעינה…</string>
+    <string name="show_older_events" msgid="5140647493681439926">יש לגעת כדי להציג אירועים לפני <xliff:g id="oldest_search_range">%1$s</xliff:g>
+    </string>
+    <string name="show_newer_events" msgid="2604638815440163080">יש לגעת כדי להציג אירועים אחרי <xliff:g id="newest_search_range">%1$s</xliff:g>
+    </string>
+    <string name="search_title" msgid="8898015280250716254">חיפוש בלוחות השנה שלי</string>
     <string name="edit_event_label" msgid="7413222956349977161">"פרטים"</string>
     <string name="edit_label" msgid="8934331258435656534">"ערוך"</string>
     <string name="delete_label" msgid="874742811918030739">"מחק"</string>
     <string name="save_label" msgid="2133599104834432589">"סיום"</string>
     <string name="discard_label" msgid="2394623883289782541">"ביטול"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"נדנד על הכל"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"דחה הכל"</string>
     <string name="snooze_label" msgid="1515893621063224666">"נודניק"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"אירוע חד-פעמי"</string>
     <string name="endByDate" msgid="7654221304929538201">"; עד <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; פעם אחת"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> פעמים"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"יומי"</item>
-    <item quantity="other" msgid="5455230727715859264">"כל <xliff:g id="NUMBER">%d</xliff:g> ימים"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one">; פעם אחת</item>
+        <item quantity="two">; for <xliff:g id="number">%d</xliff:g> פעמים</item>
+        <item quantity="many">; for <xliff:g id="number">%d</xliff:g> פעמים</item>
+        <item quantity="other">; for <xliff:g id="number">%d</xliff:g> פעמים</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one">יומי</item>
+        <item quantity="two">כל <xliff:g id="number">יומיים</xliff:g>
+        </item>
+        <item quantity="many">כל <xliff:g id="number">%d</xliff:g> ימים</item>
+        <item quantity="other">כל <xliff:g id="number">%d</xliff:g> ימים</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"כל יום חול (ראשון-חמישי)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"שבועי ביום <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"כל <xliff:g id="NUMBER">%1$d</xliff:g> שבועות ביום <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one">פעם בשבוע ב<xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+        <item quantity="two">כל <xliff:g id="number">שבועיים</xliff:g> ב<xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+        <item quantity="many">כל <xliff:g id="number">%1$d</xliff:g> שבועות ב<xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+        <item quantity="other">כל <xliff:g id="number">%1$d</xliff:g> שבועות ב<xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"כל חודש"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"כל שנה"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"מדי חודש (ביום <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"מדי שנה (בתאריכים <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"מותאם אישית (לא ניתן לבצע התאמה אישית בטלפון)"</string>
     <string name="modify_event" msgid="5982876409997142690">"שנה אירוע זה בלבד"</string>
     <string name="modify_all" msgid="4421657265864209041">"שנה את כל האירועים בסדרה"</string>
@@ -188,86 +216,98 @@
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"רטט"</string>
     <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"צליל"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"התראה קופצת"</string>
-    <string name="preferences_default_reminder_title" msgid="5188861433342733905">"ברירת מחדל של מועד תזכורת"</string>
-    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"ברירת מחדל של מועד תזכורת"</string>
+    <string name="preferences_default_reminder_title" msgid="5188861433342733905">בררת מחדל של מועד תזכורת</string>
+    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">בררת מחדל של מועד תזכורת</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
-    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"השתמש באזור הזמן המקומי"</string>
+    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">להשתמש באזור הזמן המקומי</string>
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"מציג לוחות שנה ושעות אירועים באזור הזמן המקומי שלך בנסיעות"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"אזור זמן מקומי"</string>
-    <string name="preferences_show_week_num_title" msgid="5280734329664503461">"הצג מספר שבוע"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"מידע על"</string>
+    <string name="preferences_show_week_num_title" msgid="5280734329664503461">הצגת מספר שבוע</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"גרסת Build"</string>
-    <string name="gadget_title" msgid="939918875331310945">"יומן"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one">‎+1</item>
+        <item quantity="two">‎+<xliff:g id="number">%d</xliff:g>
+        </item>
+        <item quantity="many">‎+<xliff:g id="number">%d</xliff:g>
+        </item>
+        <item quantity="other">‎+<xliff:g id="number">%d</xliff:g>
+        </item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"אין אירועים צפויים בלוח השנה"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"ניסיוני"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"תזכורות"</string>
-    <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"דלג על תזכורות"</string>
-    <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"דלג על תזכורות"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"שעות שקטות"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"השתק תזכורות לאירועים למשך פרק זמן שצוין."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"זמן התחלה של שעות שקטות"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"זמן הסיום של שעות שקטות"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"ניקוי באגים"</string>
-    <string name="copy_db" msgid="437691290566699292">"שלח מסד נתונים"</string>
-    <string name="directory_searching_fmt" msgid="1232037509095606687">"מחפש את <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
-    <string name="accessibility_remove_attendee" msgid="7082751172654698863">"הסר משתתף"</string>
+    <string name="preferences_reminders_responded_label" msgid="1196570678238475838">דילוג על תזכורות</string>
+    <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">דילוג על תזכורות</string>
+    <string name="copy_db" msgid="437691290566699292">שליחת מסד נתונים</string>
+    <string name="directory_searching_fmt" msgid="1232037509095606687">בחיפוש אחר <xliff:g id="domain">%s</xliff:g>…</string>
+    <string name="accessibility_remove_attendee" msgid="7082751172654698863">הסרת משתתף</string>
     <string name="accessibility_pick_start_date" msgid="3926641487042699037">"תאריך התחלה"</string>
     <string name="accessibility_pick_start_time" msgid="4913428100936555149">"שעת התחלה"</string>
     <string name="accessibility_pick_end_date" msgid="5624250196618643922">"תאריך סיום"</string>
     <string name="accessibility_pick_end_time" msgid="7120310166355224941">"שעת סיום"</string>
     <string name="accessibility_pick_time_zone" msgid="7155465783500323811">"אזור זמן"</string>
-    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">"חזור על האירוע"</string>
-    <string name="accessibility_add_reminder" msgid="2267950744060950152">"הוסף תזכורת"</string>
-    <string name="accessibility_remove_reminder" msgid="5261609343259665139">"הסר תזכורת"</string>
-    <string name="accessibility_add_attendee" msgid="5654014177472600916">"הוסף משתתף"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"סנכרן יומן"</string>
+    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">חזרה על האירוע</string>
+    <string name="accessibility_add_reminder" msgid="2267950744060950152">הוספת תזכורת</string>
+    <string name="accessibility_remove_reminder" msgid="5261609343259665139">הסרת תזכורת</string>
+    <string name="accessibility_add_attendee" msgid="5654014177472600916">הוספת משתתף</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"אירוע הנמשך יום שלם"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"חזרה"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"שעת תזכורת"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"סוג תזכורת"</string>
-    <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"הצג אותי כ"</string>
+    <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">להציג אותי בתור</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"פרטיות"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"התראת יומן"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"התראת נודניק"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"שלח דוא\"ל לאורחים"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ אירוע חדש"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"אירוע <xliff:g id="ITEM_INDEX">%1$s</xliff:g> מתוך <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"אירוע אחד"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> אירועים"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+אירוע אחד"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> אירועים"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one">אירוע אחד</item>
+        <item quantity="two">
+            <xliff:g id="count">%d</xliff:g> אירועים</item>
+        <item quantity="many">
+            <xliff:g id="count">%d</xliff:g> אירועים</item>
+        <item quantity="other">
+            <xliff:g id="count">%d</xliff:g> אירועים</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one">אירוע אחד</item>
+        <item quantity="two">+<xliff:g id="count">%d</xliff:g> אירועים</item>
+        <item quantity="many">+<xliff:g id="count">%d</xliff:g> אירועים</item>
+        <item quantity="other">+<xliff:g id="count">%d</xliff:g> אירועים</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"אירוע נבחר"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"אל תסמן -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"חזרה"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"ללא חזרה"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"כל יום <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="707566499994398250">"כל <xliff:g id="COUNT">%d</xliff:g> ימים"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"כל שבוע <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="7094801039989237061">"כל <xliff:g id="COUNT">%d</xliff:g> שבועות"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"כל חודש <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="5419723710346646523">"כל <xliff:g id="COUNT">%d</xliff:g> חודשים"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"כל שנה <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="5678653649746562060">"כל <xliff:g id="COUNT">%d</xliff:g> שנים"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one">כל &lt;&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"count\"&gt;יום&lt;/xliff:g&gt;</item>
+        <item quantity="two">כל <xliff:g id="count">יומיים</xliff:g>
+        </item>
+        <item quantity="many">כל <xliff:g id="count">%d</xliff:g> ימים</item>
+        <item quantity="other">כל <xliff:g id="count">%d</xliff:g> ימים</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one">כל <xliff:g id="count">שבוע</xliff:g>
+        </item>
+        <item quantity="two">כל <xliff:g id="count">שבועיים</xliff:g>
+        </item>
+        <item quantity="many">כל <xliff:g id="count">%d</xliff:g> שבועות</item>
+        <item quantity="other">כל <xliff:g id="count">%d</xliff:g> שבועות</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one">כל <xliff:g id="count">חודש</xliff:g>
+        </item>
+        <item quantity="two">כל <xliff:g id="count">חודשיים</xliff:g>
+        </item>
+        <item quantity="many">כל <xliff:g id="count">%d</xliff:g> חודשים</item>
+        <item quantity="other">כל <xliff:g id="count">%d</xliff:g> חודשים</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one">כל <xliff:g id="count">שנה</xliff:g>
+        </item>
+        <item quantity="two">כל <xliff:g id="count">שנתיים</xliff:g>
+        </item>
+        <item quantity="many">כל <xliff:g id="count">%d</xliff:g> שנים</item>
+        <item quantity="other">כל <xliff:g id="count">%d</xliff:g> שנים</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"באותו יום בכל חודש"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"ללא תאריך סיום"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"עד תאריך מסוים"</string>
-    <string name="recurrence_end_date" msgid="3693751578164711701">"עד <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="recurrence_end_date" msgid="3693751578164711701">עד <xliff:g id="date">%s</xliff:g>
+    </string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"למספר אירועים"</string>
 
 
@@ -311,7 +351,7 @@
     <string name="one_hour">שעה</string>
     <string name="one_and_a_half_hours">שעה וחצי</string>
     <string name="two_hours">שעתיים</string>
-    <string name="share_label">שיתוף</string>
+    <string name="share_label">שתף</string>
     <string name="no_map">לא מותקן יישומון מפות</string>
     <string name="default_start_title">תצוגת בררת מחדל</string>
     <string name="default_start_last">תצוגה שהשתמשו בה בעבר</string>
@@ -330,10 +370,10 @@
     <string name="cal_import_error_msg">הייבוא ללוח השנה נכשל</string>
     <string name="cal_import_error_date_msg">לא ניתן לפענח את התאריך שסופק: %s</string>
     <string name="cal_pick_ics">נא לבחור קובץ לייבוא</string>
-    <string name="view_settings">הצגת הגדרות</string>
+    <string name="view_settings">הצג הגדרות</string>
     <string name="preferences_month_view_portrait">פריסת תצוגת חודש (לאורך)</string>
     <string name="preferences_month_view_landscape">פריסת תצוגת חודש (לרוחב)</string>
-    <string name="view_details">הצגת פרטים</string>
+    <string name="display_options">הצגת פרטים</string>
     <string name="display_time">הצגת זמן</string>
     <string name="display_location">הצגת מיקום</string>
     <string name="show_time_no">לא</string>
@@ -341,4 +381,6 @@
     <string name="show_time_start_end">מועד התחלה וסיום</string>
     <string name="show_time_start_end_below">מועד התחלה וסיום מתחת לאירוע</string>
     <string name="foreground_notification_channel_name">סנכרון התראות</string>
-</resources>
+    <string name="maximum_number_of_lines">מספר שורות מרבי באירוע</string>
+    <string name="foreground_notification_channel_description">נדרשות התראות בחזית לטובת סנכרון התרעות פנימי. נא להשתיק</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 0c187e26ae842bf439e6b63d832ed9b56c35aac8..af6431bfe268b806ebc50a3e889056be33bbfc2a 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"予定なし"</item>
     <item msgid="2064426942462573474">"仮承諾"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"第1"</item>
-    <item msgid="5631923029483854900">"第2"</item>
-    <item msgid="148935502975250973">"第3"</item>
-    <item msgid="5124200797326669172">"第4"</item>
-    <item msgid="7564374178324652137">"最終"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"応答がありません"</item>
     <item msgid="3724434080904437698">"はい"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"これ以降の予定"</item>
     <item msgid="7833229563617435430">"すべての予定"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"これ以降の予定"</item>
-    <item msgid="6315440193748139854">"すべての予定"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"この予定のみ"</item>
     <item msgid="140670561403965380">"繰り返す予定すべて"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5f942656d410816754c9eaaaf17b78292d1689a2..a46893f0579ca3c25e11817abb50d712242c033c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"カレンダー"</string>
     <string name="what_label" msgid="1933578391985810049">"タイトル"</string>
     <string name="where_label" msgid="3472482206065595118">"場所"</string>
@@ -26,28 +23,28 @@
     <string name="tomorrow" msgid="614434811813859237">"明日"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"今日の<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"明日の<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>の<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g></string>
     <string name="repeats_label" msgid="7414023871434593196">"繰り返し"</string>
     <string name="no_title_label" msgid="302177118061368042">"（タイトルなし）"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1分"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g>分"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1分"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g>分"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1時間"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g>時間"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1日"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g>日"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"第<xliff:g id="COUNT">%d</xliff:g>週"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1分"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g>分"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1分"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g>分"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1時間"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g>時間"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1日"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g>日"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"第<xliff:g id="COUNT">%d</xliff:g>週"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"更新"</string>
     <string name="show_day_view" msgid="5782512782605466016">"日付を表示"</string>
     <string name="agenda_view" msgid="5566084759423843245">"予定リスト"</string>
@@ -60,16 +57,9 @@
     <string name="event_delete" msgid="2386667193277770442">"予定を削除"</string>
     <string name="goto_today" msgid="9162136434410891230">"今日"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"設定"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"表示するカレンダー"</string>
     <string name="search" msgid="550656004486017426">"検索"</string>
     <string name="hide_controls" msgid="830320505938520882">"コントロールを非表示"</string>
     <string name="show_controls" msgid="715520586028062621">"コントロールを表示"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"表示するカレンダー"</string>
-    <string name="synced" msgid="7913940305983383493">"同期済み"</string>
-    <string name="not_synced" msgid="4275114941801829419">"未同期"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"このアカウントは同期されていないため、カレンダーが最新ではない可能性があります。"</string>
-    <string name="accounts" msgid="849401841083180306">"アカウントと同期"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"同期するカレンダー"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"同期するカレンダー"</string>
     <string name="hint_what" msgid="709155115005044531">"タイトル"</string>
     <string name="hint_where" msgid="4972598001033801974">"場所"</string>
@@ -88,14 +78,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"開始"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"終日"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"カレンダー"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"すべて表示"</string>
     <string name="description_label" msgid="7193475046717505855">"内容"</string>
     <string name="presence_label" msgid="6169724148441175862">"外部向け表示"</string>
     <string name="privacy_label" msgid="9215031965259597335">"公開設定"</string>
     <string name="reminders_label" msgid="7292389181815525676">"通知を追加"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"カレンダーがありません"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"予定を追加するには、端末に少なくとも1つのカレンダーアカウントを追加してカレンダーを表示できるようにする必要があります。アカウントを追加するには[アカウントを追加]をタップします（アカウントを追加したばかりの場合は、同期の完了を待って再試行してください）。または[キャンセル]をタップして、カレンダーが表示できるかどうかを確認してください。"</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Googleアカウントがあればカレンダーをもっと活用できます。"\n\n"• どのウェブブラウザからもアクセスできます"\n"• 予定を安全にバックアップできます"</string>
     <string name="add_account" msgid="1669072099756774952">"アカウントを追加"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"カレンダー:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"主催者:"</string>
@@ -116,16 +104,15 @@
     <string name="call_label" msgid="2960328220008869083">"発信"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"クイック返信"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"ゲストへメールを送るときのデフォルトの返事を編集"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"クイック返信の編集"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"クイック返信"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"クイック返信の選択"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"メールプログラムが見つかりません"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"数分遅れています。"</item>
-    <item msgid="6215158751728689832">"10分ほどで着きます。"</item>
-    <item msgid="4485794001743679338">"先に始めていてください。"</item>
-    <item msgid="8036557974294987511">"申し訳ありませんが、行けません。日程を変更する必要があります。"</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"数分遅れています。"</item>
+        <item msgid="6215158751728689832">"10分ほどで着きます。"</item>
+        <item msgid="4485794001743679338">"先に始めていてください。"</item>
+        <item msgid="8036557974294987511">"申し訳ありませんが、行けません。日程を変更する必要があります。"</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"カスタム返信を作成…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"主催:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"通知"</string>
@@ -141,29 +128,25 @@
     <string name="delete_label" msgid="874742811918030739">"削除"</string>
     <string name="save_label" msgid="2133599104834432589">"完了"</string>
     <string name="discard_label" msgid="2394623883289782541">"キャンセル"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"すべてスヌーズ"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"通知を消去"</string>
     <string name="snooze_label" msgid="1515893621063224666">"スヌーズ"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"繰り返しなし"</string>
     <string name="endByDate" msgid="7654221304929538201">"（<xliff:g id="DATE">%s</xliff:g>まで）"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"（1回）"</item>
-    <item quantity="other" msgid="4855496837834652446">"（<xliff:g id="NUMBER">%d</xliff:g>回）"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"毎日"</item>
-    <item quantity="other" msgid="5455230727715859264">"<xliff:g id="NUMBER">%d</xliff:g>日ごと"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"（1回）"</item>
+        <item quantity="other" msgid="4855496837834652446">"（<xliff:g id="NUMBER">%d</xliff:g>回）"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"毎日"</item>
+        <item quantity="other" msgid="5455230727715859264">"<xliff:g id="NUMBER">%d</xliff:g>日ごと"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"平日（月～金）"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"毎週<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g>週間ごとの<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"毎週<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g>週間ごとの<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"月次"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"毎年"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"毎月（<xliff:g id="DAY_OF_MONTH">%s</xliff:g>日）"</string>
-    <string name="yearly" msgid="8576208380302949002">"毎年（<xliff:g id="DATES">%s</xliff:g>）"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"カスタム（端末ではカスタマイズ不可）"</string>
     <string name="modify_event" msgid="5982876409997142690">"この予定のみを変更する"</string>
     <string name="modify_all" msgid="4421657265864209041">"一連の定期的な予定すべてを変更する"</string>
@@ -173,8 +156,6 @@
     <string name="delete_this_event_title" msgid="518402946676919384">"この予定を削除しますか？"</string>
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"<xliff:g id="EVENTTITLE">%s</xliff:g>を削除しますか？"</string>
     <string name="change_response_title" msgid="7704714776070974984">"出欠状況を変更"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"全般設定"</string>
-    <string name="menu_about_preferences" msgid="6124375438237674973">"カレンダーについて"</string>
     <string name="preferences_title" msgid="8045855493262131773">"設定"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"カレンダーの表示設定"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"通知とリマインダ"</string>
@@ -195,23 +176,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"旅行中も自宅のタイムゾーンでカレンダーと予定時間を表示する"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"自宅タイムゾーン"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"第何週かを表示"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"概要"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"ビルドバージョン"</string>
-    <string name="gadget_title" msgid="939918875331310945">"カレンダー"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"近日中の予定はありません"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"試験運用版"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"通知"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"通知をスキップ"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"通知をスキップ"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"消音時間"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"指定時間内は予定の通知を消音にします。"</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"消音時間の開始時刻"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"消音時間の終了時刻"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"デバッグ"</string>
     <string name="copy_db" msgid="437691290566699292">"データベースを送信"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"<xliff:g id="DOMAIN">%s</xliff:g>を検索中..."</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"参加者を削除"</string>
@@ -224,55 +197,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"通知を追加"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"通知を削除"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"参加者を追加"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"カレンダーを同期"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"終日"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"頻度"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"通知の時間"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"通知のタイプ"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"外部向け表示"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"公開設定"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"カレンダーの通知"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"通知をスヌーズ"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"ゲストにメールを送信"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"新しい予定を追加"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"<xliff:g id="ITEM_COUNT">%2$s</xliff:g>件中<xliff:g id="ITEM_INDEX">%1$s</xliff:g>件目の予定"</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"予定1件"</item>
-    <item quantity="other" msgid="6093072093209431078">"予定<xliff:g id="COUNT">%d</xliff:g>件"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"他1件の予定"</item>
-    <item quantity="other" msgid="3609243840882275136">"他<xliff:g id="COUNT">%d</xliff:g>件の予定"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"予定1件"</item>
+        <item quantity="other" msgid="6093072093209431078">"予定<xliff:g id="COUNT">%d</xliff:g>件"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"他1件の予定"</item>
+        <item quantity="other" msgid="3609243840882275136">"他<xliff:g id="COUNT">%d</xliff:g>件の予定"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"選択した予定"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"オンにしないでください -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"繰り返し"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"1度のみ"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>日"</item>
-    <item quantity="other" msgid="707566499994398250">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>日"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>週間"</item>
-    <item quantity="other" msgid="7094801039989237061">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>週間"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>か月"</item>
-    <item quantity="other" msgid="5419723710346646523">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>か月"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>年"</item>
-    <item quantity="other" msgid="5678653649746562060">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>年"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>日"</item>
+        <item quantity="other" msgid="707566499994398250">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>日"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>週間"</item>
+        <item quantity="other" msgid="7094801039989237061">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>週間"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>か月"</item>
+        <item quantity="other" msgid="5419723710346646523">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>か月"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>年"</item>
+        <item quantity="other" msgid="5678653649746562060">"繰り返す間隔: <xliff:g id="COUNT">%d</xliff:g>年"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"毎月同じ日"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"終了日なし"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"終了日:"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"<xliff:g id="DATE">%s</xliff:g>まで"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"回数"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g>回繰り返す"</item>
-    <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g>回繰り返す"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g>回繰り返す"</item>
+        <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g>回繰り返す"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"終了日を変更します"</string>
     <string name="visibility_default">デフォルト</string>
   <string name="visibility_private">限定公開</string>
@@ -289,4 +254,4 @@
   <string name="preferences_licence">免許</string>
     <string name="preferences_privacy_policy">プライバシーポリシー</string>
     <string name="preferences_service_terms">利用規約</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index f98835d75733457e8fa395f374172989216d7fc1..f75cb47c4cc93d5f18b673bc8760c5d73f91c28c 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"한가함"</item>
     <item msgid="2064426942462573474">"미정"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"처음"</item>
-    <item msgid="5631923029483854900">"2번째"</item>
-    <item msgid="148935502975250973">"3번째"</item>
-    <item msgid="5124200797326669172">"4번째"</item>
-    <item msgid="7564374178324652137">"마지막"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"응답 없음"</item>
     <item msgid="3724434080904437698">"예"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"이번 및 향후 일정"</item>
     <item msgid="7833229563617435430">"모든 일정"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"이번 및 향후 일정"</item>
-    <item msgid="6315440193748139854">"모든 일정"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"이번 일정만"</item>
     <item msgid="140670561403965380">"모든 반복 일정"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 427811f424ae66f200e9a619adf6437413173c70..4f6cbd3d75015db149448104be9d1b9e5fe21f53 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"캘린더"</string>
     <string name="what_label" msgid="1933578391985810049">"내용"</string>
     <string name="where_label" msgid="3472482206065595118">"장소"</string>
@@ -26,28 +23,28 @@
     <string name="tomorrow" msgid="614434811813859237">"내일"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"오늘 <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"내일 <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g></string>
     <string name="repeats_label" msgid="7414023871434593196">"반복"</string>
     <string name="no_title_label" msgid="302177118061368042">"(제목 없음)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1분"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g>분"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1분"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g>분"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1시간"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g>시간"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1일"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g>일"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>번째 주"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1분"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g>분"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1분"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g>분"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1시간"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g>시간"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1일"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g>일"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>번째 주"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"새로고침"</string>
     <string name="show_day_view" msgid="5782512782605466016">"요일 표시"</string>
     <string name="agenda_view" msgid="5566084759423843245">"일정목록"</string>
@@ -60,16 +57,9 @@
     <string name="event_delete" msgid="2386667193277770442">"일정 삭제"</string>
     <string name="goto_today" msgid="9162136434410891230">"오늘"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"설정"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"표시할 캘린더"</string>
     <string name="search" msgid="550656004486017426">"검색"</string>
     <string name="hide_controls" msgid="830320505938520882">"컨트롤 숨기기"</string>
     <string name="show_controls" msgid="715520586028062621">"컨트롤 표시"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"표시할 캘린더"</string>
-    <string name="synced" msgid="7913940305983383493">"동기화됨"</string>
-    <string name="not_synced" msgid="4275114941801829419">"동기화 안됨"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"계정이 동기화되지 않아 캘린더의 상태가 최신이 아닐 수 있습니다."</string>
-    <string name="accounts" msgid="849401841083180306">"계정 및 동기화"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"동기화할 캘린더"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"동기화할 캘린더"</string>
     <string name="hint_what" msgid="709155115005044531">"일정 이름"</string>
     <string name="hint_where" msgid="4972598001033801974">"장소"</string>
@@ -84,18 +74,16 @@
     <string name="alert_title" msgid="7869592820853066853">"캘린더 알림"</string>
     <string name="event_info_title" msgid="56024222340421620">"일정 보기"</string>
     <string name="event_info_title_invite" msgid="9160326363769403865">"회의 초대"</string>
-    <string name="edit_event_to_label" msgid="795012981218062421">"종료:"</string>
-    <string name="edit_event_from_label" msgid="174999102612666115">"시작:"</string>
+    <string name="edit_event_to_label" msgid="795012981218062421">종료</string>
+    <string name="edit_event_from_label" msgid="174999102612666115">시작</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"종일"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"캘린더"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"모두 표시"</string>
     <string name="description_label" msgid="7193475046717505855">"일정 설명"</string>
     <string name="presence_label" msgid="6169724148441175862">"내 상태"</string>
     <string name="privacy_label" msgid="9215031965259597335">"공개여부"</string>
     <string name="reminders_label" msgid="7292389181815525676">"알림 추가"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"캘린더 없음"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"일정을 추가하기 전에 기기에 하나 이상의 캘린더 계정을 추가하고 캘린더를 표시해야 합니다. 계정 추가를 터치하여 계정을 추가합니다(계정을 추가한 다음 동기화가 완료될 때까지 기다렸다가 다시 시도합니다). 또는 취소를 터치하고 적어도 하나의 캘린더가 표시되도록 합니다."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"캘린더는 Google 계정에서 사용할 때 더 효과적입니다."\n\n"• 어떤 웹 브라우저에서든 액세스하세요."\n"• 일정을 안전하게 백업하세요."</string>
     <string name="add_account" msgid="1669072099756774952">"계정 추가"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"캘린더:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"주최자:"</string>
@@ -110,22 +98,21 @@
     <string name="response_no" msgid="561911691884148136">"아니요"</string>
     <string name="email_guests_label" msgid="8772030932155305903">"참석자에게 이메일 보내기"</string>
     <string name="email_organizer_label" msgid="7178059542798074813">"이메일 관리도구"</string>
-    <string name="email_picker_label" msgid="4808253965057791781">"이메일:"</string>
+    <string name="email_picker_label" msgid="4808253965057791781">이메일</string>
     <string name="event_not_found" msgid="8356864185947582727">"일정을 찾을 수 없습니다."</string>
     <string name="map_label" msgid="8795383535586556038">"지도"</string>
     <string name="call_label" msgid="2960328220008869083">"통화"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"빠른 응답"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"참석자에게 보내는 빠른 응답 메시지 수정"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"빠른 응답 수정"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"빠른 응답"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"빠른 응답 선택"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"이메일 프로그램 찾기 실패"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"조금 늦어요."</item>
-    <item msgid="6215158751728689832">"약 10분 후에 도착합니다."</item>
-    <item msgid="4485794001743679338">"저 없이 시작하세요."</item>
-    <item msgid="8036557974294987511">"죄송합니다. 일정을 변경해야 합니다."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"조금 늦어요."</item>
+        <item msgid="6215158751728689832">"약 10분 후에 도착합니다."</item>
+        <item msgid="4485794001743679338">"저 없이 시작하세요."</item>
+        <item msgid="8036557974294987511">"죄송합니다. 일정을 변경해야 합니다."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"직접 메시지 쓰기…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"주최자:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"알림"</string>
@@ -141,33 +128,29 @@
     <string name="delete_label" msgid="874742811918030739">"삭제"</string>
     <string name="save_label" msgid="2133599104834432589">"완료"</string>
     <string name="discard_label" msgid="2394623883289782541">"취소"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"모두 일시 중지"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"모두 해제"</string>
     <string name="snooze_label" msgid="1515893621063224666">"알림 일시중지"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"없음"</string>
     <string name="endByDate" msgid="7654221304929538201">", <xliff:g id="DATE">%s</xliff:g>까지"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">", 일회성"</item>
-    <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g>회"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"매일"</item>
-    <item quantity="other" msgid="5455230727715859264">"<xliff:g id="NUMBER">%d</xliff:g>일에 한 번"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">", 일회성"</item>
+        <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g>회"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"매일"</item>
+        <item quantity="other" msgid="5455230727715859264">"<xliff:g id="NUMBER">%d</xliff:g>일에 한 번"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"주중 매일(월-금)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"매주 <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g>주에 한 번 <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"매주 <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"<xliff:g id="NUMBER">%1$d</xliff:g>주에 한 번 <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"매월"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"매년"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"매월(<xliff:g id="DAY_OF_MONTH">%s</xliff:g>일)"</string>
-    <string name="yearly" msgid="8576208380302949002">"매년(<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"사용자 설정(휴대전화에서는 할 수 없음)"</string>
-    <string name="modify_event" msgid="5982876409997142690">"이번 일정만 변경합니다."</string>
-    <string name="modify_all" msgid="4421657265864209041">"모든 반복일정을 변경합니다."</string>
-    <string name="modify_all_following" msgid="3017428541066390380">"이번 및 모든 향후 일정을 변경합니다."</string>
+    <string name="modify_event" msgid="5982876409997142690">이번 일정만 변경합니다</string>
+    <string name="modify_all" msgid="4421657265864209041">모든 반복일정을 변경합니다</string>
+    <string name="modify_all_following" msgid="3017428541066390380">이번 및 모든 향후 일정을 변경합니다</string>
     <string name="new_event_dialog_label" msgid="7553105224561147916">"새 일정"</string>
     <string name="new_event_dialog_option" msgid="6154657379574669371">"새 일정"</string>
     <string name="delete_this_event_title" msgid="518402946676919384">"이번 일정을 삭제하시겠습니까?"</string>
@@ -192,26 +175,18 @@
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"기본 알림 시간"</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
     <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"기본 시간대 사용"</string>
-    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"여행하는 동안 캘린더와 일정 시간을 기본 시간대로 표시합니다."</string>
+    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">여행하는 동안 캘린더와 일정 시간을 기본 시간대로 표시합니다</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"기본 시간대"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"몇째 주인지 표시"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"정보"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"빌드 버전"</string>
-    <string name="gadget_title" msgid="939918875331310945">"캘린더"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+ 1개"</item>
-    <item quantity="other" msgid="1997405398178470838">"+ <xliff:g id="NUMBER">%d</xliff:g>개"</item>
-  </plurals>
-    <string name="gadget_no_events" msgid="5209110911088302855">"예정된 캘린더 일정이 없습니다."</string>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+ 1개"</item>
+        <item quantity="other" msgid="1997405398178470838">"+ <xliff:g id="NUMBER">%d</xliff:g>개"</item>
+    </plurals>
+    <string name="gadget_no_events" msgid="5209110911088302855">예정된 캘린더 일정이 없습니다</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"베타"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"알림"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"알림 건너뛰기"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"알림 건너뛰기"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"무음 모드 시간"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"지정한 시간에는 이벤트 알림을 무음으로 설정합니다."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"무음 모드 시작 시간"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"무음 모드 종료 시간"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"디버깅"</string>
     <string name="copy_db" msgid="437691290566699292">"데이터베이스 보내기"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"<xliff:g id="DOMAIN">%s</xliff:g> 검색 중..."</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"참석자 삭제"</string>
@@ -224,55 +199,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"알림 추가"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"알림 삭제"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"참석자 추가"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"캘린더 동기화"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"종일 일정"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"반복"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"알림 시간"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"알림 유형"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"내 상태"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"개인정보 보호"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"캘린더 알림"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"알림 일시중지"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"참석자에게 이메일 보내기"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ 새 일정"</string>
-    <string name="template_announce_item_index" msgid="4067877800670753110">"일정 <xliff:g id="ITEM_INDEX">%1$s</xliff:g>/<xliff:g id="ITEM_COUNT">%2$s</xliff:g>"</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"일정 1개"</item>
-    <item quantity="other" msgid="6093072093209431078">"일정 <xliff:g id="COUNT">%d</xliff:g>개"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"남은 일정 1개"</item>
-    <item quantity="other" msgid="3609243840882275136">"남은 일정 <xliff:g id="COUNT">%d</xliff:g>개"</item>
-  </plurals>
+    <string name="template_announce_item_index" msgid="4067877800670753110">일정 <xliff:g id="ITEM_INDEX">%1$s</xliff:g>/<xliff:g id="ITEM_COUNT">%2$s</xliff:g>.</string>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"일정 1개"</item>
+        <item quantity="other" msgid="6093072093209431078">"일정 <xliff:g id="COUNT">%d</xliff:g>개"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"남은 일정 1개"</item>
+        <item quantity="other" msgid="3609243840882275136">"남은 일정 <xliff:g id="COUNT">%d</xliff:g>개"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"선택한 일정"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"선택안함 -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"반복"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"없음"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"<xliff:g id="COUNT">%d</xliff:g>일에 한 번"</item>
-    <item quantity="other" msgid="707566499994398250">"<xliff:g id="COUNT">%d</xliff:g>일에 한 번"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"<xliff:g id="COUNT">%d</xliff:g>주에 한 번"</item>
-    <item quantity="other" msgid="7094801039989237061">"<xliff:g id="COUNT">%d</xliff:g>주에 한 번"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"<xliff:g id="COUNT">%d</xliff:g>개월에 한 번"</item>
-    <item quantity="other" msgid="5419723710346646523">"<xliff:g id="COUNT">%d</xliff:g>개월에 한 번"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"<xliff:g id="COUNT">%d</xliff:g>년에 한 번"</item>
-    <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g>년에 한 번"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"<xliff:g id="COUNT">%d</xliff:g>일에 한 번"</item>
+        <item quantity="other" msgid="707566499994398250">"<xliff:g id="COUNT">%d</xliff:g>일에 한 번"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"<xliff:g id="COUNT">%d</xliff:g>주에 한 번"</item>
+        <item quantity="other" msgid="7094801039989237061">"<xliff:g id="COUNT">%d</xliff:g>주에 한 번"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"<xliff:g id="COUNT">%d</xliff:g>개월에 한 번"</item>
+        <item quantity="other" msgid="5419723710346646523">"<xliff:g id="COUNT">%d</xliff:g>개월에 한 번"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"<xliff:g id="COUNT">%d</xliff:g>년에 한 번"</item>
+        <item quantity="other" msgid="5678653649746562060">"<xliff:g id="COUNT">%d</xliff:g>년에 한 번"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"매월 같은 날"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"계속"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"특정일까지"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"종료일: <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"여러 번"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g>개의 이벤트"</item>
-    <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g>개의 이벤트"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g>개의 이벤트"</item>
+        <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g>개의 이벤트"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"종료일 변경"</string>
     <string name="visibility_default">기본값</string>
 
@@ -284,7 +251,7 @@
     <string name="preferences_service_terms">서비스 약관</string>
     <string name="visibility_private">비공개</string>
     <string name="visibility_public">공개</string>
-    <string name="goto_date">이동</string>
+    <string name="goto_date">이동…</string>
     <string name="rsvp_accepted">승낙하다.</string>
     <string name="rsvp_tentative">잘모르겠다고 응답.</string>
     <string name="rsvp_declined">거절하다.</string>
@@ -299,7 +266,7 @@
     <string name="preferences_default_event_duration_title">기본 이벤트 지속시간</string>
     <string name="preferences_issues">버그 신고하기</string>
     <string name="user_rejected_calendar_write_permission">Etar앱은 읽기와 쓰기 권한을 필요로합니다. 다시시도해주세요.</string>
-    <string name="calendar_permission_not_granted">죄송하지만 이기능은 작동하지않습니다. Etar앱은 읽기와 쓰기 권한을 필요로합니다.</string>
+    <string name="calendar_permission_not_granted">죄송하지만 이기능은 작동하지않습니다. Etar앱은 읽기와 쓰기 권한을 필요로합니다</string>
     <string name="visibility_confidential">신뢰</string>
     <string name="zero_minutes">0 분</string>
     <string name="fifteen_minutes">15분</string>
@@ -329,7 +296,7 @@
     <string name="view_settings">설정 보기</string>
     <string name="preferences_month_view_portrait">월 보기 (세로로)</string>
     <string name="preferences_month_view_landscape">월 보기 (가로로)</string>
-    <string name="view_details">세부사항 보기</string>
+    <string name="display_options">세부사항 보기</string>
     <string name="display_time">디스플레이 시간</string>
     <string name="display_location">디스플레이 위치</string>
     <string name="show_time_no">시간 표시 안 함</string>
@@ -337,4 +304,6 @@
     <string name="show_time_start_end">시작시간과 끝나는시간</string>
     <string name="show_time_start_end_below">이벤트보다 낮은 시작 및 종료 시간</string>
     <string name="maximum_number_of_lines">이벤트의 최대 라인 수</string>
-</resources>
+    <string name="foreground_notification_channel_name">동기화 경고</string>
+    <string name="foreground_notification_channel_description">Foreground 알림 내부 경계 태세를 동기화에 필요하다. 음소거 해달라</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index d15eebd698dcbf24062db1d0570895e54e02a672..44989d166da7ca24cffddc15cbfacf715d55e0b5 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Pasiekiama"</item>
     <item msgid="2064426942462573474">"Bandomasis"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"pirmas"</item>
-    <item msgid="5631923029483854900">"antras"</item>
-    <item msgid="148935502975250973">"trečias"</item>
-    <item msgid="5124200797326669172">"ketvirtas"</item>
-    <item msgid="7564374178324652137">"paskutinis"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Nėra atsako"</item>
     <item msgid="3724434080904437698">"Taip"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Šis ir būsimi įvykiai"</item>
     <item msgid="7833229563617435430">"Visi įvykiai"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Šis ir būsimi įvykiai"</item>
-    <item msgid="6315440193748139854">"Visi įvykiai"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Tik šis įvykis"</item>
     <item msgid="140670561403965380">"Visi sekos įvykiai"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1e50983271321aa3e156cf10d84e8ba0b74eae2c..b03d80a3ba28b330b894dc087db807e5e3a270c0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalendorius"</string>
     <string name="what_label" msgid="1933578391985810049">"Kas"</string>
     <string name="where_label" msgid="3472482206065595118">"Kur"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Rytoj"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Šiandien <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Rytoj <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Pasikartojimas"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Nėra pavadinimo)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 min."</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> min."</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min."</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min."</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 val."</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> val."</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 d."</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> d."</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g> savaitė"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 min."</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> min."</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min."</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min."</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 val."</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> val."</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 d."</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> d."</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g> savaitė"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Atnaujinti"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Rodyti dieną"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Darbotvarkė"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Ištrinti įvykį"</string>
     <string name="goto_today" msgid="9162136434410891230">"Šiandien"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Nustatymai"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Pat. kalen."</string>
     <string name="search" msgid="550656004486017426">"Ieškoti"</string>
     <string name="hide_controls" msgid="830320505938520882">"Slėpti valdiklius"</string>
     <string name="show_controls" msgid="715520586028062621">"Rodyti valdiklius"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Norimi rodyti kalendoriai"</string>
-    <string name="synced" msgid="7913940305983383493">"sinchronizuota"</string>
-    <string name="not_synced" msgid="4275114941801829419">"nesinchronizuota"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Ši paskyra nesinchronizuojama, todėl kalendoriuose gali būti pateikiama ne pati naujausia informacija."</string>
-    <string name="accounts" msgid="849401841083180306">"Paskyros ir sinchronizavimas"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Norimi sinchronizuoti kalendoriai"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Sinchronizuojami kalendoriai"</string>
     <string name="hint_what" msgid="709155115005044531">"Įvykio pavadinimas"</string>
     <string name="hint_where" msgid="4972598001033801974">"Vieta"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Nuo"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Visos dienos"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalendorius"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Rodyti viską"</string>
     <string name="description_label" msgid="7193475046717505855">"Aprašas"</string>
     <string name="presence_label" msgid="6169724148441175862">"Rodyti mane kaip"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privatumas"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Pridėti priminimą"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Nėra kalendorių"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Jei norite pridėti įvykį, savo įrenginyje turite pridėti bent vieną Kalendoriaus paskyrą ir padaryti kalendorių matomą. Jei norite pridėti paskyrą, palieskite „Pridėti paskyrą“ (jei paskyrą ką tik pridėjote, palaukite, kol ji bus sinchronizuota, ir bandykite dar kartą). Arba palieskite „Atšaukti“ ir įsitikinkite, kad matomas bent vienas kalendorius."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalendorius geriau veikia naudojant „Google“ paskyrą."\n\n"• Pasiekite jį naudodami bet kurią žiniatinklio naršyklę"\n"• Saugiau kurkite atsargines įvykių kopijas"</string>
     <string name="add_account" msgid="1669072099756774952">"Pridėti paskyrą"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalendorius:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Tvarkytuvė:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Skambinti"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Greiti atsakai"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Red. num. ats. sveč. siunč. el. laišk."</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Red. greit. ats."</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Greitas atsakas"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Pasirinkti greitą atsaką"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Nepavyko rasti el. pašto programos"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Vėluojama tik kelias minutes."</item>
-    <item msgid="6215158751728689832">"Būkite ten po maždaug 10 min."</item>
-    <item msgid="4485794001743679338">"Pirmyn, pradėkite be manęs."</item>
-    <item msgid="8036557974294987511">"Deja, nespėsiu. Turėsime suplanuoti iš naujo."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Vėluojama tik kelias minutes."</item>
+        <item msgid="6215158751728689832">"Būkite ten po maždaug 10 min."</item>
+        <item msgid="4485794001743679338">"Pirmyn, pradėkite be manęs."</item>
+        <item msgid="8036557974294987511">"Deja, nespėsiu. Turėsime suplanuoti iš naujo."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Sukurkite patys…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Tvarkytuvė:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Priminimai"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Ištrinti"</string>
     <string name="save_label" msgid="2133599104834432589">"Atlikta"</string>
     <string name="discard_label" msgid="2394623883289782541">"Atšaukti"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Snausti visiems"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Atsisakyti visko"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Snausti"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Vienkartinis įvykis"</string>
     <string name="endByDate" msgid="7654221304929538201">", iki <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">", vieną kartą"</item>
-    <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g> k."</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Kasdien"</item>
-    <item quantity="other" msgid="5455230727715859264">"Kas <xliff:g id="NUMBER">%d</xliff:g> d."</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">", vieną kartą"</item>
+        <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g> k."</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Kasdien"</item>
+        <item quantity="other" msgid="5455230727715859264">"Kas <xliff:g id="NUMBER">%d</xliff:g> d."</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Savaitės dienomis (Pi–Pe)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Kas savaitę, <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Kas <xliff:g id="NUMBER">%1$d</xliff:g> sav., <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Kas savaitę, <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Kas <xliff:g id="NUMBER">%1$d</xliff:g> sav., <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Kas mėnesį"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Kasmet"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Kas mėnesį (<xliff:g id="DAY_OF_MONTH">%s</xliff:g> d.)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Kasmet (<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Priskirtas (negalima tinkinti telefonu)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Keisti tik šį įvykį"</string>
     <string name="modify_all" msgid="4421657265864209041">"Keisti visus sekos įvykius"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Keliaujant pateik. kalend. ir įvyk. laik. pagr. laiko juosta"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Pagrindinė laiko juosta"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Rodyti savaitės numerį"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Apie"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versija"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalendorius"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Nėra būsimų kalendoriaus įvykių"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Eksperimentinė versija"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Priminimai"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Praleisti priminimus"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Praleisti priminimus"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Tylos valandos"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Nurodytą laiką nutildyti priminimus apie įvykį."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Nutildymo laiko pradžia"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Nutildymo laiko pabaiga"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Derinimas"</string>
     <string name="copy_db" msgid="437691290566699292">"Siųsti duomenis"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Ieškoma <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Pašalinti dalyvį"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Pridėti priminimą"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Pašalinti priminimą"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Pridėti dalyvį"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sinchronizuoti kalendorių"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Visos dienos įvykis"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Pasikartojimas"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Priminimo laikas"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Priminimo tipas"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Rodyti mane kaip"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privatumas"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Kalendoriaus pranešimas"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Atidėti pranešimą"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Siųsti svečiams el. laišką"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Naujas įvykis"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"<xliff:g id="ITEM_INDEX">%1$s</xliff:g> įvyk. iš <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 įvyk."</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> įvyk."</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"Dar 1 įvykis"</item>
-    <item quantity="other" msgid="3609243840882275136">"Dar <xliff:g id="COUNT">%d</xliff:g> įvykiai (-ių)"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 įvyk."</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> įvyk."</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"Dar 1 įvykis"</item>
+        <item quantity="other" msgid="3609243840882275136">"Dar <xliff:g id="COUNT">%d</xliff:g> įvykiai (-ių)"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Pasirinktas įvykis"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NEŽYMĖKITE -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Kartoti"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Niekada nekartojamas"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Kas <xliff:g id="COUNT">%d</xliff:g> d."</item>
-    <item quantity="other" msgid="707566499994398250">"Kas <xliff:g id="COUNT">%d</xliff:g> d."</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Kas <xliff:g id="COUNT">%d</xliff:g> sav."</item>
-    <item quantity="other" msgid="7094801039989237061">"Kas <xliff:g id="COUNT">%d</xliff:g> sav."</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Kas <xliff:g id="COUNT">%d</xliff:g> mėn."</item>
-    <item quantity="other" msgid="5419723710346646523">"Kas <xliff:g id="COUNT">%d</xliff:g> mėn."</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Kas <xliff:g id="COUNT">%d</xliff:g> m."</item>
-    <item quantity="other" msgid="5678653649746562060">"Kas <xliff:g id="COUNT">%d</xliff:g> m."</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Kas <xliff:g id="COUNT">%d</xliff:g> d."</item>
+        <item quantity="other" msgid="707566499994398250">"Kas <xliff:g id="COUNT">%d</xliff:g> d."</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Kas <xliff:g id="COUNT">%d</xliff:g> sav."</item>
+        <item quantity="other" msgid="7094801039989237061">"Kas <xliff:g id="COUNT">%d</xliff:g> sav."</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Kas <xliff:g id="COUNT">%d</xliff:g> mėn."</item>
+        <item quantity="other" msgid="5419723710346646523">"Kas <xliff:g id="COUNT">%d</xliff:g> mėn."</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Kas <xliff:g id="COUNT">%d</xliff:g> m."</item>
+        <item quantity="other" msgid="5678653649746562060">"Kas <xliff:g id="COUNT">%d</xliff:g> m."</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"kas mėn. tą pačią d."</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Visada"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Iki nurodytos datos"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Iki <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Vykstant keliems įvykiams"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Vykstant <xliff:g id="EVENT_COUNT">%d</xliff:g> įvyk."</item>
-    <item quantity="other" msgid="8779598489398048259">"Vykstant <xliff:g id="EVENT_COUNT">%d</xliff:g> įvyk."</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Vykstant <xliff:g id="EVENT_COUNT">%d</xliff:g> įvyk."</item>
+        <item quantity="other" msgid="8779598489398048259">"Vykstant <xliff:g id="EVENT_COUNT">%d</xliff:g> įvyk."</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"keisti pabaigos datą"</string>
     <string name="visibility_default">Numatytasis</string>
   <string name="visibility_private">Privatus</string>
@@ -283,4 +252,4 @@
   <string name="preferences_licence">Licencija</string>
     <string name="preferences_privacy_policy">Privatumo politika</string>
     <string name="preferences_service_terms">Paslaugų teikimo sąlygos</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index c706e3559a372db52ebd6719dca8dbd5b4c0d0f7..270ae20db8e3389f93ca189563b92addd97b841c 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Pieejams"</item>
     <item msgid="2064426942462573474">"Pagaidu"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"pirmā"</item>
-    <item msgid="5631923029483854900">"otrā"</item>
-    <item msgid="148935502975250973">"trešā"</item>
-    <item msgid="5124200797326669172">"ceturtā"</item>
-    <item msgid="7564374178324652137">"pēdējā"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Nav atbildes"</item>
     <item msgid="3724434080904437698">"Jā"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Šis un nākamie pasākumi"</item>
     <item msgid="7833229563617435430">"Visus pasākumus"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Šo un nākamos pasākumus"</item>
-    <item msgid="6315440193748139854">"Visus pasākumus"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Tikai šis pasākums"</item>
     <item msgid="140670561403965380">"Visus virknes pasākumus"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index bb755d09caed093fb47841faf6304719b32b5161..75dc4f1fe28fcc784f4d412daaec0c8b68d57c5f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalendārs"</string>
     <string name="what_label" msgid="1933578391985810049">"Kas"</string>
     <string name="where_label" msgid="3472482206065595118">"Kur"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Rīt"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Šodien plkst. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Rīt plkst. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Atkārtošana"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Nav nosaukuma)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minūte"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minūte(-es)"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 stunda"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> stunda(-as)"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 diena"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> diena(-as)"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>. nedēļa"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minūte"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minūte(-es)"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 stunda"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> stunda(-as)"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 diena"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> diena(-as)"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>. nedēļa"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Atsvaidzināt"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Rādīt dienu"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Dienas kārtība"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Dzēst pasākumu"</string>
     <string name="goto_today" msgid="9162136434410891230">"Šodien"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Iestatījumi"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Parādīt kalendārus"</string>
     <string name="search" msgid="550656004486017426">"Meklēt"</string>
     <string name="hide_controls" msgid="830320505938520882">"Slēpt vadīklas"</string>
     <string name="show_controls" msgid="715520586028062621">"Rādīt vadīklas"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Parādāmie kalendāri"</string>
-    <string name="synced" msgid="7913940305983383493">"sinhronizēts"</string>
-    <string name="not_synced" msgid="4275114941801829419">"nav sinhronizēts"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Šis konts netiek sinhronizēts, tāpēc jūsu kalendāri, iespējams, nav atjaunināti."</string>
-    <string name="accounts" msgid="849401841083180306">"Konti un sinhronizācija"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Sinhronizējamie kalendāri"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Sinhronizējamie kalendāri"</string>
     <string name="hint_what" msgid="709155115005044531">"Pasākuma nosaukums"</string>
     <string name="hint_where" msgid="4972598001033801974">"Atrašanās vieta"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"No"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Visu dienu"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalendārs"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Rādīt visu"</string>
     <string name="description_label" msgid="7193475046717505855">"Apraksts"</string>
     <string name="presence_label" msgid="6169724148441175862">"Rādīt mani ar šādu statusu:"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Konfidencialitāte"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Pievienot atgādin."</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Nav kalendāru"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Lai pievienotu kādu pasākumu, vispirms savā ierīcē pievienojiet vismaz vienu kontu pakalpojumā Kalendārs un padariet redzamu konkrētu kalendāru. Lai pievienotu kontu, pieskarieties vienumam Pievienot kontu (ja tikko jau pievienojāt kontu, gaidiet, kamēr tas tiek sinhronizēts, un mēģiniet vēlreiz). Varat arī pieskarties vienumam Atcelt un padarīt redzamu vismaz vienu kalendāru."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalendārs darbojas labāk ar kontu."\n\n"• Piekļuve no jebkuras tīmekļa pārlūkprogrammas"\n"• Droša pasākumu dublēšana"</string>
     <string name="add_account" msgid="1669072099756774952">"Pievienot kontu"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalendārs:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Rīkotājs:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Zvanīt"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Ātrās atbildes"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Mainīt atbildes"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Ātro atbilžu red."</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Ātrā atbilde"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Ātrās atbildes izvēle"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Neizdevās atrast e-pasta programmu."</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Kavēšu dažas minūtes."</item>
-    <item msgid="6215158751728689832">"Būšu pēc aptuveni 10 minūtēm."</item>
-    <item msgid="4485794001743679338">"Sāciet bez manis."</item>
-    <item msgid="8036557974294987511">"Diemžēl nevarēšu ierasties, pasākumu vajadzēs pārcelt."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Kavēšu dažas minūtes."</item>
+        <item msgid="6215158751728689832">"Būšu pēc aptuveni 10 minūtēm."</item>
+        <item msgid="4485794001743679338">"Sāciet bez manis."</item>
+        <item msgid="8036557974294987511">"Diemžēl nevarēšu ierasties, pasākumu vajadzēs pārcelt."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Rakstīt savu…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Rīkotājs:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Atgādinājumi"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Dzēst"</string>
     <string name="save_label" msgid="2133599104834432589">"Gatavs"</string>
     <string name="discard_label" msgid="2394623883289782541">"Atcelt"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Atlikt visus"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Noraidīt visus"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Atlikt"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Vienreizējs pasākums"</string>
     <string name="endByDate" msgid="7654221304929538201">"; līdz šādam datumam: <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; vienu reizi"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> reizes"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Katru dienu"</item>
-    <item quantity="other" msgid="5455230727715859264">"Ik pēc <xliff:g id="NUMBER">%d</xliff:g> dienām"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; vienu reizi"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> reizes"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Katru dienu"</item>
+        <item quantity="other" msgid="5455230727715859264">"Ik pēc <xliff:g id="NUMBER">%d</xliff:g> dienām"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Katru darbadienu (Pr–Pk)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Reizi nedēļā, katru <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Reizi <xliff:g id="NUMBER">%1$d</xliff:g> nedēļās, katru <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Reizi nedēļā, katru <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Reizi <xliff:g id="NUMBER">%1$d</xliff:g> nedēļās, katru <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Reizi mēnesī"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Reizi gadā"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Reizi mēnesī (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. datumā)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Reizi gadā (<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Pielāgots (nevar pielāgot tālrunī)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Mainīt tikai šo pasākumu"</string>
     <string name="modify_all" msgid="4421657265864209041">"Mainīt visus virknes pasākumus"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Kalendāri un pasākumu laiks sākuma laika joslā, kad ceļojat."</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Sākuma laika josla"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Rādīt nedēļas numuru"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Par"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Būvējuma versija"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalendārs"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Kalendārā nav plānotu pasākumu."</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Eksperimentāli"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Atgādinājumi"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Izlaist atgādinājumus"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Atgādinājumu izlaišana"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Klusums"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Izslēdziet pasākumu atgādinājumu skaņu norādītajā laika posmā."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Klusuma sākuma laiks"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Klusuma beigu laiks"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Atkļūdošana"</string>
     <string name="copy_db" msgid="437691290566699292">"Nosūtīt datu bāzi"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Notiek domēna <xliff:g id="DOMAIN">%s</xliff:g> meklēšana…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Noņemt dalībnieku"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Pievienot atgādinājumu"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Noņemt atgādinājumu"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Pievienot dalībnieku"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sinhronizēt kalendāru"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Pasākums visas dienas garumā"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Atkārtošana"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Atgādinājuma laiks"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Atgādinājuma veids"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Rādīt man šādu statusu:"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Konfidencialitāte"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Kalendāra paziņojums"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Atlikt paziņojumu"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Sūtīt viesiem e-pasta ziņojumu"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Jauns notikums"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"<xliff:g id="ITEM_INDEX">%1$s</xliff:g>. notikums no <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 pasākums"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> pasākumi"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"Vēl 1 pasākums"</item>
-    <item quantity="other" msgid="3609243840882275136">"Vēl <xliff:g id="COUNT">%d</xliff:g> pasākums(-i)"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 pasākums"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> pasākumi"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"Vēl 1 pasākums"</item>
+        <item quantity="other" msgid="3609243840882275136">"Vēl <xliff:g id="COUNT">%d</xliff:g> pasākums(-i)"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Atlasītais pasākums"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NEATZĪMĒJIET -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Atkārtošana"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Bez atkārtošanas"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> dienas"</item>
-    <item quantity="other" msgid="707566499994398250">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> dienas(-ām)"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> nedēļas"</item>
-    <item quantity="other" msgid="7094801039989237061">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> nedēļas(-ām)"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> mēneša"</item>
-    <item quantity="other" msgid="5419723710346646523">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> mēneša(-iem)"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> gada"</item>
-    <item quantity="other" msgid="5678653649746562060">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> gada(-iem)"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> dienas"</item>
+        <item quantity="other" msgid="707566499994398250">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> dienas(-ām)"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> nedēļas"</item>
+        <item quantity="other" msgid="7094801039989237061">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> nedēļas(-ām)"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> mēneša"</item>
+        <item quantity="other" msgid="5419723710346646523">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> mēneša(-iem)"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> gada"</item>
+        <item quantity="other" msgid="5678653649746562060">"Ik pēc <xliff:g id="COUNT">%d</xliff:g> gada(-iem)"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"Katru mēnesi"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Bezgalīgi"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Līdz noteiktam datumam"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Līdz  šādam datumam: <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Noteiktu reižu skaitu"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> notikumā"</item>
-    <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> notikumos"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> notikumā"</item>
+        <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> notikumos"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"mainīt beigu datumu"</string>
     <string name="visibility_default">Noklusējums</string>
   <string name="visibility_private">Privāts</string>
@@ -283,4 +252,4 @@
   <string name="preferences_licence">Licence</string>
     <string name="preferences_privacy_policy">Privātuma politika</string>
     <string name="preferences_service_terms">Pakalpojuma noteikumi</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index a798754f332c49b025cf98e91c206569c980fa77..a7d444b3dbb00d7087094dcd548aed62866f1139 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Ada"</item>
     <item msgid="2064426942462573474">"Tentatif"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"pertama"</item>
-    <item msgid="5631923029483854900">"saat"</item>
-    <item msgid="148935502975250973">"ketiga"</item>
-    <item msgid="5124200797326669172">"keempat"</item>
-    <item msgid="7564374178324652137">"terakhir"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Tiada jawapan"</item>
     <item msgid="3724434080904437698">"Ya"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Acara ini dan acara masa depan"</item>
     <item msgid="7833229563617435430">"Semua acara"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Acara ini &amp; masa depan"</item>
-    <item msgid="6315440193748139854">"Semua acara"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Acara ini sahaja"</item>
     <item msgid="140670561403965380">"Semua acara dalam siri"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 8b6e24027a2876f0cda10828f71ea1eeb90c6ab8..089bb6f3a91514eb236fb1103b11f32739b54a4b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalendar"</string>
     <string name="what_label" msgid="1933578391985810049">"Apa"</string>
     <string name="where_label" msgid="3472482206065595118">"Di mana"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Esok"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Hari ini pada <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Esok pada <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Ulangan"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Tiada tajuk)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minit"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minit"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 jam"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> jam"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 hari"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> hari"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"minggu <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minit"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minit"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 jam"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> jam"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 hari"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> hari"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"minggu <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Muat semula"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Tunjukkan hari"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Padam acara"</string>
     <string name="goto_today" msgid="9162136434410891230">"Hari ini"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Tetapan"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalendar utk dpprkn"</string>
     <string name="search" msgid="550656004486017426">"Carian"</string>
     <string name="hide_controls" msgid="830320505938520882">"Sembunyikan kawalan"</string>
     <string name="show_controls" msgid="715520586028062621">"Tunjukkan kawalan"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalendar untuk dipaparkan"</string>
-    <string name="synced" msgid="7913940305983383493">"tersegerak"</string>
-    <string name="not_synced" msgid="4275114941801829419">"tidak disegerakkan"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Akaun ini tidak disegerakkan, maka kalendar anda mungkin tidak terkini."</string>
-    <string name="accounts" msgid="849401841083180306">"Akaun &amp; penyegerakan"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Kalendar untuk disegerakkan"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Kalendar untuk disegerakkan"</string>
     <string name="hint_what" msgid="709155115005044531">"Nama acara"</string>
     <string name="hint_where" msgid="4972598001033801974">"Lokasi"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Dari"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Sepanjang hari"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalendar"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Tunjukkan semua"</string>
     <string name="description_label" msgid="7193475046717505855">"Keterangan"</string>
     <string name="presence_label" msgid="6169724148441175862">"Tunjukkan saya sebagai"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privasi"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Tambah peringatan"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Tiada kalendar"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Sebelum anda dapat menambahkan sesuatu acara, anda mesti menambahkan sekurang-kurangnya satu akaun Kalendar pada peranti anda dan menjadikan kalendar dapat dilihat. Sentuh Tambah Akaun untuk menambahkan akaun (jika anda baru sahaja menambahkan akaun, tunggu sehingga ia selesai menyegerak dan cuba lagi). Jika tidak, sentuh Batal dan pastikan sekurang-kurangnya satu kalendar kelihatan."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalendar berfungsi lebih baik dengan Akaun. "\n" "\n"• Akses dari sebarang penyemak imbas "\n"• Buat sandaran untuk acara anda secara selamat"</string>
     <string name="add_account" msgid="1669072099756774952">"Tambah akaun"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalendar"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Penganjur:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Panggil"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Respons pantas"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Edit jawapan lalai semasa menghantar e-mel kepada tetamu"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Edit respons pantas"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Respons pantas"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Pilih respons pantas"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Gagal mencari program e-mel"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Terlewat beberapa minit sahaja."</item>
-    <item msgid="6215158751728689832">"Ada di sana dalam kira-kira 10 minit."</item>
-    <item msgid="4485794001743679338">"Teruskan dan mulakan tanpa saya."</item>
-    <item msgid="8036557974294987511">"Maaf, saya tidak dapat datang. Kita perlu menjadualkannya semula."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Terlewat beberapa minit sahaja."</item>
+        <item msgid="6215158751728689832">"Ada di sana dalam kira-kira 10 minit."</item>
+        <item msgid="4485794001743679338">"Teruskan dan mulakan tanpa saya."</item>
+        <item msgid="8036557974294987511">"Maaf, saya tidak dapat datang. Kita perlu menjadualkannya semula."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Tulis sendiri…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Penganjur:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Peringatan"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Padam"</string>
     <string name="save_label" msgid="2133599104834432589">"Selesai"</string>
     <string name="discard_label" msgid="2394623883289782541">"Batal"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Tidurkan sekejap semua"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Ketepikan semua"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Tidur sekejap"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Acara satu kali"</string>
     <string name="endByDate" msgid="7654221304929538201">"; sehingga <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; utk satu kali"</item>
-    <item quantity="other" msgid="4855496837834652446">"; utk <xliff:g id="NUMBER">%d</xliff:g> kali"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Harian"</item>
-    <item quantity="other" msgid="5455230727715859264">"Setiap <xliff:g id="NUMBER">%d</xliff:g> hari"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; utk satu kali"</item>
+        <item quantity="other" msgid="4855496837834652446">"; utk <xliff:g id="NUMBER">%d</xliff:g> kali"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Harian"</item>
+        <item quantity="other" msgid="5455230727715859264">"Setiap <xliff:g id="NUMBER">%d</xliff:g> hari"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Setiap hari kerja (Isn-Jum)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Mingguan pada <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Setiap <xliff:g id="NUMBER">%1$d</xliff:g> minggu pada <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Mingguan pada <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Setiap <xliff:g id="NUMBER">%1$d</xliff:g> minggu pada <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Bulanan"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Tahunan"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Bulanan (pada hari ke-<xliff:g id="DAY_OF_MONTH">%s</xliff:g> )"</string>
-    <string name="yearly" msgid="8576208380302949002">"Tahunan (pada <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Peribadi (tidak boleh diperibadikan pada telefon)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Tukar acara ini sahaja"</string>
     <string name="modify_all" msgid="4421657265864209041">"Tukar semua acara dalam siri"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Pprkn msa klendar dan acara dlm zon waktu rmah bila bergerak"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Zon waktu rumah"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Tunjukkan nombor minggu"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Mengenai"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versi binaan"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalendar"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Tiada acara kalendar yang akan datang"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Percubaan"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Peringatan"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Langkau Peringatan"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Langkau Peringatan"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Tempoh senyap"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Senyapkan peringatan acara untuk masa yang ditetapkan."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Masa mula tempoh senyap"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Masa tamat tempoh senyap"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Menyahpepijat"</string>
     <string name="copy_db" msgid="437691290566699292">"Hantar pangkalan data"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Mencari <xliff:g id="DOMAIN">%s</xliff:g>..."</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Alih keluar hadirin"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Tambah peringatan"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Alih keluar peringatan"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Tambah hadirin"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Segerakkan kalendar"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Acara sepanjang hari"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Ulangan"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Waktu peringatan"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Jenis peringatan"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Tunjukkan saya sebagai"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privasi"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Pemberitahuan Kalendar"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Tunda Pemberitahuan"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Hantar e-mel kepada tetamu"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Acara baru"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Acara <xliff:g id="ITEM_INDEX">%1$s</xliff:g> daripada <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 acara"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> acara"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 acara"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> acara"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 acara"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> acara"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 acara"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> acara"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Acara dipilih"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"JANGAN periksa -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Ulang"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Jangan ulang"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Setiap <xliff:g id="COUNT">%d</xliff:g> hari"</item>
-    <item quantity="other" msgid="707566499994398250">"Setiap <xliff:g id="COUNT">%d</xliff:g> hari"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Setiap <xliff:g id="COUNT">%d</xliff:g> minggu"</item>
-    <item quantity="other" msgid="7094801039989237061">"Setiap <xliff:g id="COUNT">%d</xliff:g> minggu"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Setiap <xliff:g id="COUNT">%d</xliff:g> bulan"</item>
-    <item quantity="other" msgid="5419723710346646523">"Setiap <xliff:g id="COUNT">%d</xliff:g> bulan"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Setiap <xliff:g id="COUNT">%d</xliff:g> tahun"</item>
-    <item quantity="other" msgid="5678653649746562060">"Setiap <xliff:g id="COUNT">%d</xliff:g> tahun"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Setiap <xliff:g id="COUNT">%d</xliff:g> hari"</item>
+        <item quantity="other" msgid="707566499994398250">"Setiap <xliff:g id="COUNT">%d</xliff:g> hari"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Setiap <xliff:g id="COUNT">%d</xliff:g> minggu"</item>
+        <item quantity="other" msgid="7094801039989237061">"Setiap <xliff:g id="COUNT">%d</xliff:g> minggu"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Setiap <xliff:g id="COUNT">%d</xliff:g> bulan"</item>
+        <item quantity="other" msgid="5419723710346646523">"Setiap <xliff:g id="COUNT">%d</xliff:g> bulan"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Setiap <xliff:g id="COUNT">%d</xliff:g> tahun"</item>
+        <item quantity="other" msgid="5678653649746562060">"Setiap <xliff:g id="COUNT">%d</xliff:g> tahun"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"hari sama setiap bln"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Selamanya"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Sehingga tarikh"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Sehingga <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Untuk sejumlah acara"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Untuk <xliff:g id="EVENT_COUNT">%d</xliff:g> acara"</item>
-    <item quantity="other" msgid="8779598489398048259">"Untuk <xliff:g id="EVENT_COUNT">%d</xliff:g> acara"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Untuk <xliff:g id="EVENT_COUNT">%d</xliff:g> acara"</item>
+        <item quantity="other" msgid="8779598489398048259">"Untuk <xliff:g id="EVENT_COUNT">%d</xliff:g> acara"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"tukar tarikh akhir"</string>
     <string name="visibility_default">Lalai</string>
   <string name="visibility_private">Peribadi</string>
@@ -283,4 +252,4 @@
   <string name="preferences_licence">Lesen</string>
     <string name="preferences_privacy_policy">Dasar privasi</string>
     <string name="preferences_service_terms">Syarat perkhidmatan</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 1f1116631deea93ba7c703f77079ccb8a50028e6..a7dfa694777ea0e22106b72f772734f2acee7dcd 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Tilgjengelig"</item>
     <item msgid="2064426942462573474">"Kanskje"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"første"</item>
-    <item msgid="5631923029483854900">"andre"</item>
-    <item msgid="148935502975250973">"tredje"</item>
-    <item msgid="5124200797326669172">"fjerde"</item>
-    <item msgid="7564374178324652137">"siste"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Ingen svar"</item>
     <item msgid="3724434080904437698">"Ja"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Denne og fremtidige aktiviteter"</item>
     <item msgid="7833229563617435430">"Alle hendelser"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Denne og framtidige hendelser"</item>
-    <item msgid="6315440193748139854">"Alle hendelser"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Bare denne aktiviteten"</item>
     <item msgid="140670561403965380">"Alle hendelser i serien"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ccde1ae650205d21f17fb99efb31568c67567ad3..9ffc23232447dfbd581c2fb7a8cfc40797730afb 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -23,30 +23,29 @@
     <string name="tomorrow" msgid="614434811813859237">"I morgen"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"I dag kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"I morgen kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g> kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g></string>
     <string name="repeats_label" msgid="7414023871434593196">"Gjentas"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Ingen tittel)"</string>
     <plurals name="Nminutes">
-        <item quantity="one" msgid="4871052965772159239">"Et minutt"</item>
-        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minutter"</item>
+        <item quantity="one">1 minutt</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> minutter</item>
     </plurals>
     <plurals name="Nmins">
-        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+        <item quantity="one">1 min</item>
+        <item quantity="other">
+            <xliff:g id="count">%d</xliff:g> minutter</item>
     </plurals>
     <plurals name="Nhours">
-        <item quantity="one" msgid="4793697728599296830">"En time"</item>
-        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> timer"</item>
+        <item quantity="one">Én time</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> timer</item>
     </plurals>
     <plurals name="Ndays">
-        <item quantity="one" msgid="5988137255732166573">"En dag"</item>
-        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dager"</item>
+        <item quantity="one">Én dag</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> dager</item>
     </plurals>
     <plurals name="weekN">
-        <item quantity="one">uke <xliff:g id="COUNT">%d</xliff:g>
-        </item>
-        <item quantity="other">uke <xliff:g id="COUNT">%d</xliff:g>
-        </item>
+        <item quantity="one">uke <xliff:g id="count">%d</xliff:g></item>
+        <item quantity="other">uke <xliff:g id="count">%d</xliff:g></item>
     </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Last inn"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Vis dag"</string>
@@ -61,16 +60,9 @@
     <string name="goto_today" msgid="9162136434410891230">"I dag"</string>
     <string name="goto_date">"Gå til …"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Innstillinger"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalendere som skal vises"</string>
     <string name="search" msgid="550656004486017426">"Søk"</string>
     <string name="hide_controls" msgid="830320505938520882">"Skjul kontrollere"</string>
     <string name="show_controls" msgid="715520586028062621">"Vis kontrollere"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalendere som skal vises"</string>
-    <string name="synced" msgid="7913940305983383493">"er synkronisert"</string>
-    <string name="not_synced" msgid="4275114941801829419">"er ikke synkronisert"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Denne kontoen blir ikke synkronisert, så kalendrene dine er muligens ikke oppdaterte."</string>
-    <string name="accounts" msgid="849401841083180306">"Kontoer og synkronisering"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Kalendere som skal synkroniseres"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Kalendere som skal synkroniseres"</string>
     <string name="hint_what" msgid="709155115005044531">"Navn på aktivitet"</string>
     <string name="hint_where" msgid="4972598001033801974">"Sted"</string>
@@ -92,14 +84,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Fra"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Hele dagen"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalender"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Vis alle"</string>
     <string name="description_label" msgid="7193475046717505855">"Beskrivelse"</string>
     <string name="presence_label" msgid="6169724148441175862">"Vis meg som"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Personvern"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Legg til påminnelse"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Ingen kalendre"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Før du kan legge til en aktivitet, må du tilordne enheten din minst én Kalender-konto samt sørge for at du har en synlig kalender. Trykk på Legg til konto for å legge til en konto (Hvis du akkurat har gjort det, bør du vente til kontoen er synkronisert og prøve på nytt). Alternativt kan du trykke på Avbryt og sørge for at minst én kalender er synlig."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalender fungerer bedre med en konto."\n\n"• Du får tilgang til den fra en hvilken som helst nettleser"\n"• Ta trygge sikkerhetskopier av aktivitetene dine"</string>
     <string name="add_account" msgid="1669072099756774952">"Legg til en konto"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalender:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Arrangør:"</string>
@@ -120,7 +110,6 @@
     <string name="call_label" msgid="2960328220008869083">"Ring"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Hurtigsvar"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Rediger standardsvaret for E-poster til gjester"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Rediger hurtigsvarene"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Hurtigsvar"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Velg hurtigsvar"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Kunne ikke finne et E-postprogram"</string>
@@ -145,7 +134,6 @@
     <string name="delete_label" msgid="874742811918030739">"Slett"</string>
     <string name="save_label" msgid="2133599104834432589">"Lagre"</string>
     <string name="discard_label" msgid="2394623883289782541">"Avbryt"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Slumre alle"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Skjul alle"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Slumre"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Engangsaktivitet"</string>
@@ -165,8 +153,6 @@
     </plurals>
     <string name="monthly" msgid="4587116285383048586">"Månedlig"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Årlig"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Hver måned (den <xliff:g id="DAY_OF_MONTH">%s</xliff:g>.)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Hvert år (<xliff:g id="DATES">%s</xliff:g>)"</string>
     <string name="custom" product="default" msgid="4137468716966004993">"Egendefinert (Kan ikke tilpasses på telefon)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Endre bare denne aktiviteten"</string>
     <string name="modify_all" msgid="4421657265864209041">"Endre alle aktivitetene i denne serien"</string>
@@ -203,23 +189,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Viser kalender- og aktivitets-tidspunkter i din egen tidssone når du er på reise"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Egen tidssone"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Vis ukenumre"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Om"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Delversjon"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
     <plurals name="month_more_events">
-        <item quantity="one" msgid="8971334808414201327">"+ 1"</item>
-        <item quantity="other" msgid="1997405398178470838">"+ <xliff:g id="NUMBER">%d</xliff:g>"</item>
+        <item quantity="one">+ 1</item>
+        <item quantity="other">+<xliff:g id="number">%d</xliff:g></item>
     </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Ingen kommende kalenderaktiviteter"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"På forsøksstadiet"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Påminnelser"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Hopp over påminnelser"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Hopp over påminnelser"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Lydløse varsler"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Demp lyden for aktivitetspåminnelser i det angitte tidsrommet."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Starttid for lydløse varsler"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Sluttid for lydløse varsler"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Feilsøking"</string>
     <string name="copy_db" msgid="437691290566699292">"Send databasen"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Søker på <xliff:g id="DOMAIN">%s</xliff:g> …"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Fjern deltaker"</string>
@@ -232,45 +210,37 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Legg til påminnelse"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Fjern påminnelse"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Legg til deltaker"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Synkroniser kalender"</string>
-    <string name="accessibility_all_day" msgid="4146955438811915282">"Heldagshendelse"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Repetisjon"</string>
+    <string name="accessibility_all_day" msgid="4146955438811915282">Heldagsaktivitet</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Påminnelsestid"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Påminnelsestype"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Vis meg som"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Personvern"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Kalendervarsling"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Slumrevarsling"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Send e-post til gjestene"</string>
-    <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ ny hendelse"</string>
+    <string name="day_view_new_event_hint" msgid="2131483437911536229">+ ny aktivitet</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Aktivitet <xliff:g id="ITEM_INDEX">%1$s</xliff:g> av <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
     <plurals name="Nevents">
-        <item quantity="one" msgid="5230907142214104485">"1 aktivitet"</item>
-        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> aktiviteter"</item>
+        <item quantity="one">Én aktivitet</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> aktiviteter</item>
     </plurals>
     <plurals name="N_remaining_events">
-        <item quantity="one" msgid="431585781647034528">"+1 aktivitet"</item>
-        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> aktiviteter"</item>
+        <item quantity="one">+1 aktivitet.</item>
+        <item quantity="other">+<xliff:g id="count">%d</xliff:g> aktiviteter</item>
     </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Valgt aktivitet"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"IKKE merk av -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Gjenta"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Gjentas aldri"</string>
     <plurals name="recurrence_interval_daily">
-        <item quantity="one" msgid="1205422710088692631">"Hver dag"</item>
-        <item quantity="other" msgid="707566499994398250">"Hver <xliff:g id="COUNT">%d</xliff:g>. dag"</item>
+        <item quantity="one">Hver <xliff:g id="count">%d</xliff:g> dag</item>
+        <item quantity="other">Hver <xliff:g id="count">%d</xliff:g> dag</item>
     </plurals>
     <plurals name="recurrence_interval_weekly">
-        <item quantity="one" msgid="4948681635464488351">"Hver uke"</item>
-        <item quantity="other" msgid="7094801039989237061">"Hver <xliff:g id="COUNT">%d</xliff:g>. uke"</item>
+        <item quantity="one">Hver <xliff:g id="count">%d</xliff:g> uke</item>
+        <item quantity="other">Hver <xliff:g id="count">%d</xliff:g> uke</item>
     </plurals>
     <plurals name="recurrence_interval_monthly">
-        <item quantity="one" msgid="4768178401603139718">"Hver måned"</item>
-        <item quantity="other" msgid="5419723710346646523">"Hver <xliff:g id="COUNT">%d</xliff:g>. måned"</item>
+        <item quantity="one">Hver måned <xliff:g id="count">%d</xliff:g> måned</item>
+        <item quantity="other">Hver <xliff:g id="count">%d</xliff:g>måned</item>
     </plurals>
     <plurals name="recurrence_interval_yearly">
-        <item quantity="one" msgid="5819562634008179102">"Hvert år"</item>
-        <item quantity="other" msgid="5678653649746562060">"Hvert <xliff:g id="COUNT">%d</xliff:g>. år"</item>
+        <item quantity="one">Hvert <xliff:g id="count">%d</xliff:g> år</item>
+        <item quantity="other">Hvert <xliff:g id="count">%d</xliff:g> år</item>
     </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"på samme dag hver måned"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"For alltid"</string>
@@ -288,15 +258,8 @@
     <string name="visibility_public">Offentlig</string>
     <string name="preferences_black_theme">Svart</string>
     <string name="preferences_color">Hovedfarge</string>
-    <string name="preferences_color_teal">Turkis</string>
-    <string name="preferences_color_blue">Blå</string>
-    <string name="preferences_color_orange">Oransje</string>
-    <string name="preferences_color_green">Grønn</string>
-    <string name="preferences_color_red">Rød</string>
-    <string name="preferences_color_purple">Lilla</string>
     <string name="preferences_color_pick">Hovedfarge</string>
-    <string name="preferences_default_event_duration_title">Forvalgt hendelsesvarighet</string>
-    <string name="preferences_home_tz_default">America/Los_Angeles</string>
+    <string name="preferences_default_event_duration_title">Forvalgt aktivitetsvarighet</string>
     <string name="user_rejected_calendar_write_permission">Etar krever tilgang til å lese og skrive kalender for å virke. Prøv igjen.</string>
     <string name="calendar_permission_not_granted">Denne funksjonen kan ikke virke siden Etar krever tilgang til lesing og skriving av kalender for å virke</string>
     <string name="visibility_confidential">Konfidensiell</string>
@@ -307,7 +270,7 @@
     <string name="one_and_a_half_hours">Én og en halv time</string>
     <string name="two_hours">To timer</string>
     <string name="no_map">Ingen kartapper er installert</string>
-    <string name="error_generating_ics">Problemer oppstod under deling av hendelsen</string>
+    <string name="error_generating_ics">Problemer oppstod under deling av aktivitet</string>
     <string name="share_label">Del</string>
     <string name="preferences_alerts_custom_snooze_delay_title">Be om påminnelsesslumring</string>
     <string name="preferences_alerts_custom_snooze_delay_summary_on">Spør om slumrelengde når enn det er slumrepåminnelser</string>
@@ -315,24 +278,23 @@
     <string name="snooze_delay_dialog_title">Bestem slumrelengden</string>
     <string name="preferences_default_snooze_delay_title">Standard-slumretid</string>
     <string name="preferences_default_snooze_delay_dialog">Standard-slumretid</string>
-    <string name="preferences_default_snooze_delay_default" translatable="false">5</string>
     <string name="default_start_title">Standardvisningen</string>
     <string name="default_start_last">Forrige valgte visning</string>
     <string name="cal_share_intent_title">Send aktiviteten til:</string>
     <string name="cal_export_event_sdcard_title">Eksporter til SD-kortet</string>
     <string name="cal_export_succ_msg">Eksporteringen av aktiviteten var vellykket: %1s</string>
-    <string name="cal_import_menu_title">Importer hendelse</string>
+    <string name="cal_import_menu_title">Importer aktivitet</string>
     <string name="cal_nothing_to_import">Det er ingenting å importere</string>
     <string name="cal_import_error_msg">Importering til kalenderen mislyktes</string>
     <string name="cal_pick_ics">Velg en fil å importere</string>
     <string name="view_settings">Vis innstillinger</string>
     <string name="preferences_month_view_portrait">Månedsvisning (portrett)</string>
     <string name="preferences_month_view_landscape">Månedsvisning (landskap)</string>
-    <string name="view_details">Vis detaljer</string>
+    <string name="display_options">Vis detaljer</string>
     <string name="display_time">Vis tid</string>
     <string name="display_location">Vis plassering</string>
     <string name="cal_import_error_date_msg">Forsto ikke gitt dato: %s</string>
-    <string name="show_time_no">Nei</string>
+    <string name="show_time_no">Ikke vis tid</string>
     <string name="show_time_start">Kun starttid</string>
     <string name="show_time_start_end">Start- og slutttid</string>
 
@@ -346,4 +308,37 @@
     <string name="maximum_number_of_lines">Maksimalt antall linjer i aktivitet</string>
     <string name="foreground_notification_channel_name">Varselsynkronisering</string>
     <string name="foreground_notification_channel_description">Forgrunnsmerknader kreves for intern varselssynkronisering. Forstum lyden.</string>
+    <string name="cal_import_error_time_zone_msg">Angitt tidssone er uforståelig: %s</string>
+    <string name="preferences_calendar_account">%1$s konto</string>
+    <string name="preferences_calendar_delete">Slett kalender</string>
+    <string name="preferences_calendar_display_name">Endre navn</string>
+    <string name="preferences_calendar_color">Farge</string>
+    <string name="preferences_calendar_visible">Vis aktiviteter</string>
+    <string name="preferences_calendar_synchronize">Synkroniser denne kalenderen</string>
+    <string name="preferences_list_calendar_summary_sync_off">Ikke synkronisert</string>
+    <string name="preferences_list_calendar_summary_invisible">Aktiviteter vises ikke</string>
+    <string name="preferences_list_general">Hovedinnstillinger</string>
+    <string name="preferences_list_add_remote">Legg til kalender annensteds fra (CalDAV)</string>
+    <string name="preferences_list_add_offline">Legg til frakoblet kalender</string>
+    <string name="preferences_list_add_offline_title">Legg til frakoblet kalender</string>
+    <string name="preferences_list_add_offline_error_empty">Skriv inn kalendernavn!</string>
+    <string name="preferences_list_add_offline_message">Frakoblede kalendere synkroniseres IKKE til en skytjeneste, og er kun tilgjengelig på din enhet.</string>
+    <string name="preferences_list_add_offline_button">Legg til kalender</string>
+    <string name="preferences_list_add_offline_name">Navn</string>
+    <string name="preferences_list_add_offline_cancel">Avbryt</string>
+    <string name="preferences_calendar_color_warning_title">Advarsel</string>
+    <string name="preferences_calendar_color_warning_message">Endring av farge kan bli tilbakestilt når kalenderen er synkronisert igjen.
+\n
+\nI DAVx⁵ kan \"Håndter kalenderfarger\" skrus av for å forhindre dette.</string>
+    <string name="preferences_calendar_color_warning_button">Jeg forstår</string>
+    <string name="preferences_calendar_delete_message">Ønsker du virkelig å slette denne kalenderen\?</string>
+    <string name="preferences_calendar_delete_delete">Slett kalender</string>
+    <string name="preferences_calendar_delete_cancel">Avbryt</string>
+    <string name="preferences_menu_about">Om Etar</string>
+    <string name="offline_account_name">Frakoblet kalender</string>
+    <string name="app_copyright">© 2015-<xliff:g>%s</xliff:g> Etar-prosjektet. Portions © 2005-<xliff:g>%s</xliff:g> Android Open Source-prosjektet.</string>
+    <string name="authors">Utviklere</string>
+    <string name="changelog">Endringslogg</string>
+    <string name="license">Lisens</string>
+    <string name="source_code">Kilde</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index fa288a657ceec0c7a5017e7e5db247bf91cb67db..3dba554c32f99ddf0d9364245165dd1bfac47850 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Beschikbaar"</item>
     <item msgid="2064426942462573474">"Voorlopig"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"eerste"</item>
-    <item msgid="5631923029483854900">"tweede"</item>
-    <item msgid="148935502975250973">"derde"</item>
-    <item msgid="5124200797326669172">"vierde"</item>
-    <item msgid="7564374178324652137">"laatste"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Geen reactie"</item>
     <item msgid="3724434080904437698">"Ja"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Deze en toekomstige afspraken"</item>
     <item msgid="7833229563617435430">"Alle afspraken"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Deze en toekomstige afspraken"</item>
-    <item msgid="6315440193748139854">"Alle afspraken"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Alleen deze afspraak"</item>
     <item msgid="140670561403965380">"Alle gebeurtenissen in de reeks"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 37d7ac3d1e4ae16ec5159793708023a40c74ac45..98c5620aed653f18dec8ace23b754a3d5ca0b611 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Agenda"</string>
     <string name="what_label" msgid="1933578391985810049">"Wat"</string>
     <string name="where_label" msgid="3472482206065595118">"Waar"</string>
@@ -26,82 +23,75 @@
     <string name="tomorrow" msgid="614434811813859237">"Morgen"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Vandaag om <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Morgen om <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Herhaling"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Geen titel)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minuut"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minuten"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min."</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min."</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 uur"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> uur"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 dag"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dagen"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"week <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minuut"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minuten"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min."</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min."</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 uur"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> uur"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 dag"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dagen"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"week <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Vernieuwen"</string>
-    <string name="show_day_view" msgid="5782512782605466016">"Geef dag weer"</string>
+    <string name="show_day_view" msgid="5782512782605466016">Toon dag</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
     <string name="day_view" msgid="4467754504843584437">"Dag"</string>
     <string name="week_view" msgid="6775043022159508060">"Week"</string>
     <string name="month_view" msgid="7287101431749285412">"Maand"</string>
-    <string name="event_view" msgid="7621353079385122317">"Afspraak weergeven"</string>
+    <string name="event_view" msgid="7621353079385122317">Bekijk afspraak</string>
     <string name="event_create" msgid="6941040556709110617">"Nieuwe afspraak"</string>
-    <string name="event_edit" msgid="4006961928830064662">"Afspraak bewerken"</string>
-    <string name="event_delete" msgid="2386667193277770442">"Afspraak verwijderen"</string>
+    <string name="event_edit" msgid="4006961928830064662">Bewerk afspraak</string>
+    <string name="event_delete" msgid="2386667193277770442">Verwijder afspraak</string>
     <string name="goto_today" msgid="9162136434410891230">"Vandaag"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Instellingen"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Agenda\'s"</string>
     <string name="search" msgid="550656004486017426">"Zoeken"</string>
     <string name="hide_controls" msgid="830320505938520882">"Bediening verbergen"</string>
-    <string name="show_controls" msgid="715520586028062621">"Bediening weergeven"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Agenda\'s om weer te geven"</string>
-    <string name="synced" msgid="7913940305983383493">"gesynchroniseerd"</string>
-    <string name="not_synced" msgid="4275114941801829419">"niet gesynchroniseerd"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Dit account wordt niet gesynchroniseerd, dus uw agenda\'s zijn mogelijk niet bijgewerkt."</string>
-    <string name="accounts" msgid="849401841083180306">"Accounts en synchronisatie"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Agenda\'s om te synchroniseren"</string>
+    <string name="show_controls" msgid="715520586028062621">Toon bediening</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Agenda\'s om te synchroniseren"</string>
     <string name="hint_what" msgid="709155115005044531">"Afspraaknaam"</string>
     <string name="hint_where" msgid="4972598001033801974">"Locatie"</string>
     <string name="hint_description" msgid="1910143586169033232">"Beschrijving"</string>
     <string name="hint_attendees" msgid="1650488163176888480">"Gasten"</string>
-    <string name="creating_event" msgid="7516249252554059980">"Afspraak gemaakt."</string>
-    <string name="saving_event" msgid="7694181017411177226">"Afspraak opgeslagen."</string>
-    <string name="empty_event" msgid="9018699257414338634">"Lege afspraak niet gemaakt."</string>
+    <string name="creating_event" msgid="7516249252554059980">Afspraak is aangemaakt.</string>
+    <string name="saving_event" msgid="7694181017411177226">Afspraak is opgeslagen.</string>
+    <string name="empty_event" msgid="9018699257414338634">Lege afspraak is niet gemaakt.</string>
     <string name="creating_event_with_guest" msgid="5758688413124191931">"Uitnodigingen worden verzonden."</string>
     <string name="saving_event_with_guest" msgid="9184584438475689577">"Updates worden verzonden."</string>
-    <string name="create_event_dialog_save" msgid="1080859798521717414">"Opslaan"</string>
+    <string name="create_event_dialog_save" msgid="1080859798521717414">Sla op</string>
     <string name="alert_title" msgid="7869592820853066853">"Agenda-herinneringen"</string>
-    <string name="event_info_title" msgid="56024222340421620">"Afspraak weergeven"</string>
+    <string name="event_info_title" msgid="56024222340421620">Bekijk afspraak</string>
     <string name="event_info_title_invite" msgid="9160326363769403865">"Uitnodiging voor vergadering"</string>
     <string name="edit_event_to_label" msgid="795012981218062421">"Tot"</string>
     <string name="edit_event_from_label" msgid="174999102612666115">"Van"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"De hele dag"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Agenda"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Alles weergeven"</string>
     <string name="description_label" msgid="7193475046717505855">"Beschrijving"</string>
-    <string name="presence_label" msgid="6169724148441175862">"Mij weergeven als"</string>
+    <string name="presence_label" msgid="6169724148441175862">Toon mij als</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privacy"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Herinnering toevoegen"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Geen agenda\'s"</string>
-    <string name="no_calendars_found" msgid="8968682716053492187">"Voordat u een afspraak kunt toevoegen, moet u ten minste één Agenda-account aan uw apparaat toevoegen en de agenda zichtbaar maken. Raak \'Account toevoegen\' aan om een account toe te voegen (als u net een account heeft toegevoegd, wacht u tot het synchroniseren is voltooid en probeert u het opnieuw). Of raak \'Annuleren\' aan en zorg ervoor dat er ten minste één agenda zichtbaar is."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Agenda werkt beter met een account."\n\n"• Toegang via elke webbrowser"\n"• Maak beveiligde back-ups van uw afspraken"</string>
+    <string name="no_calendars_found" msgid="8968682716053492187">Voordat u een afspraak kunt toevoegen, moet u ten minste één agenda-account aan uw apparaat toevoegen en de agenda zichtbaar maken. Raak \'Account toevoegen\' aan om een account toe te voegen (als u net een account heeft toegevoegd, wacht u tot het synchroniseren is voltooid en probeert u het opnieuw). Of raak \'Annuleren\' aan en zorg ervoor dat er ten minste één agenda zichtbaar is.</string>
     <string name="add_account" msgid="1669072099756774952">"Account toevoegen"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Agenda:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organisator:"</string>
-    <string name="choose_event_color_label" msgid="2192923501857428854">"Kleur voor evenement kiezen"</string>
-    <string name="event_color_picker_dialog_title" msgid="4631938661655159511">"Kleur voor evenement"</string>
-    <string name="event_color_set_to_default" msgid="3447218820785647967">"Instellen als standaardkleur voor agenda"</string>
+    <string name="choose_event_color_label" msgid="2192923501857428854">Kies kleur voor afspraak</string>
+    <string name="event_color_picker_dialog_title" msgid="4631938661655159511">Kleur voor afspraak</string>
+    <string name="event_color_set_to_default" msgid="3447218820785647967">Gebruik standaardkleur voor agenda</string>
     <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">"Kleur voor agenda"</string>
     <string name="calendar_square_color_picker_description" msgid="7430468363525563483">"Kleurenkiezer"</string>
     <string name="view_event_response_label" msgid="8382281658458798329">"Aanwezig?"</string>
@@ -111,74 +101,69 @@
     <string name="email_guests_label" msgid="8772030932155305903">"E-mailen aan gasten"</string>
     <string name="email_organizer_label" msgid="7178059542798074813">"Organisator e-mailen"</string>
     <string name="email_picker_label" msgid="4808253965057791781">"E-mail met"</string>
-    <string name="event_not_found" msgid="8356864185947582727">"Evenement niet gevonden."</string>
+    <string name="event_not_found" msgid="8356864185947582727">Afspraak is niet gevonden.</string>
     <string name="map_label" msgid="8795383535586556038">"Kaart"</string>
     <string name="call_label" msgid="2960328220008869083">"Bellen"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Snelle reacties"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Standaardreacties bewerken voor het e-mailen van gasten"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Snelle reacties bewerken"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Snelle reactie"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Snelle reactie kiezen"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Het vinden van een e-mailprogramma is mislukt"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Ik ben een paar minuten te laat."</item>
-    <item msgid="6215158751728689832">"Ik ben er over ongeveer 10 minuten."</item>
-    <item msgid="4485794001743679338">"Begin maar vast zonder mij."</item>
-    <item msgid="8036557974294987511">"Ik red het helaas niet. Laten we een nieuwe afspraak maken."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Ik ben een paar minuten te laat."</item>
+        <item msgid="6215158751728689832">"Ik ben er over ongeveer 10 minuten."</item>
+        <item msgid="4485794001743679338">"Begin maar vast zonder mij."</item>
+        <item msgid="8036557974294987511">"Ik red het helaas niet. Laten we een nieuwe afspraak maken."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Eigen reactie opstellen…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organisator:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Herinneringen"</string>
     <string name="agenda_today" msgid="5965841338467422191">"vandaag, <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="agenda_yesterday" msgid="4170964206728599693">"gisteren, <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="agenda_tomorrow" msgid="3893625470780723605">"morgen, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="loading" msgid="3772533493214331230">"Laden..."</string>
-    <string name="show_older_events" msgid="5140647493681439926">"Raak aan om gebeurtenissen vóór <xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g> weer te geven"</string>
-    <string name="show_newer_events" msgid="2604638815440163080">"Raak aan om gebeurtenissen na <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g> weer te geven"</string>
+    <string name="loading" msgid="3772533493214331230">Laden…</string>
+    <string name="show_older_events" msgid="5140647493681439926">Raak aan om gebeurtenissen vóór <xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g> te bekijken</string>
+    <string name="show_newer_events" msgid="2604638815440163080">Raak aan om afspraken na <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g> te bekijken</string>
     <string name="search_title" msgid="8898015280250716254">"Zoeken in mijn agenda\'s"</string>
     <string name="edit_event_label" msgid="7413222956349977161">"Details"</string>
     <string name="edit_label" msgid="8934331258435656534">"Bewerken"</string>
     <string name="delete_label" msgid="874742811918030739">"Verwijderen"</string>
     <string name="save_label" msgid="2133599104834432589">"Gereed"</string>
     <string name="discard_label" msgid="2394623883289782541">"Annuleren"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"5 min. uitstellen"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Allemaal verwijderen"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Snooze"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Eenmalige afspraak"</string>
     <string name="endByDate" msgid="7654221304929538201">"; tot <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; één keer"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> keer"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Dagelijks"</item>
-    <item quantity="other" msgid="5455230727715859264">"Elke <xliff:g id="NUMBER">%d</xliff:g> dagen"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; één keer"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> keer"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Dagelijks"</item>
+        <item quantity="other" msgid="5455230727715859264">"Elke <xliff:g id="NUMBER">%d</xliff:g> dagen"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Elke werkdag (ma - vr)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Wekelijks op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Elke <xliff:g id="NUMBER">%1$d</xliff:g> weken op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Wekelijks op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Elke <xliff:g id="NUMBER">%1$d</xliff:g> weken op <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Maandelijks"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Jaarlijks"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Maandelijks (op dag <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Jaarlijks (op <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Aangepast (kan niet op de telefoon worden aangepast)"</string>
-    <string name="modify_event" msgid="5982876409997142690">"Alleen deze afspraak wijzigen"</string>
-    <string name="modify_all" msgid="4421657265864209041">"Alle afspraken in de reeks wijzigen"</string>
-    <string name="modify_all_following" msgid="3017428541066390380">"Deze en alle toekomstige afspraken wijzigen"</string>
+    <string name="modify_event" msgid="5982876409997142690">Wijzig alleen deze afspraak</string>
+    <string name="modify_all" msgid="4421657265864209041">Wijzig alle afspraken in de reeks</string>
+    <string name="modify_all_following" msgid="3017428541066390380">Wijzig deze en alle toekomstige afspraken</string>
     <string name="new_event_dialog_label" msgid="7553105224561147916">"Nieuwe afspraak"</string>
     <string name="new_event_dialog_option" msgid="6154657379574669371">"Nieuwe afspraak"</string>
-    <string name="delete_this_event_title" msgid="518402946676919384">"Deze afspraak verwijderen?"</string>
-    <string name="delete_recurring_event_title" msgid="5609046778422180206">"<xliff:g id="EVENTTITLE">%s</xliff:g> verwijderen?"</string>
+    <string name="delete_this_event_title" msgid="518402946676919384">Verwijder deze afspraak\?</string>
+    <string name="delete_recurring_event_title" msgid="5609046778422180206">Verwijder <xliff:g id="EVENTTITLE">%s</xliff:g>\?</string>
     <string name="change_response_title" msgid="7704714776070974984">"Reactie wijzigen"</string>
     <string name="menu_general_preferences" msgid="2812705323334260708">"Algemene instellingen"</string>
     <string name="menu_about_preferences" msgid="6124375438237674973">Kalender over</string>
     <string name="preferences_title" msgid="8045855493262131773">"Instellingen"</string>
-    <string name="preferences_general_title" msgid="2069075513760573117">"Instelling agendaweergave"</string>
+    <string name="preferences_general_title" msgid="2069075513760573117">Agendaweergave-instelling</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Meldingen en herinneringen"</string>
-    <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Geweigerde afspraken verbergen"</string>
+    <string name="preferences_hide_declined_title" msgid="1849295943669890034">Verberg geweigerde afspraken</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Week begint op"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Week begint op"</string>
     <string name="preferences_clear_search_history_title" msgid="6619916370215282982">"Zoekgeschiedenis wissen"</string>
@@ -192,26 +177,18 @@
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Herinneringstijd"</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
     <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Eigen tijdzone gebruiken"</string>
-    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Op reis agenda\'s en gebeurtenistijden weergeven in eigen tijdzone"</string>
+    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">Toon agenda\'s en afspraaktijden op reis in tijdzone van thuis</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Eigen tijdzone"</string>
-    <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Weeknummer weergeven"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Over"</string>
+    <string name="preferences_show_week_num_title" msgid="5280734329664503461">Ton weeknummer</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Build-versie"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Agenda"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Geen lopende agenda-afspraken"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimenteel"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Herinneringen"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Herinneringen overslaan"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Herinneringen overslaan"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Stille uren"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Evenementherinneringen op stil zetten gedurende opgegeven tijd."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Starttijd stille uren"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Eindtijd stille uren"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Foutopsporing"</string>
     <string name="copy_db" msgid="437691290566699292">"Database verzenden"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"<xliff:g id="DOMAIN">%s</xliff:g> zoeken…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Deelnemer verwijderen"</string>
@@ -220,59 +197,51 @@
     <string name="accessibility_pick_end_date" msgid="5624250196618643922">"Einddatum"</string>
     <string name="accessibility_pick_end_time" msgid="7120310166355224941">"Eindtijd"</string>
     <string name="accessibility_pick_time_zone" msgid="7155465783500323811">"Tijdzone"</string>
-    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">"Evenement herhalen"</string>
+    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">Herhaal afspraak</string>
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Herinnering toevoegen"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Herinnering verwijderen"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Deelnemer toevoegen"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Agenda synchroniseren"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Afspraak die de hele dag duurt"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Herhaling"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Herinneringstijd"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Type herinnering"</string>
-    <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Mij weergeven als"</string>
+    <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">Toon mij als</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privacy"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Agenda-melding"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Snooze-melding"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Gasten e-mailen"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Nieuwe afspraak"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Afspraak <xliff:g id="ITEM_INDEX">%1$s</xliff:g> van <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 afspraak"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> afspraken"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 afspraak"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> afspraken"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 afspraak"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> afspraken"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 afspraak"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> afspraken"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Geselecteerde afspraak"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NIET aanvinken -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Herhalen"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Wordt nooit herhaald"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Elke <xliff:g id="COUNT">%d</xliff:g> dag"</item>
-    <item quantity="other" msgid="707566499994398250">"Elke <xliff:g id="COUNT">%d</xliff:g> dagen"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Elke <xliff:g id="COUNT">%d</xliff:g> week"</item>
-    <item quantity="other" msgid="7094801039989237061">"Elke <xliff:g id="COUNT">%d</xliff:g> weken"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Elke <xliff:g id="COUNT">%d</xliff:g> maand"</item>
-    <item quantity="other" msgid="5419723710346646523">"Elke <xliff:g id="COUNT">%d</xliff:g> maanden"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Elk <xliff:g id="COUNT">%d</xliff:g> jaar"</item>
-    <item quantity="other" msgid="5678653649746562060">"Elke <xliff:g id="COUNT">%d</xliff:g> jaar"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Elke <xliff:g id="COUNT">%d</xliff:g> dag"</item>
+        <item quantity="other" msgid="707566499994398250">"Elke <xliff:g id="COUNT">%d</xliff:g> dagen"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Elke <xliff:g id="COUNT">%d</xliff:g> week"</item>
+        <item quantity="other" msgid="7094801039989237061">"Elke <xliff:g id="COUNT">%d</xliff:g> weken"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Elke <xliff:g id="COUNT">%d</xliff:g> maand"</item>
+        <item quantity="other" msgid="5419723710346646523">"Elke <xliff:g id="COUNT">%d</xliff:g> maanden"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Elk <xliff:g id="COUNT">%d</xliff:g> jaar"</item>
+        <item quantity="other" msgid="5678653649746562060">"Elke <xliff:g id="COUNT">%d</xliff:g> jaar"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"elke maand op dezelfde dag"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Voor altijd"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Tot een datum"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Tot <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="recurrence_end_count_label" msgid="1233883668293087977">"Voor een aantal evenementen"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Voor <xliff:g id="EVENT_COUNT">%d</xliff:g> evenement"</item>
-    <item quantity="other" msgid="8779598489398048259">"Voor <xliff:g id="EVENT_COUNT">%d</xliff:g> evenementen"</item>
-  </plurals>
+    <string name="recurrence_end_count_label" msgid="1233883668293087977">Voor een aantal afspraken</string>
+    <plurals name="recurrence_end_count">
+        <item quantity="one">Voor <xliff:g id="EVENT_COUNT">%d</xliff:g> afspraak</item>
+        <item quantity="other">Voor <xliff:g id="EVENT_COUNT">%d</xliff:g> afspraken</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"einddatum wijzigen"</string>
     <string name="visibility_default">Standaard</string>
   <string name="visibility_private">Privé</string>
@@ -329,7 +298,7 @@
     <string name="view_settings">Bekijk instellinge</string>
     <string name="preferences_month_view_portrait">Maandoverzicht (Staand)</string>
     <string name="preferences_month_view_landscape">Maandoverzicht (Liggend)</string>
-    <string name="view_details">Bekijk details</string>
+    <string name="display_options">Bekijk details</string>
     <string name="display_time">Laat tijd zien</string>
     <string name="display_location">Toon locatie</string>
     <string name="show_time_no">Toon geen tijd</string>
@@ -339,4 +308,4 @@
     <string name="maximum_number_of_lines">Maximaal aantal regels in afspraak</string>
     <string name="foreground_notification_channel_name">Alarmsynchronisatie</string>
     <string name="foreground_notification_channel_description">Voorgrondnotificatie is nodig voor interne alarmsynchronisatie. Zet deze melding uit</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 6c740f240d3085995b4ce3cad06b894bc8e77814..0cd95067cfa6a871b112f44d0db089126d75d89f 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Dostępny"</item>
     <item msgid="2064426942462573474">"Wstępnie"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"1."</item>
-    <item msgid="5631923029483854900">"2."</item>
-    <item msgid="148935502975250973">"3."</item>
-    <item msgid="5124200797326669172">"4."</item>
-    <item msgid="7564374178324652137">"ostatni"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Brak odpowiedzi"</item>
     <item msgid="3724434080904437698">"Tak"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"To i przyszłe wydarzenia"</item>
     <item msgid="7833229563617435430">"Wszystkie wydarzenia"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"To i przyszłe wydarzenia"</item>
-    <item msgid="6315440193748139854">"Wszystkie wydarzenia"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Tylko to wydarzenie"</item>
     <item msgid="140670561403965380">"Wszystkie wydarzenia w serii"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7823492e6df56b1820f5d42ad8f05d5dcabcbfcd..103746c2d5604b4eec4d9ccc3f6139bb63f9f24f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -23,39 +23,46 @@
     <string name="tomorrow" msgid="614434811813859237">"Jutro"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Dzisiaj o <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Jutro o <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Powtarzanie"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Bez tytułu)"</string>
     <plurals name="Nminutes">
-        <item quantity="one">1 minuta</item>
+        <item quantity="one">1 minuta.</item>
         <item quantity="few">
             <xliff:g id="COUNT">%d</xliff:g> minuty</item>
         <item quantity="many">
             <xliff:g id="COUNT">%d</xliff:g> minut</item>
     </plurals>
     <plurals name="Nmins">
-        <item quantity="one">1 min</item>
+        <item quantity="one">1 minuta.</item>
         <item quantity="few">
-            <xliff:g id="COUNT">%d</xliff:g> min</item>
+            <xliff:g id="COUNT">%d</xliff:g> minuty</item>
         <item quantity="many">
-            <xliff:g id="COUNT">%d</xliff:g> min</item>
+            <xliff:g id="COUNT">%d</xliff:g> minut</item>
     </plurals>
     <plurals name="Nhours">
-        <item quantity="one">1 godzina</item>
+        <item quantity="one">1 godzina.</item>
         <item quantity="few">
             <xliff:g id="COUNT">%d</xliff:g> godziny</item>
         <item quantity="many">
             <xliff:g id="COUNT">%d</xliff:g> godzin</item>
     </plurals>
     <plurals name="Ndays">
-        <item quantity="one">1 dzień</item>
+        <item quantity="one">1 dzień.</item>
         <item quantity="few">
             <xliff:g id="COUNT">%d</xliff:g> dni</item>
         <item quantity="many">
             <xliff:g id="COUNT">%d</xliff:g> dni</item>
     </plurals>
     <plurals name="weekN">
-        <item quantity="other" msgid="8085184869561028365">"tydzień <xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="one">tydzień <xliff:g id="COUNT">%d</xliff:g>
+        </item>
+        <item quantity="few">tygodni <xliff:g id="COUNT">%d</xliff:g>
+        </item>
+        <item quantity="many">tygodnie <xliff:g id="COUNT">%d</xliff:g>
+        </item>
     </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Odśwież"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Pokaż dzień"</string>
@@ -69,16 +76,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Usuń wydarzenie"</string>
     <string name="goto_today" msgid="9162136434410891230">"Dzisiaj"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Ustawienia"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">Kalendarze do wyświetlenia</string>
     <string name="search" msgid="550656004486017426">"Szukaj"</string>
     <string name="hide_controls" msgid="830320505938520882">"Ukryj nawigację"</string>
     <string name="show_controls" msgid="715520586028062621">"Pokaż nawigację"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalendarze do wyświetlenia"</string>
-    <string name="synced" msgid="7913940305983383493">"zsynchronizowany"</string>
-    <string name="not_synced" msgid="4275114941801829419">"niezsynchronizowany"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Konto nie jest synchronizowane, dlatego kalendarze mogą być nieaktualne."</string>
-    <string name="accounts" msgid="849401841083180306">"Konta i synchronizacja"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Kalendarze do synchronizacji"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Kalendarze do synchronizacji"</string>
     <string name="hint_what" msgid="709155115005044531">"Nazwa wydarzenia"</string>
     <string name="hint_where" msgid="4972598001033801974">"Lokalizacja"</string>
@@ -97,14 +97,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Od"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Cały dzień"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalendarz"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Pokaż wszystkie"</string>
     <string name="description_label" msgid="7193475046717505855">"Opis"</string>
     <string name="presence_label" msgid="6169724148441175862">"Pokaż mój stan jako"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Prywatność"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Dodaj przypomnienie"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Brak kalendarzy"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Przed utworzeniem wydarzenia musisz dodać do urządzenia konto z Kalendarzem i ustawić wybrany kalendarz jako widoczny. Wybierz „Dodaj konto” (jeśli właśnie to zrobiłeś, poczekaj na zakończenie synchronizacji i spróbuj ponownie). Możesz też dotknąć Anuluj i upewnić się, że co najmniej jeden kalendarz jest widoczny."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalendarz działa lepiej z kontem."\n\n"• Używaj go w dowolnej przeglądarce."\n"• Twórz kopie zapasowe wydarzeń."</string>
     <string name="add_account" msgid="1669072099756774952">"Dodaj konto"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalendarz:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organizator:"</string>
@@ -125,7 +123,6 @@
     <string name="call_label" msgid="2960328220008869083">"Zadzwoń"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Szybkie odpowiedzi"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Edytuj domyślne odpowiedzi do uczestników"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Edytuj szybkie odpowiedzi"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Szybka odpowiedź"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Wybierz szybką odpowiedź"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Nie można znaleźć programu pocztowego"</string>
@@ -150,28 +147,31 @@
     <string name="delete_label" msgid="874742811918030739">"Usuń"</string>
     <string name="save_label" msgid="2133599104834432589">"Gotowe"</string>
     <string name="discard_label" msgid="2394623883289782541">"Anuluj"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Odłóż wszystkie"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Zamknij"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Drzemka"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Wydarzenie jednorazowe"</string>
     <string name="endByDate" msgid="7654221304929538201">"; do <xliff:g id="DATE">%s</xliff:g>"</string>
     <plurals name="endByCount">
-        <item quantity="one" msgid="3727754565990691816">"; jeden raz"</item>
-        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> razy"</item>
+        <item quantity="one">; jeden raz</item>
+        <item quantity="few">; <xliff:g id="number">%d</xliff:g> razy</item>
+        <item quantity="many">; co <xliff:g id="number">%d</xliff:g> razy</item>
     </plurals>
     <plurals name="daily">
-        <item quantity="one" msgid="5169052946627480942">"Codziennie"</item>
-        <item quantity="other" msgid="5455230727715859264">"Co <xliff:g id="NUMBER">%d</xliff:g> dni"</item>
+        <item quantity="one">Codziennie</item>
+        <item quantity="few">Co <xliff:g id="NUMBER">%d</xliff:g> dni</item>
+        <item quantity="many">Co <xliff:g id="NUMBER">%d</xliff:g> dni</item>
     </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Codziennie (pn-pt)"</string>
     <plurals name="weekly">
-        <item quantity="one" msgid="5463021019301453273">"Co tydzień w <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-        <item quantity="other" msgid="2857390143157377867">"Co <xliff:g id="NUMBER">%1$d</xliff:g> tygodni(e) w <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="one">Co tydzień w <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>
+        </item>
+        <item quantity="few">Co <xliff:g id="NUMBER">%1$d</xliff:g> tygodni w <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>
+        </item>
+        <item quantity="many">Co <xliff:g id="NUMBER">%1$d</xliff:g> tygodnie w <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>
+        </item>
     </plurals>
     <string name="monthly" msgid="4587116285383048586">"Co miesiąc"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Co rok"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Co miesiąc (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. każdego miesiąca)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Co rok (<xliff:g id="DATES">%s</xliff:g>)"</string>
     <string name="custom" product="default" msgid="4137468716966004993">"Niestandardowo (nie można dostosować na telefonie)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Zmień tylko to wydarzenie"</string>
     <string name="modify_all" msgid="4421657265864209041">"Zmień wszystkie wydarzenia w serii"</string>
@@ -203,23 +203,18 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Godziny będą podawane w domowej strefie czasowej (nawet w podróży)"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Domowa strefa czasowa"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Pokaż numer tygodnia"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Informacje"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Wersja kompilacji"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalendarz"</string>
     <plurals name="month_more_events">
-        <item quantity="one" msgid="8971334808414201327">"+1"</item>
-        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+        <item quantity="one">+1</item>
+        <item quantity="few">+<xliff:g id="NUMBER">%d</xliff:g>
+        </item>
+        <item quantity="many">+<xliff:g id="number">%d</xliff:g>
+        </item>
     </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Brak zbliżających się wydarzeń w kalendarzu"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Eksperymentalny"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Przypomnienia"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Pomiń przypomnienia"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Pomiń przypomnienia"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Ciche godziny"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Wyciszaj przypomnienia o wydarzeniach przez określony czas."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Początek cichych godzin"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Koniec cichych godzin"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Debugowanie"</string>
     <string name="copy_db" msgid="437691290566699292">"Wyślij bazę danych"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Trwa wyszukiwanie w witrynie <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Usuń uczestnika"</string>
@@ -232,45 +227,45 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Dodaj przypomnienie"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Usuń przypomnienie"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Dodaj uczestnika"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Synchronizuj kalendarz"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Wydarzenie całodniowe"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Powtarzanie"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Godzina przypomnienia"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Typ przypomnienia"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Pokaż mój stan jako"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Prywatność"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Powiadomienie kalendarza"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Uśpij powiadomienie"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Wyślij e-maila do gości"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Nowe wydarzenie"</string>
-    <string name="template_announce_item_index" msgid="4067877800670753110">"Wydarzenie <xliff:g id="ITEM_INDEX">%1$s</xliff:g> z <xliff:g id="ITEM_COUNT">%2$s</xliff:g>"</string>
+    <string name="template_announce_item_index" msgid="4067877800670753110">Wydarzenie <xliff:g id="ITEM_INDEX">%1$s</xliff:g> z <xliff:g id="ITEM_COUNT">%2$s</xliff:g>.</string>
     <plurals name="Nevents">
-        <item quantity="one" msgid="5230907142214104485">"1 wydarzenie"</item>
-        <item quantity="other" msgid="6093072093209431078">"Nowe wydarzenia (<xliff:g id="COUNT">%d</xliff:g>)"</item>
+        <item quantity="one">1 wydarzenie.</item>
+        <item quantity="few">Nowe wydarzenia <xliff:g id="count">%d</xliff:g>
+        </item>
+        <item quantity="many">Nowych wydarzeń <xliff:g id="count">%d</xliff:g>
+        </item>
     </plurals>
     <plurals name="N_remaining_events">
-        <item quantity="one" msgid="431585781647034528">"+1 wydarzenie"</item>
-        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> wydarzenia(ń)"</item>
+        <item quantity="one">+1 wydarzenie.</item>
+        <item quantity="few">+<xliff:g id="count">%d</xliff:g> wydarzenia</item>
+        <item quantity="many">+<xliff:g id="count">%d</xliff:g> wydarzeń</item>
     </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Wybrane wydarzenie"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NIE zaznaczaj -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Powtarzanie"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Nigdy nie powtarzaj"</string>
     <plurals name="recurrence_interval_daily">
-        <item quantity="one" msgid="1205422710088692631">"Co <xliff:g id="COUNT">%d</xliff:g> dzień"</item>
-        <item quantity="other" msgid="707566499994398250">"Co <xliff:g id="COUNT">%d</xliff:g> dni"</item>
+        <item quantity="one">Co <xliff:g id="COUNT">%d</xliff:g> dzień</item>
+        <item quantity="few">Co <xliff:g id="COUNT">%d</xliff:g> dni</item>
+        <item quantity="many">Co <xliff:g id="COUNT">%d</xliff:g> dni</item>
     </plurals>
     <plurals name="recurrence_interval_weekly">
-        <item quantity="one" msgid="4948681635464488351">"Co <xliff:g id="COUNT">%d</xliff:g> tydzień"</item>
-        <item quantity="other" msgid="7094801039989237061">"Co <xliff:g id="COUNT">%d</xliff:g> tyg."</item>
+        <item quantity="one">"Co  "<xliff:g id="count">%d</xliff:g> tydzień</item>
+        <item quantity="few">Co <xliff:g id="count">%d</xliff:g> tygodni</item>
+        <item quantity="many">Co <xliff:g id="count">%d</xliff:g> tygodnie</item>
     </plurals>
     <plurals name="recurrence_interval_monthly">
-        <item quantity="one" msgid="4768178401603139718">"Co <xliff:g id="COUNT">%d</xliff:g> miesiąc"</item>
-        <item quantity="other" msgid="5419723710346646523">"Co <xliff:g id="COUNT">%d</xliff:g> mies."</item>
+        <item quantity="one">Co <xliff:g id="COUNT">%d</xliff:g> miesiąc</item>
+        <item quantity="few">Co <xliff:g id="count">%d</xliff:g> miesięcy</item>
+        <item quantity="many">Co <xliff:g id="count">%d</xliff:g> miesięce</item>
     </plurals>
     <plurals name="recurrence_interval_yearly">
-        <item quantity="one" msgid="5819562634008179102">"Co <xliff:g id="COUNT">%d</xliff:g> rok"</item>
-        <item quantity="other" msgid="5678653649746562060">"Co <xliff:g id="COUNT">%d</xliff:g> lat(a)"</item>
+        <item quantity="one">Co <xliff:g id="COUNT">%d</xliff:g> rok</item>
+        <item quantity="few">Co <xliff:g id="count">%d</xliff:g> lat</item>
+        <item quantity="many">Co <xliff:g id="count">%d</xliff:g> lata</item>
     </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"tego samego dnia miesiąca"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Bez końca"</string>
@@ -278,8 +273,9 @@
     <string name="recurrence_end_date" msgid="3693751578164711701">"Do <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Określona liczba powtórzeń"</string>
     <plurals name="recurrence_end_count">
-        <item quantity="one" msgid="1400782968090516215">"Do <xliff:g id="EVENT_COUNT">%d</xliff:g> wydarzenia"</item>
-        <item quantity="other" msgid="8779598489398048259">"Dla <xliff:g id="EVENT_COUNT">%d</xliff:g> wydarzeń"</item>
+        <item quantity="one">Dla <xliff:g id="event_count">%d</xliff:g> wydarzenia</item>
+        <item quantity="few">Dla <xliff:g id="event_count">%d</xliff:g> wydarzeń</item>
+        <item quantity="many">Dla <xliff:g id="event_count">%d</xliff:g> wydarzeń</item>
     </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"zmień datę zakończenia"</string>
     <string name="visibility_default">Domyślne</string>
@@ -322,7 +318,7 @@
     <string name="preferences_service_terms">Warunki usługi</string>
     <string name="view_settings">Ustawienia widoku</string>
     <string name="default_start_title">Widok domyślny</string>
-    <string name="view_details">Szczegóły widoku</string>
+    <string name="display_options">Szczegóły widoku</string>
     <string name="display_time">Wyśietl czas</string>
     <string name="display_location">Wyświetl lokalizację</string>
     <string name="maximum_number_of_lines">Maksymalna ilość lini w wydarzeniu</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0e2549bf5e71af7e11cfef41853bdda0874bff85..891b376daccde1b81eebf643a92a7c078716cd2e 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -30,17 +30,10 @@
     <string name="share_label">Compartilhar</string>
     <string name="goto_today">Hoje</string>
     <string name="menu_preferences">Configurações</string>
-    <string name="menu_select_visible_calendars">Agendas para exibição</string>
     <string name="search">Pesquisar</string>
     <string name="hide_controls">Ocultar controles</string>
     <string name="show_controls">Mostrar controles</string>
     <string name="view_settings">Ver configurações</string>
-    <string name="select_visible_calendars_title">Agendas para exibição</string>
-    <string name="synced">sincronizado</string>
-    <string name="not_synced">não sincronizada</string>
-    <string name="acct_not_synced">Esta conta não é sincronizada e, por isso, é possível que suas agendas não estejam atualizadas.</string>
-    <string name="accounts">Contas e sincronização</string>
-    <string name="select_synced_calendars_title">Agendas para sincronização</string>
     <string name="select_synced_calendars_button">Agendas para sincronização</string>
     <string name="hint_what">Nome do evento</string>
     <string name="hint_where">Localização</string>
@@ -62,17 +55,12 @@
     <string name="edit_event_from_label">De</string>
     <string name="edit_event_all_day_label">O dia todo</string>
     <string name="edit_event_calendar_label">Agenda</string>
-    <string name="edit_event_show_all">Mostrar todos</string>
     <string name="description_label">Descrição</string>
     <string name="presence_label">Mostrar-me como</string>
     <string name="privacy_label">Privacidade</string>
     <string name="reminders_label">Adicionar lembrete</string>
     <string name="no_syncable_calendars">Nenhuma agenda disponível</string>
     <string name="no_calendars_found">Antes de adicionar um evento, você deve adicionar pelo menos uma conta do Agenda a seu dispositivo e tornar uma agenda visível. Toque em \"Adicionar conta\" para adicionar uma conta (caso tenha adicionado uma conta recentemente, aguarde o fim da sincronização e tente novamente). Ou toque em \"Cancelar\" e certifique-se de que pelo menos uma agenda esteja visível.</string>
-    <string name="create_an_account_desc">O aplicativo Agenda funciona melhor com uma Conta do.
-\n
-\n• Acesse-o a partir de qualquer navegador da web
-\n• Faça backup de seus eventos com segurança</string>
     <string name="add_account">Adicionar conta</string>
     <string name="view_event_calendar_label">Agenda:</string>
     <string name="view_event_organizer_label">Organizador:</string>
@@ -93,7 +81,6 @@
     <string name="call_label">Chamar</string>
     <string name="quick_response_settings">Respostas rápidas</string>
     <string name="quick_response_settings_summary">Editar resposta padrão em e-mail p/ convidados</string>
-    <string name="quick_response_settings_title">Editar respostas rápidas</string>
     <string name="quick_response_settings_edit_title">Resposta rápida</string>
     <string name="quick_response_dialog_title">Escolher resposta rápida</string>
     <string name="quick_response_email_failed">Falha ao localar um programa de e-mail</string>
@@ -117,7 +104,6 @@
     <string name="delete_label">Excluir</string>
     <string name="save_label">Concluído</string>
     <string name="discard_label">Cancelar</string>
-    <string name="snooze_all_label">Lembrar em 5 min</string>
     <string name="dismiss_all_label">Encerrar tudo</string>
     <string name="snooze_label">Soneca</string>
     <string name="does_not_repeat">Evento único</string>
@@ -126,8 +112,6 @@
     <string name="every_weekday">Todos os dias da semana (de segunda a sexta)</string>
     <string name="monthly">Mensalmente</string>
     <string name="yearly_plain">Anualmente</string>
-    <string name="monthly_on_day">Mensalmente (no dia <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)</string>
-    <string name="yearly">Anualmente (em <xliff:g id="DATES">%s</xliff:g>)</string>
     <string name="custom" product="default">Personalizado (não é possível personalizar no telefone)</string>
     <string name="modify_event">Alterar somente este evento</string>
     <string name="modify_all">Alterar todos os eventos da série</string>
@@ -137,7 +121,6 @@
     <string name="delete_this_event_title">Excluir este evento\?</string>
     <string name="delete_recurring_event_title">Excluir <xliff:g id="EVENTTITLE">%s</xliff:g>\?</string>
     <string name="change_response_title">Alterar resposta</string>
-    <string name="menu_general_preferences">Configurações gerais</string>
     <string name="preferences_title">Configurações</string>
     <string name="preferences_general_title">Configuração de visualização</string>
     <string name="preferences_month_view_portrait">Exibição mensal (vertical)</string>
@@ -150,7 +133,7 @@
     <string name="preferences_color_pick">Cor principal</string>
     <string name="preferences_reminder_title">Notificações e lembretes</string>
     <string name="preferences_hide_declined_title">Ocultar recusados</string>
-    <string name="view_details">Ver detalhes</string>
+    <string name="display_options">Ver detalhes</string>
     <string name="display_time">Mostrar hora</string>
     <string name="display_location">Mostrar localização</string>
     <string name="preferences_week_start_day_title">A semana começa em</string>
@@ -177,20 +160,12 @@
     <string name="snooze_delay_dialog_title">Definir atraso da soneca</string>
     <string name="preferences_default_snooze_delay_title">Tempo padrão de atraso da soneca</string>
     <string name="preferences_default_snooze_delay_dialog">Adiar soneca padrão</string>
-    <string name="preferences_about_title">Sobre</string>
     <string name="preferences_build_version">Versão da compilação</string>
     <string name="preferences_issues">Relatar erros</string>
-    <string name="gadget_title">Agenda</string>
     <string name="gadget_no_events">Não há eventos futuros na agenda</string>
     <string name="preferences_experimental_category">Experimentais</string>
-    <string name="preferences_reminders_category">Lembretes</string>
     <string name="preferences_reminders_responded_label">Ignorar lembretes</string>
     <string name="preferences_reminders_responded_dialog">Ignorar lembretes</string>
-    <string name="preferences_reminders_quiet_hours_label">Horário de silêncio</string>
-    <string name="preferences_reminders_quiet_hours_description">Silenciar lembretes de eventos durante o horário especificado.</string>
-    <string name="preferences_reminders_quiet_hours_start">Início hor. de silêncio</string>
-    <string name="preferences_reminders_quiet_hours_end">Fim do hor. de silêncio</string>
-    <string name="preferences_debug_category">Depuração</string>
     <string name="copy_db">Enviar banco de dados</string>
     <string name="directory_searching_fmt">Pesquisando <xliff:g id="DOMAIN">%s</xliff:g>…</string>
     <string name="accessibility_remove_attendee">Remover participante</string>
@@ -203,22 +178,14 @@
     <string name="accessibility_add_reminder">Adicionar lembrete</string>
     <string name="accessibility_remove_reminder">Remover lembrete</string>
     <string name="accessibility_add_attendee">Adicionar participante</string>
-    <string name="accessibility_sync_cal">Sincronizar agenda</string>
     <string name="accessibility_all_day">Evento durante o dia inteiro</string>
-    <string name="accessibility_repeats">Repetição</string>
     <string name="accessibility_reminder_time">Duração do lembrete</string>
     <string name="accessibility_reminder_type">Tipo de lembrete</string>
     <string name="accessibility_reminder_showmeas">Mostrar-me como</string>
     <string name="accessibility_reminder_privacy">Privacidade</string>
-    <string name="accessibility_cal_notification">Notificações da agenda</string>
-    <string name="accessibility_snooze_notification">Notificação de soneca</string>
-    <string name="accessibility_email_notification">Enviar e-mail para os convidados</string>
     <string name="day_view_new_event_hint">+ Novo evento</string>
     <string name="template_announce_item_index">Evento <xliff:g id="ITEM_INDEX">%1$s</xliff:g> de <xliff:g id="ITEM_COUNT">%2$s</xliff:g>.</string>
     <string name="acessibility_selected_marker_description">Eventos selecionados</string>
-    <string name="do_not_check">Não marcar -&gt;</string>
-    <string name="recurrence_dialog_title">Repetir</string>
-    <string name="recurrence_dialog_title_never">Não repetir</string>
     <string name="recurrence_month_pattern_by_day">no mesmo dia de cada mês</string>
     <string name="recurrence_end_continously">Sempre</string>
     <string name="recurrence_end_date_label">Até uma data</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 4704f076cd892223a729ee393edb8ed3af4d6fc8..c1d92668d3fc41ab1ac9540229b648220fdef506 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Disponível"</item>
     <item msgid="2064426942462573474">"Tentativa"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"primeiro/a"</item>
-    <item msgid="5631923029483854900">"segundo/a"</item>
-    <item msgid="148935502975250973">"terceiro/a"</item>
-    <item msgid="5124200797326669172">"quarto/a"</item>
-    <item msgid="7564374178324652137">"último"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Sem resposta"</item>
     <item msgid="3724434080904437698">"Sim"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Este e futuros eventos"</item>
     <item msgid="7833229563617435430">"Todos os eventos"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Este e futuros eventos"</item>
-    <item msgid="6315440193748139854">"Todos os eventos"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Apenas este evento"</item>
     <item msgid="140670561403965380">"Todos os eventos da série"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 031d670ff35eca480c493d61e36940becfc607cb..cce325fa52fa4ac4de2683b300aa317709d22a9f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Calendário"</string>
     <string name="what_label" msgid="1933578391985810049">"O quê"</string>
     <string name="where_label" msgid="3472482206065595118">"Onde"</string>
@@ -24,52 +21,46 @@
     <string name="attendees_label" msgid="2971281641565729725">"Convidados"</string>
     <string name="today" msgid="8577375020252453006">"Hoje"</string>
     <string name="tomorrow" msgid="614434811813859237">"Amanhã"</string>
-    <string name="today_at_time_fmt" msgid="1981279213130049736">"Hoje às <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Amanhã às <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="repeats_label" msgid="7414023871434593196">"Repetição"</string>
-    <string name="no_title_label" msgid="302177118061368042">"(Sem título)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minuto"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minutos"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 hora"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> horas"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 dia"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dias"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"semana <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <string name="today_at_time_fmt" msgid="1981279213130049736">Hoje, às <xliff:g id="time_interval">%s</xliff:g></string>
+    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">Amanhã, às <xliff:g id="time_interval">%s</xliff:g></string>
+    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g></string>
+    <string name="repeats_label" msgid="7414023871434593196">Repetições</string>
+    <string name="no_title_label" msgid="302177118061368042">(sem título)</string>
+    <plurals name="Nminutes">
+        <item quantity="one">1 minuto</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> minutos</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one">1 min</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> min</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one">1 hora</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> horas</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one">1 dia</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> dias</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="one">semana <xliff:g id="count">%d</xliff:g></item>
+        <item quantity="other">semana <xliff:g id="count">%d</xliff:g></item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Atualizar"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Mostrar dia"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
     <string name="day_view" msgid="4467754504843584437">"Dia"</string>
     <string name="week_view" msgid="6775043022159508060">"Semana"</string>
     <string name="month_view" msgid="7287101431749285412">"Mês"</string>
-    <string name="event_view" msgid="7621353079385122317">"Visualizar evento"</string>
+    <string name="event_view" msgid="7621353079385122317">Ver evento</string>
     <string name="event_create" msgid="6941040556709110617">"Novo evento"</string>
     <string name="event_edit" msgid="4006961928830064662">"Editar evento"</string>
     <string name="event_delete" msgid="2386667193277770442">"Eliminar evento"</string>
     <string name="goto_today" msgid="9162136434410891230">"Hoje"</string>
-    <string name="menu_preferences" msgid="9120238479503233925">"Definições"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Calendários para apresentar"</string>
+    <string name="menu_preferences" msgid="9120238479503233925">Definições</string>
     <string name="search" msgid="550656004486017426">"Pesquisar"</string>
     <string name="hide_controls" msgid="830320505938520882">"Ocultar controlos"</string>
     <string name="show_controls" msgid="715520586028062621">"Mostrar controlos"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Calendários para apresentar"</string>
-    <string name="synced" msgid="7913940305983383493">"sincronizado"</string>
-    <string name="not_synced" msgid="4275114941801829419">"não sincronizado"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Esta conta não está a ser sincronizada e os calendários podem não estar atualizados."</string>
-    <string name="accounts" msgid="849401841083180306">"Contas e sincronização"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Calendários a sincronizar"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Calendários a sincronizar"</string>
     <string name="hint_what" msgid="709155115005044531">"Nome do evento"</string>
     <string name="hint_where" msgid="4972598001033801974">"Localização"</string>
@@ -78,193 +69,178 @@
     <string name="creating_event" msgid="7516249252554059980">"Evento criado."</string>
     <string name="saving_event" msgid="7694181017411177226">"Evento guardado."</string>
     <string name="empty_event" msgid="9018699257414338634">"Evento vazio não criado."</string>
-    <string name="creating_event_with_guest" msgid="5758688413124191931">"Serão enviados convites."</string>
-    <string name="saving_event_with_guest" msgid="9184584438475689577">"Serão enviadas atualizações."</string>
+    <string name="creating_event_with_guest" msgid="5758688413124191931">Os convites serão enviados.</string>
+    <string name="saving_event_with_guest" msgid="9184584438475689577">As atualizações serão enviadas.</string>
     <string name="create_event_dialog_save" msgid="1080859798521717414">"Guardar"</string>
     <string name="alert_title" msgid="7869592820853066853">"Notificações do calendário"</string>
-    <string name="event_info_title" msgid="56024222340421620">"Visualizar evento"</string>
+    <string name="event_info_title" msgid="56024222340421620">Ver evento</string>
     <string name="event_info_title_invite" msgid="9160326363769403865">"Convite para reunião"</string>
-    <string name="edit_event_to_label" msgid="795012981218062421">"Até"</string>
+    <string name="edit_event_to_label" msgid="795012981218062421">Até</string>
     <string name="edit_event_from_label" msgid="174999102612666115">"De"</string>
-    <string name="edit_event_all_day_label" msgid="6200181113992136073">"Todo o dia"</string>
+    <string name="edit_event_all_day_label" msgid="6200181113992136073">Todo o dia</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Calendário"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Mostrar tudo"</string>
     <string name="description_label" msgid="7193475046717505855">"Descrição"</string>
     <string name="presence_label" msgid="6169724148441175862">"Mostrar-me como"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privacidade"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Adicionar lembrete"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Sem calendários"</string>
-    <string name="no_calendars_found" msgid="8968682716053492187">"Antes de poder adicionar um evento, tem de adicionar pelo menos uma conta do Calendário para o seu aparelho e tornar um calendário visível. Toque em Adicionar Conta para adicionar uma conta (se acabou de adicionar uma conta, aguarde até que termine a sincronização e tente novamente). Em alternativa, toque em Cancelar e certifique-se de que pelo menos um calendário está visível."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"A aplicação Calendário funciona melhor com uma Conta."\n\n"• Aceda à Conta a partir de qualquer navegador de Internet"\n"• Faça uma cópia de segurança dos seus eventos de forma segura"</string>
+    <string name="no_calendars_found" msgid="8968682716053492187">Antes de poder adicionar um evento, tem de adicionar pelo menos uma conta do Calendário e torná-lo visível. Toque em Adicionar conta para adicionar uma conta (se acabou de adicionar uma conta, aguarde que a sincronização esteja concluída). Em alternativa, toque em Cancelar e certifique-se que está visível pelo menos um calendário.</string>
     <string name="add_account" msgid="1669072099756774952">"Adicionar conta"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Calendário:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organizador:"</string>
-    <string name="choose_event_color_label" msgid="2192923501857428854">"Escolher a cor do evento"</string>
-    <string name="event_color_picker_dialog_title" msgid="4631938661655159511">"Cor do Evento"</string>
-    <string name="event_color_set_to_default" msgid="3447218820785647967">"Definir para a cor predefinida do calendário"</string>
-    <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">"Cor do Calendário"</string>
+    <string name="choose_event_color_label" msgid="2192923501857428854">Escolher cor do evento</string>
+    <string name="event_color_picker_dialog_title" msgid="4631938661655159511">Cor do evento</string>
+    <string name="event_color_set_to_default" msgid="3447218820785647967">Definir como cor padrão do calendário</string>
+    <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">Cor do calendário</string>
     <string name="calendar_square_color_picker_description" msgid="7430468363525563483">"Seletor de cores"</string>
-    <string name="view_event_response_label" msgid="8382281658458798329">"Assistir?"</string>
+    <string name="view_event_response_label" msgid="8382281658458798329">Vai estar presente\?</string>
     <string name="response_yes" msgid="2027484304899988350">"Sim"</string>
     <string name="response_maybe" msgid="7791500973627841695">"Talvez"</string>
     <string name="response_no" msgid="561911691884148136">"Não"</string>
-    <string name="email_guests_label" msgid="8772030932155305903">"Enviar email para os convidados"</string>
-    <string name="email_organizer_label" msgid="7178059542798074813">"Organizador de email"</string>
-    <string name="email_picker_label" msgid="4808253965057791781">"Enviar email a"</string>
+    <string name="email_guests_label" msgid="8772030932155305903">Enviar e-mail aos convidados</string>
+    <string name="email_organizer_label" msgid="7178059542798074813">Enviar e-mail ao organizador</string>
+    <string name="email_picker_label" msgid="4808253965057791781">Enviar e-mail com</string>
     <string name="event_not_found" msgid="8356864185947582727">"Evento não encontrado."</string>
     <string name="map_label" msgid="8795383535586556038">"Mapa"</string>
-    <string name="call_label" msgid="2960328220008869083">"Ligar"</string>
+    <string name="call_label" msgid="2960328220008869083">Ligar</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Respostas rápidas"</string>
-    <string name="quick_response_settings_summary" msgid="7878304729027355604">"Editar respostas predefinidas ao enviar email a convidados"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Editar respostas rápidas"</string>
+    <string name="quick_response_settings_summary" msgid="7878304729027355604">Editar respostas padrão em e-mails para convidados</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Resposta rápida"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Escolher resposta rápida"</string>
-    <string name="quick_response_email_failed" msgid="5544066405231853245">"Não foi possível encontrar um programa de email"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Estou ligeiramente atrasado(a)."</item>
-    <item msgid="6215158751728689832">"Chego daqui a cerca de 10 minutos."</item>
-    <item msgid="4485794001743679338">"Podem começar sem mim."</item>
-    <item msgid="8036557974294987511">"Lamento, mas não me é possível comparecer. Temos de reagendar."</item>
-  </string-array>
-    <string name="quick_response_custom_msg" msgid="8792374208224108798">"Escreva a sua própria..."</string>
+    <string name="quick_response_email_failed" msgid="5544066405231853245">Não foi encontrada nenhuma aplicação de e-mail</string>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Estou ligeiramente atrasado(a)."</item>
+        <item msgid="6215158751728689832">"Chego daqui a cerca de 10 minutos."</item>
+        <item msgid="4485794001743679338">"Podem começar sem mim."</item>
+        <item msgid="8036557974294987511">"Lamento, mas não me é possível comparecer. Temos de reagendar."</item>
+    </string-array>
+    <string name="quick_response_custom_msg" msgid="8792374208224108798">Escreva a sua resposta…</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organizador:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Lembretes"</string>
-    <string name="agenda_today" msgid="5965841338467422191">"hoje, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="agenda_yesterday" msgid="4170964206728599693">"ontem, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="agenda_tomorrow" msgid="3893625470780723605">"amanhã, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="loading" msgid="3772533493214331230">"A carregar..."</string>
-    <string name="show_older_events" msgid="5140647493681439926">"Tocar para ver eventos antes de <xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
-    <string name="show_newer_events" msgid="2604638815440163080">"Tocar para ver eventos após <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
-    <string name="search_title" msgid="8898015280250716254">"Pesquisar nos meus calendários"</string>
+    <string name="agenda_today" msgid="5965841338467422191">hoje, <xliff:g id="date">%1$s</xliff:g>
+    </string>
+    <string name="agenda_yesterday" msgid="4170964206728599693">ontem, <xliff:g id="date">%1$s</xliff:g>
+    </string>
+    <string name="agenda_tomorrow" msgid="3893625470780723605">amanhã, <xliff:g id="date">%1$s</xliff:g>
+    </string>
+    <string name="loading" msgid="3772533493214331230">A carregar…</string>
+    <string name="show_older_events" msgid="5140647493681439926">Toque para ver os eventos antes de <xliff:g id="oldest_search_range">%1$s</xliff:g>
+    </string>
+    <string name="show_newer_events" msgid="2604638815440163080">Toque para ver os eventos posteriores a <xliff:g id="newest_search_range">%1$s</xliff:g>
+    </string>
+    <string name="search_title" msgid="8898015280250716254">Pesquisar os meus calendários</string>
     <string name="edit_event_label" msgid="7413222956349977161">"Detalhes"</string>
     <string name="edit_label" msgid="8934331258435656534">"Editar"</string>
     <string name="delete_label" msgid="874742811918030739">"Eliminar"</string>
     <string name="save_label" msgid="2133599104834432589">"Concluído"</string>
     <string name="discard_label" msgid="2394623883289782541">"Cancelar"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Suspender todos"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Cancelar tudo"</string>
-    <string name="snooze_label" msgid="1515893621063224666">"Suspender"</string>
+    <string name="snooze_label" msgid="1515893621063224666">Adiar</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Evento único"</string>
-    <string name="endByDate" msgid="7654221304929538201">"; até <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; evento único"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> vezes"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Diariamente"</item>
-    <item quantity="other" msgid="5455230727715859264">"A cada <xliff:g id="NUMBER">%d</xliff:g> dias"</item>
-  </plurals>
-    <string name="every_weekday" msgid="5896574838353902978">"Todos os dias úteis (Seg-Sex)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Semanalmente às <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"A cada <xliff:g id="NUMBER">%1$d</xliff:g> semanas, às <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <string name="endByDate" msgid="7654221304929538201">; até <xliff:g id="date">%s</xliff:g>
+    </string>
+    <plurals name="endByCount">
+        <item quantity="one">; uma vez</item>
+        <item quantity="other">; <xliff:g id="number">%d</xliff:g> vezes</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one">Diariamente</item>
+        <item quantity="other">A cada <xliff:g id="number">%d</xliff:g> dias</item>
+    </plurals>
+    <string name="every_weekday" msgid="5896574838353902978">Todos os dias úteis (seg-sex)</string>
+    <plurals name="weekly">
+        <item quantity="one">Semanalmente às <xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+        <item quantity="other">A cada <xliff:g id="number">%1$d</xliff:g> semanas, às <xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Mensalmente"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anualmente"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Mensalmente (no dia <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Anualmente (em <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Personalizado (não é possível personalizar no telemóvel)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Alterar apenas este evento"</string>
-    <string name="modify_all" msgid="4421657265864209041">"Alterar todos os eventos da série"</string>
-    <string name="modify_all_following" msgid="3017428541066390380">"Alterar este e todos os futuros eventos"</string>
+    <string name="modify_all" msgid="4421657265864209041">Alterar todos os eventos nesta série</string>
+    <string name="modify_all_following" msgid="3017428541066390380">Alterar este e todos os eventos futuros</string>
     <string name="new_event_dialog_label" msgid="7553105224561147916">"Novo evento"</string>
     <string name="new_event_dialog_option" msgid="6154657379574669371">"Novo evento"</string>
     <string name="delete_this_event_title" msgid="518402946676919384">"Eliminar este evento?"</string>
-    <string name="delete_recurring_event_title" msgid="5609046778422180206">"Eliminar <xliff:g id="EVENTTITLE">%s</xliff:g>?"</string>
+    <string name="delete_recurring_event_title" msgid="5609046778422180206">Eliminar <xliff:g id="eventtitle">%s</xliff:g>\?</string>
     <string name="change_response_title" msgid="7704714776070974984">"Alterar resposta"</string>
     <string name="menu_general_preferences" msgid="2812705323334260708">"Definições gerais"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Definições"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Configuração de visualização do calendário"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Notificações e lembretes"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ocultar eventos recusados"</string>
-    <string name="preferences_week_start_day_title" msgid="4619489296444901622">"A semana começa"</string>
-    <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"A semana começa na"</string>
+    <string name="preferences_week_start_day_title" msgid="4619489296444901622">Primeiro dia da semana</string>
+    <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">Primeiro dia da semana</string>
     <string name="preferences_clear_search_history_title" msgid="6619916370215282982">"Limpar histórico de pesquisas"</string>
     <string name="preferences_clear_search_history_summary" msgid="7864674093455778158">"Remover todas as pesquisas efetuadas"</string>
     <string name="search_history_cleared" msgid="1536707558435227567">"Histórico de pesquisas limpo."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notificações"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrar"</string>
     <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Som"</string>
-    <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Notificação de pop-up"</string>
-    <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Tempo predefinido do lembrete"</string>
-    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Tempo predefinido do lembrete"</string>
+    <string name="preferences_alerts_popup_title" msgid="6643468203670475296">Notificação pop-up</string>
+    <string name="preferences_default_reminder_title" msgid="5188861433342733905">Tempo padrão do lembrete</string>
+    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">Tempo padrão do lembrete</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
-    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Usar hora de casa"</string>
-    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Mostra os calendários e horas dos eventos no fuso horário de casa quando viaja"</string>
-    <string name="preferences_home_tz_title" msgid="6680000444088818578">"Fuso hor. de casa"</string>
+    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">Usar hora local</string>
+    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">Mostrar calendários e horas dos eventos no seu fuso horário</string>
+    <string name="preferences_home_tz_title" msgid="6680000444088818578">Fuso horário</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostrar número da semana"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Acerca de"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versão da compilação"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Calendário"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one">+1</item>
+        <item quantity="other">+<xliff:g id="number">%d</xliff:g></item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Sem eventos futuros no calendário"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimental"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Lembretes"</string>
-    <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Ignorar Lembretes"</string>
-    <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Ignorar Lembretes"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Horas calmas"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Silenciar lembretes de eventos durante um período especificado."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Início das horas calmas"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Fim das horas calmas"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Depuração"</string>
+    <string name="preferences_reminders_responded_label" msgid="1196570678238475838">Ignorar lembretes</string>
+    <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">Ignorar lembretes</string>
     <string name="copy_db" msgid="437691290566699292">"Enviar base de dados"</string>
-    <string name="directory_searching_fmt" msgid="1232037509095606687">"A pesquisar <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+    <string name="directory_searching_fmt" msgid="1232037509095606687">A pesquisar <xliff:g id="domain">%s</xliff:g>…</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Remover participante"</string>
     <string name="accessibility_pick_start_date" msgid="3926641487042699037">"Data de início"</string>
     <string name="accessibility_pick_start_time" msgid="4913428100936555149">"Hora de início"</string>
-    <string name="accessibility_pick_end_date" msgid="5624250196618643922">"Data de conclusão"</string>
-    <string name="accessibility_pick_end_time" msgid="7120310166355224941">"Hora de conclusão"</string>
+    <string name="accessibility_pick_end_date" msgid="5624250196618643922">Data de término</string>
+    <string name="accessibility_pick_end_time" msgid="7120310166355224941">Hora de término</string>
     <string name="accessibility_pick_time_zone" msgid="7155465783500323811">"Fuso horário"</string>
     <string name="accessibility_pick_recurrence" msgid="1834311617874828931">"Repetir evento"</string>
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Adicionar lembrete"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Remover lembrete"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Adicionar participante"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sincronizar calendário"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Evento para todo o dia"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Repetição"</string>
-    <string name="accessibility_reminder_time" msgid="3594100545814579575">"Hora do lembrete"</string>
+    <string name="accessibility_reminder_time" msgid="3594100545814579575">Duração do lembrete</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Tipo de lembrete"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Mostrar-me como"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privacidade"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Notificação do Calendário"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Suspender Notificação"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Enviar email para os convidados"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Novo evento"</string>
-    <string name="template_announce_item_index" msgid="4067877800670753110">"Evento <xliff:g id="ITEM_INDEX">%1$s</xliff:g> de <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 evento"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> eventos"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 evento"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> eventos"</item>
-  </plurals>
+    <string name="template_announce_item_index" msgid="4067877800670753110">Evento <xliff:g id="item_index">%1$s</xliff:g> de <xliff:g id="item_count">%2$s</xliff:g>.</string>
+    <plurals name="Nevents">
+        <item quantity="one">1 evento</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> eventos</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one">+1 evento</item>
+        <item quantity="other">+<xliff:g id="count">%d</xliff:g> eventos</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Evento selecionado"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NÃO marque -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Repetir"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Nunca repete"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"A cada <xliff:g id="COUNT">%d</xliff:g> dia"</item>
-    <item quantity="other" msgid="707566499994398250">"A cada <xliff:g id="COUNT">%d</xliff:g> dias"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"A cada <xliff:g id="COUNT">%d</xliff:g> semana"</item>
-    <item quantity="other" msgid="7094801039989237061">"A cada <xliff:g id="COUNT">%d</xliff:g> semanas"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"A cada <xliff:g id="COUNT">%d</xliff:g> mês"</item>
-    <item quantity="other" msgid="5419723710346646523">"A cada <xliff:g id="COUNT">%d</xliff:g> meses"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"A cada <xliff:g id="COUNT">%d</xliff:g> ano"</item>
-    <item quantity="other" msgid="5678653649746562060">"A cada <xliff:g id="COUNT">%d</xliff:g> anos"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one">A cada <xliff:g id="count">%d</xliff:g> dia</item>
+        <item quantity="other">A cada <xliff:g id="count">%d</xliff:g> dias</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one">A cada <xliff:g id="count">%d</xliff:g> semana</item>
+        <item quantity="other">A cada <xliff:g id="count">%d</xliff:g> semanas</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one">A cada <xliff:g id="count">%d</xliff:g> mês</item>
+        <item quantity="other">A cada <xliff:g id="count">%d</xliff:g> meses</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one">A cada <xliff:g id="count">%d</xliff:g> ano</item>
+        <item quantity="other">A cada <xliff:g id="count">%d</xliff:g> anos</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"no mesmo dia de cada mês"</string>
-    <string name="recurrence_end_continously" msgid="6898950241634912991">"Para Sempre"</string>
+    <string name="recurrence_end_continously" msgid="6898950241634912991">Eternamente</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Até uma data"</string>
    sadf
 <!--    <string name="recurrence_end_date" msgid="3693751578164711701">"Até <xliff:g id="DATE">%s</xliff:g>"</string>-->
@@ -310,7 +286,7 @@
     <string name="preferences_color">Cor principal</string>
     <string name="preferences_color_pick">Cor principal</string>
     <string name="default_start_title">Vista padrão</string>
-    <string name="view_details">Detalhes de visualização</string>
+    <string name="display_options">Detalhes de visualização</string>
     <string name="display_time">Mostrar hora</string>
     <string name="display_location">Mostrar localização</string>
     <string name="default_start_last">Vista utilizada anteriormente</string>
@@ -349,4 +325,4 @@
     <string name="maximum_number_of_lines">Número máximo de linhas no evento</string>
     <string name="foreground_notification_channel_name">Sincronização de alertas</string>
     <string name="foreground_notification_channel_description">Requer notificação em primeiro plano para sincronização de alertas. Por favor silencie.</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index a719972113966448e3ca764d703689d8a45e16c7..f7f6c6d39749c7801513047eda8fd5076615e689 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Disponível"</item>
     <item msgid="2064426942462573474">"Tentativa"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"primeiro(a)"</item>
-    <item msgid="5631923029483854900">"segundo(a)"</item>
-    <item msgid="148935502975250973">"terceiro(a)"</item>
-    <item msgid="5124200797326669172">"quarto(a)"</item>
-    <item msgid="7564374178324652137">"último"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Sem resposta"</item>
     <item msgid="3724434080904437698">"Sim"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Este evento e eventos futuros"</item>
     <item msgid="7833229563617435430">"Todos os eventos"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Este evento e eventos futuros"</item>
-    <item msgid="6315440193748139854">"Todos os eventos"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Somente este evento"</item>
     <item msgid="140670561403965380">"Todos os eventos da série"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index de9ea50374303793f513b6ff7bd4f1f9888ea36f..5de1b3d3076e53cd2f85546a19f898789f4eb60c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,277 +12,260 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="5452708708398908131">"Agenda"</string>
-    <string name="what_label" msgid="1933578391985810049">"O que"</string>
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="5452708708398908131">Calendário</string>
+    <string name="what_label" msgid="1933578391985810049">O quê</string>
     <string name="where_label" msgid="3472482206065595118">"Onde"</string>
     <string name="when_label" msgid="894636567327261599">"Quando"</string>
     <string name="timezone_label" msgid="3988530993300431650">"Fuso horário"</string>
     <string name="attendees_label" msgid="2971281641565729725">"Convidados"</string>
     <string name="today" msgid="8577375020252453006">"Hoje"</string>
     <string name="tomorrow" msgid="614434811813859237">"Amanhã"</string>
-    <string name="today_at_time_fmt" msgid="1981279213130049736">"Hoje, às <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Amanhã, às <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="today_at_time_fmt" msgid="1981279213130049736">Hoje, às <xliff:g id="time_interval">%s</xliff:g>
+    </string>
+    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">Amanhã, às <xliff:g id="time_interval">%s</xliff:g>
+    </string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Repetições"</string>
-    <string name="no_title_label" msgid="302177118061368042">"(Sem título)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minuto"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minutos"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min."</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min."</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 hora"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> horas"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 dia"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dias"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <string name="no_title_label" msgid="302177118061368042">(sem título)</string>
+    <plurals name="Nminutes">
+        <item quantity="one">1 minuto</item>
+        <item quantity="other">
+            <xliff:g id="count">%d</xliff:g> minutos</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one">1 min.</item>
+        <item quantity="other">
+            <xliff:g id="count">%d</xliff:g> min.</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one">1 hora</item>
+        <item quantity="other">
+            <xliff:g id="count">%d</xliff:g> horas</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one">1 dia</item>
+        <item quantity="other">
+            <xliff:g id="count">%d</xliff:g> dias</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="one">semana <xliff:g id="count">%d</xliff:g>
+        </item>
+        <item quantity="other">semana <xliff:g id="count">%d</xliff:g>
+        </item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Atualizar"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Mostrar dia"</string>
-    <string name="agenda_view" msgid="5566084759423843245">"Compromissos"</string>
+    <string name="agenda_view" msgid="5566084759423843245">Agenda</string>
     <string name="day_view" msgid="4467754504843584437">"Dia"</string>
     <string name="week_view" msgid="6775043022159508060">"Semana"</string>
     <string name="month_view" msgid="7287101431749285412">"Mês"</string>
-    <string name="event_view" msgid="7621353079385122317">"Visualizar evento"</string>
+    <string name="event_view" msgid="7621353079385122317">Ver evento</string>
     <string name="event_create" msgid="6941040556709110617">"Novo evento"</string>
     <string name="event_edit" msgid="4006961928830064662">"Editar evento"</string>
-    <string name="event_delete" msgid="2386667193277770442">"Excluir evento"</string>
+    <string name="event_delete" msgid="2386667193277770442">Eliminar evento</string>
     <string name="goto_today" msgid="9162136434410891230">"Hoje"</string>
-    <string name="menu_preferences" msgid="9120238479503233925">"Configurações"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Agendas para exibição"</string>
+    <string name="menu_preferences" msgid="9120238479503233925">Definições</string>
     <string name="search" msgid="550656004486017426">"Pesquisar"</string>
-    <string name="hide_controls" msgid="830320505938520882">"Ocultar controles"</string>
-    <string name="show_controls" msgid="715520586028062621">"Mostrar controles"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Agendas para exibição"</string>
-    <string name="synced" msgid="7913940305983383493">"sincronizado"</string>
-    <string name="not_synced" msgid="4275114941801829419">"não sincronizada"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Esta conta não é sincronizada e, por isso, é possível que suas agendas não estejam atualizadas."</string>
-    <string name="accounts" msgid="849401841083180306">"Contas e sincronização"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Agendas para sincronização"</string>
-    <string name="select_synced_calendars_button" msgid="8890542984949996251">"Agendas para sincronização"</string>
+    <string name="hide_controls" msgid="830320505938520882">Ocultar controlos</string>
+    <string name="show_controls" msgid="715520586028062621">Mostrar controlos</string>
+    <string name="select_synced_calendars_button" msgid="8890542984949996251">Calendários a sincronizar</string>
     <string name="hint_what" msgid="709155115005044531">"Nome do evento"</string>
     <string name="hint_where" msgid="4972598001033801974">"Localização"</string>
     <string name="hint_description" msgid="1910143586169033232">"Descrição"</string>
     <string name="hint_attendees" msgid="1650488163176888480">"Convidados"</string>
     <string name="creating_event" msgid="7516249252554059980">"Evento criado."</string>
-    <string name="saving_event" msgid="7694181017411177226">"Evento salvo."</string>
+    <string name="saving_event" msgid="7694181017411177226">Evento guardado.</string>
     <string name="empty_event" msgid="9018699257414338634">"Evento vazio não criado."</string>
     <string name="creating_event_with_guest" msgid="5758688413124191931">"Os convites serão enviados."</string>
     <string name="saving_event_with_guest" msgid="9184584438475689577">"As atualizações serão enviadas."</string>
-    <string name="create_event_dialog_save" msgid="1080859798521717414">"Salvar"</string>
-    <string name="alert_title" msgid="7869592820853066853">"Notificações da agenda"</string>
-    <string name="event_info_title" msgid="56024222340421620">"Visualizar evento"</string>
+    <string name="create_event_dialog_save" msgid="1080859798521717414">Guardar</string>
+    <string name="alert_title" msgid="7869592820853066853">Notificações do calendário</string>
+    <string name="event_info_title" msgid="56024222340421620">Ver evento</string>
     <string name="event_info_title_invite" msgid="9160326363769403865">"Convite para reunião"</string>
-    <string name="edit_event_to_label" msgid="795012981218062421">"A"</string>
+    <string name="edit_event_to_label" msgid="795012981218062421">Até</string>
     <string name="edit_event_from_label" msgid="174999102612666115">"De"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"O dia todo"</string>
-    <string name="edit_event_calendar_label" msgid="4556498359505856900">"Agenda"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Mostrar todos"</string>
+    <string name="edit_event_calendar_label" msgid="4556498359505856900">Calendário</string>
     <string name="description_label" msgid="7193475046717505855">"Descrição"</string>
     <string name="presence_label" msgid="6169724148441175862">"Mostrar-me como"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privacidade"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Adicionar lembrete"</string>
-    <string name="no_syncable_calendars" msgid="7019488867045436129">"Nenhuma agenda disponível"</string>
-    <string name="no_calendars_found" msgid="8968682716053492187">"Antes de adicionar um evento, você deve adicionar pelo menos uma conta do Agenda a seu dispositivo e tornar uma agenda visível. Toque em \"Adicionar conta\" para adicionar uma conta (caso tenha adicionado uma conta recentemente, aguarde o fim da sincronização e tente novamente). Ou toque em \"Cancelar\" e certifique-se de que pelo menos uma agenda esteja visível."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"O aplicativo Agenda funciona melhor com uma Conta do."\n\n"• Acesse-o a partir de qualquer navegador da web"\n"• Faça backup de seus eventos com segurança"</string>
+    <string name="no_syncable_calendars" msgid="7019488867045436129">Sem calendários</string>
+    <string name="no_calendars_found" msgid="8968682716053492187">Antes de poder adicionar um evento, tem de adicionar pelo menos uma conta do Calendário e torná-lo visível. Toque em Adicionar conta para adicionar uma conta (se acabou de adicionar uma conta, aguarde que a sincronização esteja concluída). Em alternativa, toque em Cancelar e certifique-se que está visível pelo menos um calendário.</string>
     <string name="add_account" msgid="1669072099756774952">"Adicionar conta"</string>
-    <string name="view_event_calendar_label" msgid="6126231656338241140">"Agenda:"</string>
+    <string name="view_event_calendar_label" msgid="6126231656338241140">Calendário:</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organizador:"</string>
     <string name="choose_event_color_label" msgid="2192923501857428854">"Escolher cor do evento"</string>
     <string name="event_color_picker_dialog_title" msgid="4631938661655159511">"Cor do evento"</string>
-    <string name="event_color_set_to_default" msgid="3447218820785647967">"Definir como cor padrão de agenda"</string>
-    <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">"Cor da agenda"</string>
+    <string name="event_color_set_to_default" msgid="3447218820785647967">Definir como cor padrão do calendário</string>
+    <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">Cor do calendário</string>
     <string name="calendar_square_color_picker_description" msgid="7430468363525563483">"Seletor de cores"</string>
-    <string name="view_event_response_label" msgid="8382281658458798329">"Você vai?"</string>
+    <string name="view_event_response_label" msgid="8382281658458798329">Vai estar presente\?</string>
     <string name="response_yes" msgid="2027484304899988350">"Sim"</string>
     <string name="response_maybe" msgid="7791500973627841695">"Talvez"</string>
     <string name="response_no" msgid="561911691884148136">"Não"</string>
-    <string name="email_guests_label" msgid="8772030932155305903">"Enviar e-mail para os convidados"</string>
-    <string name="email_organizer_label" msgid="7178059542798074813">"Enviar e-mail para o organizador"</string>
-    <string name="email_picker_label" msgid="4808253965057791781">"Enviar e-mail para"</string>
+    <string name="email_guests_label" msgid="8772030932155305903">Enviar e-mail aos convidados</string>
+    <string name="email_organizer_label" msgid="7178059542798074813">Enviar e-mail ao organizador</string>
+    <string name="email_picker_label" msgid="4808253965057791781">Enviar e-mail com</string>
     <string name="event_not_found" msgid="8356864185947582727">"Evento não encontrado."</string>
     <string name="map_label" msgid="8795383535586556038">"Mapa"</string>
-    <string name="call_label" msgid="2960328220008869083">"Chamar"</string>
+    <string name="call_label" msgid="2960328220008869083">Ligar</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Respostas rápidas"</string>
-    <string name="quick_response_settings_summary" msgid="7878304729027355604">"Editar resposta padrão em e-mail p/ convidados"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Editar resp. ráp."</string>
+    <string name="quick_response_settings_summary" msgid="7878304729027355604">Editar respostas padrão em e-mails para convidados</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Resposta rápida"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Escolher resposta rápida"</string>
-    <string name="quick_response_email_failed" msgid="5544066405231853245">"Falha ao localar um programa de e-mail"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Chegarei c/ alguns mins. de atraso."</item>
-    <item msgid="6215158751728689832">"Chegarei em cerca de 10 minutos."</item>
-    <item msgid="4485794001743679338">"Vá em frente e comece sem mim."</item>
-    <item msgid="8036557974294987511">"Desculpe, não chegarei. Precisaremos remarcar."</item>
-  </string-array>
-    <string name="quick_response_custom_msg" msgid="8792374208224108798">"Escreva sua resposta..."</string>
+    <string name="quick_response_email_failed" msgid="5544066405231853245">Não foi encontrada uma aplicação de e-mail</string>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Chegarei c/ alguns mins. de atraso."</item>
+        <item msgid="6215158751728689832">"Chegarei em cerca de 10 minutos."</item>
+        <item msgid="4485794001743679338">"Vá em frente e comece sem mim."</item>
+        <item msgid="8036557974294987511">"Desculpe, não chegarei. Precisaremos remarcar."</item>
+    </string-array>
+    <string name="quick_response_custom_msg" msgid="8792374208224108798">Escreva a sua resposta…</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organizador:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Lembretes"</string>
-    <string name="agenda_today" msgid="5965841338467422191">"hoje, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="agenda_yesterday" msgid="4170964206728599693">"ontem, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="agenda_tomorrow" msgid="3893625470780723605">"amanhã, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="loading" msgid="3772533493214331230">"Carregando..."</string>
-    <string name="show_older_events" msgid="5140647493681439926">"Toque para ver os eventos antes de <xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
-    <string name="show_newer_events" msgid="2604638815440163080">"Toque para ver os eventos depois de <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
-    <string name="search_title" msgid="8898015280250716254">"Pesquisar minhas agendas"</string>
+    <string name="agenda_today" msgid="5965841338467422191">hoje, <xliff:g id="date">%1$s</xliff:g>
+    </string>
+    <string name="agenda_yesterday" msgid="4170964206728599693">ontem, <xliff:g id="date">%1$s</xliff:g>
+    </string>
+    <string name="agenda_tomorrow" msgid="3893625470780723605">amanhã, <xliff:g id="date">%1$s</xliff:g>
+    </string>
+    <string name="loading" msgid="3772533493214331230">A carregar…</string>
+    <string name="show_older_events" msgid="5140647493681439926">Toque para ver os eventos antes de <xliff:g id="oldest_search_range">%1$s</xliff:g>
+    </string>
+    <string name="show_newer_events" msgid="2604638815440163080">Toque para ver os eventos posteriores a <xliff:g id="newest_search_range">%1$s</xliff:g>
+    </string>
+    <string name="search_title" msgid="8898015280250716254">Pesquisar os meus calendários</string>
     <string name="edit_event_label" msgid="7413222956349977161">"Detalhes"</string>
     <string name="edit_label" msgid="8934331258435656534">"Editar"</string>
-    <string name="delete_label" msgid="874742811918030739">"Excluir"</string>
+    <string name="delete_label" msgid="874742811918030739">Eliminar</string>
     <string name="save_label" msgid="2133599104834432589">"Concluído"</string>
     <string name="discard_label" msgid="2394623883289782541">"Cancelar"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Lembrar em 5 min"</string>
-    <string name="dismiss_all_label" msgid="1834400025868091301">"Encerrar tudo"</string>
-    <string name="snooze_label" msgid="1515893621063224666">"Soneca"</string>
+    <string name="dismiss_all_label" msgid="1834400025868091301">Descartar todos</string>
+    <string name="snooze_label" msgid="1515893621063224666">Adiar</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Evento único"</string>
-    <string name="endByDate" msgid="7654221304929538201">"; até <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; uma vez"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> vezes"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Diariamente"</item>
-    <item quantity="other" msgid="5455230727715859264">"A cada <xliff:g id="NUMBER">%d</xliff:g> dias"</item>
-  </plurals>
-    <string name="every_weekday" msgid="5896574838353902978">"Todos os dias da semana (de segunda a sexta)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"A cada <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> a cada <xliff:g id="NUMBER">%1$d</xliff:g> semanas"</item>
-  </plurals>
+    <string name="endByDate" msgid="7654221304929538201">; até <xliff:g id="date">%s</xliff:g>
+    </string>
+    <plurals name="endByCount">
+        <item quantity="one">; uma vez</item>
+        <item quantity="other">; <xliff:g id="number">%d</xliff:g> vezes</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one">Diariamente</item>
+        <item quantity="other">A cada <xliff:g id="number">%d</xliff:g> dias</item>
+    </plurals>
+    <string name="every_weekday" msgid="5896574838353902978">Todos os dias úteis (seg-sex)</string>
+    <plurals name="weekly">
+        <item quantity="one">Semanalmente, às <xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+        <item quantity="other">A cada <xliff:g id="number">%1$d</xliff:g> semanas, às <xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Mensalmente"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anualmente"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Mensalmente (no dia <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Anualmente (em <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
-    <string name="custom" product="default" msgid="4137468716966004993">"Personalizado (não é possível personalizar no telefone)"</string>
-    <string name="modify_event" msgid="5982876409997142690">"Alterar somente este evento"</string>
-    <string name="modify_all" msgid="4421657265864209041">"Alterar todos os eventos da série"</string>
+    <string name="custom" product="default" msgid="4137468716966004993">Personalizado (não é possível personalizar no telemóvel)</string>
+    <string name="modify_event" msgid="5982876409997142690">Alterar apenas este evento</string>
+    <string name="modify_all" msgid="4421657265864209041">Alterar todos os eventos da série</string>
     <string name="modify_all_following" msgid="3017428541066390380">"Alterar este e todos os eventos futuros"</string>
     <string name="new_event_dialog_label" msgid="7553105224561147916">"Novo evento"</string>
     <string name="new_event_dialog_option" msgid="6154657379574669371">"Novo evento"</string>
-    <string name="delete_this_event_title" msgid="518402946676919384">"Excluir este evento?"</string>
-    <string name="delete_recurring_event_title" msgid="5609046778422180206">"Excluir <xliff:g id="EVENTTITLE">%s</xliff:g>?"</string>
+    <string name="delete_this_event_title" msgid="518402946676919384">Eliminar este evento\?</string>
+    <string name="delete_recurring_event_title" msgid="5609046778422180206">Eliminar <xliff:g id="eventtitle">%s</xliff:g>\?</string>
     <string name="change_response_title" msgid="7704714776070974984">"Alterar resposta"</string>
     <string name="menu_general_preferences" msgid="2812705323334260708">"Configurações gerais"</string>
     <string name="menu_about_preferences" msgid="6124375438237674973">Calendário sobre</string>
     <string name="preferences_title" msgid="8045855493262131773">"Configurações"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Configuração de visualização"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Notificações e lembretes"</string>
-    <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ocultar recusados"</string>
-    <string name="preferences_week_start_day_title" msgid="4619489296444901622">"A semana começa em"</string>
-    <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"A semana começa em"</string>
-    <string name="preferences_clear_search_history_title" msgid="6619916370215282982">"Limpar histórico de pesquisa"</string>
-    <string name="preferences_clear_search_history_summary" msgid="7864674093455778158">"Remover todas as pesquisas realizadas"</string>
-    <string name="search_history_cleared" msgid="1536707558435227567">"Histórico de pesquisa apagado."</string>
+    <string name="preferences_hide_declined_title" msgid="1849295943669890034">Ocultar eventos recusados</string>
+    <string name="preferences_week_start_day_title" msgid="4619489296444901622">Primeiro dia da semana</string>
+    <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">Primeiro dia da semana</string>
+    <string name="preferences_clear_search_history_title" msgid="6619916370215282982">Limpar histórico de pesquisas</string>
+    <string name="preferences_clear_search_history_summary" msgid="7864674093455778158">Remover todas as pesquisas efetuadas</string>
+    <string name="search_history_cleared" msgid="1536707558435227567">Histórico de pesquisas limpo.</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notificações"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrar"</string>
     <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Som"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Notificação pop-up"</string>
-    <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Tempo do lembrete"</string>
-    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Momento padrão do lembrete"</string>
+    <string name="preferences_default_reminder_title" msgid="5188861433342733905">Tempo padrão do lembrete</string>
+    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">Tempo padrão do lembrete</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
-    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Usar hora local"</string>
-    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Exibe agendas e eventos no seu fuso horário local quando você viajar"</string>
-    <string name="preferences_home_tz_title" msgid="6680000444088818578">"Fuso horário local"</string>
-    <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostrar núm. da semana"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Sobre"</string>
+    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">Usar fuso horário local</string>
+    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">Mostra os calendários e as horas dos eventos no seu fuso horário</string>
+    <string name="preferences_home_tz_title" msgid="6680000444088818578">Fuso horário</string>
+    <string name="preferences_show_week_num_title" msgid="5280734329664503461">Mostrar número da semana</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versão da compilação"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Agenda"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
-    <string name="gadget_no_events" msgid="5209110911088302855">"Não há eventos futuros na agenda"</string>
-    <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimentais"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Lembretes"</string>
+    <plurals name="month_more_events">
+        <item quantity="one">+1</item>
+        <item quantity="other">+<xliff:g id="number">%d</xliff:g>
+        </item>
+    </plurals>
+    <string name="gadget_no_events" msgid="5209110911088302855">Sem eventos futuros no calendário</string>
+    <string name="preferences_experimental_category" msgid="8111213192001230350">Experimental</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Ignorar lembretes"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Ignorar lembretes"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Horário de silêncio"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Silenciar lembretes de eventos durante o horário especificado."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Início hor. de silêncio"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Fim do hor. de silêncio"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Depuração"</string>
-    <string name="copy_db" msgid="437691290566699292">"Enviar banco de dados"</string>
-    <string name="directory_searching_fmt" msgid="1232037509095606687">"Pesquisando <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+    <string name="copy_db" msgid="437691290566699292">Enviar base de dados</string>
+    <string name="directory_searching_fmt" msgid="1232037509095606687">A pesquisar <xliff:g id="domain">%s</xliff:g>…</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Remover participante"</string>
     <string name="accessibility_pick_start_date" msgid="3926641487042699037">"Data de início"</string>
-    <string name="accessibility_pick_start_time" msgid="4913428100936555149">"Horário de início"</string>
+    <string name="accessibility_pick_start_time" msgid="4913428100936555149">Hora de início</string>
     <string name="accessibility_pick_end_date" msgid="5624250196618643922">"Data de término"</string>
-    <string name="accessibility_pick_end_time" msgid="7120310166355224941">"Horário de término"</string>
+    <string name="accessibility_pick_end_time" msgid="7120310166355224941">Hora de término</string>
     <string name="accessibility_pick_time_zone" msgid="7155465783500323811">"Fuso horário"</string>
     <string name="accessibility_pick_recurrence" msgid="1834311617874828931">"Repetir evento"</string>
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Adicionar lembrete"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Remover lembrete"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Adicionar participante"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sincronizar agenda"</string>
-    <string name="accessibility_all_day" msgid="4146955438811915282">"Evento durante o dia inteiro"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Repetição"</string>
-    <string name="accessibility_reminder_time" msgid="3594100545814579575">"Duração do lembrete"</string>
+    <string name="accessibility_all_day" msgid="4146955438811915282">Evento para todo o dia</string>
+    <string name="accessibility_reminder_time" msgid="3594100545814579575">Hora do lembrete</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Tipo de lembrete"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Mostrar-me como"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privacidade"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Notificações da agenda"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Notificação de soneca"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Enviar e-mail para os convidados"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Novo evento"</string>
-    <string name="template_announce_item_index" msgid="4067877800670753110">"Evento <xliff:g id="ITEM_INDEX">%1$s</xliff:g> de <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 evento"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> eventos"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 evento"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> eventos"</item>
-  </plurals>
-    <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Eventos selecionados"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"Não marcar -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Repetir"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Não repetir"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"A cada <xliff:g id="COUNT">%d</xliff:g> dia"</item>
-    <item quantity="other" msgid="707566499994398250">"A cada <xliff:g id="COUNT">%d</xliff:g> dias"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"A cada <xliff:g id="COUNT">%d</xliff:g> semana"</item>
-    <item quantity="other" msgid="7094801039989237061">"A cada <xliff:g id="COUNT">%d</xliff:g> semanas"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"A cada <xliff:g id="COUNT">%d</xliff:g> mês"</item>
-    <item quantity="other" msgid="5419723710346646523">"A cada <xliff:g id="COUNT">%d</xliff:g> meses"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"A cada <xliff:g id="COUNT">%d</xliff:g> ano"</item>
-    <item quantity="other" msgid="5678653649746562060">"A cada <xliff:g id="COUNT">%d</xliff:g> anos"</item>
-  </plurals>
+    <string name="template_announce_item_index" msgid="4067877800670753110">Evento <xliff:g id="item_index">%1$s</xliff:g> de <xliff:g id="item_count">%2$s</xliff:g>.</string>
+    <plurals name="Nevents">
+        <item quantity="one">1 evento</item>
+        <item quantity="other">
+            <xliff:g id="count">%d</xliff:g> eventos</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one">+1 evento</item>
+        <item quantity="other">+<xliff:g id="count">%d</xliff:g> eventos</item>
+    </plurals>
+    <string name="acessibility_selected_marker_description" msgid="3010149843148810768">Evento selecionado</string>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one">A cada <xliff:g id="count">%d</xliff:g> dia</item>
+        <item quantity="other">A cada <xliff:g id="count">%d</xliff:g> dias</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one">A cada <xliff:g id="count">%d</xliff:g> semana</item>
+        <item quantity="other">A cada <xliff:g id="count">%d</xliff:g> semanas</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one">A cada <xliff:g id="count">%d</xliff:g> mês</item>
+        <item quantity="other">A cada <xliff:g id="count">%d</xliff:g> meses</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one">A cada <xliff:g id="count">%d</xliff:g> ano</item>
+        <item quantity="other">A cada <xliff:g id="count">%d</xliff:g> anos</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"no mesmo dia de cada mês"</string>
-    <string name="recurrence_end_continously" msgid="6898950241634912991">"Sempre"</string>
+    <string name="recurrence_end_continously" msgid="6898950241634912991">Eternamente</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Até uma data"</string>
-    <string name="recurrence_end_date" msgid="3693751578164711701">"Até <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="recurrence_end_count_label" msgid="1233883668293087977">"Vários eventos"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Por <xliff:g id="EVENT_COUNT">%d</xliff:g> evento"</item>
-    <item quantity="other" msgid="8779598489398048259">"Por <xliff:g id="EVENT_COUNT">%d</xliff:g> eventos"</item>
-  </plurals>
+    <string name="recurrence_end_date" msgid="3693751578164711701">Até <xliff:g id="date">%s</xliff:g>
+    </string>
+    <string name="recurrence_end_count_label" msgid="1233883668293087977">Por um número de eventos</string>
+    <plurals name="recurrence_end_count">
+        <item quantity="one">Durante <xliff:g id="event_count">%d</xliff:g> evento</item>
+        <item quantity="other">Durante <xliff:g id="event_count">%d</xliff:g> eventos</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"alterar data de término"</string>
     <string name="visibility_default">Padrão</string>
 
 
-
-
-
-
-
-
     <string name="preferences_about_app">O calendário é bifurcado no Etar-Calendar</string>
     <string name="preferences_authors">Autores</string>
   <string name="preferences_source_code">Código fonte</string>
@@ -313,7 +296,7 @@
     <string name="preferences_color">Cor principal</string>
     <string name="preferences_color_pick">Cor principal</string>
     <string name="default_start_title">Vista padrão</string>
-    <string name="view_details">Ver detalhes</string>
+    <string name="display_options">Ver detalhes</string>
     <string name="display_time">Mostrar hora</string>
     <string name="display_location">Mostrar localização</string>
     <string name="default_start_last">Vista utilizada anteriormente</string>
@@ -344,4 +327,4 @@
     <string name="show_time_start_end">Hora de início e de término</string>
     <string name="show_time_start_end_below">Hora de início e de término para além do evento</string>
     <string name="maximum_number_of_lines">Quantidade máxima de linhas por evento</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 681e76e99a91e7328e2d2ef465cd1b9b410b2d34..c14f5325a4e9bcb3aab5daac5e59de330ed27452 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Disponibil"</item>
     <item msgid="2064426942462573474">"Tentativă"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"primul"</item>
-    <item msgid="5631923029483854900">"al doilea"</item>
-    <item msgid="148935502975250973">"al treilea"</item>
-    <item msgid="5124200797326669172">"al patrulea"</item>
-    <item msgid="7564374178324652137">"ultimul"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Niciun răspuns"</item>
     <item msgid="3724434080904437698">"Da"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Acest eveniment şi cele viitoare"</item>
     <item msgid="7833229563617435430">"Toate evenimentele"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Acesta şi evenimentele viitoare"</item>
-    <item msgid="6315440193748139854">"Toate evenimentele"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Doar acest eveniment"</item>
     <item msgid="140670561403965380">"Toate evenimentele din serie"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ebf823bed000b90aaa7fcb788424941bd6317f6e..dccfacc5d27e6b6ee6dd8af6d605f4f01d1e64a4 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Calendar"</string>
     <string name="what_label" msgid="1933578391985810049">"Ce"</string>
     <string name="where_label" msgid="3472482206065595118">"Unde"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Mâine"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Astăzi la <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Mâine la <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Repetiţie"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Fără titlu)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minut"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> (de) minute"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 minut"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> (de) minute"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 oră"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> (de) ore"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 zi"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> (de) zile"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"săptămâna <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minut"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> (de) minute"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 minut"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> (de) minute"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 oră"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> (de) ore"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 zi"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> (de) zile"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"săptămâna <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Actualizaţi"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Afişaţi ziua"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agendă"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Ștergeţi evenimentul"</string>
     <string name="goto_today" msgid="9162136434410891230">"Azi"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Setări"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"De afişat"</string>
     <string name="search" msgid="550656004486017426">"Căutaţi"</string>
     <string name="hide_controls" msgid="830320505938520882">"Ascundeţi comenzile"</string>
     <string name="show_controls" msgid="715520586028062621">"Afişaţi comenzile"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Calendare de afişat"</string>
-    <string name="synced" msgid="7913940305983383493">"sincronizat"</string>
-    <string name="not_synced" msgid="4275114941801829419">"nesincronizat"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Acest cont nu este sincronizat, prin urmare calendarele dvs. pot să nu fie actualizate."</string>
-    <string name="accounts" msgid="849401841083180306">"Conturi şi sincronizare"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Calendare de sincronizat"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Calendare de sincronizat"</string>
     <string name="hint_what" msgid="709155115005044531">"Numele evenimentului"</string>
     <string name="hint_where" msgid="4972598001033801974">"Locaţie"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"De la"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Toată ziua"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Calendar"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Afişaţi-le pe toate"</string>
     <string name="description_label" msgid="7193475046717505855">"Descriere"</string>
     <string name="presence_label" msgid="6169724148441175862">"Doresc să fiu afişat(ă) ca"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Confidenţialitate"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Adăugaţi memento"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Niciun calendar"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Înainte de a putea adăuga un eveniment, trebuie să adăugaţi cel puţin un cont Calendar pe dispozitiv şi să faceţi un calendar vizibil. Atingeţi „Adăugaţi un cont” pentru a adăuga un cont (dacă tocmai aţi adăugat un cont, aşteptaţi să se termine sincronizarea şi încercaţi din nou). Sau atingeţi „Anulaţi” şi asiguraţi-vă că cel puţin un calendar este vizibil."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Etar Calendar funcţionează mai bine cu un Cont."\n\n"• Accesaţi serviciul din orice browser web"\n"• Creaţi în siguranţă copii de rezervă pentru evenimentele dvs."</string>
     <string name="add_account" msgid="1669072099756774952">"Adăugaţi un cont"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Calendar:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organizator:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Apelați"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Răspunsuri rapide"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Editaţi răspuns prestab. e-mailuri invitaţi"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Editaţi răsp. rapide"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Răspuns rapid"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Alegeţi un răspuns rapid"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Nu s-a putut găsi un program de e-mail"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Întârzii numai câteva minute."</item>
-    <item msgid="6215158751728689832">"Ajung în aproximativ 10 minute."</item>
-    <item msgid="4485794001743679338">"Începeţi fără mine."</item>
-    <item msgid="8036557974294987511">"Îmi pare rău, nu pot să ajung. Va trebui să ne vedem altădată."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Întârzii numai câteva minute."</item>
+        <item msgid="6215158751728689832">"Ajung în aproximativ 10 minute."</item>
+        <item msgid="4485794001743679338">"Începeţi fără mine."</item>
+        <item msgid="8036557974294987511">"Îmi pare rău, nu pot să ajung. Va trebui să ne vedem altădată."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Scrieți propriul răspuns…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organizator:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Mementouri"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Ștergeţi"</string>
     <string name="save_label" msgid="2133599104834432589">"Terminat"</string>
     <string name="discard_label" msgid="2394623883289782541">"Anulaţi"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Amânaţi-le pe toate"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Renunţaţi la toate"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Amânaţi"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Eveniment unic"</string>
     <string name="endByDate" msgid="7654221304929538201">"; până la <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; o dată"</item>
-    <item quantity="other" msgid="4855496837834652446">"; de <xliff:g id="NUMBER">%d</xliff:g> ori"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Zilnic"</item>
-    <item quantity="other" msgid="5455230727715859264">"O dată la <xliff:g id="NUMBER">%d</xliff:g> zile"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; o dată"</item>
+        <item quantity="other" msgid="4855496837834652446">"; de <xliff:g id="NUMBER">%d</xliff:g> ori"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Zilnic"</item>
+        <item quantity="other" msgid="5455230727715859264">"O dată la <xliff:g id="NUMBER">%d</xliff:g> zile"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"În fiecare zi lucrătoare (Luni – Vineri)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Săptămânal, <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"La fiecare <xliff:g id="NUMBER">%1$d</xliff:g> săpt., <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Săptămânal, <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"La fiecare <xliff:g id="NUMBER">%1$d</xliff:g> săpt., <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Lunar"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Anual"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Lunar (în zile de <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Anual (pe <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Personalizat (nu se poate personaliza pe telefon)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Modificaţi doar acest eveniment"</string>
     <string name="modify_all" msgid="4421657265864209041">"Modificaţi toate evenimentele din serie"</string>
@@ -173,8 +158,6 @@
     <string name="delete_this_event_title" msgid="518402946676919384">"Ștergeţi acest eveniment?"</string>
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"Ștergeţi <xliff:g id="EVENTTITLE">%s</xliff:g>?"</string>
     <string name="change_response_title" msgid="7704714776070974984">"Modificaţi răspunsul"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"Setări generale"</string>
-    <string name="menu_about_preferences" msgid="6124375438237674973">"Despre Calendar"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Setări"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Setarea afişării calendarului"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Notificări și mementouri"</string>
@@ -195,23 +178,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"În călătorii, calendarul se afișează în fusul orar de acasă."</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Fus orar de acasă"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Afişaţi numărul săptămânii"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Despre"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versiunea"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Calendar"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Niciun eveniment viitor în calendar"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimentale"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Mementouri"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Ignorați mementourile"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Ignorați mementourile"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Interval de repaus"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Dezactivați mementourile pentru evenimente pe perioada specificată."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Început interval repaus"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Final interval repaus"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Remedierea erorilor"</string>
     <string name="copy_db" msgid="437691290566699292">"Trimiteţi baza de date"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Se caută <xliff:g id="DOMAIN">%s</xliff:g>..."</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Eliminaţi participantul"</string>
@@ -224,55 +199,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Adăugaţi memento"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Eliminaţi mementoul"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Adăugaţi participant"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sincronizaţi calendarul"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Eveniment cotidian"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Repetiţie"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Timp pentru memento"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Tip de memento"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Doresc să fiu afişat(ă) ca"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Confidenţialitate"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Notificare din calendar"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Amânaţi notificarea"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Trimiteţi e-mailuri invitaţilor"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Eveniment nou"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Evenimentul <xliff:g id="ITEM_INDEX">%1$s</xliff:g> din <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 eveniment"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> (de) evenimente"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 eveniment"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> (de) evenimente"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 eveniment"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> (de) evenimente"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 eveniment"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> (de) evenimente"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Eveniment selectat"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NU bifaţi -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Repetare"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Nu se repetă"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"O dată la <xliff:g id="COUNT">%d</xliff:g> zi"</item>
-    <item quantity="other" msgid="707566499994398250">"O dată la <xliff:g id="COUNT">%d</xliff:g> zile"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"O dată la <xliff:g id="COUNT">%d</xliff:g> săptămână"</item>
-    <item quantity="other" msgid="7094801039989237061">"O dată la <xliff:g id="COUNT">%d</xliff:g> săptămâni"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"O dată la <xliff:g id="COUNT">%d</xliff:g> lună"</item>
-    <item quantity="other" msgid="5419723710346646523">"O dată la <xliff:g id="COUNT">%d</xliff:g> luni"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"O dată la <xliff:g id="COUNT">%d</xliff:g> an"</item>
-    <item quantity="other" msgid="5678653649746562060">"O dată la <xliff:g id="COUNT">%d</xliff:g> ani"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"O dată la <xliff:g id="COUNT">%d</xliff:g> zi"</item>
+        <item quantity="other" msgid="707566499994398250">"O dată la <xliff:g id="COUNT">%d</xliff:g> zile"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"O dată la <xliff:g id="COUNT">%d</xliff:g> săptămână"</item>
+        <item quantity="other" msgid="7094801039989237061">"O dată la <xliff:g id="COUNT">%d</xliff:g> săptămâni"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"O dată la <xliff:g id="COUNT">%d</xliff:g> lună"</item>
+        <item quantity="other" msgid="5419723710346646523">"O dată la <xliff:g id="COUNT">%d</xliff:g> luni"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"O dată la <xliff:g id="COUNT">%d</xliff:g> an"</item>
+        <item quantity="other" msgid="5678653649746562060">"O dată la <xliff:g id="COUNT">%d</xliff:g> ani"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"în aceeași zi lunar"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Întotdeauna"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Până la o anumită dată"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Până la <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"De mai multe ori"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Pentru <xliff:g id="EVENT_COUNT">%d</xliff:g> eveniment"</item>
-    <item quantity="other" msgid="8779598489398048259">"Pentru <xliff:g id="EVENT_COUNT">%d</xliff:g> evenimente"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Pentru <xliff:g id="EVENT_COUNT">%d</xliff:g> eveniment"</item>
+        <item quantity="other" msgid="8779598489398048259">"Pentru <xliff:g id="EVENT_COUNT">%d</xliff:g> evenimente"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"schimbați data de încheiere"</string>
     <string name="visibility_default">Prestabilit</string>
   <string name="visibility_private">Privat</string>
@@ -283,4 +250,4 @@
   <string name="preferences_licence">licență</string>
     <string name="preferences_privacy_policy">Politica de confidențialitate</string>
     <string name="preferences_service_terms">Termenii serviciului</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index bcc64550d680d96b4825477aa13fa9e6e04f29ea..08120e5fc275ff01998afcee5598834214280c88 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Доступен"</item>
     <item msgid="2064426942462573474">"Может быть"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"1"</item>
-    <item msgid="5631923029483854900">"2"</item>
-    <item msgid="148935502975250973">"3"</item>
-    <item msgid="5124200797326669172">"4"</item>
-    <item msgid="7564374178324652137">"посл."</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Не ответили"</item>
     <item msgid="3724434080904437698">"Да"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Это и будущие мероприятия"</item>
     <item msgid="7833229563617435430">"Все мероприятия"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Это и будущие мероприятия"</item>
-    <item msgid="6315440193748139854">"Все мероприятия"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Только это мероприятие"</item>
     <item msgid="140670561403965380">"Все мероприятия в серии"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index be05d4c26dbd2d89b735c62736a0a3579563e4f4..fb2c31c5f0ffd1662d8a226942cfb06e73d2ca79 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,206 +12,189 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Календарь"</string>
     <string name="what_label" msgid="1933578391985810049">"Что"</string>
     <string name="where_label" msgid="3472482206065595118">"Где"</string>
     <string name="when_label" msgid="894636567327261599">"Когда"</string>
     <string name="timezone_label" msgid="3988530993300431650">"Часовой пояс"</string>
-    <string name="attendees_label" msgid="2971281641565729725">"Гости"</string>
+    <string name="attendees_label" msgid="2971281641565729725">Участники</string>
     <string name="today" msgid="8577375020252453006">"Сегодня"</string>
     <string name="tomorrow" msgid="614434811813859237">"Завтра"</string>
-    <string name="today_at_time_fmt" msgid="1981279213130049736">"Сегодня, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Завтра, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="today_at_time_fmt" msgid="1981279213130049736">Сегодня, <xliff:g id="time_interval">%s</xliff:g></string>
+    <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">Завтра, <xliff:g id="time_interval">%s</xliff:g></string>
+    <string name="date_time_fmt" msgid="1642972650061946484"><xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g></string>
     <string name="repeats_label" msgid="7414023871434593196">"Повторять"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Нет заголовка)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 минута"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> мин."</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 мин."</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> мин."</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"за 1 час"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> ч."</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 день"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> дн."</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"Неделя <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one">1 минута</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> минуты</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> минут</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one">1 мин.</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> мин.</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> мин.</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one">1 час</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> часа</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> часов</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one">1 день</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> дня</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> дней</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> неделя</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> неделя</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> неделя</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Обновить"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Показать день"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Повестка дня"</string>
     <string name="day_view" msgid="4467754504843584437">"День"</string>
     <string name="week_view" msgid="6775043022159508060">"Неделя"</string>
     <string name="month_view" msgid="7287101431749285412">"Месяц"</string>
-    <string name="event_view" msgid="7621353079385122317">"Просмотр мероприятия"</string>
-    <string name="event_create" msgid="6941040556709110617">"Новое мероприятие"</string>
-    <string name="event_edit" msgid="4006961928830064662">"Изменить мероприятие"</string>
-    <string name="event_delete" msgid="2386667193277770442">"Удалить мероприятие"</string>
+    <string name="event_view" msgid="7621353079385122317">Просмотр события</string>
+    <string name="event_create" msgid="6941040556709110617">Новое событие</string>
+    <string name="event_edit" msgid="4006961928830064662">Изменить событие</string>
+    <string name="event_delete" msgid="2386667193277770442">Удалить событие</string>
     <string name="goto_today" msgid="9162136434410891230">"Сегодня"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Настройки"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Календари"</string>
     <string name="search" msgid="550656004486017426">"Поиск"</string>
     <string name="hide_controls" msgid="830320505938520882">"Скрыть боковую панель"</string>
     <string name="show_controls" msgid="715520586028062621">"Показать боковую панель"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Календари"</string>
-    <string name="synced" msgid="7913940305983383493">"синхронизирован"</string>
-    <string name="not_synced" msgid="4275114941801829419">"не синхронизирован"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Этот аккаунт не синхронизируется, поэтому ваши календари не обновляются."</string>
-    <string name="accounts" msgid="849401841083180306">"Аккаунты"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Календари для синхронизации"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Календари для синхронизации"</string>
-    <string name="hint_what" msgid="709155115005044531">"Название мероприятия"</string>
+    <string name="hint_what" msgid="709155115005044531">Название события</string>
     <string name="hint_where" msgid="4972598001033801974">"Место"</string>
     <string name="hint_description" msgid="1910143586169033232">"Описание"</string>
-    <string name="hint_attendees" msgid="1650488163176888480">"Гости"</string>
-    <string name="creating_event" msgid="7516249252554059980">"Мероприятие создано."</string>
-    <string name="saving_event" msgid="7694181017411177226">"Мероприятие сохранено."</string>
-    <string name="empty_event" msgid="9018699257414338634">"Нельзя создать мероприятие без данных."</string>
+    <string name="hint_attendees" msgid="1650488163176888480">Участники</string>
+    <string name="creating_event" msgid="7516249252554059980">Событие создано.</string>
+    <string name="saving_event" msgid="7694181017411177226">Событие сохранено.</string>
+    <string name="empty_event" msgid="9018699257414338634">Нельзя создать событие без данных.</string>
     <string name="creating_event_with_guest" msgid="5758688413124191931">"Приглашения будут отправлены."</string>
     <string name="saving_event_with_guest" msgid="9184584438475689577">"Обновления будут отправлены."</string>
     <string name="create_event_dialog_save" msgid="1080859798521717414">"Сохранить"</string>
     <string name="alert_title" msgid="7869592820853066853">"Уведомления календаря"</string>
-    <string name="event_info_title" msgid="56024222340421620">"Просмотр мероприятия"</string>
+    <string name="event_info_title" msgid="56024222340421620">Просмотр события</string>
     <string name="event_info_title_invite" msgid="9160326363769403865">"Приглашение на встречу"</string>
     <string name="edit_event_to_label" msgid="795012981218062421">"До"</string>
     <string name="edit_event_from_label" msgid="174999102612666115">"С"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Целый день"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Календарь"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Показать все"</string>
     <string name="description_label" msgid="7193475046717505855">"Описание"</string>
-    <string name="presence_label" msgid="6169724148441175862">"Мой статус:"</string>
+    <string name="presence_label" msgid="6169724148441175862">Мой статус</string>
     <string name="privacy_label" msgid="9215031965259597335">"Конфиденциальность"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Добавить напоминание"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Нет календарей"</string>
-    <string name="no_calendars_found" msgid="8968682716053492187">"Добавить мероприятие можно только в видимый календарь, связанный с аккаунтом Google. Нажмите \"Добавить аккаунт\" или, если аккаунт уже добавлен, дождитесь окончания синхронизации и повторите попытку. Либо нажмите \"Отмена\" и сделайте видимым хотя бы один календарь."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Подключите Календарь к аккаунту Google, чтобы: "\n\n"• Всегда иметь под рукой обновленные данные – на любом устройстве."\n"• Синхронизировать все мероприятия – вы никогда не потеряете их."</string>
+    <string name="no_calendars_found" msgid="8968682716053492187">Добавить событие можно только в видимый календарь, связанный с аккаунтом Google. Нажмите \"Добавить аккаунт\" или, если аккаунт уже добавлен, дождитесь окончания синхронизации и повторите попытку. Либо нажмите \"Отмена\" и сделайте видимым хотя бы один календарь.</string>
     <string name="add_account" msgid="1669072099756774952">"Добавить аккаунт"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Календарь:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Организатор:"</string>
-    <string name="choose_event_color_label" msgid="2192923501857428854">"Выбрать цвет мероприятия"</string>
-    <string name="event_color_picker_dialog_title" msgid="4631938661655159511">"Цвет мероприятия"</string>
+    <string name="choose_event_color_label" msgid="2192923501857428854">Выбрать цвет события</string>
+    <string name="event_color_picker_dialog_title" msgid="4631938661655159511">Цвет события</string>
     <string name="event_color_set_to_default" msgid="3447218820785647967">"Сделать цветом календаря по умолчанию"</string>
     <string name="calendar_color_picker_dialog_title" msgid="3595509200561433667">"Цвет календаря"</string>
-    <string name="calendar_square_color_picker_description" msgid="7430468363525563483">"Цветовая палитра"</string>
+    <string name="calendar_square_color_picker_description" msgid="7430468363525563483">Выбор цвета</string>
     <string name="view_event_response_label" msgid="8382281658458798329">"Принять приглашение?"</string>
     <string name="response_yes" msgid="2027484304899988350">"Да"</string>
-    <string name="response_maybe" msgid="7791500973627841695">"Может быть"</string>
+    <string name="response_maybe" msgid="7791500973627841695">Возможно</string>
     <string name="response_no" msgid="561911691884148136">"Нет"</string>
-    <string name="email_guests_label" msgid="8772030932155305903">"Уведомить гостей по эл. почте"</string>
+    <string name="email_guests_label" msgid="8772030932155305903">Уведомить участников по эл. почте</string>
     <string name="email_organizer_label" msgid="7178059542798074813">"Написать организатору"</string>
     <string name="email_picker_label" msgid="4808253965057791781">"Отправить из"</string>
-    <string name="event_not_found" msgid="8356864185947582727">"Мероприятие не найдено"</string>
+    <string name="event_not_found" msgid="8356864185947582727">Событие не найдено.</string>
     <string name="map_label" msgid="8795383535586556038">"Карта"</string>
     <string name="call_label" msgid="2960328220008869083">"Позвонить"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Быстрые ответы"</string>
-    <string name="quick_response_settings_summary" msgid="7878304729027355604">"Изменить ответы"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Изменить ответы"</string>
+    <string name="quick_response_settings_summary" msgid="7878304729027355604">Изменение ответов по умолчанию при уведомлении участников по электронной почте</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Быстрый ответ"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Выбор быстрого ответа"</string>
-    <string name="quick_response_email_failed" msgid="5544066405231853245">"Не удалось найти почтовый клиент."</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Задерживаюсь на пару минут."</item>
-    <item msgid="6215158751728689832">"Буду примерно через 10 минут."</item>
-    <item msgid="4485794001743679338">"Начинайте без меня."</item>
-    <item msgid="8036557974294987511">"К сожалению, я не успеваю. Придется перенести мероприятие."</item>
-  </string-array>
+    <string name="quick_response_email_failed" msgid="5544066405231853245">Не удалось найти почтовый клиент</string>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Задерживаюсь на пару минут."</item>
+        <item msgid="6215158751728689832">"Буду примерно через 10 минут."</item>
+        <item msgid="4485794001743679338">"Начинайте без меня."</item>
+        <item msgid="8036557974294987511">"К сожалению, я не успеваю. Придется перенести мероприятие."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Ваш ответ…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Организатор:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Напоминания"</string>
-    <string name="agenda_today" msgid="5965841338467422191">"СЕГОДНЯ, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="agenda_yesterday" msgid="4170964206728599693">"ВЧЕРА, <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="agenda_tomorrow" msgid="3893625470780723605">"ЗАВТРА, <xliff:g id="DATE">%1$s</xliff:g>"</string>
+    <string name="agenda_today" msgid="5965841338467422191">сегодня, <xliff:g id="date">%1$s</xliff:g></string>
+    <string name="agenda_yesterday" msgid="4170964206728599693">вчера, <xliff:g id="date">%1$s</xliff:g></string>
+    <string name="agenda_tomorrow" msgid="3893625470780723605">завтра, <xliff:g id="date">%1$s</xliff:g></string>
     <string name="loading" msgid="3772533493214331230">"Загрузка…"</string>
-    <string name="show_older_events" msgid="5140647493681439926">"Нажмите, чтобы увидеть мероприятия до <xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
-    <string name="show_newer_events" msgid="2604638815440163080">"Нажмите, чтобы увидеть мероприятия после <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
+    <string name="show_older_events" msgid="5140647493681439926">Нажмите, чтобы увидеть события до <xliff:g id="oldest_search_range">%1$s</xliff:g></string>
+    <string name="show_newer_events" msgid="2604638815440163080">Нажмите, чтобы увидеть события после <xliff:g id="newest_search_range">%1$s</xliff:g></string>
     <string name="search_title" msgid="8898015280250716254">"Поиск в моих календарях"</string>
     <string name="edit_event_label" msgid="7413222956349977161">"Сведения"</string>
     <string name="edit_label" msgid="8934331258435656534">"Изменить"</string>
     <string name="delete_label" msgid="874742811918030739">"Удалить"</string>
     <string name="save_label" msgid="2133599104834432589">"Готово"</string>
     <string name="discard_label" msgid="2394623883289782541">"Отмена"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Напомнить"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Удалить все"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Отложить"</string>
-    <string name="does_not_repeat" msgid="1877681921029738999">"Однократное мероприятие"</string>
-    <string name="endByDate" msgid="7654221304929538201">"до <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; 1 раз"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> раз(-а)"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Ежедневно"</item>
-    <item quantity="other" msgid="5455230727715859264">"Раз в <xliff:g id="NUMBER">%d</xliff:g> дн."</item>
-  </plurals>
+    <string name="does_not_repeat" msgid="1877681921029738999">Однократное событие</string>
+    <string name="endByDate" msgid="7654221304929538201">до <xliff:g id="date">%s</xliff:g></string>
+    <plurals name="endByCount">
+        <item quantity="one"><xliff:g id="number">%d</xliff:g> раз</item>
+        <item quantity="few"><xliff:g id="number">%d</xliff:g> раза</item>
+        <item quantity="many"><xliff:g id="number">%d</xliff:g> раз</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one">Ежедневно</item>
+        <item quantity="few">Раз в <xliff:g id="NUMBER">%d</xliff:g> дня</item>
+        <item quantity="many">Раз в <xliff:g id="NUMBER">%d</xliff:g> дней</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Каждый будний день (пн–пт)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Еженедельно (<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
-    <item quantity="other" msgid="2857390143157377867">"Кажд. <xliff:g id="NUMBER">%1$d</xliff:g> нед. (<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one">Еженедельно (<xliff:g id="days_of_week">%2$s</xliff:g>)</item>
+        <item quantity="few">Раз в <xliff:g id="number">%1$d</xliff:g> недели (<xliff:g id="days_of_week">%2$s</xliff:g>)</item>
+        <item quantity="many">Раз в <xliff:g id="number">%1$d</xliff:g> недель (<xliff:g id="days_of_week">%2$s</xliff:g>)</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Ежемесячно"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Ежегодно"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Ежемесячно (<xliff:g id="DAY_OF_MONTH">%s</xliff:g> числа)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Ежегодно (<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Особое… (настраивается только на сайте)"</string>
-    <string name="modify_event" msgid="5982876409997142690">"Изменить только это мероприятие"</string>
-    <string name="modify_all" msgid="4421657265864209041">"Изменить все мероприятия в серии"</string>
-    <string name="modify_all_following" msgid="3017428541066390380">"Изменить это и будущие мероприятия"</string>
-    <string name="new_event_dialog_label" msgid="7553105224561147916">"Новое мероприятие"</string>
-    <string name="new_event_dialog_option" msgid="6154657379574669371">"Новое мероприятие"</string>
-    <string name="delete_this_event_title" msgid="518402946676919384">"Удалить мероприятие?"</string>
-    <string name="delete_recurring_event_title" msgid="5609046778422180206">"Удалить мероприятие \"<xliff:g id="EVENTTITLE">%s</xliff:g>\"?"</string>
+    <string name="modify_event" msgid="5982876409997142690">Изменить только это событие</string>
+    <string name="modify_all" msgid="4421657265864209041">Изменить все события в серии</string>
+    <string name="modify_all_following" msgid="3017428541066390380">Изменить это и будущие события</string>
+    <string name="new_event_dialog_label" msgid="7553105224561147916">Новое событие</string>
+    <string name="new_event_dialog_option" msgid="6154657379574669371">Новое событие</string>
+    <string name="delete_this_event_title" msgid="518402946676919384">Удалить событие\?</string>
+    <string name="delete_recurring_event_title" msgid="5609046778422180206">Удалить событие \"<xliff:g id="eventtitle">%s</xliff:g>\"\?</string>
     <string name="change_response_title" msgid="7704714776070974984">"Изменить ответ"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"Общие настройки"</string>
-    <string name="menu_about_preferences" msgid="6124375438237674973">"О календаре"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Настройки"</string>
-    <string name="preferences_general_title" msgid="2069075513760573117">"Мероприятия"</string>
+    <string name="preferences_general_title" msgid="2069075513760573117">Отображение календаря</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Уведомления и напоминания"</string>
-    <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Скрыть отклоненные"</string>
-    <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Начало недели:"</string>
-    <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Начало недели:"</string>
+    <string name="preferences_hide_declined_title" msgid="1849295943669890034">Не показывать отклонённые</string>
+    <string name="preferences_week_start_day_title" msgid="4619489296444901622">Начало недели</string>
+    <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">Начало недели</string>
     <string name="preferences_clear_search_history_title" msgid="6619916370215282982">"Очистить историю поиска"</string>
     <string name="preferences_clear_search_history_summary" msgid="7864674093455778158">"Удалить информацию обо всех выполненных поисковых запросах"</string>
     <string name="search_history_cleared" msgid="1536707558435227567">"История поиска удалена."</string>
-    <string name="preferences_alerts_title" msgid="6636088008103904020">"Оповещения"</string>
+    <string name="preferences_alerts_title" msgid="6636088008103904020">Уведомления</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Вибросигнал"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Рингтон"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">Звук</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Всплывающее уведомление"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Время напоминания"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Напомнить"</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
-    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Фикс. часовой пояс"</string>
+    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">Домашний часовой пояс</string>
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Всегда показывать в календаре время в заданном часовом поясе"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Мой часовой пояс"</string>
-    <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Показать номер недели"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"О программе"</string>
+    <string name="preferences_show_week_num_title" msgid="5280734329664503461">Показывать номер недели</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Версия сборки"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Календарь"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">" и еще 1"</item>
-    <item quantity="other" msgid="1997405398178470838">" и еще <xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
-    <string name="gadget_no_events" msgid="5209110911088302855">"В календаре нет предстоящих мероприятий"</string>
+    <plurals name="month_more_events">
+        <item quantity="one">и ещё 1</item>
+        <item quantity="few">и ещё <xliff:g id="number">%d</xliff:g></item>
+        <item quantity="many">и ещё <xliff:g id="number">%d</xliff:g></item>
+    </plurals>
+    <string name="gadget_no_events" msgid="5209110911088302855">В календаре нет предстоящих событий</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Экспериментальная версия"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Напоминания"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Пропустить напоминания"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Пропустить напоминания"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Пауза"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"В течение указанного периода напоминания о событиях не будут приходить."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Начало паузы"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Окончание паузы"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Отладка"</string>
     <string name="copy_db" msgid="437691290566699292">"Отправить базу данных"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Поиск в <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Удалить участника"</string>
@@ -220,59 +203,58 @@
     <string name="accessibility_pick_end_date" msgid="5624250196618643922">"Дата окончания"</string>
     <string name="accessibility_pick_end_time" msgid="7120310166355224941">"Время окончания"</string>
     <string name="accessibility_pick_time_zone" msgid="7155465783500323811">"Часовой пояс"</string>
-    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">"Повторять мероприятие"</string>
+    <string name="accessibility_pick_recurrence" msgid="1834311617874828931">Повторять событие</string>
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Добавить напоминание"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Удалить напоминание"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Добавить участника"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Синхронизировать календарь"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"На весь день"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Повтор"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Время срабатывания напоминания"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Тип напоминания"</string>
-    <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Мой статус:"</string>
+    <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">Мой статус</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Конфиденциальность"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Уведомления календаря"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Напомнить позже"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Уведомить гостей по электронной почте"</string>
-    <string name="day_view_new_event_hint" msgid="2131483437911536229">"Создать мероприятие"</string>
-    <string name="template_announce_item_index" msgid="4067877800670753110">"Мероприятие <xliff:g id="ITEM_INDEX">%1$s</xliff:g> из <xliff:g id="ITEM_COUNT">%2$s</xliff:g>"</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"Мероприятий: 1"</item>
-    <item quantity="other" msgid="6093072093209431078">"Мероприятий: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"Ещё мероприятий: 1"</item>
-    <item quantity="other" msgid="3609243840882275136">"Ещё мероприятий: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-    <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Выбранное мероприятие"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"НЕ устанавливайте флажок &gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Повтор"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Никогда"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Интервал: <xliff:g id="COUNT">%d</xliff:g> д."</item>
-    <item quantity="other" msgid="707566499994398250">"Интервал: <xliff:g id="COUNT">%d</xliff:g> дн."</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Интервал: <xliff:g id="COUNT">%d</xliff:g> нед."</item>
-    <item quantity="other" msgid="7094801039989237061">"Интервал: <xliff:g id="COUNT">%d</xliff:g> нед."</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Интервал: <xliff:g id="COUNT">%d</xliff:g> мес."</item>
-    <item quantity="other" msgid="5419723710346646523">"Интервал: <xliff:g id="COUNT">%d</xliff:g> мес."</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Интервал: <xliff:g id="COUNT">%d</xliff:g> г."</item>
-    <item quantity="other" msgid="5678653649746562060">"Интервал: <xliff:g id="COUNT">%d</xliff:g> гг./лет"</item>
-  </plurals>
-    <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"ежемесячно"</string>
+    <string name="day_view_new_event_hint" msgid="2131483437911536229">Создать событие</string>
+    <string name="template_announce_item_index" msgid="4067877800670753110">Событие <xliff:g id="item_index">%1$s</xliff:g> из <xliff:g id="item_count">%2$s</xliff:g>.</string>
+    <plurals name="Nevents">
+        <item quantity="one">1 событие</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> события</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> событий</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one">Ещё 1 событие</item>
+        <item quantity="few">Ещё <xliff:g id="count">%d</xliff:g> события</item>
+        <item quantity="many">Ещё <xliff:g id="count">%d</xliff:g> событий</item>
+    </plurals>
+    <string name="acessibility_selected_marker_description" msgid="3010149843148810768">Выбранное событие</string>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one">Каждый <xliff:g id="count">%d</xliff:g> день</item>
+        <item quantity="few">Каждые <xliff:g id="count">%d</xliff:g> дня</item>
+        <item quantity="many">Каждые <xliff:g id="count">%d</xliff:g> дней</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one">Каждую <xliff:g id="count">%d</xliff:g> неделю</item>
+        <item quantity="few">Каждые <xliff:g id="count">%d</xliff:g> недели</item>
+        <item quantity="many">Каждые <xliff:g id="count">%d</xliff:g> недель</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one">Каждый <xliff:g id="count">%d</xliff:g> месяц</item>
+        <item quantity="few">Каждые <xliff:g id="count">%d</xliff:g> месяца</item>
+        <item quantity="many">Каждые <xliff:g id="count">%d</xliff:g> месяцев</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one">Каждый <xliff:g id="count">%d</xliff:g> год</item>
+        <item quantity="few">Каждые <xliff:g id="count">%d</xliff:g> года</item>
+        <item quantity="many">Каждые <xliff:g id="count">%d</xliff:g> лет</item>
+    </plurals>
+    <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">ежемесячно в этот день</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Всегда"</string>
-    <string name="recurrence_end_date_label" msgid="4142791438636994952">"до определенной даты"</string>
-    <string name="recurrence_end_date" msgid="3693751578164711701">"До <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="recurrence_end_count_label" msgid="1233883668293087977">"несколько раз"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Повторов: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="8779598489398048259">"Повторов: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <string name="recurrence_end_date_label" msgid="4142791438636994952">До определённой даты</string>
+    <string name="recurrence_end_date" msgid="3693751578164711701">До <xliff:g id="date">%s</xliff:g></string>
+    <string name="recurrence_end_count_label" msgid="1233883668293087977">Несколько раз</string>
+    <plurals name="recurrence_end_count">
+        <item quantity="one"><xliff:g id="event_count">%d</xliff:g> повтор</item>
+        <item quantity="few"><xliff:g id="event_count">%d</xliff:g> повтора</item>
+        <item quantity="many"><xliff:g id="event_count">%d</xliff:g> повторов</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"изменить дату окончания"</string>
     <string name="visibility_default">По умолчанию</string>
 
@@ -335,7 +317,7 @@
     <string name="view_settings">Просмотр настроек</string>
     <string name="preferences_month_view_portrait">Вид месяца (вертикальный)</string>
     <string name="preferences_month_view_landscape">Вид месяца (горизонтальный)</string>
-    <string name="view_details">Подробный вид</string>
+    <string name="display_options">Подробный вид</string>
     <string name="display_time">Показывать время</string>
     <string name="display_location">Показывать место</string>
     <string name="show_time_no">Не показывать время</string>
@@ -345,4 +327,37 @@
     <string name="maximum_number_of_lines">Максимальное количество строк для события</string>
     <string name="foreground_notification_channel_name">Синхронизация оповещений</string>
     <string name="foreground_notification_channel_description">Уведомление требуется для внутренней синхронизации оповещений. Пожалуйста, отключите у него звук.</string>
-</resources>
+    <string name="cal_import_error_time_zone_msg">Невозможно определить предлагаемый часовой пояс: %s</string>
+    <string name="preferences_calendar_account">Аккаунт %1$s</string>
+    <string name="preferences_calendar_delete">Удалить календарь</string>
+    <string name="preferences_calendar_display_name">Переименовать</string>
+    <string name="preferences_calendar_color">Цвет</string>
+    <string name="preferences_calendar_visible">Отображение событий</string>
+    <string name="preferences_calendar_synchronize">Синхронизировать этот календарь</string>
+    <string name="preferences_list_calendar_summary_sync_off">Не синхронизирован</string>
+    <string name="preferences_list_calendar_summary_invisible">События не отображаются</string>
+    <string name="preferences_list_general">Общие настройки</string>
+    <string name="preferences_list_add_remote">Добавить удалённый календарь (CalDAV)</string>
+    <string name="preferences_list_add_offline">Добавить локальный календарь</string>
+    <string name="preferences_list_add_offline_title">Добавить локальный календарь</string>
+    <string name="preferences_list_add_offline_error_empty">Введите название календаря!</string>
+    <string name="preferences_list_add_offline_message">Локальные календари НЕ синхронизируются с облачным сервисом и доступны только на вашем устройстве.</string>
+    <string name="preferences_list_add_offline_button">Добавить календарь</string>
+    <string name="preferences_list_add_offline_name">Название</string>
+    <string name="preferences_list_add_offline_cancel">Отмена</string>
+    <string name="preferences_calendar_color_warning_title">Внимание</string>
+    <string name="preferences_calendar_color_warning_message">Изменение цвета может быть отменено при повторной синхронизации календаря.
+\n
+\nТакое поведение можно отключить в \"Управлении цветами календаря\" DAVx⁵.</string>
+    <string name="preferences_calendar_color_warning_button">Я понимаю</string>
+    <string name="preferences_calendar_delete_message">Вы действительно хотите удалить этот календарь\?</string>
+    <string name="preferences_calendar_delete_delete">Удалить календарь</string>
+    <string name="preferences_calendar_delete_cancel">Отмена</string>
+    <string name="preferences_menu_about">Об Etar</string>
+    <string name="offline_account_name">Локальный календарь</string>
+    <string name="app_copyright">© 2015-<xliff:g>%s</xliff:g> Проект Etar. Частично © 2005-<xliff:g>%s</xliff:g> The Android Open Source Project.</string>
+    <string name="authors">Авторы</string>
+    <string name="changelog">История изменений</string>
+    <string name="license">Лицензия</string>
+    <string name="source_code">Исходный код</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 6bf898623806ec62a00300cfdc36503c54b11430..27a95dc5b2516ac63eace9834d9c81f04cb2ca52 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"K dispozícii"</item>
     <item msgid="2064426942462573474">"Predbežný"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"prvý"</item>
-    <item msgid="5631923029483854900">"sekunda"</item>
-    <item msgid="148935502975250973">"tretí"</item>
-    <item msgid="5124200797326669172">"štvrtý"</item>
-    <item msgid="7564374178324652137">"posledné"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Bez odpovede"</item>
     <item msgid="3724434080904437698">"Áno"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Túto a budúce udalosti"</item>
     <item msgid="7833229563617435430">"Všetky udalosti"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Túto a budúce udalosti"</item>
-    <item msgid="6315440193748139854">"Všetky udalosti"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Iba túto udalosť"</item>
     <item msgid="140670561403965380">"Všetky udalosti v rade"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0474b875ef438fe81a811457a2b350d96a04bb6b..873661c490937345692fe732165292466b624b30 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalendár"</string>
     <string name="what_label" msgid="1933578391985810049">"Čo"</string>
     <string name="where_label" msgid="3472482206065595118">"Kde"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Zajtra"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Dnes o <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Zajtra o <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Opakovanie"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Bez názvu)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minúta"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> min."</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min."</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 hodina"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> hod."</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 deň"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> d."</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"týždeň <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minúta"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> min."</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min."</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 hodina"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> hod."</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 deň"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> d."</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"týždeň <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Obnoviť"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Zobraziť deň"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Odstrániť udalosť"</string>
     <string name="goto_today" msgid="9162136434410891230">"Dnes"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Nastavenia"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalendáre, ktoré sa majú zobraziť"</string>
     <string name="search" msgid="550656004486017426">"Hľadať"</string>
     <string name="hide_controls" msgid="830320505938520882">"Skryť ovlád. prvky"</string>
     <string name="show_controls" msgid="715520586028062621">"Zobraziť ovl. prvky"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalendáre, ktoré sa majú zobraziť"</string>
-    <string name="synced" msgid="7913940305983383493">"synchronizovaný"</string>
-    <string name="not_synced" msgid="4275114941801829419">"nie je synchronizovaný"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Tento účet nie je synchronizovaný, preto kalendáre nemusia byť aktuálne."</string>
-    <string name="accounts" msgid="849401841083180306">"Účty a synchronizácia"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Kalendáre, ktoré sa majú synchronizovať"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Kalendáre, ktoré sa majú synchronizovať"</string>
     <string name="hint_what" msgid="709155115005044531">"Názov udalosti"</string>
     <string name="hint_where" msgid="4972598001033801974">"Umiestnenie"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Od"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Celý deň"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalendár"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Zobraziť všetky"</string>
     <string name="description_label" msgid="7193475046717505855">"Popis"</string>
     <string name="presence_label" msgid="6169724148441175862">"Zobraziť ma ako"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Ochrana osobných údajov"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Pridať pripomienku"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Žiadne kalendáre"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Pred pridaním udalosti musíte do zariadenia pridať aspoň jeden účet služby Kalendár a nastaviť kalendár ako viditeľný. Ak chcete pridať účet, dotknite sa možnosti Pridať účet (ak ste účet práve pridali, počkajte na dokončenie jeho synchronizácie a skúste to znova). Prípadne sa dotknite možnosti Zrušiť a skontrolujte, či je viditeľný aspoň jeden kalendár."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalendár funguje lepšie s účtom Google."\n\n"• Môžete k nemu pristupovať z akéhokoľvek webového prehliadača"\n"• Bezpečne zálohujte svoje udalosti"</string>
     <string name="add_account" msgid="1669072099756774952">"Pridať účet"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalendár:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organizátor:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Zavolať"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Rýchle odpovede"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Upraviť predv. odp."</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Upraviť rýchle odp."</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Rýchla odpoveď"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Vyberte rýchlu odpoveď"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"E-mailový program sa nepodarilo nájsť"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Budem pár minút meškať."</item>
-    <item msgid="6215158751728689832">"Budem tam o 10 minút."</item>
-    <item msgid="4485794001743679338">"Začnite bezo mňa."</item>
-    <item msgid="8036557974294987511">"Je mi ľúto, ale nestíham. Naplánujeme to na inokedy."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Budem pár minút meškať."</item>
+        <item msgid="6215158751728689832">"Budem tam o 10 minút."</item>
+        <item msgid="4485794001743679338">"Začnite bezo mňa."</item>
+        <item msgid="8036557974294987511">"Je mi ľúto, ale nestíham. Naplánujeme to na inokedy."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Napíšte vlastnú..."</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organizátor:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Pripomienky"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Odstrániť"</string>
     <string name="save_label" msgid="2133599104834432589">"Hotovo"</string>
     <string name="discard_label" msgid="2394623883289782541">"Zrušiť"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Odložiť všetky"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Zrušiť všetko"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Odložiť"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Jednorazová udalosť"</string>
     <string name="endByDate" msgid="7654221304929538201">", do <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">", jednorazovo"</item>
-    <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g>-krát"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Denne"</item>
-    <item quantity="other" msgid="5455230727715859264">"Vždy po <xliff:g id="NUMBER">%d</xliff:g> dňoch"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">", jednorazovo"</item>
+        <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g>-krát"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Denne"</item>
+        <item quantity="other" msgid="5455230727715859264">"Vždy po <xliff:g id="NUMBER">%d</xliff:g> dňoch"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Každý pracovný deň (Po. – Pi.)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Každý týždeň v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Raz za <xliff:g id="NUMBER">%1$d</xliff:g> týžd. v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Každý týždeň v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Raz za <xliff:g id="NUMBER">%1$d</xliff:g> týžd. v <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Mesačne"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Ročne"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Mesačne (dňa <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Ročne (vždy <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Vlastné (nie je možné prispôsobiť v telefóne)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Zmeniť iba túto udalosť"</string>
     <string name="modify_all" msgid="4421657265864209041">"Zmeniť všetky udalosti v rade"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Kalendáre a časy udal. sa zobr. vždy v domovskom čas. pásme"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Domov. čas. pásmo"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Zobrazovať číslo týždňa"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"O službe"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Verzia zostavy"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalendár"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Žiadne ďalšie udalosti v kalendári"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimentálne"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Pripomienky"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Preskočiť pripomienky"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Preskočiť pripomienky"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Tichý režim"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Stíšiť pripomienky udalostí počas zadaného času."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Začiatok tichého režimu"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Koniec tichého režimu"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Ladenie"</string>
     <string name="copy_db" msgid="437691290566699292">"Odoslať databázu"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Prebieha vyhľadávanie <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Odstrániť účastníka"</string>
@@ -224,74 +201,57 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Pridať pripomienku"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Odstránenie pripomienky"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Pridať účastníka"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Synchronizovať kalendár"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Celodenná udalosť"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Opakovanie"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Čas pripomienky"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Typ pripomienky"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Zobraziť ma ako"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Ochrana osobných údajov"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Upozornenie v kalendári"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Odložiť upozornenie"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Poslať e-mail hosťom"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"Pridať novú udalosť"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Udalosť <xliff:g id="ITEM_INDEX">%1$s</xliff:g> z <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 udalosť"</item>
-    <item quantity="other" msgid="6093072093209431078">"Počet udalostí: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 udalosť"</item>
-    <item quantity="other" msgid="3609243840882275136">"+ďalšie udalosti (<xliff:g id="COUNT">%d</xliff:g>)"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 udalosť"</item>
+        <item quantity="other" msgid="6093072093209431078">"Počet udalostí: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 udalosť"</item>
+        <item quantity="other" msgid="3609243840882275136">"+ďalšie udalosti (<xliff:g id="COUNT">%d</xliff:g>)"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Vybratá udalosť"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NEzačiarknite -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Opakovať"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Nikdy neopakovať"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Raz za <xliff:g id="COUNT">%d</xliff:g> d."</item>
-    <item quantity="other" msgid="707566499994398250">"Raz za <xliff:g id="COUNT">%d</xliff:g> d."</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Raz za <xliff:g id="COUNT">%d</xliff:g> týžd."</item>
-    <item quantity="other" msgid="7094801039989237061">"Raz za <xliff:g id="COUNT">%d</xliff:g> týžd."</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Raz za <xliff:g id="COUNT">%d</xliff:g> mes."</item>
-    <item quantity="other" msgid="5419723710346646523">"Raz za <xliff:g id="COUNT">%d</xliff:g> mes."</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Raz za <xliff:g id="COUNT">%d</xliff:g> r."</item>
-    <item quantity="other" msgid="5678653649746562060">"Raz za <xliff:g id="COUNT">%d</xliff:g> r."</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Raz za <xliff:g id="COUNT">%d</xliff:g> d."</item>
+        <item quantity="other" msgid="707566499994398250">"Raz za <xliff:g id="COUNT">%d</xliff:g> d."</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Raz za <xliff:g id="COUNT">%d</xliff:g> týžd."</item>
+        <item quantity="other" msgid="7094801039989237061">"Raz za <xliff:g id="COUNT">%d</xliff:g> týžd."</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Raz za <xliff:g id="COUNT">%d</xliff:g> mes."</item>
+        <item quantity="other" msgid="5419723710346646523">"Raz za <xliff:g id="COUNT">%d</xliff:g> mes."</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Raz za <xliff:g id="COUNT">%d</xliff:g> r."</item>
+        <item quantity="other" msgid="5678653649746562060">"Raz za <xliff:g id="COUNT">%d</xliff:g> r."</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"mesačne v ten istý deň"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Stále"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Do dátumu"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Do <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Pre určitý počet udalostí"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Pre <xliff:g id="EVENT_COUNT">%d</xliff:g> udalosť"</item>
-    <item quantity="other" msgid="8779598489398048259">"Pre <xliff:g id="EVENT_COUNT">%d</xliff:g> udalosti/-í"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Pre <xliff:g id="EVENT_COUNT">%d</xliff:g> udalosť"</item>
+        <item quantity="other" msgid="8779598489398048259">"Pre <xliff:g id="EVENT_COUNT">%d</xliff:g> udalosti/-í"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"zmeniť dátum ukončenia"</string>
     <string name="visibility_default">Predvolené</string>
-  <string name="visibility_private">Súkromné</string>
-  <string name="visibility_public">Verejné</string>
-  <string name="preferences_alerts_custom_snooze_delay_title">Pýtať sa na dĺžku odloženia upomienky</string>
-  <string name="preferences_alerts_custom_snooze_delay_summary_on">Pýtať sa na dĺžku odloženia pri odložení upomienky</string>
-  <string name="preferences_alerts_custom_snooze_delay_summary_off">Vždy použiť predvolenú dĺžku odloženia</string>
-  <string name="snooze_delay_dialog_title">Nastaviť dĺžku odloženia</string>
-  <string name="preferences_default_snooze_delay_title">Predvolená dĺžka odloženia</string>
-  <string name="preferences_default_snooze_delay_dialog">Predvolená dĺžka odloženia</string>
-    <string name="preferences_about_app">Kalendár je vidlicový z Etar-Calendar</string>
-    <string name="preferences_authors">Autori</string>
-  <string name="preferences_source_code">Zdrojový kód</string>
-  <string name="preferences_licence">licencie</string>
-    <string name="preferences_privacy_policy">Zásady ochrany osobných údajov</string>
-    <string name="preferences_service_terms">Podmienky služby</string>
-
-
-
+    <string name="visibility_private">Súkromné</string>
+    <string name="visibility_public">Verejné</string>
+    <string name="preferences_alerts_custom_snooze_delay_title">Pýtať sa na dĺžku odloženia upomienky</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_on">Pýtať sa na dĺžku odloženia pri odložení upomienky</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_off">Vždy použiť predvolenú dĺžku odloženia</string>
+    <string name="snooze_delay_dialog_title">Nastaviť dĺžku odloženia</string>
+    <string name="preferences_default_snooze_delay_title">Predvolená dĺžka odloženia</string>
+    <string name="preferences_default_snooze_delay_dialog">Predvolená dĺžka odloženia</string>
     <string name="goto_date">ísť na…</string>
     <string name="rsvp_accepted">Odpovedal „Áno“.</string>
     <string name="rsvp_tentative">Odpovedal „Možno“.</string>
@@ -331,7 +291,7 @@
     <string name="view_settings">Nastavenia zobrazenia</string>
     <string name="preferences_month_view_portrait">Rozloženie zobrazenia mesiaca (na výšku)</string>
     <string name="preferences_month_view_landscape">Rozloženie zobrazenia mesiaca (na šírku)</string>
-    <string name="view_details">Zobraziť podrobnosti</string>
+    <string name="display_options">Zobraziť podrobnosti</string>
     <string name="display_time">Čas zobrazenia</string>
     <string name="display_location">Zobrazenie polohy</string>
     <string name="show_time_no">Nie</string>
@@ -339,4 +299,4 @@
     <string name="show_time_start_end">Čas začatia a ukončenia</string>
     <string name="show_time_start_end_below">Počiatočný a koncový čas pod udalosťou</string>
     <string name="maximum_number_of_lines">Maximálny počet riadkov v udalosti</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 0029f300930045f515d546bb78b8aff6a8a34b5f..6733c8c825e9c0474ce8766e6aea9e618ced82aa 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Na voljo"</item>
     <item msgid="2064426942462573474">"Začasno"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"prvi"</item>
-    <item msgid="5631923029483854900">"sekunda"</item>
-    <item msgid="148935502975250973">"tretji"</item>
-    <item msgid="5124200797326669172">"četrti"</item>
-    <item msgid="7564374178324652137">"zadnji"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Ni odgovora"</item>
     <item msgid="3724434080904437698">"Da"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Ta in prihodnji dogodki"</item>
     <item msgid="7833229563617435430">"Vsi dogodki"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Ti in prihodnji dogodki"</item>
-    <item msgid="6315440193748139854">"Vsi dogodki"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Samo ta dogodek"</item>
     <item msgid="140670561403965380">"Vsi dogodki v nizu"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 181d60ba714cdc9682d926bbe5d1b75c04d8416b..20a33d5151aeae0fd577c903b8bd02dd2ead02ea 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Koledar"</string>
     <string name="what_label" msgid="1933578391985810049">"Kaj"</string>
     <string name="where_label" msgid="3472482206065595118">"Kje"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Jutri"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Danes ob <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Jutri ob <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Ponovitev"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Brez naslova)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minuta"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 ura"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> ur"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 dan"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dni"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>. teden"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minuta"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 ura"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> ur"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 dan"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dni"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>. teden"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Osveži"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Pokaži dan"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Dnevni red"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Izbriši dogodek"</string>
     <string name="goto_today" msgid="9162136434410891230">"Danes"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Nastavitve"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Koledarji za prikaz"</string>
     <string name="search" msgid="550656004486017426">"Išči"</string>
     <string name="hide_controls" msgid="830320505938520882">"Skrij kontrolnike"</string>
     <string name="show_controls" msgid="715520586028062621">"Pokaži kontrolnike"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Koledarji za prikaz"</string>
-    <string name="synced" msgid="7913940305983383493">"sinhronizirano"</string>
-    <string name="not_synced" msgid="4275114941801829419">"ni sinhronizirano"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Ta račun ni sinhroniziran, zato vaši koledarji morda niso posodobljeni."</string>
-    <string name="accounts" msgid="849401841083180306">"Računi in sinhronizacija"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Koledarji za sinhroniziranje"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Koledarji za sinhronizacijo"</string>
     <string name="hint_what" msgid="709155115005044531">"Ime dogodka"</string>
     <string name="hint_where" msgid="4972598001033801974">"Lokacija"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Od"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Ves dan"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Koledar"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Pokaži vse"</string>
     <string name="description_label" msgid="7193475046717505855">"Opis"</string>
     <string name="presence_label" msgid="6169724148441175862">"Pokaži me kot"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Zasebnost"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Dodaj opomnik"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Ni koledarjev"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Pred dodajanjem dogodka morate v napravo dodati vsaj en račun za Etar Koledar in narediti koledar viden. Dotaknite se možnosti »Dodaj račun«, da dodate račun (če ste ga pravkar dodali, počakajte, da se sinhroniziranje konča, in poskusite znova). Lahko se tudi dotaknete možnosti »Prekliči« in se prepričate, da je viden vsaj en koledar."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Koledar deluje bolje z Računom."\n\n"• Do njega lahko dostopate v katerem koli spletnem brskalniku"\n"• Varno varnostno kopiranje dogodkov"</string>
     <string name="add_account" msgid="1669072099756774952">"Dodaj račun"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Koledar:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organizator:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Klic"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Jedrnati odgovori"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Urejanje privzetih odgovorov za e-poštno pošiljanje"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Urejanje jedrnatih odgovorov"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Jedrnat odgovor"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Izberite jedrnat odgovor"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"E-poštnega programa ni mogoče najti"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Čisto malo zamujam."</item>
-    <item msgid="6215158751728689832">"Pridem čez 10 minut."</item>
-    <item msgid="4485794001743679338">"Kar brez mene začnite."</item>
-    <item msgid="8036557974294987511">"Ne bo mi uspelo, žal. Zmenimo se za drugič."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Čisto malo zamujam."</item>
+        <item msgid="6215158751728689832">"Pridem čez 10 minut."</item>
+        <item msgid="4485794001743679338">"Kar brez mene začnite."</item>
+        <item msgid="8036557974294987511">"Ne bo mi uspelo, žal. Zmenimo se za drugič."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Napišite lastno besedilo …"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organizator:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Opomniki"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Izbriši"</string>
     <string name="save_label" msgid="2133599104834432589">"Dokončano"</string>
     <string name="discard_label" msgid="2394623883289782541">"Prekliči"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Postavi vse v dremež"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Opusti vse"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Dremež"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Enkraten dogodek"</string>
     <string name="endByDate" msgid="7654221304929538201">"– do <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"– enkrat"</item>
-    <item quantity="other" msgid="4855496837834652446">"– tolikokrat: <xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Dnevno"</item>
-    <item quantity="other" msgid="5455230727715859264">"Vsakih toliko dni: <xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"– enkrat"</item>
+        <item quantity="other" msgid="4855496837834652446">"– tolikokrat: <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Dnevno"</item>
+        <item quantity="other" msgid="5455230727715859264">"Vsakih toliko dni: <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Vsak delovni dan (pon–pet)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Tedensko: <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> – na vsakih toliko tednov: <xliff:g id="NUMBER">%1$d</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Tedensko: <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> – na vsakih toliko tednov: <xliff:g id="NUMBER">%1$d</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Mesečno"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Letno"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Mesečno (na dan <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Letno (na <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Po meri (prilagajanje ni mogoče v telefonu)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Spremeni samo ta dogodek"</string>
     <string name="modify_all" msgid="4421657265864209041">"Spremeni vse dogodke v nizu"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Prikaže koledarje in čas dogodkov v vašem domačem časovnem pasu, ko potujete"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Domač časovni pas"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Pokaži številko tedna"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"O programu"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Delovna različica"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Koledar"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+ <xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+ <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Ni prihajajočih dogodkov v koledarju"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Poskusne"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Opomniki"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Preskoči opomnike"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Preskoči opomnike"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Trajanje utišanja"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Utišanje opomnikov o dogodkih v izbranem času."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Začetek trajanja utišanja"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Konec trajanja utišanja"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Iskanje napak"</string>
     <string name="copy_db" msgid="437691290566699292">"Pošlji zbirko podatkov"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Iskanje <xliff:g id="DOMAIN">%s</xliff:g> ..."</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Odstrani udeleženca"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Dodaj opomnik"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Odstrani opomnik"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Dodaj udeleženca"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sinhroniziraj koledar"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Celodnevni dogodek"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Ponovitev"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Čas opomnika"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Vrsta opomnika"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Pokaži me kot"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Zasebnost"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Obvestilo koledarja"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Preklop obvestila v dremež"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Pošiljanje e-pošte gostom"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Nov dogodek"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Dogodek <xliff:g id="ITEM_INDEX">%1$s</xliff:g> od <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 dogodek"</item>
-    <item quantity="other" msgid="6093072093209431078">"Št. dogodkov: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"Še 1 dogodek"</item>
-    <item quantity="other" msgid="3609243840882275136">"Še toliko dogodkov: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 dogodek"</item>
+        <item quantity="other" msgid="6093072093209431078">"Št. dogodkov: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"Še 1 dogodek"</item>
+        <item quantity="other" msgid="3609243840882275136">"Še toliko dogodkov: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Izbrani dogodek"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"NE potrdite polja -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Ponovi"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Se ne ponovi"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Vsakih toliko dni: <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="707566499994398250">"Vsakih toliko dni: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Vsakih toliko tednov: <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="7094801039989237061">"Vsakih toliko tednov: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Vsakih toliko mesecev: <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="5419723710346646523">"Vsakih toliko mesecev: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Vsakih toliko let: <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="5678653649746562060">"Vsakih toliko let: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Vsakih toliko dni: <xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="707566499994398250">"Vsakih toliko dni: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Vsakih toliko tednov: <xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="7094801039989237061">"Vsakih toliko tednov: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Vsakih toliko mesecev: <xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="5419723710346646523">"Vsakih toliko mesecev: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Vsakih toliko let: <xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="5678653649746562060">"Vsakih toliko let: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"istega dne vsak mesec"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Za vedno"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Do datuma"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Do <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Za določeno št. dogodkov"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Za toliko dogodkov: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="8779598489398048259">"Za toliko dogodkov: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Za toliko dogodkov: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="8779598489398048259">"Za toliko dogodkov: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"sprememba končnega datuma"</string>
     <string name="visibility_default">Privzeto</string>
   <string name="visibility_private">Zasebno</string>
@@ -283,4 +252,4 @@
   <string name="preferences_licence">Licenca</string>
     <string name="preferences_privacy_policy">Politika zasebnosti</string>
     <string name="preferences_service_terms">Pogoji storitve</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 405ad1deaf3afbb11018296b68f00b4689e23ddd..27bd48f6f0c2d0cfe06c092085166f2b30ba62b2 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Доступан/а"</item>
     <item msgid="2064426942462573474">"Проба"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"први"</item>
-    <item msgid="5631923029483854900">"други"</item>
-    <item msgid="148935502975250973">"трећи"</item>
-    <item msgid="5124200797326669172">"четврти"</item>
-    <item msgid="7564374178324652137">"последњи"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Без одговора"</item>
     <item msgid="3724434080904437698">"Да"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Овај и будући догађаји"</item>
     <item msgid="7833229563617435430">"Сви догађаји"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Овај и будући догађаји"</item>
-    <item msgid="6315440193748139854">"Сви догађаји"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Само овај догађај"</item>
     <item msgid="140670561403965380">"Сви догађаји у овом низу"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fab0c6c0a56600dc04569f03f1ea551792df19cc..044d39799203a3e07df9d6d0cf23815fe9dba7ba 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Календар"</string>
     <string name="what_label" msgid="1933578391985810049">"Шта"</string>
     <string name="where_label" msgid="3472482206065595118">"Где"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Сутра"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Данас у <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Сутра у <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Понављање"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Без наслова)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 минут"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> минута"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 мин"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> мин"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 сат"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> сата(и)"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 дан"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> дана"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>. НЕДЕЉА"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 минут"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> минута"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 мин"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> мин"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 сат"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> сата(и)"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 дан"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> дана"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g>. НЕДЕЉА"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Освежи"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Прикажи дан"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Распоред"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Избриши догађај"</string>
     <string name="goto_today" msgid="9162136434410891230">"Данас"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Подешавања"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Календари који ће бити приказани"</string>
     <string name="search" msgid="550656004486017426">"Претражи"</string>
     <string name="hide_controls" msgid="830320505938520882">"Сакриј контроле"</string>
     <string name="show_controls" msgid="715520586028062621">"Прикажи контроле"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Календари за приказ"</string>
-    <string name="synced" msgid="7913940305983383493">"синхронизовано"</string>
-    <string name="not_synced" msgid="4275114941801829419">"није синхронизовано"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Овај налог се не синхронизује и календари можда неће бити ажурирани."</string>
-    <string name="accounts" msgid="849401841083180306">"Налози и синхронизација"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Календари за синхронизацију"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Календари за синхронизацију"</string>
     <string name="hint_what" msgid="709155115005044531">"Назив догађаја"</string>
     <string name="hint_where" msgid="4972598001033801974">"Локација"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Од"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Цео дан"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Календар"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Прикажи све"</string>
     <string name="description_label" msgid="7193475046717505855">"Опис"</string>
     <string name="presence_label" msgid="6169724148441175862">"Прикажи ме као"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Приватност"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Додај подсетник"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Нема календара"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Да бисте могли да додате догађај, на уређај морате да додате најмање један налог Календара и да омогућите видљивост календара. Да бисте додали налог, додирните Додај налог (ако сте управо додали налог, сачекајте да се синхронизација заврши и покушајте поново) или додирните Откажи и проверите да ли је најмање један календар видљив."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Календар боље функционише са Google налогом."\n\n"• Приступајте му из било ког веб прегледача"\n"• Безбедно направите резервне копије догађаја"</string>
     <string name="add_account" msgid="1669072099756774952">"Додај налог"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Календар:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Организатор:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Позови"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Брзи одговори"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Измени подраз. одгов. у е-порукама за госте"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Измена брзих одгов."</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Брзи одговор"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Избор брзог одговора"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Није пронађен програм за е-пошту"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Касним пар минута."</item>
-    <item msgid="6215158751728689832">"Стижем за 10 минута."</item>
-    <item msgid="4485794001743679338">"Почните без мене."</item>
-    <item msgid="8036557974294987511">"Жао ми је, не могу да стигнем. Мораћемо да одложимо."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Касним пар минута."</item>
+        <item msgid="6215158751728689832">"Стижем за 10 минута."</item>
+        <item msgid="4485794001743679338">"Почните без мене."</item>
+        <item msgid="8036557974294987511">"Жао ми је, не могу да стигнем. Мораћемо да одложимо."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Напишите сами…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Организатор:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Подсетници"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Избриши"</string>
     <string name="save_label" msgid="2133599104834432589">"Готово"</string>
     <string name="discard_label" msgid="2394623883289782541">"Откажи"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Одложи све"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Одбаци све"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Одложи"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Догађај који се не понавља"</string>
     <string name="endByDate" msgid="7654221304929538201">"; до <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; једанпут"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> пута"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Дневно"</item>
-    <item quantity="other" msgid="5455230727715859264">"На <xliff:g id="NUMBER">%d</xliff:g> дана"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; једанпут"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> пута"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Дневно"</item>
+        <item quantity="other" msgid="5455230727715859264">"На <xliff:g id="NUMBER">%d</xliff:g> дана"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Сваког радног дана (од понедељка до петка)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Недељно (<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
-    <item quantity="other" msgid="2857390143157377867">"На <xliff:g id="NUMBER">%1$d</xliff:g> недеље(а) (<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Недељно (<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
+        <item quantity="other" msgid="2857390143157377867">"На <xliff:g id="NUMBER">%1$d</xliff:g> недеље(а) (<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"На месечном нивоу"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"На годишњем нивоу"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"На месечном нивоу (дана <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"На годишњем нивоу (<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Прилагођено (није могуће прилагодити на телефону)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Промени само овај догађај"</string>
     <string name="modify_all" msgid="4421657265864209041">"Промени све догађаје у низу"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Приказује календаре и време догађаја у кућној временској зони током путовања"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Матична временска зона"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Прикажи број недеље"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"О"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Верзија апликације"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Календар"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Нема предстојећих догађаја у календару"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Експериментална"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Подсетници"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Прескочи подсетнике"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Прескакање подсетника"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Тихи период"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Искључује звук за подсетнике за догађаје током наведеног времена."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Почетак тихог периода"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Завршетак тихог периода"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Отклањање грешака"</string>
     <string name="copy_db" msgid="437691290566699292">"Пошаљи базу података"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Претраживање <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Уклони учесника"</string>
@@ -224,65 +201,51 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Додај подсетник"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Уклони подсетник"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Додај учесника"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Синхронизуј календар"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Целодневни догађај"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Понављање"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Време подсетника"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Тип подсетника"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Прикажи ме као"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Приватност"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Обавештење календара"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Одложи обавештење"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Пошаљи поруку е-поште гостима"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Нови догађај"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Догађај <xliff:g id="ITEM_INDEX">%1$s</xliff:g> од <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 догађај"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> догађаја"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"још 1 догађај"</item>
-    <item quantity="other" msgid="3609243840882275136">"још <xliff:g id="COUNT">%d</xliff:g> догађаја"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 догађај"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> догађаја"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"још 1 догађај"</item>
+        <item quantity="other" msgid="3609243840882275136">"још <xliff:g id="COUNT">%d</xliff:g> догађаја"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Изабрани догађај"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"НЕ потврђујте избор -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Понављање"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Нема понављања"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"На <xliff:g id="COUNT">%d</xliff:g> дан"</item>
-    <item quantity="other" msgid="707566499994398250">"На <xliff:g id="COUNT">%d</xliff:g> дана"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"На <xliff:g id="COUNT">%d</xliff:g> недељу"</item>
-    <item quantity="other" msgid="7094801039989237061">"На <xliff:g id="COUNT">%d</xliff:g> недеље(а)"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"На <xliff:g id="COUNT">%d</xliff:g> месец"</item>
-    <item quantity="other" msgid="5419723710346646523">"На <xliff:g id="COUNT">%d</xliff:g> месеца(и)"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"На <xliff:g id="COUNT">%d</xliff:g> годину"</item>
-    <item quantity="other" msgid="5678653649746562060">"На <xliff:g id="COUNT">%d</xliff:g> године(а)"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"На <xliff:g id="COUNT">%d</xliff:g> дан"</item>
+        <item quantity="other" msgid="707566499994398250">"На <xliff:g id="COUNT">%d</xliff:g> дана"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"На <xliff:g id="COUNT">%d</xliff:g> недељу"</item>
+        <item quantity="other" msgid="7094801039989237061">"На <xliff:g id="COUNT">%d</xliff:g> недеље(а)"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"На <xliff:g id="COUNT">%d</xliff:g> месец"</item>
+        <item quantity="other" msgid="5419723710346646523">"На <xliff:g id="COUNT">%d</xliff:g> месеца(и)"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"На <xliff:g id="COUNT">%d</xliff:g> годину"</item>
+        <item quantity="other" msgid="5678653649746562060">"На <xliff:g id="COUNT">%d</xliff:g> године(а)"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"истог дана сваког месеца"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Заувек"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"До одређеног датума"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"До <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"За више догађаја"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"За <xliff:g id="EVENT_COUNT">%d</xliff:g> догађај"</item>
-    <item quantity="other" msgid="8779598489398048259">"За <xliff:g id="EVENT_COUNT">%d</xliff:g> догађаја"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"За <xliff:g id="EVENT_COUNT">%d</xliff:g> догађај"</item>
+        <item quantity="other" msgid="8779598489398048259">"За <xliff:g id="EVENT_COUNT">%d</xliff:g> догађаја"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"промена крајњег датума"</string>
     <string name="visibility_default">Подразумевано</string>
-  <string name="visibility_private">Приватно</string>
-  <string name="visibility_public">Јавно</string>
-    <string name="preferences_about_app">Календар је форкиран из Етар-Календара</string>
-    <string name="preferences_authors">Аутори</string>
-  <string name="preferences_source_code">Изворни код</string>
-  <string name="preferences_licence">Лиценца</string>
-    <string name="preferences_privacy_policy">Политика приватности</string>
-    <string name="preferences_service_terms">Условия обслуживания</string>
+    <string name="visibility_private">Приватно</string>
+    <string name="visibility_public">Јавно</string>
     <string name="goto_date">Иди на…</string>
     <string name="rsvp_accepted">Одговор је потврдан.</string>
     <string name="rsvp_tentative">Одговор је можда.</string>
@@ -299,7 +262,7 @@
     <string name="view_settings">Прегледај подешавања</string>
     <string name="preferences_month_view_portrait">Преглед месеца (Вертикалан)</string>
     <string name="preferences_month_view_landscape">Преглед месеца (Хоризонталан)</string>
-    <string name="view_details">Погледај детаље</string>
+    <string name="display_options">Погледај детаље</string>
     <string name="display_time">Прикажи Време</string>
     <string name="display_location">Прикажи Локацију</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 49573608710dcf02afadfbe0f92a1052bc8f77dc..63ea8a09ad446e22a86d27671efa8511fb5b845e 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Tillgänglig"</item>
     <item msgid="2064426942462573474">"Preliminärt"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"första"</item>
-    <item msgid="5631923029483854900">"andra"</item>
-    <item msgid="148935502975250973">"tredje"</item>
-    <item msgid="5124200797326669172">"fjärde"</item>
-    <item msgid="7564374178324652137">"senaste"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Inget svar"</item>
     <item msgid="3724434080904437698">"Ja"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Den här och framtida händelser"</item>
     <item msgid="7833229563617435430">"Alla händelser"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Den här och framtida händelser"</item>
-    <item msgid="6315440193748139854">"Alla händelser"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Bara den här händelsen"</item>
     <item msgid="140670561403965380">"Alla händelser i serien"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c80d2ab2e6575c4c4e6b7f37b00fa21d3270762b..d1fcb1a374c8a1b47751006f3a1a9904bc536a08 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalender"</string>
     <string name="what_label" msgid="1933578391985810049">"Vad"</string>
     <string name="where_label" msgid="3472482206065595118">"Var"</string>
@@ -26,28 +23,32 @@
     <string name="tomorrow" msgid="614434811813859237">"Imorgon"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Idag kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Imorgon kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Upprepning"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Ingen titel)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minut"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minuter"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> minuter"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 timme"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> timmar"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 dag"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dagar"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"vecka <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minut"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> minuter"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> minuter"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 timme"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> timmar"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 dag"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> dagar"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="one">Etikett för att visa veckan på året för alla veckovärden [Teckengräns = 16]</item>
+        <item quantity="other">vecka <xliff:g id="count">%d</xliff:g>
+        </item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Uppdatera"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Visa dag"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
@@ -60,16 +61,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Ta bort händelse"</string>
     <string name="goto_today" msgid="9162136434410891230">"Idag"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Inställningar"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalendrar att visa"</string>
     <string name="search" msgid="550656004486017426">"Sök"</string>
     <string name="hide_controls" msgid="830320505938520882">"Dölj kontroller"</string>
     <string name="show_controls" msgid="715520586028062621">"Visa kontroller"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalendrar som ska visas"</string>
-    <string name="synced" msgid="7913940305983383493">"synkroniserat"</string>
-    <string name="not_synced" msgid="4275114941801829419">"inte synkat"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Kontot synkroniseras inte, så det är inte säkert att kalendrarna är uppdaterade."</string>
-    <string name="accounts" msgid="849401841083180306">"Konton och synkronisering"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Kalendrar som ska synkroniseras"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Kalendrar som ska synkroniseras"</string>
     <string name="hint_what" msgid="709155115005044531">"Eventnamn"</string>
     <string name="hint_where" msgid="4972598001033801974">"Plats"</string>
@@ -88,14 +82,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Från"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Hela dagen"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalender"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Visa alla"</string>
     <string name="description_label" msgid="7193475046717505855">"Beskrivning"</string>
     <string name="presence_label" msgid="6169724148441175862">"Visa mig som"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Sekretess"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Lägg till påminnelse"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Inga kalendrar"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Innan du kan lägga till en händelse måste du lägga till minst ett kalenderkonto på enheten och göra en kalender synlig. Tryck på Lägg till konto (om du precis har lagt till ett konto väntar du tills synkroniseringen är slutförd och försöker sedan igen). Annars trycker du på Avbryt och kontrollerar att minst en kalender visas."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalendern fungerar bättre med ett konto."\n\n"• Öppna den i valfri webbläsare"\n"• Säkerhetskopiera dina händelser på ett tryggt sätt"</string>
     <string name="add_account" msgid="1669072099756774952">"Lägg till konto"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalender:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organisatör:"</string>
@@ -116,17 +108,16 @@
     <string name="call_label" msgid="2960328220008869083">"Ring"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Snabbsvar"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Redigera standardsvar när du skickar e-post till gäster"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Redigera snabbsvar"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Snabbsvar"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Välj snabbsvar"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Det gick inte att hitta något e-postprogram"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Är några minuter sen."</item>
-    <item msgid="6215158751728689832">"Kommer om runt tio minuter."</item>
-    <item msgid="4485794001743679338">"Börja gärna, vänta inte på mig."</item>
-    <item msgid="8036557974294987511">"Jag kan tyvärr inte komma. Vi får välja en ny tid."</item>
-  </string-array>
-    <string name="quick_response_custom_msg" msgid="8792374208224108798">"Skriv eget svar ..."</string>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Är några minuter sen."</item>
+        <item msgid="6215158751728689832">"Kommer om runt tio minuter."</item>
+        <item msgid="4485794001743679338">"Börja gärna, vänta inte på mig."</item>
+        <item msgid="8036557974294987511">"Jag kan tyvärr inte komma. Vi får välja en ny tid."</item>
+    </string-array>
+    <string name="quick_response_custom_msg" msgid="8792374208224108798">Skriv eget svar…</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organisatör:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Påminnelser"</string>
     <string name="agenda_today" msgid="5965841338467422191">"idag, <xliff:g id="DATE">%1$s</xliff:g>"</string>
@@ -141,29 +132,25 @@
     <string name="delete_label" msgid="874742811918030739">"Ta bort"</string>
     <string name="save_label" msgid="2133599104834432589">"Färdig"</string>
     <string name="discard_label" msgid="2394623883289782541">"Avbryt"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Sätt alla på snooze"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Ta bort alla permanent"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Skjut upp"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Engångshändelse"</string>
     <string name="endByDate" msgid="7654221304929538201">", till <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">", en gång"</item>
-    <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g> gånger"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Varje dag"</item>
-    <item quantity="other" msgid="5455230727715859264">"<xliff:g id="NUMBER">%d</xliff:g> dagars interv."</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">", en gång"</item>
+        <item quantity="other" msgid="4855496837834652446">", <xliff:g id="NUMBER">%d</xliff:g> gånger"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one">Varje dag</item>
+        <item quantity="other">Var <xliff:g id="number">%d</xliff:g> dag</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Varje vardag (mån-fre)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Varje vecka på <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Med <xliff:g id="NUMBER">%1$d</xliff:g> v. intervall på <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Varje vecka på <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Med <xliff:g id="NUMBER">%1$d</xliff:g> v. intervall på <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Varje månad"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Varje år"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Varje månad (den <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Varje år (den <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Anpassad (går ej att anpassa i mobilen)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Ändra bara den här händelsen"</string>
     <string name="modify_all" msgid="4421657265864209041">"Ändra alla händelser i serien"</string>
@@ -195,23 +182,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Tiderna i kalendern visas i din standardtidszon när du är ute och reser."</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Standardtidszon"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Visa veckonummer"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Om"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Programversion"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+ 1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+ <xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+ 1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+ <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Inga kommande händelser i kalendern"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Experimentell"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Påminnelser"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Hoppa över påminnelser"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Hoppa över påminnelser"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Tyst läge"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Tysta påminnelser om event under en angiven tid."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Starttid för tyst läge"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Sluttid för tyst läge"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Felsökning"</string>
     <string name="copy_db" msgid="437691290566699292">"Skicka databas"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Söker <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Ta bort deltagare"</string>
@@ -224,74 +203,58 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Lägg till påminnelse"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Ta bort påminnelse"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Lägg till deltagare"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Synkronisera kalender"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Hela dagen"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Upprepning"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Tid för påminnelse"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Påminnelsetyp"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Visa mig som"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Sekretess"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Kalendermeddelande"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Sätt meddelandet i viloläge"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Skicka e-post till gäster"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ ny händelse"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Händelse <xliff:g id="ITEM_INDEX">%1$s</xliff:g> av <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 händelse"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> händelser"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"1 händelse"</item>
-    <item quantity="other" msgid="3609243840882275136">"<xliff:g id="COUNT">%d</xliff:g> händelser till"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 händelse"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> händelser"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one">Detta är etiketten för 1 händelse.</item>
+        <item quantity="other">
+            <xliff:g id="count">%d</xliff:g> händelser till</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Markerad händelse"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"Markera INTE -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Upprepa"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Upprepas aldrig"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Med <xliff:g id="COUNT">%d</xliff:g> dags intervall"</item>
-    <item quantity="other" msgid="707566499994398250">"Med <xliff:g id="COUNT">%d</xliff:g> dagars intervall"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Med <xliff:g id="COUNT">%d</xliff:g> veckas intervall"</item>
-    <item quantity="other" msgid="7094801039989237061">"Med <xliff:g id="COUNT">%d</xliff:g> veckors intervall"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Med <xliff:g id="COUNT">%d</xliff:g> månads intervall"</item>
-    <item quantity="other" msgid="5419723710346646523">"Med <xliff:g id="COUNT">%d</xliff:g> månaders intervall"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Med <xliff:g id="COUNT">%d</xliff:g> års intervall"</item>
-    <item quantity="other" msgid="5678653649746562060">"Med <xliff:g id="COUNT">%d</xliff:g> års intervall"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Med <xliff:g id="COUNT">%d</xliff:g> dags intervall"</item>
+        <item quantity="other" msgid="707566499994398250">"Med <xliff:g id="COUNT">%d</xliff:g> dagars intervall"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Med <xliff:g id="COUNT">%d</xliff:g> veckas intervall"</item>
+        <item quantity="other" msgid="7094801039989237061">"Med <xliff:g id="COUNT">%d</xliff:g> veckors intervall"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Med <xliff:g id="COUNT">%d</xliff:g> månads intervall"</item>
+        <item quantity="other" msgid="5419723710346646523">"Med <xliff:g id="COUNT">%d</xliff:g> månaders intervall"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one">Singular form [teckengräns = 30]</item>
+        <item quantity="other">Med <xliff:g id="count">%d</xliff:g> års intervall</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"samma dag varje månad"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"För alltid"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Till ett visst datum"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Till den <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Ett antal upprepningar"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"För <xliff:g id="EVENT_COUNT">%d</xliff:g> event"</item>
-    <item quantity="other" msgid="8779598489398048259">"För <xliff:g id="EVENT_COUNT">%d</xliff:g> event"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one">För <xliff:g id="event_count">%d</xliff:g> händelse</item>
+        <item quantity="other">För <xliff:g id="event_count">%d</xliff:g> händelse</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"ändra slutdatum"</string>
     <string name="visibility_default">Standardinställning</string>
-  <string name="visibility_private">Privat</string>
-  <string name="visibility_public">Offentligt</string>
-  <string name="preferences_alerts_custom_snooze_delay_title">Fråga efter snoozelängd</string>
-  <string name="preferences_alerts_custom_snooze_delay_summary_on">Fråga efter snoozelängd vid snooze av påminnelser</string>
-  <string name="preferences_alerts_custom_snooze_delay_summary_off">Använd alltid standardsnoozelängd</string>
-  <string name="snooze_delay_dialog_title">Välj snoozelängd</string>
-  <string name="preferences_default_snooze_delay_title">Standardsnoozelängd</string>
-  <string name="preferences_default_snooze_delay_dialog">Standardsnoozelängd</string>
-    <string name="preferences_about_app">Kalendern är gafflad från Etar-Calendar</string>
-    <string name="preferences_authors">Författare</string>
-  <string name="preferences_source_code">Källkod</string>
-  <string name="preferences_licence">License</string>
-    <string name="preferences_privacy_policy">Integritetspolicy</string>
-    <string name="preferences_service_terms">Användarvillkor</string>
-
-
-
+    <string name="visibility_private">Privat</string>
+    <string name="visibility_public">Offentligt</string>
+    <string name="preferences_alerts_custom_snooze_delay_title">Fråga efter snoozelängd</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_on">Fråga efter snoozelängd vid snooze av påminnelser</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_off">Använd alltid standardsnoozelängd</string>
+    <string name="snooze_delay_dialog_title">Välj snoozelängd</string>
+    <string name="preferences_default_snooze_delay_title">Standardsnoozelängd</string>
+    <string name="preferences_default_snooze_delay_dialog">Standardsnoozelängd</string>
     <string name="goto_date">Gå till…</string>
     <string name="rsvp_accepted">Svarade ja.</string>
     <string name="rsvp_tentative">Svarade kanske.</string>
@@ -331,7 +294,7 @@
     <string name="view_settings">Visa inställningar</string>
     <string name="preferences_month_view_portrait">Layout för månadsvy (Porträtt)</string>
     <string name="preferences_month_view_landscape">Layout för månadsvy (Landskap)</string>
-    <string name="view_details">Visa detaljer</string>
+    <string name="display_options">Visa detaljer</string>
     <string name="display_time">Visa tid</string>
     <string name="display_location">Visa plats</string>
     <string name="show_time_no">Visa inte tid</string>
@@ -341,4 +304,4 @@
     <string name="maximum_number_of_lines">Max antal rader i händelse</string>
     <string name="foreground_notification_channel_name">Varningssynkronisering</string>
     <string name="foreground_notification_channel_description">Förgrundsmeddelande krävs för intern varningssynkronisering. Vänligen stäng av ljudet</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 0929b129922d5a7692edb97c2c27030220a923fe..8b3ece2d74602bec06f7486b380f7cfb99ed9d16 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Ninapatikana"</item>
     <item msgid="2064426942462573474">"Kujaribia"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"kwanza"</item>
-    <item msgid="5631923029483854900">"sekunde"</item>
-    <item msgid="148935502975250973">"tatu"</item>
-    <item msgid="5124200797326669172">"nne"</item>
-    <item msgid="7564374178324652137">"ya mwisho"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Hakuna jibu"</item>
     <item msgid="3724434080904437698">"Ndio"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Hii na matukio ya baadaye"</item>
     <item msgid="7833229563617435430">"Matukio yote"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Tukio hili na yote yajayo"</item>
-    <item msgid="6315440193748139854">"Matukio yote"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Tukio hili tu"</item>
     <item msgid="140670561403965380">"Matukio yote katika mfululizo"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3d5e104e453f3f1fe3a09850cc5c3e129e15850e..2037bc1968de51ba1eaa5fbb32b54ee6a5e9920c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalenda"</string>
     <string name="what_label" msgid="1933578391985810049">"Nini"</string>
     <string name="where_label" msgid="3472482206065595118">"Wapi"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Kesho"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Leo saa <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Kesho saa <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Kurudia"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Hakuna kichwa)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"Dakika 1"</item>
-    <item quantity="other" msgid="5644461630927544936">"Dakika <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"Dakika 1"</item>
-    <item quantity="other" msgid="9175648445939148974">"Dakika <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"Saa 1"</item>
-    <item quantity="other" msgid="4477841052001760620">"Saa <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"siku 1"</item>
-    <item quantity="other" msgid="1709378992389618261">"siku <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"wiki <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"Dakika 1"</item>
+        <item quantity="other" msgid="5644461630927544936">"Dakika <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"Dakika 1"</item>
+        <item quantity="other" msgid="9175648445939148974">"Dakika <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"Saa 1"</item>
+        <item quantity="other" msgid="4477841052001760620">"Saa <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"siku 1"</item>
+        <item quantity="other" msgid="1709378992389618261">"siku <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"wiki <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Onyesha upya"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Onyesha siku"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Ajenda"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Futa tukio"</string>
     <string name="goto_today" msgid="9162136434410891230">"Leo"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Mipangilio"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Kalenda za kuonyeshwa"</string>
     <string name="search" msgid="550656004486017426">"Tafuta"</string>
     <string name="hide_controls" msgid="830320505938520882">"Ficha vidhibiti"</string>
     <string name="show_controls" msgid="715520586028062621">"Onyesha vidhibiti"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Kalenda za kuonyeshwa"</string>
-    <string name="synced" msgid="7913940305983383493">"Vilivyosawazishwa"</string>
-    <string name="not_synced" msgid="4275114941801829419">"haijasawazishwa"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Akaunti hii hailandanishwi na huenda kalenda zako zaweza kuwa hazijasasishwa."</string>
-    <string name="accounts" msgid="849401841083180306">"Akaunti na usawazishaji"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Kalenda za kusawazisha"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Kalenda za kusawazisha"</string>
     <string name="hint_what" msgid="709155115005044531">"Jina la tukio"</string>
     <string name="hint_where" msgid="4972598001033801974">"Mahali"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Kuanzia"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Siku nzima"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalenda"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Onyesha zote"</string>
     <string name="description_label" msgid="7193475046717505855">"Maelezo"</string>
     <string name="presence_label" msgid="6169724148441175862">"Onyesha kuwa"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Faragha"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Ongeza kumbusho"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Hakuna kalenda"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Kabla ya kuongeza tukio, sharti uongeze angalau akaunti moja ya Kalenda kwenye kifaa chako na ufanye kalenda ionekane. Gusa Ongeza Akaunti ili uongeze akaunti (kama umeongeza akaunti sasa hivi, subiri imalize kusawazishwa na ujaribu tena). Au gusa Ghairi na uhakikishe kuwa angalau kalenda moja inaonekana."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Kalenda inafanya kazi vizuri ukiwa na Akaunti. "\n" "\n" • Iangalie kwa kutumia kivinjari chochote "\n" • Tunza matukio yako kwa usalama."</string>
     <string name="add_account" msgid="1669072099756774952">"Ongeza akaunti"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalenda:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Mwandalizi:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Piga simu"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Majibu ya haraka"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Hariri majibu ya chaguo-msingi wakati wa kutumia wateja barua pepe"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Hariri majibu ya haraka"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Majibu ya haraka"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Chagua jibu la haraka"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Imeshindwa kupata programu ya barua pepe"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Nitachelewa tu kwa dakika chache."</item>
-    <item msgid="6215158751728689832">"Kuwa hapo katika dakika 10."</item>
-    <item msgid="4485794001743679338">"Endelea na uanze bila mimi."</item>
-    <item msgid="8036557974294987511">"Samahani, Siwezi. Itabidi tupange upya."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Nitachelewa tu kwa dakika chache."</item>
+        <item msgid="6215158751728689832">"Kuwa hapo katika dakika 10."</item>
+        <item msgid="4485794001743679338">"Endelea na uanze bila mimi."</item>
+        <item msgid="8036557974294987511">"Samahani, Siwezi. Itabidi tupange upya."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Andika yako binafsi…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Mwandalizi:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Makumbusho"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Futa"</string>
     <string name="save_label" msgid="2133599104834432589">"Kwisha"</string>
     <string name="discard_label" msgid="2394623883289782541">"Ghairi"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Sinzisha zote"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Kataa zote"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Pumzisha"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Tukio la wakati mmoja"</string>
     <string name="endByDate" msgid="7654221304929538201">"; hadi <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; kwa wakati mmoja"</item>
-    <item quantity="other" msgid="4855496837834652446">"; kwa mara <xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Kila siku"</item>
-    <item quantity="other" msgid="5455230727715859264">"Kila baada ya siku <xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; kwa wakati mmoja"</item>
+        <item quantity="other" msgid="4855496837834652446">"; kwa mara <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Kila siku"</item>
+        <item quantity="other" msgid="5455230727715859264">"Kila baada ya siku <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Kila siku ya kazi (Jumatatu-Ijumaa)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Kila wiki siku ya <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Kila wiki  <xliff:g id="NUMBER">%1$d</xliff:g> siku ya <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Kila wiki siku ya <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Kila wiki  <xliff:g id="NUMBER">%1$d</xliff:g> siku ya <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Kila mwezi"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Kila mwaka"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Kila mwezi (kwa siku ya <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Kila mwaka (mnamo <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Maalum (haiwezi kugeuzia kukufaa kwenye simu)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Badilisha tukio hili pekee"</string>
     <string name="modify_all" msgid="4421657265864209041">"Badilisha matukio yote katika mfululizo"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Inaonyesha kalenda na muda wa mtukio ndani ya ukanda wa saa wa nyumba yako unaposafiri"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Saa za eneo nyumbani"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Onyesha nambari ya wiki"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Kuhusu"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Toleo la muundo"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalenda"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Hakuna matukio ya kalenda yatakayofanyika hivi karibuni"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Ya majaribio"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Vikumbusho"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Ruka Vikumbusho"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Ruka Vikumbusho"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Saa za utulivu"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Fanya kimya vikumbusho vya matukio katika wakati uliobainishwa."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Wakati wa kuanza kwa saa za utulivu"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Muda wa mwisho wa Saa tulivu"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Utatuaji"</string>
     <string name="copy_db" msgid="437691290566699292">"Tuma hifadhidata"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Inatafuta <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Ondoa mhudhuriaji"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Ongesha kumbusho"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Ondoa kumbusho"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Ongeza mhudhuriaji"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Sawazisha kalenda"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Tukio la mchana kutwa"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Kurudia"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Saa ya kumbusho"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Aina ya kumbusho"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Onyesha kuwa"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Faragha"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Arifa ya Kalenda"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Arifa ya Pumzisha"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Watumie wageni barua pepe"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Tukio jipya"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Tukio <xliff:g id="ITEM_INDEX">%1$s</xliff:g> la <xliff:g id="ITEM_COUNT">%2$s</xliff:g>"</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"Tukio 1"</item>
-    <item quantity="other" msgid="6093072093209431078">"Matukio <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+ tukio 1"</item>
-    <item quantity="other" msgid="3609243840882275136">"+ matukio <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"Tukio 1"</item>
+        <item quantity="other" msgid="6093072093209431078">"Matukio <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+ tukio 1"</item>
+        <item quantity="other" msgid="3609243840882275136">"+ matukio <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Tukio lililochaguliwa"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"Usikague -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Rudia"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Usirudie kamwe"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Kila baada ya siku <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="707566499994398250">"Kila baada ya siku <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Kila baada ya wiki <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="7094801039989237061">"Kila baada ya wiki <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Kila baada ya mwezi <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="5419723710346646523">"Kila baada ya miezi <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Kila baada ya mwaka <xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="5678653649746562060">"Kila baada ya miaka <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Kila baada ya siku <xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="707566499994398250">"Kila baada ya siku <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Kila baada ya wiki <xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="7094801039989237061">"Kila baada ya wiki <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Kila baada ya mwezi <xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="5419723710346646523">"Kila baada ya miezi <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Kila baada ya mwaka <xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="5678653649746562060">"Kila baada ya miaka <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"katika siku sawa ya kila mwezi"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Milele"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Hadi tarehe"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Hadi <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Kwa matukio kadhaa"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Kwa tukio <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="8779598489398048259">"Kwa matukio <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Kwa tukio <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="8779598489398048259">"Kwa matukio <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"badilisha tarehe ya mwisho"</string>
     <string name="visibility_default">Chaguo-msingi</string>
   <string name="visibility_private">Faragha</string>
@@ -283,4 +252,4 @@
   <string name="preferences_licence">Leseni</string>
     <string name="preferences_privacy_policy">Sera ya faragha</string>
     <string name="preferences_service_terms">Masharti ya Huduma</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-szl/strings.xml b/res/values-szl/strings.xml
index 74e5248e92ab476e8dfe182ad6497f9c450fce1c..eec46557b86373f06c55a6b9e580372c54f5a82f 100644
--- a/res/values-szl/strings.xml
+++ b/res/values-szl/strings.xml
@@ -2,7 +2,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="rsvp_accepted">Ôdpowiedziano \"ja\".</string>
     <string name="event_color_set_to_default">Nasztaluj wychodno farba kalyndorza</string>
-    <string name="menu_general_preferences">Sztelōnki ôgōlne</string>
     <string name="new_event_dialog_option">Nowe zdarzynie</string>
     <string name="edit_label">Edytuj</string>
     <string name="no_title_label">(Bez tytułu)</string>
@@ -25,7 +24,6 @@
     </plurals>
     <string name="show_newer_events">Tyknij, coby pokozać zdarzynia po <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g>
     </string>
-    <string name="preferences_about_title">Informacyje</string>
     <string name="one_and_a_half_hours">1.5 godzin</string>
     <string name="monthly">Co miesiōnc</string>
     <string name="show_day_view">Pokoż dziyń</string>
@@ -33,7 +31,6 @@
     <string name="preferences_hide_declined_title">Skryj ôdciepniynte</string>
     <string name="no_syncable_calendars">Brak kalyndorzōw</string>
     <string name="recurrence_end_count_label">Ôkryślōno wielość powtōrzyń</string>
-    <string name="acct_not_synced">Kōnto niyma synchrōnizowane, bez to kalyndorze mogōm niy być aktualne.</string>
     <string name="accessibility_pick_recurrence">Powtorzej zdarzynie</string>
     <string name="show_controls">Pokoż nawigacyjo</string>
     <plurals name="recurrence_end_count">
@@ -49,7 +46,6 @@
     <string name="new_event_dialog_label">Nowe zdarzynie</string>
     <string name="endByDate">; do <xliff:g id="DATE">%s</xliff:g>
     </string>
-    <string name="gadget_title">Kalyndorz</string>
     <string name="delete_this_event_title">Skasować zdarzynie\?</string>
     <string name="rsvp_tentative">Ôdpowiedziano \"możno\".</string>
     <string name="what_label">Co</string>
@@ -59,7 +55,6 @@
     <string name="privacy_label">Prywatność</string>
     <string name="response_no">Niy</string>
     <string name="preferences_build_version">Wersyjo kōmpilacyje</string>
-    <string name="accounts">Kōnta i synchrōnizacyjo</string>
     <plurals name="Nminutes">
         <item quantity="one">1 minuta</item>
         <item quantity="other">
@@ -80,17 +75,14 @@
     <string name="calendar_square_color_picker_description">Ôbiyranie farbōw</string>
     <string name="recurrence_end_date">Do <xliff:g id="DATE">%s</xliff:g>
     </string>
-    <string name="preferences_reminders_quiet_hours_start">Poczōntek cichych godzin</string>
     <string name="preferences_dark_theme">Ciymny</string>
     <string name="event_create">Nowe zdarzynie</string>
     <string name="preferences_default_reminder_default">10</string>
-    <string name="synced">zesynchrōnizowany</string>
     <string name="event_info_organizer">Ôrganizatōr:</string>
     <string name="preferences_alerts_custom_snooze_delay_summary_off">Dycki używej wychodnyj dugości drzymki</string>
     <string name="tomorrow_at_time_fmt">Jutro ô <xliff:g id="time_interval">%s</xliff:g>
     </string>
     <string name="preferences_default_snooze_delay_dialog">Wychodno dugość drzymki</string>
-    <string name="select_visible_calendars_title">Kalyndorze do pokozanio</string>
     <string name="preferences_issues">Zgłoś problym</string>
     <string name="preferences_black_theme">Czorny</string>
     <plurals name="Nmins">
@@ -110,7 +102,6 @@
     <string name="cal_pick_ics">Ôbier zbiōr do zaimportowanio</string>
     <string name="create_event_dialog_save">Spamiyntej</string>
     <string name="preferences_alerts_popup_title">Pokoż na ekranie</string>
-    <string name="accessibility_email_notification">Wyślij e-maila do gości</string>
     <string name="gadget_no_events">Brak zbliżajōncych sie zdarzyń w kalyndorzu</string>
     <string name="preferences_use_home_tz_title">Dōmowo strefa czasowo</string>
     <string name="accessibility_pick_start_time">Godzina zaczyńcio</string>
@@ -124,7 +115,6 @@
     <string name="yearly_plain">Co rok</string>
     <string name="event_color_picker_dialog_title">Farba zdarzynio</string>
     <string name="saving_event">Zdarzynie było spamiyntano.</string>
-    <string name="recurrence_dialog_title">Powtōrz</string>
     <string name="call_label">Zazwōń</string>
     <string name="modify_all_following">Zmiyń to i wszyjske prziszłe zdarzynia</string>
     <string name="preferences_light_theme">Jasny</string>
@@ -155,13 +145,7 @@
     <string name="preferences_home_tz_title">Dōmowo strefa czasowo</string>
     <string name="quick_response_custom_msg">Napisz włosno…</string>
     <string name="event_view">Pokoż zdarzynie</string>
-    <string name="preferences_reminders_quiet_hours_description">Wyciszej spōmniynia ô zdarzyniach bez ôkryślōny czas.</string>
-    <string name="quick_response_settings_title">Edytuj gibke ôdpowiedzi</string>
     <string name="accessibility_pick_end_time">Godzina kōńca</string>
-    <string name="create_an_account_desc">Kalyndorz funguje lepij z kōntym.
-\n
-\n• Używej go w leda jakij przeglōndarce.
-\n• Twōrz kopije ibryczne trefiyń.</string>
     <string name="preferences_default_reminder_title">Wychodne spōmniynie</string>
     <string name="visibility_public">Publiczny</string>
     <string name="hide_controls">Skryj nawigacyjo</string>
@@ -174,7 +158,6 @@
     <string name="recurrence_month_pattern_by_day">w tyn sōm dziyń miesiōnca</string>
     <string name="creating_event_with_guest">Zaproszynia były wysłane.</string>
     <string name="reminders_label">Przidej spōmniynie</string>
-    <string name="edit_event_show_all">Pokoż wszyjske</string>
     <string name="view_settings">Sztelōnki widoku</string>
     <string name="day_view">Dziyń</string>
     <plurals name="daily">
@@ -182,9 +165,7 @@
         <item quantity="other">Co <xliff:g id="number">%d</xliff:g> dni</item>
     </plurals>
     <string name="day_view_new_event_hint">+ Nowe zdarzynie</string>
-    <string name="accessibility_sync_cal">Synchrōnizuj kalyndorz</string>
     <string name="preferences_reminder_title">Powiadōmiynia i spōmniynia</string>
-    <string name="recurrence_dialog_title_never">Nigdy niy powtorzej</string>
     <string name="event_delete">Skasuj zdarzynie</string>
     <string name="show_time_start">Ino czas zaczyńcio</string>
     <plurals name="recurrence_interval_daily">
@@ -204,14 +185,10 @@
     <string name="copy_db">Wyślij baza danych</string>
     <string name="acessibility_recurrence_choose_end_date_description">zmiyń data kōńca</string>
     <string name="edit_event_calendar_label">Kalyndorz</string>
-    <string name="accessibility_snooze_notification">Uspej powiadōmiynie</string>
-    <string name="preferences_reminders_quiet_hours_end">Kōniec cichych godzin</string>
     <string name="preferences_week_start_day_title">Piyrszy dziyń tydnia</string>
-    <string name="preferences_debug_category">Debugowanie</string>
     <string name="accessibility_remove_reminder">Skasuj spōmniynie</string>
     <string name="email_picker_label">E-mail bez</string>
     <string name="quick_response_settings_summary">Edytuj wychodne ôdpowiedzi do uczestnikōw</string>
-    <string name="select_synced_calendars_title">Kalyndorze do synchrōnizacyje</string>
     <plurals name="N_remaining_events">
         <item quantity="one">+1 zdarzynie</item>
         <item quantity="other">+<xliff:g id="count">%d</xliff:g> zdarzynia</item>
@@ -220,14 +197,12 @@
     <string name="preferences_default_reminder_dialog">Wychodne spōmniynie</string>
     <string name="default_start_last">Piyrwyjszy używany widok</string>
     <string name="preferences_clear_search_history_summary">Skasuj wszyjske piyrwyjsze wyszukowania</string>
-    <string name="accessibility_cal_notification">Powiadōmiynie kalyndorza</string>
     <string name="event_edit">Edytuj zdarzynie</string>
     <string name="menu_preferences">Sztelōnki</string>
     <plurals name="recurrence_interval_yearly">
         <item quantity="one">Co <xliff:g id="COUNT">%d</xliff:g> rok</item>
         <item quantity="other">Co <xliff:g id="COUNT">%d</xliff:g> lata</item>
     </plurals>
-    <string name="not_synced">niyzesynchrōnizowany</string>
     <string name="snooze_delay_dialog_title">Nasztaluj dugość drzymki</string>
     <string name="empty_event">Zdarzynie prōzne – niy było stworzōno.</string>
     <string name="recurrence_end_date_label">Do daty</string>
@@ -238,7 +213,6 @@
     <string name="response_maybe">Możno</string>
     <string name="accessibility_reminder_showmeas">Pokoż mōj sztand za</string>
     <string name="accessibility_reminder_time">Godzina spōmniynio</string>
-    <string name="do_not_check">NIY zaznaczej -&gt;</string>
     <string name="preferences_default_event_duration_title">Wychodno dugość zdarzynio</string>
     <string name="accessibility_reminder_type">Zorta spōmniynio</string>
     <string name="email_organizer_label">Wyślij e-maila do ôrganizatora</string>
@@ -249,7 +223,7 @@
     <string name="cal_import_error_date_msg">Niy idzie zrozumieć podanyj daty: %s</string>
     <string name="repeats_label">Powtorzanie</string>
     <string name="preferences_alerts_vibrateWhen_title">Wibracyje</string>
-    <string name="view_details">Pokoż informacyje</string>
+    <string name="display_options">Pokoż informacyje</string>
     <string name="search">Szukej</string>
     <string name="save_label">Fertich</string>
     <string name="quick_response_email_failed">Niy idzie znojś programu pocztowego</string>
@@ -268,10 +242,8 @@
     <string name="preferences_alerts_ringtone_title">Źwiynk</string>
     <string name="event_info_title_invite">Zaproszynie na tref</string>
     <string name="goto_today">Dzisiej</string>
-    <string name="accessibility_repeats">Powtorzanie</string>
     <string name="preferences_alerts_title">Powiadōmiynia</string>
     <string name="preferences_theme">Tymat</string>
-    <string name="monthly_on_day">Co miesiōnc (<xliff:g id="DAY_OF_MONTH">%s</xliff:g> kożdego miesiōnca)</string>
     <string name="calendar_permission_not_granted">Niystety ta funkcyjo niy funguje. Etar wymogo uprawniyń czytanio i zapisowanio kalyndorza coby funkcjōniyrować sprownie</string>
     <string name="delete_label">Skasuj</string>
     <string name="directory_searching_fmt">Trwo wyszukowanie <xliff:g id="DOMAIN">%s</xliff:g>…</string>
@@ -280,11 +252,9 @@
         <item quantity="other">
             <xliff:g id="COUNT">%d</xliff:g> dni</item>
     </plurals>
-    <string name="yearly">Co rok (<xliff:g id="DATES">%s</xliff:g>)</string>
     <string name="preferences_experimental_category">Eksperymyntalny</string>
     <string name="accessibility_reminder_privacy">Prywatność</string>
     <string name="loading">Wgrowanie…</string>
-    <string name="menu_select_visible_calendars">Kalyndorze do pokozanio</string>
     <string name="acessibility_selected_marker_description">Ôbrane zdarzynie</string>
     <string name="agenda_view">Plan dnia</string>
     <string name="accessibility_remove_attendee">Skasuj uczestnika</string>
@@ -292,7 +262,6 @@
     <string name="one_hour">1 godzina</string>
     <string name="preferences_show_week_num_title">Pokoż numer tydnia</string>
     <string name="visibility_default">Wychodno</string>
-    <string name="snooze_all_label">Ôdłōż wszyjske</string>
     <string name="quick_response_dialog_title">Ôbier gibko ôdpowiydź</string>
     <string name="agenda_tomorrow">jutro, <xliff:g id="DATE">%1$s</xliff:g>
     </string>
@@ -301,7 +270,6 @@
     <string name="add_account">Przidej kōnto</string>
     <string name="custom" product="default">Niysztandardowo (niy idzie przipasować na telefōnie)</string>
     <string name="app_label">Kalyndorz</string>
-    <string name="preferences_reminders_category">Spōmniynia</string>
     <string name="select_synced_calendars_button">Kalyndorze do synchrōnizacyje</string>
     <string name="attendees_label">Goście</string>
     <string name="no_calendars_found">Przed stworzyniym zdarzynio musisz przidać do masziny kōnto z Kalyndorzym i nasztelować ôbrany kalyndorz za widzialny. Ôbier „Przidej kōnto” (jeźli to prawie było zrobiōno, to na kōniec synchrōnizacyje i sprōbuj zaś). Możesz tyż tyknōńć Pociep i dać pozōr, żeby aby jedyn kalyndorz bōł widzialny.</string>
@@ -312,7 +280,6 @@
         <item quantity="one">Co <xliff:g id="COUNT">%d</xliff:g> tydziyń</item>
         <item quantity="other">Co <xliff:g id="count">%d</xliff:g> tydnie</item>
     </plurals>
-    <string name="preferences_reminders_quiet_hours_label">Ciche godziny</string>
     <string name="preferences_days_per_week_dialog">Dni w tydniu</string>
     <string name="every_weekday">Beztydziyń (pn-pt)</string>
     <string name="visibility_confidential">Tajne</string>
@@ -321,7 +288,7 @@
     <plurals name="weekN">
         <item quantity="one">tydziyń <xliff:g id="count">%d</xliff:g>
         </item>
-        <item quantity="other"></item>
+        <item quantity="other">tydziyń <xliff:g id="count">%d</xliff:g></item>
     </plurals>
     <string name="edit_event_to_label">Do</string>
     <string name="preferences_month_view_portrait">Widok miesiōnca (portret)</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index a1c8f140e22b5ec3f84c5692a8a92e5c97585c13..8a9b38c2df4460a6aadd4d5d8d814f35c903edac 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"ว่าง"</item>
     <item msgid="2064426942462573474">"ยังไม่แน่นอน"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"แรก"</item>
-    <item msgid="5631923029483854900">"วินาที"</item>
-    <item msgid="148935502975250973">"ที่สาม"</item>
-    <item msgid="5124200797326669172">"ที่สี่"</item>
-    <item msgid="7564374178324652137">"สุดท้าย"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"ไม่มีการตอบกลับ"</item>
     <item msgid="3724434080904437698">"ใช่"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"กิจกรรมนี้และในอนาคต"</item>
     <item msgid="7833229563617435430">"กิจกรรมทั้งหมด"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"กิจกรรมนี้และในอนาคต"</item>
-    <item msgid="6315440193748139854">"กิจกรรมทั้งหมด"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"เฉพาะกิจกรรมนี้"</item>
     <item msgid="140670561403965380">"กิจกรรมทั้งหมดในชุด"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index df77b46a0e4267a9d6011625c164ecd1b39a3661..283480d9d09c5a3d08614abf35c7f3adb5de016e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"ปฏิทิน"</string>
     <string name="what_label" msgid="1933578391985810049">"อะไร"</string>
     <string name="where_label" msgid="3472482206065595118">"สถานที่"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"วันพรุ่งนี้"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"วันนี้เวลา <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"พรุ่งนี้เวลา <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"การเกิดซ้ำ"</string>
     <string name="no_title_label" msgid="302177118061368042">"(ไม่มีชื่อ)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 นาที"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> นาที"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 นาที"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> นาที"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 ชั่วโมง"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> ชั่วโมง"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 วัน"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> วัน"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"สัปดาห์ที่ <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 นาที"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> นาที"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 นาที"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> นาที"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 ชั่วโมง"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> ชั่วโมง"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 วัน"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> วัน"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"สัปดาห์ที่ <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"รีเฟรช"</string>
     <string name="show_day_view" msgid="5782512782605466016">"แสดงวัน"</string>
     <string name="agenda_view" msgid="5566084759423843245">"กำหนดการ"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"ลบกิจกรรม"</string>
     <string name="goto_today" msgid="9162136434410891230">"วันนี้"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"การตั้งค่า"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"เลือกปฏิทิน"</string>
     <string name="search" msgid="550656004486017426">"ค้นหา"</string>
     <string name="hide_controls" msgid="830320505938520882">"ซ่อนปุ่มควบคุม"</string>
     <string name="show_controls" msgid="715520586028062621">"แสดงปุ่มควบคุม"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"ปฏิทินที่จะแสดง"</string>
-    <string name="synced" msgid="7913940305983383493">"ซิงค์แล้ว"</string>
-    <string name="not_synced" msgid="4275114941801829419">"ไม่ได้ซิงค์"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"บัญชีนี้ไม่มีการซิงค์และปฏิทินของคุณอาจไม่มีข้อมูลล่าสุด"</string>
-    <string name="accounts" msgid="849401841083180306">"บัญชีและการซิงค์"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"ปฏิทินที่จะซิงค์"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"ปฏิทินที่จะซิงค์"</string>
     <string name="hint_what" msgid="709155115005044531">"ชื่อกิจกรรม"</string>
     <string name="hint_where" msgid="4972598001033801974">"สถานที่ตั้ง"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"จาก"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"ตลอดทั้งวัน"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"ปฏิทิน"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"แสดงทั้งหมด"</string>
     <string name="description_label" msgid="7193475046717505855">"คำอธิบาย"</string>
     <string name="presence_label" msgid="6169724148441175862">"แสดงสถานะว่าฉัน"</string>
     <string name="privacy_label" msgid="9215031965259597335">"ข้อมูลส่วนบุคคล"</string>
     <string name="reminders_label" msgid="7292389181815525676">"เพิ่มการแจ้งเตือน"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"ไม่มีปฏิทิน"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"ก่อนที่คุณจะสามารถเพิ่มกิจกรรมได้ คุณต้องเพิ่มบัญชีปฏิทินอย่างน้อยหนึ่งบัญชีลงในอุปกรณ์ของคุณและทำให้ปฏิทินหนึ่งปรากฏให้เห็น แตะ \"เพิ่มบัญชี\" เพื่อเพิ่มบัญชี (หากคุณเพิ่งเพิ่มบัญชี รอให้ซิงค์เสร็จก่อนและลองอีกครั้ง) หรือแตะ \"ยกเลิก\" และตรวจสอบว่ามีอย่างน้อยปฏิทินหนึ่งปรากฏให้เห็น"</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"ปฏิทินทำงานได้ดีกว่าหากมีบัญชี Google"\n\n"•เข้าถึงปฏิทินจากทุกเว็บเบราว์เซอร์"\n"•สำรองข้อมูลกิจกรรมของคุณอย่างปลอดภัย"</string>
     <string name="add_account" msgid="1669072099756774952">"เพิ่มบัญชี"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"ปฏิทิน:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"ผู้จัด:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"โทร"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"คำตอบด่วน"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"แก้ไขคำตอบเริ่มต้น"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"แก้ไขคำตอบด่วน"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"คำตอบด่วน"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"เลือกคำตอบด่วน"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"การค้นหาโปรแกรมอีเมลล้มเหลว"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"ไปช้าสักสองสามนาที"</item>
-    <item msgid="6215158751728689832">"ไปถึงในอีกประมาณ 10 นาที"</item>
-    <item msgid="4485794001743679338">"เริ่มไปเลย ไม่ต้องรอ"</item>
-    <item msgid="8036557974294987511">"ขอโทษ ฉันไปไม่ได้ เราต้องกำหนดเวลากันใหม่"</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"ไปช้าสักสองสามนาที"</item>
+        <item msgid="6215158751728689832">"ไปถึงในอีกประมาณ 10 นาที"</item>
+        <item msgid="4485794001743679338">"เริ่มไปเลย ไม่ต้องรอ"</item>
+        <item msgid="8036557974294987511">"ขอโทษ ฉันไปไม่ได้ เราต้องกำหนดเวลากันใหม่"</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"เขียนคำตอบของคุณเอง…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"ผู้จัด:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"การแจ้งเตือน"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"ลบ"</string>
     <string name="save_label" msgid="2133599104834432589">"เสร็จสิ้น"</string>
     <string name="discard_label" msgid="2394623883289782541">"ยกเลิก"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"ปิดเสียงเตือนชั่วคราวทั้งหมด"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"ปิดทั้งหมด"</string>
     <string name="snooze_label" msgid="1515893621063224666">"ปิดเสียงเตือนชั่วคราว"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"กิจกรรมที่เกิดขึ้นครั้งเดียว"</string>
     <string name="endByDate" msgid="7654221304929538201">"จนถึง <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"รวมหนึ่งครั้ง"</item>
-    <item quantity="other" msgid="4855496837834652446">"รวม <xliff:g id="NUMBER">%d</xliff:g> ครั้ง"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"รายวัน"</item>
-    <item quantity="other" msgid="5455230727715859264">"ทุก <xliff:g id="NUMBER">%d</xliff:g> วัน"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"รวมหนึ่งครั้ง"</item>
+        <item quantity="other" msgid="4855496837834652446">"รวม <xliff:g id="NUMBER">%d</xliff:g> ครั้ง"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"รายวัน"</item>
+        <item quantity="other" msgid="5455230727715859264">"ทุก <xliff:g id="NUMBER">%d</xliff:g> วัน"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"ทุกวันทำการ (จันทร์-ศุกร์)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"ทุก <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> ของแต่ละสัปดาห์"</item>
-    <item quantity="other" msgid="2857390143157377867">"ทุก <xliff:g id="NUMBER">%1$d</xliff:g> สัปดาห์ใน <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"ทุก <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> ของแต่ละสัปดาห์"</item>
+        <item quantity="other" msgid="2857390143157377867">"ทุก <xliff:g id="NUMBER">%1$d</xliff:g> สัปดาห์ใน <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"รายเดือน"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"รายปี"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"รายเดือน (ในวันที่ <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"รายปี (วันที่ <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"กำหนดเอง (ไม่สามารถกำหนดค่าบนโทรศัพท์)"</string>
     <string name="modify_event" msgid="5982876409997142690">"เปลี่ยนเฉพาะกิจกรรมนี้"</string>
     <string name="modify_all" msgid="4421657265864209041">"เปลี่ยนกิจกรรมทั้งหมดในชุด"</string>
@@ -195,23 +180,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"แสดงปฏิทินและเวลากิจกรรมตามเขตเวลาท้องถิ่นของคุณขณะเดินทาง"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"เขตเวลาท้องถิ่น"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"แสดงหมายเลขสัปดาห์"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"เกี่ยวกับ"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"รุ่น"</string>
-    <string name="gadget_title" msgid="939918875331310945">"ปฏิทิน"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"ไม่มีกิจกรรมในปฏิทินที่กำลังมาถึง"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"ทดลอง"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"การแจ้งเตือน"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"ข้ามการแจ้งเตือน"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"ข้ามการแจ้งเตือน"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"ชั่วโมงเงียบ"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"ปิดเสียงการแจ้งเตือนกิจกรรมระหว่างเวลาที่กำหนด"</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"เวลาเริ่มชั่วโมงเงียบ"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"เวลาสิ้นสุดชั่วโมงเงียบ"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"การแก้ไขข้อบกพร่อง"</string>
     <string name="copy_db" msgid="437691290566699292">"ส่งฐานข้อมูล"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"กำลังค้นหา <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"นำผู้เข้าร่วมออก"</string>
@@ -224,55 +201,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"เพิ่มการแจ้งเตือน"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"นำการแจ้งเตือนออก"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"เพิ่มผู้เข้าร่วม"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"ซิงค์ปฏิทิน"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"กิจกรรมตลอดวัน"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"การเกิดซ้ำ"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"เวลาการแจ้งเตือน"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"ประเภทการแจ้งเตือน"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"แสดงสถานะว่าฉัน"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"ข้อมูลส่วนบุคคล"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"การแจ้งเตือนของปฏิทิน"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"ปิดเสียงเตือนชั่วคราว"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"ส่งอีเมลถึงผู้เข้าร่วม"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ กิจกรรมใหม่"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"กิจกรรม <xliff:g id="ITEM_INDEX">%1$s</xliff:g> จาก <xliff:g id="ITEM_COUNT">%2$s</xliff:g>"</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 กิจกรรม"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> กิจกรรม"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 กิจกรรม"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> กิจกรรม"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 กิจกรรม"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> กิจกรรม"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 กิจกรรม"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> กิจกรรม"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"กิจกรรมที่เลือก"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"อย่าเลือก -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"ตั้งซ้ำ"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"ไม่เกิดซ้ำ"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"ทุก <xliff:g id="COUNT">%d</xliff:g> วัน"</item>
-    <item quantity="other" msgid="707566499994398250">"ทุก <xliff:g id="COUNT">%d</xliff:g> วัน"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"ทุก <xliff:g id="COUNT">%d</xliff:g> สัปดาห์"</item>
-    <item quantity="other" msgid="7094801039989237061">"ทุก <xliff:g id="COUNT">%d</xliff:g> สัปดาห์"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"ทุก <xliff:g id="COUNT">%d</xliff:g> เดือน"</item>
-    <item quantity="other" msgid="5419723710346646523">"ทุก <xliff:g id="COUNT">%d</xliff:g> เดือน"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"ทุก <xliff:g id="COUNT">%d</xliff:g> ปี"</item>
-    <item quantity="other" msgid="5678653649746562060">"ทุก <xliff:g id="COUNT">%d</xliff:g> ปี"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"ทุก <xliff:g id="COUNT">%d</xliff:g> วัน"</item>
+        <item quantity="other" msgid="707566499994398250">"ทุก <xliff:g id="COUNT">%d</xliff:g> วัน"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"ทุก <xliff:g id="COUNT">%d</xliff:g> สัปดาห์"</item>
+        <item quantity="other" msgid="7094801039989237061">"ทุก <xliff:g id="COUNT">%d</xliff:g> สัปดาห์"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"ทุก <xliff:g id="COUNT">%d</xliff:g> เดือน"</item>
+        <item quantity="other" msgid="5419723710346646523">"ทุก <xliff:g id="COUNT">%d</xliff:g> เดือน"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"ทุก <xliff:g id="COUNT">%d</xliff:g> ปี"</item>
+        <item quantity="other" msgid="5678653649746562060">"ทุก <xliff:g id="COUNT">%d</xliff:g> ปี"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"ในวันเดียวกันในแต่ละเดือน"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"ตลอดไป"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"จนถึงวันที่"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"จนถึงวันที่ <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"กำหนดจำนวนกิจกรรม"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"สำหรับกิจกรรม <xliff:g id="EVENT_COUNT">%d</xliff:g> รายการ"</item>
-    <item quantity="other" msgid="8779598489398048259">"สำหรับกิจกรรม <xliff:g id="EVENT_COUNT">%d</xliff:g> รายการ"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"สำหรับกิจกรรม <xliff:g id="EVENT_COUNT">%d</xliff:g> รายการ"</item>
+        <item quantity="other" msgid="8779598489398048259">"สำหรับกิจกรรม <xliff:g id="EVENT_COUNT">%d</xliff:g> รายการ"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"เปลี่ยนวันที่สิ้นสุด"</string>
     <string name="visibility_default">เริ่มต้น</string>
   <string name="visibility_private">ส่วนบุคคล</string>
@@ -283,4 +252,4 @@
     <string name="preferences_licence">การอนุญาต</string>
     <string name="preferences_privacy_policy">นโยบายความเป็นส่วนตัว</string>
     <string name="preferences_service_terms">เงื่อนไขการให้บริการ</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 837f6699143a5b4fa244a3db63f7449b104b2634..c67e4d573ba0029f5c66257ecafef04a93d104d9 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Available"</item>
     <item msgid="2064426942462573474">"Pansamantala"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"una"</item>
-    <item msgid="5631923029483854900">"segundo"</item>
-    <item msgid="148935502975250973">"pangatlo"</item>
-    <item msgid="5124200797326669172">"pang-apat"</item>
-    <item msgid="7564374178324652137">"panghuli"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Walang tugon"</item>
     <item msgid="3724434080904437698">"Oo"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Ito at mga kaganapan sa hinaharap"</item>
     <item msgid="7833229563617435430">"Lahat ng mg kaganapan"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Itong &amp; mga kaganapan sa hinaharap"</item>
-    <item msgid="6315440193748139854">"Lahat ng mga kaganapan"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Ang kaganapang ito lamang"</item>
     <item msgid="140670561403965380">"Lahat ng mga kaganapan sa serye"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f92f7cc12cb9b54515e5bb14bd87e890b06479bf..9c4db2d2d7e606ccab49a7ceb3853daa26578b5f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Kalendaryo"</string>
     <string name="what_label" msgid="1933578391985810049">"Ano"</string>
     <string name="where_label" msgid="3472482206065595118">"Saan"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Bukas"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Ngayong <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Bukas ng <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Pag-uulit"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Walang pamagat)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 minuto"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> (na) minuto"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 min"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> (na) min"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 oras"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> (na) oras"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 araw"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> (na) araw"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"linggo <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 minuto"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> (na) minuto"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 min"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> (na) min"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 oras"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> (na) oras"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 araw"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> (na) araw"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"linggo <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"I-refresh"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Ipakita ang araw"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Agenda"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Tanggalin ang kaganapan"</string>
     <string name="goto_today" msgid="9162136434410891230">"Ngayong araw"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Mga Setting"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Mga kalendaryong ipapakita"</string>
     <string name="search" msgid="550656004486017426">"Paghahanap"</string>
     <string name="hide_controls" msgid="830320505938520882">"Itago ang mga kontrol"</string>
     <string name="show_controls" msgid="715520586028062621">"Ipakita ang mga kontrol"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Mga kalendaryong ipapakita"</string>
-    <string name="synced" msgid="7913940305983383493">"naka-sync"</string>
-    <string name="not_synced" msgid="4275114941801829419">"hindi naka-sync"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Hindi sini-sync ang account na ito kung kaya maaaring hindi napapanahon ang iyong mga kalendaryo."</string>
-    <string name="accounts" msgid="849401841083180306">"Mga Account &amp; sync"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Mga kalendaryong isi-sync"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Mga kalendaryong isi-sync"</string>
     <string name="hint_what" msgid="709155115005044531">"Pangalan ng kaganapan"</string>
     <string name="hint_where" msgid="4972598001033801974">"Lokasyon"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Mula"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Buong araw"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Kalendaryo"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Ipakita lahat"</string>
     <string name="description_label" msgid="7193475046717505855">"Paglalarawan"</string>
     <string name="presence_label" msgid="6169724148441175862">"Ipakita ako bilang"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Privacy"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Magdagdag ng paalala"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Walang mga kalendaryo"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Bago ka makapagdagdag ng isang kaganapan, dapat kang magdagdag ng hindi bababa sa isang Calendar account sa iyong device at gawing nakikita ang isang kalendaryo. Pindutin ang Magdagdag ng Account upang magdagdag ng isang account (kung kadaragdag mo lang ng isang account, hintayin itong matapos sa pag-sync at subukang muli). O pindutin ang Kanselahin at tiyaking nakikita ang hindi bababa sa isang kalendaryo."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Mas mahusay na gumagana ang Calendar gamit ang Account."\n\n"• I-access ito mula sa anumang web browser"\n"• I-back up nang secure ang iyong mga kaganapan"</string>
     <string name="add_account" msgid="1669072099756774952">"Magdagdag ng account"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Kalendaryo:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Organizer:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Tumawag"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Mabilisang tugon"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Edit default tugon pag email sa mga bisita"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Edit mabilis tugon"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Mabilisang tugon"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Pumili ng mabilisang tugon"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Nabigong makahanap ng email program"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Mahuhuli nang ilang minuto lang."</item>
-    <item msgid="6215158751728689832">"Darating na sa loob ng mga 10 minuto."</item>
-    <item msgid="4485794001743679338">"Magsimula na kayo nang wala ako."</item>
-    <item msgid="8036557974294987511">"Paumanhin, hindi ako makakapunta. Kakailanganin nating mag-reschedule."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Mahuhuli nang ilang minuto lang."</item>
+        <item msgid="6215158751728689832">"Darating na sa loob ng mga 10 minuto."</item>
+        <item msgid="4485794001743679338">"Magsimula na kayo nang wala ako."</item>
+        <item msgid="8036557974294987511">"Paumanhin, hindi ako makakapunta. Kakailanganin nating mag-reschedule."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Isulat ang iyong sariling…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Taga-ayos:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Mga Paalala"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Tanggalin"</string>
     <string name="save_label" msgid="2133599104834432589">"Tapos na"</string>
     <string name="discard_label" msgid="2394623883289782541">"Kanselahin"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"I-snooze lahat"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Balewalain lahat"</string>
     <string name="snooze_label" msgid="1515893621063224666">"I-snooze"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Isang-beses na kaganapan"</string>
     <string name="endByDate" msgid="7654221304929538201">"; hanggang <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; isang beses"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> (na) beses"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Araw-araw"</item>
-    <item quantity="other" msgid="5455230727715859264">"Bawat <xliff:g id="NUMBER">%d</xliff:g> araw"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; isang beses"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> (na) beses"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Araw-araw"</item>
+        <item quantity="other" msgid="5455230727715859264">"Bawat <xliff:g id="NUMBER">%d</xliff:g> araw"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Tuwing Lunes hanggang Biyernes"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> linggu-linggo"</item>
-    <item quantity="other" msgid="2857390143157377867">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> bawat <xliff:g id="NUMBER">%1$d</xliff:g> (na) linggo"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> linggu-linggo"</item>
+        <item quantity="other" msgid="2857390143157377867">"<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g> bawat <xliff:g id="NUMBER">%1$d</xliff:g> (na) linggo"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Buwan-buwan"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Taun-taon"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Buwan-buwan (sa araw na <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Taun-taon (sa <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Custom (hindi mako-customize sa telepono)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Baguhin ang kaganapang ito lamang"</string>
     <string name="modify_all" msgid="4421657265864209041">"Palitan ang lahat ng kaganapan sa serye"</string>
@@ -194,23 +179,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Ipakita calendar at event time sa home time zone sa biyahe"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Home time zone"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Ipakita ang numero ng linggo"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Tungkol sa"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Bumuo ng bersyon"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Kalendaryo"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Walang mga paparating na kaganapan sa kalendaryo"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Pang-eksperimento"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Mga Paalala"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Laktawan ang Mga Paalala"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Laktawan ang Mga Paalala"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Mga oras na tahimik"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Patahimikin ang mga paalala sa kaganapan sa tinukoy na oras."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Quiet hours start time"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Quiet hours end time"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Pag-debug"</string>
     <string name="copy_db" msgid="437691290566699292">"Ipadala ang database"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Naghahanap <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Alisin ang dadalo"</string>
@@ -223,55 +200,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Magdagdag ng paalala"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Alisin ang paalala"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Magdagdag ng dadalo"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"I-sync ang kalendaryo"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Kaganapang buong araw"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Pag-uulit"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Oras ng paalala"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Uri ng paalala"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Ipakita ako bilang"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Privacy"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Mga Notification sa Kalendaryo"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"I-snooze ang Notification"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"I-email ang mga bisita"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Bagong kaganapan"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Kaganapan <xliff:g id="ITEM_INDEX">%1$s</xliff:g> ng <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 kaganapan"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> (na) kaganapan"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 kaganapan"</item>
-    <item quantity="other" msgid="3609243840882275136">"<xliff:g id="COUNT">%d</xliff:g> (na) kaganapan"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 kaganapan"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> (na) kaganapan"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 kaganapan"</item>
+        <item quantity="other" msgid="3609243840882275136">"<xliff:g id="COUNT">%d</xliff:g> (na) kaganapan"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Piniling kaganapan"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"HUWAG lagyan ng check -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Ulitin"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Hindi nauulit"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Bawat <xliff:g id="COUNT">%d</xliff:g> araw"</item>
-    <item quantity="other" msgid="707566499994398250">"Bawat <xliff:g id="COUNT">%d</xliff:g> (na) araw"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Bawat <xliff:g id="COUNT">%d</xliff:g> linggo"</item>
-    <item quantity="other" msgid="7094801039989237061">"Bawat <xliff:g id="COUNT">%d</xliff:g> (na) linggo"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Bawat <xliff:g id="COUNT">%d</xliff:g> buwan"</item>
-    <item quantity="other" msgid="5419723710346646523">"Bawat <xliff:g id="COUNT">%d</xliff:g> (na) buwan"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Bawat <xliff:g id="COUNT">%d</xliff:g> taon"</item>
-    <item quantity="other" msgid="5678653649746562060">"Bawat <xliff:g id="COUNT">%d</xliff:g> (na) taon"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Bawat <xliff:g id="COUNT">%d</xliff:g> araw"</item>
+        <item quantity="other" msgid="707566499994398250">"Bawat <xliff:g id="COUNT">%d</xliff:g> (na) araw"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Bawat <xliff:g id="COUNT">%d</xliff:g> linggo"</item>
+        <item quantity="other" msgid="7094801039989237061">"Bawat <xliff:g id="COUNT">%d</xliff:g> (na) linggo"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Bawat <xliff:g id="COUNT">%d</xliff:g> buwan"</item>
+        <item quantity="other" msgid="5419723710346646523">"Bawat <xliff:g id="COUNT">%d</xliff:g> (na) buwan"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Bawat <xliff:g id="COUNT">%d</xliff:g> taon"</item>
+        <item quantity="other" msgid="5678653649746562060">"Bawat <xliff:g id="COUNT">%d</xliff:g> (na) taon"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"pareho araw buwanan"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Habambuhay"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"hanggang tukoy na petsa"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Hanggang <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"sa ilang kaganapan"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Para sa <xliff:g id="EVENT_COUNT">%d</xliff:g> (na) kaganapan"</item>
-    <item quantity="other" msgid="8779598489398048259">"Para sa <xliff:g id="EVENT_COUNT">%d</xliff:g> (na) kaganapan"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Para sa <xliff:g id="EVENT_COUNT">%d</xliff:g> (na) kaganapan"</item>
+        <item quantity="other" msgid="8779598489398048259">"Para sa <xliff:g id="EVENT_COUNT">%d</xliff:g> (na) kaganapan"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"baguhin ang petsa ng pagtatapos"</string>
     <string name="visibility_default">Default</string>
   <string name="visibility_private">Pribado</string>
@@ -280,4 +249,4 @@
   <string name="preferences_source_code">Source code</string>
     <string name="preferences_privacy_policy">Privacy policy</string>
     <string name="preferences_service_terms">Terms of service</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 72f7aefe450de402f160e00b760820d2fddf07e5..2d8a24c68e12e34812eb8943be4f712c46cc24a7 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Uygun"</item>
     <item msgid="2064426942462573474">"Kararsız"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"ilk"</item>
-    <item msgid="5631923029483854900">"ikinci"</item>
-    <item msgid="148935502975250973">"üçüncü"</item>
-    <item msgid="5124200797326669172">"dördüncü"</item>
-    <item msgid="7564374178324652137">"son"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Yanıt yok"</item>
     <item msgid="3724434080904437698">"Evet"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Bu ve gelecekteki etkinlikler"</item>
     <item msgid="7833229563617435430">"Tüm etkinlikler"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Bu ve gelecekteki etkinlikler"</item>
-    <item msgid="6315440193748139854">"Tüm etkinlikler"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Yalnızca bu etkinlik"</item>
     <item msgid="140670561403965380">"Serideki tüm etkinlikler"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 547d0f5c3068dae92cba21340aa9799968569a33..37e839e026d78dc9b4c1217b4f30653f71213ef0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -62,16 +62,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Etkinliği sil"</string>
     <string name="goto_today" msgid="9162136434410891230">"Bugün"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Ayarlar"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Görüntlnck takvimler"</string>
     <string name="search" msgid="550656004486017426">"Ara"</string>
     <string name="hide_controls" msgid="830320505938520882">"Denetimleri gizle"</string>
     <string name="show_controls" msgid="715520586028062621">"Denetimleri göster"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Görüntülenecek takvimler"</string>
-    <string name="synced" msgid="7913940305983383493">"senkronize edildi"</string>
-    <string name="not_synced" msgid="4275114941801829419">"senkronize edilmedi"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Bu hesap senkronize edilmiyor, bu nedenle takvimleriniz güncel olmayabilir."</string>
-    <string name="accounts" msgid="849401841083180306">"Hesaplar ve senkronizasyon"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Senkronize edilecek takvimler"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Senkronize edilecek takvimler"</string>
     <string name="hint_what" msgid="709155115005044531">"Etkinlik adı"</string>
     <string name="hint_where" msgid="4972598001033801974">"Konum"</string>
@@ -90,14 +83,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">Başlama</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Tüm gün"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Takvim"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Tümünü göster"</string>
     <string name="description_label" msgid="7193475046717505855">"Açıklama"</string>
     <string name="presence_label" msgid="6169724148441175862">Bana şunun gibi göster</string>
     <string name="privacy_label" msgid="9215031965259597335">"Gizlilik"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Hatırlatıcı ekle"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Takvim yok"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Bir etkinlik ekleyebilmek için öncelikle cihazınıza en az bir Takvim hesabı eklemeli ve takvimi görünür yapmalısınız. Hesap eklemek için Hesap Ekle\'ye dokunun (hesabı yeni eklediyseniz, senkronizasyonu bitirmesini bekleyin ve tekrar deneyin). Ya da İptal\'e dokunun ve en az bir takvimin görünür olduğundan emin olun."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Takvim bir Google Hesabı ile daha iyi çalışır."\n\n"• Takvim\'e herhangi bir tarayıcıdan erişin"\n"• Mevcut etkinliklerinizi güvenli bir şekilde yedekleyin"</string>
     <string name="add_account" msgid="1669072099756774952">"Hesap ekle"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Takvim:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Düzenleyici:"</string>
@@ -118,7 +109,6 @@
     <string name="call_label" msgid="2960328220008869083">"Çağrı"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Hızlı yanıtlar"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Konuklara gönderilecek e-posta varsayılan yanıtlarını düzenle"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Hızlı yanıtları düzenle"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Hızlı yanıt"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Hızlı yanıt seç"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Bir e-posta programı bulunamadı"</string>
@@ -143,7 +133,6 @@
     <string name="delete_label" msgid="874742811918030739">"Sil"</string>
     <string name="save_label" msgid="2133599104834432589">"Bitti"</string>
     <string name="discard_label" msgid="2394623883289782541">"İptal"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Tümünü ertele"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Tümünü kapat"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Ertele"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Bir kerelik etkinlik"</string>
@@ -163,8 +152,6 @@
     </plurals>
     <string name="monthly" msgid="4587116285383048586">"Aylık"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Yılda bir"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Ayda bir (<xliff:g id="DAY_OF_MONTH">%s</xliff:g>. günde)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Yılda bir (<xliff:g id="DATES">%s</xliff:g> tarihinde)"</string>
     <string name="custom" product="default" msgid="4137468716966004993">"Özel (telefonda özelleştirilemez)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Yalnızca bu etkinliği değiştir"</string>
     <string name="modify_all" msgid="4421657265864209041">"Serideki tüm etkinlikleri değiştir"</string>
@@ -174,8 +161,6 @@
     <string name="delete_this_event_title" msgid="518402946676919384">"Bu etkinlik silinsin mi?"</string>
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"<xliff:g id="EVENTTITLE">%s</xliff:g> silinsin mi?"</string>
     <string name="change_response_title" msgid="7704714776070974984">"Yanıtı değiştir"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"Genel ayarlar"</string>
-    <string name="menu_about_preferences" msgid="6124375438237674973">"Takvim hakkında"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Ayarlar"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Takvim görünümü ayarı"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Bildirimler ve hatırlatıcılar"</string>
@@ -196,23 +181,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Seyahat ederken takvimleri ve etkinlik saatlerini ev saat diliminde görüntüler"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Ev saat dilimi"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Hafta sayısını göster"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Hakkında"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Derleme sürümü"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Takvim"</string>
     <plurals name="month_more_events">
         <item quantity="one" msgid="8971334808414201327">"+1"</item>
         <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
     </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Yakın takvim etkinliği yok"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Deneysel"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Hatırlatıcılar"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Hatırlatıcıları Atla"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Hatırlatıcıları Atla"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Sessiz zaman"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Belirtilen süre boyunca sessiz etkinlik hatırlatıcıları."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Sessiz zaman başlangıç saati"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Sessiz zaman bitiş saati"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Hata ayıklama"</string>
     <string name="copy_db" msgid="437691290566699292">"Veritabanını gönder"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"<xliff:g id="DOMAIN">%s</xliff:g> aranıyor…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Katılımcıyı kaldır"</string>
@@ -225,16 +202,11 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Hatırlatıcı ekle"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Hatırlatıcıyı kaldır"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Katılımcı ekle"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Takvimi senkronize et"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Tüm gün etkinliği"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Tekrar"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Hatırlatıcı süresi"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Hatırlatıcı türü"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">Bana şunun gibi göster</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Gizlilik"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Takvim Bildirimleri"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Erteleme Bildirimi"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Davetlilere e-posta gönder"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Yeni etkinlik"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Etkinlik: <xliff:g id="ITEM_INDEX">%1$s</xliff:g> / <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
     <plurals name="Nevents">
@@ -246,9 +218,6 @@
         <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> etkinlik"</item>
     </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Seçili etkinlik"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"İŞARETLEMEYİN -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Tekrar"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Tekrarlama yok"</string>
     <plurals name="recurrence_interval_daily">
         <item quantity="one" msgid="1205422710088692631">"Her <xliff:g id="COUNT">%d</xliff:g> günde bir"</item>
         <item quantity="other" msgid="707566499994398250">"Her <xliff:g id="COUNT">%d</xliff:g> günde bir"</item>
@@ -301,6 +270,70 @@
     <string name="one_hour">1 saat</string>
     <string name="one_and_a_half_hours">1.5 saat</string>
     <string name="two_hours">2 saat</string>
+    <string name="share_label">Paylaş</string>
+    <string name="no_map">Herhangi bir harita uygulaması yüklü değil</string>
+    <string name="default_start_title">Varsayılan görünüm</string>
+    <string name="default_start_last">Önceden kullanılan görünüm</string>
+    <string name="preferences_alerts_custom_snooze_delay_title">Hatırlatıcı için erteleme süresini sor</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_on">Hatırlatıcı her ertelendiğinde erteleme süresini sor</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_off">Her zaman varsayılan erteleme süresini kullan</string>
+    <string name="snooze_delay_dialog_title">Erteleme süresini ayarla</string>
+    <string name="preferences_default_snooze_delay_title">Varsayılan erteleme süresi</string>
+    <string name="preferences_default_snooze_delay_dialog">Varsayılan erteleme süresi</string>
+    <string name="error_generating_ics">Etkinlik paylaşılırken bir hata oluştu</string>
+    <string name="cal_share_intent_title">Etkinliği şuna gönder:</string>
+    <string name="cal_export_event_sdcard_title">SD karta aktar</string>
+    <string name="cal_export_succ_msg">Etkinlik başarıyla dışarıya aktarıldı: %1s</string>
+    <string name="cal_import_menu_title">Etkinliği içeri aktar</string>
+    <string name="cal_nothing_to_import">İçeri aktarılacak hiçbir şey yok</string>
+    <string name="cal_import_error_msg">Takvime aktarma başarısız oldu</string>
+    <string name="cal_import_error_date_msg">Girilen tarih anlaşılamadı: %s</string>
+    <string name="cal_pick_ics">İçe aktarmak için dosya seçin</string>
+    <string name="view_settings">Ayarları görüntüle</string>
+    <string name="preferences_month_view_portrait">Aylık görünüm (Dik)</string>
+    <string name="preferences_month_view_landscape">Aylık görünüm (Yatay)</string>
+    <string name="display_options">Ayrıntıları görüntüle</string>
+    <string name="display_time">Zamanı görüntüle</string>
+    <string name="display_location">Yeri görüntüle</string>
+    <string name="show_time_no">Saati gösterme</string>
+    <string name="show_time_start">Sadece başlangıç saati</string>
+    <string name="show_time_start_end">Başlangıç ve bitiş saatleri</string>
+    <string name="show_time_start_end_below">Etkinliğin altında başlangıç ve bitiş saatleri</string>
+    <string name="maximum_number_of_lines">Etkinlikteki maksimum satır sayısı</string>
+    <string name="foreground_notification_channel_name">Uyarı eşitlemesi</string>
+    <string name="cal_import_error_time_zone_msg">Verilen saat dilimi anlaşılamıyor: %s</string>
+    <string name="preferences_calendar_account">%1$s hesap</string>
+    <string name="preferences_calendar_delete">Takvimi sil</string>
+    <string name="preferences_calendar_display_name">İsmini değiştir</string>
+    <string name="preferences_calendar_color">Renk</string>
+    <string name="preferences_calendar_visible">Olayları görüntüle</string>
+    <string name="preferences_calendar_synchronize">Bu takvimi senkronize et</string>
+    <string name="preferences_list_calendar_summary_sync_off">Senkronize değil</string>
+    <string name="preferences_list_calendar_summary_invisible">Olaylar gösterilmiyor</string>
+    <string name="preferences_list_general">Genel ayarlar</string>
+    <string name="preferences_list_add_remote">Uzak takvim ekle (CalDAV)</string>
+    <string name="preferences_list_add_offline">Çevrimdışı takvim ekle</string>
+    <string name="preferences_list_add_offline_title">Çevrimdışı takvim ekle</string>
+    <string name="preferences_list_add_offline_error_empty">Bir takvim adı girin!</string>
+    <string name="preferences_list_add_offline_message">Çevrimdışı takvimler bir bulut hizmetiyle senkronize DEĞİLDİR ve yalnızca telefonunuzda kullanılabilir.</string>
+    <string name="preferences_list_add_offline_button">Takvim ekle</string>
+    <string name="preferences_list_add_offline_name">İsim</string>
+    <string name="preferences_list_add_offline_cancel">İptal</string>
+    <string name="preferences_calendar_color_warning_title">Uyarı</string>
+    <string name="preferences_calendar_color_warning_message">Takvim tekrar senkronize edildiğinde renk değişikliği sıfırlanabilir.
+\n
+\nBunu önlemek için DAVx⁵\'de \'Takvim renklerini yönet\' devre dışı bırakılabilir.</string>
+    <string name="preferences_calendar_color_warning_button">Anlaşıldı</string>
+    <string name="preferences_calendar_delete_message">Bu takvimi gerçekten silmek istiyor musunuz\?</string>
+    <string name="preferences_calendar_delete_delete">Takvimi sil</string>
+    <string name="preferences_calendar_delete_cancel">İptal</string>
+    <string name="preferences_menu_about">Etar Hakkında</string>
+    <string name="offline_account_name">Çevrimdışı Takvim</string>
+    <string name="app_copyright">© 2015-<xliff:g>%s</xliff:g> Etar Projsi. Portions © 2005-<xliff:g>%s</xliff:g> Android Açık Kaynak Projesi.</string>
+    <string name="authors">Yazarlar</string>
+    <string name="changelog">Değişiklikler</string>
+    <string name="license">Lisans</string>
+    <string name="source_code">Kaynak kod</string>
     <string name="preferences_about_app">Takvim Etar-Takvim\'den çatallandı</string>
     <string name="preferences_authors">Yazarlar</string>
     <string name="preferences_source_code">Kaynak kodu</string>
diff --git a/res/values-ug/arrays.xml b/res/values-ug/arrays.xml
index e7036044c194bc32d0e41a484ea6eff17ded98ba..d6c3ad5057f70d09c35e15dac72af982a09e8909 100644
--- a/res/values-ug/arrays.xml
+++ b/res/values-ug/arrays.xml
@@ -68,13 +68,6 @@
     <item msgid="6228387173725732140">"ئىشلىتىلىشچان"</item>
     <item msgid="2064426942462573474">"سىناق"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"بىرىنچى"</item>
-    <item msgid="5631923029483854900">"ئىككىنچى"</item>
-    <item msgid="148935502975250973">"ئۈچىنچى"</item>
-    <item msgid="5124200797326669172">"تۆتىنچى"</item>
-    <item msgid="7564374178324652137">"ئاخىرقى"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"ئىنكاس يوق"</item>
     <item msgid="3724434080904437698">"ھەئە"</item>
@@ -86,10 +79,6 @@
     <item msgid="1536401639805370405">"بۇ ۋە كەلگۈسىدىكى پائالىيەتلەر"</item>
     <item msgid="7833229563617435430">"ھەممە پائالىيەت"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"بۇ ۋە كەلگۈسىدىكى پائالىيەت"</item>
-    <item msgid="6315440193748139854">"ھەممە پائالىيەت"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"مۇشۇ پائالىيەتلا"</item>
     <item msgid="140670561403965380">"ھەممە مۇھىم پائالىيەتلەر"</item>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index dbbdd9defd8f5f3cd6fc27724bd7dd9042cba53e..286cfb4269d2552cce78445f57f1b3675df82f04 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"يىلنامە"</string>
     <string name="what_label" msgid="1933578391985810049">"مەزمۇن"</string>
     <string name="where_label" msgid="3472482206065595118">"ئورۇن"</string>
@@ -24,28 +23,29 @@
     <string name="tomorrow" msgid="614434811813859237">"ئەتە"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"بۈگۈن <xliff:g id="TIME_INTERVAL">%s</xliff:g> دە"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"ئەتە <xliff:g id="TIME_INTERVAL">%s</xliff:g> دە"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>، <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"date\"&gt;%1$s&lt;/xliff:g&gt;, &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1. id=\"time_interval\"&gt;%2$s&lt;/xliff:g&gt;<xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"تەكرارلاش"</string>
     <string name="no_title_label" msgid="302177118061368042">"(ماۋزۇسىز)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 مىنۇت"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> مىنۇت"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 مىنۇت"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> مىنۇت"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 سائەت"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> سائەت"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">«1 كۈن»</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> كۈن"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g> ھەپتە "</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 مىنۇت"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> مىنۇت"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 مىنۇت"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> مىنۇت"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 سائەت"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> سائەت"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">«1 كۈن»</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> كۈن"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"<xliff:g id="COUNT">%d</xliff:g> ھەپتە "</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"يېڭىلا"</string>
     <string name="show_day_view" msgid="5782512782605466016">"كۈن كۆرسەت"</string>
     <string name="agenda_view" msgid="5566084759423843245">"كۈنتەرتىپ"</string>
@@ -58,16 +58,9 @@
     <string name="event_delete" msgid="2386667193277770442">"پائالىيەتنى ئۆچۈر"</string>
     <string name="goto_today" msgid="9162136434410891230">"بۈگۈن"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"تەڭشەكلەر"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"كۆرسىتىدىغان يىلنامە"</string>
     <string name="search" msgid="550656004486017426">"ئىزدە"</string>
     <string name="hide_controls" msgid="830320505938520882">"كونترولنى يوشۇر"</string>
     <string name="show_controls" msgid="715520586028062621">"كونترولنى كۆرسەت"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"كۆرسىتىدىغان يىلنامە"</string>
-    <string name="synced" msgid="7913940305983383493">"قەدەمداشلاندى"</string>
-    <string name="not_synced" msgid="4275114941801829419">"تېخى قەدەمداشلانمىدى"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"بۇ ھېسابات قەدەمداشلانمىدى، يىلنامىڭىز ئەڭ يېڭىسى بولماسلىقى مۇمكىن."</string>
-    <string name="accounts" msgid="849401841083180306">"ھېسابات ۋە قەدەمداش"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"قەدەمداشلايدىغان يىلنامە"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"قەدەمداشلايدىغان يىلنامە"</string>
     <string name="hint_what" msgid="709155115005044531">"پائالىيەت ئىسمى"</string>
     <string name="hint_where" msgid="4972598001033801974">"ئورنى"</string>
@@ -86,14 +79,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"ئەۋەتكۈچى"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"پۈتۈن كۈن"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"يىلنامە"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"ھەممىنى كۆرسەت"</string>
     <string name="description_label" msgid="7193475046717505855">"چۈشەندۈرۈش"</string>
     <string name="presence_label" msgid="6169724148441175862">"مېنى كۆرسىتىشى"</string>
     <string name="privacy_label" msgid="9215031965259597335">"شەخسىيەت"</string>
     <string name="reminders_label" msgid="7292389181815525676">"ئەسكەرتىش قوش"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"يىلنامە يوق"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"پائالىيەت قوشۇشتىن ئىلگىرى، سىز ئاز دېگەندە بىر يىلنامە ھېساباتى قوشۇپ، يىلنامەنى كۆرسىتىشىڭىز لازىم. ھېسابات قوشنى چەكسىڭىزلا ھېسابات قوشۇلىدۇ(ئەگەر بايىلا ھېسابات قوشقان بولسىڭىز، ھېساباتنىڭ قەدەمداشلىنىشىنى كۈتۈپ ئاندىن قايتا سىناڭ). ياكى ۋاز كەچنى چېكىپ، ئاز دېگەندە بىر يىلنامەنىڭ كۆرۈنۈشىگە كاپالەتلىك قىلىڭ."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"گۇگىل ھېساباتى يىلنامە ئىقتىدارىنى كۈچەيتىدۇ."\n\n"•يىلنامەنى خالىغان توركۆرگۈدىن زىيارەت قىلالايسىز"\n"• بىخەتەر ھالدا پائالىيەتلىرىڭىزنى زاپاسلىيالايسىز"</string>
     <string name="add_account" msgid="1669072099756774952">"ھېسابات قوش"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"يىلنامە:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"تەشكىللىگۈچى:"</string>
@@ -114,16 +105,15 @@
     <string name="call_label" msgid="2960328220008869083">"چاقىر"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"تېز جاۋابلار"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"قاتناشقۇچىغا ئېلخەت يوللىغاندا ئىشلىتىدىغان كۆڭۈلدىكى جاۋابنى تەھرىرلەيدۇ."</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"تېز جاۋاب تەھرىر"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"تېز جاۋاب"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"تېز جاۋاب تاللاڭ"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"ئېلخەت پىروگراممىسىنى تاپالمىدى"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"بىر قانچە مىنۇت كېچىكىشىم مۇمكىن."</item>
-    <item msgid="6215158751728689832">"10 مىنۇت ئەتراپىدا يېتىپ بارىمەن."</item>
-    <item msgid="4485794001743679338">"مېنى ساقلىماي باشلاۋېرىڭلار."</item>
-    <item msgid="8036557974294987511">"كەچۈرۈڭ، مەن ئۈلگۈرەلمىدىم. باشقا بىر ۋاقىتنى كېلىشەيلى."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"بىر قانچە مىنۇت كېچىكىشىم مۇمكىن."</item>
+        <item msgid="6215158751728689832">"10 مىنۇت ئەتراپىدا يېتىپ بارىمەن."</item>
+        <item msgid="4485794001743679338">"مېنى ساقلىماي باشلاۋېرىڭلار."</item>
+        <item msgid="8036557974294987511">"كەچۈرۈڭ، مەن ئۈلگۈرەلمىدىم. باشقا بىر ۋاقىتنى كېلىشەيلى."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"جاۋابىڭىزنى يېزىڭ…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"تەشكىللىگۈچى:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"ئەسكەرتىش"</string>
@@ -139,29 +129,25 @@
     <string name="delete_label" msgid="874742811918030739">"ئۆچۈر"</string>
     <string name="save_label" msgid="2133599104834432589">"تامام"</string>
     <string name="discard_label" msgid="2394623883289782541">"ۋاز كەچ"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"ھەممىنى كېچىكتۈر"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"ھەممىنى بىكار قىل"</string>
     <string name="snooze_label" msgid="1515893621063224666">"قايتا جىرىڭلاتما"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"بىر قېتىملىك پائالىيەت"</string>
     <string name="endByDate" msgid="7654221304929538201">"؛ <xliff:g id="DATE">%s</xliff:g> غىچە"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"؛ بىر قېتىم"</item>
-    <item quantity="other" msgid="4855496837834652446">"؛ <xliff:g id="NUMBER">%d</xliff:g> قېتىم"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"ھەر كۈنى"</item>
-    <item quantity="other" msgid="5455230727715859264">"ھەر <xliff:g id="NUMBER">%d</xliff:g> كۈندە"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"؛ بىر قېتىم"</item>
+        <item quantity="other" msgid="4855496837834652446">"؛ <xliff:g id="NUMBER">%d</xliff:g> قېتىم"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"ھەر كۈنى"</item>
+        <item quantity="other" msgid="5455230727715859264">"ھەر <xliff:g id="NUMBER">%d</xliff:g> كۈندە"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"خىزمەت كۈنى (دۈشەنبە-جۈمە)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"ھەر ھەپتىنىڭ <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"ھەر <xliff:g id="NUMBER">%1$d</xliff:g> ھەپتىنىڭ <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"ھەر ھەپتىنىڭ <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"ھەر <xliff:g id="NUMBER">%1$d</xliff:g> ھەپتىنىڭ <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"ھەر ئايدا"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"ھەر يىلى"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"ھەر ئاينىڭ (<xliff:g id="DAY_OF_MONTH">%s</xliff:g> كۈنى)"</string>
-    <string name="yearly" msgid="8576208380302949002">"ھەر يىلى (<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"ئىختىيارىي… (تېلېفوندا ئۆزلەشتۈرەلمەيدۇ)"</string>
     <string name="modify_event" msgid="5982876409997142690">"مۇشۇ پائالىيەتنىلا ئۆزگەرتىدۇ"</string>
     <string name="modify_all" msgid="4421657265864209041">"تەكرار پائالىيەتنىڭ ھەممىسىنى ئۆزگەرتىدۇ."</string>
@@ -193,23 +179,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"ساياھەت قىلغاندا ۋاقىت رايونى بېسىلسا يىلنامە ۋە پائالىيەت ۋاقتىنى كۆرسىتىدۇ"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"يەرلىك ۋاقىت رايونى"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"ھەپتە نومۇرىنى كۆرسەت"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"ھەققىدە"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"نەشر نومۇرى"</string>
-    <string name="gadget_title" msgid="939918875331310945">"يىلنامە"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"يېقىندا ھېچقانداق يىلنامە پائالىيىتى يوق"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"سىناق"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"ئەسكەرتىش"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"ئەسكەرتىشتىن ئاتلا"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"ئەسكەرتىشتىن ئاتلا"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"دەخلىسىز ۋاقىت"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"بەلگىلەنگەن ۋاقىت بۆلىكىدە پائالىيەتنى ئەسكەرتمەيدۇ."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"دەخلىسىز ۋاقىتنىڭ باشلىنىش ۋاقتى"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"دەخلىسىز ۋاقىتنىڭ ئاخىرلىشىش ۋاقتى"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"سازلاش"</string>
     <string name="copy_db" msgid="437691290566699292">"ساندان يوللا"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"<xliff:g id="DOMAIN">%s</xliff:g> ئىزدەۋاتىدۇ…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"قاتناشقۇچىنى چىقىرىۋەت"</string>
@@ -222,55 +200,48 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"ئەسكەرتىش قوش"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"ئەسكەرتىشنى چىقىرىۋەت"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"قاتناشقۇچى قوش"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"يىلنامە قەدەمداشلا"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"پۈتۈن كۈنلۈك پائالىيەت"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"تەكرارلاش"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"ئەسكەرتىش ۋاقتى"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"ئەسكەرتىش تىپى"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"مېنى كۆرسىتىشى"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"شەخسىيەت"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"يىلنامە ئۇقتۇرۇشى"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"ئۇقتۇرۇشنى ۋاقىتلىق توختات"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"قاتناشقۇچىغا ئېلخەت يوللا"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ يېڭى پائالىيەت"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"<xliff:g id="ITEM_COUNT">%2$s</xliff:g> پائالىيەتنىڭ <xliff:g id="ITEM_INDEX">%1$s</xliff:g>"</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 پائالىيەت"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> پائالىيەت"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"يەنە بىر پائالىيەت"</item>
-    <item quantity="other" msgid="3609243840882275136">"يەنە <xliff:g id="COUNT">%d</xliff:g> پائالىيەت"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 پائالىيەت"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> پائالىيەت"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"يەنە بىر پائالىيەت"</item>
+        <item quantity="other" msgid="3609243840882275136">"يەنە <xliff:g id="COUNT">%d</xliff:g> پائالىيەت"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"تاللانغان پائالىيەت"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"تەكشۈرمە -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"قايتىلا"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"ھەرگىز تەكرارلىما"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"ھەر <xliff:g id="COUNT">%d</xliff:g> كۈندە"</item>
-    <item quantity="other" msgid="707566499994398250">"ھەر <xliff:g id="COUNT">%d</xliff:g> كۈندە"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"ھەر <xliff:g id="COUNT">%d</xliff:g> ھەپتىدە"</item>
-    <item quantity="other" msgid="7094801039989237061">"ھەر <xliff:g id="COUNT">%d</xliff:g> ھەپتىدە"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"ھەر <xliff:g id="COUNT">%d</xliff:g> ئايدا"</item>
-    <item quantity="other" msgid="5419723710346646523">"ھەر <xliff:g id="COUNT">%d</xliff:g> ئايدا"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"ھەر <xliff:g id="COUNT">%d</xliff:g> يىلدا"</item>
-    <item quantity="other" msgid="5678653649746562060">"ھەر <xliff:g id="COUNT">%d</xliff:g> يىلدا"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"ھەر <xliff:g id="COUNT">%d</xliff:g> كۈندە"</item>
+        <item quantity="other" msgid="707566499994398250">"ھەر <xliff:g id="COUNT">%d</xliff:g> كۈندە"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"ھەر <xliff:g id="COUNT">%d</xliff:g> ھەپتىدە"</item>
+        <item quantity="other" msgid="7094801039989237061">"ھەر <xliff:g id="COUNT">%d</xliff:g> ھەپتىدە"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"ھەر <xliff:g id="COUNT">%d</xliff:g> ئايدا"</item>
+        <item quantity="other" msgid="5419723710346646523">"ھەر <xliff:g id="COUNT">%d</xliff:g> ئايدا"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"ھەر <xliff:g id="COUNT">%d</xliff:g> يىلدا"</item>
+        <item quantity="other" msgid="5678653649746562060">"ھەر <xliff:g id="COUNT">%d</xliff:g> يىلدا"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"ھەر ئاينىڭ ئوخشاش بىر كۈنىدە"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"مەڭگۈ"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"بەلگىلىك چېسلاغىچە"</string>
-    <string name="recurrence_end_date" msgid="3693751578164711701">"%s غىچە"<xliff:g id="DATE"></xliff:g></string>
+    <string name="recurrence_end_date" msgid="3693751578164711701">"%s غىچە"<xliff:g id="DATE"/>
+    </string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"چەكلەنگەن قېتىم سانى"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> قېتىم"</item>
-    <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> قېتىم"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"<xliff:g id="EVENT_COUNT">%d</xliff:g> قېتىم"</item>
+        <item quantity="other" msgid="8779598489398048259">"<xliff:g id="EVENT_COUNT">%d</xliff:g> قېتىم"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"ئاخىرلىشىش چېسلاسىنى ئۆزگەرت"</string>
     <string name="visibility_default">كۆڭۈلدىكى</string>
   <string name="visibility_private">خۇسۇسىي</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 723b5540ca69f5740912dab7341deb8ec26d432d..8fd787146e7ef936094f4fa8aee55c161e872206 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"На місці"</item>
     <item msgid="2064426942462573474">"Під питанням"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"перший"</item>
-    <item msgid="5631923029483854900">"другий"</item>
-    <item msgid="148935502975250973">"третій"</item>
-    <item msgid="5124200797326669172">"четвертий"</item>
-    <item msgid="7564374178324652137">"останній"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Відповіді немає"</item>
     <item msgid="3724434080904437698">"Так"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Ця та майбутні події"</item>
     <item msgid="7833229563617435430">"Усі події"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Ця та майбутні події"</item>
-    <item msgid="6315440193748139854">"Усі події"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Лише ця подія"</item>
     <item msgid="140670561403965380">"Усі події в серіях"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e723e36ca8acb7c30d16e3c6371a5f637e6dfcfe..21bc7471f751fdbbfaddeb497b84948d6cff7bf7 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Календар"</string>
     <string name="what_label" msgid="1933578391985810049">"Що"</string>
     <string name="where_label" msgid="3472482206065595118">"Де"</string>
@@ -26,31 +23,49 @@
     <string name="tomorrow" msgid="614434811813859237">"Завтра"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Сьогодні о <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Завтра о <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="repeats_label" msgid="7414023871434593196">"Повторювання"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
+    <string name="repeats_label" msgid="7414023871434593196">Повторення</string>
     <string name="no_title_label" msgid="302177118061368042">"(Без назви)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 хв."</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> хв."</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 хв."</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> хв."</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 год."</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> год."</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 дн."</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> дн."</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"ТИЖДЕНЬ <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one">1 хвилина</item>
+        <item quantity="few">
+            <xliff:g id="COUNT">%d</xliff:g> хвилини</item>
+        <item quantity="many">
+            <xliff:g id="count">%d</xliff:g> хвилин</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one">1 хв.</item>
+        <item quantity="few">
+            <xliff:g id="COUNT">%d</xliff:g> хв.</item>
+        <item quantity="many">
+            <xliff:g id="count">%d</xliff:g> хв.</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one">1 година</item>
+        <item quantity="few">
+            <xliff:g id="COUNT">%d</xliff:g> години</item>
+        <item quantity="many">
+            <xliff:g id="count">%d</xliff:g> годин</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one">1 день</item>
+        <item quantity="few">
+            <xliff:g id="count">%d</xliff:g> дні</item>
+        <item quantity="many">
+            <xliff:g id="count">%d</xliff:g> днів</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="one">тиждень</item>
+        <item quantity="few">
+            <xliff:g id="count">%d</xliff:g> тижні</item>
+        <item quantity="many">
+            <xliff:g id="count">%d</xliff:g> тижнів</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Оновити"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Показ. день"</string>
-    <string name="agenda_view" msgid="5566084759423843245">"Поряд. ден."</string>
+    <string name="agenda_view" msgid="5566084759423843245">Порядок денний</string>
     <string name="day_view" msgid="4467754504843584437">"День"</string>
     <string name="week_view" msgid="6775043022159508060">"Тиждень"</string>
     <string name="month_view" msgid="7287101431749285412">"Місяць"</string>
@@ -60,16 +75,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Видалити подію"</string>
     <string name="goto_today" msgid="9162136434410891230">"Сьогодні"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Налаштування"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Календарі"</string>
     <string name="search" msgid="550656004486017426">"Пошук"</string>
-    <string name="hide_controls" msgid="830320505938520882">"Сховати елем. керув."</string>
-    <string name="show_controls" msgid="715520586028062621">"Показати елем.керув."</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Календарі для показу"</string>
-    <string name="synced" msgid="7913940305983383493">"синхронізовано"</string>
-    <string name="not_synced" msgid="4275114941801829419">"не синхронізовано"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Цей обліковий запис не синхронізується, тому ваші календарі, можливо, застаріли."</string>
-    <string name="accounts" msgid="849401841083180306">"Облікові записи і синхронізація"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Календарі для синхронізації"</string>
+    <string name="hide_controls" msgid="830320505938520882">Сховати елементи керування</string>
+    <string name="show_controls" msgid="715520586028062621">Показати елементи керування</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Календарі для синхронізації"</string>
     <string name="hint_what" msgid="709155115005044531">"Назва події"</string>
     <string name="hint_where" msgid="4972598001033801974">"Місце проведення"</string>
@@ -88,14 +96,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"З"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Увесь день"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Календар"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Показати все"</string>
     <string name="description_label" msgid="7193475046717505855">"Опис"</string>
     <string name="presence_label" msgid="6169724148441175862">"Мій статус"</string>
-    <string name="privacy_label" msgid="9215031965259597335">"Конфіденц."</string>
+    <string name="privacy_label" msgid="9215031965259597335">Конфіденційність</string>
     <string name="reminders_label" msgid="7292389181815525676">"Додати нагадування"</string>
-    <string name="no_syncable_calendars" msgid="7019488867045436129">"Немає календ."</string>
+    <string name="no_syncable_calendars" msgid="7019488867045436129">Немає календарів</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Перш ніж додавати подію, потрібно додати в пристрій хоча б один обліковий запис служби Календар і зробити календар видимим. Щоб додати обліковий запис, торкніться опції \"Додати обліковий запис\" (якщо ви його щойно додали, зачекайте завершення синхронізації та повторіть спробу). Або торкніться опції \"Скасувати\" та переконайтеся, що принаймні один календар видимий."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Календар пропонує більше можливостей, якщо у вас є обліковий запис Google."\n\n"•Отримуйте доступ до нього з будь-якого веб-переглядача"\n"•Створюйте надійні резервні копії своїх подій"</string>
     <string name="add_account" msgid="1669072099756774952">"Додати обліковий запис"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Календар:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Організатор:"</string>
@@ -116,16 +122,15 @@
     <string name="call_label" msgid="2960328220008869083">"Виклик"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Швидкі відповіді"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Редагувати відповіді за умовчанням"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Редагувати швидкі відповіді"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Швидка відповідь"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Вибрати швидку відповідь"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Не вдалося знайти поштову програму"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Запізнююся на декілька хвилин."</item>
-    <item msgid="6215158751728689832">"Буду через 10 хвилин."</item>
-    <item msgid="4485794001743679338">"Починайте без мене."</item>
-    <item msgid="8036557974294987511">"Вибачте, я не зможу. Доведеться перенести зустріч."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Запізнююся на декілька хвилин."</item>
+        <item msgid="6215158751728689832">"Буду через 10 хвилин."</item>
+        <item msgid="4485794001743679338">"Починайте без мене."</item>
+        <item msgid="8036557974294987511">"Вибачте, я не зможу. Доведеться перенести зустріч."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Напишіть власну відповідь…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Організатор:"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Нагадування"</string>
@@ -141,29 +146,31 @@
     <string name="delete_label" msgid="874742811918030739">"Видалити"</string>
     <string name="save_label" msgid="2133599104834432589">"Готово"</string>
     <string name="discard_label" msgid="2394623883289782541">"Скасувати"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Періодично всі"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Припинити всі"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Відкласти"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Одноразова подія"</string>
     <string name="endByDate" msgid="7654221304929538201">"; до <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; один раз"</item>
-    <item quantity="other" msgid="4855496837834652446">"; стільки разів: <xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Щодня"</item>
-    <item quantity="other" msgid="5455230727715859264">"Кожні <xliff:g id="NUMBER">%d</xliff:g> дн."</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one">; один раз</item>
+        <item quantity="few">; <xliff:g id="NUMBER">%d</xliff:g> рази</item>
+        <item quantity="many">; <xliff:g id="NUMBER">%d</xliff:g> разів</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one">Щодня</item>
+        <item quantity="few">Кожні <xliff:g id="number">%d</xliff:g> дні</item>
+        <item quantity="many">Кожні <xliff:g id="number">%d</xliff:g> днів</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Будні дні (пн.-пт.)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Щотижня в <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Кожні <xliff:g id="NUMBER">%1$d</xliff:g> тжн. у <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one">Щотижня у <xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+        <item quantity="few">Кожні <xliff:g id="number">%1$d</xliff:g> тижні у <xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+        <item quantity="many">Кожні <xliff:g id="number">%1$d</xliff:g> тижнів у <xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Щомісяця"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Щороку"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Щомісяця (у день: <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Щороку (дата: <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Спеціальне (неможливо налаштувати в телефоні)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Змінити лише цю подію"</string>
     <string name="modify_all" msgid="4421657265864209041">"Змінити всі події в серіях"</string>
@@ -176,11 +183,11 @@
     <string name="menu_general_preferences" msgid="2812705323334260708">"Загальні налаштування"</string>
     <string name="menu_about_preferences" msgid="6124375438237674973">Календар о</string>
     <string name="preferences_title" msgid="8045855493262131773">"Налаштування"</string>
-    <string name="preferences_general_title" msgid="2069075513760573117">"Налаш. перегляду календ."</string>
+    <string name="preferences_general_title" msgid="2069075513760573117">Налаштування перегляду календаря</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Сповіщення й нагадування"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Сховати відхилені події"</string>
-    <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Початок тижня:"</string>
-    <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Початок тижня:"</string>
+    <string name="preferences_week_start_day_title" msgid="4619489296444901622">Початок тижня</string>
+    <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">Початок тижня</string>
     <string name="preferences_clear_search_history_title" msgid="6619916370215282982">"Очистити історію пошуку"</string>
     <string name="preferences_clear_search_history_summary" msgid="7864674093455778158">"Видалити всі здійснені вами пошуки"</string>
     <string name="search_history_cleared" msgid="1536707558435227567">"Історію пошуку очищено."</string>
@@ -188,30 +195,25 @@
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Вібросигнал"</string>
     <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Звук"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Спливаюче сповіщення"</string>
-    <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Час нагад. за умовч."</string>
-    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Час нагад. за умовч."</string>
+    <string name="preferences_default_reminder_title" msgid="5188861433342733905">Типовий час нагадування</string>
+    <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">Типовий час нагадування</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
     <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Викор.рідн.час.пояс"</string>
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Показувати календарі й час подій у рідному час. поясі під час подорожі"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Рідний час. пояс"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Показувати номер тижня"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Про"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Версія складання"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Календар"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one">+1</item>
+        <item quantity="few">+<xliff:g id="number">%d</xliff:g>
+        </item>
+        <item quantity="many">+<xliff:g id="number">%d</xliff:g>
+        </item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Немає майбутніх подій календаря"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Експериментальна функція"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Нагадування"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Пропускати нагадування"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Пропускати нагадування"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Тихий режим"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"У вибраний час зменшувати гучність нагадувань."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Увімкнути тихий режим"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Вимкнути тихий режим"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Налагодження"</string>
     <string name="copy_db" msgid="437691290566699292">"Надіслати базу даних"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Пошук <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Видалити учасника"</string>
@@ -224,55 +226,56 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Додати нагадування"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Видалити нагадування"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Додати учасника"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Синхронізувати календар"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Подія на цілий день"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Повторювання"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Час нагадування"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Тип нагадування"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Мій статус"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Конфіденційність"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Сповіщення календаря"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Періодичне сповіщення"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Надіслати гостям електронною поштою"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Нова подія"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Подія <xliff:g id="ITEM_INDEX">%1$s</xliff:g> з <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 подія"</item>
-    <item quantity="other" msgid="6093072093209431078">"Подій: <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"і ще 1 подія"</item>
-    <item quantity="other" msgid="3609243840882275136">"та інші події (<xliff:g id="COUNT">%d</xliff:g>)"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one">1 подія</item>
+        <item quantity="few">
+            <xliff:g id="count">%d</xliff:g> події</item>
+        <item quantity="many">
+            <xliff:g id="count">%d</xliff:g> подій</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one">+1 подія</item>
+        <item quantity="few">+<xliff:g id="count">%d</xliff:g> події</item>
+        <item quantity="many">+<xliff:g id="count">%d</xliff:g> подій</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Вибрана подія"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"НЕ ставте прапорець -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Повторити"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Не повторюється"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Кожен <xliff:g id="COUNT">%d</xliff:g> день"</item>
-    <item quantity="other" msgid="707566499994398250">"Кожні <xliff:g id="COUNT">%d</xliff:g> дн."</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Кожен <xliff:g id="COUNT">%d</xliff:g> тжн."</item>
-    <item quantity="other" msgid="7094801039989237061">"Інтервал: <xliff:g id="COUNT">%d</xliff:g> тжн."</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Кожен <xliff:g id="COUNT">%d</xliff:g> міс."</item>
-    <item quantity="other" msgid="5419723710346646523">"Кожні <xliff:g id="COUNT">%d</xliff:g> міс."</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Кожен <xliff:g id="COUNT">%d</xliff:g> рік"</item>
-    <item quantity="other" msgid="5678653649746562060">"Кожні <xliff:g id="COUNT">%d</xliff:g> р."</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one">Кожен <xliff:g id="count">%d</xliff:g> день</item>
+        <item quantity="few">Кожні <xliff:g id="count">%d</xliff:g> дні</item>
+        <item quantity="many">Кожні <xliff:g id="count">%d</xliff:g> дні</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one">Кожен <xliff:g id="COUNT">%d</xliff:g> тиждень</item>
+        <item quantity="few">Кожні <xliff:g id="COUNT">%d</xliff:g> тижні</item>
+        <item quantity="many">Кожні <xliff:g id="COUNT">%d</xliff:g> тижнів</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one">Кожен <xliff:g id="COUNT">%d</xliff:g> місяць</item>
+        <item quantity="few">Кожні <xliff:g id="COUNT">%d</xliff:g> місяці</item>
+        <item quantity="many">Кожні <xliff:g id="COUNT">%d</xliff:g> місяців</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one">Кожен <xliff:g id="COUNT">%d</xliff:g> рік</item>
+        <item quantity="few">Кожні <xliff:g id="COUNT">%d</xliff:g> роки</item>
+        <item quantity="many">Кожні <xliff:g id="COUNT">%d</xliff:g> років</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"певного дня щомісяця"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Постійно"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"До певної дати"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"До <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Для ряду подій"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Для стількох подій: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="8779598489398048259">"Для стількох подій: <xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one">Для <xliff:g id="EVENT_COUNT">%d</xliff:g> події</item>
+        <item quantity="few">Для <xliff:g id="EVENT_COUNT">%d</xliff:g> подій</item>
+        <item quantity="many">Для <xliff:g id="EVENT_COUNT">%d</xliff:g> подій</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"змінити дату завершення"</string>
 
 
@@ -330,7 +333,7 @@
     <string name="view_settings">Опції перегляду</string>
     <string name="preferences_month_view_portrait">Макет помісячного відображення (портретний режим)</string>
     <string name="preferences_month_view_landscape">Макет помісячного відображення (ландшафтний режим)</string>
-    <string name="view_details">Подробиці</string>
+    <string name="display_options">Подробиці</string>
     <string name="display_time">Показувати час</string>
     <string name="display_location">Показувати місце</string>
     <string name="show_time_no">Не показувати час</string>
@@ -338,4 +341,4 @@
     <string name="show_time_start_end">Час початку і закінчення</string>
     <string name="show_time_start_end_below">Час початку і закінчення нижче події</string>
     <string name="maximum_number_of_lines">Максимальна кількість рядків у події</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 3edda7213559a14c20b593e0849743360f8ef9a0..67106b7f18fdfafcd5f353cccc086037eb19c308 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Sẵn có"</item>
     <item msgid="2064426942462573474">"Thử nghiệm"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"đầu tiên"</item>
-    <item msgid="5631923029483854900">"thứ hai"</item>
-    <item msgid="148935502975250973">"thứ ba"</item>
-    <item msgid="5124200797326669172">"thứ tư"</item>
-    <item msgid="7564374178324652137">"cuối cùng"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Không có phản hồi"</item>
     <item msgid="3724434080904437698">"Có"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Sự kiện này và các sự kiện trong tương lai"</item>
     <item msgid="7833229563617435430">"Tất cả sự kiện"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Sự kiện này &amp; các sự kiện trong tương lai"</item>
-    <item msgid="6315440193748139854">"Tất cả sự kiện"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Chỉ sự kiện này"</item>
     <item msgid="140670561403965380">"Tất cả sự kiện trong hàng loạt sự kiện"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4031eac1e3f6766022ab58567b0e4962fd0c26bf..1eeda9273d4fb8851f5b352441eff3890db650d5 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Lịch"</string>
     <string name="what_label" msgid="1933578391985810049">"Tên sự kiện"</string>
     <string name="where_label" msgid="3472482206065595118">"Địa điểm"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Ngày mai"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Hôm nay lúc <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Ngày mai lúc <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Lặp lại"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Không có tiêu đề)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 phút"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> phút"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 phút"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> phút"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 giờ"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> giờ"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 ngày"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> ngày"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"tuần <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 phút"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> phút"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 phút"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> phút"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 giờ"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> giờ"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 ngày"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> ngày"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"tuần <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Làm mới"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Hiển thị ngày"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Lịch biểu"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Xóa sự kiện"</string>
     <string name="goto_today" msgid="9162136434410891230">"Hôm nay"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Cài đặt"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Lịch để hiển thị"</string>
     <string name="search" msgid="550656004486017426">"Tìm kiếm"</string>
     <string name="hide_controls" msgid="830320505938520882">"Ẩn các điều khiển"</string>
     <string name="show_controls" msgid="715520586028062621">"Hiển thị các điều khiển"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Lịch hiển thị"</string>
-    <string name="synced" msgid="7913940305983383493">"đã đồng bộ hóa"</string>
-    <string name="not_synced" msgid="4275114941801829419">"chưa được đồng bộ hóa"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Tài khoản này hiện không được đồng bộ hóa và lịch của bạn có thể không cập nhật."</string>
-    <string name="accounts" msgid="849401841083180306">"Tài khoản &amp; đồng bộ hóa"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Lịch để đồng bộ hóa"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Lịch để đồng bộ hóa"</string>
     <string name="hint_what" msgid="709155115005044531">"Tên sự kiện"</string>
     <string name="hint_where" msgid="4972598001033801974">"Vị trí"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Từ"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Cả ngày"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Lịch"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Hiển thị tất cả"</string>
     <string name="description_label" msgid="7193475046717505855">"Mô tả"</string>
     <string name="presence_label" msgid="6169724148441175862">"Hiển thị tôi ở trạng thái"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Bảo mật"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Thêm lời nhắc"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Không có lịch"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Trước khi có thể thêm sự kiện, bạn phải thêm ít nhất một tài khoản Lịch vào thiết bị của bạn và đặt lịch ở chế độ hiển thị. Chạm Thêm tài khoản để thêm tài khoản (nếu bạn vừa mới thêm tài khoản, hãy đợi tài khoản đó kết thúc đồng bộ hóa và thử lại). Hoặc chạm vào Hủy và đảm bảo ít nhất một lịch được hiển thị."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Lịch hoạt động tốt hơn với Tài khoản Google."\n\n"• Truy cập Lịch từ bất kỳ trình duyệt web nào"\n"• Sao lưu các sự kiện của bạn một cách an toàn"</string>
     <string name="add_account" msgid="1669072099756774952">"Thêm tài khoản"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Lịch:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Người tổ chức:"</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"Cuộc gọi"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"Trả lời nhanh"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"Sửa trả lời mặc định khi email cho khách"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"Sửa trả lời nhanh"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"Trả lời nhanh"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Chọn trả lời nhanh"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Không thể tìm được chương trình email"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Đang chạy chỉ muộn vài phút."</item>
-    <item msgid="6215158751728689832">"Sẽ ở đó sau khoảng 10 phút."</item>
-    <item msgid="4485794001743679338">"Hãy tiến hành và bắt đầu mà không có tôi."</item>
-    <item msgid="8036557974294987511">"Rất tiếc, tôi không thu xếp được. Chúng ta phải lên lịch lại."</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"Đang chạy chỉ muộn vài phút."</item>
+        <item msgid="6215158751728689832">"Sẽ ở đó sau khoảng 10 phút."</item>
+        <item msgid="4485794001743679338">"Hãy tiến hành và bắt đầu mà không có tôi."</item>
+        <item msgid="8036557974294987511">"Rất tiếc, tôi không thu xếp được. Chúng ta phải lên lịch lại."</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"Viết trả lời của riêng bạn…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Người t.chức"</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"Lời nhắc"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"Xóa"</string>
     <string name="save_label" msgid="2133599104834432589">"Xong"</string>
     <string name="discard_label" msgid="2394623883289782541">"Hủy"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Báo lại tất cả"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Loại bỏ tất cả"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Báo lại"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Sự kiện diễn ra một lần"</string>
     <string name="endByDate" msgid="7654221304929538201">"; cho đến <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; một lần"</item>
-    <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> lần"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Hàng ngày"</item>
-    <item quantity="other" msgid="5455230727715859264">"Định kỳ <xliff:g id="NUMBER">%d</xliff:g> ngày"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; một lần"</item>
+        <item quantity="other" msgid="4855496837834652446">"; <xliff:g id="NUMBER">%d</xliff:g> lần"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Hàng ngày"</item>
+        <item quantity="other" msgid="5455230727715859264">"Định kỳ <xliff:g id="NUMBER">%d</xliff:g> ngày"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Ngày trong tuần (Thứ Hai - Thứ Sáu)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Hàng tuần vào <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Định kỳ <xliff:g id="NUMBER">%1$d</xliff:g> tuần vào <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Hàng tuần vào <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Định kỳ <xliff:g id="NUMBER">%1$d</xliff:g> tuần vào <xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Hàng tháng"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Hàng năm"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Hàng tháng (vào ngày <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Hàng năm (vào <xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Tùy chỉnh (không thể tùy chỉnh trên điện thoại)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Chỉ thay đổi sự kiện này"</string>
     <string name="modify_all" msgid="4421657265864209041">"Thay đổi tất cả các sự kiện trong loạt sự kiện"</string>
@@ -173,8 +158,6 @@
     <string name="delete_this_event_title" msgid="518402946676919384">"Xóa sự kiện này?"</string>
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"Xóa <xliff:g id="EVENTTITLE">%s</xliff:g>?"</string>
     <string name="change_response_title" msgid="7704714776070974984">"Thay đổi phản hồi"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"Cài đặt chung"</string>
-    <string name="menu_about_preferences" msgid="6124375438237674973">Lịch về</string>
     <string name="preferences_title" msgid="8045855493262131773">"Cài đặt"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Cài đặt chế độ xem lịch"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"Thông báo và lời nhắc"</string>
@@ -195,23 +178,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Hiện lịch và thời gian sự kiện trong múi giờ chính khi đi du lịch"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Múi giờ chính"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Hiển thị số tuần"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Giới thiệu về"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Phiên bản đóng gói"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Lịch"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Không có sự kiện sắp tới trên lịch"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Thử nghiệm"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Lời nhắc"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Bỏ qua lời nhắc"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Bỏ qua lời nhắc"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Giờ yên lặng"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Tắt tiếng lời nhắc sự kiện trong suốt thời gian được chỉ định."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"TG bắt đầu giờ yên lặng"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"TG kết thúc giờ yên lặng"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Gỡ lỗi"</string>
     <string name="copy_db" msgid="437691290566699292">"Gửi cơ sở dữ liệu"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Đang tìm kiếm <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Xóa người tham dự"</string>
@@ -224,55 +199,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Thêm lời nhắc"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Xóa lời nhắc"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Thêm người tham dự"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Đồng bộ hóa lịch"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Sự kiện cả ngày"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Lặp lại"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Thời gian nhắc"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Loại lời nhắc"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Hiển thị tôi ở trạng thái"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Riêng tư"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Thông báo lịch"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Báo lại thông báo"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Gửi email cho khách mời"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Sự kiện mới"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Sự kiện <xliff:g id="ITEM_INDEX">%1$s</xliff:g> trong tổng số <xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 sự kiện"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> sự kiện"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 sự kiện"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> sự kiện"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 sự kiện"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> sự kiện"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 sự kiện"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> sự kiện"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Sự kiện đã chọn"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"KHÔNG chọn -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Lặp lại"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Không bao giờ lặp lại"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Cứ <xliff:g id="COUNT">%d</xliff:g> ngày một lần"</item>
-    <item quantity="other" msgid="707566499994398250">"Cứ <xliff:g id="COUNT">%d</xliff:g> ngày một lần"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Cứ <xliff:g id="COUNT">%d</xliff:g> tuần một lần"</item>
-    <item quantity="other" msgid="7094801039989237061">"Cứ <xliff:g id="COUNT">%d</xliff:g> tuần một lần"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Cứ <xliff:g id="COUNT">%d</xliff:g> tháng một lần"</item>
-    <item quantity="other" msgid="5419723710346646523">"Cứ <xliff:g id="COUNT">%d</xliff:g> tháng một lần"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Cứ <xliff:g id="COUNT">%d</xliff:g> năm một lần"</item>
-    <item quantity="other" msgid="5678653649746562060">"Cứ <xliff:g id="COUNT">%d</xliff:g> năm một lần"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Cứ <xliff:g id="COUNT">%d</xliff:g> ngày một lần"</item>
+        <item quantity="other" msgid="707566499994398250">"Cứ <xliff:g id="COUNT">%d</xliff:g> ngày một lần"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Cứ <xliff:g id="COUNT">%d</xliff:g> tuần một lần"</item>
+        <item quantity="other" msgid="7094801039989237061">"Cứ <xliff:g id="COUNT">%d</xliff:g> tuần một lần"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Cứ <xliff:g id="COUNT">%d</xliff:g> tháng một lần"</item>
+        <item quantity="other" msgid="5419723710346646523">"Cứ <xliff:g id="COUNT">%d</xliff:g> tháng một lần"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Cứ <xliff:g id="COUNT">%d</xliff:g> năm một lần"</item>
+        <item quantity="other" msgid="5678653649746562060">"Cứ <xliff:g id="COUNT">%d</xliff:g> năm một lần"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"vào cùng một ngày trong mỗi tháng"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Vĩnh viễn"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Đến một ngày nhất định"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"Cho đến ngày <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Đối với một số sự kiện"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Cho <xliff:g id="EVENT_COUNT">%d</xliff:g> sự kiện"</item>
-    <item quantity="other" msgid="8779598489398048259">"Cho <xliff:g id="EVENT_COUNT">%d</xliff:g> sự kiện"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Cho <xliff:g id="EVENT_COUNT">%d</xliff:g> sự kiện"</item>
+        <item quantity="other" msgid="8779598489398048259">"Cho <xliff:g id="EVENT_COUNT">%d</xliff:g> sự kiện"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"thay đổi ngày kết thúc"</string>
     <string name="visibility_default">Mặc định</string>
   <string name="visibility_private">Riêng tư</string>
@@ -283,4 +250,5 @@
     <string name="preferences_licence">Giấy phép</string>
     <string name="preferences_privacy_policy">Chính sách bảo mật</string>
     <string name="preferences_service_terms">Điều khoản dịch vụ</string>
-</resources>
+    <string name="menu_about_preferences">Lịch về</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index fe1d5ed3e5a9f778592634392c74ab90d4c0ad49..4e16a6081290f5e71cc5206d5d0499c13c7cb671 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"有空"</item>
     <item msgid="2064426942462573474">"暂定"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"第一个"</item>
-    <item msgid="5631923029483854900">"第二个"</item>
-    <item msgid="148935502975250973">"第三个"</item>
-    <item msgid="5124200797326669172">"第四个"</item>
-    <item msgid="7564374178324652137">"最后一个"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"无响应"</item>
     <item msgid="3724434080904437698">"是"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"此活动和将来的活动"</item>
     <item msgid="7833229563617435430">"所有活动"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"此活动和将来的活动"</item>
-    <item msgid="6315440193748139854">"所有活动"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"仅限此活动"</item>
     <item msgid="140670561403965380">"所有重复的活动"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1f249156e90731c50b4f2995ebfa2f3acd7f7e97..ff01a24caafdd6f8321e962d0ca2fcf29966afcd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -23,24 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"明天"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"今天 <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"明天 <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>，<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>,<xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"重复"</string>
     <string name="no_title_label" msgid="302177118061368042">"（无标题）"</string>
     <plurals name="Nminutes">
-        <item quantity="other">
+        <item quantity="one">
             <xliff:g id="count">%d</xliff:g> 分钟</item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="Nmins">
-        <item quantity="other">
+        <item quantity="one">
             <xliff:g id="count">%d</xliff:g> 分钟</item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="Nhours">
-        <item quantity="other">
+        <item quantity="one">
             <xliff:g id="count">%d</xliff:g> 小时</item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="Ndays">
-        <item quantity="other">
+        <item quantity="one">
             <xliff:g id="count">%d</xliff:g> 天</item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="weekN">
         <item quantity="other" msgid="8085184869561028365">"第 <xliff:g id="COUNT">%d</xliff:g> 周"</item>
@@ -57,16 +63,9 @@
     <string name="event_delete" msgid="2386667193277770442">"删除活动"</string>
     <string name="goto_today" msgid="9162136434410891230">"今天"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"设置"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"显示的日历"</string>
     <string name="search" msgid="550656004486017426">"搜索"</string>
     <string name="hide_controls" msgid="830320505938520882">"隐藏控件"</string>
     <string name="show_controls" msgid="715520586028062621">"显示控件"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"显示的日历"</string>
-    <string name="synced" msgid="7913940305983383493">"已同步"</string>
-    <string name="not_synced" msgid="4275114941801829419">"未同步"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"此帐户未同步，因此您的日历可能不是最新的。"</string>
-    <string name="accounts" msgid="849401841083180306">"帐户和同步"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"同步的日历"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"同步的日历"</string>
     <string name="hint_what" msgid="709155115005044531">"活动名称"</string>
     <string name="hint_where" msgid="4972598001033801974">"地点"</string>
@@ -85,14 +84,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"从"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"全天"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"日历"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"显示全部选择"</string>
     <string name="description_label" msgid="7193475046717505855">"说明"</string>
     <string name="presence_label" msgid="6169724148441175862">"将我的状态显示为"</string>
     <string name="privacy_label" msgid="9215031965259597335">"活动性质"</string>
     <string name="reminders_label" msgid="7292389181815525676">"添加提醒"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"无日历"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">在添加活动前，您必须添加至少一个日历帐户并使日历可见。轻触“添加账户”以添加账户（如果您刚刚添加过帐户，请等待其同步完成并重试）。或轻触“取消”并确认至少一个日历可见。</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"拥有 Google 帐户可增强“日历”的功能。"\n\n"• 通过任意网络浏览器访问“日历”"\n"• 安全地备份您的活动"</string>
     <string name="add_account" msgid="1669072099756774952">"添加帐户"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"日历："</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"组织者："</string>
@@ -113,7 +110,6 @@
     <string name="call_label" msgid="2960328220008869083">"电话"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"快速回复"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"修改向活动参加者发邮件时所用的默认回复"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"修改快速回复"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"快速回复"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"选择快速回复"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"找不到电子邮件应用"</string>
@@ -138,7 +134,6 @@
     <string name="delete_label" msgid="874742811918030739">"删除"</string>
     <string name="save_label" msgid="2133599104834432589">"完成"</string>
     <string name="discard_label" msgid="2394623883289782541">"取消"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"全部延迟"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"全部关闭"</string>
     <string name="snooze_label" msgid="1515893621063224666">"稍后再提醒"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"一次性活动"</string>
@@ -148,18 +143,15 @@
         <item quantity="other" msgid="4855496837834652446">"<xliff:g id="NUMBER">%d</xliff:g>次"</item>
     </plurals>
     <plurals name="daily">
-        <item quantity="one" msgid="5169052946627480942">"每天"</item>
-        <item quantity="other" msgid="5455230727715859264">"每<xliff:g id="NUMBER">%d</xliff:g>天"</item>
+        <item quantity="other">每<xliff:g id="number">%d</xliff:g>天</item>
     </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"每个工作日（周一至周五）"</string>
     <plurals name="weekly">
-        <item quantity="one" msgid="5463021019301453273">"每周的<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-        <item quantity="other" msgid="2857390143157377867">"每<xliff:g id="NUMBER">%1$d</xliff:g>周的<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other">每<xliff:g id="number">%1$d</xliff:g>周的<xliff:g id="days_of_week">%2$s</xliff:g>
+        </item>
     </plurals>
     <string name="monthly" msgid="4587116285383048586">"每月"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"每年"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"每月（<xliff:g id="DAY_OF_MONTH">%s</xliff:g> 日）"</string>
-    <string name="yearly" msgid="8576208380302949002">"每年（<xliff:g id="DATES">%s</xliff:g>）"</string>
     <string name="custom" product="default" msgid="4137468716966004993">"自定义（无法在手机上自定义）"</string>
     <string name="modify_event" msgid="5982876409997142690">"仅更改此活动"</string>
     <string name="modify_all" msgid="4421657265864209041">"更改所有重复的活动"</string>
@@ -170,6 +162,7 @@
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"要删除<xliff:g id="EVENTTITLE">%s</xliff:g>吗？"</string>
     <string name="change_response_title" msgid="7704714776070974984">"更改答复"</string>
     <string name="menu_general_preferences" msgid="2812705323334260708">"常规设置"</string>
+    <string name="menu_about_preferences" msgid="6124375438237674973">日历约</string>
     <string name="preferences_title" msgid="8045855493262131773">"设置"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"日历视图设置"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"通知和提醒"</string>
@@ -190,23 +183,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"旅行时按家里的时区显示日历和活动时间"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"家里时区"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"显示周数"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"关于"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"版本号"</string>
-    <string name="gadget_title" msgid="939918875331310945">"日历"</string>
     <plurals name="month_more_events">
-        <item quantity="one" msgid="8971334808414201327">"+1"</item>
-        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+        <item quantity="other">+<xliff:g id="number">%d</xliff:g>
+        </item>
     </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"最近没有任何日历活动"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"实验性"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"提醒"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"免去提醒"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"免去提醒"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"勿扰时段"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"在指定的时段内不发出活动提醒。"</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"勿扰时段开始时间"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"勿扰时段结束时间"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"调试"</string>
     <string name="copy_db" msgid="437691290566699292">"发送数据库"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"正在搜索 <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"删除参加者"</string>
@@ -219,44 +204,33 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"添加提醒"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"删除提醒"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"添加参加者"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"同步日历"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"全天活动"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"重复"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"提醒时间"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"提醒类型"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">将我的状态显示为</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"隐私设置"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"日历通知"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"暂停通知"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"向参加者发邮件"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ 新建活动"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"第 <xliff:g id="ITEM_INDEX">%1$s</xliff:g> 个活动，共 <xliff:g id="ITEM_COUNT">%2$s</xliff:g> 个。"</string>
     <plurals name="Nevents">
-        <item quantity="other">
+        <item quantity="one">
             <xliff:g id="count">%d</xliff:g> 项活动</item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="N_remaining_events">
-        <item quantity="other">+<xliff:g id="count">%d</xliff:g> 项活动</item>
+        <item quantity="other">+<xliff:g id="count">%d</xliff:g>事件</item>
     </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"所选活动"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"请勿选中 -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"重复"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"不重复"</string>
     <plurals name="recurrence_interval_daily">
-        <item quantity="one" msgid="1205422710088692631">"每<xliff:g id="COUNT">%d</xliff:g>天"</item>
-        <item quantity="other" msgid="707566499994398250">"每<xliff:g id="COUNT">%d</xliff:g>天"</item>
+        <item quantity="other">每<xliff:g id="count">%d</xliff:g>天</item>
     </plurals>
     <plurals name="recurrence_interval_weekly">
-        <item quantity="one" msgid="4948681635464488351">"每<xliff:g id="COUNT">%d</xliff:g>周"</item>
-        <item quantity="other" msgid="7094801039989237061">"每<xliff:g id="COUNT">%d</xliff:g>周"</item>
+        <item quantity="other">每<xliff:g id="count">%d</xliff:g>周</item>
     </plurals>
     <plurals name="recurrence_interval_monthly">
-        <item quantity="one" msgid="4768178401603139718">"每<xliff:g id="COUNT">%d</xliff:g>个月"</item>
-        <item quantity="other" msgid="5419723710346646523">"每<xliff:g id="COUNT">%d</xliff:g>个月"</item>
+        <item quantity="other">每<xliff:g id="count">%d</xliff:g>月</item>
     </plurals>
     <plurals name="recurrence_interval_yearly">
-        <item quantity="one" msgid="5819562634008179102">"每<xliff:g id="COUNT">%d</xliff:g>年"</item>
-        <item quantity="other" msgid="5678653649746562060">"每<xliff:g id="COUNT">%d</xliff:g>年"</item>
+        <item quantity="other">每<xliff:g id="count">%d</xliff:g>年</item>
     </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"在每个月的同一天"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"无限重复"</string>
@@ -322,7 +296,7 @@
     <string name="view_settings">查看设置</string>
     <string name="preferences_month_view_portrait">月视图布局(纵向)</string>
     <string name="preferences_month_view_landscape">月视图布局(横向)</string>
-    <string name="view_details">查看细节</string>
+    <string name="display_options">查看细节</string>
     <string name="display_time">显示时间</string>
     <string name="display_location">显示位置</string>
     <string name="show_time_no">不要显示时间</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 6ce3e619215805b358bf1e10abd347fb33129ad9..7b08468fb3e8ed76be06aa68d51b289acd36e347 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"有空"</item>
     <item msgid="2064426942462573474">"未定"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"第一個"</item>
-    <item msgid="5631923029483854900">"第二個"</item>
-    <item msgid="148935502975250973">"第三個"</item>
-    <item msgid="5124200797326669172">"第四個"</item>
-    <item msgid="7564374178324652137">"最後一個"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"沒有回應"</item>
     <item msgid="3724434080904437698">"是"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"這項活動及未來活動"</item>
     <item msgid="7833229563617435430">"所有活動"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"此活動及未來活動"</item>
-    <item msgid="6315440193748139854">"所有活動"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"僅限這項活動"</item>
     <item msgid="140670561403965380">"所有後續活動"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 527ef9c686a8e85ea079ed61975d237169f375b7..d4d6116d58410f4d946e0087dd6b15a1bbaf21fa 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Google 日曆"</string>
     <string name="what_label" msgid="1933578391985810049">"主題"</string>
     <string name="where_label" msgid="3472482206065595118">"地點"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"明天"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"今天，<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"明天，<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>，<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"顯示頻率"</string>
     <string name="no_title_label" msgid="302177118061368042">"(無標題)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 分鐘"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> 分鐘"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"1 分鐘"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> 分鐘"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 小時"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> 小時"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"1 天"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> 天"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"第 <xliff:g id="COUNT">%d</xliff:g> 週"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 分鐘"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> 分鐘"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"1 分鐘"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> 分鐘"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 小時"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> 小時"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"1 天"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> 天"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"第 <xliff:g id="COUNT">%d</xliff:g> 週"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"重新整理"</string>
     <string name="show_day_view" msgid="5782512782605466016">"顯示天"</string>
     <string name="agenda_view" msgid="5566084759423843245">"待辦事項"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"刪除活動"</string>
     <string name="goto_today" msgid="9162136434410891230">"今日"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"設定"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"要顯示的日曆"</string>
     <string name="search" msgid="550656004486017426">"搜尋"</string>
     <string name="hide_controls" msgid="830320505938520882">"隱藏控制介面"</string>
     <string name="show_controls" msgid="715520586028062621">"顯示控制介面"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"要顯示的日曆"</string>
-    <string name="synced" msgid="7913940305983383493">"已同步處理"</string>
-    <string name="not_synced" msgid="4275114941801829419">"未同步處理"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"這個帳戶未經過同步處理，您的日曆可能不含最新資訊。"</string>
-    <string name="accounts" msgid="849401841083180306">"帳戶與同步處理"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"要同步處理的日曆"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"要同步處理的日曆"</string>
     <string name="hint_what" msgid="709155115005044531">"活動名稱"</string>
     <string name="hint_where" msgid="4972598001033801974">"地點"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"從"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"全天"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"日曆"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"全部顯示"</string>
     <string name="description_label" msgid="7193475046717505855">"說明"</string>
     <string name="presence_label" msgid="6169724148441175862">"將我的狀態顯示為"</string>
     <string name="privacy_label" msgid="9215031965259597335">"隱私權"</string>
     <string name="reminders_label" msgid="7292389181815525676">"新增提醒"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"無日曆"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"您必須在裝置上至少新增一個「日曆」帳戶，並將一個日曆設為顯示，才能新增活動。輕觸 [新增帳戶] 即可新增帳戶 (如果您剛剛新增帳戶，請稍候片刻，待帳戶同步處理完成後再試一次)；或是輕觸 [取消]，並確認至少將一個日曆設為顯示。"</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"透過「Google 帳戶」使用「Google 日曆」可獲得更佳的效益。"\n\n"• 透過任何瀏覽器都可存取「Google 日曆」"\n"• 安全備份您的活動"</string>
     <string name="add_account" msgid="1669072099756774952">"新增帳戶"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"日曆："</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"主辦人："</string>
@@ -116,16 +106,15 @@
     <string name="call_label" msgid="2960328220008869083">"電洽"</string>
     <string name="quick_response_settings" msgid="6776151690686068278">"快速回應"</string>
     <string name="quick_response_settings_summary" msgid="7878304729027355604">"編輯傳送給邀請對象的預設電子郵件回應"</string>
-    <string name="quick_response_settings_title" msgid="8966517107774567031">"編輯快速回應"</string>
     <string name="quick_response_settings_edit_title" msgid="6260055523174081930">"快速回應"</string>
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"選擇快速回應"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"找不到電子郵件程式"</string>
-  <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"我會遲到幾分鐘。"</item>
-    <item msgid="6215158751728689832">"我大約 10 分鐘後抵達。"</item>
-    <item msgid="4485794001743679338">"別等我，請直接開始。"</item>
-    <item msgid="8036557974294987511">"抱歉不克前往。我們再約時間。"</item>
-  </string-array>
+    <string-array name="quick_response_defaults">
+        <item msgid="1524421198348168403">"我會遲到幾分鐘。"</item>
+        <item msgid="6215158751728689832">"我大約 10 分鐘後抵達。"</item>
+        <item msgid="4485794001743679338">"別等我，請直接開始。"</item>
+        <item msgid="8036557974294987511">"抱歉不克前往。我們再約時間。"</item>
+    </string-array>
     <string name="quick_response_custom_msg" msgid="8792374208224108798">"自行撰寫回應…"</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"主辦人："</string>
     <string name="event_info_reminders_label" msgid="8913097552956388972">"提醒"</string>
@@ -141,29 +130,25 @@
     <string name="delete_label" msgid="874742811918030739">"刪除"</string>
     <string name="save_label" msgid="2133599104834432589">"完成"</string>
     <string name="discard_label" msgid="2394623883289782541">"取消"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"全部延遲"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"全部關閉"</string>
     <string name="snooze_label" msgid="1515893621063224666">"延遲"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"單次活動"</string>
     <string name="endByDate" msgid="7654221304929538201">"；直到 <xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"；1 次"</item>
-    <item quantity="other" msgid="4855496837834652446">"；<xliff:g id="NUMBER">%d</xliff:g> 次"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"每天"</item>
-    <item quantity="other" msgid="5455230727715859264">"每 <xliff:g id="NUMBER">%d</xliff:g> 天"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"；1 次"</item>
+        <item quantity="other" msgid="4855496837834652446">"；<xliff:g id="NUMBER">%d</xliff:g> 次"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"每天"</item>
+        <item quantity="other" msgid="5455230727715859264">"每 <xliff:g id="NUMBER">%d</xliff:g> 天"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"平日 (週一至週五)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"每週 (每<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
-    <item quantity="other" msgid="2857390143157377867">"每 <xliff:g id="NUMBER">%1$d</xliff:g> 週 (每<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"每週 (每<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
+        <item quantity="other" msgid="2857390143157377867">"每 <xliff:g id="NUMBER">%1$d</xliff:g> 週 (每<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>)"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"每月"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"每年"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"每月 (<xliff:g id="DAY_OF_MONTH">%s</xliff:g> 日)"</string>
-    <string name="yearly" msgid="8576208380302949002">"每年 (<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"自訂 (無法在手機上自訂)"</string>
     <string name="modify_event" msgid="5982876409997142690">"僅變更這項活動。"</string>
     <string name="modify_all" msgid="4421657265864209041">"變更所有後續的活動"</string>
@@ -173,7 +158,6 @@
     <string name="delete_this_event_title" msgid="518402946676919384">"刪除這項活動？"</string>
     <string name="delete_recurring_event_title" msgid="5609046778422180206">"要刪除「<xliff:g id="EVENTTITLE">%s</xliff:g>」嗎？"</string>
     <string name="change_response_title" msgid="7704714776070974984">"變更回應"</string>
-    <string name="menu_general_preferences" msgid="2812705323334260708">"一般設定"</string>
     <string name="preferences_title" msgid="8045855493262131773">"設定"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"日曆檢視設定"</string>
     <string name="preferences_reminder_title" msgid="5199606534191180129">"通知和提醒"</string>
@@ -194,23 +178,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"在差旅期間以您的居住地時區來顯示日曆及活動時間"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"居住地時區"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"顯示週數"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"相關資訊"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"版本"</string>
-    <string name="gadget_title" msgid="939918875331310945">"日曆"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"沒有即將開始的日曆活動"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"實驗性"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"提醒"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"略過提醒"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"略過提醒"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"限制時段"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"在特定時段內取消活動提醒。"</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"限制時段開始時間"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"限制時段結束時間"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"偵錯"</string>
     <string name="copy_db" msgid="437691290566699292">"傳送資料庫"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"正在搜尋 <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"移除參加者"</string>
@@ -223,55 +199,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"新增提醒"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"移除提醒"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"新增參加者"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"同步處理日曆"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"全天活動"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"顯示頻率"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"提醒時間"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"提醒類型"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"將我的狀態顯示為"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"隱私權"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"日曆通知"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"延後通知"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"傳送電子郵件給邀請對象"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ 新活動"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"第 <xliff:g id="ITEM_INDEX">%1$s</xliff:g> 個活動 (共 <xliff:g id="ITEM_COUNT">%2$s</xliff:g> 個)"</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"1 個活動"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> 個活動"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 個活動"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> 個活動"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"1 個活動"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> 個活動"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 個活動"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> 個活動"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"選取的活動"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"請勿勾選 -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"提醒方式"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"不重複進行"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"每 <xliff:g id="COUNT">%d</xliff:g> 天"</item>
-    <item quantity="other" msgid="707566499994398250">"每 <xliff:g id="COUNT">%d</xliff:g> 天"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"每 <xliff:g id="COUNT">%d</xliff:g> 週"</item>
-    <item quantity="other" msgid="7094801039989237061">"每 <xliff:g id="COUNT">%d</xliff:g> 週"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"每 <xliff:g id="COUNT">%d</xliff:g> 個月"</item>
-    <item quantity="other" msgid="5419723710346646523">"每 <xliff:g id="COUNT">%d</xliff:g> 個月"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"每 <xliff:g id="COUNT">%d</xliff:g> 年"</item>
-    <item quantity="other" msgid="5678653649746562060">"每 <xliff:g id="COUNT">%d</xliff:g> 年"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"每 <xliff:g id="COUNT">%d</xliff:g> 天"</item>
+        <item quantity="other" msgid="707566499994398250">"每 <xliff:g id="COUNT">%d</xliff:g> 天"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"每 <xliff:g id="COUNT">%d</xliff:g> 週"</item>
+        <item quantity="other" msgid="7094801039989237061">"每 <xliff:g id="COUNT">%d</xliff:g> 週"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"每 <xliff:g id="COUNT">%d</xliff:g> 個月"</item>
+        <item quantity="other" msgid="5419723710346646523">"每 <xliff:g id="COUNT">%d</xliff:g> 個月"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"每 <xliff:g id="COUNT">%d</xliff:g> 年"</item>
+        <item quantity="other" msgid="5678653649746562060">"每 <xliff:g id="COUNT">%d</xliff:g> 年"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"每月的同一天"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"無限期"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"直到指定日期為止"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"結束日期：<xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"固定次數重複"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"重複 <xliff:g id="EVENT_COUNT">%d</xliff:g> 次活動"</item>
-    <item quantity="other" msgid="8779598489398048259">"重複 <xliff:g id="EVENT_COUNT">%d</xliff:g> 次活動"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"重複 <xliff:g id="EVENT_COUNT">%d</xliff:g> 次活動"</item>
+        <item quantity="other" msgid="8779598489398048259">"重複 <xliff:g id="EVENT_COUNT">%d</xliff:g> 次活動"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"變更結束日期"</string>
     <string name="visibility_default">預設</string>
   <string name="visibility_private">私人</string>
@@ -288,4 +256,5 @@
   <string name="preferences_licence">牌照</string>
     <string name="preferences_privacy_policy">隱私政策</string>
   <string name="preferences_service_terms">服務條款</string>
-</resources>
+    <string name="menu_about_preferences">日历约</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 1797a41dc2084f66c183582c64342e66328c63db..6eb9aa01179890f295fbef9a69d3cd578cd42abc 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -70,13 +70,6 @@
     <item msgid="6228387173725732140">"Yatholakala"</item>
     <item msgid="2064426942462573474">"Okwesikhashana"</item>
   </string-array>
-  <string-array name="ordinal_labels">
-    <item msgid="2693927956303125332">"okokuqala"</item>
-    <item msgid="5631923029483854900">"isekhondi"</item>
-    <item msgid="148935502975250973">"okwesithathu"</item>
-    <item msgid="5124200797326669172">"okwesine"</item>
-    <item msgid="7564374178324652137">"okokugcina"</item>
-  </string-array>
   <string-array name="response_labels1">
     <item msgid="5605392595848194997">"Ayikho impendulo"</item>
     <item msgid="3724434080904437698">"Yebo"</item>
@@ -88,10 +81,6 @@
     <item msgid="1536401639805370405">"Lona kanye neyakusasa imicimbi"</item>
     <item msgid="7833229563617435430">"Zonke izenzakalo"</item>
   </string-array>
-  <string-array name="delete_repeating_labels_no_selected">
-    <item msgid="1341910309321756150">"Lokhu &amp; izenzakalo zesikhathi esizayo"</item>
-    <item msgid="6315440193748139854">"Zonke izenzakalo"</item>
-  </string-array>
   <string-array name="change_response_labels">
     <item msgid="3466644709343519437">"Kuphela le senzakalo"</item>
     <item msgid="140670561403965380">"Zonke izenzakalo ochungechungeni"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 7c53b3198e0a479d0cad95f70813af38861d419a..7e6b765d5aa681a9a7649c065e3afbc57c2712ef 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="5452708708398908131">"Ikhalenda"</string>
     <string name="what_label" msgid="1933578391985810049">"Ini"</string>
     <string name="where_label" msgid="3472482206065595118">"Kuphi"</string>
@@ -26,28 +23,30 @@
     <string name="tomorrow" msgid="614434811813859237">"Kusasa"</string>
     <string name="today_at_time_fmt" msgid="1981279213130049736">"Namuhla ngo-<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
     <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"Kusasa ngo-<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
-    <string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+    <string name="date_time_fmt" msgid="1642972650061946484">
+        <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>
+    </string>
     <string name="repeats_label" msgid="7414023871434593196">"Impinda"</string>
     <string name="no_title_label" msgid="302177118061368042">"(Asikho isihloko)"</string>
-  <plurals name="Nminutes">
-    <item quantity="one" msgid="4871052965772159239">"1 iminithi"</item>
-    <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> amaminithi"</item>
-  </plurals>
-  <plurals name="Nmins">
-    <item quantity="one" msgid="9191090668359663663">"iminithi engu-1"</item>
-    <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> amaminithi"</item>
-  </plurals>
-  <plurals name="Nhours">
-    <item quantity="one" msgid="4793697728599296830">"1 ihora"</item>
-    <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> amahora"</item>
-  </plurals>
-  <plurals name="Ndays">
-    <item quantity="one" msgid="5988137255732166573">"Usuku olungu-1"</item>
-    <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> izinsuku"</item>
-  </plurals>
-  <plurals name="weekN">
-    <item quantity="other" msgid="8085184869561028365">"iviki <xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="Nminutes">
+        <item quantity="one" msgid="4871052965772159239">"1 iminithi"</item>
+        <item quantity="other" msgid="5644461630927544936">"<xliff:g id="COUNT">%d</xliff:g> amaminithi"</item>
+    </plurals>
+    <plurals name="Nmins">
+        <item quantity="one" msgid="9191090668359663663">"iminithi engu-1"</item>
+        <item quantity="other" msgid="9175648445939148974">"<xliff:g id="COUNT">%d</xliff:g> amaminithi"</item>
+    </plurals>
+    <plurals name="Nhours">
+        <item quantity="one" msgid="4793697728599296830">"1 ihora"</item>
+        <item quantity="other" msgid="4477841052001760620">"<xliff:g id="COUNT">%d</xliff:g> amahora"</item>
+    </plurals>
+    <plurals name="Ndays">
+        <item quantity="one" msgid="5988137255732166573">"Usuku olungu-1"</item>
+        <item quantity="other" msgid="1709378992389618261">"<xliff:g id="COUNT">%d</xliff:g> izinsuku"</item>
+    </plurals>
+    <plurals name="weekN">
+        <item quantity="other" msgid="8085184869561028365">"iviki <xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="calendar_refresh" msgid="6172731193680500025">"Qala kabusha"</string>
     <string name="show_day_view" msgid="5782512782605466016">"Bonisa usuku"</string>
     <string name="agenda_view" msgid="5566084759423843245">"Ajenda"</string>
@@ -60,16 +59,9 @@
     <string name="event_delete" msgid="2386667193277770442">"Susa umcimbi"</string>
     <string name="goto_today" msgid="9162136434410891230">"Namhlanje"</string>
     <string name="menu_preferences" msgid="9120238479503233925">"Izilungiselelo"</string>
-    <string name="menu_select_visible_calendars" msgid="735670432781741817">"Amakhalenda azoboniswa"</string>
     <string name="search" msgid="550656004486017426">"Sesha"</string>
     <string name="hide_controls" msgid="830320505938520882">"Fihla okulawulayo"</string>
     <string name="show_controls" msgid="715520586028062621">"Bonisa wezilawuli"</string>
-    <string name="select_visible_calendars_title" msgid="7944393060991949882">"Amakhalenda azoboniswa"</string>
-    <string name="synced" msgid="7913940305983383493">"kuvumelanisiwe"</string>
-    <string name="not_synced" msgid="4275114941801829419">"akuvumelanisiwe"</string>
-    <string name="acct_not_synced" msgid="6126800985681230627">"Le-akhawunti ayivumelaniswa futhi amakhalenda akho kungenzeka awekho esikhathini."</string>
-    <string name="accounts" msgid="849401841083180306">"Ama-akhawunti; ukuvumelanisa"</string>
-    <string name="select_synced_calendars_title" msgid="7916084873075901448">"Amakhalenda azovumelaniswa"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Amakhalenda azovumelaniswa"</string>
     <string name="hint_what" msgid="709155115005044531">"Igama lomcimbi"</string>
     <string name="hint_where" msgid="4972598001033801974">"Indawo"</string>
@@ -88,14 +80,12 @@
     <string name="edit_event_from_label" msgid="174999102612666115">"Ibuya"</string>
     <string name="edit_event_all_day_label" msgid="6200181113992136073">"Usuku Lonke"</string>
     <string name="edit_event_calendar_label" msgid="4556498359505856900">"Ikhalenda"</string>
-    <string name="edit_event_show_all" msgid="4558049350756058301">"Bonisa konke"</string>
     <string name="description_label" msgid="7193475046717505855">"Incazelo"</string>
     <string name="presence_label" msgid="6169724148441175862">"Ngibonise njengo"</string>
     <string name="privacy_label" msgid="9215031965259597335">"Okwangasese"</string>
     <string name="reminders_label" msgid="7292389181815525676">"Faka isikhumbuzi"</string>
     <string name="no_syncable_calendars" msgid="7019488867045436129">"Awekho amakhalenda"</string>
     <string name="no_calendars_found" msgid="8968682716053492187">"Ngaphambili kokuthi ufake umcimbi, kufanele ufake noma i-akhawunti yekhalende eyodwa eivayisini yakho bese wenza ikhalenda ukuthi ibonakale. Thinta u-Yengeza i-Akhawunti ukuze wengeze i-akhawunti (uma usana kuyengez i-akhawunti, linda ukuthi iqede ukuvumelanisa bese uphinda uzame futhi). No uthinte u-Khnsela bese uqinisekis ukuthi kuba khona mhlampe eyodwa ikhalende eyodwa ebonakalayo."</string>
-    <string name="create_an_account_desc" msgid="7249605109240576895">"Ikhalenda isebenza kangcono nge-akhawunti yakwa-Google. I-akhawunti."\n\n"• Finyelela kuyo usebenzisa noma iluphi uhlobo lwesiphequluli sewebhu "\n"• Londoloza izinhlelo zakho ngokuphephile"</string>
     <string name="add_account" msgid="1669072099756774952">"Faka i-akhawunti"</string>
     <string name="view_event_calendar_label" msgid="6126231656338241140">"Ikhalenda:"</string>
     <string name="view_event_organizer_label" msgid="2753151795647402277">"Umdidiyeli:"</string>
@@ -115,17 +105,17 @@
     <string name="map_label" msgid="8795383535586556038">"Imephu"</string>
     <string name="call_label" msgid="2960328220008869083">"Fonela"</string>
     <!-- no translation found for quick_response_settings (6776151690686068278) -->
-    <skip />
+    <skip/>
     <!-- no translation found for quick_response_settings_summary (7878304729027355604) -->
-    <skip />
+    <skip/>
     <!-- no translation found for quick_response_settings_title (8966517107774567031) -->
-    <skip />
+    <skip/>
     <!-- no translation found for quick_response_settings_edit_title (6260055523174081930) -->
-    <skip />
+    <skip/>
     <!-- no translation found for quick_response_dialog_title (2681309456412199207) -->
-    <skip />
+    <skip/>
     <!-- no translation found for quick_response_email_failed (5544066405231853245) -->
-    <skip />
+    <skip/>
     <!-- no translation found for quick_response_defaults:0 (1524421198348168403) -->
     <!-- no translation found for quick_response_defaults:1 (6215158751728689832) -->
     <!-- no translation found for quick_response_defaults:2 (4485794001743679338) -->
@@ -145,29 +135,25 @@
     <string name="delete_label" msgid="874742811918030739">"Susa"</string>
     <string name="save_label" msgid="2133599104834432589">"Kwenziwe"</string>
     <string name="discard_label" msgid="2394623883289782541">"Khansela"</string>
-    <string name="snooze_all_label" msgid="4994488813124409077">"Snuza konke"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"Cashisa konke"</string>
     <string name="snooze_label" msgid="1515893621063224666">"Ukusnuza"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"Umcimbi owenzeka kanye"</string>
     <string name="endByDate" msgid="7654221304929538201">"; kuze kube umhla ka-<xliff:g id="DATE">%s</xliff:g>"</string>
-  <plurals name="endByCount">
-    <item quantity="one" msgid="3727754565990691816">"; okwesikhathi esisodwa"</item>
-    <item quantity="other" msgid="4855496837834652446">"; okwezikhathi ezingu-<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="daily">
-    <item quantity="one" msgid="5169052946627480942">"Nsuku zonke"</item>
-    <item quantity="other" msgid="5455230727715859264">"Njalo ngezinsuku ezingu-<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="endByCount">
+        <item quantity="one" msgid="3727754565990691816">"; okwesikhathi esisodwa"</item>
+        <item quantity="other" msgid="4855496837834652446">"; okwezikhathi ezingu-<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="daily">
+        <item quantity="one" msgid="5169052946627480942">"Nsuku zonke"</item>
+        <item quantity="other" msgid="5455230727715859264">"Njalo ngezinsuku ezingu-<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="every_weekday" msgid="5896574838353902978">"Njalo phakathi nesonto (Msom-Lwes)"</string>
-  <plurals name="weekly">
-    <item quantity="one" msgid="5463021019301453273">"Njalo ngeviki nge-<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="2857390143157377867">"Njalo ngamaviki angu-<xliff:g id="NUMBER">%1$d</xliff:g> nge-<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
-  </plurals>
+    <plurals name="weekly">
+        <item quantity="one" msgid="5463021019301453273">"Njalo ngeviki nge-<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+        <item quantity="other" msgid="2857390143157377867">"Njalo ngamaviki angu-<xliff:g id="NUMBER">%1$d</xliff:g> nge-<xliff:g id="DAYS_OF_WEEK">%2$s</xliff:g>"</item>
+    </plurals>
     <string name="monthly" msgid="4587116285383048586">"Nyanga zonke"</string>
     <string name="yearly_plain" msgid="3652692085322162449">"Mnyaka yonke"</string>
-    <string name="monthly_on_day" msgid="5370155265278821156">"Zinyanga zonke (ngosuku <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly" msgid="8576208380302949002">"Minyaka yonke (ngezi-<xliff:g id="DATES">%s</xliff:g>)"</string>
-    
     <string name="custom" product="default" msgid="4137468716966004993">"Ngokwezifiso... (ayikwazi ukwenza ngendlela oyifisayo efonini)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Shintsha kuphela lesi senzakalo."</string>
     <string name="modify_all" msgid="4421657265864209041">"Shintsha zonke izenzakalo ochungechungeni."</string>
@@ -199,23 +185,15 @@
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Ibonisa amakhalenda nezikhathi zezenzakalo kumkhawulo wakho wasekhaya lapho uhamba"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Umkhawulo wesikhathi sasekhaya"</string>
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Bonisa inombolo yeviki"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Mayelana"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Yakha inguqulo"</string>
-    <string name="gadget_title" msgid="939918875331310945">"Ikhalenda"</string>
-  <plurals name="month_more_events">
-    <item quantity="one" msgid="8971334808414201327">"+1"</item>
-    <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="month_more_events">
+        <item quantity="one" msgid="8971334808414201327">"+1"</item>
+        <item quantity="other" msgid="1997405398178470838">"+<xliff:g id="NUMBER">%d</xliff:g>"</item>
+    </plurals>
     <string name="gadget_no_events" msgid="5209110911088302855">"Azikho izenzakalo zekhalenda ezizayo"</string>
     <string name="preferences_experimental_category" msgid="8111213192001230350">"Okokulinga"</string>
-    <string name="preferences_reminders_category" msgid="3179315692653755740">"Izikhumbuzo"</string>
     <string name="preferences_reminders_responded_label" msgid="1196570678238475838">"Yeqa izikhumbuzo"</string>
     <string name="preferences_reminders_responded_dialog" msgid="1873289128793828352">"Yeqa izikhumbuzo"</string>
-    <string name="preferences_reminders_quiet_hours_label" msgid="8529712276644546893">"Amahora anokuthula"</string>
-    <string name="preferences_reminders_quiet_hours_description" msgid="65969073433791290">"Izikhumbuzo ezithulile zemicimbi ngesikhathi esithile."</string>
-    <string name="preferences_reminders_quiet_hours_start" msgid="3433058529220285232">"Isikhathi sokuqala samahora anokuthula"</string>
-    <string name="preferences_reminders_quiet_hours_end" msgid="7492883554865119346">"Isikhathi sokuphela samahora anokuthula"</string>
-    <string name="preferences_debug_category" msgid="6203278208385095018">"Kususwa iphutha"</string>
     <string name="copy_db" msgid="437691290566699292">"Thumela imininingo egciniwe"</string>
     <string name="directory_searching_fmt" msgid="1232037509095606687">"Iyasesha...<xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="accessibility_remove_attendee" msgid="7082751172654698863">"Susa abaphelekezeli"</string>
@@ -228,55 +206,47 @@
     <string name="accessibility_add_reminder" msgid="2267950744060950152">"Faka isikhumbuzi"</string>
     <string name="accessibility_remove_reminder" msgid="5261609343259665139">"Khipha isikhumbuzi"</string>
     <string name="accessibility_add_attendee" msgid="5654014177472600916">"Engeza umphelezeli"</string>
-    <string name="accessibility_sync_cal" msgid="6506181885764723383">"Vumelanisa ikhalenda"</string>
     <string name="accessibility_all_day" msgid="4146955438811915282">"Umcimbi wosuku lonke"</string>
-    <string name="accessibility_repeats" msgid="1629279916830919582">"Impinda"</string>
     <string name="accessibility_reminder_time" msgid="3594100545814579575">"Isikhathi sesikhumbuzi"</string>
     <string name="accessibility_reminder_type" msgid="5339120699701437227">"Uhlobo lwesikhumbuzi"</string>
     <string name="accessibility_reminder_showmeas" msgid="6669129015980006570">"Ngibonise njengo"</string>
     <string name="accessibility_reminder_privacy" msgid="8669288484484022771">"Ubumfihlo"</string>
-    <string name="accessibility_cal_notification" msgid="7267601064994839394">"Izaziso zekhalenda"</string>
-    <string name="accessibility_snooze_notification" msgid="5007852779125102681">"Hlehlisa isaziso"</string>
-    <string name="accessibility_email_notification" msgid="9124064701968129831">"Thumela izivakashi i-imeyili"</string>
     <string name="day_view_new_event_hint" msgid="2131483437911536229">"+ Umcimbi omusha"</string>
     <string name="template_announce_item_index" msgid="4067877800670753110">"Umcimbi <xliff:g id="ITEM_INDEX">%1$s</xliff:g> kwengu-<xliff:g id="ITEM_COUNT">%2$s</xliff:g>."</string>
-  <plurals name="Nevents">
-    <item quantity="one" msgid="5230907142214104485">"Umcimbi ongu-1"</item>
-    <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> imicimbi"</item>
-  </plurals>
-  <plurals name="N_remaining_events">
-    <item quantity="one" msgid="431585781647034528">"+1 umcimbi"</item>
-    <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> imicimbi"</item>
-  </plurals>
+    <plurals name="Nevents">
+        <item quantity="one" msgid="5230907142214104485">"Umcimbi ongu-1"</item>
+        <item quantity="other" msgid="6093072093209431078">"<xliff:g id="COUNT">%d</xliff:g> imicimbi"</item>
+    </plurals>
+    <plurals name="N_remaining_events">
+        <item quantity="one" msgid="431585781647034528">"+1 umcimbi"</item>
+        <item quantity="other" msgid="3609243840882275136">"+<xliff:g id="COUNT">%d</xliff:g> imicimbi"</item>
+    </plurals>
     <string name="acessibility_selected_marker_description" msgid="3010149843148810768">"Umcimbi okhethiwe"</string>
-    <string name="do_not_check" msgid="7815441673853466129">"Ungalokothi uhlole -&gt;"</string>
-    <string name="recurrence_dialog_title" msgid="8093909645557717483">"Phindaphinda"</string>
-    <string name="recurrence_dialog_title_never" msgid="2679396029776590130">"Awulokothi uphinde"</string>
-  <plurals name="recurrence_interval_daily">
-    <item quantity="one" msgid="1205422710088692631">"Njalo ngosuku olungu-<xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="707566499994398250">"Njalo ngezinsuku ezingu-<xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="recurrence_interval_weekly">
-    <item quantity="one" msgid="4948681635464488351">"Njalo ngeviki elingu-<xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="7094801039989237061">"Njalo ngamaviki angu-<xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="recurrence_interval_monthly">
-    <item quantity="one" msgid="4768178401603139718">"Njalo ngenyanga engu-<xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="5419723710346646523">"Njalo ngezinyanga ezingu-<xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
-  <plurals name="recurrence_interval_yearly">
-    <item quantity="one" msgid="5819562634008179102">"Njalo ngonyaka ongu-<xliff:g id="COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="5678653649746562060">"Njalo ngeminyaka engu-<xliff:g id="COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="recurrence_interval_daily">
+        <item quantity="one" msgid="1205422710088692631">"Njalo ngosuku olungu-<xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="707566499994398250">"Njalo ngezinsuku ezingu-<xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="recurrence_interval_weekly">
+        <item quantity="one" msgid="4948681635464488351">"Njalo ngeviki elingu-<xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="7094801039989237061">"Njalo ngamaviki angu-<xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="recurrence_interval_monthly">
+        <item quantity="one" msgid="4768178401603139718">"Njalo ngenyanga engu-<xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="5419723710346646523">"Njalo ngezinyanga ezingu-<xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
+    <plurals name="recurrence_interval_yearly">
+        <item quantity="one" msgid="5819562634008179102">"Njalo ngonyaka ongu-<xliff:g id="COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="5678653649746562060">"Njalo ngeminyaka engu-<xliff:g id="COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="recurrence_month_pattern_by_day" msgid="4400107556121003459">"ngosuku olufanayo njalo ngenyanga"</string>
     <string name="recurrence_end_continously" msgid="6898950241634912991">"Phakade"</string>
     <string name="recurrence_end_date_label" msgid="4142791438636994952">"Kuze kube idethi ethile"</string>
     <string name="recurrence_end_date" msgid="3693751578164711701">"kuze kube ngumhla ka-<xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="recurrence_end_count_label" msgid="1233883668293087977">"Okwezinombolo zemicimbi"</string>
-  <plurals name="recurrence_end_count">
-    <item quantity="one" msgid="1400782968090516215">"Okomcimbi ongu-<xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-    <item quantity="other" msgid="8779598489398048259">"Okwemicimbi engu-<xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
-  </plurals>
+    <plurals name="recurrence_end_count">
+        <item quantity="one" msgid="1400782968090516215">"Okomcimbi ongu-<xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+        <item quantity="other" msgid="8779598489398048259">"Okwemicimbi engu-<xliff:g id="EVENT_COUNT">%d</xliff:g>"</item>
+    </plurals>
     <string name="acessibility_recurrence_choose_end_date_description" msgid="5899029840837836711">"shintsha idethi yokugcina"</string>
     <string name="visibility_default">Okuzenzakalelayo</string>
   <string name="visibility_private">Imfihlo</string>
@@ -287,4 +257,4 @@
     <string name="preferences_licence">Ilayisense</string>
     <string name="preferences_privacy_policy">Inqubomgomo yobumfihlo</string>
     <string name="preferences_service_terms">Imibandela yokusizakala</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 329a2d94cb1ef06cb76e241a7da596ef02262720..774e1f653b12907a842d781b4c18a36cb64173df 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -255,13 +255,6 @@
         <item>@string/visibility_public</item>
     </string-array>
 
-    <string-array name="ordinal_labels">
-        <item>first</item>
-        <item>second</item>
-        <item>third</item>
-        <item>fourth</item>
-        <item>last</item>
-    </string-array>
 
     <!-- Invitation responses -->
     <string-array name="response_labels1">
@@ -298,10 +291,6 @@
          was created on the phone until that event has been synced to the server.
      -->
     <skip/>
-    <string-array name="delete_repeating_labels_no_selected">
-        <item>This &amp; future events</item>
-        <item>All events</item>
-    </string-array>
 
     <!-- The corresponding array indices are defined in EventInfoActivity.java -->
     <skip/>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 960afd85c1c5a88cadd42151afb5c89b0f0815c2..403ee025c59a353668f5811bd91c1226bdc142f8 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -41,5 +41,9 @@
         <attr name="ic_menu_email" format="reference"/>
         <attr name="calendar_future_bg_color" format="color"/>
         <attr name="month_other_bgcolor" format="color"/>
+        <attr name="settings_calendar_offline" format="reference"/>
+        <attr name="iconAboutAuthors" format="reference"/>
+        <attr name="iconAboutLicense" format="reference"/>
+        <attr name="iconSettingsAbout" format="reference" />
     </declare-styleable>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d888f1075fe124ff03a2720253dd80bea8acfb4d..f0c429c3f95968bad5cc143d946bba43261ffc12 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -269,6 +269,7 @@
     <color name="recurrence_picker_background_up_black">#212121</color>
     <color name="recurrence_bubble_text_normal_black">#ff737373</color>
     <color name="recurrence_done_black">#ffffff</color>
+    <color name="done_text_color_disabled">#cccccc</color>
 
     <!-- Create event colors -->
     <color name="create_event_date_color_black">#ffffff</color>
@@ -398,4 +399,32 @@
     <!-- Overwrite external chips colors -->
     <color name="chips_dropdown_text_default_dark">#9e9e9e</color>
     <color name="chips_dropdown_text_highlighted_dark">@android:color/holo_blue_light</color>
+
+    <!-- default calendar/event color palette -->
+    <array name="defaultCalendarColors">
+        <item>#FFD1270C</item>
+        <item>#FF11AB64</item>
+        <item>#FF1454B9</item>
+        <item>#FF4EA719</item>
+        <item>#FF62B492</item>
+        <item>#FF6365CC</item>
+        <item>#FF6E96B9</item>
+        <item>#FF6EB3B9</item>
+        <item>#FF7449B5</item>
+        <item>#FF8363CC</item>
+        <item>#FF85B03C</item>
+        <item>#FF8A4D38</item>
+        <item>#FF9B9B9B</item>
+        <item>#FF9E41B8</item>
+        <item>#FFA29496</item>
+        <item>#FFA37C82</item>
+        <item>#FFA63D36</item>
+        <item>#FFC55C7E</item>
+        <item>#FFC61600</item>
+        <item>#FFC81E02</item>
+        <item>#FFC89D2D</item>
+        <item>#FFC9B64C</item>
+        <item>#FFCC3F00</item>
+        <item>#FFCC770C</item>
+    </array>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c553151403926146a6b65edbb1f1dd618c6fede6..6ffeff02241b71a46d64906cbbf48173bf94b0fd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -22,7 +22,7 @@
     <dimen name="hours_text_size">12sp</dimen>
     <dimen name="allday_text_size">12sp</dimen>
     <dimen name="day_view_event_text_size">12sp</dimen>
-    <dimen name="week_view_event_text_size">12sp</dimen>
+    <dimen name="week_view_event_text_size">10sp</dimen>
     <dimen name="event_text_vertical_margin">2dp</dimen>
     <dimen name="event_text_horizontal_margin">4dp</dimen>
     <!-- minimum size of hours column in day/week view -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index aa02b8ae8be6af7ff4e66c992a987424a0a66e7f..9fb0a6fe531e00c6eb8f9d2e71e2b6711ffed86d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2006 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
     <string name="app_label">Calendar</string>
 
     <!-- Shared Labels. These labels are shared among the activities. -->
-    <skip />
+    <skip/>
     <!-- This is the label for the title or name of an event -->
     <string name="what_label">What</string>
     <!-- This is the label for the location of an event -->
@@ -97,7 +98,7 @@
     </plurals>
 
     <!-- Menu items: -->
-    <skip />
+    <skip/>
     <!-- This is a label on a context menu item. Pressing this menu item to initiate
         syncing of your Calendar data with the server. [CHAR LIMIT=11] -->
     <string name="calendar_refresh">"Refresh"</string>
@@ -139,16 +140,11 @@
     <!-- This is a label on a menu item. Pressing this menu
      item opens new dialog shown the date that the user wants to go. -->
     <string name="goto_date">"Go to…"</string>
-    <!-- This is a label on a menu item. Pressing this menu item allows the
-         user to see the list of calendars that he is viewing and to then add
-         or remove selected calendars. -->
-
     <!-- This is a label on a menu item. Pressing this menu item allows the
          user to view and edit his Settings (or Preferences) -->
     <string name="menu_preferences">"Settings"</string>
     <!-- This is a label on a menu item. Pressing this menu item allows the
          user to select the calendars to display [CHAR LIMIT=20] -->
-    <string name="menu_select_visible_calendars">"Calendars to display"</string>
     <!-- This is a label on a menu item. Pressing this menu item allows the
          user to select the calendars to display [CHAR LIMIT=20] -->
     <string name="search">"Search"</string>
@@ -164,40 +160,15 @@
 
 
     <!-- Month view -->
-    <skip />
+    <skip/>
 
     <!-- Select Visible Calendars activity -->
-    <skip />
-    <!-- Title of "My calendars" screen -->
-    <string name="select_visible_calendars_title">"Calendars to display"</string>
-    <!-- Synced and visible status message -->
-
-    <!-- Synced but not visible status message -->
-
-    <!-- not Synced or visible status message -->
-
-    <!-- Synced status message displayed when the given calendar is stored/synced on the device
-        [CHAR LIMIT=60] -->
-    <string name="synced"> synced</string>
-    <!-- Not synced status message displayed when the given calendar is not stored/synced on the
-        device [CHAR LIMIT=60] -->
-    <string name="not_synced"> not synced</string>
-    <!-- Message displayed to user when an account with Calendars is not being auto-synced
-        [CHAR LIMIT=120]-->
-    <string name="acct_not_synced">This account isn\'t being synced so your calendars may
-        not be up-to-date.</string>
-    <!-- Label on button that takes user to the Accounts and Sync settings page [CHAR LIMIT=60] -->
-    <string name="accounts">Accounts &amp; sync</string>
-
-    <!-- Select Synced Calendars activity -->
-    <!-- Select the set of calendars to sync [CHAR LIMIT=60] -->
-    <string name="select_synced_calendars_title">Calendars to sync</string>
+    <skip/>
     <!-- Select the set of calendars to sync [CHAR LIMIT=60] -->
     <string name="select_synced_calendars_button">Calendars to sync</string>
 
     <!-- Event edit activity -->
-    <skip />
-    <!-- The title of the screen where the user edits an event [CHAR LIMIT=17] -->
+    <skip/>
 
     <!-- Default value of What field (as a hint to the user) [CHAR LIMIT=15] -->
     <string name="hint_what">"Event name"</string>
@@ -229,31 +200,24 @@
     <string name="rsvp_declined">"Responded no."</string>
 
 
-    <!-- Title of message displayed to indicate available calendars are being loaded when creating
-         a new event -->
-
-    <!-- Body of message displayed to indicate available calendars are being loaded when creating
-         a new event -->
-
-
     <!-- Create event dialog -->
-    <skip />
+    <skip/>
     <!-- Create event dialog save button [CHAR LIMIT=10] -->
     <string name="create_event_dialog_save">Save</string>
 
     <!-- The alert toast is not actually being displayed for some reason. -->
-    <skip />
+    <skip/>
     <!-- the title of the alert/notification activity -->
     <string name="alert_title">Calendar notifications</string>
     <!-- Notification window messages: -->
-    <skip />
+    <skip/>
     <string name="foreground_notification_channel_name">Alert Sync</string>
     <string name="foreground_notification_channel_description">
         Foreground notification required for internal alert sync. Please mute
     </string>
 
     <!-- Event info/edit screen labels:-->
-    <skip />
+    <skip/>
     <!-- This is the title of the screen used to view the details of an event -->
     <string name="event_info_title">View event</string>
     <!-- This is the title of the screen used to view the details of an invitation
@@ -261,7 +225,7 @@
     <string name="event_info_title_invite">Meeting invitation</string>
 
     <!-- EditEventActivity specific strings: -->
-    <skip />
+    <skip/>
     <!-- Events have a start date/time and an end date/time. The display shows
          the start and end times like 'From start date To end date'. This is the
          label before the 'end date'. -->
@@ -275,7 +239,6 @@
     <!-- Label for choosing one of the calendars -->
     <string name="edit_event_calendar_label">Calendar</string>
     <!-- Menu item to show all choices [CHAR LIMIT=22]-->
-    <string name="edit_event_show_all">Show all</string>
     <!-- Label for the event description -->
     <string name="description_label">Description</string>
     <!-- Label for the 'Presence' of an event, which can be either 'busy' (the default)
@@ -291,18 +254,15 @@
     <!-- Body of alert shown if the user tries to create an event and has no calendars. Users can start adding an account here. [CHAR LIMIT=NONE] -->
     <string name="no_calendars_found">Before you can add an event, you must add at least one Calendar account to your device and make a calendar visible. Touch Add Account to add an account (if you just added an account, wait for it to finish syncing and try again). Or touch Cancel and make sure at least one calendar is visible.</string>
     <!-- Body of dialog prompting the user to create an account.[CHAR LIMIT=NONE] -->
-    <string name="create_an_account_desc">"Calendar works better with an Account.\n\n\u2022 Access it from any web browser\n\u2022 Back up your events securely"</string>
     <!-- Title of a button shown when there is no account available and the system prompt a user to add one. [CHAR LIMIT=none] -->
     <string name="add_account">Add account</string>
 
     <!-- View Event -->
-    <skip />
+    <skip/>
     <!-- Label for which calendar an event is part of -->
     <string name="view_event_calendar_label">Calendar:</string>
     <!-- Label for the event organizer -->
     <string name="view_event_organizer_label">Organizer:</string>
-    <!-- Label for the local timezone -->
-
     <!-- Label for showing event color picker -->
     <string name="choose_event_color_label">Choose event color</string>
     <!-- Title for event color picker dialog -->
@@ -348,7 +308,6 @@
     <!-- Summary of the quick response item in Settings [CHAR LIMIT=80]-->
     <string name="quick_response_settings_summary">Edit default responses when emailing guests</string>
     <!-- Title of the quick response screen in Settings->Quick Response [CHAR LIMIT=27]-->
-    <string name="quick_response_settings_title">Edit quick responses</string>
     <!-- Title of the quick response item in Settings [CHAR LIMIT=18]-->
     <string name="quick_response_settings_edit_title">Quick response</string>
 
@@ -362,14 +321,11 @@
         <item>Be there in about 10 minutes.</item>
         <item>Go ahead and start without me.</item>
         <item>Sorry, I can\'t make it. We\'ll have to reschedule.</item>
-    </string-array>
+        </string-array>
     <!-- Option to create a custom response instead of using defaults [CHAR LIMIT=none] -->
     <string name="quick_response_custom_msg">Write your own\u2026</string>
 
     <!-- Event Info strings-->
-    <!-- Time Zone Label [CHAR LIMIT=12]-->
-
-    <!-- Repetition Label [CHAR LIMIT=12]-->
 
     <!-- Organizer Label [CHAR LIMIT=12]-->
     <string name="event_info_organizer">Organizer:</string>
@@ -392,12 +348,12 @@
     <string name="show_newer_events">Touch to view events after <xliff:g id="newest_search_range">%1$s</xliff:g></string>
 
     <!-- Search activity strings -->
-    <skip />
+    <skip/>
     <!-- Title of the search screen [CHAR LIMIT=30] -->
     <string name="search_title">Search my calendars</string>
 
     <!-- Button labels: -->
-    <skip />
+    <skip/>
     <!-- This is the title of a popup window that is displayed when the user
          edits a repeating event. [CHAR LIMIT=20]-->
     <string name="edit_event_label">"Details"</string>
@@ -414,10 +370,9 @@
     <string name="discard_label">Cancel</string>
 
     <!-- Button labels on expanded notification reminders: -->
-    <skip />
+    <skip/>
     <!-- The button label for making the reminder alarms go away temporarily.
          The reminder alarms will fire off again in 5 minutes. -->
-    <string name="snooze_all_label">"Snooze all"</string>
     <!-- The button label for dismissing all the current reminder alarms. This
          causes them to disappear from the notification screen. -->
     <string name="dismiss_all_label">"Dismiss all"</string>
@@ -426,7 +381,7 @@
     <string name="snooze_label">"Snooze"</string>
 
     <!-- Repetition dialog options: -->
-    <skip />
+    <skip/>
     <!-- A label in a multiple-choice list for the specifying that an event does
          not repeat -->
     <string name="does_not_repeat">One-time event</string>
@@ -461,15 +416,6 @@
     <string name="monthly">Monthly</string>
     <!-- Calendar spinner item, to select that an event recurs every year. -->
     <string name="yearly_plain">Yearly</string>
-    <!-- Example: "Monthly (on day 15)" -->
-    <string name="monthly_on_day">"Monthly (on day <xliff:g id="day_of_month">%s</xliff:g>)"</string>
-    <!-- Example: "Yearly (on April 15)" -->
-    <string name="yearly">"Yearly (on <xliff:g id="dates">%s</xliff:g>)"</string>
-    <!-- This is a label for telling the user that this event repeats in
-         custom (non-standard) way from the usual repeat rates (such as daily,
-         weekly, etc.) and that the user cannot change this on the phone
-         (but only on the web). -->
-
     <!-- This is a label for telling the user that this event repeats in
          custom (non-standard) way from the usual repeat rates (such as daily,
          weekly, etc.) and that the user cannot change this on the phone
@@ -496,7 +442,7 @@
     <!-- This is the button to create a new event in a dialog window. [CHAR LIMIT=30] -->
     <string name="new_event_dialog_option">"New event"</string>
     <!-- Confirmation dialog message -->
-    <skip />
+    <skip/>
     <!-- This is a confirmation message in a popup dialog that appears when the
          user has asked to delete an event. The user still has a chance to cancel
          this operation. -->
@@ -509,16 +455,6 @@
          changing the response to an invitation. -->
     <string name="change_response_title">Change response</string>
 
-    <!-- This the title of a menu for General Preferences.
-         Pressing the menu item lets user to view and edit his general settings
-         (or preferences) [CHAR LIMIT=30] -->
-    <string name="menu_general_preferences">General settings</string>
-
-    <!-- This the title of a menu for "About Calendar" Preferences.
-         Pressing the menu item lets user to view the current settings
-         [CHAR LIMIT=30] -->
-    <string name="menu_about_preferences">Calendar about</string>
-
     <!-- This is the title of the screen for setting user preferences. -->
     <string name="preferences_title">"Settings"</string>
     <!-- This is the title of a section in the Settings screen for settings
@@ -549,7 +485,7 @@
     <string name="preferences_hide_declined_title">Hide declined events</string>
     <!-- Label values for the default start page preference. -->
     <string name="default_start_title">Default view</string>
-    <string name="view_details">View details</string>
+    <string name="display_options">Display options</string>
     <string name="display_time">Display time</string>
     <string name="display_location">Display location</string>
     <string name="maximum_number_of_lines">Max number of lines in event</string>
@@ -619,13 +555,11 @@
     <string name="preferences_about_title">About</string>
     <!-- Build version of the application -->
     <string name="preferences_build_version">Build version</string>
-    <!-- Report application issues  -->
     <string name="preferences_issues">Report issues</string>
 
     <!-- Widget -->
-    <skip />
+    <skip/>
     <!-- Title for calendar gadget when displayed in list of all other gadgets -->
-    <string name="gadget_title">Calendar</string>
 
     <!-- Shown in month view next to event icon when additional events exist for that day, but no
         room remaining -->
@@ -640,36 +574,14 @@
     <!-- Caption to show on gadget when there are no upcoming calendar events -->
     <string name="gadget_no_events">No upcoming calendar events</string>
 
-    <!-- Text to show on gadget when an event is currently in progress -->
-
-
-    <!-- Text to show on gadget when an all-day event is in progress -->
-
-
-    <!-- DO NOT TRANSLATE -->
-    <string name="tardis" translatable="false">TARDIS</string>
-
     <!-- Experimental settings [CHAR LIMIT = 30]-->
     <string name="preferences_experimental_category">Experimental</string>
 
     <!-- Reminders settings [CHAR LIMIT = 30]-->
-    <string name="preferences_reminders_category">Reminders</string>
     <!-- Preference label for when to skip reminders [CHAR LIMIT = 25] -->
     <string name="preferences_reminders_responded_label">Skip Reminders</string>
     <!-- Dialog title for when to skip reminders [CHAR LIMIT = 25] -->
     <string name="preferences_reminders_responded_dialog">Skip Reminders</string>
-    <!-- Preference label for quiet hours [CHAR LIMIT = 25]-->
-    <string name="preferences_reminders_quiet_hours_label">Quiet hours</string>
-    <!-- Preference description for quiet hours [CHAR LIMIT = NONE]-->
-    <string name="preferences_reminders_quiet_hours_description">Silence event reminders during specified time.</string>
-    <!-- Preference label for quiet hours start time [CHAR LIMIT = 25]-->
-    <string name="preferences_reminders_quiet_hours_start">Quiet hours start time</string>
-    <!-- Preference label for quiet hours end time [CHAR LIMIT = 25]-->
-    <string name="preferences_reminders_quiet_hours_end">Quiet hours end time</string>
-
-    <!-- Preferences used for debugging purposes [CHAR LIMIT = 30]-->
-    <string name="preferences_debug_category">Debugging</string>
-
     <!-- Send a copy of the database to developers for debugging [CHAR LIMIT="NONE"] -->
     <string name="copy_db">Send database</string>
 
@@ -702,13 +614,11 @@
     <!-- Add a new attendee to an event [CHAR LIMIT = NONE]-->
     <string name="accessibility_add_attendee">Add attendee</string>
     <!-- Choose if to sync/unsync this calendar with its server [CHAR LIMIT = NONE]-->
-    <string name="accessibility_sync_cal">Sync calendar</string>
     <!-- Mark this event as an "all day event" [CHAR LIMIT = NONE]-->
     <string name="accessibility_all_day">All day event</string>
     <!-- Refresh the data in the calendar [CHAR LIMIT = NONE]-->
 
     <!-- Choose the type of repetition for the event (daily, weekly, etc.[CHAR LIMIT = NONE]-->
-    <string name="accessibility_repeats">Repetition</string>
     <!-- Set the time for the reminder[CHAR LIMIT = NONE]-->
     <string name="accessibility_reminder_time">Reminder time</string>
     <!-- Set the type of the reminder (popup/email/sms)[CHAR LIMIT = NONE]-->
@@ -717,13 +627,6 @@
     <string name="accessibility_reminder_showmeas">Show me as</string>
     <!-- Set the event as private/public/default [CHAR LIMIT = NONE]-->
     <string name="accessibility_reminder_privacy">Privacy</string>
-    <!-- Calendar notification [CHAR LIMIT = NONE]-->
-    <string name="accessibility_cal_notification">Calendar Notification</string>
-    <!-- Calendar notification snooze button [CHAR LIMIT = NONE]-->
-    <string name="accessibility_snooze_notification">Snooze Notification</string>
-    <!-- Calendar notification email button [CHAR LIMIT = NONE]-->
-    <string name="accessibility_email_notification">Email guests</string>
-
     <!-- A "new event" hint for the user when selecting a specific hour in the day view [CHAR LIMIT = 30]-->
     <string name="day_view_new_event_hint">+ New event</string>
 
@@ -733,7 +636,7 @@
     -->
     <string name="template_announce_item_index">Event <xliff:g id="item_index">%1$s</xliff:g> of <xliff:g id="item_count">%2$s</xliff:g>.</string>
 
-    <!-- number of events in the notification bar -->
+        <!-- number of events in the notification bar -->
     <plurals name="Nevents">
         <!-- This is the label for a 1 event. -->
         <item quantity="one">1 event</item>
@@ -753,12 +656,9 @@
     <string name="acessibility_selected_marker_description">Selected event</string>
 
     <!-- Tell user not to check a checkbox [CHAR LIMIT=30] -->
-    <string name="do_not_check">Do NOT check -></string>
 
     <!-- Dialog title for recurrence picker for configuring a repeating event[CHAR LIMIT=20] -->
-    <string name="recurrence_dialog_title">Repeat</string>
     <!-- Dialog title for recurrence picker when one-time event is selected [CHAR LIMIT=20] -->
-    <string name="recurrence_dialog_title_never">Never repeats</string>
 
     <!-- Strings to describe how frequently to repeat an event (e.g. every 5 days) -->
     <plurals name="recurrence_interval_daily">
@@ -861,4 +761,38 @@
     <string name="preferences_privacy_policy">Privacy policy</string>
     <string name="preferences_service_terms">Terms of service</string>
 
+    <!-- Preferences -->
+    <string name="preferences_calendar_no_display_name">Unnamed calendar</string>
+    <string name="preferences_calendar_account">%1$s account</string>
+    <string name="preferences_calendar_account_local">Offline calendar</string>
+    <string name="preferences_calendar_configure_account">Configure calendar in %1$s</string>
+    <string name="preferences_calendar_number_of_events">%1d events</string>
+    <string name="preferences_calendar_delete">Delete calendar</string>
+    <string name="preferences_calendar_display_name">Change name</string>
+    <string name="preferences_calendar_info_category">Calendar information</string>
+    <string name="preferences_calendar_color">Color</string>
+    <string name="preferences_calendar_visible">Display events</string>
+    <string name="preferences_calendar_synchronize">Synchronize this calendar</string>
+    <string name="preferences_calendar_color_warning_title">Warning</string>
+    <string name="preferences_calendar_color_warning_message">Changing the color may be reverted when the calendar is synchronized again.\n\nIn DAVx⁵ \'Manage calendar colors\' can be disabled to prevent this.</string>
+    <string name="preferences_calendar_color_warning_button">I understand</string>
+    <string name="preferences_calendar_delete_message">Do you really want to delete this calendar?</string>
+    <string name="preferences_calendar_delete_delete">Delete calendar</string>
+    <string name="preferences_calendar_delete_cancel">Cancel</string>
+    <string name="preferences_list_calendar_summary_sync_off">Not synchronized</string>
+    <string name="preferences_list_calendar_summary_invisible">Events are not displayed</string>
+    <string name="preferences_list_general">General settings</string>
+    <string name="preferences_list_add_remote">Add remote calendar (CalDAV)</string>
+    <string name="preferences_list_add_offline">Add offline calendar</string>
+    <string name="preferences_list_add_offline_title">Add offline calendar</string>
+    <string name="preferences_list_add_offline_error_empty">Enter a calendar name!</string>
+    <string name="preferences_list_add_offline_message">Offline calendars are NOT synchronized to a cloud service and only available on your phone.</string>
+    <string name="preferences_list_add_offline_button">Add calendar</string>
+    <string name="preferences_list_add_offline_name">Name</string>
+    <string name="preferences_list_add_offline_cancel">Cancel</string>
+    <string name="preferences_menu_about">About Etar</string>
+
+    <string name="offline_account_name">Offline Calendar</string>
+    <string name="menu_about_preferences">Calendar about</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 18eb61e1508dc416b49e91671745ec5ce4a4b223..20ad735db004186e7bed94f72e4dec5982235b95 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 /* //device/apps/Calendar/assets/res/any/styles.xml
 **
 ** Copyright 2006, The Android Open Source Project
@@ -60,6 +59,10 @@
         <item name="ic_menu_email">@drawable/ic_menu_email_holo_light</item>
         <item name="calendar_future_bg_color">@color/calendar_future_bg_color</item>
         <item name="month_other_bgcolor">@color/month_other_bgcolor</item>
+        <item name="settings_calendar_offline">@drawable/ic_sync_off_light</item>
+        <item name="iconAboutAuthors">@drawable/ic_create_light</item>
+        <item name="iconAboutLicense">@drawable/ic_description_light</item>
+        <item name="iconSettingsAbout">@drawable/ic_info_outline_light</item>
     </style>
 
     <style name="Base.CalendarAppThemeWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 008f621adec5b28b9908b2a45455c13b5380b4c1..bf91bfa614342312dfaacecfab54758f738fdeec 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -36,6 +36,10 @@
         <item name="ic_menu_email">@drawable/ic_menu_email_holo_dark</item>
         <item name="calendar_future_bg_color">@color/calendar_future_bg_color_dark</item>
         <item name="month_other_bgcolor">@color/month_other_bgcolor_dark</item>
+        <item name="settings_calendar_offline">@drawable/ic_sync_off_dark</item>
+        <item name="iconAboutAuthors">@drawable/ic_create_dark</item>
+        <item name="iconAboutLicense">@drawable/ic_description_dark</item>
+        <item name="iconSettingsAbout">@drawable/ic_info_outline_dark</item>
     </style>
 
     <style name="CalendarAppThemeBlack" parent="Theme.AppCompat.NoActionBar">
@@ -73,6 +77,10 @@
         <item name="ic_menu_email">@drawable/ic_menu_email_holo_dark</item>
         <item name="calendar_future_bg_color">@color/calendar_future_bg_color_black</item>
         <item name="month_other_bgcolor">@color/month_other_bgcolor_black</item>
+        <item name="settings_calendar_offline">@drawable/ic_sync_off_dark</item>
+        <item name="iconAboutAuthors">@drawable/ic_create_dark</item>
+        <item name="iconAboutLicense">@drawable/ic_description_dark</item>
+        <item name="iconSettingsAbout">@drawable/ic_info_outline_dark</item>
     </style>
 
 
diff --git a/res/xml-v25/shortcuts.xml b/res/xml-v25/shortcuts.xml
new file mode 100644
index 0000000000000000000000000000000000000000..50b4c2b3603af387a1b6f0de49672da83e65b3bf
--- /dev/null
+++ b/res/xml-v25/shortcuts.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:icon="@mipmap/ic_launcher"
+        android:shortcutId="newevent"
+        android:shortcutLongLabel="@string/new_event_dialog_label"
+        android:shortcutShortLabel="@string/new_event_dialog_label">
+        <intent
+            android:action="android.intent.action.INSERT"
+            android:targetClass="com.android.calendar.EditEventActivity"
+            android:targetPackage="foundation.e.calendar" />
+    </shortcut>
+</shortcuts>
diff --git a/res/xml-v26/general_preferences.xml b/res/xml-v26/general_preferences.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fbd54ae308fdd7492de2a5dc00c93d9e13c0aef1
--- /dev/null
+++ b/res/xml-v26/general_preferences.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <PreferenceCategory app:title="@string/preferences_general_title">
+        <ListPreference
+            app:key="pref_theme"
+            app:title="@string/preferences_theme"
+            app:entries="@array/pref_theme_entries"
+            app:entryValues="@array/pref_theme_values"
+            app:defaultValue="light"/>
+        <Preference
+            app:key="pref_color"
+            app:title="@string/preferences_color"
+            app:entries="@array/pref_color_entries"
+            app:entryValues="@array/pref_color_values"
+            app:defaultValue="teal"/>
+        <ListPreference
+            app:key="preferences_default_start"
+            app:defaultValue="-2"
+            app:title="@string/default_start_title"
+            app:entries="@array/default_start_entries"
+            app:entryValues="@array/default_start_values" />
+        <Preference
+            app:key="pref_view_details"
+            app:title="@string/display_options"
+            app:fragment="com.android.calendar.settings.ViewDetailsPreferences" />
+        <CheckBoxPreference
+            app:key="preferences_hide_declined"
+            app:defaultValue="false"
+            app:title="@string/preferences_hide_declined_title" />
+        <CheckBoxPreference
+            app:key="preferences_show_week_num"
+            app:defaultValue="false"
+            app:title="@string/preferences_show_week_num_title" />
+        <ListPreference
+            app:key="preferences_week_start_day"
+            app:defaultValue="@string/preferences_week_start_day_default"
+            app:title="@string/preferences_week_start_day_title"
+            app:entries="@array/preferences_week_start_day_labels"
+            app:entryValues="@array/preferences_week_start_day_values"
+            app:dialogTitle="@string/preferences_week_start_day_dialog" />
+        <ListPreference
+            app:key="preferences_days_per_week"
+            app:defaultValue="@string/preferences_days_per_week_default"
+            app:title="@string/preferences_days_per_week_title"
+            app:entries="@array/preferences_days_per_week_labels"
+            app:entryValues="@array/preferences_days_per_week_values"
+            app:dialogTitle="@string/preferences_days_per_week_dialog" />
+        <ListPreference
+            app:key="preferences_default_event_duration"
+            app:defaultValue="60"
+            app:title="@string/preferences_default_event_duration_title"
+            app:entries="@array/preferences_default_duration_labels"
+            app:entryValues="@array/preferences_default_duration_values"
+            />
+        <CheckBoxPreference
+            app:key="preferences_home_tz_enabled"
+            app:defaultValue="false"
+            app:title="@string/preferences_use_home_tz_title"
+            app:summary="@string/preferences_use_home_tz_descrip" />
+        <Preference
+            app:key="preferences_home_tz"
+            app:dependency="preferences_home_tz_enabled"
+            app:defaultValue="@string/preferences_home_tz_default"
+            app:title="@string/preferences_home_tz_title" />
+        <Preference
+            app:key="preferences_clear_search_history"
+            app:title="@string/preferences_clear_search_history_title"
+            app:summary="@string/preferences_clear_search_history_summary" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        app:key="preferences_alerts_category"
+        app:title="@string/preferences_reminder_title">
+        <Preference
+            app:key="preferences_notification"
+            app:title="@string/preferences_alerts_title" />
+
+        <CheckBoxPreference
+            app:key="preferences_alerts_popup"
+            app:layout="?android:attr/preferenceLayoutChild"
+            app:defaultValue="false"
+            app:title="@string/preferences_alerts_popup_title" />
+
+        <CheckBoxPreference
+            app:key="preferences_custom_snooze_delay"
+            app:defaultValue="false"
+            app:title="@string/preferences_alerts_custom_snooze_delay_title"
+            app:summaryOn="@string/preferences_alerts_custom_snooze_delay_summary_on"
+            app:summaryOff="@string/preferences_alerts_custom_snooze_delay_summary_off" />
+
+        <ListPreference
+            app:key="preferences_default_snooze_delay"
+            app:defaultValue="@string/preferences_default_snooze_delay_default"
+            app:entryValues="@array/preferences_default_snooze_delay_values"
+            app:title="@string/preferences_default_snooze_delay_title"
+            app:dialogTitle="@string/preferences_default_snooze_delay_dialog" />
+
+        <ListPreference
+            app:key="preferences_default_reminder"
+            app:defaultValue="@string/preferences_default_reminder_default"
+            app:title="@string/preferences_default_reminder_title"
+            app:entries="@array/preferences_default_reminder_labels"
+            app:entryValues="@array/preferences_default_reminder_values"
+            app:dialogTitle="@string/preferences_default_reminder_dialog" />
+
+        <Preference
+            app:key="preferences_quick_responses"
+            app:fragment="com.android.calendar.settings.QuickResponsePreferences"
+            app:title="@string/quick_response_settings"
+            app:summary="@string/quick_response_settings_summary" />
+     </PreferenceCategory>
+    <PreferenceCategory
+        app:key="preferences_experimental_category"
+        app:title="@string/preferences_experimental_category">
+        <Preference
+            app:key="preferences_copy_db"
+            app:title="@string/copy_db" />
+
+        <ListPreference
+            app:key="preferences_reminders_responded"
+            app:title="@string/preferences_reminders_responded_label"
+            app:entries="@array/preferences_skip_reminders_labels"
+            app:entryValues="@array/preferences_skip_reminders_values"
+            app:dialogTitle="@string/preferences_reminders_responded_dialog" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/about_preferences.xml b/res/xml/about_preferences.xml
deleted file mode 100644
index 15b2b8a33d9d93677aa33c75759b59ad2fe836b2..0000000000000000000000000000000000000000
--- a/res/xml/about_preferences.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory android:title="@string/preferences_about_title">
-
-
-        <Preference
-            android:key="calendar_info"
-            android:title="@string/preferences_app_info_title" />
-
-        <Preference
-            android:key="build_version"
-            android:title="@string/preferences_build_version">
-
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://gitlab.e.foundation/e/apps/Calendar/-/releases" />
-
-
-        </Preference>
-
-
-        <Preference
-            android:key="about_app"
-            android:title="@string/preferences_about_app">
-
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://github.com/Etar-Group/Etar-Calendar" />
-
-        </Preference>
-
-        <!--<Preference android:title="@string/preferences_issues">
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://github.com/Etar-Group/Etar-Calendar/issues" />
-        </Preference>-->
-
-        <Preference android:title="@string/preferences_licence">
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://gitlab.e.foundation/e/apps/Calendar/-/blob/master/LICENSE" />
-        </Preference>
-
-        <Preference android:title="@string/preferences_authors">
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://gitlab.e.foundation/e/apps/Calendar/-/blob/master/AUTHORS" />
-        </Preference>
-
-        <Preference android:title="@string/preferences_source_code">
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://gitlab.e.foundation/e/apps/Calendar" />
-        </Preference>
-
-        <Preference android:title="@string/preferences_privacy_policy">
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://e.foundation/legal-notice-privacy/" />
-        </Preference>
-
-        <Preference android:title="@string/preferences_service_terms">
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://e.foundation/legal-notice-privacy/" />
-        </Preference>
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/calendar_settings_headers.xml b/res/xml/calendar_settings_headers.xml
deleted file mode 100644
index a5a5ae7223a77a268bff22937d3945ad5b1c896c..0000000000000000000000000000000000000000
--- a/res/xml/calendar_settings_headers.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<preference-headers
-        xmlns:android="http://schemas.android.com/apk/res/android">
-    <header android:fragment="com.android.calendar.GeneralPreferences"
-            android:title="@string/menu_general_preferences" />
-
-    <header android:fragment="com.android.calendar.AboutPreferences"
-            android:title="@string/menu_about_preferences" />
-</preference-headers>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 59c700d507b460511e464bd6215d5d7213c1c2b0..c39acd28d00a6cae09e6836d0458e6fbb034e074 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -14,131 +14,145 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/preferences_general_title">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <PreferenceCategory app:title="@string/preferences_general_title">
         <ListPreference
-            android:key="pref_theme"
-            android:title="@string/preferences_theme"
-            android:entries="@array/pref_theme_entries"
-            android:entryValues="@array/pref_theme_values"
-            android:defaultValue="light"/>
+            app:key="pref_theme"
+            app:title="@string/preferences_theme"
+            app:entries="@array/pref_theme_entries"
+            app:entryValues="@array/pref_theme_values"
+            app:defaultValue="light"/>
         <Preference
-            android:key="pref_color"
-            android:title="@string/preferences_color"
-            android:entries="@array/pref_color_entries"
-            android:entryValues="@array/pref_color_values"
-            android:defaultValue="teal"/>
+            app:key="pref_color"
+            app:title="@string/preferences_color"
+            app:entries="@array/pref_color_entries"
+            app:entryValues="@array/pref_color_values"
+            app:defaultValue="teal"/>
         <ListPreference
-            android:key="preferences_default_start"
-            android:defaultValue="-2"
-            android:title="@string/default_start_title"
-            android:entries="@array/default_start_entries"
-            android:entryValues="@array/default_start_values" />
-        <PreferenceScreen
-            android:key="pref_view_details"
-            android:title="@string/view_details"
-            android:fragment="com.android.calendar.ViewDetailsPreferences" />
+            app:key="preferences_default_start"
+            app:defaultValue="-2"
+            app:title="@string/default_start_title"
+            app:entries="@array/default_start_entries"
+            app:entryValues="@array/default_start_values" />
+        <Preference
+            app:key="pref_view_details"
+            app:title="@string/display_options"
+            app:fragment="com.android.calendar.settings.ViewDetailsPreferences" />
         <CheckBoxPreference
-            android:key="preferences_hide_declined"
-            android:defaultValue="false"
-            android:title="@string/preferences_hide_declined_title" />
+            app:key="preferences_hide_declined"
+            app:defaultValue="false"
+            app:title="@string/preferences_hide_declined_title" />
         <CheckBoxPreference
-            android:key="preferences_show_week_num"
-            android:defaultValue="false"
-            android:title="@string/preferences_show_week_num_title" />
+            app:key="preferences_show_week_num"
+            app:defaultValue="false"
+            app:title="@string/preferences_show_week_num_title" />
         <ListPreference
-            android:key="preferences_week_start_day"
-            android:defaultValue="@string/preferences_week_start_day_default"
-            android:title="@string/preferences_week_start_day_title"
-            android:entries="@array/preferences_week_start_day_labels"
-            android:entryValues="@array/preferences_week_start_day_values"
-            android:dialogTitle="@string/preferences_week_start_day_dialog" />
+            app:key="preferences_week_start_day"
+            app:defaultValue="@string/preferences_week_start_day_default"
+            app:title="@string/preferences_week_start_day_title"
+            app:entries="@array/preferences_week_start_day_labels"
+            app:entryValues="@array/preferences_week_start_day_values"
+            app:dialogTitle="@string/preferences_week_start_day_dialog" />
         <ListPreference
-            android:key="preferences_days_per_week"
-            android:defaultValue="@string/preferences_days_per_week_default"
-            android:title="@string/preferences_days_per_week_title"
-            android:entries="@array/preferences_days_per_week_labels"
-            android:entryValues="@array/preferences_days_per_week_values"
-            android:dialogTitle="@string/preferences_days_per_week_dialog" />
+            app:key="preferences_days_per_week"
+            app:defaultValue="@string/preferences_days_per_week_default"
+            app:title="@string/preferences_days_per_week_title"
+            app:entries="@array/preferences_days_per_week_labels"
+            app:entryValues="@array/preferences_days_per_week_values"
+            app:dialogTitle="@string/preferences_days_per_week_dialog" />
         <ListPreference
-            android:key="preferences_default_event_duration"
-            android:defaultValue="60"
-            android:title="@string/preferences_default_event_duration_title"
-            android:entries="@array/preferences_default_duration_labels"
-            android:entryValues="@array/preferences_default_duration_values"
+            app:key="preferences_default_event_duration"
+            app:defaultValue="60"
+            app:title="@string/preferences_default_event_duration_title"
+            app:entries="@array/preferences_default_duration_labels"
+            app:entryValues="@array/preferences_default_duration_values"
             />
         <CheckBoxPreference
-            android:key="preferences_home_tz_enabled"
-            android:defaultValue="false"
-            android:title="@string/preferences_use_home_tz_title"
-            android:summary="@string/preferences_use_home_tz_descrip" />
+            app:key="preferences_home_tz_enabled"
+            app:defaultValue="false"
+            app:title="@string/preferences_use_home_tz_title"
+            app:summary="@string/preferences_use_home_tz_descrip" />
+        <Preference
+            app:key="preferences_home_tz"
+            app:dependency="preferences_home_tz_enabled"
+            app:defaultValue="@string/preferences_home_tz_default"
+            app:title="@string/preferences_home_tz_title" />
         <Preference
-            android:key="preferences_home_tz"
-            android:dependency="preferences_home_tz_enabled"
-            android:defaultValue="@string/preferences_home_tz_default"
-            android:title="@string/preferences_home_tz_title" />
-        <PreferenceScreen
-            android:key="preferences_clear_search_history"
-            android:title="@string/preferences_clear_search_history_title"
-            android:summary="@string/preferences_clear_search_history_summary" />
+            app:key="preferences_clear_search_history"
+            app:title="@string/preferences_clear_search_history_title"
+            app:summary="@string/preferences_clear_search_history_summary" />
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="preferences_alerts_category"
-        android:title="@string/preferences_reminder_title">
+        app:key="preferences_alerts_category"
+        app:title="@string/preferences_reminder_title">
         <CheckBoxPreference
-            android:key="preferences_alerts"
-            android:defaultValue="true"
-            android:title="@string/preferences_alerts_title" />
+            app:key="preferences_alerts"
+            app:defaultValue="true"
+            app:title="@string/preferences_alerts_title" />
 
-        <RingtonePreference
-            android:layout="?android:attr/preferenceLayoutChild"
-            android:key="preferences_alerts_ringtone"
-            android:title="@string/preferences_alerts_ringtone_title"
-            android:ringtoneType="notification"
-            android:defaultValue="content://settings/system/notification_sound"
-            android:dependency="preferences_alerts" />
+        <Preference
+            app:layout="?android:attr/preferenceLayoutChild"
+            app:key="preferences_alerts_ringtone"
+            app:title="@string/preferences_alerts_ringtone_title"
+            app:defaultValue="content://settings/system/notification_sound"
+            app:dependency="preferences_alerts" />
 
         <CheckBoxPreference
-            android:layout="?android:attr/preferenceLayoutChild"
-            android:key="preferences_alerts_vibrate"
-            android:title="@string/preferences_alerts_vibrateWhen_title"
-            android:defaultValue="false"
-            android:dependency="preferences_alerts" />
+            app:layout="?android:attr/preferenceLayoutChild"
+            app:key="preferences_alerts_vibrate"
+            app:title="@string/preferences_alerts_vibrateWhen_title"
+            app:defaultValue="false"
+            app:dependency="preferences_alerts" />
 
         <CheckBoxPreference
-            android:layout="?android:attr/preferenceLayoutChild"
-            android:key="preferences_alerts_popup"
-            android:defaultValue="false"
-            android:title="@string/preferences_alerts_popup_title"
-            android:dependency="preferences_alerts" />
+            app:layout="?android:attr/preferenceLayoutChild"
+            app:key="preferences_alerts_popup"
+            app:defaultValue="false"
+            app:title="@string/preferences_alerts_popup_title"
+            app:dependency="preferences_alerts" />
 
         <CheckBoxPreference
-            android:key="preferences_custom_snooze_delay"
-            android:defaultValue="false"
-            android:title="@string/preferences_alerts_custom_snooze_delay_title"
-            android:summaryOn="@string/preferences_alerts_custom_snooze_delay_summary_on"
-            android:summaryOff="@string/preferences_alerts_custom_snooze_delay_summary_off" />
+            app:key="preferences_custom_snooze_delay"
+            app:defaultValue="false"
+            app:title="@string/preferences_alerts_custom_snooze_delay_title"
+            app:summaryOn="@string/preferences_alerts_custom_snooze_delay_summary_on"
+            app:summaryOff="@string/preferences_alerts_custom_snooze_delay_summary_off" />
 
         <ListPreference
-            android:key="preferences_default_snooze_delay"
-            android:defaultValue="@string/preferences_default_snooze_delay_default"
-            android:entryValues="@array/preferences_default_snooze_delay_values"
-            android:title="@string/preferences_default_snooze_delay_title"
-            android:dialogTitle="@string/preferences_default_snooze_delay_dialog" />
+            app:key="preferences_default_snooze_delay"
+            app:defaultValue="@string/preferences_default_snooze_delay_default"
+            app:entryValues="@array/preferences_default_snooze_delay_values"
+            app:title="@string/preferences_default_snooze_delay_title"
+            app:dialogTitle="@string/preferences_default_snooze_delay_dialog" />
 
         <ListPreference
-            android:key="preferences_default_reminder"
-            android:defaultValue="@string/preferences_default_reminder_default"
-            android:title="@string/preferences_default_reminder_title"
-            android:entries="@array/preferences_default_reminder_labels"
-            android:entryValues="@array/preferences_default_reminder_values"
-            android:dialogTitle="@string/preferences_default_reminder_dialog" />
+            app:key="preferences_default_reminder"
+            app:defaultValue="@string/preferences_default_reminder_default"
+            app:title="@string/preferences_default_reminder_title"
+            app:entries="@array/preferences_default_reminder_labels"
+            app:entryValues="@array/preferences_default_reminder_values"
+            app:dialogTitle="@string/preferences_default_reminder_dialog" />
 
-        <PreferenceScreen
-            android:key="preferences_quick_responses"
-            android:fragment="com.android.calendar.QuickResponseSettings"
-            android:title="@string/quick_response_settings"
-            android:summary="@string/quick_response_settings_summary" />
+        <Preference
+            app:key="preferences_quick_responses"
+            app:fragment="com.android.calendar.settings.QuickResponsePreferences"
+            app:title="@string/quick_response_settings"
+            app:summary="@string/quick_response_settings_summary" />
      </PreferenceCategory>
+    <PreferenceCategory
+        app:key="preferences_experimental_category"
+        app:title="@string/preferences_experimental_category">
+        <Preference
+            app:key="preferences_copy_db"
+            app:title="@string/copy_db" />
+
+        <ListPreference
+            app:key="preferences_reminders_responded"
+            app:title="@string/preferences_reminders_responded_label"
+            app:entries="@array/preferences_skip_reminders_labels"
+            app:entryValues="@array/preferences_skip_reminders_values"
+            app:dialogTitle="@string/preferences_reminders_responded_dialog" />
+    </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/general_preferences_oreo_and_up.xml b/res/xml/general_preferences_oreo_and_up.xml
deleted file mode 100644
index 40a078229f3b0a658fc5f2217541caf39bf4d041..0000000000000000000000000000000000000000
--- a/res/xml/general_preferences_oreo_and_up.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/preferences_general_title">
-        <ListPreference
-            android:key="pref_theme"
-            android:title="@string/preferences_theme"
-            android:entries="@array/pref_theme_entries"
-            android:entryValues="@array/pref_theme_values"
-            android:defaultValue="light"/>
-        <Preference
-            android:key="pref_color"
-            android:title="@string/preferences_color"
-            android:entries="@array/pref_color_entries"
-            android:entryValues="@array/pref_color_values"
-            android:defaultValue="teal"/>
-        <ListPreference
-            android:key="preferences_default_start"
-            android:defaultValue="-2"
-            android:title="@string/default_start_title"
-            android:entries="@array/default_start_entries"
-            android:entryValues="@array/default_start_values" />
-        <PreferenceScreen
-            android:key="pref_view_details"
-            android:title="@string/view_details"
-            android:fragment="com.android.calendar.ViewDetailsPreferences" />
-        <CheckBoxPreference
-            android:key="preferences_hide_declined"
-            android:defaultValue="false"
-            android:title="@string/preferences_hide_declined_title" />
-        <CheckBoxPreference
-            android:key="preferences_show_week_num"
-            android:defaultValue="false"
-            android:title="@string/preferences_show_week_num_title" />
-        <ListPreference
-            android:key="preferences_week_start_day"
-            android:defaultValue="@string/preferences_week_start_day_default"
-            android:title="@string/preferences_week_start_day_title"
-            android:entries="@array/preferences_week_start_day_labels"
-            android:entryValues="@array/preferences_week_start_day_values"
-            android:dialogTitle="@string/preferences_week_start_day_dialog" />
-        <ListPreference
-            android:key="preferences_days_per_week"
-            android:defaultValue="@string/preferences_days_per_week_default"
-            android:title="@string/preferences_days_per_week_title"
-            android:entries="@array/preferences_days_per_week_labels"
-            android:entryValues="@array/preferences_days_per_week_values"
-            android:dialogTitle="@string/preferences_days_per_week_dialog" />
-        <ListPreference
-            android:key="preferences_default_event_duration"
-            android:defaultValue="60"
-            android:title="@string/preferences_default_event_duration_title"
-            android:entries="@array/preferences_default_duration_labels"
-            android:entryValues="@array/preferences_default_duration_values"
-            />
-        <CheckBoxPreference
-            android:key="preferences_home_tz_enabled"
-            android:defaultValue="false"
-            android:title="@string/preferences_use_home_tz_title"
-            android:summary="@string/preferences_use_home_tz_descrip" />
-        <Preference
-            android:key="preferences_home_tz"
-            android:dependency="preferences_home_tz_enabled"
-            android:defaultValue="@string/preferences_home_tz_default"
-            android:title="@string/preferences_home_tz_title" />
-        <PreferenceScreen
-            android:key="preferences_clear_search_history"
-            android:title="@string/preferences_clear_search_history_title"
-            android:summary="@string/preferences_clear_search_history_summary" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:key="preferences_alerts_category"
-        android:title="@string/preferences_reminder_title">
-        <Preference
-            android:key="preferences_notification"
-            android:title="@string/preferences_alerts_title" />
-
-        <CheckBoxPreference
-            android:layout="?android:attr/preferenceLayoutChild"
-            android:key="preferences_alerts_popup"
-            android:defaultValue="false"
-            android:title="@string/preferences_alerts_popup_title" />
-
-        <CheckBoxPreference
-            android:key="preferences_custom_snooze_delay"
-            android:defaultValue="false"
-            android:title="@string/preferences_alerts_custom_snooze_delay_title"
-            android:summaryOn="@string/preferences_alerts_custom_snooze_delay_summary_on"
-            android:summaryOff="@string/preferences_alerts_custom_snooze_delay_summary_off" />
-
-        <ListPreference
-            android:key="preferences_default_snooze_delay"
-            android:defaultValue="@string/preferences_default_snooze_delay_default"
-            android:entryValues="@array/preferences_default_snooze_delay_values"
-            android:title="@string/preferences_default_snooze_delay_title"
-            android:dialogTitle="@string/preferences_default_snooze_delay_dialog" />
-
-        <ListPreference
-            android:key="preferences_default_reminder"
-            android:defaultValue="@string/preferences_default_reminder_default"
-            android:title="@string/preferences_default_reminder_title"
-            android:entries="@array/preferences_default_reminder_labels"
-            android:entryValues="@array/preferences_default_reminder_values"
-            android:dialogTitle="@string/preferences_default_reminder_dialog" />
-
-        <PreferenceScreen
-            android:key="preferences_quick_responses"
-            android:fragment="com.android.calendar.QuickResponseSettings"
-            android:title="@string/quick_response_settings"
-            android:summary="@string/quick_response_settings_summary" />
-     </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/other_preferences.xml b/res/xml/other_preferences.xml
deleted file mode 100644
index 411643e9406d6e6d110b587994ed47e67a70c2da..0000000000000000000000000000000000000000
--- a/res/xml/other_preferences.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:key="preferences_debug_category"
-        android:title="@string/preferences_debug_category">
-        <Preference
-            android:key="preferences_copy_db"
-            android:title="@string/copy_db" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:key="preferences_reminders_category"
-        android:title="@string/preferences_reminders_category" >
-        <ListPreference
-            android:key="preferences_reminders_responded"
-            android:title="@string/preferences_reminders_responded_label"
-            android:entries="@array/preferences_skip_reminders_labels"
-            android:entryValues="@array/preferences_skip_reminders_values"
-            android:dialogTitle="@string/preferences_reminders_responded_dialog" />
-        <CheckBoxPreference
-            android:key="preferences_reminders_quiet_hours"
-            android:title="@string/preferences_reminders_quiet_hours_label"
-            android:summary="@string/preferences_reminders_quiet_hours_description"/>
-        <Preference
-            android:key="preferences_reminders_quiet_hours_start"
-            android:dependency="preferences_reminders_quiet_hours"
-            android:title="@string/preferences_reminders_quiet_hours_start"
-            android:summary="10:00pm" />
-        <Preference
-            android:key="preferences_reminders_quiet_hours_end"
-            android:dependency="preferences_reminders_quiet_hours"
-            android:title="@string/preferences_reminders_quiet_hours_end"
-            android:summary="08:00am" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:key="preferences_tardis_category"
-        android:title="@string/tardis">
-        <CheckBoxPreference
-            android:key="preferences_tardis_1"
-            android:title="@string/do_not_check" />
-    </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index f4d8447d83d5a3b8fa5341d8b09c2bfa66f4a469..fee7b391c1c10880ac8afc2db9421bde79f8bc4b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,4 @@
 include ':external:calendar'
 include ':external:colorpicker'
-include ':external:datetimepicker'
 include ':external:timezonepicker'
 include ':external:chips'
diff --git a/src/com/android/calendar/AboutActivity.kt b/src/com/android/calendar/AboutActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..8131eb3293d421fe72e89d991dc8b7f01abba303
--- /dev/null
+++ b/src/com/android/calendar/AboutActivity.kt
@@ -0,0 +1,35 @@
+package com.android.calendar
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import foundation.e.calendar.R
+
+private val dynamicTheme = DynamicTheme()
+
+class AboutActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        dynamicTheme.onCreate(this)
+
+        setContentView(R.layout.simple_frame_layout_material)
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        title = getString(R.string.menu_about_preferences)
+
+        if (savedInstanceState == null) {
+            supportFragmentManager
+                    .beginTransaction()
+                    .add(R.id.body_frame, AboutFragment())
+                    .commit()
+        }
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        finish()
+        return true
+    }
+
+}
diff --git a/src/com/android/calendar/AboutFragment.kt b/src/com/android/calendar/AboutFragment.kt
new file mode 100644
index 0000000000000000000000000000000000000000..350c381a7e7e8f35ef48518828b6fa6fe24d5219
--- /dev/null
+++ b/src/com/android/calendar/AboutFragment.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar
+
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import foundation.e.calendar.R
+import kotlinx.android.synthetic.main.about.*
+
+class AboutFragment : Fragment() {
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.about, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        version.text = getVersionNumber()
+
+        authorsLayout.setOnClickListener {
+            openUri("https://gitlab.e.foundation/e/apps/Calendar/-/blob/master/AUTHORS")
+        }
+
+        versionLayout.setOnClickListener {
+            openUri("https://gitlab.e.foundation/e/apps/Calendar/-/releases")
+        }
+
+        forkInfoLayout.setOnClickListener {
+            openUri("https://github.com/Etar-Group/Etar-Calendar")
+        }
+
+        licenseLayout.setOnClickListener {
+            openUri("https://gitlab.e.foundation/e/apps/Calendar/-/blob/master/LICENSE")
+        }
+
+        sourceLayout.setOnClickListener {
+            openUri("https://gitlab.e.foundation/e/apps/Calendar")
+        }
+
+        privacyLayout.setOnClickListener {
+            openUri("https://e.foundation/legal-notice-privacy")
+        }
+
+        termsLayout.setOnClickListener {
+            openUri("https://e.foundation/legal-notice-privacy")
+        }
+
+    }
+
+    private fun openUri(uri: String) {
+        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(uri)))
+    }
+
+    private fun getVersionNumber(): String {
+        return try {
+            val context = requireContext()
+            val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            packageInfo.versionName
+        } catch (e: PackageManager.NameNotFoundException) {
+            "?"
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/android/calendar/AboutPreferences.java b/src/com/android/calendar/AboutPreferences.java
deleted file mode 100644
index addb2cf76b4e4f65aff4a70b82a6d6a62efbdd62..0000000000000000000000000000000000000000
--- a/src/com/android/calendar/AboutPreferences.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar;
-
-import android.app.Activity;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Bundle;
-import android.preference.PreferenceFragment;
-
-import foundation.e.calendar.R;
-
-public class AboutPreferences extends PreferenceFragment {
-    private static final String BUILD_VERSION = "build_version";
-    private static final String CALENDAR_INFO = "calendar_info";
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        addPreferencesFromResource(R.xml.about_preferences);
-
-        final Activity activity = getActivity();
-        try {
-            final PackageInfo packageInfo =
-                    activity.getPackageManager().getPackageInfo(activity.getPackageName(), 0);
-            findPreference(BUILD_VERSION).setSummary(packageInfo.versionName);
-        } catch (NameNotFoundException e) {
-            findPreference(BUILD_VERSION).setSummary("?");
-        }
-
-        findPreference(CALENDAR_INFO).setSummary(getString(R.string.preferences_app_info));
-
-
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index e716e74481b6c8fa9916f6284b691f1e60937d96..e5534dc6dd7ce4272c8a6853716ed7e2b5a9c7db 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -20,6 +20,7 @@ import android.Manifest;
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
 import android.animation.ObjectAnimator;
+import android.app.DatePickerDialog;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
@@ -43,10 +44,15 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.preference.PreferenceActivity;
 import android.provider.CalendarContract;
 import android.provider.CalendarContract.Attendees;
 import android.provider.CalendarContract.Events;
+
+import com.android.calendar.alerts.NotificationMgr;
+import com.android.calendar.settings.SettingsActivity;
+import com.android.calendar.settings.GeneralPreferences;
+import com.android.calendar.settings.SettingsActivityKt;
+import com.android.calendar.settings.ViewDetailsPreferences;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.navigation.NavigationView;
 import androidx.core.app.ActivityCompat;
@@ -66,6 +72,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
+import android.widget.DatePicker;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
@@ -78,10 +85,8 @@ import com.android.calendar.CalendarController.EventType;
 import com.android.calendar.CalendarController.ViewType;
 import com.android.calendar.agenda.AgendaFragment;
 import com.android.calendar.alerts.AlertService;
-import com.android.calendar.alerts.NotificationMgr;
 import com.android.calendar.month.MonthByWeekFragment;
 import com.android.calendar.selectcalendars.SelectVisibleCalendarsFragment;
-import com.android.datetimepicker.date.DatePickerDialog;
 
 import java.io.File;
 import java.util.List;
@@ -98,7 +103,6 @@ import static com.android.calendar.alerts.AlertService.ALERT_CHANNEL_ID;
 import static com.android.calendar.alerts.AlertService.FOREGROUND_CHANNEL_ID;
 
 
-
 public class AllInOneActivity extends AbstractCalendarActivity implements EventHandler,
         OnSharedPreferenceChangeListener, SearchView.OnQueryTextListener, SearchView.OnSuggestionListener, NavigationView.OnNavigationItemSelectedListener {
     private static final String TAG = "AllInOneActivity";
@@ -255,9 +259,7 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
 
     @Override
     protected void onCreate(Bundle icicle) {
-        if (Utils.getSharedPreference(this, OtherPreferences.KEY_OTHER_1, false)) {
-            setTheme(R.style.CalendarTheme_WithActionBarWallpaper);
-        }
+        setTheme(R.style.CalendarTheme_WithActionBarWallpaper);
         super.onCreate(icicle);
         dynamicTheme.onCreate(this);
 
@@ -399,7 +401,7 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
         initFragments(timeMillis, viewType, icicle);
 
         // Listen for changes that would require this to be refreshed
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(this);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(this);
         prefs.registerOnSharedPreferenceChangeListener(this);
 
         mContentResolver = getContentResolver();
@@ -655,7 +657,7 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
         mContentResolver.unregisterContentObserver(mObserver);
         if (isFinishing()) {
             // Stop listening for changes that would require this to be refreshed
-            SharedPreferences prefs = GeneralPreferences.getSharedPreferences(this);
+            SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(this);
             prefs.unregisterOnSharedPreferenceChangeListener(this);
         }
         // FRAG_TODO save highlighted days of the week;
@@ -694,7 +696,7 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
     protected void onDestroy() {
         super.onDestroy();
 
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(this);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(this);
         prefs.unregisterOnSharedPreferenceChangeListener(this);
 
         mController.deregisterAllEventHandlers();
@@ -756,7 +758,7 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
 
         EventInfo info = null;
         if (viewType == ViewType.EDIT) {
-            mPreviousView = GeneralPreferences.getSharedPreferences(this).getInt(
+            mPreviousView = GeneralPreferences.Companion.getSharedPreferences(this).getInt(
                     GeneralPreferences.KEY_START_VIEW, GeneralPreferences.DEFAULT_START_VIEW);
 
             long eventId = -1;
@@ -890,7 +892,6 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
             mController.refreshCalendars();
             return true;
         } else if (itemId == R.id.action_today) {
-            viewType = ViewType.CURRENT;
             t = new Time(mTimeZone);
             t.setToNow();
             extras |= CalendarController.EXTRA_GOTO_TODAY;
@@ -904,9 +905,9 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
                 t = todayTime;
             }
 
-            DatePickerDialog datePickerDialog = DatePickerDialog.newInstance(new DatePickerDialog.OnDateSetListener() {
-                @Override
-                public void onDateSet(DatePickerDialog dialog, int year, int monthOfYear, int dayOfMonth) {
+            DatePickerDialog.OnDateSetListener datePickerListener = new DatePickerDialog.OnDateSetListener() {
+
+                public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
                     Time selectedTime = new Time(mTimeZone);
                     selectedTime.year = year;
                     selectedTime.month = monthOfYear;
@@ -914,8 +915,9 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
                     long extras = CalendarController.EXTRA_GOTO_TIME | CalendarController.EXTRA_GOTO_DATE;
                     mController.sendEvent(this, EventType.GO_TO, selectedTime, null, selectedTime, -1, ViewType.CURRENT, extras, null, null);
                 }
-            }, t.year, t.month, t.monthDay);
-            datePickerDialog.show(getFragmentManager(), "datePickerDialog");
+            };
+            DatePickerDialog datePickerDialog = new DatePickerDialog(this,datePickerListener,t.year, t.month,t.monthDay);
+            datePickerDialog.show();
 
         } else if (itemId == R.id.action_hide_controls) {
             mHideControls = !mHideControls;
@@ -939,9 +941,8 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
         } else if (itemId == R.id.action_import) {
             ImportActivity.pickImportFile(this);
         } else if (itemId == R.id.action_view_settings) {
-            Intent intent = new Intent(this, CalendarSettingsActivity.class);
-            intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, ViewDetailsPreferences.class.getName());
-            intent.putExtra( PreferenceActivity.EXTRA_NO_HEADERS, true );
+            Intent intent = new Intent(this, SettingsActivity.class);
+            intent.putExtra(SettingsActivityKt.EXTRA_SHOW_FRAGMENT, ViewDetailsPreferences.class.getName());
             startActivity(intent);
         } else {
                 return mExtensions.handleItemSelected(item, this);
@@ -974,13 +975,13 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
                     mController.sendEvent(this, EventType.GO_TO, null, null, -1, ViewType.AGENDA);
                 }
                 break;
-            case R.id.action_select_visible_calendars:
-                mController.sendEvent(this, EventType.LAUNCH_SELECT_VISIBLE_CALENDARS, null, null,
-                        0, 0);
-                break;
             case R.id.action_settings:
                 mController.sendEvent(this, EventType.LAUNCH_SETTINGS, null, null, 0, 0);
                 break;
+            case R.id.action_about:
+                Intent intent = new Intent(this, AboutActivity.class);
+                startActivity(intent);
+                break;
         }
         mDrawerLayout.closeDrawers();
         return false;
@@ -1416,39 +1417,6 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
         return true;
     }
 
-    //@Override
-    public boolean onNavigationItemSelected(int itemPosition, long itemId) {
-        switch (itemPosition) {
-            case CalendarViewAdapter.DAY_BUTTON_INDEX:
-                if (mCurrentView != ViewType.DAY) {
-                    mController.sendEvent(this, EventType.GO_TO, null, null, -1, ViewType.DAY);
-                }
-                break;
-            case CalendarViewAdapter.WEEK_BUTTON_INDEX:
-                if (mCurrentView != ViewType.WEEK) {
-                    mController.sendEvent(this, EventType.GO_TO, null, null, -1, ViewType.WEEK);
-                }
-                break;
-            case CalendarViewAdapter.MONTH_BUTTON_INDEX:
-                if (mCurrentView != ViewType.MONTH) {
-                    mController.sendEvent(this, EventType.GO_TO, null, null, -1, ViewType.MONTH);
-                }
-                break;
-            case CalendarViewAdapter.AGENDA_BUTTON_INDEX:
-                if (mCurrentView != ViewType.AGENDA) {
-                    mController.sendEvent(this, EventType.GO_TO, null, null, -1, ViewType.AGENDA);
-                }
-                break;
-            default:
-                Log.w(TAG, "ItemSelected event from unknown button: " + itemPosition);
-                /*Log.w(TAG, "CurrentView:" + mCurrentView + " Button:" + itemPosition +
-                        " Day:" + mDayTab + " Week:" + mWeekTab + " Month:" + mMonthTab +
-                        " Agenda:" + mAgendaTab);*/
-                break;
-        }
-        return false;
-    }
-
     @Override
     public boolean onSuggestionSelect(int position) {
         return false;
diff --git a/src/com/android/calendar/AsyncQueryService.java b/src/com/android/calendar/AsyncQueryService.java
index fd2d187f7a8e0d3bcac31a32fe02ec877af0cde7..9b8e3e0bb87c9fa6ce8804d6108cfa346fa15b68 100644
--- a/src/com/android/calendar/AsyncQueryService.java
+++ b/src/com/android/calendar/AsyncQueryService.java
@@ -27,6 +27,8 @@ import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import com.android.calendar.AsyncQueryServiceHelper.OperationInfo;
 
 import java.util.ArrayList;
@@ -109,8 +111,8 @@ public class AsyncQueryService extends Handler {
      *            (excluding the ORDER BY itself). Passing null will use the
      *            default sort order, which may be unordered.
      */
-    public void startQuery(int token, Object cookie, Uri uri, String[] projection,
-            String selection, String[] selectionArgs, String orderBy) {
+    public void startQuery(int token, @Nullable Object cookie, Uri uri, String[] projection,
+                           String selection, String[] selectionArgs, String orderBy) {
         OperationInfo info = new OperationInfo();
         info.op = Operation.EVENT_ARG_QUERY;
         info.resolver = mContext.getContentResolver();
@@ -141,7 +143,7 @@ public class AsyncQueryService extends Handler {
      *            execute before the delayed time when another operation is
      *            added. Useful for implementing single level undo.
      */
-    public void startInsert(int token, Object cookie, Uri uri, ContentValues initialValues,
+    public void startInsert(int token, @Nullable Object cookie, Uri uri, ContentValues initialValues,
             long delayMillis) {
         OperationInfo info = new OperationInfo();
         info.op = Operation.EVENT_ARG_INSERT;
@@ -177,7 +179,7 @@ public class AsyncQueryService extends Handler {
      *            execute before the delayed time when another operation is
      *            added. Useful for implementing single level undo.
      */
-    public void startUpdate(int token, Object cookie, Uri uri, ContentValues values,
+    public void startUpdate(int token, @Nullable Object cookie, Uri uri, ContentValues values,
             String selection, String[] selectionArgs, long delayMillis) {
         OperationInfo info = new OperationInfo();
         info.op = Operation.EVENT_ARG_UPDATE;
@@ -214,7 +216,7 @@ public class AsyncQueryService extends Handler {
      *            execute before the delayed time when another operation is
      *            added. Useful for implementing single level undo.
      */
-    public void startDelete(int token, Object cookie, Uri uri, String selection,
+    public void startDelete(int token, @Nullable Object cookie, Uri uri, String selection,
             String[] selectionArgs, long delayMillis) {
         OperationInfo info = new OperationInfo();
         info.op = Operation.EVENT_ARG_DELETE;
@@ -245,7 +247,7 @@ public class AsyncQueryService extends Handler {
      *            execute before the delayed time when another operation is
      *            added. Useful for implementing single level undo.
      */
-    public void startBatch(int token, Object cookie, String authority,
+    public void startBatch(int token, @Nullable Object cookie, String authority,
             ArrayList<ContentProviderOperation> cpo, long delayMillis) {
         OperationInfo info = new OperationInfo();
         info.op = Operation.EVENT_ARG_BATCH;
@@ -269,7 +271,7 @@ public class AsyncQueryService extends Handler {
      * @param cookie the cookie object passed in from {@link #startQuery}.
      * @param cursor The cursor holding the results from the query.
      */
-    protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
+    protected void onQueryComplete(int token, @Nullable Object cookie, Cursor cursor) {
         if (localLOGV) {
             Log.d(TAG, "########## default onQueryComplete");
         }
@@ -284,7 +286,7 @@ public class AsyncQueryService extends Handler {
      *            {@link #startInsert}.
      * @param uri the uri returned from the insert operation.
      */
-    protected void onInsertComplete(int token, Object cookie, Uri uri) {
+    protected void onInsertComplete(int token, @Nullable Object cookie, Uri uri) {
         if (localLOGV) {
             Log.d(TAG, "########## default onInsertComplete");
         }
@@ -299,7 +301,7 @@ public class AsyncQueryService extends Handler {
      *            {@link #startUpdate}.
      * @param result the result returned from the update operation
      */
-    protected void onUpdateComplete(int token, Object cookie, int result) {
+    protected void onUpdateComplete(int token, @Nullable Object cookie, int result) {
         if (localLOGV) {
             Log.d(TAG, "########## default onUpdateComplete");
         }
@@ -314,7 +316,7 @@ public class AsyncQueryService extends Handler {
      *            {@link #startDelete}.
      * @param result the result returned from the delete operation
      */
-    protected void onDeleteComplete(int token, Object cookie, int result) {
+    protected void onDeleteComplete(int token, @Nullable Object cookie, int result) {
         if (localLOGV) {
             Log.d(TAG, "########## default onDeleteComplete");
         }
@@ -331,7 +333,7 @@ public class AsyncQueryService extends Handler {
      * @param results the result returned from executing the
      *            {@link ContentProviderOperation}
      */
-    protected void onBatchComplete(int token, Object cookie, ContentProviderResult[] results) {
+    protected void onBatchComplete(int token, @Nullable Object cookie, ContentProviderResult[] results) {
         if (localLOGV) {
             Log.d(TAG, "########## default onBatchComplete");
         }
diff --git a/src/com/android/calendar/AsyncQueryServiceHelper.java b/src/com/android/calendar/AsyncQueryServiceHelper.java
index 449d329ce2dfcc225020c52a5fa3d8c13ae7b980..5ec180a801b9abd425d9beed49c3d22bdc589595 100644
--- a/src/com/android/calendar/AsyncQueryServiceHelper.java
+++ b/src/com/android/calendar/AsyncQueryServiceHelper.java
@@ -31,6 +31,8 @@ import android.os.RemoteException;
 import android.os.SystemClock;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import com.android.calendar.AsyncQueryService.Operation;
 
 import java.util.ArrayList;
@@ -286,7 +288,7 @@ public class AsyncQueryServiceHelper extends IntentService {
         public String[] selectionArgs;
         public String orderBy;
         public Object result;
-        public Object cookie;
+        @Nullable public Object cookie;
         public ContentValues values;
         public ArrayList<ContentProviderOperation> cpo;
 
diff --git a/src/com/android/calendar/CalendarApplication.java b/src/com/android/calendar/CalendarApplication.java
index 57c4c9bcdc290aebc338841ba4fd3441a0af20fd..1260c11a3c11de63af81f785b21b4be8ae8679a8 100644
--- a/src/com/android/calendar/CalendarApplication.java
+++ b/src/com/android/calendar/CalendarApplication.java
@@ -19,6 +19,9 @@ package com.android.calendar;
 import android.app.Application;
 import android.content.SharedPreferences;
 
+import com.android.calendar.settings.GeneralPreferences;
+import com.android.calendar.settings.ViewDetailsPreferences;
+
 public class CalendarApplication extends Application {
     @Override
     public void onCreate() {
@@ -32,10 +35,10 @@ public class CalendarApplication extends Application {
          */
         final int SHARED_PREFS_VERSION = 1;
         final String VERSION_KEY = "spv";
-        SharedPreferences preferences = GeneralPreferences.getSharedPreferences(this);
+        SharedPreferences preferences = GeneralPreferences.Companion.getSharedPreferences(this);
         if (preferences.getInt(VERSION_KEY, 0) != SHARED_PREFS_VERSION) {
-            GeneralPreferences.setDefaultValues(this);
-            ViewDetailsPreferences.setDefaultValues(this);
+            GeneralPreferences.Companion.setDefaultValues(this);
+            ViewDetailsPreferences.Companion.setDefaultValues(this);
             preferences.edit().putInt(VERSION_KEY, SHARED_PREFS_VERSION).apply();
         }
 
diff --git a/src/com/android/calendar/CalendarBackupAgent.java b/src/com/android/calendar/CalendarBackupAgent.java
index 0e9f9d72c8447a3332aa8874845fae3e83db9f4c..c27b79628986c8c0ad9ee6a9904efd8ee07e8090 100644
--- a/src/com/android/calendar/CalendarBackupAgent.java
+++ b/src/com/android/calendar/CalendarBackupAgent.java
@@ -23,6 +23,8 @@ import android.content.Context;
 import android.content.SharedPreferences.Editor;
 import android.os.ParcelFileDescriptor;
 
+import com.android.calendar.settings.GeneralPreferences;
+
 import java.io.IOException;
 
 public class CalendarBackupAgent extends BackupAgentHelper
@@ -38,7 +40,7 @@ public class CalendarBackupAgent extends BackupAgentHelper
     @Override
     public void onRestore(BackupDataInput data, int appVersionCode, ParcelFileDescriptor newState)
             throws IOException {
-        // See Utils.getRingTonePreference for more info
+        // See Utils.getRingtonePreference for more info
         final Editor editor = getSharedPreferences(
                 GeneralPreferences.SHARED_PREFS_NAME_NO_BACKUP, Context.MODE_PRIVATE).edit();
         editor.putString(GeneralPreferences.KEY_ALERTS_RINGTONE,
diff --git a/src/com/android/calendar/CalendarController.java b/src/com/android/calendar/CalendarController.java
index 93786f8bf93a4c569ba40ffe2d1667b15e7bd751..68422ee252c4ccc01e02e5bbc146550c8fe80059 100644
--- a/src/com/android/calendar/CalendarController.java
+++ b/src/com/android/calendar/CalendarController.java
@@ -36,7 +36,8 @@ import android.util.Log;
 import android.util.Pair;
 
 import com.android.calendar.event.EditEventActivity;
-import com.android.calendar.selectcalendars.SelectVisibleCalendarsActivity;
+import com.android.calendar.settings.GeneralPreferences;
+import com.android.calendar.settings.SettingsActivity;
 
 import java.lang.ref.WeakReference;
 import java.util.Iterator;
@@ -414,12 +415,6 @@ public class CalendarController {
                 return;
             }
 
-            // Launch Calendar Visible Selector
-            if (event.eventType == EventType.LAUNCH_SELECT_VISIBLE_CALENDARS) {
-                launchSelectVisibleCalendars();
-                return;
-            }
-
             // Create/View/Edit/Delete Event
             long endTime = (event.endTime == null) ? -1 : event.endTime.toMillis(false);
             if (event.eventType == EventType.CREATE_EVENT) {
@@ -555,16 +550,9 @@ public class CalendarController {
         return mPreviousViewType;
     }
 
-    private void launchSelectVisibleCalendars() {
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setClass(mContext, SelectVisibleCalendarsActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        mContext.startActivity(intent);
-    }
-
     private void launchSettings() {
         Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setClass(mContext, CalendarSettingsActivity.class);
+        intent.setClass(mContext, SettingsActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
         mContext.startActivity(intent);
     }
@@ -675,8 +663,6 @@ public class CalendarController {
             tmp = "Edit event";
         } else if ((eventInfo.eventType & EventType.DELETE_EVENT) != 0) {
             tmp = "Delete event";
-        } else if ((eventInfo.eventType & EventType.LAUNCH_SELECT_VISIBLE_CALENDARS) != 0) {
-            tmp = "Launch select visible calendars";
         } else if ((eventInfo.eventType & EventType.LAUNCH_SETTINGS) != 0) {
             tmp = "Launch settings";
         } else if ((eventInfo.eventType & EventType.EVENTS_CHANGED) != 0) {
@@ -736,9 +722,6 @@ public class CalendarController {
 
         // date range has changed, update the title
         final long UPDATE_TITLE = 1L << 10;
-
-        // select which calendars to display
-        final long LAUNCH_SELECT_VISIBLE_CALENDARS = 1L << 11;
     }
 
     /**
diff --git a/src/com/android/calendar/CalendarEventModel.java b/src/com/android/calendar/CalendarEventModel.java
index 88321a1f218508369fc4d2200bca86c07305899e..18c3ed188f35de304f59b334bbbdcdbfadeed33c 100644
--- a/src/com/android/calendar/CalendarEventModel.java
+++ b/src/com/android/calendar/CalendarEventModel.java
@@ -28,6 +28,7 @@ import android.text.util.Rfc822Token;
 
 import com.android.calendar.event.EditEventHelper;
 import com.android.calendar.event.EventColorCache;
+import com.android.calendar.settings.GeneralPreferences;
 import com.android.common.Rfc822Validator;
 
 import java.io.Serializable;
@@ -60,7 +61,7 @@ public class CalendarEventModel implements Serializable {
     public String mCalendarAllowedAttendeeTypes;
     public String mCalendarAllowedAvailability;
     public String mSyncId = null;
-    public String mSyncAccount = null;
+    public String mSyncAccountName = null;
     public String mSyncAccountType = null;
     public EventColorCache mEventColorCache;
     // PROVIDER_NOTES owner account comes from the calendars table
@@ -129,7 +130,7 @@ public class CalendarEventModel implements Serializable {
         this();
 
         mTimezone = Utils.getTimeZone(context, null);
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
 
         String defaultReminder = prefs.getString(
                 GeneralPreferences.KEY_DEFAULT_REMINDER, GeneralPreferences.NO_REMINDER_STRING);
@@ -231,7 +232,7 @@ public class CalendarEventModel implements Serializable {
         mEventColorInitialized = false;
 
         mSyncId = null;
-        mSyncAccount = null;
+        mSyncAccountName = null;
         mSyncAccountType = null;
         mOwnerAccount = null;
 
@@ -348,7 +349,7 @@ public class CalendarEventModel implements Serializable {
         result = prime * result + mSelfAttendeeStatus;
         result = prime * result + mOwnerAttendeeId;
         result = prime * result + (int) (mStart ^ (mStart >>> 32));
-        result = prime * result + ((mSyncAccount == null) ? 0 : mSyncAccount.hashCode());
+        result = prime * result + ((mSyncAccountName == null) ? 0 : mSyncAccountName.hashCode());
         result = prime * result + ((mSyncAccountType == null) ? 0 : mSyncAccountType.hashCode());
         result = prime * result + ((mSyncId == null) ? 0 : mSyncId.hashCode());
         result = prime * result + ((mTimezone == null) ? 0 : mTimezone.hashCode());
@@ -638,11 +639,11 @@ public class CalendarEventModel implements Serializable {
         if (mOwnerAttendeeId != originalModel.mOwnerAttendeeId) {
             return false;
         }
-        if (mSyncAccount == null) {
-            if (originalModel.mSyncAccount != null) {
+        if (mSyncAccountName == null) {
+            if (originalModel.mSyncAccountName != null) {
                 return false;
             }
-        } else if (!mSyncAccount.equals(originalModel.mSyncAccount)) {
+        } else if (!mSyncAccountName.equals(originalModel.mSyncAccountName)) {
             return false;
         }
 
diff --git a/src/com/android/calendar/CalendarSettingsActivity.java b/src/com/android/calendar/CalendarSettingsActivity.java
deleted file mode 100644
index d65073233ef9115dde7d63bdd5f87f36dfaf5c44..0000000000000000000000000000000000000000
--- a/src/com/android/calendar/CalendarSettingsActivity.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.ActionBar;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceActivity;
-import android.provider.CalendarContract;
-import android.provider.CalendarContract.Calendars;
-import android.provider.Settings;
-import androidx.appcompat.widget.AppCompatCheckBox;
-import androidx.appcompat.widget.AppCompatCheckedTextView;
-import androidx.appcompat.widget.AppCompatEditText;
-import androidx.appcompat.widget.AppCompatRadioButton;
-import androidx.appcompat.widget.AppCompatSpinner;
-import androidx.appcompat.widget.Toolbar;
-import android.text.format.DateUtils;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import com.android.calendar.selectcalendars.SelectCalendarsSyncFragment;
-
-import java.util.List;
-
-import foundation.e.calendar.R;
-
-public class CalendarSettingsActivity extends PreferenceActivity {
-    private static final int CHECK_ACCOUNTS_DELAY = 3000;
-    private Account[] mAccounts;
-    Runnable mCheckAccounts = new Runnable() {
-        @Override
-        public void run() {
-            Account[] accounts = AccountManager.get(CalendarSettingsActivity.this).getAccounts();
-            if (accounts != null && !accounts.equals(mAccounts)) {
-                invalidateHeaders();
-            }
-        }
-    };
-    private Handler mHandler = new Handler();
-    private boolean mHideMenuButtons = false;
-    private final DynamicTheme dynamicTheme = new DynamicTheme();
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        dynamicTheme.onCreate(this);
-        super.onCreate(savedInstanceState);
-
-        LinearLayout root = (LinearLayout) findViewById(android.R.id.list).getParent().getParent().getParent();
-        Toolbar bar = (Toolbar) LayoutInflater.from(this).inflate(R.layout.app_bar, root, false);
-        root.addView(bar, 0); // insert at top
-        bar.setNavigationIcon(R.drawable.ic_arrow_back);
-        bar.setTitle(getTitle());
-        bar.setNavigationOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-    }
-
-    @Override
-    public View onCreateView(String name, Context context, AttributeSet attrs) {
-        // Allow super to try and create a view first
-        final View result = super.onCreateView(name, context, attrs);
-        if (result != null) {
-            return result;
-        }
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            // If we're running pre-L, we need to 'inject' our tint aware Views in place of the
-            // standard framework versions
-            switch (name) {
-                case "EditText":
-                    return new AppCompatEditText(this, attrs);
-                case "Spinner":
-                    return new AppCompatSpinner(this, attrs);
-                case "CheckBox":
-                    return new AppCompatCheckBox(this, attrs);
-                case "RadioButton":
-                    return new AppCompatRadioButton(this, attrs);
-                case "CheckedTextView":
-                    return new AppCompatCheckedTextView(this, attrs);
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public void onBuildHeaders(List<Header> target) {
-        loadHeadersFromResource(R.xml.calendar_settings_headers, target);
-
-        Account[] accounts = AccountManager.get(this).getAccounts();
-        if (accounts != null) {
-            int length = accounts.length;
-            for (int i = 0; i < length; i++) {
-                Account acct = accounts[i];
-                if (ContentResolver.getIsSyncable(acct, CalendarContract.AUTHORITY) > 0) {
-                    Header accountHeader = new Header();
-                    accountHeader.title = acct.name;
-                    accountHeader.fragment =
-                            "com.android.calendar.selectcalendars.SelectCalendarsSyncFragment";
-                    Bundle args = new Bundle();
-                    args.putString(Calendars.ACCOUNT_NAME, acct.name);
-                    args.putString(Calendars.ACCOUNT_TYPE, acct.type);
-                    accountHeader.fragmentArguments = args;
-                    target.add(1, accountHeader);
-                }
-            }
-        }
-        mAccounts = accounts;
-        if (Utils.getTardis() + DateUtils.MINUTE_IN_MILLIS > System.currentTimeMillis()) {
-            Header tardisHeader = new Header();
-            tardisHeader.title = getString(R.string.preferences_experimental_category);
-            tardisHeader.fragment = "com.android.calendar.OtherPreferences";
-            target.add(tardisHeader);
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        } else if (item.getItemId() == R.id.action_add_account) {
-            Intent nextIntent = new Intent(Settings.ACTION_ADD_ACCOUNT);
-            final String[] array = { "com.android.calendar" };
-            nextIntent.putExtra(Settings.EXTRA_AUTHORITIES, array);
-            nextIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            startActivity(nextIntent);
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        if (!mHideMenuButtons) {
-            getMenuInflater().inflate(R.menu.settings_title_bar, menu);
-        }
-        if (getActionBar() != null){
-            getActionBar().setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
-        }
-        return true;
-    }
-
-    @Override
-    public void onResume() {
-        if (mHandler != null) {
-            mHandler.postDelayed(mCheckAccounts, CHECK_ACCOUNTS_DELAY);
-        }
-        super.onResume();
-        dynamicTheme.onResume(this);
-    }
-
-    @Override
-    public void onPause() {
-        if (mHandler != null) {
-            mHandler.removeCallbacks(mCheckAccounts);
-        }
-        super.onPause();
-    }
-
-    protected boolean isValidFragment(String fragmentName) {
-        return GeneralPreferences.class.getName().equals(fragmentName)
-                || SelectCalendarsSyncFragment.class.getName().equals(fragmentName)
-                || OtherPreferences.class.getName().equals(fragmentName)
-                || AboutPreferences.class.getName().equals(fragmentName)
-                || QuickResponseSettings.class.getName().equals(fragmentName)
-                || ViewDetailsPreferences.class.getName().equals(fragmentName);
-    }
-
-    public void hideMenuButtons() {
-        mHideMenuButtons = true;
-    }
-
-    public void restartActivity() {
-        recreate();
-    }
-}
diff --git a/src/com/android/calendar/CalendarUtils.java b/src/com/android/calendar/CalendarUtils.java
index 35e65d94930de0c74ba1c5c5ac5c0ecab304f26e..344f21250b4d5749822f0a64393ab30cd88ec6bb 100644
--- a/src/com/android/calendar/CalendarUtils.java
+++ b/src/com/android/calendar/CalendarUtils.java
@@ -16,18 +16,23 @@
 
 package com.android.calendar;
 
+import android.Manifest;
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
+import android.os.Build;
 import android.provider.CalendarContract.CalendarCache;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Time;
 import android.util.Log;
 
+import androidx.core.content.ContextCompat;
+
 import java.util.Formatter;
 import java.util.HashSet;
 import java.util.Locale;
@@ -256,8 +261,11 @@ public class CalendarUtils {
                     if (mHandler == null) {
                         mHandler = new AsyncTZHandler(context.getContentResolver());
                     }
-                    mHandler.startQuery(0, context, CalendarCache.URI, CALENDAR_CACHE_POJECTION,
-                            null, null, null);
+                    if (Build.VERSION.SDK_INT < 23 || ContextCompat.checkSelfPermission(context,
+                                Manifest.permission.READ_CALENDAR) == PackageManager.PERMISSION_GRANTED) {
+                        mHandler.startQuery(0, context, CalendarCache.URI, CALENDAR_CACHE_POJECTION,
+                                null, null, null);
+                    }
                 }
                 if (mTZQueryInProgress) {
                     mTZCallbacks.add(callback);
diff --git a/src/com/android/calendar/DayView.java b/src/com/android/calendar/DayView.java
index 598c55a94d4a3df03bd6be719857a497a9ad9dbb..ff2dc32a67122de855fc37694c5ffdbaa4f10b02 100644
--- a/src/com/android/calendar/DayView.java
+++ b/src/com/android/calendar/DayView.java
@@ -83,6 +83,7 @@ import android.widget.ViewSwitcher;
 
 import com.android.calendar.CalendarController.EventType;
 import com.android.calendar.CalendarController.ViewType;
+import com.android.calendar.settings.GeneralPreferences;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -808,21 +809,20 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
         mCurrentTime.set(currentTime);
         mTodayJulianDay = Time.getJulianDay(currentTime, mCurrentTime.gmtoff);
 
-        DynamicTheme dynTheme = new DynamicTheme();
-        mWeek_todayColor = dynTheme.getColor(mContext, "week_today");
-        mWeek_saturdayColor = dynTheme.getColor(mContext, "week_saturday");
-        mWeek_sundayColor = dynTheme.getColor(mContext, "week_sunday");
-        mCalendarDateBannerTextColor = dynTheme.getColor(mContext, "calendar_date_banner_text_color");
-        mFutureBgColorRes = dynTheme.getColor(mContext, "calendar_future_bg_color");
-        mBgColor = dynTheme.getColor(mContext, "calendar_hour_background");
-        mCalendarHourLabelColor = dynTheme.getColor(mContext, "calendar_hour_label");
-        mCalendarGridAreaSelected = dynTheme.getColor(mContext, "calendar_grid_area_selected");
-        mCalendarGridLineInnerHorizontalColor = dynTheme.getColor(mContext, "calendar_grid_line_inner_horizontal_color");
-        mCalendarGridLineInnerVerticalColor = dynTheme.getColor(mContext, "calendar_grid_line_inner_vertical_color");
-        mPressedColor = dynTheme.getColor(mContext, "pressed");
-        mClickedColor = dynTheme.getColor(mContext, "day_event_clicked_background_color");
-        mEventTextColor = dynTheme.getColor(mContext, "calendar_event_text_color");
-        mMoreEventsTextColor = dynTheme.getColor(mContext, "month_event_other_color");
+        mWeek_todayColor = DynamicTheme.getColor(mContext, "week_today");
+        mWeek_saturdayColor = DynamicTheme.getColor(mContext, "week_saturday");
+        mWeek_sundayColor = DynamicTheme.getColor(mContext, "week_sunday");
+        mCalendarDateBannerTextColor = DynamicTheme.getColor(mContext, "calendar_date_banner_text_color");
+        mFutureBgColorRes = DynamicTheme.getColor(mContext, "calendar_future_bg_color");
+        mBgColor = DynamicTheme.getColor(mContext, "calendar_hour_background");
+        mCalendarHourLabelColor = DynamicTheme.getColor(mContext, "calendar_hour_label");
+        mCalendarGridAreaSelected = DynamicTheme.getColor(mContext, "calendar_grid_area_selected");
+        mCalendarGridLineInnerHorizontalColor = DynamicTheme.getColor(mContext, "calendar_grid_line_inner_horizontal_color");
+        mCalendarGridLineInnerVerticalColor = DynamicTheme.getColor(mContext, "calendar_grid_line_inner_vertical_color");
+        mPressedColor = DynamicTheme.getColor(mContext, "pressed");
+        mClickedColor = DynamicTheme.getColor(mContext, "day_event_clicked_background_color");
+        mEventTextColor = DynamicTheme.getColor(mContext, "calendar_event_text_color");
+        mMoreEventsTextColor = DynamicTheme.getColor(mContext, "month_event_other_color");
 
         int gridLineColor = mResources.getColor(R.color.calendar_grid_line_highlight_color);
         Paint p = mSelectionPaint;
@@ -924,11 +924,7 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
 
     public void handleOnResume() {
         initAccessibilityVariables();
-        if(Utils.getSharedPreference(mContext, OtherPreferences.KEY_OTHER_1, false)) {
-            mFutureBgColor = 0;
-        } else {
-            mFutureBgColor = mFutureBgColorRes;
-        }
+        mFutureBgColor = mFutureBgColorRes;
         mIs24HourFormat = DateFormat.is24HourFormat(mContext);
         mHourStrs = mIs24HourFormat ? CalendarData.s24Hours : CalendarData.s12Hours;
         mFirstDayOfWeek = Utils.getFirstDayOfWeek(mContext);
diff --git a/src/com/android/calendar/DeleteEventHelper.java b/src/com/android/calendar/DeleteEventHelper.java
index 1d2bf37e80e73d78893528cd1de0543f8c9b8716..8042d36142f0d9a8f1b63d40c13553a898888764 100644
--- a/src/com/android/calendar/DeleteEventHelper.java
+++ b/src/com/android/calendar/DeleteEventHelper.java
@@ -34,6 +34,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 
 import com.android.calendar.event.EditEventHelper;
+import com.android.calendar.persistence.CalendarRepository;
 import com.android.calendarcommon2.EventRecurrence;
 
 import java.util.ArrayList;
@@ -99,7 +100,17 @@ public class DeleteEventHelper {
         public void onClick(DialogInterface dialog, int button) {
             deleteStarted();
             long id = mModel.mId; // mCursor.getInt(mEventIndexId);
-            Uri uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, id);
+
+            // If this event is part of a local calendar, really remove it from the database
+            //
+            // "There are two versions of delete: as an app and as a sync adapter.
+            // An app delete will set the deleted column on an event and remove all instances of that event.
+            // A sync adapter delete will remove the event from the database and all associated data."
+            // from https://developer.android.com/reference/android/provider/CalendarContract.Events
+            boolean isLocal = mModel.mSyncAccountType.equals(CalendarContract.ACCOUNT_TYPE_LOCAL);
+            Uri deleteContentUri = isLocal ? CalendarRepository.asLocalCalendarSyncAdapter(mModel.mSyncAccountName, Events.CONTENT_URI) : Events.CONTENT_URI;
+
+            Uri uri = ContentUris.withAppendedId(deleteContentUri, id);
             mService.startDelete(mService.getNextToken(), null, uri, null, null, Utils.UNDO_DELAY);
             if (mCallback != null) {
                 mCallback.run();
@@ -346,6 +357,10 @@ public class DeleteEventHelper {
         long dtstart = mModel.mStart;
         long id = mModel.mId; // mCursor.getInt(mEventIndexId);
 
+        // See mDeleteNormalDialogListener for more info on this
+        boolean isLocal = mModel.mSyncAccountType.equals(CalendarContract.ACCOUNT_TYPE_LOCAL);
+        Uri deleteContentUri = isLocal ? CalendarRepository.asLocalCalendarSyncAdapter(mModel.mSyncAccountName, Events.CONTENT_URI) : Events.CONTENT_URI;
+
         switch (which) {
             case DELETE_SELECTED: {
                 // If we are deleting the first event in the series, then
@@ -382,7 +397,7 @@ public class DeleteEventHelper {
                 break;
             }
             case DELETE_ALL: {
-                Uri uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, id);
+                Uri uri = ContentUris.withAppendedId(deleteContentUri, id);
                 mService.startDelete(mService.getNextToken(), null, uri, null, null,
                         Utils.UNDO_DELAY);
                 break;
@@ -391,7 +406,7 @@ public class DeleteEventHelper {
                 // If we are deleting the first event in the series and all
                 // following events, then delete them all.
                 if (dtstart == mStartMillis) {
-                    Uri uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, id);
+                    Uri uri = ContentUris.withAppendedId(deleteContentUri, id);
                     mService.startDelete(mService.getNextToken(), null, uri, null, null,
                             Utils.UNDO_DELAY);
                     break;
diff --git a/src/com/android/calendar/Event.java b/src/com/android/calendar/Event.java
index d7027ebc1599e7d12f53c801df7f1173f86f61ae..b9114c2671863288959cab8955ee4bfa2a3c044d 100644
--- a/src/com/android/calendar/Event.java
+++ b/src/com/android/calendar/Event.java
@@ -36,6 +36,8 @@ import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
 
+import com.android.calendar.settings.GeneralPreferences;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -202,7 +204,7 @@ public class Event implements Cloneable {
             // required for correctness, it just adds a nice touch.
 
             // Respect the preference to show/hide declined events
-            SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+            SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
             boolean hideDeclined = prefs.getBoolean(GeneralPreferences.KEY_HIDE_DECLINED,
                     false);
 
diff --git a/src/com/android/calendar/EventInfoFragment.java b/src/com/android/calendar/EventInfoFragment.java
index 7552145ab640e27fcbfdd5317f8f00a2720f94fe..f9da1c1a4f2690c543316848d157e0fd964beda7 100644
--- a/src/com/android/calendar/EventInfoFragment.java
+++ b/src/com/android/calendar/EventInfoFragment.java
@@ -106,6 +106,7 @@ import com.android.calendar.icalendar.IcalendarUtils;
 import com.android.calendar.icalendar.Organizer;
 import com.android.calendar.icalendar.VCalendar;
 import com.android.calendar.icalendar.VEvent;
+import com.android.calendar.settings.GeneralPreferences;
 import com.android.calendarcommon2.DateException;
 import com.android.calendarcommon2.Duration;
 import com.android.calendarcommon2.EventRecurrence;
@@ -881,7 +882,7 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange
 
         // Set reminders variables
 
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(mActivity);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(mActivity);
         String defaultReminderString = prefs.getString(
                 GeneralPreferences.KEY_DEFAULT_REMINDER, GeneralPreferences.NO_REMINDER_STRING);
         mDefaultReminderMinutes = Integer.parseInt(defaultReminderString);
diff --git a/src/com/android/calendar/GeneralPreferences.java b/src/com/android/calendar/GeneralPreferences.java
deleted file mode 100644
index 16bc7483d89556d115e08c1f61052c44e893abed..0000000000000000000000000000000000000000
--- a/src/com/android/calendar/GeneralPreferences.java
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar;
-
-import android.app.Activity;
-import android.app.FragmentManager;
-import android.app.backup.BackupManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Vibrator;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
-import android.preference.RingtonePreference;
-import android.provider.CalendarContract;
-import android.provider.CalendarContract.CalendarCache;
-import android.provider.SearchRecentSuggestions;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.text.format.Time;
-import android.util.SparseIntArray;
-import android.widget.Toast;
-
-import com.android.calendar.alerts.AlertReceiver;
-import com.android.calendar.event.EventViewUtils;
-import com.android.colorpicker.ColorPickerDialog;
-import com.android.colorpicker.ColorPickerSwatch;
-import com.android.timezonepicker.TimeZoneInfo;
-import com.android.timezonepicker.TimeZonePickerDialog;
-import com.android.timezonepicker.TimeZonePickerDialog.OnTimeZoneSetListener;
-import com.android.timezonepicker.TimeZonePickerUtils;
-
-import foundation.e.calendar.R;
-
-public class GeneralPreferences extends PreferenceFragment implements
-        OnSharedPreferenceChangeListener, OnPreferenceChangeListener, OnTimeZoneSetListener {
-    // Preference keys
-    public static final String KEY_THEME_PREF = "pref_theme";
-    public static final String KEY_COLOR_PREF = "pref_color";
-    public static final String KEY_DEFAULT_START = "preferences_default_start";
-    public static final String KEY_HIDE_DECLINED = "preferences_hide_declined";
-    public static final String KEY_WEEK_START_DAY = "preferences_week_start_day";
-    public static final String KEY_SHOW_WEEK_NUM = "preferences_show_week_num";
-    public static final String KEY_DAYS_PER_WEEK = "preferences_days_per_week";
-    public static final String KEY_MDAYS_PER_WEEK = "preferences_mdays_per_week";
-    public static final String KEY_SKIP_SETUP = "preferences_skip_setup";
-    public static final String KEY_CLEAR_SEARCH_HISTORY = "preferences_clear_search_history";
-    public static final String KEY_ALERTS_CATEGORY = "preferences_alerts_category";
-    public static final String KEY_ALERTS = "preferences_alerts";
-    public static final String KEY_NOTIFICATION = "preferences_notification";
-    public static final String KEY_ALERTS_VIBRATE = "preferences_alerts_vibrate";
-    public static final String KEY_ALERTS_RINGTONE = "preferences_alerts_ringtone";
-    public static final String KEY_ALERTS_POPUP = "preferences_alerts_popup";
-    public static final String KEY_SHOW_CONTROLS = "preferences_show_controls";
-    public static final String KEY_DEFAULT_REMINDER = "preferences_default_reminder";
-    public static final int NO_REMINDER = -1;
-    public static final String NO_REMINDER_STRING = "-1";
-    public static final int REMINDER_DEFAULT_TIME = 10; // in minutes
-    public static final String KEY_USE_CUSTOM_SNOOZE_DELAY = "preferences_custom_snooze_delay";
-    public static final String KEY_DEFAULT_SNOOZE_DELAY = "preferences_default_snooze_delay";
-    public static final int SNOOZE_DELAY_DEFAULT_TIME = 5; // in minutes
-    public static final String KEY_DEFAULT_CELL_HEIGHT = "preferences_default_cell_height";
-    public static final String KEY_VERSION = "preferences_version";
-    /** Key to SharePreference for default view (CalendarController.ViewType) */
-    public static final String KEY_START_VIEW = "preferred_startView";
-    /**
-     *  Key to SharePreference for default detail view (CalendarController.ViewType)
-     *  Typically used by widget
-     */
-    public static final String KEY_DETAILED_VIEW = "preferred_detailedView";
-    public static final String KEY_DEFAULT_CALENDAR = "preference_defaultCalendar";
-
-    /** Key to preference for default new event duration (if provider doesn't indicate one) */
-    public static final String KEY_DEFAULT_EVENT_DURATION = "preferences_default_event_duration";
-    public static final String EVENT_DURATION_DEFAULT="60";
-
-    // These must be in sync with the array preferences_week_start_day_values
-    public static final String WEEK_START_DEFAULT = "-1";
-    public static final String WEEK_START_SATURDAY = "7";
-    public static final String WEEK_START_SUNDAY = "1";
-    public static final String WEEK_START_MONDAY = "2";
-    // Default preference values
-    public static final String DEFAULT_DEFAULT_START = "-2";
-    public static final int DEFAULT_START_VIEW = CalendarController.ViewType.WEEK;
-    public static final int DEFAULT_DETAILED_VIEW = CalendarController.ViewType.DAY;
-    public static final boolean DEFAULT_SHOW_WEEK_NUM = false;
-    // This should match the XML file.
-    public static final String DEFAULT_RINGTONE = "content://settings/system/notification_sound";
-    // The name of the shared preferences file. This name must be maintained for historical
-    // reasons, as it's what PreferenceManager assigned the first time the file was created.
-    static final String SHARED_PREFS_NAME = "com.android.calendar_preferences";
-    static final String SHARED_PREFS_NAME_NO_BACKUP = "com.android.calendar_preferences_no_backup";
-    static final String KEY_HOME_TZ_ENABLED = "preferences_home_tz_enabled";
-    static final String KEY_HOME_TZ = "preferences_home_tz";
-    private static final String FRAG_TAG_TIME_ZONE_PICKER = "TimeZonePicker";
-
-    CheckBoxPreference mAlert;
-    Preference mNotification;
-    CheckBoxPreference mVibrate;
-    RingtonePreference mRingtone;
-    CheckBoxPreference mPopup;
-    CheckBoxPreference mUseHomeTZ;
-    CheckBoxPreference mHideDeclined;
-    Preference mHomeTZ;
-    TimeZonePickerUtils mTzPickerUtils;
-    ListPreference mTheme;
-    Preference mColor;
-    ListPreference mWeekStart;
-    ListPreference mDayWeek;
-    ListPreference mDefaultReminder;
-    ListPreference mDefaultEventDuration;
-    ListPreference mSnoozeDelay;
-    ListPreference mDefaultStart;
-
-    private String mTimeZoneId;
-
-    // Used to retrieve the color id from the color picker
-    private SparseIntArray colorMap = new SparseIntArray();
-
-    /** Return a properly configured SharedPreferences instance */
-    public static SharedPreferences getSharedPreferences(Context context) {
-        return context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE);
-    }
-
-    /** Set the default shared preferences in the proper context */
-    public static void setDefaultValues(Context context) {
-        if (Utils.isOreoOrLater()) {
-            PreferenceManager.setDefaultValues(context, SHARED_PREFS_NAME, Context.MODE_PRIVATE,
-                R.xml.general_preferences_oreo_and_up, true);
-        } else {
-            PreferenceManager.setDefaultValues(context, SHARED_PREFS_NAME, Context.MODE_PRIVATE,
-                    R.xml.general_preferences, true);
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        final Activity activity = getActivity();
-
-        initializeColorMap();
-
-        // Make sure to always use the same preferences file regardless of the package name
-        // we're running under
-        final PreferenceManager preferenceManager = getPreferenceManager();
-        final SharedPreferences sharedPreferences = getSharedPreferences(activity);
-        preferenceManager.setSharedPreferencesName(SHARED_PREFS_NAME);
-
-        // Load the preferences from an XML resource
-        if (Utils.isOreoOrLater()) {
-            addPreferencesFromResource(R.xml.general_preferences_oreo_and_up);
-        } else {
-            addPreferencesFromResource(R.xml.general_preferences);
-        }
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-
-        if (Utils.isOreoOrLater()) {
-            mNotification = preferenceScreen.findPreference(KEY_NOTIFICATION);
-        } else {
-            mAlert = (CheckBoxPreference) preferenceScreen.findPreference(KEY_ALERTS);
-            mVibrate = (CheckBoxPreference) preferenceScreen.findPreference(KEY_ALERTS_VIBRATE);
-            Vibrator vibrator = (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE);
-            if (vibrator == null || !vibrator.hasVibrator()) {
-                PreferenceCategory mAlertGroup = (PreferenceCategory) preferenceScreen
-                        .findPreference(KEY_ALERTS_CATEGORY);
-                mAlertGroup.removePreference(mVibrate);
-            }
-            mRingtone = (RingtonePreference) preferenceScreen.findPreference(KEY_ALERTS_RINGTONE);
-            String ringToneUri = Utils.getRingTonePreference(activity);
-
-            // Set the ringToneUri to the backup-able shared pref only so that
-            // the Ringtone dialog will open up with the correct value.
-            final Editor editor = preferenceScreen.getEditor();
-            editor.putString(GeneralPreferences.KEY_ALERTS_RINGTONE, ringToneUri).apply();
-
-            String ringtoneDisplayString = getRingtoneTitleFromUri(activity, ringToneUri);
-            mRingtone.setSummary(ringtoneDisplayString == null ? "" : ringtoneDisplayString);
-        }
-
-        mPopup = (CheckBoxPreference) preferenceScreen.findPreference(KEY_ALERTS_POPUP);
-        mUseHomeTZ = (CheckBoxPreference) preferenceScreen.findPreference(KEY_HOME_TZ_ENABLED);
-        mTheme = (ListPreference) preferenceScreen.findPreference(KEY_THEME_PREF);
-        mColor = preferenceScreen.findPreference(KEY_COLOR_PREF);
-        mDefaultStart = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_START);
-        mHideDeclined = (CheckBoxPreference) preferenceScreen.findPreference(KEY_HIDE_DECLINED);
-        mWeekStart = (ListPreference) preferenceScreen.findPreference(KEY_WEEK_START_DAY);
-        mDayWeek = (ListPreference) preferenceScreen.findPreference(KEY_DAYS_PER_WEEK);
-        mDefaultReminder = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_REMINDER);
-        mDefaultEventDuration = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_EVENT_DURATION);
-        mDefaultEventDuration.setSummary(mDefaultEventDuration.getEntry());
-        mHomeTZ = preferenceScreen.findPreference(KEY_HOME_TZ);
-        mSnoozeDelay = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_SNOOZE_DELAY);
-        buildSnoozeDelayEntries();
-        mTheme.setSummary(mTheme.getEntry());
-        mWeekStart.setSummary(mWeekStart.getEntry());
-        mDayWeek.setSummary(mDayWeek.getEntry());
-        mDefaultReminder.setSummary(mDefaultReminder.getEntry());
-        mSnoozeDelay.setSummary(mSnoozeDelay.getEntry());
-        mDefaultStart.setSummary(mDefaultStart.getEntry());
-
-        mColor.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                showColorPickerDialog();
-                return true;
-            }
-        });
-
-        // This triggers an asynchronous call to the provider to refresh the data in shared pref
-        mTimeZoneId = Utils.getTimeZone(activity, null);
-
-        SharedPreferences prefs = CalendarUtils.getSharedPreferences(activity,
-                Utils.SHARED_PREFS_NAME);
-
-        // Utils.getTimeZone will return the currentTimeZone instead of the one
-        // in the shared_pref if home time zone is disabled. So if home tz is
-        // off, we will explicitly read it.
-        if (!prefs.getBoolean(KEY_HOME_TZ_ENABLED, false)) {
-            mTimeZoneId = prefs.getString(KEY_HOME_TZ, Time.getCurrentTimezone());
-        }
-
-        mHomeTZ.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                showTimezoneDialog();
-                return true;
-            }
-        });
-
-        if (mTzPickerUtils == null) {
-            mTzPickerUtils = new TimeZonePickerUtils(getActivity());
-        }
-        CharSequence timezoneName = mTzPickerUtils.getGmtDisplayName(getActivity(), mTimeZoneId,
-                System.currentTimeMillis(), false);
-        mHomeTZ.setSummary(timezoneName != null ? timezoneName : mTimeZoneId);
-
-        TimeZonePickerDialog tzpd = (TimeZonePickerDialog) activity.getFragmentManager()
-                .findFragmentByTag(FRAG_TAG_TIME_ZONE_PICKER);
-        if (tzpd != null) {
-            tzpd.setOnTimeZoneSetListener(this);
-        }
-
-        migrateOldPreferences(sharedPreferences);
-
-    }
-
-    private void showColorPickerDialog() {
-        final ColorPickerDialog colorPickerDialog = new ColorPickerDialog();
-        // Retrieve current color to show it as selected
-        String selectedColorName = Utils.getSharedPreference(getActivity(), KEY_COLOR_PREF,"teal");
-        int selectedColor = getResources().getColor(DynamicTheme.getColorId(selectedColorName));
-
-        colorPickerDialog.initialize(R.string.preferences_color_pick,
-                new int[]{
-                    getResources().getColor(R.color.colorPrimary),
-                        getResources().getColor(R.color.colorBluePrimary),
-                        getResources().getColor(R.color.colorPurplePrimary),
-                        getResources().getColor(R.color.colorRedPrimary),
-                        getResources().getColor(R.color.colorOrangePrimary),
-                        getResources().getColor(R.color.colorGreenPrimary)
-                },selectedColor,3,2);
-
-        colorPickerDialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
-            @Override
-            public void onColorSelected(int colour) {
-                Utils.setSharedPreference(getActivity(), KEY_COLOR_PREF, DynamicTheme.getColorName(colorMap.get(colour)));
-            }
-        });
-
-        FragmentManager fm = this.getFragmentManager();
-        colorPickerDialog.show(fm, "colorpicker");
-    }
-
-    private void initializeColorMap () {
-        colorMap.put(getResources().getColor(R.color.colorPrimary),R.color.colorPrimary);
-        colorMap.put(getResources().getColor(R.color.colorBluePrimary),R.color.colorBluePrimary);
-        colorMap.put(getResources().getColor(R.color.colorOrangePrimary),R.color.colorOrangePrimary);
-        colorMap.put(getResources().getColor(R.color.colorGreenPrimary),R.color.colorGreenPrimary);
-        colorMap.put(getResources().getColor(R.color.colorRedPrimary),R.color.colorRedPrimary);
-        colorMap.put(getResources().getColor(R.color.colorPurplePrimary),R.color.colorPurplePrimary);
-    }
-
-    private void showTimezoneDialog() {
-        final Activity activity = getActivity();
-        if (activity == null) {
-            return;
-        }
-
-        Bundle b = new Bundle();
-        b.putLong(TimeZonePickerDialog.BUNDLE_START_TIME_MILLIS, System.currentTimeMillis());
-        b.putString(TimeZonePickerDialog.BUNDLE_TIME_ZONE, Utils.getTimeZone(activity, null));
-
-        FragmentManager fm = getActivity().getFragmentManager();
-        TimeZonePickerDialog tzpd = (TimeZonePickerDialog) fm
-                .findFragmentByTag(FRAG_TAG_TIME_ZONE_PICKER);
-        if (tzpd != null) {
-            tzpd.dismiss();
-        }
-        tzpd = new TimeZonePickerDialog();
-        tzpd.setArguments(b);
-        tzpd.setOnTimeZoneSetListener(this);
-        tzpd.show(fm, FRAG_TAG_TIME_ZONE_PICKER);
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        getPreferenceScreen().getSharedPreferences()
-                .registerOnSharedPreferenceChangeListener(this);
-        setPreferenceListeners(this);
-    }
-
-    /**
-     * Sets up all the preference change listeners to use the specified
-     * listener.
-     */
-    private void setPreferenceListeners(OnPreferenceChangeListener listener) {
-        mUseHomeTZ.setOnPreferenceChangeListener(listener);
-        mHomeTZ.setOnPreferenceChangeListener(listener);
-        mTheme.setOnPreferenceChangeListener(listener);
-        mColor.setOnPreferenceChangeListener(listener);
-        mDefaultStart.setOnPreferenceChangeListener(listener);
-        mWeekStart.setOnPreferenceChangeListener(listener);
-        mDayWeek.setOnPreferenceChangeListener(listener);
-        mDefaultReminder.setOnPreferenceChangeListener(listener);
-        mSnoozeDelay.setOnPreferenceChangeListener(listener);
-        mHideDeclined.setOnPreferenceChangeListener(listener);
-        mDefaultEventDuration.setOnPreferenceChangeListener(listener);
-        if (Utils.isOreoOrLater()) {
-            mNotification.setOnPreferenceChangeListener(listener);
-        } else {
-            mVibrate.setOnPreferenceChangeListener(listener);
-            mRingtone.setOnPreferenceChangeListener(listener);
-        }
-    }
-
-    @Override
-    public void onStop() {
-        getPreferenceScreen().getSharedPreferences()
-                .unregisterOnSharedPreferenceChangeListener(this);
-        super.onStop();
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        Activity a = getActivity();
-        if (key.equals(KEY_ALERTS)) {
-
-            if (a != null) {
-                Intent intent = new Intent();
-                intent.setClass(a, AlertReceiver.class);
-                if (mAlert.isChecked()) {
-                    intent.setAction(AlertReceiver.ACTION_DISMISS_OLD_REMINDERS);
-                } else {
-                    intent.setAction(AlertReceiver.EVENT_REMINDER_APP_ACTION);
-                }
-                a.sendBroadcast(intent);
-            }
-        }
-        if (a != null) {
-            BackupManager.dataChanged(a.getPackageName());
-        }
-
-        if (key.equals(KEY_THEME_PREF) || key.equals(KEY_COLOR_PREF)) {
-            ((CalendarSettingsActivity)getActivity()).restartActivity();
-        }
-    }
-
-    /**
-     * Handles time zone preference changes
-     */
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        String tz;
-        final Activity activity = getActivity();
-        if (preference == mUseHomeTZ) {
-            if ((Boolean)newValue) {
-                tz = mTimeZoneId;
-            } else {
-                tz = CalendarCache.TIMEZONE_TYPE_AUTO;
-            }
-            Utils.setTimeZone(activity, tz);
-            return true;
-        } else if (preference == mTheme) {
-            mTheme.setValue((String) newValue);
-            mTheme.setSummary(mTheme.getEntry());
-        } else if (preference == mHideDeclined) {
-            mHideDeclined.setChecked((Boolean) newValue);
-            Intent intent = new Intent(Utils.getWidgetScheduledUpdateAction(activity));
-            intent.setDataAndType(CalendarContract.CONTENT_URI, Utils.APPWIDGET_DATA_TYPE);
-            activity.sendBroadcast(intent);
-            return true;
-        } else if (preference == mWeekStart) {
-            mWeekStart.setValue((String) newValue);
-            mWeekStart.setSummary(mWeekStart.getEntry());
-        } else if (preference == mDayWeek) {
-            mDayWeek.setValue((String) newValue);
-            mDayWeek.setSummary(mDayWeek.getEntry());
-        } else if (preference == mDefaultEventDuration) {
-            mDefaultEventDuration.setValue((String) newValue);
-            mDefaultEventDuration.setSummary(mDefaultEventDuration.getEntry());
-        } else if (preference == mDefaultReminder) {
-            mDefaultReminder.setValue((String) newValue);
-            mDefaultReminder.setSummary(mDefaultReminder.getEntry());
-        } else if (preference == mSnoozeDelay) {
-            mSnoozeDelay.setValue((String) newValue);
-            mSnoozeDelay.setSummary(mSnoozeDelay.getEntry());
-        } else if (preference == mRingtone) {
-            if (newValue instanceof String) {
-                Utils.setRingTonePreference(activity, (String) newValue);
-                String ringtone = getRingtoneTitleFromUri(activity, (String) newValue);
-                mRingtone.setSummary(ringtone == null ? "" : ringtone);
-            }
-            return true;
-        } else if (preference == mVibrate) {
-            mVibrate.setChecked((Boolean) newValue);
-            return true;
-        } else if (preference == mDefaultStart) {
-            int i = mDefaultStart.findIndexOfValue((String) newValue);
-            mDefaultStart.setSummary(mDefaultStart.getEntries()[i]);
-            return true;
-        } else {
-            return true;
-        }
-        return false;
-    }
-
-    public String getRingtoneTitleFromUri(Context context, String uri) {
-        if (TextUtils.isEmpty(uri)) {
-            return null;
-        }
-
-        Ringtone ring = RingtoneManager.getRingtone(getActivity(), Uri.parse(uri));
-        if (ring != null) {
-            return ring.getTitle(context);
-        }
-        return null;
-    }
-
-    /**
-     * If necessary, upgrades previous versions of preferences to the current
-     * set of keys and values.
-     * @param prefs the preferences to upgrade
-     */
-    private void migrateOldPreferences(SharedPreferences prefs) {
-        // If needed, migrate vibration setting from a previous version
-        if (!Utils.isOreoOrLater()) {
-            mVibrate.setChecked(Utils.getDefaultVibrate(getActivity(), prefs));
-        }
-    }
-
-    private void buildSnoozeDelayEntries() {
-        final CharSequence[] values = mSnoozeDelay.getEntryValues();
-        final int count = values.length;
-        final CharSequence[] entries = new CharSequence[count];
-
-        for (int i = 0; i < count; i++) {
-            int value = Integer.parseInt(values[i].toString());
-            entries[i] = EventViewUtils.constructReminderLabel(getActivity(), value, false);
-        }
-
-        mSnoozeDelay.setEntries(entries);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(
-            PreferenceScreen preferenceScreen, Preference preference) {
-        final String key = preference.getKey();
-        if (KEY_CLEAR_SEARCH_HISTORY.equals(key)) {
-            SearchRecentSuggestions suggestions = new SearchRecentSuggestions(getActivity(),
-                    Utils.getSearchAuthority(getActivity()),
-                    CalendarRecentSuggestionsProvider.MODE);
-            suggestions.clearHistory();
-            Toast.makeText(getActivity(), R.string.search_history_cleared,
-                    Toast.LENGTH_SHORT).show();
-            return true;
-        } else if (KEY_NOTIFICATION.equals(key)) {
-                    Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
-                    intent.putExtra(Settings.EXTRA_CHANNEL_ID, "alert_channel_01");
-                    intent.putExtra(Settings.EXTRA_APP_PACKAGE, getActivity().getPackageName());
-                    startActivity(intent);
-            return true;
-        } else {
-            return super.onPreferenceTreeClick(preferenceScreen, preference);
-        }
-    }
-
-    @Override
-    public void onTimeZoneSet(TimeZoneInfo tzi) {
-        if (mTzPickerUtils == null) {
-            mTzPickerUtils = new TimeZonePickerUtils(getActivity());
-        }
-
-        final CharSequence timezoneName = mTzPickerUtils.getGmtDisplayName(
-                getActivity(), tzi.mTzId, System.currentTimeMillis(), false);
-        mHomeTZ.setSummary(timezoneName);
-        Utils.setTimeZone(getActivity(), tzi.mTzId);
-    }
-}
diff --git a/src/com/android/calendar/ImportActivity.java b/src/com/android/calendar/ImportActivity.java
index 399ef0b05ba68ec051388b22f6d9f08f8dff03d4..42cf1b984261d4b1224ffecc1e41e3b8cf71f5a2 100644
--- a/src/com/android/calendar/ImportActivity.java
+++ b/src/com/android/calendar/ImportActivity.java
@@ -56,8 +56,7 @@ public class ImportActivity extends Activity {
                 format.parse(iCalDate);
                 format.setTimeZone(TimeZone.getDefault());
                 return format.getCalendar().getTimeInMillis();
-            } catch (ParseException e) {
-            }
+            } catch (ParseException e) { }
         }
 
         // FORM #3: DATE WITH LOCAL TIME AND TIME ZONE REFERENCE, e.g. TZID=America/New_York:19980119T020000
@@ -69,20 +68,23 @@ public class ImportActivity extends Activity {
             // (which are quite a lot, see e.g. http://tutorials.jenkov.com/java-date-time/java-util-timezone.html)
             if (Arrays.asList(TimeZone.getAvailableIDs()).contains(timeZone)) {
                 format.setTimeZone(TimeZone.getTimeZone(timeZone));
-            } else {
+            }
+            else {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                     String convertedTimeZoneId = android.icu.util.TimeZone
                             .getIDForWindowsID(timeZone, "001");
                     if (convertedTimeZoneId != null && !convertedTimeZoneId.equals("")) {
                         format.setTimeZone(TimeZone.getTimeZone(convertedTimeZoneId));
-                    } else {
+                    }
+                    else {
                         format.setTimeZone(TimeZone.getDefault());
                         Toast.makeText(
                                 this,
                                 getString(R.string.cal_import_error_time_zone_msg, timeZone),
                                 Toast.LENGTH_SHORT).show();
                     }
-                } else {
+                }
+                else {
                     format.setTimeZone(TimeZone.getDefault());
                     Toast.makeText(
                             this,
@@ -93,8 +95,7 @@ public class ImportActivity extends Activity {
             try {
                 format.parse(iCalDate);
                 return format.getCalendar().getTimeInMillis();
-            } catch (ParseException e) {
-            }
+            } catch (ParseException e) {  }
         }
 
         // ONLY DATE, e.g. 20190415
@@ -192,7 +193,7 @@ public class ImportActivity extends Activity {
         //Check if some special property which say it is a "All-Day" event.
 
         String microsoft_all_day_event = firstEvent.getProperty("X-MICROSOFT-CDO-ALLDAYEVENT");
-        if (!TextUtils.isEmpty(microsoft_all_day_event) && microsoft_all_day_event.equals("TRUE")) {
+        if(!TextUtils.isEmpty(microsoft_all_day_event) && microsoft_all_day_event.equals("TRUE")){
             calIntent.putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, true);
         }
 
diff --git a/src/com/android/calendar/OtherPreferences.java b/src/com/android/calendar/OtherPreferences.java
deleted file mode 100644
index 55f4650bddfc0c9a5145e14b4e6eaf74c113e406..0000000000000000000000000000000000000000
--- a/src/com/android/calendar/OtherPreferences.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar;
-
-import android.app.Activity;
-import android.app.TimePickerDialog;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
-import android.text.format.DateFormat;
-import android.text.format.Time;
-import android.util.Log;
-import android.widget.TimePicker;
-
-import foundation.e.calendar.R;
-
-public class OtherPreferences extends PreferenceFragment implements OnPreferenceChangeListener {
-    // Must be the same keys that are used in the other_preferences.xml file.
-    public static final String KEY_OTHER_COPY_DB = "preferences_copy_db";
-    public static final String KEY_OTHER_QUIET_HOURS = "preferences_reminders_quiet_hours";
-    public static final String KEY_OTHER_REMINDERS_RESPONDED = "preferences_reminders_responded";
-    public static final String KEY_OTHER_QUIET_HOURS_START =
-            "preferences_reminders_quiet_hours_start";
-    public static final String KEY_OTHER_QUIET_HOURS_START_HOUR =
-            "preferences_reminders_quiet_hours_start_hour";
-    public static final String KEY_OTHER_QUIET_HOURS_START_MINUTE =
-            "preferences_reminders_quiet_hours_start_minute";
-    public static final String KEY_OTHER_QUIET_HOURS_END =
-            "preferences_reminders_quiet_hours_end";
-    public static final String KEY_OTHER_QUIET_HOURS_END_HOUR =
-            "preferences_reminders_quiet_hours_end_hour";
-    public static final String KEY_OTHER_QUIET_HOURS_END_MINUTE =
-            "preferences_reminders_quiet_hours_end_minute";
-    public static final String KEY_OTHER_1 = "preferences_tardis_1";
-    public static final int QUIET_HOURS_DEFAULT_START_HOUR = 22;
-    public static final int QUIET_HOURS_DEFAULT_START_MINUTE = 0;
-    public static final int QUIET_HOURS_DEFAULT_END_HOUR = 8;
-    public static final int QUIET_HOURS_DEFAULT_END_MINUTE = 0;
-    // The name of the shared preferences file. This name must be maintained for
-    // historical reasons, as it's what PreferenceManager assigned the first
-    // time the file was created.
-    static final String SHARED_PREFS_NAME = "com.android.calendar_preferences";
-    private static final String TAG = "CalendarOtherPreferences";
-    private static final int START_LISTENER = 1;
-    private static final int END_LISTENER = 2;
-    private static final String format24Hour = "%H:%M";
-    private static final String format12Hour = "%I:%M%P";
-
-    private Preference mCopyDb;
-    private ListPreference mSkipReminders;
-    private CheckBoxPreference mQuietHours;
-    private Preference mQuietHoursStart;
-    private Preference mQuietHoursEnd;
-
-    private TimePickerDialog mTimePickerDialog;
-    private TimeSetListener mQuietHoursStartListener;
-    private TimePickerDialog mQuietHoursStartDialog;
-    private TimeSetListener mQuietHoursEndListener;
-    private TimePickerDialog mQuietHoursEndDialog;
-    private boolean mIs24HourMode;
-
-    public OtherPreferences() {
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        PreferenceManager manager = getPreferenceManager();
-        manager.setSharedPreferencesName(SHARED_PREFS_NAME);
-        SharedPreferences prefs = manager.getSharedPreferences();
-
-        addPreferencesFromResource(R.xml.other_preferences);
-        mCopyDb = findPreference(KEY_OTHER_COPY_DB);
-        mSkipReminders = (ListPreference) findPreference(KEY_OTHER_REMINDERS_RESPONDED);
-        String skipPreferencesValue = null;
-        if (mSkipReminders != null) {
-            skipPreferencesValue = mSkipReminders.getValue();
-            mSkipReminders.setOnPreferenceChangeListener(this);
-        }
-        updateSkipRemindersSummary(skipPreferencesValue);
-
-        Activity activity = getActivity();
-        if (activity == null) {
-            Log.d(TAG, "Activity was null");
-        }
-        mIs24HourMode = DateFormat.is24HourFormat(activity);
-
-        mQuietHours =
-                (CheckBoxPreference) findPreference(KEY_OTHER_QUIET_HOURS);
-
-        int startHour = prefs.getInt(KEY_OTHER_QUIET_HOURS_START_HOUR,
-                QUIET_HOURS_DEFAULT_START_HOUR);
-        int startMinute = prefs.getInt(KEY_OTHER_QUIET_HOURS_START_MINUTE,
-                QUIET_HOURS_DEFAULT_START_MINUTE);
-        mQuietHoursStart = findPreference(KEY_OTHER_QUIET_HOURS_START);
-        mQuietHoursStartListener = new TimeSetListener(START_LISTENER);
-        mQuietHoursStartDialog = new TimePickerDialog(
-                activity, mQuietHoursStartListener,
-                startHour, startMinute, mIs24HourMode);
-        mQuietHoursStart.setSummary(formatTime(startHour, startMinute));
-
-        int endHour = prefs.getInt(KEY_OTHER_QUIET_HOURS_END_HOUR,
-                QUIET_HOURS_DEFAULT_END_HOUR);
-        int endMinute = prefs.getInt(KEY_OTHER_QUIET_HOURS_END_MINUTE,
-                QUIET_HOURS_DEFAULT_END_MINUTE);
-        mQuietHoursEnd = findPreference(KEY_OTHER_QUIET_HOURS_END);
-        mQuietHoursEndListener = new TimeSetListener(END_LISTENER);
-        mQuietHoursEndDialog = new TimePickerDialog(
-                activity, mQuietHoursEndListener,
-                endHour, endMinute, mIs24HourMode);
-        mQuietHoursEnd.setSummary(formatTime(endHour, endMinute));
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object objValue) {
-        final String key = preference.getKey();
-
-        if (KEY_OTHER_REMINDERS_RESPONDED.equals(key)) {
-            String value = String.valueOf(objValue);
-            updateSkipRemindersSummary(value);
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
-        if (preference == mCopyDb) {
-            Intent intent = new Intent(Intent.ACTION_MAIN);
-            intent.setComponent(new ComponentName("com.android.providers.calendar",
-                    "com.android.providers.calendar.CalendarDebugActivity"));
-            startActivity(intent);
-        } else if (preference == mQuietHoursStart) {
-            if (mTimePickerDialog == null) {
-                mTimePickerDialog = mQuietHoursStartDialog;
-                mTimePickerDialog.show();
-            } else {
-                Log.v(TAG, "not null");
-            }
-        } else if (preference == mQuietHoursEnd) {
-            if (mTimePickerDialog == null) {
-                mTimePickerDialog = mQuietHoursEndDialog;
-                mTimePickerDialog.show();
-            } else {
-                Log.v(TAG, "not null");
-            }
-        } else {
-            return super.onPreferenceTreeClick(screen, preference);
-        }
-        return true;
-    }
-
-    /**
-     * @param hourOfDay the hour of the day (0-24)
-     * @param minute
-     * @return human-readable string formatted based on 24-hour mode.
-     */
-    private String formatTime(int hourOfDay, int minute) {
-        Time time = new Time();
-        time.hour = hourOfDay;
-        time.minute = minute;
-
-        String format = mIs24HourMode? format24Hour : format12Hour;
-        return time.format(format);
-    }
-
-    /**
-     * Update the summary for the SkipReminders preference.
-     * @param value The corresponding value of which summary to set. If null, the default summary
-     * will be set, and the value will be set accordingly too.
-     */
-    private void updateSkipRemindersSummary(String value) {
-        if (mSkipReminders != null) {
-            // Default to "declined". Must match with R.array.preferences_skip_reminders_values.
-            int index = 0;
-
-            CharSequence[] values = mSkipReminders.getEntryValues();
-            CharSequence[] entries = mSkipReminders.getEntries();
-            for(int value_i = 0; value_i < values.length; value_i++) {
-                if (values[value_i].equals(value)) {
-                    index = value_i;
-                    break;
-                }
-            }
-            mSkipReminders.setSummary(entries[index].toString());
-            if (value == null) {
-                // Value was not known ahead of time, so the default value will be set.
-                mSkipReminders.setValue(values[index].toString());
-            }
-        }
-    }
-
-    private class TimeSetListener implements TimePickerDialog.OnTimeSetListener {
-        private int mListenerId;
-
-        public TimeSetListener(int listenerId) {
-            mListenerId = listenerId;
-        }
-
-        @Override
-        public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-            mTimePickerDialog = null;
-
-            SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
-            SharedPreferences.Editor editor = prefs.edit();
-
-            String summary = formatTime(hourOfDay, minute);
-            switch (mListenerId) {
-                case (START_LISTENER):
-                    mQuietHoursStart.setSummary(summary);
-                    editor.putInt(KEY_OTHER_QUIET_HOURS_START_HOUR, hourOfDay);
-                    editor.putInt(KEY_OTHER_QUIET_HOURS_START_MINUTE, minute);
-                    break;
-                case (END_LISTENER):
-                    mQuietHoursEnd.setSummary(summary);
-                    editor.putInt(KEY_OTHER_QUIET_HOURS_END_HOUR, hourOfDay);
-                    editor.putInt(KEY_OTHER_QUIET_HOURS_END_MINUTE, minute);
-                    break;
-                default:
-                    Log.d(TAG, "Set time for unknown listener: " + mListenerId);
-            }
-
-            editor.commit();
-        }
-    }
-}
diff --git a/src/com/android/calendar/QuickResponseSettings.java b/src/com/android/calendar/QuickResponseSettings.java
deleted file mode 100644
index c7efc52051ea018a4f171098a5869252a97fdbd9..0000000000000000000000000000000000000000
--- a/src/com/android/calendar/QuickResponseSettings.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceScreen;
-import android.util.Log;
-
-import java.util.Arrays;
-
-import foundation.e.calendar.R;
-
-/**
- * Fragment to facilitate editing of quick responses when emailing guests
- *
- */
-public class QuickResponseSettings extends PreferenceFragment implements OnPreferenceChangeListener {
-    private static final String TAG = "QuickResponseSettings";
-
-    EditTextPreference[] mEditTextPrefs;
-    String[] mResponses;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        PreferenceScreen ps = getPreferenceManager().createPreferenceScreen(getActivity());
-        ps.setTitle(R.string.quick_response_settings_title);
-
-        mResponses = Utils.getQuickResponses(getActivity());
-
-        if (mResponses != null) {
-            mEditTextPrefs = new EditTextPreference[mResponses.length];
-
-            Arrays.sort(mResponses);
-            int i = 0;
-            for (String response : mResponses) {
-                EditTextPreference et = new EditTextPreference(getActivity());
-                et.setDialogTitle(R.string.quick_response_settings_edit_title);
-                et.setTitle(response); // Display Text
-                et.setText(response); // Value to edit
-                et.setOnPreferenceChangeListener(this);
-                mEditTextPrefs[i++] = et;
-                ps.addPreference(et);
-            }
-        } else {
-            Log.wtf(TAG, "No responses found");
-        }
-        setPreferenceScreen(ps);
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        ((CalendarSettingsActivity) activity).hideMenuButtons();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        CalendarSettingsActivity activity = (CalendarSettingsActivity) getActivity();
-        if (!activity.isMultiPane()) {
-            activity.setTitle(R.string.quick_response_settings_title);
-        }
-    }
-
-    // Implements OnPreferenceChangeListener
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        for (int i = 0; i < mEditTextPrefs.length; i++) {
-            if (mEditTextPrefs[i].compareTo(preference) == 0) {
-                if (!mResponses[i].equals(newValue)) {
-                    mResponses[i] = (String) newValue;
-                    mEditTextPrefs[i].setTitle(mResponses[i]);
-                    mEditTextPrefs[i].setText(mResponses[i]);
-                    Utils.setSharedPreference(getActivity(), Utils.KEY_QUICK_RESPONSES, mResponses);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/com/android/calendar/SearchActivity.java b/src/com/android/calendar/SearchActivity.java
index e449978a9b928923c2b3ccf02b4b0341f54b4f2c..8033efd4f22719d8b805ee148f7d05e8f648841a 100644
--- a/src/com/android/calendar/SearchActivity.java
+++ b/src/com/android/calendar/SearchActivity.java
@@ -152,9 +152,6 @@ public class SearchActivity extends AppCompatActivity implements CalendarControl
             } else {
                 query = intent.getStringExtra(SearchManager.QUERY);
             }
-            if ("TARDIS".equalsIgnoreCase(query)) {
-                Utils.tardis();
-            }
             initFragments(millis, query);
         }
     }
diff --git a/src/com/android/calendar/Utils.java b/src/com/android/calendar/Utils.java
index 074ddf06ac0b0ca37a3c1ea4074c1499d8d7f684..597ba68d23c302bd306c279dfb771b4355e63c59 100644
--- a/src/com/android/calendar/Utils.java
+++ b/src/com/android/calendar/Utils.java
@@ -37,6 +37,8 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.CalendarContract.Calendars;
+
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -52,10 +54,12 @@ import android.util.Log;
 import com.android.calendar.CalendarController.ViewType;
 import com.android.calendar.CalendarEventModel.ReminderEntry;
 import com.android.calendar.CalendarUtils.TimeZoneUtils;
+import com.android.calendar.settings.GeneralPreferences;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Formatter;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -109,7 +113,7 @@ public class Utils {
     // historical
     // reasons, as it's what PreferenceManager assigned the first time the file
     // was created.
-    static final String SHARED_PREFS_NAME = "com.android.calendar_preferences";
+    public static final String SHARED_PREFS_NAME = "com.android.calendar_preferences";
     static final String MACHINE_GENERATED_ADDRESS = "calendar.google.com";
     private static final boolean DEBUG = false;
     private static final String TAG = "CalUtils";
@@ -184,7 +188,6 @@ public class Utils {
     static int CONFLICT_COLOR = 0xFF000000;
     static boolean mMinutesLoaded = false;
     private static boolean mAllowWeekForDetailView = false;
-    private static long mTardis = 0;
     private static String sVersion = null;
 
     /**
@@ -197,7 +200,7 @@ public class Utils {
     public static int getViewTypeFromIntentAndSharedPref(Activity activity) {
         Intent intent = activity.getIntent();
         Bundle extras = intent.getExtras();
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(activity);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(activity);
 
         if (TextUtils.equals(intent.getAction(), Intent.ACTION_EDIT)) {
             return ViewType.EDIT;
@@ -302,7 +305,7 @@ public class Utils {
     }
 
     public static String[] getSharedPreference(Context context, String key, String[] defaultValue) {
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         Set<String> ss = prefs.getStringSet(key, null);
         if (ss != null) {
             String strings[] = new String[ss.size()];
@@ -312,17 +315,17 @@ public class Utils {
     }
 
     public static String getSharedPreference(Context context, String key, String defaultValue) {
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         return prefs.getString(key, defaultValue);
     }
 
     public static int getSharedPreference(Context context, String key, int defaultValue) {
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         return prefs.getInt(key, defaultValue);
     }
 
     public static boolean getSharedPreference(Context context, String key, boolean defaultValue) {
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         return prefs.getBoolean(key, defaultValue);
     }
 
@@ -334,36 +337,26 @@ public class Utils {
      * @param value the value to set
      */
     public static void setSharedPreference(Context context, String key, String value) {
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         prefs.edit().putString(key, value).apply();
     }
 
     public static void setSharedPreference(Context context, String key, String[] values) {
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         LinkedHashSet<String> set = new LinkedHashSet<String>();
-        for (String value : values) {
-            set.add(value);
-        }
+        Collections.addAll(set, values);
         prefs.edit().putStringSet(key, set).apply();
     }
 
-    protected static void tardis() {
-        mTardis = System.currentTimeMillis();
-    }
-
-    protected static long getTardis() {
-        return mTardis;
-    }
-
     public static void setSharedPreference(Context context, String key, boolean value) {
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         SharedPreferences.Editor editor = prefs.edit();
         editor.putBoolean(key, value);
         editor.apply();
     }
 
     static void setSharedPreference(Context context, String key, int value) {
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         SharedPreferences.Editor editor = prefs.edit();
         editor.putInt(key, value);
         editor.apply();
@@ -384,7 +377,7 @@ public class Utils {
     // At backup manager "restore" time (which should happen before launcher
     // comes up for the first time), the value will be set/reset to default
     // ringtone.
-    public static String getRingTonePreference(Context context) {
+    public static String getRingtonePreference(Context context) {
         SharedPreferences prefs = context.getSharedPreferences(
                 GeneralPreferences.SHARED_PREFS_NAME_NO_BACKUP, Context.MODE_PRIVATE);
         String ringtone = prefs.getString(GeneralPreferences.KEY_ALERTS_RINGTONE, null);
@@ -398,13 +391,13 @@ public class Utils {
                     GeneralPreferences.DEFAULT_RINGTONE);
 
             // Write it to the new place
-            setRingTonePreference(context, ringtone);
+            setRingtonePreference(context, ringtone);
         }
 
         return ringtone;
     }
 
-    public static void setRingTonePreference(Context context, String value) {
+    public static void setRingtonePreference(Context context, String value) {
         SharedPreferences prefs = context.getSharedPreferences(
                 GeneralPreferences.SHARED_PREFS_NAME_NO_BACKUP, Context.MODE_PRIVATE);
         prefs.edit().putString(GeneralPreferences.KEY_ALERTS_RINGTONE, value).apply();
@@ -417,7 +410,7 @@ public class Utils {
      * @param viewId {@link CalendarController.ViewType}
      */
     static void setDefaultView(Context context, int viewId) {
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         SharedPreferences.Editor editor = prefs.edit();
 
         boolean validDetailView = false;
@@ -598,7 +591,7 @@ public class Utils {
      * @return the first day of week in android.text.format.Time
      */
     public static int getFirstDayOfWeek(Context context) {
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         String pref = prefs.getString(
                 GeneralPreferences.KEY_WEEK_START_DAY, GeneralPreferences.WEEK_START_DEFAULT);
 
@@ -624,7 +617,7 @@ public class Utils {
      * @return the default event length, in milliseconds
      */
     public static long getDefaultEventDurationInMillis(Context context) {
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         String pref = prefs.getString(GeneralPreferences.KEY_DEFAULT_EVENT_DURATION,
                 GeneralPreferences.EVENT_DURATION_DEFAULT);
         final int defaultDurationInMins = Integer.parseInt(pref);
@@ -669,7 +662,7 @@ public class Utils {
      * @return true when week number should be shown.
      */
     public static boolean getShowWeekNumber(Context context) {
-        final SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        final SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         return prefs.getBoolean(
                 GeneralPreferences.KEY_SHOW_WEEK_NUM, GeneralPreferences.DEFAULT_SHOW_WEEK_NUM);
     }
@@ -678,27 +671,27 @@ public class Utils {
      * @return true when declined events should be hidden.
      */
     public static boolean getHideDeclinedEvents(Context context) {
-        final SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        final SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         return prefs.getBoolean(GeneralPreferences.KEY_HIDE_DECLINED, false);
     }
 
     public static int getDaysPerWeek(Context context) {
-        final SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        final SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         return Integer.valueOf(prefs.getString(GeneralPreferences.KEY_DAYS_PER_WEEK, "7"));
     }
 
     public static int getMDaysPerWeek(Context context) {
-        final SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        final SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         return Integer.valueOf(prefs.getString(GeneralPreferences.KEY_MDAYS_PER_WEEK, "7"));
     }
 
     public static boolean useCustomSnoozeDelay(Context context) {
-        final SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        final SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         return prefs.getBoolean(GeneralPreferences.KEY_USE_CUSTOM_SNOOZE_DELAY, false);
     }
 
     public static long getDefaultSnoozeDelayMs(Context context) {
-        final SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        final SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
         final String value = prefs.getString(GeneralPreferences.KEY_DEFAULT_SNOOZE_DELAY, null);
         final long intValue = value != null
                 ? Long.valueOf(value)
@@ -1642,6 +1635,7 @@ public class Utils {
      * @param context
      * @return a list of quick responses.
      */
+    @NonNull
     public static String[] getQuickResponses(Context context) {
         String[] s = Utils.getSharedPreference(context, KEY_QUICK_RESPONSES, (String[]) null);
 
diff --git a/src/com/android/calendar/ViewDetailsPreferences.java b/src/com/android/calendar/ViewDetailsPreferences.java
deleted file mode 100644
index b1d5da47f567754e3523662cbb2b89e62f23b495..0000000000000000000000000000000000000000
--- a/src/com/android/calendar/ViewDetailsPreferences.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.android.calendar;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
-
-import java.util.Arrays;
-
-import foundation.e.calendar.R;
-
-
-public class ViewDetailsPreferences extends PreferenceFragment {
-    private final static String KEY_DISPLAY_TIME_V_PREF = "pref_display_time_vertical";
-    private final static String KEY_DISPLAY_TIME_H_PREF = "pref_display_time_horizontal";
-    private final static String KEY_DISPLAY_LOCATION_V_PREF = "pref_display_location_vertical";
-    private final static String KEY_DISPLAY_LOCATION_H_PREF = "pref_display_location_horizontal";
-    private final static String KEY_MAX_NUMBER_OF_LINES_V_PREF = "pref_number_of_lines_vertical";
-    private final static String KEY_MAX_NUMBER_OF_LINES_H_PREF = "pref_number_of_lines_horizontal";
-    private final static PreferenceKeys LANDSCAPE_PREFS = new PreferenceKeys(KEY_DISPLAY_TIME_H_PREF, KEY_DISPLAY_LOCATION_H_PREF, KEY_MAX_NUMBER_OF_LINES_H_PREF);
-    private final static PreferenceKeys PORTRAIT_PREFS = new PreferenceKeys(KEY_DISPLAY_TIME_V_PREF, KEY_DISPLAY_LOCATION_V_PREF, KEY_MAX_NUMBER_OF_LINES_V_PREF);
-
-    private PreferenceConfiguration mLandscapeConf = new PreferenceConfiguration(LANDSCAPE_PREFS);
-    private PreferenceConfiguration mPortraitConf = new PreferenceConfiguration(PORTRAIT_PREFS);
-
-    public enum TimeVisibility {
-        SHOW_NONE(0),
-        SHOW_START_TIME(1),
-        SHOW_START_AND_END_TIME(2),
-        SHOW_START_TIME_AND_DURATION(3),
-        SHOW_TIME_RANGE_BELOW(4);
-        private int mValue;
-        TimeVisibility(int value) {
-            mValue = value;
-        }
-        int getValue() {
-            return mValue;
-        }
-    }
-    private static class PreferenceKeys {
-        protected final String KEY_DISPLAY_TIME;
-        protected final String KEY_DISPLAY_LOCATION;
-        protected final String KEY_MAX_NUMBER_OF_LINES;
-        PreferenceKeys(String keyDisplayTime, String keyDisplayLocation, String keyMaxNumberOfLInes) {
-            KEY_DISPLAY_TIME = keyDisplayTime;
-            KEY_DISPLAY_LOCATION = keyDisplayLocation;
-            KEY_MAX_NUMBER_OF_LINES = keyMaxNumberOfLInes;
-        }
-    }
-
-    protected static class PreferenceConfiguration {
-        private PreferenceKeys mKeys;
-        private ListPreference mDisplayTime;
-
-        PreferenceConfiguration(PreferenceKeys keys) {
-            mKeys = keys;
-        }
-
-        protected void onCreate(PreferenceScreen preferenceScreen, Activity activity)
-        {
-            mDisplayTime = (ListPreference) preferenceScreen.findPreference(mKeys.KEY_DISPLAY_TIME);
-            initDisplayTime(activity);
-        }
-        private void initDisplayTime(Activity activity) {
-            if (!Utils.getConfigBool(activity, R.bool.show_time_in_month)) {
-                CharSequence[] entries = mDisplayTime.getEntries();
-                CharSequence[] newEntries = Arrays.copyOf(entries, entries.length-1);
-                mDisplayTime.setEntries(newEntries);
-            }
-            if (mDisplayTime.getEntry() == null || mDisplayTime.getEntry().length() == 0) {
-                mDisplayTime.setValue(getDefaultTimeToShow(activity).toString());
-            }
-        }
-    }
-    static class DynamicPreferences {
-        private Context mContext;
-        private SharedPreferences mPrefs;
-        DynamicPreferences(Context context)
-        {
-            mContext = context;
-            mPrefs = GeneralPreferences.getSharedPreferences(context);
-        }
-        public PreferenceKeys getPreferenceKeys() {
-            int orientation = mContext.getResources().getConfiguration().orientation;
-            boolean landscape = (orientation == Configuration.ORIENTATION_LANDSCAPE);
-            return landscape ? LANDSCAPE_PREFS : PORTRAIT_PREFS;
-        }
-        public TimeVisibility getTimeVisibility(PreferenceKeys keys) {
-            String visibility = mPrefs.getString(keys.KEY_DISPLAY_TIME, getDefaultTimeToShow(mContext).toString());
-            return TimeVisibility.values()[Integer.parseInt(visibility)];
-        }
-        public boolean getShowLocation(PreferenceKeys keys) {
-            return mPrefs.getBoolean(keys.KEY_DISPLAY_LOCATION, false);
-        }
-        public Integer getMaxNumberOfLines(PreferenceKeys keys) {
-            return Integer.parseInt(mPrefs.getString(keys.KEY_MAX_NUMBER_OF_LINES, null));
-        }
-    }
-    public static class Preferences {
-        public final TimeVisibility TIME_VISIBILITY;
-        public final boolean LOCATION_VISIBILITY;
-        public final int MAX_LINES;
-
-        protected Preferences(Context context) {
-            DynamicPreferences prefs = new DynamicPreferences(context);
-            PreferenceKeys keys = prefs.getPreferenceKeys();
-            TIME_VISIBILITY = prefs.getTimeVisibility(keys);
-            LOCATION_VISIBILITY = prefs.getShowLocation(keys);
-            MAX_LINES = prefs.getMaxNumberOfLines(keys);
-        }
-        private Preferences(Preferences prefs) {
-            TIME_VISIBILITY = TimeVisibility.SHOW_NONE;
-            LOCATION_VISIBILITY = prefs.LOCATION_VISIBILITY;
-            MAX_LINES = prefs.MAX_LINES;
-        }
-        public Preferences hideTime() {
-            if (TIME_VISIBILITY == TimeVisibility.SHOW_TIME_RANGE_BELOW) {
-                return new Preferences(this);
-            }
-            return this;
-        }
-        public boolean isTimeVisible() {
-            return TIME_VISIBILITY != TimeVisibility.SHOW_NONE;
-        }
-        public boolean isTimeShownBelow() {
-            return (TIME_VISIBILITY == TimeVisibility.SHOW_TIME_RANGE_BELOW);
-        }
-        public boolean isStartTimeVisible() {
-            return (TIME_VISIBILITY != TimeVisibility.SHOW_NONE);
-        }
-        public boolean isEndTimeVisible() {
-            return (TIME_VISIBILITY == TimeVisibility.SHOW_START_AND_END_TIME) ||
-                    (TIME_VISIBILITY == TimeVisibility.SHOW_TIME_RANGE_BELOW);
-        }
-        public boolean isDurationVisible() {
-            return (TIME_VISIBILITY == TimeVisibility.SHOW_START_TIME_AND_DURATION);
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        final PreferenceManager preferenceManager = getPreferenceManager();
-        preferenceManager.setSharedPreferencesName(GeneralPreferences.SHARED_PREFS_NAME);
-        addPreferencesFromResource(R.xml.view_details_preferences);
-        PreferenceScreen preferenceScreen = getPreferenceScreen();
-        Activity activity = getActivity();
-        mLandscapeConf.onCreate(preferenceScreen, activity);
-        mPortraitConf.onCreate(preferenceScreen, activity);
-    }
-
-    protected static Integer getDefaultTimeToShow(Context context) {
-        return (Utils.getConfigBool(context, R.bool.show_time_in_month)) ?
-                TimeVisibility.SHOW_TIME_RANGE_BELOW.getValue() : TimeVisibility.SHOW_NONE.getValue();
-    }
-
-    public static Preferences getPreferences(Context context) {
-        return new Preferences(context);
-    }
-
-    public static void setDefaultValues(Context context) {
-        PreferenceManager.setDefaultValues(context, GeneralPreferences.SHARED_PREFS_NAME, Context.MODE_PRIVATE,
-                    R.xml.view_details_preferences, true);
-    }
-}
diff --git a/src/com/android/calendar/agenda/AgendaAdapter.java b/src/com/android/calendar/agenda/AgendaAdapter.java
index 0fdbc8e721e6e641c285b3328fa242d863dc129b..2b49c5d7c1b68d05ff89ab654c7c1ebd72acb551 100644
--- a/src/com/android/calendar/agenda/AgendaAdapter.java
+++ b/src/com/android/calendar/agenda/AgendaAdapter.java
@@ -63,13 +63,12 @@ public class AgendaAdapter extends ResourceCursorAdapter {
     public AgendaAdapter(Context context, int resource) {
         super(context, resource, null);
 
-        DynamicTheme theme = new DynamicTheme();
         mResources = context.getResources();
         mNoTitleLabel = mResources.getString(R.string.no_title_label);
-        mDeclinedColor = theme.getColor(context, "agenda_item_declined_color");
-        mStandardColor = theme.getColor(context, "agenda_item_standard_color");
-        mWhereDeclinedColor = theme.getColor(context, "agenda_item_where_declined_text_color");
-        mWhereColor = theme.getColor(context, "agenda_item_where_text_color");
+        mDeclinedColor = DynamicTheme.getColor(context, "agenda_item_declined_color");
+        mStandardColor = DynamicTheme.getColor(context, "agenda_item_standard_color");
+        mWhereDeclinedColor = DynamicTheme.getColor(context, "agenda_item_where_declined_text_color");
+        mWhereColor = DynamicTheme.getColor(context, "agenda_item_where_text_color");
         mStringBuilder = new StringBuilder(50);
         mFormatter = new Formatter(mStringBuilder, Locale.getDefault());
 
diff --git a/src/com/android/calendar/agenda/AgendaByDayAdapter.java b/src/com/android/calendar/agenda/AgendaByDayAdapter.java
index 500e58ed3cd0735b36b9ec7fab4943be344a5def..3801b8af87dc54fded77dee7cddd6a629c4acc2c 100644
--- a/src/com/android/calendar/agenda/AgendaByDayAdapter.java
+++ b/src/com/android/calendar/agenda/AgendaByDayAdapter.java
@@ -172,7 +172,6 @@ public class AgendaByDayAdapter extends BaseAdapter {
             return mAgendaAdapter.getView(position, convertView, parent);
         }
 
-        DynamicTheme theme = new DynamicTheme();
         RowInfo row = mRowInfo.get(position);
         if (row.mType == TYPE_DAY) {
             ViewHolder holder = null;
@@ -238,10 +237,10 @@ public class AgendaByDayAdapter extends BaseAdapter {
 
             // Set the background of the view, it is grayed for day that are in the past and today
             if (row.mDay > mTodayJulianDay) {
-                agendaDayView.setBackgroundResource(theme.getDrawableId(mContext, "agenda_item_bg_primary"));
+                agendaDayView.setBackgroundResource(DynamicTheme.getDrawableId(mContext, "agenda_item_bg_primary"));
                 holder.grayed = false;
             } else {
-                agendaDayView.setBackgroundResource(theme.getDrawableId(mContext, "agenda_item_bg_secondary"));
+                agendaDayView.setBackgroundResource(DynamicTheme.getDrawableId(mContext, "agenda_item_bg_secondary"));
                 holder.grayed = true;
             }
             return agendaDayView;
@@ -263,11 +262,11 @@ public class AgendaByDayAdapter extends BaseAdapter {
             // if event in the past or started already, un-bold the title and set the background
             if ((!allDay && row.mEventStartTimeMilli <= System.currentTimeMillis()) ||
                     (allDay && row.mDay <= mTodayJulianDay)) {
-                itemView.setBackgroundResource(theme.getDrawableId(mContext, "agenda_item_bg_secondary"));
+                itemView.setBackgroundResource(DynamicTheme.getDrawableId(mContext, "agenda_item_bg_secondary"));
                 title.setTypeface(Typeface.DEFAULT);
                 holder.grayed = true;
             } else {
-                itemView.setBackgroundResource(theme.getDrawableId(mContext, "agenda_item_bg_primary"));
+                itemView.setBackgroundResource(DynamicTheme.getDrawableId(mContext, "agenda_item_bg_primary"));
                 title.setTypeface(Typeface.DEFAULT_BOLD);
                 holder.grayed = false;
             }
diff --git a/src/com/android/calendar/agenda/AgendaFragment.java b/src/com/android/calendar/agenda/AgendaFragment.java
index a7cc2de844e525b72ff99159f16065a0ef6d8811..83e1e2bbb02f42fa79613dac6781a98f34655be0 100644
--- a/src/com/android/calendar/agenda/AgendaFragment.java
+++ b/src/com/android/calendar/agenda/AgendaFragment.java
@@ -39,9 +39,9 @@ import com.android.calendar.CalendarController.EventInfo;
 import com.android.calendar.CalendarController.EventType;
 import com.android.calendar.CalendarController.ViewType;
 import com.android.calendar.EventInfoFragment;
-import com.android.calendar.GeneralPreferences;
 import com.android.calendar.StickyHeaderListView;
 import com.android.calendar.Utils;
+import com.android.calendar.settings.GeneralPreferences;
 
 import java.util.Date;
 
@@ -211,7 +211,7 @@ public class AgendaFragment extends Fragment implements CalendarController.Event
             Log.v(TAG, "OnResume to " + mTime.toString());
         }
 
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(
                 getActivity());
         boolean hideDeclined = prefs.getBoolean(
                 GeneralPreferences.KEY_HIDE_DECLINED, false);
diff --git a/src/com/android/calendar/alerts/AlertService.java b/src/com/android/calendar/alerts/AlertService.java
index d5aff6aead5624c7fddff3e08002cc99149c4e4d..0a9452d3821437c650b4412068b005e461136883 100644
--- a/src/com/android/calendar/alerts/AlertService.java
+++ b/src/com/android/calendar/alerts/AlertService.java
@@ -49,9 +49,8 @@ import android.text.format.DateUtils;
 import android.text.format.Time;
 import android.util.Log;
 
-import com.android.calendar.GeneralPreferences;
-import com.android.calendar.OtherPreferences;
 import com.android.calendar.Utils;
+import com.android.calendar.settings.GeneralPreferences;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -159,7 +158,7 @@ public class AlertService extends Service {
 
 
         final long currentTime = System.currentTimeMillis();
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(context);
 
         if (DEBUG) {
             Log.d(TAG, "Beginning updateAlertNotification");
@@ -453,40 +452,12 @@ public class AlertService extends Service {
         // Experimental reminder setting to only remind for events that have
         // been responded to with "yes" or "maybe".
         String skipRemindersPref = Utils.getSharedPreference(context,
-                OtherPreferences.KEY_OTHER_REMINDERS_RESPONDED, "");
+                GeneralPreferences.KEY_OTHER_REMINDERS_RESPONDED, "");
         // Skip no-response events if the "Skip Reminders" preference has the second option,
         // "If declined or not responded", is selected.
         // Note that by default, the first option will be selected, so this will be false.
         boolean remindRespondedOnly = skipRemindersPref.equals(context.getResources().
                 getStringArray(R.array.preferences_skip_reminders_values)[1]);
-        // Experimental reminder setting to silence reminders when they are
-        // during the pre-defined quiet hours.
-        boolean useQuietHours = Utils.getSharedPreference(context,
-                OtherPreferences.KEY_OTHER_QUIET_HOURS, false);
-        // Note that the start time may be either before or after the end time,
-        // depending on whether quiet hours cross through midnight.
-        int quietHoursStartHour =
-                OtherPreferences.QUIET_HOURS_DEFAULT_START_HOUR;
-        int quietHoursStartMinute =
-                OtherPreferences.QUIET_HOURS_DEFAULT_START_MINUTE;
-        int quietHoursEndHour =
-                OtherPreferences.QUIET_HOURS_DEFAULT_END_HOUR;
-        int quietHoursEndMinute =
-                OtherPreferences.QUIET_HOURS_DEFAULT_END_MINUTE;
-        if (useQuietHours) {
-            quietHoursStartHour = Utils.getSharedPreference(context,
-                    OtherPreferences.KEY_OTHER_QUIET_HOURS_START_HOUR,
-                    OtherPreferences.QUIET_HOURS_DEFAULT_START_HOUR);
-            quietHoursStartMinute = Utils.getSharedPreference(context,
-                    OtherPreferences.KEY_OTHER_QUIET_HOURS_START_MINUTE,
-                    OtherPreferences.QUIET_HOURS_DEFAULT_START_MINUTE);
-            quietHoursEndHour = Utils.getSharedPreference(context,
-                    OtherPreferences.KEY_OTHER_QUIET_HOURS_END_HOUR,
-                    OtherPreferences.QUIET_HOURS_DEFAULT_END_HOUR);
-            quietHoursEndMinute = Utils.getSharedPreference(context,
-                    OtherPreferences.KEY_OTHER_QUIET_HOURS_END_MINUTE,
-                    OtherPreferences.QUIET_HOURS_DEFAULT_END_MINUTE);
-        }
         Time time = new Time();
 
         ContentResolver cr = context.getContentResolver();
@@ -510,45 +481,7 @@ public class AlertService extends Service {
                         .withAppendedId(CalendarAlerts.CONTENT_URI, alertId);
                 final long alarmTime = alertCursor.getLong(ALERT_INDEX_ALARM_TIME);
                 boolean forceQuiet = false;
-                if (useQuietHours) {
-                    // Quiet hours have been set.
-                    time.set(alarmTime);
-                    // Check whether the alarm will fire after the quiet hours
-                    // start time and/or before the quiet hours end time.
-                    boolean alarmAfterQuietHoursStart =
-                            (time.hour > quietHoursStartHour ||
-                                    (time.hour == quietHoursStartHour
-                                    && time.minute >= quietHoursStartMinute));
-                    boolean alarmBeforeQuietHoursEnd =
-                            (time.hour < quietHoursEndHour ||
-                                    (time.hour == quietHoursEndHour
-                                    && time.minute <= quietHoursEndMinute));
-                    // Check if quiet hours crosses through midnight, iff:
-                    // start hour is after end hour, or
-                    // start hour is equal to end hour, and start minute is
-                    // after end minute.
-                    // i.e. 22:30 - 06:45; 12:45 - 12:00
-                    //      01:05 - 10:30; 05:00 - 05:30
-                    boolean quietHoursCrossesMidnight =
-                            quietHoursStartHour > quietHoursEndHour ||
-                            (quietHoursStartHour == quietHoursEndHour
-                            && quietHoursStartMinute > quietHoursEndMinute);
-                    if (quietHoursCrossesMidnight) {
-                        // Quiet hours crosses midnight. Alarm should be quiet
-                        // if it's after start time OR before end time.
-                        if (alarmAfterQuietHoursStart ||
-                                alarmBeforeQuietHoursEnd) {
-                            forceQuiet = true;
-                        }
-                    } else {
-                        // Quiet hours doesn't cross midnight. Alarm should be
-                        // quiet if it's after start time AND before end time.
-                        if (alarmAfterQuietHoursStart &&
-                                alarmBeforeQuietHoursEnd) {
-                            forceQuiet = true;
-                        }
-                    }
-                }
+
                 int state = alertCursor.getInt(ALERT_INDEX_STATE);
                 final boolean allDay = alertCursor.getInt(ALERT_INDEX_ALL_DAY) != 0;
 
@@ -1165,7 +1098,7 @@ public class AlertService extends Service {
                 if (quietUpdate) {
                     ringtone = EMPTY_RINGTONE;
                 } else {
-                    ringtone = Utils.getRingTonePreference(context);
+                    ringtone = Utils.getRingtonePreference(context);
                 }
             }
             String retVal = ringtone;
diff --git a/src/com/android/calendar/event/CreateEventDialogFragment.java b/src/com/android/calendar/event/CreateEventDialogFragment.java
index 2e3c5cf9e26427e3b9c35579c9ea16261a0009d6..e02bd2e3023f7e45400a2791c64619c3816456c3 100644
--- a/src/com/android/calendar/event/CreateEventDialogFragment.java
+++ b/src/com/android/calendar/event/CreateEventDialogFragment.java
@@ -43,8 +43,8 @@ import com.android.calendar.AsyncQueryService;
 import com.android.calendar.CalendarController;
 import com.android.calendar.CalendarController.EventType;
 import com.android.calendar.CalendarEventModel;
-import com.android.calendar.GeneralPreferences;
 import com.android.calendar.Utils;
+import com.android.calendar.settings.GeneralPreferences;
 
 import foundation.e.calendar.R;
 
diff --git a/src/com/android/calendar/event/EditEventFragment.java b/src/com/android/calendar/event/EditEventFragment.java
index 8208900b2cd40ee4da466add72b2aba58c2a2937..b2a71898130c8fe10d8f3d4f01e857a602bfed39 100644
--- a/src/com/android/calendar/event/EditEventFragment.java
+++ b/src/com/android/calendar/event/EditEventFragment.java
@@ -135,8 +135,6 @@ public class EditEventFragment extends Fragment implements EventHandler, OnColor
     private boolean mSaveOnDetach = true;
     private boolean mIsReadOnly = false;
     private boolean mShowColorPalette = false;
-    private boolean mTimeSelectedWasStartTime;
-    private boolean mDateSelectedWasStartDate;
     private InputMethodManager mInputMethodManager;
     private final View.OnClickListener mActionBarListener = new View.OnClickListener() {
         @Override
@@ -323,8 +321,7 @@ public class EditEventFragment extends Fragment implements EventHandler, OnColor
         } else {
             view = inflater.inflate(R.layout.edit_event, null);
         }
-        mView = new EditEventView(mContext, view, mOnDone, mTimeSelectedWasStartTime,
-                mDateSelectedWasStartDate);
+        mView = new EditEventView(mContext, view, mOnDone);
 
         if (Build.VERSION.SDK_INT >= 23 && ContextCompat.checkSelfPermission(mContext,
                 Manifest.permission.READ_CALENDAR)
@@ -387,14 +384,6 @@ public class EditEventFragment extends Fragment implements EventHandler, OnColor
             if (savedInstanceState.containsKey(BUNDLE_KEY_READ_ONLY)) {
                 mIsReadOnly = savedInstanceState.getBoolean(BUNDLE_KEY_READ_ONLY);
             }
-            if (savedInstanceState.containsKey("EditEventView_timebuttonclicked")) {
-                mTimeSelectedWasStartTime = savedInstanceState.getBoolean(
-                        "EditEventView_timebuttonclicked");
-            }
-            if (savedInstanceState.containsKey(BUNDLE_KEY_DATE_BUTTON_CLICKED)) {
-                mDateSelectedWasStartDate = savedInstanceState.getBoolean(
-                        BUNDLE_KEY_DATE_BUTTON_CLICKED);
-            }
             if (savedInstanceState.containsKey(BUNDLE_KEY_SHOW_COLOR_PALETTE)) {
                 mShowColorPalette = savedInstanceState.getBoolean(BUNDLE_KEY_SHOW_COLOR_PALETTE);
             }
@@ -618,9 +607,6 @@ public class EditEventFragment extends Fragment implements EventHandler, OnColor
         outState.putSerializable(BUNDLE_KEY_EVENT, mEventBundle);
         outState.putBoolean(BUNDLE_KEY_READ_ONLY, mIsReadOnly);
         outState.putBoolean(BUNDLE_KEY_SHOW_COLOR_PALETTE, mView.isColorPaletteVisible());
-
-        outState.putBoolean("EditEventView_timebuttonclicked", mView.mTimeSelectedWasStartTime);
-        outState.putBoolean(BUNDLE_KEY_DATE_BUTTON_CLICKED, mView.mDateSelectedWasStartDate);
     }
 
     @Override
diff --git a/src/com/android/calendar/event/EditEventHelper.java b/src/com/android/calendar/event/EditEventHelper.java
index 0a913ec42903295acee00c13eef72f65502b050f..abeadb7977f329f4621358b9ec92e941e64ab87f 100644
--- a/src/com/android/calendar/event/EditEventHelper.java
+++ b/src/com/android/calendar/event/EditEventHelper.java
@@ -90,7 +90,9 @@ public class EditEventHelper {
             Events.STATUS, // 21
             Events.CALENDAR_COLOR, // 22
             Events.EVENT_COLOR, // 23
-            Events.EVENT_COLOR_KEY // 24
+            Events.EVENT_COLOR_KEY, // 24
+            Events.ACCOUNT_NAME, // 25
+            Events.ACCOUNT_TYPE // 26
     };
     protected static final int EVENT_INDEX_ID = 0;
     protected static final int EVENT_INDEX_TITLE = 1;
@@ -117,6 +119,8 @@ public class EditEventHelper {
     protected static final int EVENT_INDEX_CALENDAR_COLOR = 22;
     protected static final int EVENT_INDEX_EVENT_COLOR = 23;
     protected static final int EVENT_INDEX_EVENT_COLOR_KEY = 24;
+    protected static final int EVENT_INDEX_ACCOUNT_NAME = 25;
+    protected static final int EVENT_INDEX_ACCOUNT_TYPE = 26;
 
     public static final String[] REMINDERS_PROJECTION = new String[] {
             Reminders._ID, // 0
@@ -1065,6 +1069,8 @@ public class EditEventHelper {
         String rRule = cursor.getString(EVENT_INDEX_RRULE);
         model.mRrule = rRule;
         model.mSyncId = cursor.getString(EVENT_INDEX_SYNC_ID);
+        model.mSyncAccountName = cursor.getString(EVENT_INDEX_ACCOUNT_NAME);
+        model.mSyncAccountType = cursor.getString(EVENT_INDEX_ACCOUNT_TYPE);
         model.mAvailability = cursor.getInt(EVENT_INDEX_AVAILABILITY);
         int accessLevel = cursor.getInt(EVENT_INDEX_ACCESS_LEVEL);
         model.mOwnerAccount = cursor.getString(EVENT_INDEX_OWNER_ACCOUNT);
diff --git a/src/com/android/calendar/event/EditEventView.java b/src/com/android/calendar/event/EditEventView.java
index 05a22bce98cc4a195d78f55f50ac04aa54edf528..88337adc19ececfd4283e239d28b1589c2f68d04 100644
--- a/src/com/android/calendar/event/EditEventView.java
+++ b/src/com/android/calendar/event/EditEventView.java
@@ -18,10 +18,11 @@ package com.android.calendar.event;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.DialogFragment;
+import android.app.DatePickerDialog;
 import android.app.FragmentManager;
 import android.app.ProgressDialog;
 import android.app.Service;
+import android.app.TimePickerDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -57,6 +58,7 @@ import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.DatePicker;
 import android.widget.LinearLayout;
 import android.widget.MultiAutoCompleteTextView;
 import android.widget.RadioButton;
@@ -66,6 +68,7 @@ import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
+import android.widget.TimePicker;
 
 import com.android.calendar.CalendarEventModel;
 import com.android.calendar.CalendarEventModel.Attendee;
@@ -73,19 +76,14 @@ import com.android.calendar.CalendarEventModel.ReminderEntry;
 import com.android.calendar.EmailAddressAdapter;
 import com.android.calendar.EventInfoFragment;
 import com.android.calendar.EventRecurrenceFormatter;
-import com.android.calendar.GeneralPreferences;
 import com.android.calendar.RecipientAdapter;
 import com.android.calendar.Utils;
 import com.android.calendar.event.EditEventHelper.EditDoneRunnable;
 import com.android.calendar.recurrencepicker.RecurrencePickerDialog;
+import com.android.calendar.settings.GeneralPreferences;
 import com.android.calendarcommon2.EventRecurrence;
 import com.android.common.Rfc822InputFilter;
 import com.android.common.Rfc822Validator;
-import com.android.datetimepicker.date.DatePickerDialog;
-import com.android.datetimepicker.date.DatePickerDialog.OnDateSetListener;
-import com.android.datetimepicker.time.RadialPickerLayout;
-import com.android.datetimepicker.time.TimePickerDialog;
-import com.android.datetimepicker.time.TimePickerDialog.OnTimeSetListener;
 import com.android.ex.chips.AccountSpecifier;
 import com.android.ex.chips.BaseRecipientAdapter;
 import com.android.ex.chips.ChipsUtil;
@@ -112,8 +110,6 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
     private static final String GOOGLE_SECONDARY_CALENDAR = "calendar.google.com";
     private static final String PERIOD_SPACE = ". ";
 
-    private static final String FRAG_TAG_DATE_PICKER = "datePickerDialogFragment";
-    private static final String FRAG_TAG_TIME_PICKER = "timePickerDialogFragment";
     private static final String FRAG_TAG_TIME_ZONE_PICKER = "timeZonePickerDialogFragment";
     private static final String FRAG_TAG_RECUR_PICKER = "recurrencePickerDialogFragment";
     private static StringBuilder mSB = new StringBuilder(50);
@@ -126,8 +122,6 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
      */
     private static InputFilter[] sRecipientFilters = new InputFilter[]{new Rfc822InputFilter()};
     public boolean mIsMultipane;
-    public boolean mTimeSelectedWasStartTime;
-    public boolean mDateSelectedWasStartDate;
     ArrayList<View> mEditOnlyList = new ArrayList<View>();
     ArrayList<View> mEditViewList = new ArrayList<View>();
     ArrayList<View> mViewOnlyList = new ArrayList<View>();
@@ -175,7 +169,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
     private int[] mOriginalPadding = new int[4];
     private ProgressDialog mLoadingCalendarsDialog;
     private AlertDialog mNoCalendarsDialog;
-    private DialogFragment mTimezoneDialog;
+
     private Activity mActivity;
     private EditDoneRunnable mDone;
     private View mView;
@@ -226,8 +220,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
     private ArrayList<ReminderEntry> mUnsupportedReminders = new ArrayList<ReminderEntry>();
     private String mRrule;
 
-    public EditEventView(Activity activity, View view, EditDoneRunnable done,
-                         boolean timeSelectedWasStartTime, boolean dateSelectedWasStartDate) {
+    public EditEventView(Activity activity, View view, EditDoneRunnable done) {
 
         mActivity = activity;
         mView = view;
@@ -377,28 +370,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
         if (tzpd != null) {
             tzpd.setOnTimeZoneSetListener(this);
         }
-        TimePickerDialog tpd = (TimePickerDialog) fm.findFragmentByTag(FRAG_TAG_TIME_PICKER);
-        if (tpd != null) {
-            View v;
-            mTimeSelectedWasStartTime = timeSelectedWasStartTime;
-            if (timeSelectedWasStartTime) {
-                v = mStartTimeButton;
-            } else {
-                v = mEndTimeButton;
-            }
-            tpd.setOnTimeSetListener(new TimeListener(v));
-        }
-        mDatePickerDialog = (DatePickerDialog) fm.findFragmentByTag(FRAG_TAG_DATE_PICKER);
-        if (mDatePickerDialog != null) {
-            View v;
-            mDateSelectedWasStartDate = dateSelectedWasStartDate;
-            if (dateSelectedWasStartDate) {
-                v = mStartDateButton;
-            } else {
-                v = mEndDateButton;
-            }
-            mDatePickerDialog.setOnDateSetListener(new DateListener(v));
-        }
+
     }
 
     /**
@@ -907,7 +879,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
 
         populateTimezone(mStartTime.normalize(true));
 
-        SharedPreferences prefs = GeneralPreferences.getSharedPreferences(mActivity);
+        SharedPreferences prefs = GeneralPreferences.Companion.getSharedPreferences(mActivity);
         String defaultReminderString = prefs.getString(
                 GeneralPreferences.KEY_DEFAULT_REMINDER, GeneralPreferences.NO_REMINDER_STRING);
         mDefaultReminderMinutes = Integer.parseInt(defaultReminderString);
@@ -1658,7 +1630,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
     }
 
     /* This class is used to update the time buttons. */
-    private class TimeListener implements OnTimeSetListener {
+    private class TimeListener implements TimePickerDialog.OnTimeSetListener {
         private View mView;
 
         public TimeListener(View view) {
@@ -1666,7 +1638,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
         }
 
         @Override
-        public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute) {
+        public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
             // Cache the member variables locally to avoid inner class overhead.
             Time startTime = mStartTime;
             Time endTime = mEndTime;
@@ -1726,36 +1698,28 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
 
             TimePickerDialog dialog;
             if (v == mStartTimeButton) {
-                mTimeSelectedWasStartTime = true;
-                if (mStartTimePickerDialog == null) {
-                    mStartTimePickerDialog = TimePickerDialog.newInstance(new TimeListener(v),
-                            mTime.hour, mTime.minute, DateFormat.is24HourFormat(mActivity));
-                } else {
-                    mStartTimePickerDialog.setStartTime(mTime.hour, mTime.minute);
+                if (mStartTimePickerDialog != null) {
+                    mStartTimePickerDialog.dismiss();
                 }
+                mStartTimePickerDialog = new TimePickerDialog(mActivity, new TimeListener(v),
+                        mTime.hour, mTime.minute, DateFormat.is24HourFormat(mActivity));
                 dialog = mStartTimePickerDialog;
             } else {
-                mTimeSelectedWasStartTime = false;
-                if (mEndTimePickerDialog == null) {
-                    mEndTimePickerDialog = TimePickerDialog.newInstance(new TimeListener(v),
-                            mTime.hour, mTime.minute, DateFormat.is24HourFormat(mActivity));
-                } else {
-                    mEndTimePickerDialog.setStartTime(mTime.hour, mTime.minute);
+                if (mEndTimePickerDialog != null) {
+                    mEndTimePickerDialog.dismiss();
                 }
+                mEndTimePickerDialog = new TimePickerDialog(mActivity, new TimeListener(v),
+                        mTime.hour, mTime.minute, DateFormat.is24HourFormat(mActivity));
                 dialog = mEndTimePickerDialog;
 
             }
 
-            final FragmentManager fm = mActivity.getFragmentManager();
-            fm.executePendingTransactions();
+            dialog.show();
 
-            if (dialog != null && !dialog.isAdded()) {
-                dialog.show(fm, FRAG_TAG_TIME_PICKER);
-            }
         }
     }
 
-    private class DateListener implements OnDateSetListener {
+    private class DateListener implements DatePickerDialog.OnDateSetListener {
         View mView;
 
         public DateListener(View view) {
@@ -1763,7 +1727,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
         }
 
         @Override
-        public void onDateSet(DatePickerDialog view, int year, int month, int monthDay) {
+        public void onDateSet(DatePicker view, int year, int month, int monthDay) {
             Log.d(TAG, "onDateSet: " + year + " " + month + " " + monthDay);
             // Cache the member variables locally to avoid inner class overhead.
             Time startTime = mStartTime;
@@ -1831,21 +1795,14 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
         @Override
         public void onClick(View v) {
 
-            if (v == mStartDateButton) {
-                mDateSelectedWasStartDate = true;
-            } else {
-                mDateSelectedWasStartDate = false;
-            }
 
             final DateListener listener = new DateListener(v);
             if (mDatePickerDialog != null) {
                 mDatePickerDialog.dismiss();
             }
-            mDatePickerDialog = DatePickerDialog.newInstance(listener,
+            mDatePickerDialog = new DatePickerDialog(mActivity, listener,
                     mTime.year, mTime.month, mTime.monthDay);
-            mDatePickerDialog.setFirstDayOfWeek(Utils.getFirstDayOfWeekAsCalendar(mActivity));
-            mDatePickerDialog.setYearRange(Utils.YEAR_MIN, Utils.YEAR_MAX);
-            mDatePickerDialog.show(mActivity.getFragmentManager(), FRAG_TAG_DATE_PICKER);
+            mDatePickerDialog.show();
         }
     }
 }
diff --git a/src/com/android/calendar/event/EventColorCache.java b/src/com/android/calendar/event/EventColorCache.java
index 9a65724c7a5a434d7f8f698cec95a98146fd0059..61e2dfcdf090c35d647b84ac54df095f0aba8e25 100644
--- a/src/com/android/calendar/event/EventColorCache.java
+++ b/src/com/android/calendar/event/EventColorCache.java
@@ -19,6 +19,7 @@ package com.android.calendar.event;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
@@ -86,9 +87,7 @@ public class EventColorCache implements Serializable {
             Integer[] sortedColors = new Integer[palette.size()];
             Arrays.sort(palette.toArray(sortedColors), comparator);
             palette.clear();
-            for (Integer color : sortedColors) {
-                palette.add(color);
-            }
+            Collections.addAll(palette, sortedColors);
             mColorPaletteMap.put(key, palette);
         }
     }
diff --git a/src/com/android/calendar/month/MonthByWeekFragment.java b/src/com/android/calendar/month/MonthByWeekFragment.java
index f287018b3e2ac00d1f0f635dc6946f6fc3df97f5..9ed3ce72cc7d262a9b9e3a14cdc79537f7537164 100644
--- a/src/com/android/calendar/month/MonthByWeekFragment.java
+++ b/src/com/android/calendar/month/MonthByWeekFragment.java
@@ -301,7 +301,7 @@ public class MonthByWeekFragment extends SimpleDayPickerFragment implements
         mListView.setOnTouchListener(this);
 
         if (!mIsMiniMonth) {
-            mListView.setBackgroundColor(new DynamicTheme().getColor(getActivity(), "month_bgcolor"));
+            mListView.setBackgroundColor(DynamicTheme.getColor(getActivity(), "month_bgcolor"));
         }
 
         // To get a smoother transition when showing this fragment, delay loading of events until
diff --git a/src/com/android/calendar/month/MonthWeekEventsView.java b/src/com/android/calendar/month/MonthWeekEventsView.java
index ab2c7fd40a8d93cb012e2f6cbc2975422752f3b8..64aafd5ff0671ddfe5ba2cd54b15e58ac1c44872 100644
--- a/src/com/android/calendar/month/MonthWeekEventsView.java
+++ b/src/com/android/calendar/month/MonthWeekEventsView.java
@@ -20,7 +20,7 @@ import com.android.calendar.DynamicTheme;
 import com.android.calendar.Event;
 import com.android.calendar.LunarUtils;
 import com.android.calendar.Utils;
-import com.android.calendar.ViewDetailsPreferences;
+import com.android.calendar.settings.ViewDetailsPreferences;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -228,25 +228,24 @@ public class MonthWeekEventsView extends SimpleWeekView {
 
     protected void loadColors(Context context) {
         Resources res = context.getResources();
-        DynamicTheme dynamicTheme = new DynamicTheme();
-
-        mMonthWeekNumColor = dynamicTheme.getColor(context, "month_week_num_color");
-        mMonthNumColor = dynamicTheme.getColor(context, "month_day_number");
-        mMonthNumOtherColor = dynamicTheme.getColor(context, "month_day_number_other");
-        mMonthNumTodayColor = dynamicTheme.getColor(context, "month_today_number");
-        mMonthEventColor = dynamicTheme.getColor(context, "month_event_color");
-        mMonthDeclinedEventColor = dynamicTheme.getColor(context, "agenda_item_declined_color");
-        mMonthDeclinedExtrasColor = dynamicTheme.getColor(context, "agenda_item_where_declined_text_color");
-        mMonthEventExtraColor = dynamicTheme.getColor(context, "month_event_extra_color");
-        mMonthEventOtherColor = dynamicTheme.getColor(context, "month_event_other_color");
-        mMonthEventExtraOtherColor = dynamicTheme.getColor(context, "month_event_extra_other_color");
-        mMonthBGTodayColor = dynamicTheme.getColor(context, "month_today_bgcolor");
-        mMonthBGFocusMonthColor = dynamicTheme.getColor(context, "month_focus_month_bgcolor");
-        mMonthBGOtherColor = dynamicTheme.getColor(context, "month_other_bgcolor");
-        mMonthBGColor = dynamicTheme.getColor(context, "month_bgcolor");
-        mDaySeparatorInnerColor = dynamicTheme.getColor(context, "month_grid_lines");
-        mTodayAnimateColor = dynamicTheme.getColor(context, "today_highlight_color");
-        mClickedDayColor = dynamicTheme.getColor(context, "day_clicked_background_color");
+
+        mMonthWeekNumColor = DynamicTheme.getColor(context, "month_week_num_color");
+        mMonthNumColor = DynamicTheme.getColor(context, "month_day_number");
+        mMonthNumOtherColor = DynamicTheme.getColor(context, "month_day_number_other");
+        mMonthNumTodayColor = DynamicTheme.getColor(context, "month_today_number");
+        mMonthEventColor = DynamicTheme.getColor(context, "month_event_color");
+        mMonthDeclinedEventColor = DynamicTheme.getColor(context, "agenda_item_declined_color");
+        mMonthDeclinedExtrasColor = DynamicTheme.getColor(context, "agenda_item_where_declined_text_color");
+        mMonthEventExtraColor = DynamicTheme.getColor(context, "month_event_extra_color");
+        mMonthEventOtherColor = DynamicTheme.getColor(context, "month_event_other_color");
+        mMonthEventExtraOtherColor = DynamicTheme.getColor(context, "month_event_extra_other_color");
+        mMonthBGTodayColor = DynamicTheme.getColor(context, "month_today_bgcolor");
+        mMonthBGFocusMonthColor = DynamicTheme.getColor(context, "month_focus_month_bgcolor");
+        mMonthBGOtherColor = DynamicTheme.getColor(context, "month_other_bgcolor");
+        mMonthBGColor = DynamicTheme.getColor(context, "month_bgcolor");
+        mDaySeparatorInnerColor = DynamicTheme.getColor(context, "month_grid_lines");
+        mTodayAnimateColor = DynamicTheme.getColor(context, "today_highlight_color");
+        mClickedDayColor = DynamicTheme.getColor(context, "day_clicked_background_color");
         mTodayDrawable = res.getDrawable(R.drawable.today_blue_week_holo_light);
     }
 
@@ -853,7 +852,7 @@ public class MonthWeekEventsView extends SimpleWeekView {
         public ArrayList<DayEventFormatter> prepareFormattedEvents() {
             prepareFormattedEventsWithEventDaySpan();
             ViewDetailsPreferences.Preferences preferences =
-                    ViewDetailsPreferences.getPreferences(getContext());
+                    ViewDetailsPreferences.Companion.getPreferences(getContext());
             preFormatEventText(preferences);
             setYindexInEvents();
             return formatDays(mBoxBoundaries.getAvailableYSpace(), preferences);
diff --git a/src/com/android/calendar/month/SimpleDayPickerFragment.java b/src/com/android/calendar/month/SimpleDayPickerFragment.java
index 9b7ff7fca79083dc59286aa7412ec2eee0a9e563..cf6919ab73cad924c277aa4a13b3bcb9cf9a3655 100644
--- a/src/com/android/calendar/month/SimpleDayPickerFragment.java
+++ b/src/com/android/calendar/month/SimpleDayPickerFragment.java
@@ -169,10 +169,9 @@ public class SimpleDayPickerFragment extends ListFragment implements OnScrollLis
         mTempTime.timezone = tz;
 
         Context c = getActivity();
-        DynamicTheme theme = new DynamicTheme();
-        mSaturdayColor = theme.getColor(c, "month_saturday");
-        mSundayColor = theme.getColor(c, "month_sunday");
-        mDayNameColor = theme.getColor(c, "month_day_names_color");
+        mSaturdayColor = DynamicTheme.getColor(c, "month_saturday");
+        mSundayColor = DynamicTheme.getColor(c, "month_sunday");
+        mDayNameColor = DynamicTheme.getColor(c, "month_day_names_color");
 
         // Adjust sizes for screen density
         if (mScale == 0) {
diff --git a/src/com/android/calendar/month/SimpleWeekView.java b/src/com/android/calendar/month/SimpleWeekView.java
index 356590de5a74572cd07d6046fe41dd9ef84fb569..564a7b5cf8e23e4a8d68f1380f2448f1f69ab298 100644
--- a/src/com/android/calendar/month/SimpleWeekView.java
+++ b/src/com/android/calendar/month/SimpleWeekView.java
@@ -172,14 +172,13 @@ public class SimpleWeekView extends View {
         super(context);
 
         Resources res = context.getResources();
-        DynamicTheme theme = new DynamicTheme();
-        mBGColor = theme.getColor(context, "month_bgcolor");
-        mSelectedWeekBGColor = theme.getColor(context, "month_selected_week_bgcolor");
-        mFocusMonthColor = theme.getColor(context, "month_mini_day_number");
-        mOtherMonthColor = theme.getColor(context, "month_other_month_day_number");
-        mDaySeparatorColor = theme.getColor(context, "month_grid_lines");
-        mTodayOutlineColor = theme.getColor(context, "mini_month_today_outline_color");
-        mWeekNumColor = theme.getColor(context, "month_week_num_color");
+        mBGColor = DynamicTheme.getColor(context, "month_bgcolor");
+        mSelectedWeekBGColor = DynamicTheme.getColor(context, "month_selected_week_bgcolor");
+        mFocusMonthColor = DynamicTheme.getColor(context, "month_mini_day_number");
+        mOtherMonthColor = DynamicTheme.getColor(context, "month_other_month_day_number");
+        mDaySeparatorColor = DynamicTheme.getColor(context, "month_grid_lines");
+        mTodayOutlineColor = DynamicTheme.getColor(context, "mini_month_today_outline_color");
+        mWeekNumColor = DynamicTheme.getColor(context, "month_week_num_color");
         mSelectedDayLine = res.getDrawable(R.drawable.dayline_minical_holo_light);
 
         if (mScale == 0) {
diff --git a/src/com/android/calendar/persistence/Calendar.kt b/src/com/android/calendar/persistence/Calendar.kt
new file mode 100644
index 0000000000000000000000000000000000000000..fd67f94f908393aa1e9b6a4c8a55275af54c6d1b
--- /dev/null
+++ b/src/com/android/calendar/persistence/Calendar.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.persistence
+
+
+/**
+ * @property isLocal This calendar is stored locally.
+ */
+data class Calendar(val id: Long,
+                    val accountName: String,
+                    val accountType: String,
+                    val name: String?,
+                    val displayName: String?,
+                    val color: Int,
+                    val visible: Boolean,
+                    val syncEvents: Boolean,
+                    val isPrimary: Boolean,
+                    val isLocal: Boolean)
diff --git a/src/com/android/calendar/persistence/CalendarRepository.kt b/src/com/android/calendar/persistence/CalendarRepository.kt
new file mode 100644
index 0000000000000000000000000000000000000000..dfabb56030e243acee403e5034e2745aaea33a4c
--- /dev/null
+++ b/src/com/android/calendar/persistence/CalendarRepository.kt
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.persistence
+
+import android.accounts.Account
+import android.annotation.SuppressLint
+import android.app.Application
+import android.content.ContentUris
+import android.content.ContentValues
+import android.content.Context
+import android.net.Uri
+import android.provider.CalendarContract
+import androidx.lifecycle.LiveData
+import foundation.e.calendar.R
+
+
+/**
+ * Repository as in
+ * https://developer.android.com/jetpack/docs/guide#recommended-app-arch
+ *
+ * TODO:
+ * Replace usages of AsyncQueryService in Etar with repositories
+ * Currently CalendarRepository is only used for settings
+ */
+@SuppressLint("MissingPermission")
+internal class CalendarRepository(val application: Application) {
+
+    private var contentResolver = application.contentResolver
+
+    private var allCalendars: CalendarLiveData
+
+    init {
+        allCalendars = CalendarLiveData(application.applicationContext)
+    }
+
+    fun getCalendarsOrderedByAccount(): LiveData<List<Calendar>> {
+        return allCalendars
+    }
+
+    class CalendarLiveData(val context: Context) : ContentProviderLiveData<List<Calendar>>(context, uri) {
+
+        override fun getContentProviderValue(): List<Calendar> {
+            val calendars: MutableList<Calendar> = mutableListOf()
+
+            context.contentResolver.query(uri, PROJECTION, null, null, CalendarContract.Calendars.ACCOUNT_NAME)?.use {
+                while (it.moveToNext()) {
+                    val id = it.getLong(PROJECTION_INDEX_ID)
+                    val accountName = it.getString(PROJECTION_INDEX_ACCOUNT_NAME)
+                    val accountType = it.getString(PROJECTION_INDEX_ACCOUNT_TYPE)
+                    val name = it.getString(PROJECTION_INDEX_NAME)
+                    val displayName = it.getString(PROJECTION_INDEX_CALENDAR_DISPLAY_NAME)
+                    val color = it.getInt(PROJECTION_INDEX_CALENDAR_COLOR)
+                    val visible = it.getInt(PROJECTION_INDEX_VISIBLE) == 1
+                    val syncEvents = it.getInt(PROJECTION_INDEX_SYNC_EVENTS) == 1
+                    val isPrimary = it.getInt(PROJECTION_INDEX_IS_PRIMARY) == 1
+                    val isLocal = accountType == CalendarContract.ACCOUNT_TYPE_LOCAL
+
+                    calendars.add(Calendar(id, accountName, accountType, name, displayName, color, visible, syncEvents, isPrimary, isLocal))
+                }
+            }
+            return calendars
+        }
+
+        companion object {
+            private val uri = CalendarContract.Calendars.CONTENT_URI
+
+            private val PROJECTION = arrayOf(
+                    CalendarContract.Calendars._ID,
+                    CalendarContract.Calendars.ACCOUNT_NAME,
+                    CalendarContract.Calendars.ACCOUNT_TYPE,
+                    CalendarContract.Calendars.OWNER_ACCOUNT,
+                    CalendarContract.Calendars.NAME,
+                    CalendarContract.Calendars.CALENDAR_DISPLAY_NAME,
+                    CalendarContract.Calendars.CALENDAR_COLOR,
+                    CalendarContract.Calendars.VISIBLE,
+                    CalendarContract.Calendars.SYNC_EVENTS,
+                    CalendarContract.Calendars.IS_PRIMARY
+            )
+            const val PROJECTION_INDEX_ID = 0
+            const val PROJECTION_INDEX_ACCOUNT_NAME = 1
+            const val PROJECTION_INDEX_ACCOUNT_TYPE = 2
+            const val PROJECTION_INDEX_OWNER_ACCOUNT = 3
+            const val PROJECTION_INDEX_NAME = 4
+            const val PROJECTION_INDEX_CALENDAR_DISPLAY_NAME = 5
+            const val PROJECTION_INDEX_CALENDAR_COLOR = 6
+            const val PROJECTION_INDEX_VISIBLE = 7
+            const val PROJECTION_INDEX_SYNC_EVENTS = 8
+            const val PROJECTION_INDEX_IS_PRIMARY = 9
+        }
+    }
+
+    private fun buildLocalCalendarContentValues(accountName: String, displayName: String): ContentValues {
+        val internalName = "etar_local_" + displayName.replace("[^a-zA-Z0-9]".toRegex(), "")
+        return ContentValues().apply {
+            put(CalendarContract.Calendars.ACCOUNT_NAME, accountName)
+            put(CalendarContract.Calendars.ACCOUNT_TYPE, CalendarContract.ACCOUNT_TYPE_LOCAL)
+            put(CalendarContract.Calendars.OWNER_ACCOUNT, accountName)
+            put(CalendarContract.Calendars.NAME, internalName)
+            put(CalendarContract.Calendars.CALENDAR_DISPLAY_NAME, displayName)
+            put(CalendarContract.Calendars.CALENDAR_COLOR_KEY, DEFAULT_COLOR_KEY)
+            put(CalendarContract.Calendars.CALENDAR_ACCESS_LEVEL, CalendarContract.Calendars.CAL_ACCESS_ROOT)
+            put(CalendarContract.Calendars.VISIBLE, 1)
+            put(CalendarContract.Calendars.SYNC_EVENTS, 1)
+            put(CalendarContract.Calendars.IS_PRIMARY, 0)
+            put(CalendarContract.Calendars.CAN_ORGANIZER_RESPOND, 0)
+            put(CalendarContract.Calendars.CAN_MODIFY_TIME_ZONE, 1)
+            // from Android docs: "the device will only process METHOD_DEFAULT and METHOD_ALERT reminders"
+            put(CalendarContract.Calendars.ALLOWED_REMINDERS, CalendarContract.Reminders.METHOD_ALERT.toString())
+            put(CalendarContract.Calendars.ALLOWED_ATTENDEE_TYPES, CalendarContract.Attendees.TYPE_NONE.toString())
+        }
+    }
+
+    private fun buildLocalCalendarColorsContentValues(accountName: String, colorType: Int, colorKey: String, color: Int): ContentValues {
+        return ContentValues().apply {
+            put(CalendarContract.Colors.ACCOUNT_NAME, accountName)
+            put(CalendarContract.Colors.ACCOUNT_TYPE, CalendarContract.ACCOUNT_TYPE_LOCAL)
+            put(CalendarContract.Colors.COLOR_TYPE, colorType)
+            put(CalendarContract.Colors.COLOR_KEY, colorKey)
+            put(CalendarContract.Colors.COLOR, color)
+        }
+    }
+
+    fun addLocalCalendar(accountName: String, displayName: String): Uri {
+        maybeAddCalendarAndEventColors(accountName)
+
+        val cv = buildLocalCalendarContentValues(accountName, displayName)
+        return contentResolver.insert(asLocalCalendarSyncAdapter(accountName, CalendarContract.Calendars.CONTENT_URI), cv)
+                ?: throw IllegalArgumentException()
+    }
+
+    private fun maybeAddCalendarAndEventColors(accountName: String) {
+        if (areCalendarColorsExisting(accountName)) {
+            return
+        }
+
+        val defaultColors: IntArray = application.resources.getIntArray(R.array.defaultCalendarColors)
+
+        val insertBulk = mutableListOf<ContentValues>()
+        for ((i, color) in defaultColors.withIndex()) {
+            val colorKey = i.toString()
+            val colorCvCalendar = buildLocalCalendarColorsContentValues(accountName, CalendarContract.Colors.TYPE_CALENDAR, colorKey, color)
+            val colorCvEvent = buildLocalCalendarColorsContentValues(accountName, CalendarContract.Colors.TYPE_EVENT, colorKey, color)
+            insertBulk.add(colorCvCalendar)
+            insertBulk.add(colorCvEvent)
+        }
+        contentResolver.bulkInsert(asLocalCalendarSyncAdapter(accountName, CalendarContract.Colors.CONTENT_URI), insertBulk.toTypedArray())
+    }
+
+    private fun areCalendarColorsExisting(accountName: String): Boolean {
+        contentResolver.query(CalendarContract.Colors.CONTENT_URI,
+                null,
+                CalendarContract.Colors.ACCOUNT_NAME + "=? AND " + CalendarContract.Colors.ACCOUNT_TYPE + "=?",
+                arrayOf(accountName, CalendarContract.ACCOUNT_TYPE_LOCAL),
+                null).use {
+            if (it!!.moveToFirst()) {
+                return true
+            }
+        }
+        return false
+    }
+
+    /**
+     * @return true iff exactly one row is deleted
+     */
+    fun deleteLocalCalendar(accountName: String, id: Long): Boolean {
+        val calUri = ContentUris.withAppendedId(asLocalCalendarSyncAdapter(accountName, CalendarContract.Calendars.CONTENT_URI), id)
+        return contentResolver.delete(calUri, null, null) == 1
+    }
+
+    fun queryAccount(calendarId: Long): Account? {
+        val calendarUri = ContentUris.withAppendedId(CalendarContract.Calendars.CONTENT_URI, calendarId)
+        contentResolver.query(calendarUri, ACCOUNT_PROJECTION, null, null, null)?.use {
+            if (it.moveToFirst()) {
+                val accountName = it.getString(PROJECTION_ACCOUNT_INDEX_NAME)
+                val accountType = it.getString(PROJECTION_ACCOUNT_INDEX_TYPE)
+                return Account(accountName, accountType)
+            }
+        }
+        return null
+    }
+
+    fun queryNumberOfEvents(calendarId: Long): Long? {
+        val args = arrayOf(calendarId.toString())
+        contentResolver.query(CalendarContract.Events.CONTENT_URI, PROJECTION_COUNT_EVENTS, WHERE_COUNT_EVENTS, args, null)?.use {
+            if (it.moveToFirst()) {
+                return it.getLong(PROJECTION_COUNT_EVENTS_INDEX_COUNT)
+            }
+        }
+        return null
+    }
+
+    companion object {
+        private val ACCOUNT_PROJECTION = arrayOf(
+                CalendarContract.Calendars.ACCOUNT_NAME,
+                CalendarContract.Calendars.ACCOUNT_TYPE
+        )
+        const val PROJECTION_ACCOUNT_INDEX_NAME = 0
+        const val PROJECTION_ACCOUNT_INDEX_TYPE = 1
+
+        private val PROJECTION_COUNT_EVENTS = arrayOf(
+                CalendarContract.Events._COUNT
+        )
+        const val PROJECTION_COUNT_EVENTS_INDEX_COUNT = 0
+        const val WHERE_COUNT_EVENTS = CalendarContract.Events.CALENDAR_ID + "=?"
+
+        const val DEFAULT_COLOR_KEY = "1"
+
+        /**
+         * Operations only work if they are made "under" the correct account
+         */
+        @JvmStatic
+        fun asLocalCalendarSyncAdapter(accountName: String, uri: Uri): Uri {
+            return uri.buildUpon()
+                    .appendQueryParameter(CalendarContract.CALLER_IS_SYNCADAPTER, "true")
+                    .appendQueryParameter(CalendarContract.Calendars.ACCOUNT_NAME, accountName)
+                    .appendQueryParameter(CalendarContract.Calendars.ACCOUNT_TYPE, CalendarContract.ACCOUNT_TYPE_LOCAL).build()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/android/calendar/persistence/ContentProviderLiveData.kt b/src/com/android/calendar/persistence/ContentProviderLiveData.kt
new file mode 100644
index 0000000000000000000000000000000000000000..e512652009d958ab811f340b32b0d5002d2ba13a
--- /dev/null
+++ b/src/com/android/calendar/persistence/ContentProviderLiveData.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.persistence
+
+import android.content.Context
+import android.database.ContentObserver
+import android.net.Uri
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+
+/**
+ * Based on https://medium.com/@jmcassis/android-livedata-and-content-provider-updates-5f8fd3b2b3a4
+ *
+ * Abstract [LiveData] to observe Android's Content Provider changes.
+ * Provide a [uri] to observe changes and implement [getContentProviderValue]
+ * to provide data to post when content provider notifies a change.
+ */
+abstract class ContentProviderLiveData<T>(
+        private val context: Context,
+        private val uri: Uri
+) : MutableLiveData<T>() {
+
+    private var observer = object : ContentObserver(null) {
+        override fun onChange(self: Boolean) {
+            // Notify LiveData listeners that data at the uri has changed
+            getContentProviderValueAsync()
+        }
+    }
+
+    override fun onActive() {
+        context.contentResolver.registerContentObserver(uri, true, observer)
+        getContentProviderValueAsync()
+    }
+
+    override fun onInactive() {
+        context.contentResolver.unregisterContentObserver(observer)
+    }
+
+    private fun getContentProviderValueAsync() {
+        GlobalScope.launch(Dispatchers.Main) {
+            val accounts = async {
+                getContentProviderValue()
+            }
+
+            postValue(accounts.await())
+        }
+    }
+
+    /**
+     * Implement if you need to provide [T] value to be posted
+     * when observed content is changed.
+     */
+    abstract fun getContentProviderValue(): T
+}
\ No newline at end of file
diff --git a/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java b/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
index 9ea4c2920f2c288d2b5c91388973405a3d81252f..dc7577c2d898a77a3764520a26b4d8e642755ace 100644
--- a/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
+++ b/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
@@ -17,6 +17,7 @@
 package com.android.calendar.recurrencepicker;
 
 import android.app.Activity;
+import android.app.DatePickerDialog;
 import android.app.DialogFragment;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -43,6 +44,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
@@ -56,7 +58,7 @@ import android.widget.ToggleButton;
 
 import com.android.calendar.Utils;
 import com.android.calendarcommon2.EventRecurrence;
-import com.android.datetimepicker.date.DatePickerDialog;
+
 
 import java.text.DateFormatSymbols;
 import java.util.ArrayList;
@@ -89,7 +91,7 @@ public class RecurrencePickerDialog extends DialogFragment implements OnItemSele
     };
     private static final String BUNDLE_MODEL = "bundle_model";
     private static final String BUNDLE_END_COUNT_HAS_FOCUS = "bundle_end_count_has_focus";
-    private static final String FRAG_TAG_DATE_PICKER = "tag_date_picker_frag";
+
     private final int[] TIME_DAY_TO_CALENDAR_DAY = new int[] {
             Calendar.SUNDAY,
             Calendar.MONDAY,
@@ -882,7 +884,7 @@ public class RecurrencePickerDialog extends DialogFragment implements OnItemSele
     }
 
     @Override
-    public void onDateSet(DatePickerDialog view, int year, int monthOfYear, int dayOfMonth) {
+    public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
         if (mModel.endDate == null) {
             mModel.endDate = new Time(mTime.timezone);
             mModel.endDate.hour = mModel.endDate.minute = mModel.endDate.second = 0;
@@ -929,11 +931,9 @@ public class RecurrencePickerDialog extends DialogFragment implements OnItemSele
             if (mDatePickerDialog != null) {
                 mDatePickerDialog.dismiss();
             }
-            mDatePickerDialog = DatePickerDialog.newInstance(this, mModel.endDate.year,
-                    mModel.endDate.month, mModel.endDate.monthDay);
-            mDatePickerDialog.setFirstDayOfWeek(Utils.getFirstDayOfWeekAsCalendar(getActivity()));
-            mDatePickerDialog.setYearRange(Utils.YEAR_MIN, Utils.YEAR_MAX);
-            mDatePickerDialog.show(getFragmentManager(), FRAG_TAG_DATE_PICKER);
+            mDatePickerDialog = new DatePickerDialog(getActivity(), this,
+                    mModel.endDate.year, mModel.endDate.month, mModel.endDate.monthDay);
+            mDatePickerDialog.show();
         } else if (mDone == v) {
             String rrule;
             if (mModel.recurrenceState == RecurrenceModel.STATE_NO_RECURRENCE) {
@@ -950,11 +950,6 @@ public class RecurrencePickerDialog extends DialogFragment implements OnItemSele
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        mDatePickerDialog = (DatePickerDialog) getFragmentManager()
-                .findFragmentByTag(FRAG_TAG_DATE_PICKER);
-        if (mDatePickerDialog != null) {
-            mDatePickerDialog.setOnDateSetListener(this);
-        }
     }
 
     public void setOnRecurrenceSetListener(OnRecurrenceSetListener l) {
diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java b/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
index 39755a7afe5572df08bfbbc26f88b257dba0c677..1a41a14f12d5c170ca2f6b8b941ca0ea39ac0c24 100644
--- a/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
+++ b/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
@@ -24,13 +24,11 @@ import android.database.Cursor;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.provider.CalendarContract.Calendars;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.TouchDelegate;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 import android.widget.ListAdapter;
@@ -87,11 +85,10 @@ public class SelectCalendarsSimpleAdapter extends BaseAdapter implements ListAda
         mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mRes = context.getResources();
 
-        DynamicTheme theme = new DynamicTheme();
-        mColorCalendarVisible = theme.getColor(context, "calendar_visible");
-        mColorCalendarHidden = theme.getColor(context, "calendar_hidden");
-        mColorCalendarSecondaryVisible = theme.getColor(context, "calendar_secondary_visible");
-        mColorCalendarSecondaryHidden = theme.getColor(context, "calendar_secondary_hidden");
+        mColorCalendarVisible = DynamicTheme.getColor(context, "calendar_visible");
+        mColorCalendarHidden = DynamicTheme.getColor(context, "calendar_hidden");
+        mColorCalendarSecondaryVisible = DynamicTheme.getColor(context, "calendar_secondary_visible");
+        mColorCalendarSecondaryHidden = DynamicTheme.getColor(context, "calendar_secondary_hidden");
 
         if (mScale == 0) {
             mScale = mRes.getDisplayMetrics().density;
@@ -216,50 +213,20 @@ public class SelectCalendarsSimpleAdapter extends BaseAdapter implements ListAda
         }
         calendarName.setTextColor(textColor);
 
-        CheckBox syncCheckBox = (CheckBox) view.findViewById(R.id.sync);
-        if (syncCheckBox != null) {
-
-            // Full screen layout
-            syncCheckBox.setChecked(selected);
-
-            colorView.setEnabled(hasMoreColors(position));
-            LayoutParams layoutParam = calendarName.getLayoutParams();
-            TextView secondaryText = (TextView) view.findViewById(R.id.status);
-            if (!TextUtils.isEmpty(mData[position].ownerAccount)
-                    && !mData[position].ownerAccount.equals(name)
-                    && !mData[position].ownerAccount.endsWith("calendar.google.com")) {
-                int secondaryColor;
-                if (selected) {
-                    secondaryColor = mColorCalendarSecondaryVisible;
-                } else {
-                    secondaryColor = mColorCalendarSecondaryHidden;
-                }
-                secondaryText.setText(mData[position].ownerAccount);
-                secondaryText.setTextColor(secondaryColor);
-                secondaryText.setVisibility(View.VISIBLE);
-                layoutParam.height = LayoutParams.WRAP_CONTENT;
-            } else {
-                secondaryText.setVisibility(View.GONE);
-                layoutParam.height = LayoutParams.MATCH_PARENT;
-            }
-
-            calendarName.setLayoutParams(layoutParam);
 
+        // Tablet layout
+        view.findViewById(R.id.color).setEnabled(selected && hasMoreColors(position));
+        view.setBackgroundDrawable(getBackground(position, selected));
+        ViewGroup.LayoutParams newParams = view.getLayoutParams();
+        if (position == mData.length - 1) {
+            newParams.height = BOTTOM_ITEM_HEIGHT;
         } else {
-            // Tablet layout
-            view.findViewById(R.id.color).setEnabled(selected && hasMoreColors(position));
-            view.setBackgroundDrawable(getBackground(position, selected));
-            ViewGroup.LayoutParams newParams = view.getLayoutParams();
-            if (position == mData.length - 1) {
-                newParams.height = BOTTOM_ITEM_HEIGHT;
-            } else {
-                newParams.height = NORMAL_ITEM_HEIGHT;
-            }
-            view.setLayoutParams(newParams);
-            CheckBox visibleCheckBox = (CheckBox) view.findViewById(R.id.visible_check_box);
-            if (visibleCheckBox != null) {
-                visibleCheckBox.setChecked(selected);
-            }
+            newParams.height = NORMAL_ITEM_HEIGHT;
+        }
+        view.setLayoutParams(newParams);
+        CheckBox visibleCheckBox = (CheckBox) view.findViewById(R.id.visible_check_box);
+        if (visibleCheckBox != null) {
+            visibleCheckBox.setChecked(selected);
         }
         view.invalidate();
         return view;
diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java
deleted file mode 100644
index 44af2c4a614a8e62926dfd1bd21b082608249935..0000000000000000000000000000000000000000
--- a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar.selectcalendars;
-
-import android.app.FragmentManager;
-import android.content.Context;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.graphics.Rect;
-import android.graphics.drawable.shapes.RectShape;
-import android.provider.CalendarContract.Calendars;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.TouchDelegate;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.CheckBox;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-
-import com.android.calendar.CalendarColorPickerDialog;
-import com.android.calendar.Utils;
-import com.android.calendar.selectcalendars.CalendarColorCache.OnCalendarColorsLoadedListener;
-
-import java.util.HashMap;
-
-import foundation.e.calendar.R;
-
-public class SelectCalendarsSyncAdapter extends BaseAdapter
-        implements ListAdapter, AdapterView.OnItemClickListener, OnCalendarColorsLoadedListener {
-    private static final String TAG = "SelCalsAdapter";
-    private static final String COLOR_PICKER_DIALOG_TAG = "ColorPickerDialog";
-    private static final int LAYOUT = R.layout.calendar_sync_item;
-    private static int COLOR_CHIP_SIZE = 30;
-    private final String mSyncedString;
-    private final String mNotSyncedString;
-    private RectShape r = new RectShape();
-    private CalendarColorPickerDialog mColorPickerDialog;
-    private CalendarColorCache mCache;
-    private LayoutInflater mInflater;
-    private CalendarRow[] mData;
-    private HashMap<Long, CalendarRow> mChanges = new HashMap<Long, CalendarRow>();
-    private int mRowCount = 0;
-    private int mIdColumn;
-    private int mNameColumn;
-    private int mColorColumn;
-    private int mSyncedColumn;
-    private int mAccountNameColumn;
-    private int mAccountTypeColumn;
-    private boolean mIsTablet;
-    private FragmentManager mFragmentManager;
-    private int mColorViewTouchAreaIncrease;
-
-    public SelectCalendarsSyncAdapter(Context context, Cursor c, FragmentManager manager) {
-        super();
-        initData(c);
-        mCache = new CalendarColorCache(context, this);
-        mFragmentManager = manager;
-        mColorPickerDialog = (CalendarColorPickerDialog)
-                manager.findFragmentByTag(COLOR_PICKER_DIALOG_TAG);
-        mColorViewTouchAreaIncrease = context.getResources()
-                .getDimensionPixelSize(R.dimen.color_view_touch_area_increase);
-        mIsTablet = Utils.getConfigBool(context, R.bool.tablet_config);
-        mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        COLOR_CHIP_SIZE *= context.getResources().getDisplayMetrics().density;
-        r.resize(COLOR_CHIP_SIZE, COLOR_CHIP_SIZE);
-        Resources res = context.getResources();
-        mSyncedString = res.getString(R.string.synced);
-        mNotSyncedString = res.getString(R.string.not_synced);
-    }
-
-    private static void setText(View view, int id, String text) {
-        if (TextUtils.isEmpty(text)) {
-            return;
-        }
-        TextView textView = (TextView) view.findViewById(id);
-        textView.setText(text);
-    }
-
-    private void initData(Cursor c) {
-        if (c == null) {
-            mRowCount = 0;
-            mData = null;
-            return;
-        }
-
-        mIdColumn = c.getColumnIndexOrThrow(Calendars._ID);
-        mNameColumn = c.getColumnIndexOrThrow(Calendars.CALENDAR_DISPLAY_NAME);
-        mColorColumn = c.getColumnIndexOrThrow(Calendars.CALENDAR_COLOR);
-        mSyncedColumn = c.getColumnIndexOrThrow(Calendars.SYNC_EVENTS);
-        mAccountNameColumn = c.getColumnIndexOrThrow(Calendars.ACCOUNT_NAME);
-        mAccountTypeColumn = c.getColumnIndexOrThrow(Calendars.ACCOUNT_TYPE);
-
-        mRowCount = c.getCount();
-        mData = new CalendarRow[mRowCount];
-        c.moveToPosition(-1);
-        int p = 0;
-        while (c.moveToNext()) {
-            long id = c.getLong(mIdColumn);
-            mData[p] = new CalendarRow();
-            mData[p].id = id;
-            mData[p].displayName = c.getString(mNameColumn);
-            mData[p].color = c.getInt(mColorColumn);
-            mData[p].originalSynced = c.getInt(mSyncedColumn) != 0;
-            mData[p].accountName = c.getString(mAccountNameColumn);
-            mData[p].accountType = c.getString(mAccountTypeColumn);
-            if (mChanges.containsKey(id)) {
-                mData[p].synced = mChanges.get(id).synced;
-            } else {
-                mData[p].synced = mData[p].originalSynced;
-            }
-            p++;
-        }
-    }
-
-    public void changeCursor(Cursor c) {
-        initData(c);
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public View getView(final int position, View convertView, ViewGroup parent) {
-        if (position >= mRowCount) {
-            return null;
-        }
-        String name = mData[position].displayName;
-        boolean selected = mData[position].synced;
-        int color = Utils.getDisplayColorFromColor(mData[position].color);
-        View view;
-        if (convertView == null) {
-            view = mInflater.inflate(LAYOUT, parent, false);
-            final View delegate = view.findViewById(R.id.color);
-            final View delegateParent = (View) delegate.getParent();
-            delegateParent.post(new Runnable() {
-
-                @Override
-                public void run() {
-                    final Rect r = new Rect();
-                    delegate.getHitRect(r);
-                    r.top -= mColorViewTouchAreaIncrease;
-                    r.bottom += mColorViewTouchAreaIncrease;
-                    r.left -= mColorViewTouchAreaIncrease;
-                    r.right += mColorViewTouchAreaIncrease;
-                    delegateParent.setTouchDelegate(new TouchDelegate(r, delegate));
-                }
-            });
-        } else {
-            view = convertView;
-        }
-
-        view.setTag(mData[position]);
-
-        CheckBox cb = (CheckBox) view.findViewById(R.id.sync);
-        cb.setChecked(selected);
-
-        if (selected) {
-            setText(view, R.id.status, mSyncedString);
-        } else {
-            setText(view, R.id.status, mNotSyncedString);
-        }
-
-        View colorView = view.findViewById(R.id.color);
-        colorView.setEnabled(hasMoreColors(position));
-        colorView.setBackgroundColor(color);
-        colorView.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                // Purely for sanity check--view should be disabled if account has no more colors
-                if (!hasMoreColors(position)) {
-                    return;
-                }
-
-                if (mColorPickerDialog == null) {
-                    mColorPickerDialog = CalendarColorPickerDialog.newInstance(mData[position].id,
-                            mIsTablet);
-                } else {
-                    mColorPickerDialog.setCalendarId(mData[position].id);
-                }
-                mFragmentManager.executePendingTransactions();
-                if (!mColorPickerDialog.isAdded()) {
-                    mColorPickerDialog.show(mFragmentManager, COLOR_PICKER_DIALOG_TAG);
-                }
-            }
-        });
-
-        setText(view, R.id.calendar, name);
-        return view;
-    }
-
-    private boolean hasMoreColors(int position) {
-        return mCache.hasColors(mData[position].accountName, mData[position].accountType);
-    }
-
-    @Override
-    public int getCount() {
-        return mRowCount;
-    }
-
-    @Override
-    public Object getItem(int position) {
-        if (position >= mRowCount) {
-            return null;
-        }
-        CalendarRow item = mData[position];
-        return item;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        if (position >= mRowCount) {
-            return 0;
-        }
-        return mData[position].id;
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return true;
-    }
-
-    public int getSynced(int position) {
-        return mData[position].synced ? 1 : 0;
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id)  {
-        CalendarRow row = (CalendarRow) view.getTag();
-        row.synced = !row.synced;
-
-        String status;
-        if (row.synced) {
-            status = mSyncedString;
-        } else {
-            status = mNotSyncedString;
-        }
-        setText(view, R.id.status, status);
-
-        CheckBox cb = (CheckBox) view.findViewById(R.id.sync);
-        cb.setChecked(row.synced);
-
-        // There is some data loss in long -> int, but we should never see it in
-        // practice regarding calendar ids.
-        mChanges.put(row.id, row);
-    }
-
-    public HashMap<Long, CalendarRow> getChanges() {
-        return mChanges;
-    }
-
-    @Override
-    public void onCalendarColorsLoaded() {
-        notifyDataSetChanged();
-    }
-
-    public class CalendarRow {
-        long id;
-        String displayName;
-        int color;
-        boolean synced;
-        boolean originalSynced;
-        String accountName;
-        String accountType;
-    }
-}
diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncFragment.java b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncFragment.java
deleted file mode 100644
index f1ee19cb84c2997df478a0431bd58d1547414461..0000000000000000000000000000000000000000
--- a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncFragment.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar.selectcalendars;
-
-import android.accounts.Account;
-import android.app.Activity;
-import android.app.ListFragment;
-import android.app.LoaderManager;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.CursorLoader;
-import android.content.Intent;
-import android.content.Loader;
-import android.content.res.Resources;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.provider.CalendarContract;
-import android.provider.CalendarContract.Calendars;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-
-import com.android.calendar.AsyncQueryService;
-import com.android.calendar.Utils;
-import com.android.calendar.selectcalendars.SelectCalendarsSyncAdapter.CalendarRow;
-
-import java.util.HashMap;
-
-import foundation.e.calendar.R;
-
-public class SelectCalendarsSyncFragment extends ListFragment
-        implements View.OnClickListener, LoaderManager.LoaderCallbacks<Cursor> {
-
-    private static final String TAG = "SelectCalendarSync";
-
-    private static final String COLLATE_NOCASE = " COLLATE NOCASE";
-    private static final String SELECTION = Calendars.ACCOUNT_NAME + "=? AND "
-            + Calendars.ACCOUNT_TYPE + "=?";
-    // is primary lets us sort the user's main calendar to the top of the list
-    private static final String IS_PRIMARY = "\"primary\"";
-    private static final String SORT_ORDER = IS_PRIMARY + " DESC," + Calendars.CALENDAR_DISPLAY_NAME
-            + COLLATE_NOCASE;
-
-    private static final String[] PROJECTION = new String[] {
-        Calendars._ID,
-        Calendars.CALENDAR_DISPLAY_NAME,
-        Calendars.CALENDAR_COLOR,
-        Calendars.SYNC_EVENTS,
-        Calendars.ACCOUNT_NAME,
-        Calendars.ACCOUNT_TYPE,
-        "(" + Calendars.ACCOUNT_NAME + "=" + Calendars.OWNER_ACCOUNT + ") AS " + IS_PRIMARY, };
-    private final String[] mArgs = new String[2];
-    private TextView mSyncStatus;
-    private Button mAccountsButton;
-    private Account mAccount;
-    private AsyncQueryService mService;
-    private Handler mHandler = new Handler();
-    private ContentObserver mCalendarsObserver = new ContentObserver(mHandler) {
-        @Override
-        public void onChange(boolean selfChange) {
-            // We don't need our own sync changes to trigger refreshes.
-            if (!selfChange) {
-                getLoaderManager().initLoader(0, null, SelectCalendarsSyncFragment.this);
-            }
-        }
-    };
-
-    public SelectCalendarsSyncFragment() {
-    }
-
-    public SelectCalendarsSyncFragment(Bundle bundle) {
-        mAccount = new Account(bundle.getString(Calendars.ACCOUNT_NAME),
-                bundle.getString(Calendars.ACCOUNT_TYPE));
-    }
-
-    @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.account_calendars, null);
-        mSyncStatus = (TextView) v.findViewById(R.id.account_status);
-        mSyncStatus.setVisibility(View.GONE);
-
-        mAccountsButton = (Button) v.findViewById(R.id.sync_settings);
-        mAccountsButton.setVisibility(View.GONE);
-        mAccountsButton.setOnClickListener(this);
-
-        return v;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        // Give some text to display if there is no data. In a real
-        // application this would come from a resource.
-        setEmptyText(getActivity().getText(R.string.no_syncable_calendars));
-        // Prepare the loader. Either re-connect with an existing one,
-        // or start a new one.
-        getLoaderManager().initLoader(0, null, this);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (!ContentResolver.getMasterSyncAutomatically()
-                || !ContentResolver.getSyncAutomatically(mAccount, CalendarContract.AUTHORITY)) {
-            Resources res = getActivity().getResources();
-            mSyncStatus.setText(res.getString(R.string.acct_not_synced));
-            mSyncStatus.setVisibility(View.VISIBLE);
-            mAccountsButton.setText(res.getString(R.string.accounts));
-            mAccountsButton.setVisibility(View.VISIBLE);
-        } else {
-            mSyncStatus.setVisibility(View.GONE);
-            mAccountsButton.setVisibility(View.GONE);
-
-            // Start a background sync to get the list of calendars from the server.
-            Utils.startCalendarMetafeedSync(mAccount);
-            getActivity().getContentResolver().registerContentObserver(
-                    Calendars.CONTENT_URI, true, mCalendarsObserver);
-       }
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        mService = new AsyncQueryService(activity);
-
-        Bundle bundle = getArguments();
-        if (bundle != null && bundle.containsKey(Calendars.ACCOUNT_NAME)
-                && bundle.containsKey(Calendars.ACCOUNT_TYPE)) {
-            mAccount = new Account(bundle.getString(Calendars.ACCOUNT_NAME),
-                    bundle.getString(Calendars.ACCOUNT_TYPE));
-        }
-    }
-
-    @Override
-    public void onPause() {
-        final ListAdapter listAdapter = getListAdapter();
-        if (listAdapter != null) {
-            HashMap<Long, CalendarRow> changes = ((SelectCalendarsSyncAdapter) listAdapter)
-                    .getChanges();
-            if (changes != null && changes.size() > 0) {
-                for (CalendarRow row : changes.values()) {
-                    if (row.synced == row.originalSynced) {
-                        continue;
-                    }
-                    long id = row.id;
-                    mService.cancelOperation((int) id);
-                    // Use the full long id in case it makes a difference
-                    Uri uri = ContentUris.withAppendedId(Calendars.CONTENT_URI, row.id);
-                    ContentValues values = new ContentValues();
-                    // Toggle the current setting
-                    int synced = row.synced ? 1 : 0;
-                    values.put(Calendars.SYNC_EVENTS, synced);
-                    values.put(Calendars.VISIBLE, synced);
-                    mService.startUpdate((int) id, null, uri, values, null, null, 0);
-                }
-                changes.clear();
-            }
-        }
-        getActivity().getContentResolver().unregisterContentObserver(mCalendarsObserver);
-        super.onPause();
-    }
-
-    @Override
-    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-        mArgs[0] = mAccount.name;
-        mArgs[1] = mAccount.type;
-        return new CursorLoader(
-                getActivity(), Calendars.CONTENT_URI, PROJECTION, SELECTION, mArgs, SORT_ORDER);
-    }
-
-    @Override
-    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-        SelectCalendarsSyncAdapter adapter = (SelectCalendarsSyncAdapter) getListAdapter();
-        if (adapter == null) {
-            adapter = new SelectCalendarsSyncAdapter(getActivity(), data, getFragmentManager());
-            setListAdapter(adapter);
-        } else {
-            adapter.changeCursor(data);
-        }
-        getListView().setOnItemClickListener(adapter);
-    }
-
-    public void onLoaderReset(Loader<Cursor> loader) {
-        setListAdapter(null);
-    }
-
-    // Called when the Accounts button is pressed. Takes the user to the
-    // Accounts and Sync settings page.
-    @Override
-    public void onClick(View v) {
-        Intent intent = new Intent();
-        intent.setAction("android.settings.SYNC_SETTINGS");
-        getActivity().startActivity(intent);
-    }
-}
diff --git a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java
deleted file mode 100644
index 9cf7396b647a2685c86aa4b276c721a983a90cd6..0000000000000000000000000000000000000000
--- a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar.selectcalendars;
-
-import android.app.ActionBar;
-import android.app.ExpandableListActivity;
-import android.content.AsyncQueryHandler;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.CalendarContract.Calendars;
-import androidx.appcompat.widget.AppCompatCheckBox;
-import androidx.appcompat.widget.AppCompatCheckedTextView;
-import androidx.appcompat.widget.AppCompatEditText;
-import androidx.appcompat.widget.AppCompatRadioButton;
-import androidx.appcompat.widget.AppCompatSpinner;
-import android.util.AttributeSet;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ExpandableListView;
-
-import com.android.calendar.DynamicTheme;
-import com.android.calendar.Utils;
-
-import foundation.e.calendar.R;
-
-public class SelectSyncedCalendarsMultiAccountActivity extends ExpandableListActivity
-    implements View.OnClickListener {
-
-    private static final String TAG = "Calendar";
-    private static final String EXPANDED_KEY = "is_expanded";
-    private static final String ACCOUNT_UNIQUE_KEY = "ACCOUNT_KEY";
-    private static final String[] PROJECTION = new String[] {
-        Calendars._ID,
-        Calendars.ACCOUNT_TYPE,
-        Calendars.ACCOUNT_NAME,
-        Calendars.ACCOUNT_TYPE + " || " + Calendars.ACCOUNT_NAME + " AS " +
-                ACCOUNT_UNIQUE_KEY,
-    };
-    private MatrixCursor mAccountsCursor = null;
-    private ExpandableListView mList;
-    private SelectSyncedCalendarsMultiAccountAdapter mAdapter;
-    private final DynamicTheme dynamicTheme = new DynamicTheme();
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        dynamicTheme.onCreate(this);
-        setContentView(R.layout.select_calendars_multi_accounts_fragment);
-        mList = getExpandableListView();
-        mList.setEmptyView(findViewById(R.id.loading));
-        // Start a background sync to get the list of calendars from the server.
-        Utils.startCalendarMetafeedSync(null);
-
-        findViewById(R.id.btn_done).setOnClickListener(this);
-        findViewById(R.id.btn_discard).setOnClickListener(this);
-    }
-
-    @Override
-    public View onCreateView(String name, Context context, AttributeSet attrs) {
-        // Allow super to try and create a view first
-        final View result = super.onCreateView(name, context, attrs);
-
-        if (result != null) {
-            return result;
-        }
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            // If we're running pre-L, we need to 'inject' our tint aware Views in place of the
-            // standard framework versions
-            switch (name) {
-                case "EditText":
-                    return new AppCompatEditText(this, attrs);
-                case "Spinner":
-                    return new AppCompatSpinner(this, attrs);
-                case "CheckBox":
-                    return new AppCompatCheckBox(this, attrs);
-                case "RadioButton":
-                    return new AppCompatRadioButton(this, attrs);
-                case "CheckedTextView":
-                    return new AppCompatCheckedTextView(this, attrs);
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public void onClick(View view) {
-        if (view.getId() == R.id.btn_done) {
-            if (mAdapter != null) {
-                mAdapter.doSaveAction();
-            }
-            finish();
-        } else if (view.getId() == R.id.btn_discard) {
-            finish();
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        dynamicTheme.onResume(this);
-        if (mAdapter != null) {
-            mAdapter.startRefreshStopDelay();
-        }
-        new AsyncQueryHandler(getContentResolver()) {
-            @Override
-            protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
-                mAccountsCursor = Utils.matrixCursorFromCursor(cursor);
-
-                mAdapter = new SelectSyncedCalendarsMultiAccountAdapter(
-                        findViewById(R.id.calendars).getContext(), mAccountsCursor,
-                        SelectSyncedCalendarsMultiAccountActivity.this);
-                mList.setAdapter(mAdapter);
-
-                // TODO initialize from sharepref
-                int count = mList.getCount();
-                for(int i = 0; i < count; i++) {
-                    mList.expandGroup(i);
-                }
-            }
-        }.startQuery(0, null, Calendars.CONTENT_URI, PROJECTION,
-                "1) GROUP BY (" + ACCOUNT_UNIQUE_KEY, //Cheap hack to make WHERE a GROUP BY query
-                null /* selectionArgs */,
-                Calendars.ACCOUNT_NAME /*sort order*/);
-        //TODO change to something that supports group by queries.
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (mAdapter != null) {
-            mAdapter.cancelRefreshStopDelay();
-        }
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        if (mAdapter != null) {
-            mAdapter.closeChildrenCursors();
-        }
-        if (mAccountsCursor != null && !mAccountsCursor.isClosed()) {
-            mAccountsCursor.close();
-        }
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        boolean[] isExpanded;
-        mList = getExpandableListView();
-        if(mList != null) {
-            int count = mList.getCount();
-            isExpanded = new boolean[count];
-            for(int i = 0; i < count; i++) {
-                isExpanded[i] = mList.isGroupExpanded(i);
-            }
-        } else {
-            isExpanded = null;
-        }
-        outState.putBooleanArray(EXPANDED_KEY, isExpanded);
-        //TODO Store this to preferences instead so it remains on restart
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Bundle state) {
-        super.onRestoreInstanceState(state);
-        mList = getExpandableListView();
-        boolean[] isExpanded = state.getBooleanArray(EXPANDED_KEY);
-        if(mList != null && isExpanded != null && mList.getCount() >= isExpanded.length) {
-            for(int i = 0; i < isExpanded.length; i++) {
-                if(isExpanded[i] && !mList.isGroupExpanded(i)) {
-                    mList.expandGroup(i);
-                } else if(!isExpanded[i] && mList.isGroupExpanded(i)){
-                    mList.collapseGroup(i);
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        if (getActionBar() != null){
-            getActionBar().setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                Utils.returnToCalendarHome(this);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}
diff --git a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java
deleted file mode 100644
index 3709f5ed5116f68f1d455a3beaca632f6412fb11..0000000000000000000000000000000000000000
--- a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar.selectcalendars;
-
-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorDescription;
-import android.app.FragmentManager;
-import android.content.AsyncQueryHandler;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.graphics.Rect;
-import android.net.Uri;
-import android.provider.CalendarContract.Calendars;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.TouchDelegate;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.CursorTreeAdapter;
-import android.widget.TextView;
-
-import com.android.calendar.CalendarColorPickerDialog;
-import com.android.calendar.Utils;
-import com.android.calendar.selectcalendars.CalendarColorCache.OnCalendarColorsLoadedListener;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import foundation.e.calendar.R;
-
-public class SelectSyncedCalendarsMultiAccountAdapter extends CursorTreeAdapter implements
-        View.OnClickListener, OnCalendarColorsLoadedListener {
-
-    private static final String TAG = "Calendar";
-    private static final String COLOR_PICKER_DIALOG_TAG = "ColorPickerDialog";
-
-    private static final String IS_PRIMARY = "\"primary\"";
-    private static final String CALENDARS_ORDERBY = IS_PRIMARY + " DESC,"
-            + Calendars.CALENDAR_DISPLAY_NAME + " COLLATE NOCASE";
-    private static final String ACCOUNT_SELECTION = Calendars.ACCOUNT_NAME + "=?"
-            + " AND " + Calendars.ACCOUNT_TYPE + "=?";
-    // This is to keep our update tokens separate from other tokens. Since we cancel old updates
-    // when a new update comes in, we'd like to leave a token space that won't be canceled.
-    private static final int MIN_UPDATE_TOKEN = 1000;
-    // How long to wait between requeries of the calendars to see if anything has changed.
-    private static final int REFRESH_DELAY = 5000;
-    // How long to keep refreshing for
-    private static final int REFRESH_DURATION = 60000;
-    private static final String[] PROJECTION = new String[] {
-      Calendars._ID,
-      Calendars.ACCOUNT_NAME,
-      Calendars.OWNER_ACCOUNT,
-      Calendars.CALENDAR_DISPLAY_NAME,
-      Calendars.CALENDAR_COLOR,
-      Calendars.VISIBLE,
-      Calendars.SYNC_EVENTS,
-      "(" + Calendars.ACCOUNT_NAME + "=" + Calendars.OWNER_ACCOUNT + ") AS " + IS_PRIMARY,
-      Calendars.ACCOUNT_TYPE
-    };
-    //Keep these in sync with the projection
-    private static final int ID_COLUMN = 0;
-    private static final int ACCOUNT_COLUMN = 1;
-    private static final int OWNER_COLUMN = 2;
-    private static final int NAME_COLUMN = 3;
-    private static final int COLOR_COLUMN = 4;
-    private static final int SELECTED_COLUMN = 5;
-    private static final int SYNCED_COLUMN = 6;
-    private static final int PRIMARY_COLUMN = 7;
-    private static final int ACCOUNT_TYPE_COLUMN = 8;
-    private static final int TAG_ID_CALENDAR_ID = R.id.calendar;
-    private static final int TAG_ID_SYNC_CHECKBOX = R.id.sync;
-    private static int mUpdateToken = MIN_UPDATE_TOKEN;
-    private static boolean mRefresh = true;
-    private final static Runnable mStopRefreshing = new Runnable() {
-        @Override
-        public void run() {
-            mRefresh = false;
-        }
-    };
-    private static String mSyncedText;
-    private static String mNotSyncedText;
-    // This is to keep track of whether or not multiple calendars have the same display name
-    private static HashMap<String, Boolean> mIsDuplicateName = new HashMap<String, Boolean>();
-    private final LayoutInflater mInflater;
-    private final ContentResolver mResolver;
-    private final SelectSyncedCalendarsMultiAccountActivity mActivity;
-    private final FragmentManager mFragmentManager;
-    private final boolean mIsTablet;
-    private final View mView;
-    protected AuthenticatorDescription[] mAuthDescs;
-    private CalendarColorPickerDialog mColorPickerDialog;
-    private Map<String, AuthenticatorDescription> mTypeToAuthDescription
-            = new HashMap<String, AuthenticatorDescription>();
-    // These track changes to the synced state of calendars
-    private Map<Long, Boolean> mCalendarChanges
-            = new HashMap<Long, Boolean>();
-    private Map<Long, Boolean> mCalendarInitialStates
-            = new HashMap<Long, Boolean>();
-    // Flag for when the cursors have all been closed to ensure no race condition with queries.
-    private boolean mClosedCursorsFlag;
-    // This is for keeping MatrixCursor copies so that we can requery in the background.
-    private Map<String, Cursor> mChildrenCursors
-            = new HashMap<String, Cursor>();
-    private AsyncCalendarsUpdater mCalendarsUpdater;
-    private int mColorViewTouchAreaIncrease;
-    private CalendarColorCache mCache;
-
-    public SelectSyncedCalendarsMultiAccountAdapter(Context context, Cursor acctsCursor,
-                                                    SelectSyncedCalendarsMultiAccountActivity act) {
-        super(acctsCursor, context);
-        mSyncedText = context.getString(R.string.synced);
-        mNotSyncedText = context.getString(R.string.not_synced);
-
-        mCache = new CalendarColorCache(context, this);
-
-        mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        mResolver = context.getContentResolver();
-        mActivity = act;
-        mFragmentManager = act.getFragmentManager();
-        mColorPickerDialog = (CalendarColorPickerDialog)
-                mFragmentManager.findFragmentByTag(COLOR_PICKER_DIALOG_TAG);
-        mIsTablet = Utils.getConfigBool(context, R.bool.tablet_config);
-
-        if (mCalendarsUpdater == null) {
-            mCalendarsUpdater = new AsyncCalendarsUpdater(mResolver);
-        }
-
-        if (acctsCursor == null || acctsCursor.getCount() == 0) {
-            Log.i(TAG, "SelectCalendarsAdapter: No accounts were returned!");
-        }
-        // Collect proper description for account types
-        mAuthDescs = AccountManager.get(context).getAuthenticatorTypes();
-        for (int i = 0; i < mAuthDescs.length; i++) {
-            mTypeToAuthDescription.put(mAuthDescs[i].type, mAuthDescs[i]);
-        }
-        mView = mActivity.getExpandableListView();
-        mRefresh = true;
-        mClosedCursorsFlag = false;
-
-        mColorViewTouchAreaIncrease = context.getResources()
-                .getDimensionPixelSize(R.dimen.color_view_touch_area_increase);
-    }
-
-    private static void setText(View view, int id, String text) {
-        if (TextUtils.isEmpty(text)) {
-            return;
-        }
-        TextView textView = (TextView) view.findViewById(id);
-        textView.setText(text);
-    }
-
-    /**
-     * Method for changing the sync state when a calendar's button is pressed.
-     *
-     * This gets called when the CheckBox for a calendar is clicked. It toggles
-     * the sync state for the associated calendar and saves a change of state to
-     * a hashmap. It also compares against the original value and removes any
-     * changes from the hashmap if this is back at its initial state.
-     */
-    @Override
-    public void onClick(View v) {
-        long id = (Long) v.getTag(TAG_ID_CALENDAR_ID);
-        boolean newState;
-        boolean initialState = mCalendarInitialStates.get(id);
-        if (mCalendarChanges.containsKey(id)) {
-            // Negate to reflect the click
-            newState = !mCalendarChanges.get(id);
-        } else {
-            // Negate to reflect the click
-            newState = !initialState;
-        }
-
-        if (newState == initialState) {
-            mCalendarChanges.remove(id);
-        } else {
-            mCalendarChanges.put(id, newState);
-        }
-
-        ((CheckBox) v.getTag(TAG_ID_SYNC_CHECKBOX)).setChecked(newState);
-        setText(v, R.id.status, newState ? mSyncedText : mNotSyncedText);
-    }
-
-    public void startRefreshStopDelay() {
-        mRefresh = true;
-        mView.postDelayed(mStopRefreshing, REFRESH_DURATION);
-    }
-
-    public void cancelRefreshStopDelay() {
-        mView.removeCallbacks(mStopRefreshing);
-    }
-
-    /*
-     * Write back the changes that have been made. The sync code will pick up any changes and
-     * do updates on its own.
-     */
-    public void doSaveAction() {
-        // Cancel the previous operation
-        mCalendarsUpdater.cancelOperation(mUpdateToken);
-        mUpdateToken++;
-        // This is to allow us to do queries and updates with the same AsyncQueryHandler without
-        // accidently canceling queries.
-        if(mUpdateToken < MIN_UPDATE_TOKEN) {
-            mUpdateToken = MIN_UPDATE_TOKEN;
-        }
-
-        Iterator<Long> changeKeys = mCalendarChanges.keySet().iterator();
-        while (changeKeys.hasNext()) {
-            long id = changeKeys.next();
-            boolean newSynced = mCalendarChanges.get(id);
-
-            Uri uri = ContentUris.withAppendedId(Calendars.CONTENT_URI, id);
-            ContentValues values = new ContentValues();
-            values.put(Calendars.VISIBLE, newSynced ? 1 : 0);
-            values.put(Calendars.SYNC_EVENTS, newSynced ? 1 : 0);
-            mCalendarsUpdater.startUpdate(mUpdateToken, id, uri, values, null, null);
-        }
-    }
-
-    /**
-     * Gets the label associated with a particular account type. If none found, return null.
-     * @param accountType the type of account
-     * @return a CharSequence for the label or null if one cannot be found.
-     */
-    protected CharSequence getLabelForType(final String accountType) {
-        CharSequence label = null;
-        if (mTypeToAuthDescription.containsKey(accountType)) {
-             try {
-                 AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-                 Context authContext = mActivity.createPackageContext(desc.packageName, 0);
-                 label = authContext.getResources().getText(desc.labelId);
-             } catch (PackageManager.NameNotFoundException e) {
-                 Log.w(TAG, "No label for account type " + ", type " + accountType);
-             }
-        }
-        return label;
-    }
-
-    @Override
-    protected void bindChildView(View view, Context context, Cursor cursor, boolean isLastChild) {
-        final long id = cursor.getLong(ID_COLUMN);
-        String name = cursor.getString(NAME_COLUMN);
-        String owner = cursor.getString(OWNER_COLUMN);
-        final String accountName = cursor.getString(ACCOUNT_COLUMN);
-        final String accountType = cursor.getString(ACCOUNT_TYPE_COLUMN);
-        int color = Utils.getDisplayColorFromColor(cursor.getInt(COLOR_COLUMN));
-
-        final View colorSquare = view.findViewById(R.id.color);
-        colorSquare.setEnabled(mCache.hasColors(accountName, accountType));
-        colorSquare.setBackgroundColor(color);
-        final View delegateParent = (View) colorSquare.getParent();
-        delegateParent.post(new Runnable() {
-
-            @Override
-            public void run() {
-                final Rect r = new Rect();
-                colorSquare.getHitRect(r);
-                r.top -= mColorViewTouchAreaIncrease;
-                r.bottom += mColorViewTouchAreaIncrease;
-                r.left -= mColorViewTouchAreaIncrease;
-                r.right += mColorViewTouchAreaIncrease;
-                delegateParent.setTouchDelegate(new TouchDelegate(r, colorSquare));
-            }
-        });
-        colorSquare.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                if (!mCache.hasColors(accountName, accountType)) {
-                    return;
-                }
-                if (mColorPickerDialog == null) {
-                    mColorPickerDialog = CalendarColorPickerDialog.newInstance(id, mIsTablet);
-                } else {
-                    mColorPickerDialog.setCalendarId(id);
-                }
-                mFragmentManager.executePendingTransactions();
-                if (!mColorPickerDialog.isAdded()) {
-                    mColorPickerDialog.show(mFragmentManager, COLOR_PICKER_DIALOG_TAG);
-                }
-            }
-        });
-        if (mIsDuplicateName.containsKey(name) && mIsDuplicateName.get(name) &&
-                !name.equalsIgnoreCase(owner)) {
-            name = new StringBuilder(name)
-                    .append(Utils.OPEN_EMAIL_MARKER)
-                    .append(owner)
-                    .append(Utils.CLOSE_EMAIL_MARKER)
-                    .toString();
-        }
-        setText(view, R.id.calendar, name);
-
-        // First see if the user has already changed the state of this calendar
-        Boolean sync = mCalendarChanges.get(id);
-        if (sync == null) {
-            sync = cursor.getInt(SYNCED_COLUMN) == 1;
-            mCalendarInitialStates.put(id, sync);
-        }
-
-        CheckBox button = (CheckBox) view.findViewById(R.id.sync);
-        button.setChecked(sync);
-        setText(view, R.id.status, sync ? mSyncedText : mNotSyncedText);
-
-        view.setTag(TAG_ID_CALENDAR_ID, id);
-        view.setTag(TAG_ID_SYNC_CHECKBOX, button);
-        view.setOnClickListener(this);
-    }
-
-    @Override
-    protected void bindGroupView(View view, Context context, Cursor cursor, boolean isExpanded) {
-        int accountColumn = cursor.getColumnIndexOrThrow(Calendars.ACCOUNT_NAME);
-        int accountTypeColumn = cursor.getColumnIndexOrThrow(Calendars.ACCOUNT_TYPE);
-        String account = cursor.getString(accountColumn);
-        String accountType = cursor.getString(accountTypeColumn);
-        CharSequence accountLabel = getLabelForType(accountType);
-        setText(view, R.id.account, account);
-        if (accountLabel != null) {
-            setText(view, R.id.account_type, accountLabel.toString());
-        }
-    }
-
-    @Override
-    protected Cursor getChildrenCursor(Cursor groupCursor) {
-        int accountColumn = groupCursor.getColumnIndexOrThrow(Calendars.ACCOUNT_NAME);
-        int accountTypeColumn = groupCursor.getColumnIndexOrThrow(Calendars.ACCOUNT_TYPE);
-        String account = groupCursor.getString(accountColumn);
-        String accountType = groupCursor.getString(accountTypeColumn);
-        //Get all the calendars for just this account.
-        Cursor childCursor = mChildrenCursors.get(accountType + "#" + account);
-        new RefreshCalendars(groupCursor.getPosition(), account, accountType).run();
-        return childCursor;
-    }
-
-    @Override
-    protected View newChildView(Context context, Cursor cursor, boolean isLastChild,
-            ViewGroup parent) {
-        return mInflater.inflate(R.layout.calendar_sync_item, parent, false);
-    }
-
-    @Override
-    protected View newGroupView(Context context, Cursor cursor, boolean isExpanded,
-            ViewGroup parent) {
-        return mInflater.inflate(R.layout.account_item, parent, false);
-    }
-
-    public void closeChildrenCursors() {
-        synchronized (mChildrenCursors) {
-            for (String key : mChildrenCursors.keySet()) {
-                Cursor cursor = mChildrenCursors.get(key);
-                if (!cursor.isClosed()) {
-                    cursor.close();
-                }
-            }
-            mChildrenCursors.clear();
-            mClosedCursorsFlag = true;
-        }
-    }
-
-    @Override
-    public void onCalendarColorsLoaded() {
-        notifyDataSetChanged();
-    }
-
-    private class AsyncCalendarsUpdater extends AsyncQueryHandler {
-
-        public AsyncCalendarsUpdater(ContentResolver cr) {
-            super(cr);
-        }
-
-        @Override
-        protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
-            if (cursor == null) {
-                return;
-            }
-            synchronized (mChildrenCursors) {
-                if (mClosedCursorsFlag || (mActivity != null && mActivity.isFinishing())) {
-                    cursor.close();
-                    return;
-                }
-            }
-
-            Cursor currentCursor = mChildrenCursors.get(cookie);
-            // Check if the new cursor has the same content as our old cursor
-            if (currentCursor != null) {
-                if (Utils.compareCursors(currentCursor, cursor)) {
-                    cursor.close();
-                    return;
-                }
-            }
-            // If not then make a new matrix cursor for our Map
-            MatrixCursor newCursor = Utils.matrixCursorFromCursor(cursor);
-            cursor.close();
-            // And update our list of duplicated names
-            Utils.checkForDuplicateNames(mIsDuplicateName, newCursor, NAME_COLUMN);
-
-            mChildrenCursors.put((String) cookie, newCursor);
-            try {
-                setChildrenCursor(token, newCursor);
-            } catch (NullPointerException e) {
-                Log.w(TAG, "Adapter expired, try again on the next query: " + e);
-            }
-            // Clean up our old cursor if we had one. We have to do this after setting the new
-            // cursor so that our view doesn't throw on an invalid cursor.
-            if (currentCursor != null) {
-                currentCursor.close();
-            }
-        }
-    }
-
-    private class RefreshCalendars implements Runnable {
-
-        int mToken;
-        String mAccount;
-        String mAccountType;
-
-        public RefreshCalendars(int token, String account, String accountType) {
-            mToken = token;
-            mAccount = account;
-            mAccountType = accountType;
-        }
-
-        @Override
-        public void run() {
-            mCalendarsUpdater.cancelOperation(mToken);
-            // Set up a refresh for some point in the future if we haven't stopped updates yet
-            if(mRefresh) {
-                mView.postDelayed(new RefreshCalendars(mToken, mAccount, mAccountType),
-                        REFRESH_DELAY);
-            }
-            mCalendarsUpdater.startQuery(mToken,
-                    mAccountType + "#" + mAccount,
-                    Calendars.CONTENT_URI, PROJECTION,
-                    ACCOUNT_SELECTION,
-                    new String[] { mAccount, mAccountType } /*selectionArgs*/,
-                    CALENDARS_ORDERBY);
-        }
-    }
-}
diff --git a/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsActivity.java b/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsActivity.java
deleted file mode 100644
index dd533acbfb77f9c6742feacbea52db00505281a4..0000000000000000000000000000000000000000
--- a/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsActivity.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar.selectcalendars;
-
-import android.app.ActionBar;
-import android.app.FragmentTransaction;
-import android.content.Intent;
-import android.database.ContentObserver;
-import android.os.Bundle;
-import android.os.Handler;
-import android.provider.CalendarContract;
-import androidx.appcompat.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-import com.android.calendar.AbstractCalendarActivity;
-import com.android.calendar.CalendarController;
-import com.android.calendar.CalendarController.EventType;
-import com.android.calendar.CalendarController.ViewType;
-import com.android.calendar.DynamicTheme;
-import com.android.calendar.Utils;
-
-import foundation.e.calendar.R;
-
-public class SelectVisibleCalendarsActivity extends AbstractCalendarActivity {
-    private SelectVisibleCalendarsFragment mFragment;
-    private CalendarController mController;
-
-    // Create an observer so that we can update the views whenever a
-    // Calendar event changes.
-    private final ContentObserver mObserver = new ContentObserver(new Handler()) {
-        @Override
-        public boolean deliverSelfNotifications() {
-            return true;
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-          mController.sendEvent(this, EventType.EVENTS_CHANGED, null, null, -1, ViewType.CURRENT);
-        }
-    };
-
-    private final DynamicTheme dynamicTheme = new DynamicTheme();
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        dynamicTheme.onCreate(this);
-        setContentView(R.layout.simple_frame_layout_material);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        mController = CalendarController.getInstance(this);
-        mFragment = (SelectVisibleCalendarsFragment) getFragmentManager().findFragmentById(
-                R.id.body_frame);
-
-        if (mFragment == null) {
-            mFragment = new SelectVisibleCalendarsFragment(R.layout.calendar_sync_item);
-
-            FragmentTransaction ft = getFragmentManager().beginTransaction();
-            ft.replace(R.id.body_frame, mFragment);
-            ft.show(mFragment);
-            ft.commit();
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        getContentResolver().registerContentObserver(CalendarContract.Events.CONTENT_URI,
-                true, mObserver);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        getContentResolver().unregisterContentObserver(mObserver);
-    }
-
-    // Needs to be in proguard whitelist
-    // Specified as listener via android:onClick in a layout xml
-    public void handleSelectSyncedCalendarsClicked(View v) {
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setClass(this, SelectSyncedCalendarsMultiAccountActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        startActivity(intent);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                Utils.returnToCalendarHome(this);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}
diff --git a/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsFragment.java b/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsFragment.java
index 27df9a66fe3043873d0b549721beee3261a9b3e3..5f2ddd150bc76f441c042e0d56bf8b8a63ade682 100644
--- a/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsFragment.java
+++ b/src/com/android/calendar/selectcalendars/SelectVisibleCalendarsFragment.java
@@ -39,6 +39,9 @@ import com.android.calendar.selectcalendars.CalendarColorCache.OnCalendarColorsL
 
 import foundation.e.calendar.R;
 
+/**
+ * TODO: This fragment is still used in the tablet design
+ */
 public class SelectVisibleCalendarsFragment extends Fragment
         implements AdapterView.OnItemClickListener, CalendarController.EventHandler,
         OnCalendarColorsLoadedListener {
diff --git a/src/com/android/calendar/settings/AddOfflineCalendarDialogFragment.kt b/src/com/android/calendar/settings/AddOfflineCalendarDialogFragment.kt
new file mode 100644
index 0000000000000000000000000000000000000000..fe0e15282229f8324533ecdd5b480e6129e72df6
--- /dev/null
+++ b/src/com/android/calendar/settings/AddOfflineCalendarDialogFragment.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.content.DialogInterface
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.widget.EditText
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.android.calendar.persistence.CalendarRepository
+import com.google.android.material.textfield.TextInputLayout
+import foundation.e.calendar.R
+
+
+class AddOfflineCalendarDialogFragment : DialogFragment() {
+
+    private lateinit var nameEditText: EditText
+    private lateinit var nameEditTextLayout: TextInputLayout
+
+    @SuppressLint("InflateParams")
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return activity?.let {
+            val inflater = requireActivity().layoutInflater
+            val view = inflater.inflate(R.layout.add_offline_calendar_dialog, null)
+            nameEditText = view.findViewById(R.id.offline_calendar_name)
+            nameEditTextLayout = view.findViewById(R.id.offline_calendar_name_layout)
+            nameEditText.addTextChangedListener(object : TextWatcher {
+                override fun afterTextChanged(s: Editable) {
+                    nameEditTextLayout.error = null
+                }
+
+                override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+                }
+
+                override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+                }
+            })
+
+            val builder = AlertDialog.Builder(it).apply {
+                setView(view)
+                setTitle(R.string.preferences_list_add_offline_title)
+                setMessage(R.string.preferences_list_add_offline_message)
+            }
+            val dialog = builder.create()
+
+            // set listener in onResume to work around auto-dismiss of AlertDialog.Builder
+            // https://stackoverflow.com/a/10661281/1600685
+            val emptyClickListener: DialogInterface.OnClickListener? = null
+            dialog.setButton(AlertDialog.BUTTON_POSITIVE, getString(R.string.preferences_list_add_offline_button), emptyClickListener)
+            dialog.setButton(AlertDialog.BUTTON_NEGATIVE, getString(R.string.preferences_list_add_offline_cancel), emptyClickListener)
+
+            return dialog
+        } ?: throw IllegalStateException("Activity cannot be null")
+    }
+
+    override fun onResume() {
+        super.onResume()
+        val alertDialog = dialog as AlertDialog
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+            addCalendar()
+        }
+        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener {
+            alertDialog.cancel()
+        }
+    }
+
+    private fun addCalendar() {
+        val accountName = getString(R.string.offline_account_name)
+        val displayName = nameEditText.text.toString()
+
+        if (displayName.isEmpty()) {
+            nameEditTextLayout.error = getString(R.string.preferences_list_add_offline_error_empty)
+            return
+        }
+
+        val repository = CalendarRepository(activity!!.application)
+        repository.addLocalCalendar(accountName, displayName)
+        dismiss()
+    }
+}
diff --git a/src/com/android/calendar/settings/CalendarColorPickerDialogX.kt b/src/com/android/calendar/settings/CalendarColorPickerDialogX.kt
new file mode 100644
index 0000000000000000000000000000000000000000..f4574424de11da19409ecbf0b4737eda1ac47d27
--- /dev/null
+++ b/src/com/android/calendar/settings/CalendarColorPickerDialogX.kt
@@ -0,0 +1,270 @@
+/*
+ * Copyright (C) 2019 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.accounts.Account
+import android.app.Dialog
+import android.content.ContentUris
+import android.content.ContentValues
+import android.content.Context
+import android.database.Cursor
+import android.os.Bundle
+import android.provider.CalendarContract.*
+import android.util.SparseIntArray
+import androidx.appcompat.app.AlertDialog
+import com.android.calendar.AsyncQueryService
+import com.android.calendar.Utils
+import com.android.colorpicker.ColorPickerSwatch.OnColorSelectedListener
+import com.android.colorpicker.HsvColorComparator
+import foundation.e.calendar.R
+import java.util.*
+
+
+/**
+ * Based on CalendarColorPickerDialog.java
+ * - extends ColorPickerDialogX for androidx compatibility
+ * - added OnCalendarColorSelectedListener
+ * - handle calendars where no additional colors are provided by the account
+ */
+class CalendarColorPickerDialogX : ColorPickerDialogX() {
+    private var queryService: QueryService? = null
+    private val colorKeyMap = SparseIntArray()
+    private var calendarId: Long = 0
+
+    private var calendarColorListener: OnCalendarColorSelectedListener? = null
+
+    interface OnCalendarColorSelectedListener {
+        fun onColorSelected(color: Int)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putLong(KEY_CALENDAR_ID, calendarId)
+        saveColorKeys(outState)
+    }
+
+    private fun saveColorKeys(outState: Bundle) {
+        val colorKeys = IntArray(mColors.size)
+        for (i in mColors.indices) {
+            colorKeys[i] = colorKeyMap.get(mColors[i])
+        }
+        outState.putIntArray(KEY_COLOR_KEYS, colorKeys)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (savedInstanceState != null) {
+            calendarId = savedInstanceState.getLong(KEY_CALENDAR_ID)
+            retrieveColorKeys(savedInstanceState)
+        }
+        setOnColorSelectedListener(ThisOnColorSelectedListener())
+    }
+
+    private fun retrieveColorKeys(savedInstanceState: Bundle) {
+        val colorKeys = savedInstanceState.getIntArray(KEY_COLOR_KEYS)
+        if (mColors != null && colorKeys != null) {
+            for (i in mColors.indices) {
+                colorKeyMap.put(mColors[i], colorKeys[i])
+            }
+        }
+    }
+
+    override fun setColors(colors: IntArray) {
+        throw IllegalStateException("Must call setCalendarId() to update calendar colors")
+    }
+
+    override fun setColors(colors: IntArray, selectedColor: Int) {
+        throw IllegalStateException("Must call setCalendarId() to update calendar colors")
+    }
+
+    fun setCalendarId(calendarId: Long) {
+        if (calendarId != this.calendarId) {
+            this.calendarId = calendarId
+            startQuery()
+        }
+    }
+
+    fun setCalendarColorListener(calendarColorListener: OnCalendarColorSelectedListener) {
+        this.calendarColorListener = calendarColorListener
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        queryService = QueryService(activity!!)
+        if (mColors == null) {
+            startQuery()
+        }
+        return dialog
+    }
+
+    private fun startQuery() {
+        if (queryService != null) {
+            showProgressBarView()
+            queryService!!.startCalendarQuery()
+        }
+    }
+
+    private inner class QueryService(context: Context) : AsyncQueryService(context) {
+
+        fun startCalendarQuery() {
+            startQuery(TOKEN_QUERY_CALENDARS, null,
+                    ContentUris.withAppendedId(Calendars.CONTENT_URI, calendarId),
+                    CALENDARS_PROJECTION, null, null, null)
+        }
+
+        private fun startColorQuery(account: Account) {
+            val uri = Colors.CONTENT_URI
+            val args = arrayOf(account.name, account.type)
+            startQuery(TOKEN_QUERY_COLORS, null, uri, COLORS_PROJECTION, COLORS_WHERE, args, null)
+        }
+
+        override fun onQueryComplete(token: Int, cookie: Any?, cursor: Cursor?) {
+            // If the query didn't return a cursor for some reason return
+            if (cursor == null) {
+                return
+            }
+
+            // If the Activity is finishing, then close the cursor.
+            // Otherwise, use the new cursor in the adapter.
+            val activity = activity
+            if (activity == null || activity.isFinishing) {
+                cursor.close()
+                return
+            }
+
+            when (token) {
+                TOKEN_QUERY_CALENDARS -> {
+                    if (!cursor.moveToFirst()) {
+                        cursor.close()
+                        dismiss()
+                        return
+                    }
+                    mSelectedColor = Utils.getDisplayColorFromColor(cursor.getInt(CALENDARS_INDEX_CALENDAR_COLOR))
+                    val account = Account(cursor.getString(CALENDARS_INDEX_ACCOUNT_NAME),
+                            cursor.getString(CALENDARS_INDEX_ACCOUNT_TYPE))
+                    cursor.close()
+
+                    startColorQuery(account)
+                }
+                TOKEN_QUERY_COLORS -> {
+                    if (!cursor.moveToFirst()) {
+                        // no additional colors defined by account
+                        cursor.close()
+                        useDefaultColors()
+                        return
+                    }
+                    useColorKeyMap(cursor)
+                    cursor.close()
+                }
+            }
+        }
+
+    }
+
+    private fun useColorKeyMap(cursor: Cursor) {
+        colorKeyMap.clear()
+        val colors = ArrayList<Int>()
+        do {
+            val colorKey = cursor.getInt(COLORS_INDEX_COLOR_KEY)
+            val rawColor = cursor.getInt(COLORS_INDEX_COLOR)
+            val displayColor = Utils.getDisplayColorFromColor(rawColor)
+            colorKeyMap.put(displayColor, colorKey)
+            colors.add(displayColor)
+        } while (cursor.moveToNext())
+        val colorsToSort = colors.toTypedArray()
+        setColorPalette(colorsToSort)
+        showPaletteView()
+    }
+
+    private fun useDefaultColors() {
+        val warningDialog = AlertDialog.Builder(activity!!)
+                .setTitle(R.string.preferences_calendar_color_warning_title)
+                .setMessage(R.string.preferences_calendar_color_warning_message)
+                .setPositiveButton(R.string.preferences_calendar_color_warning_button) { dialogInterface, _ ->
+                    dialogInterface.dismiss()
+                }
+                .create()
+        warningDialog.show()
+        val defaultColors: IntArray = resources.getIntArray(R.array.defaultCalendarColors)
+        setColorPalette(defaultColors.toTypedArray())
+        showPaletteView()
+    }
+
+    private fun setColorPalette(colorsToSort: Array<Int>) {
+        Arrays.sort(colorsToSort, HsvColorComparator())
+        mColors = IntArray(colorsToSort.size)
+        for (i in mColors.indices) {
+            mColors[i] = colorsToSort[i]
+        }
+    }
+
+    private inner class ThisOnColorSelectedListener : OnColorSelectedListener {
+
+        override fun onColorSelected(color: Int) {
+            if (color == mSelectedColor || queryService == null) {
+                return
+            }
+
+            val values = ContentValues()
+            if (colorKeyMap.size() == 0) {
+                values.put(Calendars.CALENDAR_COLOR, color)
+            } else {
+                values.put(Calendars.CALENDAR_COLOR_KEY, colorKeyMap.get(color))
+            }
+            queryService!!.startUpdate(queryService!!.nextToken, null, ContentUris.withAppendedId(
+                    Calendars.CONTENT_URI, calendarId), values, null, null, Utils.UNDO_DELAY)
+            calendarColorListener!!.onColorSelected(color)
+        }
+    }
+
+    companion object {
+
+        fun newInstance(calendarId: Long, isTablet: Boolean, newListener: OnCalendarColorSelectedListener): CalendarColorPickerDialogX {
+            val fragment = CalendarColorPickerDialogX()
+            fragment.setArguments(R.string.calendar_color_picker_dialog_title, NUM_COLUMNS, if (isTablet) SIZE_LARGE else SIZE_SMALL)
+            fragment.setCalendarId(calendarId)
+            fragment.setCalendarColorListener(newListener)
+            return fragment
+        }
+
+        internal val CALENDARS_PROJECTION = arrayOf(
+                Calendars.ACCOUNT_NAME,
+                Calendars.ACCOUNT_TYPE,
+                Calendars.CALENDAR_COLOR
+        )
+        internal const val CALENDARS_INDEX_ACCOUNT_NAME = 0
+        internal const val CALENDARS_INDEX_ACCOUNT_TYPE = 1
+        internal const val CALENDARS_INDEX_CALENDAR_COLOR = 2
+
+        internal val COLORS_PROJECTION = arrayOf(
+                Colors.COLOR,
+                Colors.COLOR_KEY
+        )
+        const val COLORS_INDEX_COLOR = 0
+        const val COLORS_INDEX_COLOR_KEY = 1
+        internal const val COLORS_WHERE = Colors.ACCOUNT_NAME + "=? AND " +
+                Colors.ACCOUNT_TYPE + "=? AND " +
+                Colors.COLOR_TYPE + "=" + Colors.TYPE_CALENDAR
+
+        private const val NUM_COLUMNS = 4
+        private const val KEY_CALENDAR_ID = "calendar_id"
+        private const val KEY_COLOR_KEYS = "color_keys"
+        private const val TOKEN_QUERY_CALENDARS = 1 shl 1
+        private const val TOKEN_QUERY_COLORS = 1 shl 2
+    }
+}
diff --git a/src/com/android/calendar/settings/CalendarDataStore.kt b/src/com/android/calendar/settings/CalendarDataStore.kt
new file mode 100644
index 0000000000000000000000000000000000000000..ceb46942d4eea5b08251e8aa4ee62950a78febdc
--- /dev/null
+++ b/src/com/android/calendar/settings/CalendarDataStore.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.content.ContentUris
+import android.content.ContentValues
+import android.provider.CalendarContract
+import androidx.fragment.app.FragmentActivity
+import androidx.preference.PreferenceDataStore
+
+/**
+ * Custom data store for preferences that saves/retrieves settings of an individual calendar
+ * from Android's calendar database.
+ */
+class CalendarDataStore(activity: FragmentActivity, calendarId: Long) : PreferenceDataStore() {
+    private var contentResolver = activity.contentResolver
+    private var calendarUri = ContentUris.withAppendedId(CalendarContract.Calendars.CONTENT_URI, calendarId)
+
+    companion object {
+        private val PROJECTION = arrayOf(
+                CalendarContract.Calendars._ID,
+                CalendarContract.Calendars.SYNC_EVENTS,
+                CalendarContract.Calendars.VISIBLE,
+                CalendarContract.Calendars.CALENDAR_COLOR,
+                CalendarContract.Calendars.CALENDAR_DISPLAY_NAME
+        )
+    }
+
+    private fun mapPreferenceKeyToDatabaseKey(key: String?): String {
+        return when (key) {
+            CalendarPreferences.SYNCHRONIZE_KEY -> CalendarContract.Calendars.SYNC_EVENTS
+            CalendarPreferences.VISIBLE_KEY -> CalendarContract.Calendars.VISIBLE
+            CalendarPreferences.COLOR_KEY -> CalendarContract.Calendars.CALENDAR_COLOR
+            CalendarPreferences.DISPLAY_NAME_KEY -> CalendarContract.Calendars.CALENDAR_DISPLAY_NAME
+            else -> throw UnsupportedOperationException("unsupported preference key")
+        }
+    }
+
+    override fun putBoolean(key: String?, value: Boolean) {
+        val databaseKey = mapPreferenceKeyToDatabaseKey(key)
+
+        val values = ContentValues()
+        values.put(databaseKey, if (value) 1 else 0)
+        contentResolver.update(calendarUri, values, null, null)
+    }
+
+    override fun getBoolean(key: String?, defValue: Boolean): Boolean {
+        val databaseKey = mapPreferenceKeyToDatabaseKey(key)
+
+        contentResolver.query(calendarUri, PROJECTION, null, null, null)?.use {
+            if (it.moveToFirst()) {
+                return it.getInt(it.getColumnIndex(databaseKey)) == 1
+            }
+        }
+        return defValue
+    }
+
+    override fun putInt(key: String?, value: Int) {
+        val databaseKey = mapPreferenceKeyToDatabaseKey(key)
+
+        val values = ContentValues()
+        values.put(databaseKey, value)
+        contentResolver.update(calendarUri, values, null, null)
+    }
+
+    override fun getInt(key: String?, defValue: Int): Int {
+        val databaseKey = mapPreferenceKeyToDatabaseKey(key)
+
+        contentResolver.query(calendarUri, PROJECTION, null, null, null)?.use {
+            if (it.moveToFirst()) {
+                return it.getInt(it.getColumnIndex(databaseKey))
+            }
+        }
+        return defValue
+    }
+
+    override fun putString(key: String?, value: String?) {
+        val databaseKey = mapPreferenceKeyToDatabaseKey(key)
+
+        val values = ContentValues()
+        values.put(databaseKey, value)
+        contentResolver.update(calendarUri, values, null, null)
+    }
+
+    override fun getString(key: String?, defValue: String?): String? {
+        val databaseKey = mapPreferenceKeyToDatabaseKey(key)
+
+        contentResolver.query(calendarUri, PROJECTION, null, null, null)?.use {
+            if (it.moveToFirst()) {
+                return it.getString(it.getColumnIndex(databaseKey))
+            }
+        }
+        return defValue
+    }
+
+}
diff --git a/src/com/android/calendar/settings/CalendarPreferences.kt b/src/com/android/calendar/settings/CalendarPreferences.kt
new file mode 100644
index 0000000000000000000000000000000000000000..a21d12c9c7076c2ba3053c6254ded36aa623fd29
--- /dev/null
+++ b/src/com/android/calendar/settings/CalendarPreferences.kt
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.accounts.Account
+import android.accounts.AccountManager
+import android.accounts.AuthenticatorDescription
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.provider.CalendarContract
+import android.util.TypedValue
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import androidx.preference.*
+import com.android.calendar.Utils
+import com.android.calendar.persistence.CalendarRepository
+import foundation.e.calendar.R
+
+
+class CalendarPreferences : PreferenceFragmentCompat() {
+
+    private var calendarId: Long = -1
+    private lateinit var calendarRepository: CalendarRepository
+    private lateinit var account: Account
+    private var numberOfEvents: Long = -1
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        calendarId = arguments!!.getLong(ARG_CALENDAR_ID)
+        calendarRepository = CalendarRepository(activity!!.application)
+        account = calendarRepository.queryAccount(calendarId)!!
+        numberOfEvents = calendarRepository.queryNumberOfEvents(calendarId)!!
+
+        // use custom data store to save/retrieve calendar preferences in Android's calendar database
+        val preferenceManager = preferenceManager
+        preferenceManager.preferenceDataStore = CalendarDataStore(activity!!, calendarId)
+
+        populatePreferences()
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        val displayName = preferenceManager.preferenceDataStore!!.getString(DISPLAY_NAME_KEY, null)
+        activity?.title = if (displayName.isNullOrBlank()) getString(R.string.preferences_calendar_no_display_name) else displayName
+    }
+
+    private fun populatePreferences() {
+        val context = preferenceManager.context
+        val screen = preferenceManager.createPreferenceScreen(context)
+
+        val isLocalAccount = account.type == CalendarContract.ACCOUNT_TYPE_LOCAL
+        val currentColor = preferenceManager.preferenceDataStore!!.getInt(COLOR_KEY, -1)
+        val authenticatorInfo = getAuthenticatorInfo(account)
+
+        val synchronizePreference = SwitchPreference(context).apply {
+            key = SYNCHRONIZE_KEY
+            title = getString(R.string.preferences_calendar_synchronize)
+        }
+        val visiblePreference = SwitchPreference(context).apply {
+            key = VISIBLE_KEY
+            title = getString(R.string.preferences_calendar_visible)
+        }
+        val colorPreference = Preference(context).apply {
+            key = COLOR_KEY
+            title = getString(R.string.preferences_calendar_color)
+            icon = getColorIcon(currentColor)
+        }
+        colorPreference.setOnPreferenceClickListener {
+            displayCalendarColorPicker()
+            true
+        }
+        val displayNamePreference = EditTextPreference(context).apply {
+            key = DISPLAY_NAME_KEY
+            title = getString(R.string.preferences_calendar_display_name)
+            dialogTitle = getString(R.string.preferences_calendar_display_name)
+        }
+        displayNamePreference.setOnPreferenceChangeListener { _, newValue ->
+            activity?.title = newValue as String
+            true
+        }
+        val deletePreference = Preference(context).apply {
+            title = getString(R.string.preferences_calendar_delete)
+        }
+        deletePreference.setOnPreferenceClickListener {
+            deleteCalendar()
+            true
+        }
+        val configurePreference = Preference(context).apply {
+            title = getString(R.string.preferences_calendar_configure_account, authenticatorInfo?.label)
+            intent = authenticatorInfo?.intent
+        }
+
+        val infoCategory = PreferenceCategory(context).apply {
+            title = getString(R.string.preferences_calendar_info_category)
+        }
+
+        val numberOfEventsPreference = Preference(context).apply {
+            title = getString(R.string.preferences_calendar_number_of_events, numberOfEvents)
+            isSelectable = false
+        }
+        val accountPreference = Preference(context).apply {
+            title = getString(R.string.preferences_calendar_account, authenticatorInfo?.label)
+            icon = authenticatorInfo?.icon
+            isSelectable = false
+        }
+        val localAccountPreference = Preference(context).apply {
+            title = getString(R.string.preferences_calendar_account_local)
+            icon = getThemeDrawable(R.attr.settings_calendar_offline)
+            isSelectable = false
+        }
+        val localAccountInfoPreference = Preference(context).apply {
+            title = getString(R.string.preferences_list_add_offline_message)
+            isSelectable = false
+        }
+
+
+        if (!isLocalAccount) {
+            screen.addPreference(synchronizePreference)
+        }
+        screen.addPreference(visiblePreference)
+        screen.addPreference(colorPreference)
+        if (isLocalAccount) {
+            screen.addPreference(displayNamePreference)
+            screen.addPreference(deletePreference)
+        }
+        if (authenticatorInfo?.intent != null && !isLocalAccount) {
+            screen.addPreference(configurePreference)
+        }
+
+        screen.addPreference(infoCategory)
+
+        infoCategory.addPreference(numberOfEventsPreference)
+        if (isLocalAccount) {
+            infoCategory.addPreference(localAccountPreference)
+            infoCategory.addPreference(localAccountInfoPreference)
+        } else {
+            infoCategory.addPreference(accountPreference)
+        }
+
+        preferenceScreen = screen
+    }
+
+    private fun getThemeDrawable(attr: Int): Drawable {
+        val typedValue = TypedValue()
+        context!!.theme.resolveAttribute(attr, typedValue, true)
+        val imageResId = typedValue.resourceId
+        return ContextCompat.getDrawable(context!!, imageResId)
+                ?: throw IllegalArgumentException("Cannot load drawable $imageResId")
+    }
+
+    private fun getColorIcon(color: Int): Drawable {
+        val icon: Drawable = ContextCompat.getDrawable(context!!, R.drawable.circle)!!
+        icon.mutate().setColorFilter(color, Mode.SRC_IN)
+        return icon
+    }
+
+    private fun displayCalendarColorPicker() {
+        if (fragmentManager!!.findFragmentByTag(COLOR_PICKER_DIALOG_TAG) != null) {
+            return
+        }
+
+        val isTablet = Utils.getConfigBool(context, R.bool.tablet_config)
+        val calendarDialogPicker = CalendarColorPickerDialogX.newInstance(calendarId, isTablet,
+                object : CalendarColorPickerDialogX.OnCalendarColorSelectedListener {
+                    override fun onColorSelected(color: Int) {
+                        val colorPref = findPreference<Preference>(COLOR_KEY)!!
+                        colorPref.icon = getColorIcon(color)
+                    }
+                })
+        calendarDialogPicker.show(fragmentManager!!, COLOR_PICKER_DIALOG_TAG)
+    }
+
+    data class AuthenticatorInfo(val label: String?,
+                                 val icon: Drawable?,
+                                 val intent: Intent?)
+
+    private fun getAuthenticatorInfo(account: Account): AuthenticatorInfo? {
+        val description = getAuthenticatorDescription(account) ?: return null
+
+        val pm = activity?.packageManager
+        val label = pm?.getResourcesForApplication(description.packageName)?.getString(
+                description.labelId)
+        val icon = pm?.getDrawable(description.packageName, description.iconId, null)
+        val intent = pm?.getLaunchIntentForPackage(description.packageName)
+
+        return AuthenticatorInfo(label, icon, intent)
+    }
+
+    private fun getAuthenticatorDescription(account: Account): AuthenticatorDescription? {
+        val manager = AccountManager.get(context)
+        val descriptions = manager.authenticatorTypes
+        for (description in descriptions) {
+            if (description.type == account.type) {
+                return description
+            }
+        }
+        return null
+    }
+
+    private fun deleteCalendar() {
+        val warningDialog = AlertDialog.Builder(activity!!)
+                .setMessage(R.string.preferences_calendar_delete_message)
+                .setPositiveButton(R.string.preferences_calendar_delete_delete) { _, _ ->
+                    calendarRepository.deleteLocalCalendar(account.name, calendarId)
+                    activity?.supportFragmentManager?.popBackStackImmediate()
+                }
+                .setNegativeButton(R.string.preferences_calendar_delete_cancel) { dialogInterface, _ ->
+                    dialogInterface.dismiss()
+                }
+                .create()
+        warningDialog.show()
+    }
+
+    companion object {
+        const val COLOR_PICKER_DIALOG_TAG = "CalendarColorPickerDialog"
+
+        const val ARG_CALENDAR_ID = "calendarId"
+
+        const val SYNCHRONIZE_KEY = "synchronize"
+        const val VISIBLE_KEY = "visible"
+        const val COLOR_KEY = "color"
+        const val DISPLAY_NAME_KEY = "displayName"
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/android/calendar/settings/ColorFilterExtension.kt b/src/com/android/calendar/settings/ColorFilterExtension.kt
new file mode 100644
index 0000000000000000000000000000000000000000..56653fabf672075a2a17527f7f38bdb973afd3dd
--- /dev/null
+++ b/src/com/android/calendar/settings/ColorFilterExtension.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.annotation.SuppressLint
+import android.graphics.BlendMode
+import android.graphics.BlendModeColorFilter
+import android.graphics.PorterDuff
+import android.graphics.drawable.Drawable
+import android.os.Build
+
+/**
+ * From https://stackoverflow.com/a/57054627/1600685
+ */
+fun Drawable.setColorFilter(color: Int, mode: Mode = Mode.SRC_ATOP) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        colorFilter = BlendModeColorFilter(color, mode.getBlendMode())
+    } else {
+        @Suppress("DEPRECATION")
+        setColorFilter(color, mode.getPorterDuffMode())
+    }
+}
+
+// This class is needed to call the setColorFilter
+// with different BlendMode on older API (before 29).
+enum class Mode {
+    CLEAR,
+    SRC,
+    DST,
+    SRC_OVER,
+    DST_OVER,
+    SRC_IN,
+    DST_IN,
+    SRC_OUT,
+    DST_OUT,
+    SRC_ATOP,
+    DST_ATOP,
+    XOR,
+    DARKEN,
+    LIGHTEN,
+    MULTIPLY,
+    SCREEN,
+    ADD,
+    OVERLAY;
+
+    @SuppressLint("NewApi")
+    fun getBlendMode(): BlendMode =
+            when (this) {
+                CLEAR -> BlendMode.CLEAR
+                SRC -> BlendMode.SRC
+                DST -> BlendMode.DST
+                SRC_OVER -> BlendMode.SRC_OVER
+                DST_OVER -> BlendMode.DST_OVER
+                SRC_IN -> BlendMode.SRC_IN
+                DST_IN -> BlendMode.DST_IN
+                SRC_OUT -> BlendMode.SRC_OUT
+                DST_OUT -> BlendMode.DST_OUT
+                SRC_ATOP -> BlendMode.SRC_ATOP
+                DST_ATOP -> BlendMode.DST_ATOP
+                XOR -> BlendMode.XOR
+                DARKEN -> BlendMode.DARKEN
+                LIGHTEN -> BlendMode.LIGHTEN
+                MULTIPLY -> BlendMode.MULTIPLY
+                SCREEN -> BlendMode.SCREEN
+                ADD -> BlendMode.PLUS
+                OVERLAY -> BlendMode.OVERLAY
+            }
+
+    fun getPorterDuffMode(): PorterDuff.Mode =
+            when (this) {
+                CLEAR -> PorterDuff.Mode.CLEAR
+                SRC -> PorterDuff.Mode.SRC
+                DST -> PorterDuff.Mode.DST
+                SRC_OVER -> PorterDuff.Mode.SRC_OVER
+                DST_OVER -> PorterDuff.Mode.DST_OVER
+                SRC_IN -> PorterDuff.Mode.SRC_IN
+                DST_IN -> PorterDuff.Mode.DST_IN
+                SRC_OUT -> PorterDuff.Mode.SRC_OUT
+                DST_OUT -> PorterDuff.Mode.DST_OUT
+                SRC_ATOP -> PorterDuff.Mode.SRC_ATOP
+                DST_ATOP -> PorterDuff.Mode.DST_ATOP
+                XOR -> PorterDuff.Mode.XOR
+                DARKEN -> PorterDuff.Mode.DARKEN
+                LIGHTEN -> PorterDuff.Mode.LIGHTEN
+                MULTIPLY -> PorterDuff.Mode.MULTIPLY
+                SCREEN -> PorterDuff.Mode.SCREEN
+                ADD -> PorterDuff.Mode.ADD
+                OVERLAY -> PorterDuff.Mode.OVERLAY
+            }
+}
\ No newline at end of file
diff --git a/src/com/android/calendar/settings/ColorPickerDialogX.java b/src/com/android/calendar/settings/ColorPickerDialogX.java
new file mode 100644
index 0000000000000000000000000000000000000000..7bcc5646b3824c9ca8a451ef3146fe4e884ebdb3
--- /dev/null
+++ b/src/com/android/calendar/settings/ColorPickerDialogX.java
@@ -0,0 +1,198 @@
+package com.android.calendar.settings;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ProgressBar;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
+import com.android.colorpicker.ColorPickerPalette;
+import com.android.colorpicker.ColorPickerSwatch.OnColorSelectedListener;
+
+/**
+ * 1-to-1 Copy of ColorPickerDialog but using androidx classes
+ */
+public class ColorPickerDialogX extends DialogFragment implements OnColorSelectedListener {
+
+    public static final int SIZE_LARGE = 1;
+    public static final int SIZE_SMALL = 2;
+
+    protected AlertDialog mAlertDialog;
+
+    protected static final String KEY_TITLE_ID = "title_id";
+    protected static final String KEY_COLORS = "colors";
+    protected static final String KEY_COLOR_CONTENT_DESCRIPTIONS = "color_content_descriptions";
+    protected static final String KEY_SELECTED_COLOR = "selected_color";
+    protected static final String KEY_COLUMNS = "columns";
+    protected static final String KEY_SIZE = "size";
+
+    protected int mTitleResId = com.android.colorpicker.R.string.color_picker_default_title;
+    protected int[] mColors = null;
+    protected String[] mColorContentDescriptions = null;
+    protected int mSelectedColor;
+    protected int mColumns;
+    protected int mSize;
+
+    private ColorPickerPalette mPalette;
+    private ProgressBar mProgress;
+
+    protected OnColorSelectedListener mListener;
+
+    public ColorPickerDialogX() {
+        // Empty constructor required for dialog fragments.
+    }
+
+    public static ColorPickerDialogX newInstance(int titleResId, int[] colors, int selectedColor,
+                                                 int columns, int size) {
+        ColorPickerDialogX ret = new ColorPickerDialogX();
+        ret.initialize(titleResId, colors, selectedColor, columns, size);
+        return ret;
+    }
+
+    public void initialize(int titleResId, int[] colors, int selectedColor, int columns, int size) {
+        setArguments(titleResId, columns, size);
+        setColors(colors, selectedColor);
+    }
+
+    public void setArguments(int titleResId, int columns, int size) {
+        Bundle bundle = new Bundle();
+        bundle.putInt(KEY_TITLE_ID, titleResId);
+        bundle.putInt(KEY_COLUMNS, columns);
+        bundle.putInt(KEY_SIZE, size);
+        setArguments(bundle);
+    }
+
+    public void setOnColorSelectedListener(OnColorSelectedListener listener) {
+        mListener = listener;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (getArguments() != null) {
+            mTitleResId = getArguments().getInt(KEY_TITLE_ID);
+            mColumns = getArguments().getInt(KEY_COLUMNS);
+            mSize = getArguments().getInt(KEY_SIZE);
+        }
+
+        if (savedInstanceState != null) {
+            mColors = savedInstanceState.getIntArray(KEY_COLORS);
+            mSelectedColor = (Integer) savedInstanceState.getSerializable(KEY_SELECTED_COLOR);
+            mColorContentDescriptions = savedInstanceState.getStringArray(
+                    KEY_COLOR_CONTENT_DESCRIPTIONS);
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Activity activity = getActivity();
+
+        View view = LayoutInflater.from(getActivity()).inflate(com.android.colorpicker.R.layout.color_picker_dialog, null);
+        mProgress = (ProgressBar) view.findViewById(android.R.id.progress);
+        mPalette = (ColorPickerPalette) view.findViewById(com.android.colorpicker.R.id.color_picker);
+        mPalette.init(mSize, mColumns, this);
+
+        if (mColors != null) {
+            showPaletteView();
+        }
+
+        mAlertDialog = new AlertDialog.Builder(activity)
+            .setTitle(mTitleResId)
+            .setView(view)
+            .create();
+
+        return mAlertDialog;
+    }
+
+    @Override
+    public void onColorSelected(int color) {
+        if (mListener != null) {
+            mListener.onColorSelected(color);
+        }
+
+        if (getTargetFragment() instanceof OnColorSelectedListener) {
+            final OnColorSelectedListener listener =
+                    (OnColorSelectedListener) getTargetFragment();
+            listener.onColorSelected(color);
+        }
+
+        if (color != mSelectedColor) {
+            mSelectedColor = color;
+            // Redraw palette to show checkmark on newly selected color before dismissing.
+            mPalette.drawPalette(mColors, mSelectedColor);
+        }
+
+        dismiss();
+    }
+
+    public void showPaletteView() {
+        if (mProgress != null && mPalette != null) {
+            mProgress.setVisibility(View.GONE);
+            refreshPalette();
+            mPalette.setVisibility(View.VISIBLE);
+        }
+    }
+
+    public void showProgressBarView() {
+        if (mProgress != null && mPalette != null) {
+            mProgress.setVisibility(View.VISIBLE);
+            mPalette.setVisibility(View.GONE);
+        }
+    }
+
+    public void setColors(int[] colors, int selectedColor) {
+        if (mColors != colors || mSelectedColor != selectedColor) {
+            mColors = colors;
+            mSelectedColor = selectedColor;
+            refreshPalette();
+        }
+    }
+
+    public void setColors(int[] colors) {
+        if (mColors != colors) {
+            mColors = colors;
+            refreshPalette();
+        }
+    }
+
+    public void setSelectedColor(int color) {
+        if (mSelectedColor != color) {
+            mSelectedColor = color;
+            refreshPalette();
+        }
+    }
+
+    public void setColorContentDescriptions(String[] colorContentDescriptions) {
+        if (mColorContentDescriptions != colorContentDescriptions) {
+            mColorContentDescriptions = colorContentDescriptions;
+            refreshPalette();
+        }
+    }
+
+    private void refreshPalette() {
+        if (mPalette != null && mColors != null) {
+            mPalette.drawPalette(mColors, mSelectedColor, mColorContentDescriptions);
+        }
+    }
+
+    public int[] getColors() {
+        return mColors;
+    }
+
+    public int getSelectedColor() {
+        return mSelectedColor;
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putIntArray(KEY_COLORS, mColors);
+        outState.putSerializable(KEY_SELECTED_COLOR, mSelectedColor);
+        outState.putStringArray(KEY_COLOR_CONTENT_DESCRIPTIONS, mColorContentDescriptions);
+    }
+}
diff --git a/src/com/android/calendar/settings/GeneralPreferences.kt b/src/com/android/calendar/settings/GeneralPreferences.kt
new file mode 100644
index 0000000000000000000000000000000000000000..d9fb7767842351d6cbbe0c9da8bcfc9cf254a249
--- /dev/null
+++ b/src/com/android/calendar/settings/GeneralPreferences.kt
@@ -0,0 +1,558 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.annotation.TargetApi
+import android.app.backup.BackupManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener
+import android.media.RingtoneManager
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.os.Vibrator
+import android.provider.CalendarContract
+import android.provider.CalendarContract.CalendarCache
+import android.provider.SearchRecentSuggestions
+import android.provider.Settings
+import android.text.TextUtils
+import android.util.SparseIntArray
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.preference.*
+import com.android.calendar.*
+import com.android.calendar.alerts.AlertReceiver
+import com.android.calendar.event.EventViewUtils
+import com.android.timezonepicker.TimeZoneInfo
+import com.android.timezonepicker.TimeZonePickerUtils
+import foundation.e.calendar.R
+import java.util.*
+
+class GeneralPreferences : PreferenceFragmentCompat(),
+        OnSharedPreferenceChangeListener, Preference.OnPreferenceChangeListener,
+        TimeZonePickerDialogX.OnTimeZoneSetListener {
+
+    private lateinit var themePref: ListPreference
+    private lateinit var colorPref: Preference
+    private lateinit var defaultStartPref: ListPreference
+    private lateinit var hideDeclinedPref: CheckBoxPreference
+    private lateinit var weekStartPref: ListPreference
+    private lateinit var dayWeekPref: ListPreference
+    private lateinit var defaultEventDurationPref: ListPreference
+    private lateinit var useHomeTzPref: CheckBoxPreference
+    private lateinit var homeTzPref: Preference
+    private lateinit var popupPref: CheckBoxPreference
+    private lateinit var snoozeDelayPref: ListPreference
+    private lateinit var defaultReminderPref: ListPreference
+    private lateinit var copyDbPref: Preference
+    private lateinit var skipRemindersPref: ListPreference
+
+    // >= 26
+    private lateinit var notificationPref: Preference
+
+    // < 26
+    private lateinit var alertPref: CheckBoxPreference
+    private lateinit var ringtonePref: Preference
+    private lateinit var vibratePref: CheckBoxPreference
+
+    private lateinit var tzPickerUtils: TimeZonePickerUtils
+    private var timeZoneId: String? = null
+
+    // Used to retrieve the color id from the color picker
+    private val colorMap = SparseIntArray()
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        preferenceManager.sharedPreferencesName = SHARED_PREFS_NAME
+        setPreferencesFromResource(R.xml.general_preferences, rootKey)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        activity?.title = getString(R.string.preferences_list_general)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        themePref = preferenceScreen.findPreference(KEY_THEME_PREF)!!
+        colorPref = preferenceScreen.findPreference(KEY_COLOR_PREF)!!
+        defaultStartPref = preferenceScreen.findPreference(KEY_DEFAULT_START)!!
+        hideDeclinedPref = preferenceScreen.findPreference(KEY_HIDE_DECLINED)!!
+        weekStartPref = preferenceScreen.findPreference(KEY_WEEK_START_DAY)!!
+        dayWeekPref = preferenceScreen.findPreference(KEY_DAYS_PER_WEEK)!!
+        defaultEventDurationPref = preferenceScreen.findPreference(KEY_DEFAULT_EVENT_DURATION)!!
+        useHomeTzPref = preferenceScreen.findPreference(KEY_HOME_TZ_ENABLED)!!
+        homeTzPref = preferenceScreen.findPreference(KEY_HOME_TZ)!!
+        popupPref = preferenceScreen.findPreference(KEY_ALERTS_POPUP)!!
+        snoozeDelayPref = preferenceScreen.findPreference(KEY_DEFAULT_SNOOZE_DELAY)!!
+        defaultReminderPref = preferenceScreen.findPreference(KEY_DEFAULT_REMINDER)!!
+        copyDbPref = preferenceScreen.findPreference(KEY_OTHER_COPY_DB)!!
+        skipRemindersPref = preferenceScreen.findPreference(KEY_OTHER_REMINDERS_RESPONDED)!!
+
+        val prefs = CalendarUtils.getSharedPreferences(activity!!,
+                Utils.SHARED_PREFS_NAME)
+
+        if (Utils.isOreoOrLater()) {
+            notificationPref = preferenceScreen.findPreference(KEY_NOTIFICATION)!!
+        } else {
+            alertPref = preferenceScreen.findPreference(KEY_ALERTS)!!
+            vibratePref = preferenceScreen.findPreference(KEY_ALERTS_VIBRATE)!!
+            val vibrator = activity!!.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+            if (!vibrator.hasVibrator()) {
+                val alertGroup = preferenceScreen
+                        .findPreference<PreferenceCategory>(KEY_ALERTS_CATEGORY)!!
+                alertGroup.removePreference(vibratePref)
+            }
+            ringtonePref = preferenceScreen.findPreference(KEY_ALERTS_RINGTONE)!!
+            val ringtoneUriString = Utils.getRingtonePreference(activity)
+
+            // Set the ringtoneUri to the backup-able shared pref only so that
+            // the Ringtone dialog will open up with the correct value.
+            val editor = prefs.edit()
+            editor.putString(KEY_ALERTS_RINGTONE, ringtoneUriString).apply()
+
+            val ringtoneDisplayString = getRingtoneTitleFromUri(activity!!, ringtoneUriString)
+            ringtonePref.summary = ringtoneDisplayString ?: ""
+        }
+
+        buildSnoozeDelayEntries()
+        defaultEventDurationPref.summary = defaultEventDurationPref.entry
+        themePref.summary = themePref.entry
+        weekStartPref.summary = weekStartPref.entry
+        dayWeekPref.summary = dayWeekPref.entry
+        defaultReminderPref.summary = defaultReminderPref.entry
+        snoozeDelayPref.summary = snoozeDelayPref.entry
+        defaultStartPref.summary = defaultStartPref.entry
+
+        // This triggers an asynchronous call to the provider to refresh the data in shared pref
+        timeZoneId = Utils.getTimeZone(activity, null)
+
+        // Utils.getTimeZone will return the currentTimeZone instead of the one
+        // in the shared_pref if home time zone is disabled. So if home tz is
+        // off, we will explicitly read it.
+        if (!prefs.getBoolean(KEY_HOME_TZ_ENABLED, false)) {
+            timeZoneId = prefs.getString(KEY_HOME_TZ, TimeZone.getDefault().id)
+        }
+
+        tzPickerUtils = TimeZonePickerUtils(activity)
+
+        val timezoneName = tzPickerUtils.getGmtDisplayName(activity, timeZoneId,
+                System.currentTimeMillis(), false)
+        homeTzPref.summary = timezoneName ?: timeZoneId
+
+        val tzpd = activity!!.supportFragmentManager
+                .findFragmentByTag(FRAG_TAG_TIME_ZONE_PICKER) as TimeZonePickerDialogX?
+        tzpd?.setOnTimeZoneSetListener(this)
+
+        updateSkipRemindersSummary(skipRemindersPref.value)
+
+        initializeColorMap()
+    }
+
+    /**
+     * Update the summary for the SkipReminders preference.
+     * @param value The corresponding value of which summary to set. If null, the default summary
+     * will be set, and the value will be set accordingly too.
+     */
+    private fun updateSkipRemindersSummary(value: String?) {
+        // Default to "declined". Must match with R.array.preferences_skip_reminders_values.
+        var index = 0
+        val values = skipRemindersPref.entryValues
+        val entries = skipRemindersPref.entries
+        for (value_i in values.indices) {
+            if (values[value_i] == value) {
+                index = value_i
+                break
+            }
+        }
+        skipRemindersPref.summary = entries[index].toString()
+        if (value == null) { // Value was not known ahead of time, so the default value will be set.
+            skipRemindersPref.value = values[index].toString()
+        }
+    }
+
+    private fun showColorPickerDialog() {
+        val colorPickerDialog = ColorPickerDialogX()
+        val selectedColorName = Utils.getSharedPreference(activity, KEY_COLOR_PREF, "teal")
+        val selectedColor = ContextCompat.getColor(context!!, DynamicTheme.getColorId(selectedColorName))
+        colorPickerDialog.initialize(R.string.preferences_color_pick,
+                intArrayOf(ContextCompat.getColor(context!!, R.color.colorPrimary),
+                        ContextCompat.getColor(context!!, R.color.colorBluePrimary),
+                        ContextCompat.getColor(context!!, R.color.colorPurplePrimary),
+                        ContextCompat.getColor(context!!, R.color.colorRedPrimary),
+                        ContextCompat.getColor(context!!, R.color.colorOrangePrimary),
+                        ContextCompat.getColor(context!!, R.color.colorGreenPrimary)),
+                selectedColor, 3, 2)
+        colorPickerDialog.setOnColorSelectedListener { colour ->
+            Utils.setSharedPreference(activity, KEY_COLOR_PREF, DynamicTheme.getColorName(colorMap.get(colour)))
+        }
+        colorPickerDialog.show(fragmentManager!!, "colorpicker")
+    }
+
+    private fun initializeColorMap() {
+        colorMap.put(ContextCompat.getColor(context!!, R.color.colorPrimary), R.color.colorPrimary)
+        colorMap.put(ContextCompat.getColor(context!!, R.color.colorBluePrimary), R.color.colorBluePrimary)
+        colorMap.put(ContextCompat.getColor(context!!, R.color.colorOrangePrimary), R.color.colorOrangePrimary)
+        colorMap.put(ContextCompat.getColor(context!!, R.color.colorGreenPrimary), R.color.colorGreenPrimary)
+        colorMap.put(ContextCompat.getColor(context!!, R.color.colorRedPrimary), R.color.colorRedPrimary)
+        colorMap.put(ContextCompat.getColor(context!!, R.color.colorPurplePrimary), R.color.colorPurplePrimary)
+    }
+
+    private fun showTimezoneDialog() {
+        val arguments = Bundle().apply {
+            putLong(TimeZonePickerDialogX.BUNDLE_START_TIME_MILLIS, System.currentTimeMillis())
+            putString(TimeZonePickerDialogX.BUNDLE_TIME_ZONE, Utils.getTimeZone(activity, null))
+        }
+
+        val fm = activity!!.supportFragmentManager
+        var tzpd: TimeZonePickerDialogX? = fm.findFragmentByTag(FRAG_TAG_TIME_ZONE_PICKER) as TimeZonePickerDialogX?
+        tzpd?.dismiss()
+
+        tzpd = TimeZonePickerDialogX()
+        tzpd.arguments = arguments
+        tzpd.setOnTimeZoneSetListener(this)
+        tzpd.show(fm, FRAG_TAG_TIME_ZONE_PICKER)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+        setPreferenceListeners(this)
+    }
+
+    /**
+     * Sets up all the preference change listeners to use the specified listener.
+     */
+    private fun setPreferenceListeners(listener: Preference.OnPreferenceChangeListener) {
+        themePref.onPreferenceChangeListener = listener
+        colorPref.onPreferenceChangeListener = listener
+        defaultStartPref.onPreferenceChangeListener = listener
+        hideDeclinedPref.onPreferenceChangeListener = listener
+        weekStartPref.onPreferenceChangeListener = listener
+        dayWeekPref.onPreferenceChangeListener = listener
+        defaultEventDurationPref.onPreferenceChangeListener = listener
+        useHomeTzPref.onPreferenceChangeListener = listener
+        homeTzPref.onPreferenceChangeListener = listener
+        snoozeDelayPref.onPreferenceChangeListener = listener
+        defaultReminderPref.onPreferenceChangeListener = listener
+        skipRemindersPref.onPreferenceChangeListener = listener
+        if (!Utils.isOreoOrLater()) {
+            vibratePref.onPreferenceChangeListener = listener
+        }
+    }
+
+    override fun onStop() {
+        preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+        super.onStop()
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        val a = activity ?: return
+
+        BackupManager.dataChanged(a.packageName)
+
+        when (key) {
+            KEY_ALERTS -> {
+                val intent = Intent()
+                intent.setClass(a, AlertReceiver::class.java)
+                if (alertPref.isChecked) {
+                    intent.action = AlertReceiver.ACTION_DISMISS_OLD_REMINDERS
+                } else {
+                    intent.action = AlertReceiver.EVENT_REMINDER_APP_ACTION
+                }
+                a.sendBroadcast(intent)
+            }
+            KEY_THEME_PREF -> a.recreate()
+            KEY_COLOR_PREF -> a.recreate()
+        }
+    }
+
+    override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
+        if (!Utils.isOreoOrLater()) {
+            when (preference) {
+                vibratePref -> {
+                    vibratePref.isChecked = newValue as Boolean
+                    return true
+                }
+            }
+        }
+
+        when (preference) {
+            useHomeTzPref -> {
+                val useHomeTz = newValue as Boolean
+                val tz: String? = if (useHomeTz) {
+                    timeZoneId
+                } else {
+                    CalendarCache.TIMEZONE_TYPE_AUTO
+                }
+                Utils.setTimeZone(activity, tz)
+                return true
+            }
+            themePref -> {
+                themePref.value = newValue as String
+                themePref.summary = themePref.entry
+            }
+            hideDeclinedPref -> {
+                hideDeclinedPref.isChecked = newValue as Boolean
+                val intent = Intent(Utils.getWidgetScheduledUpdateAction(activity))
+                intent.setDataAndType(CalendarContract.CONTENT_URI, Utils.APPWIDGET_DATA_TYPE)
+                activity!!.sendBroadcast(intent)
+                return true
+            }
+            weekStartPref -> {
+                weekStartPref.value = newValue as String
+                weekStartPref.summary = weekStartPref.entry
+            }
+            dayWeekPref -> {
+                dayWeekPref.value = newValue as String
+                dayWeekPref.summary = dayWeekPref.entry
+            }
+            defaultEventDurationPref -> {
+                defaultEventDurationPref.value = newValue as String
+                defaultEventDurationPref.summary = defaultEventDurationPref.entry
+            }
+            defaultReminderPref -> {
+                defaultReminderPref.value = newValue as String
+                defaultReminderPref.summary = defaultReminderPref.entry
+            }
+            snoozeDelayPref -> {
+                snoozeDelayPref.value = newValue as String
+                snoozeDelayPref.summary = snoozeDelayPref.entry
+            }
+            defaultStartPref -> {
+                val i = defaultStartPref.findIndexOfValue(newValue as String)
+                defaultStartPref.summary = defaultStartPref.entries[i]
+                return true
+            }
+            skipRemindersPref -> {
+                updateSkipRemindersSummary(newValue as String)
+            }
+            else -> {
+                return true
+            }
+        }
+        return false
+    }
+
+    private fun getRingtoneTitleFromUri(context: Context, uri: String): String? {
+        if (TextUtils.isEmpty(uri)) {
+            return null
+        }
+
+        val ring = RingtoneManager.getRingtone(activity, Uri.parse(uri))
+        return ring?.getTitle(context)
+    }
+
+    private fun buildSnoozeDelayEntries() {
+        val values = snoozeDelayPref.entryValues
+        val count = values.size
+        val entries = arrayOfNulls<CharSequence>(count)
+
+        for (i in 0 until count) {
+            val value = Integer.parseInt(values[i].toString())
+            entries[i] = EventViewUtils.constructReminderLabel(activity!!, value, false)
+        }
+
+        snoozeDelayPref.entries = entries
+    }
+
+    override fun onPreferenceTreeClick(preference: Preference?): Boolean {
+        when (preference!!.key) {
+            KEY_COLOR_PREF -> {
+                showColorPickerDialog()
+                return true
+            }
+            KEY_HOME_TZ -> {
+                showTimezoneDialog()
+                return true
+            }
+            KEY_CLEAR_SEARCH_HISTORY -> {
+                clearSearchHistory()
+                return true
+            }
+            KEY_ALERTS_RINGTONE -> {
+                showRingtoneManager()
+                return true
+            }
+            KEY_NOTIFICATION -> {
+                showNotificationChannel()
+                return true
+            }
+            KEY_OTHER_COPY_DB -> {
+                showDbCopy()
+                return true
+            }
+            else -> return super.onPreferenceTreeClick(preference)
+        }
+    }
+
+    private fun showDbCopy() {
+        val intent = Intent(Intent.ACTION_MAIN)
+        intent.component = ComponentName("com.android.providers.calendar",
+                "com.android.providers.calendar.CalendarDebugActivity")
+        startActivity(intent)
+    }
+
+    private fun clearSearchHistory() {
+        val suggestions = SearchRecentSuggestions(activity,
+                Utils.getSearchAuthority(activity),
+                CalendarRecentSuggestionsProvider.MODE)
+        suggestions.clearHistory()
+        Toast.makeText(activity, R.string.search_history_cleared, Toast.LENGTH_SHORT).show()
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private fun showNotificationChannel() {
+        val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS).apply {
+            putExtra(Settings.EXTRA_CHANNEL_ID, "alert_channel_01")
+            putExtra(Settings.EXTRA_APP_PACKAGE, activity!!.packageName)
+        }
+        startActivity(intent)
+    }
+
+    /**
+     * AndroidX does not include the RingtonePreference
+     * This code is based on https://issuetracker.google.com/issues/37057453#comment3
+     */
+    private fun showRingtoneManager() {
+        val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER).apply {
+            putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)
+            putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
+            putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
+            putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI, Settings.System.DEFAULT_NOTIFICATION_URI)
+        }
+
+        val existingValue = Utils.getRingtonePreference(activity)
+        if (existingValue != null) {
+            if (existingValue.isEmpty()) {
+                // Select "Silent"
+                val empty: Uri? = null
+                intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, empty)
+            } else {
+                intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, Uri.parse(existingValue))
+            }
+        } else {
+            // No ringtone has been selected, set to the default
+            intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, Settings.System.DEFAULT_NOTIFICATION_URI)
+        }
+
+        startActivityForResult(intent, REQUEST_CODE_ALERT_RINGTONE)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == REQUEST_CODE_ALERT_RINGTONE && data != null) {
+            val ringtone = data.getParcelableExtra<Uri>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
+            // ringtone is null when "Silent" was selected
+            val ringtoneString = ringtone?.toString() ?: ""
+
+            Utils.setRingtonePreference(activity, ringtoneString)
+            val ringtoneDisplayString = getRingtoneTitleFromUri(activity!!, ringtoneString)
+            ringtonePref.summary = ringtoneDisplayString ?: ""
+        } else {
+            super.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+
+    override fun onTimeZoneSet(tzi: TimeZoneInfo) {
+        val timeZoneDisplayName = tzPickerUtils.getGmtDisplayName(
+                activity, tzi.mTzId, System.currentTimeMillis(), false)
+        homeTzPref.summary = timeZoneDisplayName
+        Utils.setTimeZone(activity, tzi.mTzId)
+    }
+
+    companion object {
+        // Preference keys
+        const val KEY_THEME_PREF = "pref_theme"
+        const val KEY_COLOR_PREF = "pref_color"
+        const val KEY_DEFAULT_START = "preferences_default_start"
+        const val KEY_HIDE_DECLINED = "preferences_hide_declined"
+        const val KEY_WEEK_START_DAY = "preferences_week_start_day"
+        const val KEY_SHOW_WEEK_NUM = "preferences_show_week_num"
+        const val KEY_DAYS_PER_WEEK = "preferences_days_per_week"
+        const val KEY_MDAYS_PER_WEEK = "preferences_mdays_per_week"
+        const val KEY_CLEAR_SEARCH_HISTORY = "preferences_clear_search_history"
+        const val KEY_ALERTS_CATEGORY = "preferences_alerts_category"
+        const val KEY_ALERTS = "preferences_alerts"
+        const val KEY_NOTIFICATION = "preferences_notification"
+        const val KEY_ALERTS_VIBRATE = "preferences_alerts_vibrate"
+        const val KEY_ALERTS_RINGTONE = "preferences_alerts_ringtone"
+        const val KEY_ALERTS_POPUP = "preferences_alerts_popup"
+        const val KEY_SHOW_CONTROLS = "preferences_show_controls"
+        const val KEY_DEFAULT_REMINDER = "preferences_default_reminder"
+        const val NO_REMINDER = -1
+        const val NO_REMINDER_STRING = "-1"
+        const val REMINDER_DEFAULT_TIME = 10 // in minutes
+        const val KEY_USE_CUSTOM_SNOOZE_DELAY = "preferences_custom_snooze_delay"
+        const val KEY_DEFAULT_SNOOZE_DELAY = "preferences_default_snooze_delay"
+        const val SNOOZE_DELAY_DEFAULT_TIME = 5 // in minutes
+        const val KEY_DEFAULT_CELL_HEIGHT = "preferences_default_cell_height"
+        const val KEY_VERSION = "preferences_version"
+        /** Key to SharePreference for default view (CalendarController.ViewType)  */
+        const val KEY_START_VIEW = "preferred_startView"
+        /**
+         * Key to SharePreference for default detail view (CalendarController.ViewType)
+         * Typically used by widget
+         */
+        const val KEY_DETAILED_VIEW = "preferred_detailedView"
+        const val KEY_DEFAULT_CALENDAR = "preference_defaultCalendar"
+
+        /** Key to preference for default new event duration (if provider doesn't indicate one)  */
+        const val KEY_DEFAULT_EVENT_DURATION = "preferences_default_event_duration"
+        const val EVENT_DURATION_DEFAULT = "60"
+
+        // These must be in sync with the array preferences_week_start_day_values
+        const val WEEK_START_DEFAULT = "-1"
+        const val WEEK_START_SATURDAY = "7"
+        const val WEEK_START_SUNDAY = "1"
+        const val WEEK_START_MONDAY = "2"
+        // Default preference values
+        const val DEFAULT_DEFAULT_START = "-2"
+        const val DEFAULT_START_VIEW = CalendarController.ViewType.WEEK
+        const val DEFAULT_DETAILED_VIEW = CalendarController.ViewType.DAY
+        const val DEFAULT_SHOW_WEEK_NUM = false
+        // This should match the XML file.
+        const val DEFAULT_RINGTONE = "content://settings/system/notification_sound"
+        // The name of the shared preferences file. This name must be maintained for historical
+        // reasons, as it's what PreferenceManager assigned the first time the file was created.
+        const val SHARED_PREFS_NAME = "com.android.calendar_preferences"
+        const val SHARED_PREFS_NAME_NO_BACKUP = "com.android.calendar_preferences_no_backup"
+        private const val KEY_HOME_TZ_ENABLED = "preferences_home_tz_enabled"
+        private const val KEY_HOME_TZ = "preferences_home_tz"
+        private const val FRAG_TAG_TIME_ZONE_PICKER = "TimeZonePicker"
+
+        // experimental
+        const val KEY_OTHER_COPY_DB = "preferences_copy_db"
+        const val KEY_OTHER_REMINDERS_RESPONDED = "preferences_reminders_responded"
+
+        internal const val REQUEST_CODE_ALERT_RINGTONE = 42
+
+        /** Return a properly configured SharedPreferences instance  */
+        fun getSharedPreferences(context: Context): SharedPreferences {
+            return context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE)
+        }
+
+        /** Set the default shared preferences in the proper context */
+        fun setDefaultValues(context: Context) {
+            PreferenceManager.setDefaultValues(context, SHARED_PREFS_NAME, Context.MODE_PRIVATE,
+                    R.xml.general_preferences, true)
+        }
+    }
+}
diff --git a/src/com/android/calendar/settings/MainListPreferences.kt b/src/com/android/calendar/settings/MainListPreferences.kt
new file mode 100644
index 0000000000000000000000000000000000000000..60409e7e1b3cc13de7bbf9a764b8ba23d9c66e33
--- /dev/null
+++ b/src/com/android/calendar/settings/MainListPreferences.kt
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.os.Bundle
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.preference.Preference
+import androidx.preference.PreferenceCategory
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceScreen
+import com.android.calendar.persistence.Calendar
+import foundation.e.calendar.R
+
+
+class MainListPreferences : PreferenceFragmentCompat() {
+
+    private lateinit var mainListViewModel: MainListViewModel
+
+    private var currentCalendars = mutableSetOf<Long>()
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        val context = preferenceManager.context
+        val screen = preferenceManager.createPreferenceScreen(context)
+
+        addGeneralPreferences(screen)
+
+        preferenceScreen = screen
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        activity?.title = getString(R.string.preferences_title)
+
+        val factory = MainListViewModelFactory(activity!!.application)
+        mainListViewModel = ViewModelProvider(this, factory).get(MainListViewModel::class.java)
+
+        // Add an observer on the LiveData returned by getCalendarsOrderedByAccount.
+        // The onChanged() method fires when the observed data changes and the activity is
+        // in the foreground.
+        mainListViewModel.getCalendarsOrderedByAccount().observe(viewLifecycleOwner, Observer<List<Calendar>> { calendars ->
+            updateCalendarPreferences(preferenceScreen, calendars)
+        })
+    }
+
+    private fun updateCalendarPreferences(screen: PreferenceScreen, allCalendars: List<Calendar>) {
+        val newCalendars = mutableSetOf<Long>()
+
+        for (calendar in allCalendars) {
+            newCalendars.add(calendar.id)
+
+            // add category per account if not already present
+            val accountCategoryUniqueKey = "account_category_${calendar.accountName}_${calendar.accountType}"
+            var accountCategory = screen.findPreference<PreferenceCategory>(accountCategoryUniqueKey)
+            if (accountCategory == null) {
+                accountCategory = PreferenceCategory(context).apply {
+                    key = accountCategoryUniqueKey
+                    title = calendar.accountName
+                    order = if (calendar.isLocal) 10 else 11 // show offline calendar first
+                    isOrderingAsAdded = false // use alphabetic ordering for children
+                }
+                screen.addPreference(accountCategory)
+            }
+
+            // add preference per calendar if not already present
+            val calendarUniqueKey = "calendar_preference_${calendar.id}"
+            var calendarPreference = screen.findPreference<Preference>(calendarUniqueKey)
+            if (calendarPreference == null) {
+                calendarPreference = Preference(context)
+                accountCategory.addPreference(calendarPreference)
+            }
+            calendarPreference.apply {
+                key = calendarUniqueKey
+                title = if (calendar.displayName.isNullOrBlank()) getString(R.string.preferences_calendar_no_display_name) else calendar.displayName
+                fragment = CalendarPreferences::class.java.name
+                order = if (calendar.isPrimary) 1 else 2 // primary calendar is first, others are alphabetically ordered below
+                icon = getCalendarIcon(calendar.color, calendar.visible, calendar.syncEvents)
+                summary = getCalendarSummary(calendar.visible, calendar.syncEvents)
+            }
+            // pass-through calendar id for CalendarPreferences
+            calendarPreference.extras.putLong(CalendarPreferences.ARG_CALENDAR_ID, calendar.id)
+        }
+
+        // remove preferences for calendars no longer existing
+        val calendarsToDelete = currentCalendars.subtract(newCalendars)
+        calendarsToDelete.forEach {
+            val calendarUniqueKey = "calendar_preference_${it}"
+            screen.removePreferenceRecursively(calendarUniqueKey)
+        }
+
+        // remove empty account categories
+        val categoriesToDelete = mutableSetOf<PreferenceCategory>()
+        for (i in 0 until screen.preferenceCount) {
+            val pref = screen.getPreference(i)
+            if (pref is PreferenceCategory) {
+                if (pref.preferenceCount == 0) {
+                    categoriesToDelete.add(pref)
+                }
+            }
+        }
+        categoriesToDelete.forEach {
+            screen.removePreference(it)
+        }
+
+        currentCalendars = newCalendars
+    }
+
+    private fun getCalendarSummary(visible: Boolean, syncEvents: Boolean): String {
+        return if (!syncEvents) {
+            getString(R.string.preferences_list_calendar_summary_sync_off)
+        } else if (visible) {
+            ""
+        } else {
+            getString(R.string.preferences_list_calendar_summary_invisible)
+        }
+    }
+
+    private fun getCalendarIcon(color: Int, visible: Boolean, syncEvents: Boolean): Drawable {
+        val icon = if (!syncEvents) {
+            ContextCompat.getDrawable(context!!, R.drawable.ic_sync_off_light)
+        } else if (visible) {
+            ContextCompat.getDrawable(context!!, R.drawable.circle)
+        } else {
+            ContextCompat.getDrawable(context!!, R.drawable.circle_outline)
+        }
+
+        icon!!.mutate().setColorFilter(color, Mode.SRC_IN)
+        return icon
+    }
+
+    private fun addGeneralPreferences(screen: PreferenceScreen) {
+        val generalPreference = Preference(context).apply {
+            title = getString(R.string.preferences_list_general)
+            fragment = GeneralPreferences::class.java.name
+        }
+        val addCaldavPreference = Preference(context).apply {
+            title = getString(R.string.preferences_list_add_remote)
+        }
+        addCaldavPreference.setOnPreferenceClickListener {
+            launchDavX5Login()
+            true
+        }
+        val addOfflinePreference = Preference(context).apply {
+            title = getString(R.string.preferences_list_add_offline)
+        }
+        addOfflinePreference.setOnPreferenceClickListener {
+            addOfflineCalendar()
+            true
+        }
+        screen.addPreference(generalPreference)
+        screen.addPreference(addCaldavPreference)
+        screen.addPreference(addOfflinePreference)
+    }
+
+    private fun addOfflineCalendar() {
+        val dialog = AddOfflineCalendarDialogFragment()
+        dialog.show(fragmentManager!!, "addOfflineCalendar")
+    }
+
+    /**
+     * Based on https://www.davx5.com/manual/technical_information.html#api-integration
+     */
+    private fun launchDavX5Login() {
+        val davX5Intent = Intent()
+        davX5Intent.setClassName("at.bitfire.davdroid", "at.bitfire.davdroid.ui.setup.LoginActivity")
+
+        if (activity!!.packageManager.resolveActivity(davX5Intent, 0) != null) {
+            startActivityForResult(davX5Intent, ACTION_REQUEST_CODE_DAVX5_SETUP)
+        } else {
+            // DAVx5 is not installed
+            val installIntent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=at.bitfire.davdroid"))
+
+            // launch market
+            if (installIntent.resolveActivity(activity!!.packageManager) != null) {
+                startActivity(installIntent)
+            } else {
+                // no f-droid market app or Play store installed -> launch browser for f-droid url
+                val downloadIntent = Intent(Intent.ACTION_VIEW,
+                        Uri.parse("https://f-droid.org/repository/browse/?fdid=at.bitfire.davdroid"))
+                if (downloadIntent.resolveActivity(activity!!.packageManager) != null) {
+                    startActivity(downloadIntent)
+                } else {
+                    Toast.makeText(activity, "No browser available!", Toast.LENGTH_LONG).show()
+                }
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        if (requestCode == ACTION_REQUEST_CODE_DAVX5_SETUP && resultCode == AppCompatActivity.RESULT_OK) {
+            Toast.makeText(activity, "CalDAV account added!", Toast.LENGTH_LONG).show()
+        }
+    }
+
+    companion object {
+        private const val ACTION_REQUEST_CODE_DAVX5_SETUP = 10
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/calendar/settings/MainListViewModel.kt b/src/com/android/calendar/settings/MainListViewModel.kt
new file mode 100644
index 0000000000000000000000000000000000000000..b44161c09d55b234b4e09a7401e0fa85b7b96eb2
--- /dev/null
+++ b/src/com/android/calendar/settings/MainListViewModel.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import com.android.calendar.persistence.Calendar
+import com.android.calendar.persistence.CalendarRepository
+
+
+class MainListViewModel(application: Application) : AndroidViewModel(application) {
+
+    private var repository: CalendarRepository = CalendarRepository(application)
+
+    // Using LiveData and caching what fetchCalendarsByAccountName returns has several benefits:
+    // - We can put an observer on the data (instead of polling for changes) and only update the
+    //   the UI when the data actually changes.
+    // - Repository is completely separated from the UI through the ViewModel.
+    private lateinit var allCalendars: LiveData<List<Calendar>>
+
+    init {
+        loadCalendars() // ViewModel is created only once during Activity/Fragment lifetime
+    }
+
+    private fun loadCalendars() {
+        allCalendars = repository.getCalendarsOrderedByAccount()
+    }
+
+    fun getCalendarsOrderedByAccount(): LiveData<List<Calendar>> {
+        return allCalendars
+    }
+
+}
diff --git a/src/com/android/calendar/settings/MainListViewModelFactory.kt b/src/com/android/calendar/settings/MainListViewModelFactory.kt
new file mode 100644
index 0000000000000000000000000000000000000000..55637a4f59c20fcbc815f13746a8cb29020aa669
--- /dev/null
+++ b/src/com/android/calendar/settings/MainListViewModelFactory.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.app.Application
+import androidx.annotation.NonNull
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+
+
+class MainListViewModelFactory(private val application: Application) : ViewModelProvider.Factory {
+
+    @Suppress("UNCHECKED_CAST")
+    @NonNull
+    override fun <T : ViewModel> create(@NonNull modelClass: Class<T>): T {
+        if (modelClass.isAssignableFrom(MainListViewModel::class.java)) {
+            return MainListViewModel(application) as T
+        }
+        throw IllegalArgumentException("Unknown ViewModel class")
+    }
+}
diff --git a/src/com/android/calendar/settings/QuickResponsePreferences.kt b/src/com/android/calendar/settings/QuickResponsePreferences.kt
new file mode 100644
index 0000000000000000000000000000000000000000..fa17f4ea895cd4be6d4f64defa98617cbd8150be
--- /dev/null
+++ b/src/com/android/calendar/settings/QuickResponsePreferences.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.os.Bundle
+import androidx.preference.EditTextPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceScreen
+import com.android.calendar.Utils
+import foundation.e.calendar.R
+import java.util.*
+
+/**
+ * Fragment to facilitate editing of quick responses when emailing guests
+ */
+class QuickResponsePreferences : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
+    private lateinit var responsePreferences: Array<EditTextPreference?>
+    private lateinit var responses: Array<String>
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        val context = preferenceManager.context
+        val screen = preferenceManager.createPreferenceScreen(context)
+
+        addResponsePreferences(screen)
+
+        preferenceScreen = screen
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        activity?.title = getString(R.string.quick_response_settings)
+    }
+
+    private fun addResponsePreferences(screen: PreferenceScreen) {
+        responses = Utils.getQuickResponses(activity)
+        Arrays.sort(responses)
+
+        responsePreferences = arrayOfNulls(responses.size)
+        for ((i, response) in responses.withIndex()) {
+            val responsePreference = EditTextPreference(activity).apply {
+                setDialogTitle(R.string.quick_response_settings_edit_title)
+                title = response
+                text = response
+                key = i.toString()
+                order = i
+                isPersistent = false // done manually in onPreferenceChange
+                onPreferenceChangeListener = this@QuickResponsePreferences
+            }
+
+            responsePreferences[i] = responsePreference
+            screen.addPreference(responsePreference)
+        }
+    }
+
+    override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
+        val i = Integer.parseInt(preference.key)
+        val newResponse = newValue as String
+
+        if (responses[i] != newResponse) {
+            // update UI
+            responsePreferences[i]!!.title = newResponse
+            responsePreferences[i]!!.text = newResponse
+
+            // save new responses
+            responses[i] = newResponse
+            Utils.setSharedPreference(activity, Utils.KEY_QUICK_RESPONSES, responses)
+
+            return true
+        }
+        return false
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/android/calendar/settings/SettingsActivity.kt b/src/com/android/calendar/settings/SettingsActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..492189a0f8312579f349dbb7bcd17d6d5a2e454a
--- /dev/null
+++ b/src/com/android/calendar/settings/SettingsActivity.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import com.android.calendar.DynamicTheme
+import foundation.e.calendar.R
+
+
+
+const val EXTRA_SHOW_FRAGMENT = "settingsShowFragment"
+
+/**
+ * Based on the official Kotlin example for AndroidX preferences:
+ * https://github.com/android/user-interface-samples/blob/master/PreferencesKotlin/app/src/main/java/com/example/androidx/preference/sample/MainActivity.kt
+ *
+ * - Added EXTRA_SHOW_FRAGMENT
+ * - Don't assume title from setting, instead set it in each fragment individually
+ */
+class SettingsActivity : AppCompatActivity(),
+        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+
+    private val dynamicTheme = DynamicTheme()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        dynamicTheme.onCreate(this)
+
+        val fragment = if (intent.hasExtra(EXTRA_SHOW_FRAGMENT)) {
+            supportFragmentManager.fragmentFactory.instantiate(
+                    classLoader,
+                    intent.getStringExtra(EXTRA_SHOW_FRAGMENT)!!
+            )
+        } else {
+            MainListPreferences()
+        }
+
+        setContentView(R.layout.simple_frame_layout_material)
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        setSupportActionBar(toolbar)
+
+        if (savedInstanceState == null) {
+            supportFragmentManager
+                    .beginTransaction()
+                    .replace(R.id.body_frame, fragment)
+                    .commit()
+        }
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        if (supportFragmentManager.popBackStackImmediate()) {
+            return true
+        }
+        return super.onSupportNavigateUp()
+    }
+
+    override fun onPreferenceStartFragment(
+            caller: PreferenceFragmentCompat,
+            pref: Preference
+    ): Boolean {
+        // Instantiate the new Fragment
+        val args = pref.extras
+        val fragment = supportFragmentManager.fragmentFactory.instantiate(
+                classLoader,
+                pref.fragment
+        ).apply {
+            arguments = args
+            setTargetFragment(caller, 0)
+        }
+        // Replace the existing Fragment with the new Fragment
+        supportFragmentManager.beginTransaction()
+                .replace(R.id.body_frame, fragment)
+                .addToBackStack(null)
+                .commit()
+        return true
+    }
+
+    override fun onResume() {
+        super.onResume()
+        dynamicTheme.onResume(this)
+    }
+}
diff --git a/src/com/android/calendar/settings/TimeZonePickerDialogX.java b/src/com/android/calendar/settings/TimeZonePickerDialogX.java
new file mode 100644
index 0000000000000000000000000000000000000000..d62aed9d80cbab84ffb1b2d0ac0ff8758799bb00
--- /dev/null
+++ b/src/com/android/calendar/settings/TimeZonePickerDialogX.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.calendar.settings;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.fragment.app.DialogFragment;
+
+import com.android.timezonepicker.TimeZoneInfo;
+import com.android.timezonepicker.TimeZonePickerView;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * 1-to-1 Copy of TimeZonePickerDialog but using androidx classes
+ */
+public class TimeZonePickerDialogX extends DialogFragment implements
+        TimeZonePickerView.OnTimeZoneSetListener {
+    public static final String TAG = TimeZonePickerDialogX.class.getSimpleName();
+
+    public static final String BUNDLE_START_TIME_MILLIS = "bundle_event_start_time";
+    public static final String BUNDLE_TIME_ZONE = "bundle_event_time_zone";
+
+    private static final String KEY_HAS_RESULTS = "has_results";
+    private static final String KEY_LAST_FILTER_STRING = "last_filter_string";
+    private static final String KEY_LAST_FILTER_TYPE = "last_filter_type";
+    private static final String KEY_LAST_FILTER_TIME = "last_filter_time";
+    private static final String KEY_HIDE_FILTER_SEARCH = "hide_filter_search";
+
+    private OnTimeZoneSetListener mTimeZoneSetListener;
+    private TimeZonePickerView mView;
+    private boolean mHasCachedResults = false;
+
+    public interface OnTimeZoneSetListener {
+        void onTimeZoneSet(TimeZoneInfo tzi);
+    }
+
+    public void setOnTimeZoneSetListener(OnTimeZoneSetListener l) {
+        mTimeZoneSetListener = l;
+    }
+
+    public TimeZonePickerDialogX() {
+        super();
+    }
+
+    @Override
+    public View onCreateView(@NotNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        long timeMillis = 0;
+        String timeZone = null;
+        Bundle b = getArguments();
+        if (b != null) {
+            timeMillis = b.getLong(BUNDLE_START_TIME_MILLIS);
+            timeZone = b.getString(BUNDLE_TIME_ZONE);
+        }
+        boolean hideFilterSearch = false;
+
+        if (savedInstanceState != null) {
+            hideFilterSearch = savedInstanceState.getBoolean(KEY_HIDE_FILTER_SEARCH);
+        }
+        mView = new TimeZonePickerView(getActivity(), null, timeZone, timeMillis, this,
+                hideFilterSearch);
+        if (savedInstanceState != null && savedInstanceState.getBoolean(KEY_HAS_RESULTS, false)) {
+            mView.showFilterResults(savedInstanceState.getInt(KEY_LAST_FILTER_TYPE),
+                    savedInstanceState.getString(KEY_LAST_FILTER_STRING),
+                    savedInstanceState.getInt(KEY_LAST_FILTER_TIME));
+        }
+        return mView;
+    }
+
+    @Override
+    public void onSaveInstanceState(@NotNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(KEY_HAS_RESULTS, mView != null && mView.hasResults());
+        if (mView != null) {
+            outState.putInt(KEY_LAST_FILTER_TYPE, mView.getLastFilterType());
+            outState.putString(KEY_LAST_FILTER_STRING, mView.getLastFilterString());
+            outState.putInt(KEY_LAST_FILTER_TIME, mView.getLastFilterTime());
+            outState.putBoolean(KEY_HIDE_FILTER_SEARCH, mView.getHideFilterSearchOnStart());
+        }
+    }
+
+    @NotNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Dialog dialog = super.onCreateDialog(savedInstanceState);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        return dialog;
+    }
+
+    @Override
+    public void onTimeZoneSet(TimeZoneInfo tzi) {
+        if (mTimeZoneSetListener != null) {
+            mTimeZoneSetListener.onTimeZoneSet(tzi);
+        }
+        dismiss();
+    }
+}
diff --git a/src/com/android/calendar/settings/ViewDetailsPreferences.kt b/src/com/android/calendar/settings/ViewDetailsPreferences.kt
new file mode 100644
index 0000000000000000000000000000000000000000..6c2917d778cc2914c71fc42646917b9e23cfc94c
--- /dev/null
+++ b/src/com/android/calendar/settings/ViewDetailsPreferences.kt
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2020 Dominik Schürmann <dominik@schuermann.eu>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.android.calendar.settings
+
+import android.app.Activity
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.res.Configuration
+import android.os.Bundle
+import androidx.preference.*
+import com.android.calendar.Utils
+import com.android.calendar.Utils.SHARED_PREFS_NAME
+import java.util.*
+import foundation.e.calendar.R
+
+
+class ViewDetailsPreferences : PreferenceFragmentCompat() {
+
+    private val landscapeConf = PreferenceConfiguration(LANDSCAPE_PREFS)
+    private val portraitConf = PreferenceConfiguration(PORTRAIT_PREFS)
+
+    enum class TimeVisibility(val value: Int) {
+        SHOW_NONE(0),
+        SHOW_START_TIME(1),
+        SHOW_START_AND_END_TIME(2),
+        SHOW_START_TIME_AND_DURATION(3),
+        SHOW_TIME_RANGE_BELOW(4)
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        preferenceManager.sharedPreferencesName = GeneralPreferences.SHARED_PREFS_NAME
+
+        setPreferencesFromResource(R.xml.view_details_preferences, rootKey)
+
+        landscapeConf.onCreate(preferenceScreen, activity)
+        portraitConf.onCreate(preferenceScreen, activity)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        activity?.title = getString(R.string.display_options)
+    }
+
+    private class PreferenceKeys internal constructor(val KEY_DISPLAY_TIME: String,
+                                                      val KEY_DISPLAY_LOCATION: String,
+                                                      val KEY_MAX_NUMBER_OF_LINES: String)
+
+    private class PreferenceConfiguration(val keys: PreferenceKeys) {
+        private lateinit var displayTime: ListPreference
+
+        fun onCreate(preferenceScreen: PreferenceScreen, activity: Activity?) {
+            displayTime = preferenceScreen.findPreference(keys.KEY_DISPLAY_TIME)!!
+            initDisplayTime(activity)
+        }
+
+        private fun initDisplayTime(activity: Activity?) {
+            if (!Utils.getConfigBool(activity, R.bool.show_time_in_month)) {
+                val entries = displayTime.entries
+                val newEntries = Arrays.copyOf(entries, entries.size - 1)
+                displayTime.entries = newEntries
+            }
+            if (displayTime.entry == null || displayTime.entry.isEmpty()) {
+                displayTime.value = getDefaultTimeToShow(activity).toString()
+            }
+        }
+
+    }
+
+    private class DynamicPreferences(private val context: Context) {
+        private val prefs: SharedPreferences = GeneralPreferences.getSharedPreferences(context)
+
+        val preferenceKeys: PreferenceKeys
+            get() {
+                val orientation = context.resources.configuration.orientation
+                val landscape = orientation == Configuration.ORIENTATION_LANDSCAPE
+                return if (landscape) LANDSCAPE_PREFS else PORTRAIT_PREFS
+            }
+
+        fun getTimeVisibility(keys: PreferenceKeys): TimeVisibility {
+            val visibility = prefs.getString(keys.KEY_DISPLAY_TIME, getDefaultTimeToShow(context).toString())
+            return TimeVisibility.values()[visibility!!.toInt()]
+        }
+
+        fun getShowLocation(keys: PreferenceKeys): Boolean {
+            return prefs.getBoolean(keys.KEY_DISPLAY_LOCATION, false)
+        }
+
+        fun getMaxNumberOfLines(keys: PreferenceKeys): Int {
+            return prefs.getString(keys.KEY_MAX_NUMBER_OF_LINES, null)!!.toInt()
+        }
+
+    }
+
+    class Preferences {
+        @JvmField
+        var TIME_VISIBILITY: TimeVisibility
+        @JvmField
+        var LOCATION_VISIBILITY: Boolean
+        @JvmField
+        var MAX_LINES: Int
+
+        constructor(context: Context) {
+            val prefs = DynamicPreferences(context)
+            val keys = prefs.preferenceKeys
+            TIME_VISIBILITY = prefs.getTimeVisibility(keys)
+            LOCATION_VISIBILITY = prefs.getShowLocation(keys)
+            MAX_LINES = prefs.getMaxNumberOfLines(keys)
+        }
+
+        private constructor(prefs: Preferences) {
+            TIME_VISIBILITY = TimeVisibility.SHOW_NONE
+            LOCATION_VISIBILITY = prefs.LOCATION_VISIBILITY
+            MAX_LINES = prefs.MAX_LINES
+        }
+
+        fun hideTime(): Preferences {
+            return if (TIME_VISIBILITY == TimeVisibility.SHOW_TIME_RANGE_BELOW) {
+                Preferences(this)
+            } else this
+        }
+
+        val isTimeVisible: Boolean
+            get() = TIME_VISIBILITY != TimeVisibility.SHOW_NONE
+
+        val isTimeShownBelow: Boolean
+            get() = TIME_VISIBILITY == TimeVisibility.SHOW_TIME_RANGE_BELOW
+
+        val isStartTimeVisible: Boolean
+            get() = TIME_VISIBILITY != TimeVisibility.SHOW_NONE
+
+        val isEndTimeVisible: Boolean
+            get() = TIME_VISIBILITY == TimeVisibility.SHOW_START_AND_END_TIME ||
+                    TIME_VISIBILITY == TimeVisibility.SHOW_TIME_RANGE_BELOW
+
+        val isDurationVisible: Boolean
+            get() = TIME_VISIBILITY == TimeVisibility.SHOW_START_TIME_AND_DURATION
+    }
+
+    companion object {
+        private const val KEY_DISPLAY_TIME_V_PREF = "pref_display_time_vertical"
+        private const val KEY_DISPLAY_TIME_H_PREF = "pref_display_time_horizontal"
+        private const val KEY_DISPLAY_LOCATION_V_PREF = "pref_display_location_vertical"
+        private const val KEY_DISPLAY_LOCATION_H_PREF = "pref_display_location_horizontal"
+        private const val KEY_MAX_NUMBER_OF_LINES_V_PREF = "pref_number_of_lines_vertical"
+        private const val KEY_MAX_NUMBER_OF_LINES_H_PREF = "pref_number_of_lines_horizontal"
+
+        private val LANDSCAPE_PREFS = PreferenceKeys(KEY_DISPLAY_TIME_H_PREF, KEY_DISPLAY_LOCATION_H_PREF, KEY_MAX_NUMBER_OF_LINES_H_PREF)
+        private val PORTRAIT_PREFS = PreferenceKeys(KEY_DISPLAY_TIME_V_PREF, KEY_DISPLAY_LOCATION_V_PREF, KEY_MAX_NUMBER_OF_LINES_V_PREF)
+
+        private fun getDefaultTimeToShow(context: Context?): Int {
+            return if (Utils.getConfigBool(context, R.bool.show_time_in_month)) TimeVisibility.SHOW_TIME_RANGE_BELOW.value else TimeVisibility.SHOW_NONE.value
+        }
+
+        fun getPreferences(context: Context?): Preferences? {
+            return Preferences(context!!)
+        }
+
+        fun setDefaultValues(context: Context?) {
+            PreferenceManager.setDefaultValues(context, SHARED_PREFS_NAME, Context.MODE_PRIVATE,
+                    R.xml.view_details_preferences, true)
+        }
+    }
+}
\ No newline at end of file