okhttp 3.8.0 ProGuard settings

* refactoring: don't use global string variables

.gitignore

@@ -84,3 +84,9 @@ build/
 
 # Ignore Gradle GUI config
 gradle-app.setting
+
+### external libs ###
+.svn
+
+# Javadoc
+javadoc/

.gitlab-ci.yml

@@ -0,0 +1,21 @@
+image: registry.gitlab.com/bitfireat/davdroid:latest
+
+before_script:
+  - git submodule update --init --recursive
+  - export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew
+  - emulator64-arm -avd test -no-audio -no-window & wait-for-emulator.sh
+  - wget -q https://f-droid.org/repo/org.dmfs.tasks_103.apk && adb install org.dmfs.tasks_103.apk
+
+cache:
+  paths:
+     - .gradle/wrapper
+     - .gradle/caches
+
+test:
+  script:
+    - ./gradlew check mergeAndroidReports
+  artifacts:
+    paths:
+      - app/build/outputs/lint-results-debug.html
+      - app/build/reports
+      - build/reports

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "dav4android"]
+	path = dav4android
+	url = ../dav4android.git
+[submodule "ical4android"]
+	path = ical4android
+	url = ../ical4android.git
+[submodule "vcard4android"]
+	path = vcard4android
+	url = ../vcard4android.git
+[submodule "cert4android"]
+	path = cert4android
+	url = ../cert4android.git

CONTRIBUTING.md

@@ -1,58 +0,0 @@
-
-DAVdroid is free and open-source software, licensed under the [GPLv3 License](COPYING).
-If you like our project, please contribute to it.
-
-# How to contribute
-
-## Reporting issues
-
-An issue might be a bug, an enhancement request or something in between. If you think you
-have found a bug or if you want to request some enhancement, please:
-
-1. Read the [Configuration](http://davdroid.bitfire.at/configuration) and [FAQ](http://davdroid.bitfire.at/faq/)
-   pages carefully. The most common issues/usage challenges are explained there.
-2. Search the Web for the problem, maybe ask competent friends or in forums.
-3. Browse through the [open issues](https://github.com/rfc2822/davdroid/issues). You can
-   also search the issues in the search field on top of the page. Please have a look
-   into the closed issues, too, because many requests have already been handled (and can't/won't
-   be fixed, for instance).
-4. **[Fetch verbose logs](https://github.com/rfc2822/davdroid/wiki/How-to-view-the-logs) and prepare
-   them. Remove `Authorization: Basic xxxxxx` headers and other private data.** Extracting the
-   logs may be cumbersome work in the first time, but it's absolutely necessary in order to
-   handle your issue.
-5. [Create a new issue](https://github.com/rfc2822/davdroid/issues/new), containing
-   * a useful summary of the problem ("Crash when syncing contacts with large photos" instead of "CRASH PLEASE HELP"),
-   * your DAVdroid version and source ("DAVdroid 0.5.10 from F-Droid"),
-   * your Android version and device model ("Samsung Galaxy S2 running Android 4.4.2 (CyanogenMod 11-20140504-SNAPSHOT-M6-i9100)"),
-   * your CalDAV/CardDAV server software, version and hosting information ("OwnCloud 6, hosted on virtual server"),
-   * a problem description, including **instructions on how to reproduce the problem** (we need to
-     reproduce the problem before we can fix it!),
-   * **verbose logs including the network traffic** (see step before). Enquote the logs with three backticks ```
-     before and after, or post them onto http://gist.github.com and provide a link.
-
-
-## Pull requests
-
-We're very happy about pull requests for
-
-* source code,
-* documentation,
-* translation (strings).
-
-However, if you want to contribute source code, please talk with us in the
-corresponding issue before because will only merge pull requests that
-
-* match our product goals,
-* have the necessary code quality,
-* don't interfere with other near-term future development.
-
-However, feel free to fork the repository and do your changes anyway
-(that's why it's open-source). Just don't expect your strategic changes to be
-merged if there's no consensus in the issue before.
-
-
-## Donations
-
-If you want to support this project, please also consider [donating to DAVdroid](http://davdroid.bitfire.at/donate)
-or [purchasing it in one of the commercial stores](http://davdroid.bitfire.at/download).
-

README.md

@@ -1,21 +1,38 @@
 
-DAVDROID
+[![build status](https://gitlab.com/bitfireAT/davdroid/badges/master/build.svg)](https://gitlab.com/bitfireAT/davdroid/commits/master)
+
+
+DAVdroid
 ========
 
 Please see the [DAVdroid Web site](https://davdroid.bitfire.at) for
-detailled information about DAVdroid.
+comprehensive information about DAVdroid.
 
-DAVdroid is licensed under the [GPLv3 License](COPYING).
+DAVdroid is licensed under the [GPLv3 License](LICENSE).
 
-Twitter: [@davdroidapp](https://twitter.com/davdroidapp)
+News and updates: [@davdroidapp](https://twitter.com/davdroidapp) on Twitter /
+[davdroid-announce](https://davdroid.bitfire.at/download/newsletter/) mailing list
+
+Help and discussion: [DAVdroid forums](https://davdroid.bitfire.at/forums)
+
+**If you want to support DAVdroid, please consider [donating to DAVdroid](https://davdroid.bitfire.at/donate/)
+or [purchasing it](https://davdroid.bitfire.at/download/).**
+
+Parts of DAVdroid have been outsourced into these libraries:
+
+* [cert4android](https://gitlab.com/bitfireAT/cert4android) – custom certificate management
+* [dav4android](https://gitlab.com/bitfireAT/dav4android) – WebDAV/CalDav/CardDAV framework
+* [ical4android](https://gitlab.com/bitfireAT/ical4android) – iCalendar processing and Calendar Provider access
+* [vcard4android](https://gitlab.com/bitfireAT/vcard4android) – VCard processing and Contacts Provider access
 
 
 USED THIRD-PARTY LIBRARIES
 ==========================
 
-* [Apache HttpClient](http://hc.apache.org) (Android port) – [Apache License](http://www.apache.org/licenses/)
-* [iCal4j](http://ical4j.sourceforge.net/) – [New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE)
+Those libraries are used by DAVdroid (alphabetically):
+
+* [dnsjava](http://www.xbill.org/dnsjava/) – [BSD License](http://www.xbill.org/dnsjava/dnsjava-current/LICENSE)
 * [ez-vcard](https://code.google.com/p/ez-vcard/) – [New BSD License](http://opensource.org/licenses/BSD-3-Clause)
-* [Simple XML Serialization](http://simple.sourceforge.net/) – [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
+* [iCal4j](http://ical4j.sourceforge.net/) – [New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE)
+* [okhttp](https://square.github.io/okhttp/) – [Apache License, Version 2.0](https://square.github.io/okhttp/#license)
 * [Project Lombok](http://projectlombok.org/) – [MIT License](http://opensource.org/licenses/mit-license.php)
-* [dnsjava](http://www.xbill.org/dnsjava/) – [BSD license](http://www.xbill.org/dnsjava/dnsjava-current/LICENSE)

app/build.gradle

@@ -1,21 +1,91 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright (c) Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
 
+buildscript {
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.1'
+    }
+}
+
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.2'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         applicationId "at.bitfire.davdroid"
-        minSdkVersion 14
-        targetSdkVersion 21
+        resValue "string", "packageID", applicationId
+
+        versionCode 147
+        buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
+
+        minSdkVersion 15
+        targetSdkVersion 25
+
+        buildConfigField "boolean", "customCerts", "false"
+        buildConfigField "at.bitfire.vcard4android.GroupMethod", "settingContactGroupMethod", "null"
+    }
+
+    productFlavors {
+        standard {
+            versionName "1.5.2"
+            buildConfigField "boolean", "customCerts", "true"
+        }
+
+        gplay {
+            versionName "1.5.2-gplay"
+            buildConfigField "boolean", "customCerts", "true"
+        }
+        icloud {
+            applicationId "at.bitfire.cloudsync"
+            resValue "string", "packageID", applicationId
+
+            versionName "1.5.2-cloud"
+            buildConfigField "at.bitfire.vcard4android.GroupMethod", "settingContactGroupMethod", "at.bitfire.vcard4android.GroupMethod.GROUP_VCARDS"
+        }
+        soldupe {
+            applicationId "com.soldupe.cloudsync"
+            resValue "string", "packageID", applicationId
+            minSdkVersion 21
+
+            versionName "1.5.2-soldupe"
+            buildConfigField "boolean", "customCerts", "true"
+            buildConfigField "at.bitfire.vcard4android.GroupMethod", "settingContactGroupMethod", "at.bitfire.vcard4android.GroupMethod.CATEGORIES"
+        }
+    }
+
+    sourceSets {
+        standard.java.srcDirs = [ "src/davdroid/java" ]
+        standard.res.srcDirs = [ "src/davdroid/res" ]
+        gplay.java.srcDirs = [ "src/gplay/java", "src/davdroid/java" ]
+        gplay.res.srcDirs = [ "src/gplay/res", "src/davdroid/res" ]
+
+    }
+
+    signingConfigs {
+        bitfire {
+            storeFile file("${System.env.HOME}/Entwicklung/GooglePlay/bitfire.jks")
+            storePassword '***REMOVED***'
+            keyAlias 'bitfire'
+            keyPassword '***REMOVED***'
+        }
+        soldupe {
+            storeFile file("${System.env.HOME}/Entwicklung/GooglePlay/soldupe.jks")
+            storePassword 'hei8eePh'
+            keyAlias 'soldupe'
+            keyPassword 'ocaip6oZ'
+        }
     }
 
     buildTypes {
@@ -25,48 +95,67 @@ android {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+
+            signingConfig signingConfigs.bitfire
+            productFlavors.soldupe.signingConfig signingConfigs.soldupe
         }
     }
-    lintOptions {
-    	abortOnError false
-    }
 
+    lintOptions {
+        disable 'GoogleAppIndexingWarning'      // we don't need Google indexing, thanks
+        disable 'GradleDependency'
+        disable 'GradleDynamicVersion'
+        disable 'IconColors'
+        disable 'IconLauncherShape'
+        disable 'IconMissingDensityFolder'
+        disable 'ImpliedQuantity', 'MissingQuantity'
+        disable 'MissingTranslation', 'ExtraTranslation'	// translations from Transifex are not always up to date
+        disable 'Recycle'           // doesn't understand Lombok's @Cleanup
+        disable 'RtlEnabled'
+        disable 'RtlHardcoded'
+        disable 'Typos'
+    }
     packagingOptions {
+        exclude 'LICENSE'
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
     }
-}
 
-configurations.all {
-    exclude module: 'commons-logging'       // undocumented part of Android
+    defaultConfig {
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
 }
 
 dependencies {
-    // Apache Commons
-    compile 'commons-lang:commons-lang:2.6'
-    compile 'commons-io:commons-io:2.4'
-    // Lombok for useful @helpers
-    provided 'org.projectlombok:lombok:1.14.8'
-    // ical4j for parsing/generating iCalendars
-    compile 'org.mnode.ical4j:ical4j:1.0.6'
-    // ez-vcard for parsing/generating VCards
-    compile('com.googlecode.ez-vcard:ez-vcard:0.9.6') {
-        // hCard functionality not needed
-        exclude group: 'org.jsoup', module: 'jsoup'
-        exclude group: 'org.freemarker', module: 'freemarker'
-        // jCard functionality not needed
-        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
+    compile project(':cert4android')
+    compile project(':dav4android')
+    compile project(':ical4android')
+    compile project(':vcard4android')
+
+    compile 'com.android.support:appcompat-v7:25.+'
+    compile 'com.android.support:cardview-v7:25.+'
+    compile 'com.android.support:design:25.+'
+    compile 'com.android.support:preference-v14:25.+'
+
+    compile 'com.github.yukuku:ambilwarna:2.0.1'
+
+    compile 'com.squareup.okhttp3:logging-interceptor:3.8.0'
+    compile 'commons-io:commons-io:2.5'
+    compile 'dnsjava:dnsjava:2.1.8'
+    compile 'org.apache.commons:commons-lang3:3.5'
+    compile 'org.apache.commons:commons-collections4:4.1'
+    provided 'org.projectlombok:lombok:1.16.16'
+
+    // for tests
+    androidTestCompile('com.android.support.test:runner:+') {
+        exclude group: 'com.android.support', module: 'support-annotations'
     }
-    // dnsjava for querying SRV/TXT records
-    compile 'dnsjava:dnsjava:2.1.6'
-    // HttpClient 4.3, Android flavour for WebDAV operations
-    // we have to use our own patched build of 4.3.5.2-SNAPSHOT to avoid
-    // https://issues.apache.org/jira/browse/HTTPCLIENT-1591
-    compile files('lib/httpclient-android-4.3.5.2-davdroid1.jar')
-    // compile 'org.apache.httpcomponents:httpclient-android:4.3.5.2-SNAPSHOT'
-    // SimpleXML for parsing and generating WebDAV messages
-    compile('org.simpleframework:simple-xml:2.7.1') {
-        exclude group: 'stax', module: 'stax-api'
-        exclude group: 'xpp3', module: 'xpp3'
+    androidTestCompile('com.android.support.test:rules:+') {
+        exclude group: 'com.android.support', module: 'support-annotations'
     }
+    androidTestCompile 'junit:junit:4.12'
+    androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.0'
+
+    testCompile 'junit:junit:4.12'
+    testCompile 'com.squareup.okhttp3:mockwebserver:3.8.0'
 }

app/proguard-rules.txt

@@ -1,34 +1,38 @@
 
 # ProGuard usage for DAVdroid:
-# 	shrinking		yes - main reason for using ProGuard
-# 	optimization		no - too risky
-# 	obfuscation		no - DAVdroid is open-source
-# 	preverification		no (Android default)
+#       shrinking        yes (main reason for using ProGuard)
+#       optimization     yes
+#       obfuscation      no (DAVdroid is open-source)
+#       preverification  no
 
 -dontobfuscate
 
-
-# SimpleXML
--keep class org.simpleframework.** { *; }	# keep all interfaces etc. to allow reflection
--dontwarn com.bea.xml.stream.**			# StAX API not used
--dontwarn javax.xml.stream.**
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+-optimizationpasses 5
+-allowaccessmodification
+-dontpreverify
 
 # ez-vcard
--dontwarn com.fasterxml.jackson.**		# Jackson JSON Processor (for jCards) not used
--dontwarn freemarker.**				# freemarker templating library (for creating hCards) not used
--dontwarn org.jsoup.**				# jsoup library (for hCard parsing) not used
+-dontwarn ezvcard.io.json.**            # JSON serializer (for jCards) not used
+-dontwarn freemarker.**                 # freemarker templating library (for creating hCards) not used
+-dontwarn org.jsoup.**                  # jsoup library (for hCard parsing) not used
 -dontwarn sun.misc.Perf
--keep class ezvcard.property.** { *; }		# keep all VCard properties (created at runtime)
+-keep class ezvcard.property.** { *; }  # keep all VCard properties (created at runtime)
 
 # ical4j: ignore unused dynamic libraries
--dontwarn groovy.**				# Groovy-based ContentBuilder not used
+-dontwarn aQute.**
+-dontwarn groovy.**                       # Groovy-based ContentBuilder not used
 -dontwarn org.codehaus.groovy.**
--dontwarn org.apache.commons.logging.**		# Commons logging is not available
--dontwarn net.fortuna.ical4j.model.**		# ignore warnings from Groovy dependency
--keep class net.fortuna.ical4j.model.** { *; }	# keep all model classes (properties/factories, created at runtime)
+-dontwarn net.fortuna.ical4j.model.**     # ignore warnings from Groovy dependency
+-keep class net.fortuna.ical4j.** { *; }  # keep all model classes (properties/factories, created at runtime)
+
+# okhttp
+-dontwarn okio.**
+-dontwarn javax.annotation.Nullable
+-dontwarn javax.annotation.ParametersAreNonnullByDefault
 
 # dnsjava
--dontwarn sun.net.spi.nameservice.**		# not available on Android
+-dontwarn sun.net.spi.nameservice.**   # not available on Android
 
-# DAVdroid
--keep class at.bitfire.davdroid.** { *; }	# all DAVdroid code is required
+# DAVdroid + libs
+-keep class at.bitfire.** { *; }       # all DAVdroid code is required

app/src/androidTest/assets/all-day-0sec.ics

@@ -1,11 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-BEGIN:VEVENT
-UID:all-day-0sec@example.com
-DTSTAMP:20140101T000000Z
-DTSTART;VALUE=DATE:19970714
-DTEND;VALUE=DATE:19970714
-SUMMARY:0 Sec Event
-END:VEVENT
-END:VCALENDAR

app/src/androidTest/assets/all-day-10days.ics

@@ -1,11 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-BEGIN:VEVENT
-UID:all-day-10days@example.com
-DTSTAMP:20140101T000000Z
-DTSTART;VALUE=DATE:19970714
-DTEND;VALUE=DATE:19970724
-SUMMARY:All-Day 10 Days
-END:VEVENT
-END:VCALENDAR

app/src/androidTest/assets/all-day-1day.ics

@@ -1,11 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-BEGIN:VEVENT
-UID:all-day-1day@example.com
-DTSTAMP:20140101T000000Z
-DTSTART;VALUE=DATE:19970714
-DTEND;VALUE=DATE:19970714
-SUMMARY:All-Day 1 Day
-END:VEVENT
-END:VCALENDAR

app/src/androidTest/assets/event-on-that-day.ics

@@ -1,11 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-BEGIN:VEVENT
-UID:event-on-that-day@example.com
-DTSTAMP:19970714T170000Z
-ORGANIZER;CN=John Doe:MAILTO:john.doe@example.com
-DTSTART;VALUE=DATE:19970714
-SUMMARY:Bastille Day Party
-END:VEVENT
-END:VCALENDAR

app/src/androidTest/assets/impp.vcf

@@ -1,9 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-UID:2de59c6cc9
-PRODID:-//ownCloud//NONSGML Contacts 0.2.5//EN
-REV:2013-12-08T00:04:30+00:00
-FN:test mctest
-N:mctest;test;;;
-IMPP;TYPE=WORK;X-SERVICE-TYPE=jabber:test-without-valid-scheme@test.tld
-END:VCARD

app/src/androidTest/assets/invalid-unknown-properties.vcf

@@ -1,5 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-FN:VCard with invalid unknown properties
-X-UNKNOWN@PROPERTY:MUST-NOT_CONTAIN?OTHER*LETTERS;
-END:VCARD

app/src/androidTest/assets/reference.vcf

@@ -1,16 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;Mr.
-FN:Forrest Gump
-ORG:Bubba Gump Shrimp Co.
-TITLE:Shrimp Man
-PHOTO;VALUE=URL;TYPE=PNG:http://10.0.0.11:3000/assets/davdroid-logo-192.png
-TEL;TYPE=WORK,VOICE:(111) 555-1212
-TEL;TYPE=HOME,VOICE:(404) 555-1212
-ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America
-LABEL;TYPE=WORK:100 Waters Edge\nBaytown, LA 30314\nUnited States of America
-ADR;TYPE=HOME:;;42 Plantation St.;Baytown;LA;30314;United States of America
-LABEL;TYPE=HOME:42 Plantation St.\nBaytown, LA 30314\nUnited States of America
-EMAIL;TYPE=PREF,INTERNET:forrestgump@example.com
-REV:2008-04-24T19:52:43Z
-END:VCARD

app/src/androidTest/assets/two-line-description-without-crlf.ics

@@ -1,14 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:Blabla
-BEGIN:VEVENT
-CLASS:PUBLIC
-CREATED;VALUE=DATE-TIME:20131008T205713
-LAST-MODIFIED;VALUE=DATE-TIME:20131008T205740
-SUMMARY:online Anmeldung
-DESCRIPTION:http://www.tgbornheim.de/index.php?sessionid=&page=&id=&sportce
- ntergroup=&day=6
-UID:b99c41704b
-DTSTART;VALUE=DATE-TIME;TZID=Europe/Berlin:20131019T060000
-END:VEVENT
-END:VCALENDAR

app/src/androidTest/assets/vcard3-sample1.vcf

@@ -1,16 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest
-FN:Forrest Gump
-ORG:Bubba Gump Shrimp Co.
-TITLE:Shrimp Man
-PHOTO;VALUE=URL;TYPE=GIF:http://www.example.com/dir_photos/my_photo.gif
-TEL;TYPE=WORK,VOICE:(111) 555-1212
-TEL;TYPE=HOME,VOICE:(404) 555-1212
-ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America
-LABEL;TYPE=WORK:100 Waters Edge\nBaytown, LA 30314\nUnited States of America
-ADR;TYPE=HOME:;;42 Plantation St.;Baytown;LA;30314;United States of America
-LABEL;TYPE=HOME:42 Plantation St.\nBaytown, LA 30314\nUnited States of America
-EMAIL;TYPE=PREF,INTERNET:forrestgump@example.com
-REV:2008-04-24T19:52:43Z
-END:VCARD

app/src/androidTest/assets/vienna-evolution.ics

@@ -1,33 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VTIMEZONE
-TZID:/freeassociation.sourceforge.net/Tzfile/Europe/Vienna
-X-LIC-LOCATION:Europe/Vienna
-BEGIN:STANDARD
-TZNAME:CET
-DTSTART:19701027T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-DTSTART:19700331T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:c252087c-7354-4722-aea9-0e7d86c01a25
-DTSTAMP:20130926T151211Z
-SUMMARY:Test-Ereignis im schönen Wien
-DTSTART;TZID=/freeassociation.sourceforge.net/Tzfile/Europe/Vienna:20131009T170000
-DTEND;TZID=/freeassociation.sourceforge.net/Tzfile/Europe/Vienna:20131009T180000
-X-RADICALE-NAME:97929342-291a-434e-bf1a-fa1749bf99d0.ics
-X-EVOLUTION-CALDAV-HREF:/radicale/rfc2822/default.ics/97929342-291a-434e-bf1a-fa1749bf99d0.ics
-X-EVOLUTION-CALDAV-ETAG:\"-3264224243575339985\"
-END:VEVENT
-END:VCALENDAR

app/src/androidTest/java/at/bitfire/davdroid/ArrayUtilsTest.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-import at.bitfire.davdroid.ArrayUtils;
-
-
-public class ArrayUtilsTest extends TestCase {
-	
-	public void testPartition() {
-		// n == 0
-		assertTrue(Arrays.deepEquals(
-				new Long[0][0],
-				ArrayUtils.partition(new Long[] { }, 5)));
-				
-		// n < max
-		assertTrue(Arrays.deepEquals(
-				new Long[][] { { 1l, 2l } },
-				ArrayUtils.partition(new Long[] { 1l, 2l }, 5)));
-		
-		// n == max
-		assertTrue(Arrays.deepEquals(
-				new Long[][] { { 1l, 2l }, { 3l, 4l } },
-				ArrayUtils.partition(new Long[] { 1l, 2l, 3l, 4l }, 2)));
-		
-		// n > max
-		assertTrue(Arrays.deepEquals(
-				new Long[][] { { 1l, 2l, 3l, 4l, 5l }, { 6l, 7l, 8l, 9l, 10l }, { 11l } },
-				ArrayUtils.partition(new Long[] { 1l, 2l, 3l, 4l, 5l, 6l, 7l, 8l, 9l, 10l, 11l }, 5)));
-	}
-	
-}

app/src/androidTest/java/at/bitfire/davdroid/ContactTest.java

@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import lombok.Cleanup;
-import net.fortuna.ical4j.data.ParserException;
-import android.content.res.AssetManager;
-import android.test.InstrumentationTestCase;
-import at.bitfire.davdroid.resource.Contact;
-import ezvcard.property.Impp;
-
-public class ContactTest extends InstrumentationTestCase {
-	AssetManager assetMgr;
-	
-	public void setUp() {
-		assetMgr = getInstrumentation().getContext().getResources().getAssets();
-	}
-	
-	public void testIMPP() throws IOException {
-		Contact c = parseVCard("impp.vcf");
-		assertEquals("test mctest", c.getDisplayName());
-		
-		Impp jabber = c.getImpps().get(0);
-		assertNull(jabber.getProtocol());
-		assertEquals("test-without-valid-scheme@test.tld", jabber.getHandle());
-	}
-
-	
-	public void testParseVcard3() throws IOException, ParserException {
-		Contact c = parseVCard("vcard3-sample1.vcf");
-		
-		assertEquals("Forrest Gump", c.getDisplayName());
-		assertEquals("Forrest", c.getGivenName());
-		assertEquals("Gump", c.getFamilyName());
-		
-		assertEquals(2, c.getPhoneNumbers().size());
-		assertEquals("(111) 555-1212", c.getPhoneNumbers().get(0).getText());
-		
-		assertEquals(1, c.getEmails().size());
-		assertEquals("forrestgump@example.com", c.getEmails().get(0).getValue());
-		
-		assertFalse(c.isStarred());
-	}
-
-	
-	private Contact parseVCard(String fileName) throws IOException {
-		@Cleanup InputStream in = assetMgr.open(fileName, AssetManager.ACCESS_STREAMING);
-		
-		Contact c = new Contact(fileName, null);
-		c.parseEntity(in, null);
-		
-		return c;
-	}
-}

app/src/androidTest/java/at/bitfire/davdroid/SSLSocketFactoryCompatTest.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid;
+
+import android.os.Build;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.net.Socket;
+
+import javax.net.ssl.SSLSocket;
+
+import at.bitfire.cert4android.CustomCertManager;
+import okhttp3.mockwebserver.MockWebServer;
+
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static junit.framework.TestCase.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class SSLSocketFactoryCompatTest {
+
+    SSLSocketFactoryCompat factory;
+    MockWebServer server = new MockWebServer();
+
+    @Before
+    public void startServer() throws Exception {
+        factory = new SSLSocketFactoryCompat(new CustomCertManager(getTargetContext().getApplicationContext(), true));
+        server.start();
+    }
+
+    @After
+    public void stopServer() throws Exception {
+        server.shutdown();
+    }
+
+
+    @Test
+    public void testUpgradeTLS() throws IOException {
+        Socket s = factory.createSocket(server.getHostName(), server.getPort());
+        assertTrue(s instanceof SSLSocket);
+
+        SSLSocket ssl = (SSLSocket)s;
+        assertFalse(org.apache.commons.lang3.ArrayUtils.contains(ssl.getEnabledProtocols(), "SSLv3"));
+        assertTrue(org.apache.commons.lang3.ArrayUtils.contains(ssl.getEnabledProtocols(), "TLSv1"));
+
+        if (Build.VERSION.SDK_INT >= 16) {
+            assertTrue(org.apache.commons.lang3.ArrayUtils.contains(ssl.getEnabledProtocols(), "TLSv1.1"));
+            assertTrue(org.apache.commons.lang3.ArrayUtils.contains(ssl.getEnabledProtocols(), "TLSv1.2"));
+        }
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/TestConstants.java

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import android.util.Log;
-
-public class TestConstants {
-	public static final String ROBOHYDRA_BASE = "http://10.0.0.11:3000/";
-	
-	public static URI roboHydra;
-	static {
-		try {
-			roboHydra = new URI(ROBOHYDRA_BASE);
-		} catch(URISyntaxException e) {
-			Log.wtf("davdroid.test.Constants", "Invalid RoboHydra base URL");
-		}
-	}
-}

app/src/androidTest/java/at/bitfire/davdroid/URLUtilsTest.java

@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid;
-
-import java.net.URI;
-
-import junit.framework.TestCase;
-import at.bitfire.davdroid.URIUtils;
-
-
-public class URLUtilsTest extends TestCase {
-	
-	/* RFC 1738 p17 HTTP URLs:
-	hpath          = hsegment *[ "/" hsegment ]
-	hsegment       = *[ uchar | ";" | ":" | "@" | "&" | "=" ]
-	uchar          = unreserved | escape
-	unreserved     = alpha | digit | safe | extra
-	alpha          = lowalpha | hialpha
-	lowalpha       = ...
-	hialpha        = ...					
-	digit          = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" |
-	                 "8" | "9"
-	safe           = "$" | "-" | "_" | "." | "+"
-	extra          = "!" | "*" | "'" | "(" | ")" | ","
-	escape         = "%" hex hex
-	*/
-
-
-	public void testEnsureTrailingSlash() throws Exception {
-		assertEquals("/test/", URIUtils.ensureTrailingSlash("/test"));
-		assertEquals("/test/", URIUtils.ensureTrailingSlash("/test/"));
-
-		String	withoutSlash = "http://www.test.example/dav/collection",
-				withSlash = withoutSlash + "/";
-		assertEquals(new URI(withSlash), URIUtils.ensureTrailingSlash(new URI(withoutSlash)));
-		assertEquals(new URI(withSlash), URIUtils.ensureTrailingSlash(new URI(withSlash)));
-	}
-
-	public void testParseURI() throws Exception {
-		// don't escape valid characters
-	    String validPath = "/;:@&=$-_.+!*'(),";
-		assertEquals(new URI("https://www.test.example:123" + validPath), URIUtils.parseURI("https://www.test.example:123" + validPath, false));
-		assertEquals(new URI(validPath), URIUtils.parseURI(validPath, true));
-		
-		// keep literal IPv6 addresses (only in host name)
-		assertEquals(new URI("https://[1:2::1]/"), URIUtils.parseURI("https://[1:2::1]/", false));
-		
-		// "~" as home directory (valid)
-		assertEquals(new URI("http://www.test.example/~user1/"), URIUtils.parseURI("http://www.test.example/~user1/", false));
-		assertEquals(new URI("/~user1/"), URIUtils.parseURI("/%7euser1/", true));
-		
-		// "@" in path names (valid)
-		assertEquals(new URI("http://www.test.example/user@server.com/"), URIUtils.parseURI("http://www.test.example/user@server.com/", false));
-        assertEquals(new URI("/user@server.com/"), URIUtils.parseURI("/user%40server.com/", true));
-		assertEquals(new URI("user@server.com"), URIUtils.parseURI("user%40server.com", true));
-        
-        // ":" in path names (valid)
-        assertEquals(new URI("http://www.test.example/my:cal.ics"), URIUtils.parseURI("http://www.test.example/my:cal.ics", false));
-        assertEquals(new URI("/my:cal.ics"), URIUtils.parseURI("/my%3Acal.ics", true));
-        assertEquals(new URI(null, null, "my:cal.ics", null, null), URIUtils.parseURI("my%3Acal.ics", true));
-
-        // common invalid path names
-        assertEquals(new URI(null, null, "my cal.ics", null, null), URIUtils.parseURI("my cal.ics", true));
-        assertEquals(new URI(null, null, "{1234}.vcf", null, null), URIUtils.parseURI("{1234}.vcf", true));
-	}
-}

app/src/androidTest/java/at/bitfire/davdroid/model/CollectionInfoTest.java

@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.model;
+
+import android.content.ContentValues;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+
+import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.exception.DavException;
+import at.bitfire.dav4android.exception.HttpException;
+import at.bitfire.dav4android.property.ResourceType;
+import at.bitfire.davdroid.HttpClient;
+import at.bitfire.davdroid.model.ServiceDB.Collections;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class CollectionInfoTest {
+
+    MockWebServer server = new MockWebServer();
+
+    @Test
+    public void testFromDavResource() throws IOException, HttpException, DavException {
+        // r/w address book
+        server.enqueue(new MockResponse()
+                .setResponseCode(207)
+                .setBody("<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav'>" +
+                        "<response>" +
+                        "   <href>/</href>" +
+                        "   <propstat><prop>" +
+                        "       <resourcetype><collection/><CARD:addressbook/></resourcetype>" +
+                        "       <displayname>My Contacts</displayname>" +
+                        "       <CARD:addressbook-description>My Contacts Description</CARD:addressbook-description>" +
+                        "   </prop></propstat>" +
+                        "</response>" +
+                        "</multistatus>"));
+
+        DavResource dav = new DavResource(HttpClient.create(null), server.url("/"));
+        dav.propfind(0, ResourceType.NAME);
+        CollectionInfo info = CollectionInfo.fromDavResource(dav);
+        assertEquals(CollectionInfo.Type.ADDRESS_BOOK, info.type);
+        assertFalse(info.readOnly);
+        assertEquals("My Contacts", info.displayName);
+        assertEquals("My Contacts Description", info.description);
+
+        // read-only calendar, no display name
+        server.enqueue(new MockResponse()
+                .setResponseCode(207)
+                .setBody("<multistatus xmlns='DAV:' xmlns:CAL='urn:ietf:params:xml:ns:caldav' xmlns:ICAL='http://apple.com/ns/ical/'>" +
+                        "<response>" +
+                        "   <href>/</href>" +
+                        "   <propstat><prop>" +
+                        "       <resourcetype><collection/><CAL:calendar/></resourcetype>" +
+                        "       <current-user-privilege-set><privilege><read/></privilege></current-user-privilege-set>" +
+                        "       <CAL:calendar-description>My Calendar</CAL:calendar-description>" +
+                        "       <CAL:calendar-timezone>tzdata</CAL:calendar-timezone>" +
+                        "       <ICAL:calendar-color>#ff0000</ICAL:calendar-color>" +
+                        "   </prop></propstat>" +
+                        "</response>" +
+                        "</multistatus>"));
+
+        dav = new DavResource(HttpClient.create(null), server.url("/"));
+        dav.propfind(0, ResourceType.NAME);
+        info = CollectionInfo.fromDavResource(dav);
+        assertEquals(CollectionInfo.Type.CALENDAR, info.type);
+        assertTrue(info.readOnly);
+        assertNull(info.displayName);
+        assertEquals("My Calendar", info.description);
+        assertEquals(0xFFFF0000, (int)info.color);
+        assertEquals("tzdata", info.timeZone);
+        assertTrue(info.supportsVEVENT);
+        assertTrue(info.supportsVTODO);
+    }
+
+    @Test
+    public void testFromDB() {
+        ContentValues values = new ContentValues();
+        values.put(Collections.ID, 1);
+        values.put(Collections.SERVICE_ID, 1);
+        values.put(Collections.URL, "http://example.com");
+        values.put(Collections.READ_ONLY, 1);
+        values.put(Collections.DISPLAY_NAME, "display name");
+        values.put(Collections.DESCRIPTION, "description");
+        values.put(Collections.COLOR, 0xFFFF0000);
+        values.put(Collections.TIME_ZONE, "tzdata");
+        values.put(Collections.SUPPORTS_VEVENT, 1);
+        values.put(Collections.SUPPORTS_VTODO, 1);
+        values.put(Collections.SYNC, 1);
+
+        CollectionInfo info = CollectionInfo.fromDB(values);
+        assertEquals(1, info.id);
+        assertEquals(1, (long)info.serviceID);
+        assertEquals("http://example.com", info.url);
+        assertTrue(info.readOnly);
+        assertEquals("display name", info.displayName);
+        assertEquals("description", info.description);
+        assertEquals(0xFFFF0000, (int)info.color);
+        assertEquals("tzdata", info.timeZone);
+        assertTrue(info.supportsVEVENT);
+        assertTrue(info.supportsVTODO);
+        assertTrue(info.selected);
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java

@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-
-import at.bitfire.davdroid.webdav.DavException;
-import at.bitfire.davdroid.webdav.HttpException;
-import ezvcard.property.Email;
-import ezvcard.property.Telephone;
-import lombok.Cleanup;
-import android.content.res.AssetManager;
-import android.test.InstrumentationTestCase;
-
-import org.apache.commons.io.IOUtils;
-
-import at.bitfire.davdroid.resource.Contact;
-import at.bitfire.davdroid.resource.InvalidResourceException;
-
-public class ContactTest extends InstrumentationTestCase {
-	AssetManager assetMgr;
-	
-	public void setUp() throws IOException, InvalidResourceException {
-		assetMgr = getInstrumentation().getContext().getResources().getAssets();
-	}
-	
-	public void testReferenceVCard() throws IOException, InvalidResourceException {
-		Contact c = parseVCF("reference.vcf");
-		assertEquals("Gump", c.getFamilyName());
-		assertEquals("Forrest", c.getGivenName());
-		assertEquals("Forrest Gump", c.getDisplayName());
-		assertEquals("Bubba Gump Shrimp Co.", c.getOrganization().getValues().get(0));
-		assertEquals("Shrimp Man", c.getJobTitle());
-		
-		Telephone phone1 = c.getPhoneNumbers().get(0);
-		assertEquals("(111) 555-1212", phone1.getText());
-		assertEquals("WORK", phone1.getParameters("TYPE").get(0));
-		assertEquals("VOICE", phone1.getParameters("TYPE").get(1));
-		
-		Telephone phone2 = c.getPhoneNumbers().get(1);
-		assertEquals("(404) 555-1212", phone2.getText());
-		assertEquals("HOME", phone2.getParameters("TYPE").get(0));
-		assertEquals("VOICE", phone2.getParameters("TYPE").get(1));
-		
-		Email email = c.getEmails().get(0);
-		assertEquals("forrestgump@example.com", email.getValue());
-		assertEquals("PREF", email.getParameters("TYPE").get(0));
-		assertEquals("INTERNET", email.getParameters("TYPE").get(1));
-
-		@Cleanup InputStream photoStream = assetMgr.open("davdroid-logo-192.png", AssetManager.ACCESS_STREAMING);
-		byte[] expectedPhoto = IOUtils.toByteArray(photoStream);
-		assertTrue(Arrays.equals(c.getPhoto(), expectedPhoto));
-	}
-
-	public void testParseInvalidUnknownProperties() throws IOException, InvalidResourceException {
-		Contact c = parseVCF("invalid-unknown-properties.vcf");
-		assertEquals("VCard with invalid unknown properties", c.getDisplayName());
-		assertNull(c.getUnknownProperties());
-	}
-	
-	
-	protected Contact parseVCF(String fname) throws IOException, InvalidResourceException {
-		@Cleanup InputStream in = assetMgr.open(fname, AssetManager.ACCESS_STREAMING);
-		Contact c = new Contact(fname, null);
-		c.parseEntity(in, new Resource.AssetDownloader() {
-			@Override
-			public byte[] download(URI uri) throws URISyntaxException, IOException, HttpException, DavException {
-				return IOUtils.toByteArray(uri);
-			}
-		});
-		return c;
-	}
-}

app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java

@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import lombok.Cleanup;
-import net.fortuna.ical4j.data.ParserException;
-import android.content.res.AssetManager;
-import android.test.InstrumentationTestCase;
-import android.text.format.Time;
-import at.bitfire.davdroid.resource.Event;
-import at.bitfire.davdroid.resource.InvalidResourceException;
-
-public class EventTest extends InstrumentationTestCase {
-	AssetManager assetMgr;
-	
-	Event eOnThatDay, eAllDay1Day, eAllDay10Days, eAllDay0Sec;
-	
-	public void setUp() throws IOException, InvalidResourceException {
-		assetMgr = getInstrumentation().getContext().getResources().getAssets();
-		
-		eOnThatDay = parseCalendar("event-on-that-day.ics");
-		eAllDay1Day = parseCalendar("all-day-1day.ics");
-		eAllDay10Days = parseCalendar("all-day-10days.ics");
-		eAllDay0Sec = parseCalendar("all-day-0sec.ics");
-		
-		//assertEquals("Test-Ereignis im schönen Wien", e.getSummary());
-	}
-	
-	
-	public void testStartEndTimes() throws IOException, ParserException, InvalidResourceException {
-		// event with start+end date-time
-		Event eViennaEvolution = parseCalendar("vienna-evolution.ics");
-		assertEquals(1381330800000L, eViennaEvolution.getDtStartInMillis());
-		assertEquals("Europe/Vienna", eViennaEvolution.getDtStartTzID());
-		assertEquals(1381334400000L, eViennaEvolution.getDtEndInMillis());
-		assertEquals("Europe/Vienna", eViennaEvolution.getDtEndTzID());
-	}
-	
-	public void testStartEndTimesAllDay() throws IOException, ParserException {
-		// event with start date only
-		assertEquals(868838400000L, eOnThatDay.getDtStartInMillis());
-		assertEquals(Time.TIMEZONE_UTC, eOnThatDay.getDtStartTzID());
-		// DTEND missing in VEVENT, must have been set to DTSTART+1 day
-		assertEquals(868838400000L + 86400000, eOnThatDay.getDtEndInMillis());
-		assertEquals(Time.TIMEZONE_UTC, eOnThatDay.getDtEndTzID());
-		
-		// event with start+end date for all-day event (one day)
-		assertEquals(868838400000L, eAllDay1Day.getDtStartInMillis());
-		assertEquals(Time.TIMEZONE_UTC, eAllDay1Day.getDtStartTzID());
-		assertEquals(868838400000L + 86400000, eAllDay1Day.getDtEndInMillis());
-		assertEquals(Time.TIMEZONE_UTC, eAllDay1Day.getDtEndTzID());
-		
-		// event with start+end date for all-day event (ten days)
-		assertEquals(868838400000L, eAllDay10Days.getDtStartInMillis());
-		assertEquals(Time.TIMEZONE_UTC, eAllDay10Days.getDtStartTzID());
-		assertEquals(868838400000L + 10*86400000, eAllDay10Days.getDtEndInMillis());
-		assertEquals(Time.TIMEZONE_UTC, eAllDay10Days.getDtEndTzID());
-		
-		// event with start+end date on some day (invalid 0 sec-event)
-		assertEquals(868838400000L, eAllDay0Sec.getDtStartInMillis());
-		assertEquals(Time.TIMEZONE_UTC, eAllDay0Sec.getDtStartTzID());
-		// DTEND invalid in VEVENT, must have been set to DTSTART+1 day
-		assertEquals(868838400000L + 86400000, eAllDay0Sec.getDtEndInMillis());
-		assertEquals(Time.TIMEZONE_UTC, eAllDay0Sec.getDtEndTzID());
-	}
-	
-	public void testTimezoneDefToTzId() {
-		// test valid definition
-		final String VTIMEZONE_SAMPLE =		// taken from RFC 4791, 5.2.2. CALDAV:calendar-timezone Property 
-				"BEGIN:VCALENDAR\n" + 
-				"PRODID:-//Example Corp.//CalDAV Client//EN\n" + 
-				"VERSION:2.0\n" + 
-				"BEGIN:VTIMEZONE\n" + 
-				"TZID:US-Eastern\n" + 
-				"LAST-MODIFIED:19870101T000000Z\n" + 
-				"BEGIN:STANDARD\n" + 
-				"DTSTART:19671029T020000\n" + 
-				"RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10\n" + 
-				"TZOFFSETFROM:-0400\n" + 
-				"TZOFFSETTO:-0500\n" + 
-				"TZNAME:Eastern Standard Time (US & Canada)\n" + 
-				"END:STANDARD\n" + 
-				"BEGIN:DAYLIGHT\n" + 
-				"DTSTART:19870405T020000\n" + 
-				"RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4\n" + 
-				"TZOFFSETFROM:-0500\n" + 
-				"TZOFFSETTO:-0400\n" + 
-				"TZNAME:Eastern Daylight Time (US & Canada)\n" + 
-				"END:DAYLIGHT\n" + 
-				"END:VTIMEZONE\n" + 
-				"END:VCALENDAR";
-		assertEquals("US-Eastern", Event.TimezoneDefToTzId(VTIMEZONE_SAMPLE));
-
-		// test null value
-		try {
-			Event.TimezoneDefToTzId(null);
-			fail();
-		} catch(IllegalArgumentException e) {
-			assert(true);
-		}
-		
-		// test invalid time zone
-		try {
-			Event.TimezoneDefToTzId("/* invalid content */");
-			fail();
-		} catch(IllegalArgumentException e) {
-			assert(true);
-		}
-	}
-
-	public void testUnfolding() throws IOException, InvalidResourceException {
-		Event e = parseCalendar("two-line-description-without-crlf.ics");
-		assertEquals("http://www.tgbornheim.de/index.php?sessionid=&page=&id=&sportcentergroup=&day=6", e.getDescription());
-	}
-	
-	
-	protected Event parseCalendar(String fname) throws IOException, InvalidResourceException {
-		@Cleanup InputStream in = assetMgr.open(fname, AssetManager.ACCESS_STREAMING);
-		Event e = new Event(fname, null);
-		e.parseEntity(in, null);
-		return e;
-	}
-}

app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java

@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid.resource;
-
-import java.util.Calendar;
-
-import lombok.Cleanup;
-import android.accounts.Account;
-import android.annotation.TargetApi;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.os.RemoteException;
-import android.provider.CalendarContract;
-import android.provider.CalendarContract.Attendees;
-import android.provider.CalendarContract.Calendars;
-import android.provider.CalendarContract.Events;
-import android.provider.CalendarContract.Reminders;
-import android.test.InstrumentationTestCase;
-import android.util.Log;
-import at.bitfire.davdroid.resource.LocalCalendar;
-import at.bitfire.davdroid.resource.LocalStorageException;
-
-public class LocalCalendarTest extends InstrumentationTestCase {
-	
-	private static final String
-		TAG = "davroid.LocalCalendarTest",
-		calendarName = "DAVdroid_Test";
-	
-	ContentProviderClient providerClient;
-	Account testAccount = new Account(calendarName, CalendarContract.ACCOUNT_TYPE_LOCAL);
-	LocalCalendar testCalendar;
-	
-	
-	// helpers
-	
-	private Uri syncAdapterURI(Uri uri) {
-		return uri.buildUpon()
-				.appendQueryParameter(Calendars.ACCOUNT_NAME, calendarName)
-				.appendQueryParameter(Calendars.ACCOUNT_TYPE, CalendarContract.ACCOUNT_TYPE_LOCAL)
-				.appendQueryParameter(CalendarContract.CALLER_IS_SYNCADAPTER, "true").
-				build();
-	}
-	
-	private long insertNewEvent() throws LocalStorageException, RemoteException {
-		ContentValues values = new ContentValues();
-		values.put(Events.CALENDAR_ID, testCalendar.getId());
-		values.put(Events.TITLE, "Test Event");
-		values.put(Events.ALL_DAY, 0);
-		values.put(Events.DTSTART, Calendar.getInstance().getTimeInMillis());
-		values.put(Events.DTEND, Calendar.getInstance().getTimeInMillis());
-		values.put(Events.EVENT_TIMEZONE, "UTC");
-		values.put(Events.DIRTY, 1);
-		return ContentUris.parseId(providerClient.insert(syncAdapterURI(Events.CONTENT_URI), values));
-	}
-	
-	private void deleteEvent(long id) throws RemoteException {
-		providerClient.delete(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, id)), null, null);
-	}
-	
-	
-	// initialization
-	
-	@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
-	protected void setUp() throws Exception {
-		ContentResolver resolver = getInstrumentation().getContext().getContentResolver();
-		providerClient = resolver.acquireContentProviderClient(CalendarContract.AUTHORITY);
-		
-		long id;
-		
-		@Cleanup Cursor cursor = providerClient.query(Calendars.CONTENT_URI,
-				new String[] { Calendars._ID },
-				Calendars.ACCOUNT_TYPE + "=? AND " + Calendars.NAME + "=?",
-				new String[] { CalendarContract.ACCOUNT_TYPE_LOCAL, calendarName },
-				null);
-		if (cursor.moveToNext()) {
-			// found local test calendar
-			id = cursor.getLong(0);
-			Log.d(TAG, "Found test calendar with ID " + id);
-			
-		} else {
-			// no local test calendar found, create 
-			ContentValues values = new ContentValues();
-			values.put(Calendars.ACCOUNT_NAME, testAccount.name);
-			values.put(Calendars.ACCOUNT_TYPE, testAccount.type);
-			values.put(Calendars.NAME, calendarName);
-			values.put(Calendars.CALENDAR_DISPLAY_NAME, calendarName);
-			values.put(Calendars.CALENDAR_ACCESS_LEVEL, Calendars.CAL_ACCESS_OWNER);
-			values.put(Calendars.ALLOWED_REMINDERS, Reminders.METHOD_ALERT);
-			values.put(Calendars.SYNC_EVENTS, 0);
-			values.put(Calendars.VISIBLE, 1);
-			
-			if (android.os.Build.VERSION.SDK_INT >= 15) {
-				values.put(Calendars.ALLOWED_AVAILABILITY, Events.AVAILABILITY_BUSY + "," + Events.AVAILABILITY_FREE + "," + Events.AVAILABILITY_TENTATIVE);
-				values.put(Calendars.ALLOWED_ATTENDEE_TYPES, Attendees.TYPE_NONE + "," + Attendees.TYPE_OPTIONAL + "," + Attendees.TYPE_REQUIRED + "," + Attendees.TYPE_RESOURCE);
-			}
-			
-			Uri calendarURI = providerClient.insert(syncAdapterURI(Calendars.CONTENT_URI), values);
-			
-			id = ContentUris.parseId(calendarURI);
-			Log.d(TAG, "Created test calendar with ID " + id);
-		}
-		
-		testCalendar = new LocalCalendar(testAccount, providerClient, id, null);
-	}
-
-	protected void tearDown() throws Exception {
-		Uri uri = ContentUris.withAppendedId(syncAdapterURI(Calendars.CONTENT_URI), testCalendar.getId());
-		providerClient.delete(uri, null, null);
-	}
-
-	
-	// tests
-	
-	public void testCTags() throws LocalStorageException {
-		assertNull(testCalendar.getCTag());
-		
-		final String cTag = "just-modified"; 
-		testCalendar.setCTag(cTag);
-		
-		assertEquals(cTag, testCalendar.getCTag());
-	}
-	
-	public void testFindNew() throws LocalStorageException, RemoteException {
-		// at the beginning, there are no dirty events 
-		assertTrue(testCalendar.findNew().length == 0);
-		assertTrue(testCalendar.findUpdated().length == 0);
-		
-		// insert a "new" event
-		long id = insertNewEvent();
-		try {
-			// there must be one "new" event now
-			assertTrue(testCalendar.findNew().length == 1);
-			assertTrue(testCalendar.findUpdated().length == 0);
-					
-			// nothing has changed, the record must still be "new"
-			// see issue #233
-			assertTrue(testCalendar.findNew().length == 1);
-			assertTrue(testCalendar.findUpdated().length == 0);
-		} finally {
-			deleteEvent(id);
-		}
-	}
-
-}

app/src/androidTest/java/at/bitfire/davdroid/syncadapter/DavResourceFinderTest.java

@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid.syncadapter;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.List;
-
-import android.test.InstrumentationTestCase;
-import at.bitfire.davdroid.resource.DavResourceFinder;
-import at.bitfire.davdroid.resource.ServerInfo;
-import at.bitfire.davdroid.resource.ServerInfo.ResourceInfo;
-import at.bitfire.davdroid.TestConstants;
-import ezvcard.VCardVersion;
-
-public class DavResourceFinderTest extends InstrumentationTestCase {
-	
-	DavResourceFinder finder;
-
-	@Override
-	protected void setUp() {
-		finder = new DavResourceFinder(getInstrumentation().getContext());
-	}
-	
-	@Override
-	protected void tearDown() throws IOException {
-		finder.close();
-	}
-	
-
-	public void testFindResourcesRobohydra() throws Exception {
-		ServerInfo info = new ServerInfo(new URI(TestConstants.ROBOHYDRA_BASE), "test", "test", true);
-		finder.findResources(info);
-		
-		/*** CardDAV ***/
-		assertTrue(info.isCardDAV());
-		List<ResourceInfo> collections = info.getAddressBooks();
-		// two address books
-		assertEquals(2, collections.size());
-		// first one
-		ResourceInfo collection = collections.get(0);
-		assertEquals(TestConstants.roboHydra.resolve("/dav/addressbooks/test/default-v4.vcf/").toString(), collection.getURL());
-		assertEquals("Default Address Book", collection.getDescription());
-		assertEquals(VCardVersion.V4_0, collection.getVCardVersion());
-		// second one
-		collection = collections.get(1);
-		assertEquals("https://my.server/absolute:uri/my-address-book/", collection.getURL());
-		assertEquals("Absolute URI VCard3 Book", collection.getDescription());
-		assertEquals(VCardVersion.V3_0, collection.getVCardVersion());
-		
-		/*** CalDAV ***/
-		assertTrue(info.isCalDAV());
-		collections = info.getCalendars();
-		assertEquals(2, collections.size());
-		
-		ResourceInfo resource = collections.get(0);
-		assertEquals("Private Calendar", resource.getTitle());
-		assertEquals("This is my private calendar.", resource.getDescription());
-		assertFalse(resource.isReadOnly());
-		
-		resource = collections.get(1);
-		assertEquals("Work Calendar", resource.getTitle());
-		assertTrue(resource.isReadOnly());
-	}
-	
-	
-	public void testGetInitialContextURL() throws Exception {
-		// without SRV records, but with well-known paths
-		ServerInfo roboHydra = new ServerInfo(new URI(TestConstants.ROBOHYDRA_BASE), "test", "test", true);
-		assertEquals(TestConstants.roboHydra.resolve("/"), finder.getInitialContextURL(roboHydra, "caldav"));
-		assertEquals(TestConstants.roboHydra.resolve("/"), finder.getInitialContextURL(roboHydra, "carddav"));
-		
-		// with SRV records and well-known paths
-		ServerInfo iCloud = new ServerInfo(new URI("mailto:test@icloud.com"), "", "", true);
-		assertEquals(new URI("https://contacts.icloud.com/"), finder.getInitialContextURL(iCloud, "carddav"));
-		assertEquals(new URI("https://caldav.icloud.com/"), finder.getInitialContextURL(iCloud, "caldav"));
-	}
-
-}

app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.java

@@ -0,0 +1,206 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.ui.setup;
+
+import android.support.test.runner.AndroidJUnit4;
+import android.test.InstrumentationTestCase;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.net.URI;
+
+import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.exception.DavException;
+import at.bitfire.dav4android.exception.HttpException;
+import at.bitfire.dav4android.property.AddressbookHomeSet;
+import at.bitfire.dav4android.property.ResourceType;
+import at.bitfire.davdroid.App;
+import at.bitfire.davdroid.HttpClient;
+import at.bitfire.davdroid.ui.setup.DavResourceFinder;
+import at.bitfire.davdroid.ui.setup.DavResourceFinder.Configuration.ServiceInfo;
+import at.bitfire.davdroid.ui.setup.LoginCredentials;
+import okhttp3.OkHttpClient;
+import okhttp3.mockwebserver.Dispatcher;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
+
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static junit.framework.TestCase.assertFalse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class DavResourceFinderTest {
+
+    MockWebServer server = new MockWebServer();
+
+    DavResourceFinder finder;
+    OkHttpClient client;
+    LoginCredentials credentials;
+
+    private static final String
+            PATH_NO_DAV = "/nodav",
+
+            PATH_CALDAV = "/caldav",
+            PATH_CARDDAV = "/carddav",
+            PATH_CALDAV_AND_CARDDAV = "/both-caldav-carddav",
+
+            SUBPATH_PRINCIPAL = "/principal",
+            SUBPATH_ADDRESSBOOK_HOMESET = "/addressbooks",
+            SUBPATH_ADDRESSBOOK = "/addressbooks/private-contacts";
+
+    @Before
+    public void initServerAndClient() throws Exception {
+        server.setDispatcher(new TestDispatcher());
+        server.start();
+
+        credentials = new LoginCredentials(URI.create("/"), "mock", "12345");
+        finder = new DavResourceFinder(getTargetContext(), credentials);
+
+        client = HttpClient.create(null);
+        client = HttpClient.addAuthentication(client, credentials.userName, credentials.password);
+    }
+
+    @After
+    public void stopServer() throws Exception {
+        server.shutdown();
+    }
+
+    @Test
+    public void testRememberIfAddressBookOrHomeset() throws IOException, HttpException, DavException {
+        ServiceInfo info;
+
+        // before dav.propfind(), no info is available
+        DavResource dav = new DavResource(client, server.url(PATH_CARDDAV + SUBPATH_PRINCIPAL));
+        finder.rememberIfAddressBookOrHomeset(dav, info = new ServiceInfo());
+        assertEquals(0, info.collections.size());
+        assertEquals(0, info.homeSets.size());
+
+        // recognize home set
+        dav.propfind(0, AddressbookHomeSet.NAME);
+        finder.rememberIfAddressBookOrHomeset(dav, info = new ServiceInfo());
+        assertEquals(0, info.collections.size());
+        assertEquals(1, info.homeSets.size());
+        assertEquals(server.url(PATH_CARDDAV + SUBPATH_ADDRESSBOOK_HOMESET + "/").uri(), info.homeSets.iterator().next());
+
+        // recognize address book
+        dav = new DavResource(client, server.url(PATH_CARDDAV + SUBPATH_ADDRESSBOOK));
+        dav.propfind(0, ResourceType.NAME);
+        finder.rememberIfAddressBookOrHomeset(dav, info = new ServiceInfo());
+        assertEquals(1, info.collections.size());
+        assertEquals(server.url(PATH_CARDDAV + SUBPATH_ADDRESSBOOK + "/").uri(), info.collections.keySet().iterator().next());
+        assertEquals(0, info.homeSets.size());
+    }
+
+    @Test
+    public void testProvidesService() throws IOException {
+        assertFalse(finder.providesService(server.url(PATH_NO_DAV), DavResourceFinder.Service.CALDAV));
+        assertFalse(finder.providesService(server.url(PATH_NO_DAV), DavResourceFinder.Service.CARDDAV));
+
+        assertTrue(finder.providesService(server.url(PATH_CALDAV), DavResourceFinder.Service.CALDAV));
+        assertFalse(finder.providesService(server.url(PATH_CALDAV), DavResourceFinder.Service.CARDDAV));
+
+        assertTrue(finder.providesService(server.url(PATH_CARDDAV), DavResourceFinder.Service.CARDDAV));
+        assertFalse(finder.providesService(server.url(PATH_CARDDAV), DavResourceFinder.Service.CALDAV));
+
+        assertTrue(finder.providesService(server.url(PATH_CALDAV_AND_CARDDAV), DavResourceFinder.Service.CALDAV));
+        assertTrue(finder.providesService(server.url(PATH_CALDAV_AND_CARDDAV), DavResourceFinder.Service.CARDDAV));
+    }
+
+    @Test
+    public void testGetCurrentUserPrincipal() throws IOException, HttpException, DavException {
+        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_NO_DAV), DavResourceFinder.Service.CALDAV));
+        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_NO_DAV), DavResourceFinder.Service.CARDDAV));
+
+        assertEquals(
+                server.url(PATH_CALDAV + SUBPATH_PRINCIPAL).uri(),
+                finder.getCurrentUserPrincipal(server.url(PATH_CALDAV), DavResourceFinder.Service.CALDAV)
+        );
+        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_CALDAV), DavResourceFinder.Service.CARDDAV));
+
+        assertEquals(
+                server.url(PATH_CARDDAV + SUBPATH_PRINCIPAL).uri(),
+                finder.getCurrentUserPrincipal(server.url(PATH_CARDDAV), DavResourceFinder.Service.CARDDAV)
+        );
+        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_CARDDAV), DavResourceFinder.Service.CALDAV));
+    }
+
+
+    // mock server
+
+    public class TestDispatcher extends Dispatcher {
+
+        @Override
+        public MockResponse dispatch(RecordedRequest rq) throws InterruptedException {
+            if (!checkAuth(rq)) {
+                MockResponse authenticate = new MockResponse().setResponseCode(401);
+                authenticate.setHeader("WWW-Authenticate", "Basic realm=\"test\"");
+                return authenticate;
+            }
+
+            String path = rq.getPath();
+
+            if ("OPTIONS".equalsIgnoreCase(rq.getMethod())) {
+                String dav = null;
+                if (path.startsWith(PATH_CALDAV))
+                    dav = "calendar-access";
+                else if (path.startsWith(PATH_CARDDAV))
+                    dav = "addressbook";
+                else if (path.startsWith(PATH_CALDAV_AND_CARDDAV))
+                    dav = "calendar-access, addressbook";
+                MockResponse response = new MockResponse().setResponseCode(200);
+                if (dav != null)
+                       response.addHeader("DAV", dav);
+                return response;
+
+            } else if ("PROPFIND".equalsIgnoreCase(rq.getMethod())) {
+                String props = null;
+                switch (path) {
+                    case PATH_CALDAV:
+                    case PATH_CARDDAV:
+                        props = "<current-user-principal><href>" + path + SUBPATH_PRINCIPAL + "</href></current-user-principal>";
+                        break;
+
+                    case PATH_CARDDAV + SUBPATH_PRINCIPAL:
+                        props = "<CARD:addressbook-home-set>" +
+                                "   <href>" + PATH_CARDDAV + SUBPATH_ADDRESSBOOK_HOMESET + "</href>" +
+                                "</CARD:addressbook-home-set>";
+                        break;
+                    case PATH_CARDDAV + SUBPATH_ADDRESSBOOK:
+                        props = "<resourcetype>" +
+                                "   <collection/>" +
+                                "   <CARD:addressbook/>" +
+                                "</resourcetype>";
+                        break;
+                }
+                App.log.info("Sending props: " + props);
+                return new MockResponse()
+                        .setResponseCode(207)
+                        .setBody("<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav'>" +
+                                "<response>" +
+                                "   <href>" + rq.getPath() + "</href>" +
+                                "   <propstat><prop>" + props + "</prop></propstat>" +
+                                "</response>" +
+                                "</multistatus>");
+            }
+
+            return new MockResponse().setResponseCode(404);
+        }
+
+        private boolean checkAuth(RecordedRequest rq) {
+            return "Basic bW9jazoxMjM0NQ==".equals(rq.getHeader("Authorization"));
+        }
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/webdav/DavRedirectStrategyTest.java

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid.webdav;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import at.bitfire.davdroid.TestConstants;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpOptions;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.protocol.HttpContext;
-
-public class DavRedirectStrategyTest extends TestCase {
-	
-	CloseableHttpClient httpClient;
-	DavRedirectStrategy strategy = DavRedirectStrategy.INSTANCE;
-	
-	@Override
-	protected void setUp() {
-		httpClient = HttpClientBuilder.create()
-				.useSystemProperties()
-				.disableRedirectHandling()
-				.build();
-	}
-	
-	@Override
-	protected void tearDown() throws IOException {
-		httpClient.close();
-	}
-	
-	
-	// happy cases
-	
-	public void testNonRedirection() throws Exception {
-		HttpUriRequest request = new HttpOptions(TestConstants.roboHydra);
-		HttpResponse response = httpClient.execute(request);
-		assertFalse(strategy.isRedirected(request, response, null));
-	}
-	
-	public void testDefaultRedirection() throws Exception {
-		final String newLocation = "/new-location";
-		
-		HttpContext context = HttpClientContext.create();
-		HttpUriRequest request = new HttpOptions(TestConstants.roboHydra.resolve("redirect/301?to=" + newLocation));
-		HttpResponse response = httpClient.execute(request, context);
-		assertTrue(strategy.isRedirected(request, response, context));
-		
-		HttpUriRequest redirected = strategy.getRedirect(request, response, context);
-		assertEquals(TestConstants.roboHydra.resolve(newLocation), redirected.getURI());
-	}
-	
-	
-	// error cases
-	
-	public void testMissingLocation() throws Exception {
-		HttpContext context = HttpClientContext.create();
-		HttpUriRequest request = new HttpOptions(TestConstants.roboHydra.resolve("redirect/without-location"));
-		HttpResponse response = httpClient.execute(request, context);
-		assertFalse(strategy.isRedirected(request, response, context));
-	}
-	
-	public void testRelativeLocation() throws Exception {
-		HttpContext context = HttpClientContext.create();
-		HttpUriRequest request = new HttpOptions(TestConstants.roboHydra.resolve("redirect/relative"));
-		HttpResponse response = httpClient.execute(request, context);
-		assertTrue(strategy.isRedirected(request, response, context));
-		
-		HttpUriRequest redirected = strategy.getRedirect(request, response, context);
-		assertEquals(TestConstants.roboHydra.resolve("/new/location"), redirected.getURI());
-	}
-}

app/src/androidTest/java/at/bitfire/davdroid/webdav/TlsSniSocketFactoryTest.java

@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid.webdav;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.security.cert.CertPathValidatorException;
-
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLSocket;
-
-import android.util.Log;
-import junit.framework.TestCase;
-
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.http.HttpHost;
-
-import lombok.Cleanup;
-
-public class TlsSniSocketFactoryTest extends TestCase {
-	private static final String TAG = "davdroid.TlsSniSocketFactoryTest";
-
-	TlsSniSocketFactory factory = TlsSniSocketFactory.getSocketFactory();
-
-	private InetSocketAddress sampleTlsEndpoint;
-
-	@Override
-	protected void setUp() {
-		// sni.velox.ch is used to test SNI (without SNI support, the certificate is invalid)
-		sampleTlsEndpoint = new InetSocketAddress("sni.velox.ch", 443);
-	}
-
-	public void testCreateSocket() {
-		try {
-			@Cleanup Socket socket = factory.createSocket(null);
-			assertFalse(socket.isConnected());
-		} catch (IOException e) {
-			fail();
-		}
-	}
-
-	public void testConnectSocket() {
-		try {
-			factory.connectSocket(1000, null, new HttpHost(sampleTlsEndpoint.getHostName()), sampleTlsEndpoint, null, null);
-		} catch (IOException e) {
-			Log.e(TAG, "I/O exception", e);
-			fail();
-		}
-	}
-
-	public void testCreateLayeredSocket() {
-		try {
-			// connect plain socket first
-			@Cleanup Socket plain = new Socket();
-			plain.connect(sampleTlsEndpoint);
-			assertTrue(plain.isConnected());
-
-			// then create TLS socket on top of it and establish TLS Connection
-			@Cleanup Socket socket = factory.createLayeredSocket(plain, sampleTlsEndpoint.getHostName(), sampleTlsEndpoint.getPort(), null);
-			assertTrue(socket.isConnected());
-
-		} catch (IOException e) {
-			Log.e(TAG, "I/O exception", e);
-			fail();
-		}
-	}
-
-	public void testProtocolVersions() throws IOException {
-		String enabledProtocols[] = factory.protocols;
-		// SSL (all versions) should be disabled
-		for (String protocol : enabledProtocols)
-			assertFalse(protocol.contains("SSL"));
-		// TLS v1+ should be enabled
-		assertTrue(ArrayUtils.contains(enabledProtocols, "TLSv1"));
-		assertTrue(ArrayUtils.contains(enabledProtocols, "TLSv1.1"));
-		assertTrue(ArrayUtils.contains(enabledProtocols, "TLSv1.2"));
-	}
-
-
-	public void testHostnameNotInCertificate() throws IOException {
-		try {
-			// host with certificate that doesn't match host name
-			// use the IP address as host name because IP addresses are usually not in the certificate subject
-			final String ipHostname = sampleTlsEndpoint.getAddress().getHostAddress();
-			InetSocketAddress host = new InetSocketAddress(ipHostname, 443);
-			@Cleanup Socket socket = factory.connectSocket(0, null, new HttpHost(ipHostname), host, null, null);
-			fail();
-		} catch (SSLException e) {
-			Log.i(TAG, "Expected exception", e);
-			assertFalse(ExceptionUtils.indexOfType(e, SSLException.class) == -1);
-		}
-	}
-
-	public void testUntrustedCertificate() throws IOException {
-		try {
-			// host with certificate that is not trusted by default
-			InetSocketAddress host = new InetSocketAddress("cacert.org", 443);
-
-			@Cleanup Socket socket = factory.connectSocket(0, null, new HttpHost(host.getHostName()), host, null, null);
-			fail();
-		} catch (SSLHandshakeException e) {
-			Log.i(TAG, "Expected exception", e);
-			assertFalse(ExceptionUtils.indexOfType(e, CertPathValidatorException.class) == -1);
-		}
-	}
-
-}

app/src/androidTest/java/at/bitfire/davdroid/webdav/WebDavResourceTest.java

@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid.webdav;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.net.ssl.SSLPeerUnverifiedException;
-
-import ezvcard.VCardVersion;
-import lombok.Cleanup;
-
-import org.apache.commons.io.IOUtils;
-
-import android.content.res.AssetManager;
-import android.test.InstrumentationTestCase;
-import at.bitfire.davdroid.TestConstants;
-import at.bitfire.davdroid.webdav.HttpPropfind.Mode;
-import at.bitfire.davdroid.webdav.WebDavResource.PutMode;
-import org.apache.http.impl.client.CloseableHttpClient;
-
-// tests require running robohydra!
-
-public class WebDavResourceTest extends InstrumentationTestCase {
-	static byte[] SAMPLE_CONTENT = new byte[] { 1, 2, 3, 4, 5 };
-	
-	final static String PATH_SIMPLE_FILE = "collection/new.file";
-	
-	AssetManager assetMgr;
-	CloseableHttpClient httpClient;
-	
-	WebDavResource baseDAV;
-	WebDavResource davAssets,
-		davCollection, davNonExistingFile, davExistingFile;
-
-	@Override
-	protected void setUp() throws Exception {
-		httpClient = DavHttpClient.create();
-				
-		assetMgr = getInstrumentation().getContext().getResources().getAssets();
-		
-		baseDAV = new WebDavResource(httpClient, TestConstants.roboHydra.resolve("/dav/"));
-		davAssets = new WebDavResource(httpClient, TestConstants.roboHydra.resolve("assets/"));
-		davCollection = new WebDavResource(httpClient, TestConstants.roboHydra.resolve("dav/"));
-
-		davNonExistingFile = new WebDavResource(davCollection, "collection/new.file");
-		davExistingFile = new WebDavResource(davCollection, "collection/existing.file");
-	}
-	
-	@Override
-	protected void tearDown() throws Exception {
-		httpClient.close();
-	}
-
-
-	/* test feature detection */
-	
-	public void testOptions() throws Exception {
-		String[]	davMethods = new String[] { "PROPFIND", "GET", "PUT", "DELETE", "REPORT" },
-					davCapabilities = new String[] { "addressbook", "calendar-access" };
-		
-		WebDavResource capable = new WebDavResource(baseDAV);
-		capable.options();
-		for (String davMethod : davMethods)
-			assertTrue(capable.supportsMethod(davMethod));
-		for (String capability : davCapabilities)
-			assertTrue(capable.supportsDAV(capability));
-	}
-
-	public void testPropfindCurrentUserPrincipal() throws Exception {
-		davCollection.propfind(HttpPropfind.Mode.CURRENT_USER_PRINCIPAL);
-		assertEquals(new URI("/dav/principals/users/test"), davCollection.getCurrentUserPrincipal());
-
-        WebDavResource simpleFile = new WebDavResource(davAssets, "test.random");
-		try {
-			simpleFile.propfind(HttpPropfind.Mode.CURRENT_USER_PRINCIPAL);
-			fail();
-			
-		} catch(DavException ex) {
-		}
-		assertNull(simpleFile.getCurrentUserPrincipal());
-	}
-		
-	public void testPropfindHomeSets() throws Exception {
-		WebDavResource dav = new WebDavResource(davCollection, "principals/users/test");
-		dav.propfind(HttpPropfind.Mode.HOME_SETS);
-		assertEquals(new URI("/dav/addressbooks/test/"), dav.getAddressbookHomeSet());
-		assertEquals(new URI("/dav/calendars/test/"), dav.getCalendarHomeSet());
-	}
-	
-	public void testPropfindAddressBooks() throws Exception {
-		WebDavResource dav = new WebDavResource(davCollection, "addressbooks/test");
-		dav.propfind(HttpPropfind.Mode.CARDDAV_COLLECTIONS);
-
-		// there should be two address books
-		assertEquals(3, dav.getMembers().size());
-
-		// the first one is not an address book and not even a collection (referenced by relative URI)
-		WebDavResource ab = dav.getMembers().get(0);
-		assertEquals(TestConstants.roboHydra.resolve("/dav/addressbooks/test/useless-member"), ab.getLocation());
-		assertEquals("useless-member", ab.getName());
-		assertFalse(ab.isAddressBook());
-
-		// the second one is a VCard4-capable address book (referenced by relative URI)
-		ab = dav.getMembers().get(1);
-		assertEquals(TestConstants.roboHydra.resolve("/dav/addressbooks/test/default-v4.vcf/"), ab.getLocation());
-		assertEquals("default-v4.vcf", ab.getName());
-		assertTrue(ab.isAddressBook());
-		assertEquals(VCardVersion.V4_0, ab.getVCardVersion());
-
-		// the third one is a (non-VCard4-capable) address book (referenced by an absolute URI)
-		ab = dav.getMembers().get(2);
-		assertEquals(new URI("https://my.server/absolute:uri/my-address-book/"), ab.getLocation());
-		assertEquals("my-address-book", ab.getName());
-		assertTrue(ab.isAddressBook());
-		assertNull(ab.getVCardVersion());
-	}
-	
-	public void testPropfindCalendars() throws Exception {
-		WebDavResource dav = new WebDavResource(davCollection, "calendars/test");
-		dav.propfind(Mode.CALDAV_COLLECTIONS);
-		assertEquals(3, dav.getMembers().size());
-		assertEquals("0xFF00FF", dav.getMembers().get(2).getColor());
-		for (WebDavResource member : dav.getMembers()) {
-			if (member.getName().contains(".ics"))
-				assertTrue(member.isCalendar());
-			else
-				assertFalse(member.isCalendar());
-			assertFalse(member.isAddressBook());
-		}
-	}
-	
-	public void testPropfindTrailingSlashes() throws Exception {
-		final String principalOK = "/principals/ok";
-		
-		String requestPaths[] = {
-			"/dav/collection-response-with-trailing-slash",
-			"/dav/collection-response-with-trailing-slash/",
-			"/dav/collection-response-without-trailing-slash",
-			"/dav/collection-response-without-trailing-slash/"
-		};
-		
-		for (String path : requestPaths) {
-			WebDavResource davSlash = new WebDavResource(davCollection, path);
-			davSlash.propfind(Mode.CARDDAV_COLLECTIONS);
-			assertEquals(new URI(principalOK), davSlash.getCurrentUserPrincipal());
-		}
-	}
-	
-	
-	/* test normal HTTP/WebDAV */
-	
-	public void testPropfindRedirection() throws Exception {
-		// PROPFIND redirection
-		WebDavResource redirected = new WebDavResource(baseDAV, "/redirect/301?to=/dav/");
-		redirected.propfind(Mode.CURRENT_USER_PRINCIPAL);
-		assertEquals("/dav/", redirected.getLocation().getPath());
-	}
-	
-	public void testGet() throws Exception {
-        WebDavResource simpleFile = new WebDavResource(davAssets, "test.random");
-		simpleFile.get("*/*");
-		@Cleanup InputStream is = assetMgr.open("test.random", AssetManager.ACCESS_STREAMING);
-		byte[] expected = IOUtils.toByteArray(is);
-		assertTrue(Arrays.equals(expected, simpleFile.getContent()));
-	}
-	
-	public void testGetHttpsWithSni() throws Exception {
-		WebDavResource file = new WebDavResource(httpClient, new URI("https://sni.velox.ch"));
-		
-		boolean	sniWorking = false;
-		try {
-			file.get("* /*");
-			sniWorking = true; 
-		} catch (SSLPeerUnverifiedException e) {
-		}
-		
-		assertTrue(sniWorking);
-	}
-	
-	public void testMultiGet() throws Exception {
-		WebDavResource davAddressBook = new WebDavResource(davCollection, "addressbooks/default.vcf/");
-		davAddressBook.multiGet(DavMultiget.Type.ADDRESS_BOOK, new String[] { "1.vcf", "2:3@my%40pc.vcf" });
-		// queried address book has a name
-		assertEquals("My Book", davAddressBook.getDisplayName());
-		// there are two contacts
-		assertEquals(2, davAddressBook.getMembers().size());
-		// contact file names should be unescaped (yes, it's really named ...%40pc... to check double-encoding)
-		assertEquals("1.vcf", davAddressBook.getMembers().get(0).getName());
-		assertEquals("2:3@my%40pc.vcf", davAddressBook.getMembers().get(1).getName());
-		// both contacts have content
-		for (WebDavResource member : davAddressBook.getMembers())
-			assertNotNull(member.getContent());
-	}
-	
-	public void testPutAddDontOverwrite() throws Exception {
-		// should succeed on a non-existing file
-		assertEquals("has-just-been-created", davNonExistingFile.put(SAMPLE_CONTENT, PutMode.ADD_DONT_OVERWRITE));
-		
-		// should fail on an existing file
-		try {
-			davExistingFile.put(SAMPLE_CONTENT, PutMode.ADD_DONT_OVERWRITE);
-			fail();
-		} catch(PreconditionFailedException ex) {
-		}
-	}
-	
-	public void testPutUpdateDontOverwrite() throws Exception  {
-		// should succeed on an existing file
-		assertEquals("has-just-been-updated", davExistingFile.put(SAMPLE_CONTENT, PutMode.UPDATE_DONT_OVERWRITE));
-		
-		// should fail on a non-existing file
-		try {
-			davNonExistingFile.put(SAMPLE_CONTENT, PutMode.UPDATE_DONT_OVERWRITE);
-			fail();
-		} catch(PreconditionFailedException ex) {
-		}
-	}
-	
-	public void testDelete() throws Exception {
-		// should succeed on an existing file
-		davExistingFile.delete();
-		
-		// should fail on a non-existing file
-		try {
-			davNonExistingFile.delete();
-			fail();
-		} catch (NotFoundException e) {
-		}
-	}
-	
-	
-	/* test CalDAV/CardDAV */
-	
-	
-	/* special test */
-	
-	public void testGetSpecialURLs() throws Exception {
-        WebDavResource dav = new WebDavResource(davAssets, "member-with:colon.vcf");
-        try {
-            dav.get("*/*");
-            fail();
-        } catch(NotFoundException e) {
-            assertTrue(true);
-        }
-	}
-	
-}

app/src/androidTest/robohydra/.gitignore

@@ -1 +0,0 @@
-node_modules

app/src/androidTest/robohydra/davdroid.conf

@@ -1,5 +0,0 @@
-{"plugins":[
-	"assets",
-	"redirect",
-	"dav"
-]}

app/src/androidTest/robohydra/plugins/assets/index.js

@@ -1,12 +0,0 @@
-var RoboHydraHeadFilesystem = require("robohydra").heads.RoboHydraHeadFilesystem;
-
-exports.getBodyParts = function(conf) {
-    return {
-        heads: [
-            new RoboHydraHeadFilesystem({
-                mountPath: '/assets/',
-                documentRoot: '../assets'
-            })
-        ]
-    };
-};

app/src/androidTest/robohydra/plugins/dav/index.js

@@ -1,293 +0,0 @@
-var roboHydraHeadDAV = require("../headdav");
-
-exports.getBodyParts = function(conf) {
-    return {
-        heads: [
-			/* base URL, provide default DAV here */
-			new RoboHydraHeadDAV({ path: "/dav/" }),
-
-            /* multistatus parsing */
-            new RoboHydraHeadDAV({
-				path: "/dav/collection-response-with-trailing-slash",
-				handler: function(req,res,next) {
-					if (req.method == "PROPFIND") {
-                        res.statusCode = 207;
-						res.write('\<?xml version="1.0" encoding="utf-8" ?>\
-							<multistatus xmlns="DAV:">\
-								<response>\
-									<href>/dav/collection-response-with-trailing-slash/</href> \
-									<propstat>\
-										<prop>\
-                                            <current-user-principal>\
-                                                <href>/principals/ok</href>\
-                                            </current-user-principal>\
-                                            <resourcetype>\
-                                                <collection/>\
-                                            </resourcetype>\
-										</prop>\
-										<status>HTTP/1.1 200 OK</status>\
-									</propstat>\
-								</response>\
-							</multistatus>\
-						');
-                    }
-                }
-            }),
-            new RoboHydraHeadDAV({
-				path: "/dav/collection-response-without-trailing-slash",
-				handler: function(req,res,next) {
-					if (req.method == "PROPFIND") {
-                        res.statusCode = 207;
-						res.write('\<?xml version="1.0" encoding="utf-8" ?>\
-							<multistatus xmlns="DAV:">\
-								<response>\
-									<href>/dav/collection-response-without-trailing-slash</href> \
-									<propstat>\
-										<prop>\
-                                            <current-user-principal>\
-                                                <href>/principals/ok</href>\
-                                            </current-user-principal>\
-                                            <resourcetype>\
-                                                <collection/>\
-                                            </resourcetype>\
-										</prop>\
-										<status>HTTP/1.1 200 OK</status>\
-									</propstat>\
-								</response>\
-							</multistatus>\
-						');
-                    }
-                }
-            }),
-
-			/* principal URL */
-            new RoboHydraHeadDAV({
-				path: "/dav/principals/users/test",
-				handler: function(req,res,next) {
-					if (req.method == "PROPFIND" && req.rawBody.toString().match(/home-?set/)) {
-						res.statusCode = 207;
-						res.write('\<?xml version="1.0" encoding="utf-8" ?>\
-							<multistatus xmlns="DAV:">\
-								<response>\
-									<href>/dav/principals/users/t%65st</href> \
-									<propstat>\
-										<prop>\
-											<CARD:addressbook-home-set xmlns:CARD="urn:ietf:params:xml:ns:carddav">\
-												<href>/dav/addressbooks/test</href>\
-											</CARD:addressbook-home-set>\
-											<CAL:calendar-home-set xmlns:CAL="urn:ietf:params:xml:ns:caldav">\
-												<href>/dav/calendars/test/</href>\
-											</CAL:calendar-home-set>\
-										</prop>\
-										<status>HTTP/1.1 200 OK</status>\
-									</propstat>\
-								</response>\
-							</multistatus>\
-						');
-					}
-				}
-            }),
-
-			/* address-book home set */
-            new RoboHydraHeadDAV({
-				path: "/dav/addressbooks/test/",
-				handler: function(req,res,next) {
-					if (!req.url.match(/\/$/)) {
-						res.statusCode = 302;
-						res.headers['location'] = "/dav/addressbooks/test/";
-					}
-					else if (req.method == "PROPFIND" && req.rawBody.toString().match(/addressbook-description/)) {
-						res.statusCode = 207;
-						res.write('\<?xml version="1.0" encoding="utf-8" ?>\
-							<multistatus xmlns="DAV:">\
-								<response>\
-									<href>/dav/addressbooks/test/useless-member</href>\
-									<propstat>\
-										<prop>\
-											<resourcetype/>\
-										</prop>\
-										<status>HTTP/1.1 200 OK</status>\
-									</propstat>\
-								</response>\
-								<response>\
-									<href>/dav/addressbooks/test/default-v4.vcf</href>\
-									<propstat>\
-										<prop xmlns:CARD="urn:ietf:params:xml:ns:carddav">\
-											<resourcetype>\
-												<collection/>\
-												<CARD:addressbook/>\
-											</resourcetype>\
-											<CARD:addressbook-description>Default Address Book</CARD:addressbook-description>\
-											<CARD:supported-address-data>\
-                                                <CARD:address-data-type content-type="text/vcard" version="3.0" />\
-                                                <CARD:address-data-type content-type="text/vcard" version="4.0" />\
-                                            </CARD:supported-address-data>\
-										</prop>\
-										<status>HTTP/1.1 200 OK</status>\
-									</propstat>\
-								</response>\
-								<response>\
-									<href>https://my.server/absolute:uri/my-address-book</href>\
-									<propstat>\
-										<prop xmlns:CARD="urn:ietf:params:xml:ns:carddav">\
-											<resourcetype>\
-												<collection/>\
-												<CARD:addressbook/>\
-											</resourcetype>\
-											<CARD:addressbook-description>Absolute URI VCard3 Book</CARD:addressbook-description>\
-										</prop>\
-										<status>HTTP/1.1 200 OK</status>\
-									</propstat>\
-								</response>\
-							</multistatus>\
-						');
-					}
-				}
-            }),
-
-			/* calendar home set */
-            new RoboHydraHeadDAV({
-				path: "/dav/calendars/test/",
-				handler: function(req,res,next) {
-					if (req.method == "PROPFIND" && req.rawBody.toString().match(/calendar-description/)) {
-						res.statusCode = 207;
-						res.write('\<?xml version="1.0" encoding="utf-8" ?>\
-							<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav">\
-								<response>\
-									<href>/dav/calendars/test/shared.forbidden</href>\
-									<propstat>\
-										<prop>\
-											<resourcetype/>\
-										</prop>\
-										<status>HTTP/1.1 403 Forbidden</status>\
-									</propstat>\
-								</response>\
-								<response>\
-									<href>/dav/calendars/test/private.ics</href>\
-									<propstat>\
-										<prop>\
-											<resourcetype>\
-												<collection/>\
-												<CAL:calendar/>\
-											</resourcetype>\
-                                            <displayname>Private Calendar</displayname>\
-                                            <CAL:calendar-description>This is my private calendar.</CAL:calendar-description>\
-										</prop>\
-										<status>HTTP/1.1 200 OK</status>\
-									</propstat>\
-								</response>\
-								<response>\
-									<href>/dav/calendars/test/work.ics</href>\
-									<propstat>\
-										<prop>\
-											<resourcetype>\
-												<collection/>\
-												<CAL:calendar/>\
-											</resourcetype>\
-                                            <current-user-privilege-set>\
-                                                <privilege><read/></privilege>\
-                                            </current-user-privilege-set>\
-                                            <displayname>Work Calendar</displayname>\
-											<A:calendar-color xmlns:A="http://apple.com/ns/ical/">0xFF00FF</A:calendar-color>\
-										</prop>\
-										<status>HTTP/1.1 200 OK</status>\
-									</propstat>\
-								</response>\
-							</multistatus>\
-						');
-					}
-				}
-            }),
-
-			/* non-existing file */
-            new RoboHydraHeadDAV({
-				path: "/dav/collection/new.file",
-				handler: function(req,res,next) {
-					if (req.method == "PUT") {
-						if (req.headers['if-match'])	/* can't overwrite new file */
-							res.statusCode = 412;
-						else {
-							res.statusCode = 201;
-                            res.headers["ETag"] = "has-just-been-created";
-                        }
-
-					} else if (req.method == "DELETE")
-						res.statusCode = 404;
-				}
-            }),
-
-			/* existing file */
-            new RoboHydraHeadDAV({
-				path: "/dav/collection/existing.file",
-				handler: function(req,res,next) {
-					if (req.method == "PUT") {
-						if (req.headers['if-none-match'])	/* requested "don't overwrite", but this file exists */
-							res.statusCode = 412;
-						else {
-							res.statusCode = 204;
-                            res.headers["ETag"] = "has-just-been-updated";
-                        }
-
-					} else if (req.method == "DELETE")
-						res.statusCode = 204;
-				}
-            }),
-
-			/* address-book multiget */
-            new RoboHydraHeadDAV({
-				path: "/dav/addressbooks/default.vcf/",
-				handler: function(req,res,next) {
-					if (req.method == "REPORT" && req.rawBody.toString().match(/addressbook-multiget[\s\S]+<prop>[\s\S]+<href>/m &&
-                        req.rawBody.toString().match(/<href>\/dav\/addressbooks\/default\.vcf\/2:3@my%2540pc\.vcf<\/href>/m))) {
-						res.statusCode = 207;
-						res.write('\<?xml version="1.0" encoding="utf-8" ?>\
-							<multistatus xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">\
-								<response>\
-									<href>/dav/addressbooks/default.vcf</href>\
-									<propstat>\
-										<prop>\
-                                            <resourcetype><collection/></resourcetype>\
-                                            <displayname>My Book</displayname>\
-										</prop>\
-										<status>HTTP/1.1 200 OK</status>\
-									</propstat>\
-								</response>\
-								<response>\
-									<href>/dav/addressbooks/default.vcf/1.vcf</href>\
-									<propstat>\
-										<prop>\
-											<getetag/>\
-											<CARD:address-data>BEGIN:VCARD\
-											VERSION:3.0\
-											NICKNAME:MULTIGET1\
-											UID:1\
-											END:VCARD\
-											</CARD:address-data>\
-										</prop>\
-										<status>HTTP/1.1 200 OK</status>\
-									</propstat>\
-								</response>\
-								<response>\
-									<href>/dav/addressbooks/default.vcf/2:3%40my%2540pc.vcf</href>\
-									<propstat>\
-										<prop>\
-											<getetag/>\
-											<CARD:address-data>BEGIN:VCARD\
-											VERSION:3.0\
-											NICKNAME:MULTIGET2\
-											UID:2\
-											END:VCARD\
-											</CARD:address-data>\
-										</prop>\
-										<status>HTTP/1.1 200 OK</status>\
-									</propstat>\
-								</response>\
-							</multistatus>\
-						');
-					}
-				}
-            }),
-
-        ]
-    };
-};

app/src/androidTest/robohydra/plugins/headdav.js

@@ -1,57 +0,0 @@
-var roboHydra = require("robohydra"),
-	roboHydraHeads = roboHydra.heads,
-	roboHydraHead = roboHydraHeads.RoboHydraHead;
-
-RoboHydraHeadDAV = roboHydraHeads.roboHydraHeadType({
-	name: 'WebDAV Server',
-	mandatoryProperties: [ 'path' ],
-    optionalProperties: [ 'handler' ],
-
-	parentPropBuilder: function() {
-		var myHandler = this.handler;
-		return {
-			path: this.path,
-			handler: function(req,res,next) {
-				// default DAV behavior
-				res.headers['DAV'] = 'addressbook, calendar-access';
-				res.statusCode = 500;
-
-                // verify Accept header
-                var accept = req.headers['accept'];
-                if (req.method == "GET" && (accept == undefined || !accept.match(/text\/(calendar|vcard|xml)/)) ||
-                    (req.method == "PROPFIND" || req.method == "REPORT") && (accept == undefined || accept != "text/xml"))
-                    res.statusCode = 406;
-
-				// DAV operations that work on all URLs
-				else if (req.method == "OPTIONS") {
-					res.statusCode = 204;
-					res.headers['Allow'] = 'OPTIONS, PROPFIND, GET, PUT, DELETE, REPORT';
-
-				} else if (req.method == "PROPFIND" && req.rawBody.toString().match(/current-user-principal/)) {
-					res.statusCode = 207;
-					res.write('\<?xml version="1.0" encoding="utf-8" ?>\
-						<multistatus xmlns="DAV:">\
-							<response>\
-								<href>' + req.url + '</href> \
-								<propstat>\
-									<prop>\
-										<current-user-principal>\
-											<href>/dav/principals/users/test</href>\
-										</current-user-principal>\
-									</prop>\
-									<status>HTTP/1.1 200 OK</status>\
-								</propstat>\
-							</response>\
-						</multistatus>\
-					');
-					
-				} else if (typeof myHandler != 'undefined')
-					myHandler(req,res,next);
-
-				res.end();
-			}
-		}
-	}
-});
-
-module.exports = RoboHydraHeadDAV;

app/src/androidTest/robohydra/plugins/redirect/index.js

@@ -1,57 +0,0 @@
-require('../simple');
-
-var RoboHydraHead = require('robohydra').heads.RoboHydraHead;
-
-exports.getBodyParts = function(conf) {
-    return {
-        heads: [
-            // well-known URIs
-            new SimpleResponseHead({
-                path: '/.well-known/caldav',
-                status: 302,
-                headers: { Location: '/dav/' }
-            }),
-            new SimpleResponseHead({
-                path: '/.well-known/carddav',
-                status: 302,
-                headers: { Location: '/dav/' }
-            }),
-
-            // generic redirections
-            new RoboHydraHead({
-				path: '/redirect/301',
-				handler: function(req,res,next) {
-					res.statusCode = 301;
-                    var location = req.queryParams['to'] || '/assets/test.random';
-					res.headers = {
-						Location: location
-					}
-					res.end();
-				}
-            }),
-            new RoboHydraHead({
-				path: '/redirect/302',
-				handler: function(req,res,next) {
-					res.statusCode = 302;
-                    var location = req.queryParams['to'] || '/assets/test.random';
-					res.headers = {
-						Location: location
-					}
-					res.end();
-				}
-            }),
-
-            // special redirections
-            new SimpleResponseHead({
-                path: '/redirect/relative',
-                status: 302,
-                headers: { Location: '/new/location' }
-            }),
-            new SimpleResponseHead({
-                path: '/redirect/without-location',
-                status: 302
-            })
-
-        ]
-    };
-};

app/src/androidTest/robohydra/plugins/simple.js

@@ -1,28 +0,0 @@
-var roboHydra = require("robohydra"),
-	roboHydraHeads = roboHydra.heads,
-	roboHydraHead = roboHydraHeads.RoboHydraHead;
-
-SimpleResponseHead = roboHydraHeads.roboHydraHeadType({
-	name: 'Simple HTTP Response',
-	mandatoryProperties: [ 'path', 'status' ],
-	optionalProperties: [ 'headers', 'body' ],
-
-	parentPropBuilder: function() {
-        var head = this;
-		return {
-			path: this.path,
-			handler: function(req,res,next) {
-				res.statusCode = head.status;
-                if (typeof head.headers != 'undefined')
-                    res.headers = head.headers;
-                if (typeof head.body != 'undefined')
-                    res.write(head.body);
-                else
-                    res.write();
-				res.end();
-			}
-		}
-	}
-});
-
-module.exports = SimpleResponseHead;

app/src/androidTest/robohydra/run.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-node_modules/robohydra/bin/robohydra.js davdroid.conf -I plugins

app/src/davdroid/java/at/bitfire/davdroid/ui/DefaultAccountsDrawerHandler.java

@@ -0,0 +1,50 @@
+package at.bitfire.davdroid.ui;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.view.MenuItem;
+
+import at.bitfire.davdroid.App;
+import at.bitfire.davdroid.BuildConfig;
+import at.bitfire.davdroid.Constants;
+import at.bitfire.davdroid.R;
+
+public class DefaultAccountsDrawerHandler implements IAccountsDrawerHandler {
+
+    @Override
+    public boolean onNavigationItemSelected(@NonNull Activity activity, MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.nav_about:
+                activity.startActivity(new Intent(activity, AboutActivity.class));
+                break;
+            case R.id.nav_app_settings:
+                activity.startActivity(new Intent(activity, AppSettingsActivity.class));
+                break;
+            case R.id.nav_twitter:
+                activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://twitter.com/davdroidapp")));
+                break;
+            case R.id.nav_website:
+                activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))));
+                break;
+            case R.id.nav_faq:
+                activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.navigation_drawer_faq_url))));
+                break;
+            case R.id.nav_forums:
+                activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))
+                        .buildUpon().appendEncodedPath("forums/").build()));
+                break;
+            case R.id.nav_donate:
+                if (BuildConfig.FLAVOR != App.FLAVOR_GOOGLE_PLAY)
+                    activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))
+                            .buildUpon().appendEncodedPath("donate/").build()));
+                break;
+	    default:
+                return false;
+        }
+
+        return true;
+    }
+
+}

app/src/davdroid/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.java

@@ -0,0 +1,202 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.ui.setup;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.net.IDN;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.logging.Level;
+
+import at.bitfire.dav4android.Constants;
+import at.bitfire.davdroid.R;
+import at.bitfire.davdroid.ui.widget.EditPassword;
+
+public class DefaultLoginCredentialsFragment extends Fragment implements CompoundButton.OnCheckedChangeListener {
+
+    RadioButton radioUseEmail;
+    LinearLayout emailDetails;
+    EditText editEmailAddress;
+    EditPassword editEmailPassword;
+
+    RadioButton radioUseURL;
+    LinearLayout urlDetails;
+    EditText editBaseURL, editUserName;
+    EditPassword editUrlPassword;
+
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.login_credentials_fragment, container, false);
+
+        radioUseEmail = (RadioButton)v.findViewById(R.id.login_type_email);
+        emailDetails = (LinearLayout)v.findViewById(R.id.login_type_email_details);
+        editEmailAddress = (EditText)v.findViewById(R.id.email_address);
+        editEmailPassword = (EditPassword)v.findViewById(R.id.email_password);
+
+        radioUseURL = (RadioButton)v.findViewById(R.id.login_type_url);
+        urlDetails = (LinearLayout)v.findViewById(R.id.login_type_url_details);
+        editBaseURL = (EditText)v.findViewById(R.id.base_url);
+        editUserName = (EditText)v.findViewById(R.id.user_name);
+        editUrlPassword = (EditPassword)v.findViewById(R.id.url_password);
+
+        radioUseEmail.setOnCheckedChangeListener(this);
+        radioUseURL.setOnCheckedChangeListener(this);
+
+        if (savedInstanceState == null) {
+            // first call
+
+            Activity activity = getActivity();
+            Intent intent = (activity != null) ? activity.getIntent() : null;
+            if (intent != null) {
+                // we've got initial login data
+                String  url = intent.getStringExtra(LoginActivity.EXTRA_URL),
+                        username = intent.getStringExtra(LoginActivity.EXTRA_USERNAME),
+                        password = intent.getStringExtra(LoginActivity.EXTRA_PASSWORD);
+
+                if (url != null) {
+                    radioUseURL.setChecked(true);
+                    editBaseURL.setText(url);
+                    editUserName.setText(username);
+                    editUrlPassword.setText(password);
+                } else {
+                    radioUseEmail.setChecked(true);
+                    editEmailAddress.setText(username);
+                    editEmailPassword.setText(password);
+                }
+
+            } else
+                radioUseEmail.setChecked(true);
+        }
+
+        final Button login = (Button)v.findViewById(R.id.login);
+        login.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                LoginCredentials credentials = validateLoginData();
+                if (credentials != null)
+                    DetectConfigurationFragment.newInstance(credentials).show(getFragmentManager(), null);
+            }
+        });
+
+        return v;
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        if (isChecked) {
+            boolean loginByEmail = buttonView == radioUseEmail;
+            emailDetails.setVisibility(loginByEmail ? View.VISIBLE : View.GONE);
+            urlDetails.setVisibility(loginByEmail ? View.GONE : View.VISIBLE);
+            (loginByEmail ? editEmailAddress : editBaseURL).requestFocus();
+        }
+    }
+
+    protected LoginCredentials validateLoginData() {
+        if (radioUseEmail.isChecked()) {
+            URI uri = null;
+            boolean valid = true;
+
+            String email = editEmailAddress.getText().toString();
+            if (!email.matches(".+@.+")) {
+                editEmailAddress.setError(getString(R.string.login_email_address_error));
+                valid = false;
+            } else
+                try {
+                    uri = new URI("mailto", email, null);
+                } catch (URISyntaxException e) {
+                    editEmailAddress.setError(e.getLocalizedMessage());
+                    valid = false;
+                }
+
+            String password = editEmailPassword.getText().toString();
+            if (password.isEmpty()) {
+                editEmailPassword.setError(getString(R.string.login_password_required));
+                valid = false;
+            }
+
+            return valid ? new LoginCredentials(uri, email, password) : null;
+
+        } else if (radioUseURL.isChecked()) {
+            URI uri = null;
+            boolean valid = true;
+
+            Uri baseUrl = Uri.parse(editBaseURL.getText().toString());
+            String scheme = baseUrl.getScheme();
+            if ("https".equalsIgnoreCase(scheme) || "http".equalsIgnoreCase(scheme)) {
+                String host = baseUrl.getHost();
+                if (StringUtils.isEmpty(host)) {
+                    editBaseURL.setError(getString(R.string.login_url_host_name_required));
+                    valid = false;
+                } else
+                    try {
+                        host = IDN.toASCII(host);
+                    } catch(IllegalArgumentException e) {
+                        Constants.log.log(Level.WARNING, "Host name not conforming to RFC 3490", e);
+                    }
+
+                String path = baseUrl.getEncodedPath();
+                int port = baseUrl.getPort();
+                try {
+                    uri = new URI(baseUrl.getScheme(), null, host, port, path, null, null);
+                } catch (URISyntaxException e) {
+                    editBaseURL.setError(e.getLocalizedMessage());
+                    valid = false;
+                }
+            } else {
+                editBaseURL.setError(getString(R.string.login_url_must_be_http_or_https));
+                valid = false;
+            }
+
+            String userName = editUserName.getText().toString();
+            if (userName.isEmpty()) {
+                editUserName.setError(getString(R.string.login_user_name_required));
+                valid = false;
+            }
+
+            String password = editUrlPassword.getText().toString();
+            if (password.isEmpty()) {
+                editUrlPassword.setError(getString(R.string.login_password_required));
+                valid = false;
+            }
+
+            return valid ? new LoginCredentials(uri, userName, password) : null;
+        }
+
+        return null;
+    }
+
+
+    public static class Factory implements ILoginCredentialsFragment {
+
+        @Override
+        public Fragment getFragment() {
+            return new DefaultLoginCredentialsFragment();
+        }
+
+    }
+
+}

app/src/davdroid/res/drawable/ic_forum_dark.xml

@@ -0,0 +1,18 @@
+<!--
+  ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+  ~ All rights reserved. This program and the accompanying materials
+  ~ are made available under the terms of the GNU Public License v3.0
+  ~ which accompanies this distribution, and is available at
+  ~ http://www.gnu.org/licenses/gpl.html
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:alpha="0.54" >
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,6h-2v9H6v2c0,0.55 0.45,1 1,1h11l4,4V7c0,-0.55 -0.45,-1 -1,-1zm-4,6V3c0,-0.55 -0.45,-1 -1,-1H3c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z"/>
+</vector>

app/src/davdroid/res/layout/login_credentials_fragment.xml

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+  ~ All rights reserved. This program and the accompanying materials
+  ~ are made available under the terms of the GNU Public License v3.0
+  ~ which accompanies this distribution, and is available at
+  ~ http://www.gnu.org/licenses/gpl.html
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <!-- We don't want the keyboard up when the user arrives in this initial screen -->
+    <View android:layout_height="0dp"
+          android:layout_width="0dp"
+          android:focusable="true"
+          android:focusableInTouchMode="true"
+          android:contentDescription="@null"
+          android:importantForAccessibility="no" tools:ignore="UnusedAttribute">
+        <requestFocus/>
+    </View>
+
+    <ScrollView android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:layout_margin="@dimen/activity_margin">
+
+        <RadioGroup
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:animateLayoutChanges="true">
+
+            <RadioButton
+                android:id="@+id/login_type_email"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/login_type_email"
+                android:paddingLeft="14dp" tools:ignore="RtlSymmetry"
+                style="@style/login_type_headline"/>
+
+            <LinearLayout
+                android:id="@+id/login_type_email_details"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <EditText
+                    android:id="@+id/email_address"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/login_email_address"
+                    android:inputType="textEmailAddress"/>
+                <at.bitfire.davdroid.ui.widget.EditPassword
+                    android:id="@+id/email_password"
+                    android:hint="@string/login_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+
+            <RadioButton
+                android:id="@+id/login_type_url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/login_type_url"
+                android:layout_marginTop="16dp"
+                android:paddingLeft="14dp" tools:ignore="RtlSymmetry"
+                style="@style/login_type_headline"/>
+
+            <LinearLayout
+                android:id="@+id/login_type_url_details"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <EditText
+                    android:id="@+id/base_url"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/login_base_url"
+                    android:inputType="textUri"/>
+                <EditText
+                    android:id="@+id/user_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/login_user_name"
+                    android:inputType="textEmailAddress"/>
+                <at.bitfire.davdroid.ui.widget.EditPassword
+                    android:id="@+id/url_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/login_password"/>
+
+            </LinearLayout>
+
+        </RadioGroup>
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/stepper_nav_bar">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            style="@style/stepper_nav_button"/>
+
+        <Button
+            android:id="@+id/login"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:text="@string/login_login"
+            style="@style/stepper_nav_button"/>
+
+    </LinearLayout>
+</LinearLayout>

app/src/davdroid/res/values-ca/strings.xml

@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="help">Ajuda</string>
+  <!--startup dialogs-->
+  <!--AboutActivity-->
+  <!--global settings-->
+  <!--AccountsActivity-->
+  <!--DavService-->
+  <!--AppSettingsActivity-->
+  <!--AccountActivity-->
+  <!--PermissionsActivity-->
+  <!--AddAccountActivity-->
+  <string name="login_type_email">Entra amb una adreça de correu electrònic</string>
+  <string name="login_type_url">Entra amb una URL i un nom d\'usuari</string>
+  <!--AccountSettingsActivity-->
+  <!--collection management-->
+  <!--ExceptionInfoFragment-->
+  <!--sync errors and DebugInfoActivity-->
+  <!--cert4android-->
+</resources>

app/src/davdroid/res/values-cs/strings.xml

@@ -0,0 +1,246 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="help">Pomoc</string>
+  <string name="manage_accounts">Spravovat účty</string>
+  <string name="please_wait">Chvíli strpení ...</string>
+  <string name="send">Odeslat</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Optimalizace využití baterie</string>
+  <string name="startup_battery_optimization_message">Android může po několika dnech vypnout/prodloužit interval synchronizování DAVdroid. Chcete-li tomuto zabránit, vypněte optimalizaci baterie.</string>
+  <string name="startup_battery_optimization_disable">Vypnout pro DAVdroid</string>
+  <string name="startup_dont_show_again">Již nezobrazovat</string>
+  <string name="startup_development_version">DAVdroid preview vydání</string>
+  <string name="startup_development_version_message">Toto je vývojová verze aplikace DAVdroid. Mějte na paměti, že vše nemusí správně fungovat. Budeme rádi za konstruktivní zpětnou vazbu, která pomůže vylepšit DAVdroid.</string>
+  <string name="startup_development_version_give_feedback">Dát zpětnou vazbu</string>
+  <string name="startup_donate">Open Source informace</string>
+  <string name="startup_donate_message">Jsme velice rádi že používáte DAVdroid, software s otevřeným zdrojovým kódem (GPLv3). Vývoj této aplikace je náročný a trval již několik tisíc hodin, velice nás potěší přispějete-li na jeho vývoj.</string>
+  <string name="startup_donate_now">Zobrazit stránku pro obdarování</string>
+  <string name="startup_donate_later">Možná později</string>
+  <string name="startup_google_play_accounts_removed">Informace o chybě DRM Obchodu Play</string>
+  <string name="startup_google_play_accounts_removed_message">Za určitých podmínek může dojít po restartu nebo aktualizaci aplikace DAVdroid k vymazání účtů kvůli chybě DRM Obchodu Play. Pokud jste postiženi touto chybou (ale pouze v tomto případě), nainstalujte prosím z Obchodu Play aplikaci \"DAVdroid JB Workaround\".</string>
+  <string name="startup_google_play_accounts_removed_more_info">Více informací</string>
+  <string name="startup_opentasks_not_installed">OpenTasks není nainstalován</string>
+  <string name="startup_opentasks_not_installed_message">Aplikace OpenTasks není dostupná, proto nebude DAVdroid moci synchronizovat seznam úkolů.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Po instalaci OpenTasks musíte PŘEINSTALOVAT DAVdroid a přidat znovu své účty (Android chyba).</string>
+  <string name="startup_opentasks_not_installed_install">Nainstalovat OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Licenční podmínky</string>
+  <string name="about_license_info_no_warranty">Tento program je distribuován BEZ JAKÉKOLIV ZÁRUKY. Je to volně dostupný software a lze jej za určitých podmínek dále distribuovat.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVdroid logování do souboru</string>
+  <string name="logging_to_external_storage">Logování do externího úložiště: %s</string>
+  <string name="logging_to_external_storage_warning">Smazat logy jak nejdříve možno!</string>
+  <string name="logging_couldnt_create_file">Nelze vytvořit externí soubor logu: %s</string>
+  <string name="logging_no_external_storage">Externí úložiště nenalezeno</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Otevřít panel navigace</string>
+  <string name="navigation_drawer_close">Zavřít panel navigace</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV adapter synchronizace</string>
+  <string name="navigation_drawer_about">O aplikaci / Licence</string>
+  <string name="navigation_drawer_settings">Nastavení</string>
+  <string name="navigation_drawer_news_updates">Novinky &amp; aktualizace</string>
+  <string name="navigation_drawer_external_links">Externí odkazy</string>
+  <string name="navigation_drawer_website">Webová stránka</string>
+  <string name="navigation_drawer_faq">FAQ</string>
+  <string name="navigation_drawer_forums">Komunita</string>
+  <string name="navigation_drawer_donate">Obdarovat</string>
+  <string name="account_list_empty">Vítejte v aplikaci DAVdroid!\n\nNyní můžete přidat CalDAV/CardDAV účet.</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Vyhledání služby selhalo</string>
+  <string name="dav_service_refresh_couldnt_refresh">Nelze obnovit seznam sbírky</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Nastavení</string>
+  <string name="app_settings_user_interface">Uživatelské prostředí</string>
+  <string name="app_settings_reset_hints">Resetovat nápovědu</string>
+  <string name="app_settings_reset_hints_summary">Znovu povolí vypnuté texty nápovědy</string>
+  <string name="app_settings_reset_hints_success">Budou zobrazovány všechny texty nápovědy</string>
+  <string name="app_settings_connection">Připojení</string>
+  <string name="app_settings_override_proxy">Přepsat proxy nastavení</string>
+  <string name="app_settings_override_proxy_on">Použít vlastní proxy nastavení</string>
+  <string name="app_settings_override_proxy_off">Použít výchozí systémová proxy nastavení</string>
+  <string name="app_settings_override_proxy_host">HTTP proxy hostname</string>
+  <string name="app_settings_override_proxy_port">HTTP proxy port</string>
+  <string name="app_settings_security">Zabezpečení</string>
+  <string name="app_settings_distrust_system_certs">Nedůvěřovat systémovým certifikátům</string>
+  <string name="app_settings_distrust_system_certs_on">Systémovým a uživatelem přidaným CA nebude důvěřováno</string>
+  <string name="app_settings_distrust_system_certs_off">Systémovým a uživatelem přidaným CA bude důvěřováno (doporučeno)</string>
+  <string name="app_settings_reset_certificates">Resetovat (ne)důvěryhodné certifikáty</string>
+  <string name="app_settings_reset_certificates_summary">Resetovat důvěryhodnost všech vlastních certifikátů</string>
+  <string name="app_settings_reset_certificates_success">Všechny vlastní certifikáty byly resetovány</string>
+  <string name="app_settings_debug">Ladění</string>
+  <string name="app_settings_log_to_external_storage">Logovat do externího souboru</string>
+  <string name="app_settings_log_to_external_storage_on">Logování do externího úložiště (pokud dostupné)</string>
+  <string name="app_settings_log_to_external_storage_off">Logování do externího souboru je vypnuto</string>
+  <string name="app_settings_show_debug_info">Zobrazit ladící informace</string>
+  <string name="app_settings_show_debug_info_details">Zobrazit/sdílet software a detaily konfigurace</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Synchronizovat nyní</string>
+  <string name="account_synchronizing_now">Probíhá synchronizace</string>
+  <string name="account_settings">Nastavení účtu</string>
+  <string name="account_rename">Přejmenovat účet</string>
+  <string name="account_rename_new_name">Neuložená místní data mohou být vynechána. Po přejmenování je vyžadována nová synchronizace. Nové jméno účtu:</string>
+  <string name="account_rename_rename">Přejmenovat</string>
+  <string name="account_delete">Smazat účet</string>
+  <string name="account_delete_confirmation_title">Opravdu smazat účet?</string>
+  <string name="account_delete_confirmation_text">Všechny místní kopie adresáře, kalendářů a úkolů budou smazány.</string>
+  <string name="account_refresh_address_book_list">Obnovit seznam adresářů</string>
+  <string name="account_create_new_address_book">Vytvořit nový adresář</string>
+  <string name="account_refresh_calendar_list">Obnovit seznam kalendářů</string>
+  <string name="account_create_new_calendar">Vytvořit nový kalendář</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid oprávnění</string>
+  <string name="permissions_calendar">Oprávnění pro kalendáře</string>
+  <string name="permissions_calendar_details">Pro synchronizaci CalDAV událostí s místním kalendářem potřebuje DAVdroid oprávnění přistupovat ke kalendářům.</string>
+  <string name="permissions_calendar_request">Vyžádat oprávnění kalendáře</string>
+  <string name="permissions_contacts">Oprávnění pro kontakty</string>
+  <string name="permissions_contacts_details">Pro synchronizaci CardDAV adresářů s místními kontakty potřebuje DAVdroid oprávnění přistupovat ke kontaktům.</string>
+  <string name="permissions_contacts_request">Vyžádat oprávnění kontaktů</string>
+  <string name="permissions_opentasks">Oprávnění pro OpenTasks</string>
+  <string name="permissions_opentasks_details">Pro synchronizaci CalDAV událostí s místním seznamem úkolů potřebuje DAVdroid oprávnění přistupovat k OpenTasks.</string>
+  <string name="permissions_opentasks_request">Vyžádat oprávnění OpenTasks</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Přidat účet</string>
+  <string name="login_type_email">Přihlášení s emailovou adresou</string>
+  <string name="login_email_address">Emailová adresa</string>
+  <string name="login_email_address_error">Vyžadován platný email</string>
+  <string name="login_password">Heslo</string>
+  <string name="login_password_required">Vyžadováno heslo</string>
+  <string name="login_type_url">Přihlášení s URL a uživatelským jménem</string>
+  <string name="login_url_must_be_http_or_https">URL musí začínat na http(s)://</string>
+  <string name="login_url_host_name_required">Vyžadováno hostname</string>
+  <string name="login_user_name">Uživatelské jméno</string>
+  <string name="login_user_name_required">Vyžadováno uživatelské jméno</string>
+  <string name="login_base_url">Základní URL</string>
+  <string name="login_login">Login</string>
+  <string name="login_back">Zpět</string>
+  <string name="login_create_account">Vytvořit účet</string>
+  <string name="login_account_name">Jméno účtu</string>
+  <string name="login_account_name_info">Pro jméno účtu použijte svou emailovou adresu, protože Android bude brát jméno účtu jako údaj pro ORGANIZÁTORA vytvořených událostí. Nelze mít dva účty stejného jména.</string>
+  <string name="login_account_contact_group_method">Metoda seskupování kontaktů:</string>
+  <string name="login_account_name_required">Vyžadováno jméno účtu</string>
+  <string name="login_account_not_created">Účet nelze vytvořit</string>
+  <string name="login_configuration_detection">Vyhledání konfigurace</string>
+  <string name="login_querying_server">Chvíli strpení, probíhá dotazování serveru...</string>
+  <string name="login_no_caldav_carddav">Nelze nalézt službu CalDAV nebo CardDAV.</string>
+  <string name="login_view_logs">Prohlížet logy</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Nastavení: %s</string>
+  <string name="settings_authentication">Ověření</string>
+  <string name="settings_username">Uživatelské jméno</string>
+  <string name="settings_enter_username">Zadat uživatelské jméno</string>
+  <string name="settings_password">Heslo</string>
+  <string name="settings_password_summary">Aktualizovat heslo dle svého serveru.</string>
+  <string name="settings_enter_password">Vložit své heslo:</string>
+  <string name="settings_sync">Synchronizace</string>
+  <string name="settings_sync_interval_contacts">Interval synchronizace kontaktů</string>
+  <string name="settings_sync_summary_manually">Pouze manuálně</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Každých %d minut a ihned při lokálních změnách</string>
+  <string name="settings_sync_summary_not_available">Nedostupný</string>
+  <string name="settings_sync_interval_calendars">Interval synchronizace kalendáře</string>
+  <string name="settings_sync_interval_tasks">Interval synchronizace úkolů</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Pouze manuálně</item>
+    <item>Každých 5 minut</item>
+    <item>Každých 10 minut</item>
+    <item>Každých 15 minut</item>
+    <item>Každou hodinu</item>
+    <item>Každé 2 hodiny</item>
+    <item>Každé 4 hodiny</item>
+    <item>Jednou za den</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Synchronizovat pouze přes WiFi</string>
+  <string name="settings_sync_wifi_only_on">Synchronizace omezena na WiFi připojení</string>
+  <string name="settings_sync_wifi_only_off">Druh připojení není brán v potaz</string>
+  <string name="settings_sync_wifi_only_ssid">Omezení WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssid_on">Synchronizace pouze přes %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Použít všechna WiFi připojení</string>
+  <string name="settings_sync_wifi_only_ssid_message">Zadejte jméno WiFi sítě (SSID) pro omezení synchronizace na tutu síť, nebo ponechte prázdné pro použití všech WiFi připojení.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Metoda seskupování kontaktů</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Skupiny jsou oddělené soubory VCard</item>
+    <item>Skupiny jsou kategorie na kontakt</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Časový limit pro staré události</string>
+  <string name="settings_sync_time_range_past_none">Synchronizovat všechny události</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Ignorovat události starší než 1 den</item>
+    <item quantity="few">Ignorovat události starší než %d dny</item>
+    <item quantity="other">Ignorovat události starší než %d dnů</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Události z minulosti starší než vyznačený počet dnů budou ignorovány (lze zadat 0). Ponechte prázdné pro synchronizaci všech událostí.</string>
+  <string name="settings_manage_calendar_colors">Spravovat barvy kalendářů</string>
+  <string name="settings_manage_calendar_colors_on">Barvy kalendářů spravuje DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Barvy kalendářů nespravuje DAVdroid</string>
+  <!--collection management-->
+  <string name="create_addressbook">Vytvořit adresář</string>
+  <string name="create_addressbook_display_name_hint">Můj adresář</string>
+  <string name="create_calendar">Vytvořit CalDAV sbírku</string>
+  <string name="create_calendar_display_name_hint">Můj kalendář</string>
+  <string name="create_calendar_time_zone">Časová zóna:</string>
+  <string name="create_calendar_type">Typ sbírky:</string>
+  <string name="create_calendar_type_only_events">Kalendář (pouze události)</string>
+  <string name="create_calendar_type_only_tasks">Seznam úkolů (pouze úkoly)</string>
+  <string name="create_calendar_type_events_and_tasks">Kombinovaná (události a úkoly)</string>
+  <string name="create_collection_color">Nastavit barvu sbírky</string>
+  <string name="create_collection_creating">Vytváření sbírky</string>
+  <string name="create_collection_display_name">Zobrazit jméno (nadpis) této sbírky:</string>
+  <string name="create_collection_display_name_required">Nadpis je vyžadován</string>
+  <string name="create_collection_description">Popis (volitelný):</string>
+  <string name="create_collection_home_set">Domácí sbírka:</string>
+  <string name="create_collection_create">Vytvořit</string>
+  <string name="delete_collection">Smazat sbírku</string>
+  <string name="delete_collection_confirm_title">Jste si jisti?</string>
+  <string name="delete_collection_confirm_warning">Tato sbírka (%s) a všechna její data budou odstraněna ze serveru.</string>
+  <string name="delete_collection_deleting_collection">Mazání sbírky</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Došlo k chybě.</string>
+  <string name="exception_httpexception">Došlo k HTTP chybě.</string>
+  <string name="exception_ioexception">Došlo k I/O chybě.</string>
+  <string name="exception_show_details">Zobrazit detaily</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Ladící informace</string>
+  <string name="sync_error_permissions">DAVdroid oprávnění</string>
+  <string name="sync_error_permissions_text">Vyžadována dodatečná oprávnění</string>
+  <string name="sync_error_calendar">Synchronizace kalendáře selhala (%s)</string>
+  <string name="sync_error_contacts">Synchronizace adresáře selhala (%s)</string>
+  <string name="sync_error_tasks">Synchronizace úkolu selhala (%s)</string>
+  <string name="sync_error">Chyba při %s</string>
+  <string name="sync_error_http_dav">Chyba serveru při %s</string>
+  <string name="sync_error_local_storage">Chyba databáze při %s</string>
+  <string-array name="sync_error_phases">
+    <item>příprava synchronizace</item>
+    <item>dotazování možností</item>
+    <item>zpracovávání místně smazaných záznamů</item>
+    <item>příprava vytvořených/upravených záznamů</item>
+    <item>nahrávání vytvořených/upravených záznamů</item>
+    <item>kontrola stavu synchronizace</item>
+    <item>výpis místních záznamů</item>
+    <item>výpis vzdálených záznamů</item>
+    <item>porovnání místních/vzdálených záznamů</item>
+    <item>stahování vzdálených záznamů</item>
+    <item>uzavírání procesu</item>
+    <item>ukládání stavu synchronizace</item>
+  </string-array>
+  <string name="sync_error_unauthorized">Chybné uživatelské jméno/heslo</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: Zabezpečení připojení</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroid nalezl neznámý certifikát. Chcete mu důvěřovat?</string>
+</resources>

app/src/davdroid/res/values-da/strings.xml

@@ -0,0 +1,249 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="account_title_address_book">DAVdroid Addressebog</string>
+  <string name="address_books_authority_title">Adressebøger</string>
+  <string name="help">Hjælp</string>
+  <string name="manage_accounts">Administrer konti</string>
+  <string name="please_wait">Vent venligst ...</string>
+  <string name="send">Send</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Batterioptimering</string>
+  <string name="startup_battery_optimization_message">Android kan deaktivere/reducere DAVDroid synkronisering efter et par dage. For at undgå dette, slå batterioptimering fra.</string>
+  <string name="startup_battery_optimization_disable">Deaktiver DAVdroid</string>
+  <string name="startup_dont_show_again">Vis ikke igen</string>
+  <string name="startup_development_version">DAVdroid Preview</string>
+  <string name="startup_development_version_message">Dette er udviklingsversionen af DAVdroid. Bemærk, at nogle ting måske ikke fungerer, som man forventer. Giv os gerne konstruktiv kritik for at forbedre DAVdroid.</string>
+  <string name="startup_development_version_give_feedback">Giv feedback</string>
+  <string name="startup_donate">Open-Source Information</string>
+  <string name="startup_donate_message">Det glæder os, at du bruger DAVdroid, som er open source-software (GPLv3). Det er hårdt arbejde at udvikle DAVdroid og taget tusindvis af arbejdstimer, så overvej at donere til projektet.</string>
+  <string name="startup_donate_now">Vis donationsside</string>
+  <string name="startup_donate_later">Måske senere</string>
+  <string name="startup_google_play_accounts_removed">Play Store DRM-fejl: Information</string>
+  <string name="startup_google_play_accounts_removed_message">Under visse tekniske omstændigheder kan DRM fra Play Store bevirke, at alle DAVdroid-konti er væk efter en genstart eller opgradering af DAVdroid. Hvis du er udsat for dette problem (og ellers ikke), opfordres du til at installere DAVDroid JB Workaround\" fra Play Store.</string>
+  <string name="startup_google_play_accounts_removed_more_info">Yderligere oplysninger</string>
+  <string name="startup_opentasks_not_installed">OpenTasks ikke installeret</string>
+  <string name="startup_opentasks_not_installed_message">OpenTasks er ikke til rådighedm så DAVdroid vil ikke kunne synkronisere opgavelister.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Efter at have installeret OpenTasks, vil du være nødt til at GENINSTALLERE DAVdroid og dine konti igen (en fejl i Android).</string>
+  <string name="startup_opentasks_not_installed_install">Installer OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Licensforhold</string>
+  <string name="about_license_info_no_warranty">Dette program leveres ABSOLUT UDEN GARANTI. Det er fri software, og du er velkommen til at videredistribuere det under visse betingelse.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVdroid fil-logning</string>
+  <string name="logging_to_external_storage">Logger til eksternt datalager: %s</string>
+  <string name="logging_to_external_storage_warning">Slet logfiler hurtigst muligt!</string>
+  <string name="logging_couldnt_create_file">Kunne ikke oprette ekstern logfil: %s</string>
+  <string name="logging_no_external_storage">Eksternt lager ikke funder</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Åbn navigationsvindue</string>
+  <string name="navigation_drawer_close">Luk navigationsvindue</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV Sync-adapter</string>
+  <string name="navigation_drawer_about">Om / Licens</string>
+  <string name="navigation_drawer_settings">Indstillinger</string>
+  <string name="navigation_drawer_news_updates">Nyheder &amp; opdateringer</string>
+  <string name="navigation_drawer_external_links">Eksterne links</string>
+  <string name="navigation_drawer_website">Hjemmeside</string>
+  <string name="navigation_drawer_faq">FAQ</string>
+  <string name="navigation_drawer_forums">Community</string>
+  <string name="navigation_drawer_donate">Donation</string>
+  <string name="account_list_empty">Velkommen til DAVdroid!\n\nDu kan nu tilføje en CaDAV/CardDAV-konto.</string>
+  <string name="accounts_global_sync_disabled">Automatisk synkronisering på tværs af systemet er deaktiveret</string>
+  <string name="accounts_global_sync_enable">Aktiver</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Registrering af tjeneste kunne ikke foretages</string>
+  <string name="dav_service_refresh_couldnt_refresh">Kunne opdatere liste over sæt</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Indstillinger</string>
+  <string name="app_settings_user_interface">Brugerflade</string>
+  <string name="app_settings_reset_hints">Nulstil vejledende popups</string>
+  <string name="app_settings_reset_hints_summary">Genaktiverer hjælp, som er blevet lukket tidligere</string>
+  <string name="app_settings_reset_hints_success">Al vejledning vil blive vist igen</string>
+  <string name="app_settings_connection">Forbindelse</string>
+  <string name="app_settings_override_proxy">Tilsidesæt proxyindstillinger</string>
+  <string name="app_settings_override_proxy_on">Brug brugerdefinerede proxyindstillinger</string>
+  <string name="app_settings_override_proxy_off">Brug systemstandard proxyindstillinger</string>
+  <string name="app_settings_override_proxy_host">HTTP proxy værtsnavn</string>
+  <string name="app_settings_override_proxy_port">HTTP proxy port</string>
+  <string name="app_settings_security">Sikkerhed</string>
+  <string name="app_settings_distrust_system_certs">Stol ikke på systemcertifikater</string>
+  <string name="app_settings_distrust_system_certs_on">System og brugertilføjede CA\'er vil ikke blive betroet</string>
+  <string name="app_settings_distrust_system_certs_off">System og brugertilføjede CA\'er vil blive betroet (anbefalet)</string>
+  <string name="app_settings_reset_certificates">Nulstil (ikke-)betroede certifikater</string>
+  <string name="app_settings_reset_certificates_summary">Nulstiller tilliden til brugerdefinerede certifikater</string>
+  <string name="app_settings_reset_certificates_success">Alle brugerdefinerede certifikater er blevet rydet</string>
+  <string name="app_settings_debug">Debugging</string>
+  <string name="app_settings_log_to_external_storage">Log til ekstern fil</string>
+  <string name="app_settings_log_to_external_storage_on">Logger til eksternt lager (hvis muligt)</string>
+  <string name="app_settings_log_to_external_storage_off">Ekstern logning deaktiveret</string>
+  <string name="app_settings_show_debug_info">Vis debug-info</string>
+  <string name="app_settings_show_debug_info_details">Vis/del software og opsætningsoplysninger</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Synkroniser nu</string>
+  <string name="account_synchronizing_now">Synkroniserer nu</string>
+  <string name="account_settings">Opsætning af konti</string>
+  <string name="account_rename">Omdøb konto</string>
+  <string name="account_rename_new_name">Lokaldata der ikke er gemt kan gå tabt. Eftersynkronisering er krævet efter omdøbning. Nyt kontonavn: </string>
+  <string name="account_rename_rename">Omdøb</string>
+  <string name="account_delete">Slet konto</string>
+  <string name="account_delete_confirmation_title">Ønsker du at slette konto?</string>
+  <string name="account_delete_confirmation_text">Alle lokale kopier af addessebøger, kalendere og opgavelister vil blive slettet.</string>
+  <string name="account_refresh_address_book_list">Opdater adressebogslister</string>
+  <string name="account_create_new_address_book">Opret ny adressebog</string>
+  <string name="account_refresh_calendar_list">Opdater kalenderliste</string>
+  <string name="account_create_new_calendar">Opret ny kalender</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid adgangsrettigheder</string>
+  <string name="permissions_calendar">Kalenderadgange</string>
+  <string name="permissions_calendar_details">For at synkronisere CalDAV-begivenheder med dine lokale kalendere, skal DAVdroid have adgang til dine kalendere.</string>
+  <string name="permissions_calendar_request">Anmod om kalenderadgang</string>
+  <string name="permissions_contacts">Kontakter: Adgangsrettigheder</string>
+  <string name="permissions_contacts_details">DAVdroid er nødt til at have adgang til dine kontakter, hvis CardDAV-adressebøger skal kunne synkronisere med dine kontakter.</string>
+  <string name="permissions_contacts_request">Anmod om adgang til kontakter</string>
+  <string name="permissions_opentasks">OpenTasks: Adgangsrettigheder</string>
+  <string name="permissions_opentasks_details">DAVdroid er nødt til at have adgang til OpenTasks, hvis CalDAV-opgaver skal kunne synkronisere med dine lokale opgavelister.</string>
+  <string name="permissions_opentasks_request">Anmod om adgang til OpenTasks</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Tilføj konto</string>
+  <string name="login_type_email">Log ind med emailadresse</string>
+  <string name="login_email_address">Emailadresse</string>
+  <string name="login_email_address_error">Gyldig emailadresse påkrævet</string>
+  <string name="login_password">Adgangskode</string>
+  <string name="login_password_required">Adgangskode påkrævet</string>
+  <string name="login_type_url">Log ind med URL og brugernavn</string>
+  <string name="login_url_must_be_http_or_https">URL skal begynde med http(s)://</string>
+  <string name="login_url_host_name_required">Værtsnavn påkrævet</string>
+  <string name="login_user_name">Brugernavn</string>
+  <string name="login_user_name_required">Brugernavn påkrævet</string>
+  <string name="login_base_url">Basis-URL</string>
+  <string name="login_login">Login</string>
+  <string name="login_back">Tilbage</string>
+  <string name="login_create_account">Opret konto</string>
+  <string name="login_account_name">Kontonavn</string>
+  <string name="login_account_name_info">Brug emailadressen som kontonavn, for Android vil bruge kontonavnet til ORGANIZER-feltet for aktiviteter, som du opretter. Du kan ikke have to konti med samme navn.</string>
+  <string name="login_account_contact_group_method">Gruppering af kontakter:</string>
+  <string name="login_account_name_required">Kontonavn påkrævet</string>
+  <string name="login_account_not_created">Konto kunne ikke oprettes</string>
+  <string name="login_configuration_detection">Check konfiguration</string>
+  <string name="login_querying_server">Vent, forespørger hos serveren...</string>
+  <string name="login_no_caldav_carddav">Kunne ikke finde CalDAV- eller CardDAV-tjeneste.</string>
+  <string name="login_view_logs">Vis logs.</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Indstillinger: %s</string>
+  <string name="settings_authentication">Adgangsgodkendelse</string>
+  <string name="settings_username">Brugernavn</string>
+  <string name="settings_enter_username">Indtast brugernavn:</string>
+  <string name="settings_password">Adgangskode</string>
+  <string name="settings_password_summary">Opdater adgangskoden, så den svarer til din server.</string>
+  <string name="settings_enter_password">Indtast adgangskode:</string>
+  <string name="settings_sync">Synkronisering</string>
+  <string name="settings_sync_interval_contacts">Synkroniseringsinterval for kontakter</string>
+  <string name="settings_sync_summary_manually">Kun manuelt</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Hver %d minutter + øjeblikkeligt ved lokale ændringer</string>
+  <string name="settings_sync_summary_not_available">Ikke tilgængeligt</string>
+  <string name="settings_sync_interval_calendars">Synkroniseringsinterval for kalender</string>
+  <string name="settings_sync_interval_tasks">Synkroniseringsinterval for opgaver</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Kun manuelt</item>
+    <item>Hver 5. minut</item>
+    <item>Hver 10. minut</item>
+    <item>Hver 15. minut</item>
+    <item>En gang i timen</item>
+    <item>En gang hver 2. time</item>
+    <item>En gang hver 4. time</item>
+    <item>En gang om dagen</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Synkroniser kun over WiFi</string>
+  <string name="settings_sync_wifi_only_on">Synkronisering er begrænset til WiFi-forbindelser</string>
+  <string name="settings_sync_wifi_only_off">Forbindelsestypen har ingen betydning</string>
+  <string name="settings_sync_wifi_only_ssid">Begræsning til WiFi-SSID</string>
+  <string name="settings_sync_wifi_only_ssid_on">Vil kun blive synkroniseret over %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Alle WiFi-forbindelse vil kunne bruges</string>
+  <string name="settings_sync_wifi_only_ssid_message">Indtast navnet på et WiFi-netværk (SSID) for at begrænse synkronisering til dette netværk, eller efterlad feltet blank for at acceptere alle WiFi-forbindelser.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Gruppering af kontakter</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Grupper er særskilte VCards</item>
+    <item>Grupper er kategorier pr. kontakt</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Tidsafgrænsning for tidligere begivenheder</string>
+  <string name="settings_sync_time_range_past_none">Alle begivenheder vil blive synkroniseret</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Begivenheder ældre end en dag vil blive ignoreret</item>
+    <item quantity="other">Begivenheder, der er mere end %d dage gamle, vil blive ignoreret</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Begivenheder, som er mere end dette antal dage gamle vil blive ignoreret (kan også være 0). Hvis feltet ikke er udfyldt, vil alle begivenheder blive synkroniseret.</string>
+  <string name="settings_manage_calendar_colors">Administrer farver for kalender</string>
+  <string name="settings_manage_calendar_colors_on">Kalenderfarver administreres af DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Kalenderfarver sættes ikke fra DAVdroid</string>
+  <!--collection management-->
+  <string name="create_addressbook">Opret adressebog</string>
+  <string name="create_addressbook_display_name_hint">Min adressebog</string>
+  <string name="create_calendar">Opret CalDAV-sæt</string>
+  <string name="create_calendar_display_name_hint">Min kalender</string>
+  <string name="create_calendar_time_zone">Tidszone:</string>
+  <string name="create_calendar_type">Type af sæt:</string>
+  <string name="create_calendar_type_only_events">Kalender (kun begivenheder)</string>
+  <string name="create_calendar_type_only_tasks">Opgaveliste (kun opgaver)</string>
+  <string name="create_calendar_type_events_and_tasks">Kombineret (begivenheder og opgaver)</string>
+  <string name="create_collection_color">Sæt en farve på sættet</string>
+  <string name="create_collection_creating">Opretter sæt</string>
+  <string name="create_collection_display_name">Navn (titel) på dette sæt:</string>
+  <string name="create_collection_display_name_required">En titel er påkrævet</string>
+  <string name="create_collection_description">Beskrivelse (valgfri):</string>
+  <string name="create_collection_home_set">Home set:</string>
+  <string name="create_collection_create">Opret</string>
+  <string name="delete_collection">Slet sæt</string>
+  <string name="delete_collection_confirm_title">Er du sikker?</string>
+  <string name="delete_collection_confirm_warning">DAV-sættet (%s) og dets data vil blive fjernet fra serveren.</string>
+  <string name="delete_collection_deleting_collection">Sletter CalDAV-sæt</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Der er opstået en fejl.</string>
+  <string name="exception_httpexception">Der er opstået en HTTP-fejl.</string>
+  <string name="exception_ioexception">Der er opstået en I/O-fejl.</string>
+  <string name="exception_show_details">Vis detaljer</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Debug-info</string>
+  <string name="sync_error_permissions">DAVdroid-rettigheder</string>
+  <string name="sync_error_permissions_text">Yderligere adgang påkrævet</string>
+  <string name="sync_error_calendar">Synkronisering af kalenderen lykkedes ikke (%s)</string>
+  <string name="sync_error_contacts">Synkronisering af adressebogen lykkedes ikke (%s)</string>
+  <string name="sync_error_tasks">Synkronisering af opgaver lykkedes ikke (%s)</string>
+  <string name="sync_error">Fejl under %s</string>
+  <string name="sync_error_http_dav">Serverfejl under %s</string>
+  <string name="sync_error_local_storage">Databasefejl under %s</string>
+  <string-array name="sync_error_phases">
+    <item>forbereder synkronisering</item>
+    <item>checker understøttelse</item>
+    <item>behandler poster, der er slettet lokalt</item>
+    <item>behandler poster, der er blevet oprettet/redigeret</item>
+    <item>uploader poster, der er blevet oprettet/redigeret</item>
+    <item>checker synkroniseringsstatus</item>
+    <item>laver liste af lokale poster</item>
+    <item>laver lister af poster på server</item>
+    <item>sammenligner poster lokalt og på server</item>
+    <item>downloader poster på server</item>
+    <item>efterbehandler</item>
+    <item>gemmer synkroniseringsstatus</item>
+  </string-array>
+  <string name="sync_error_unauthorized">Fejl i brugernavn/adgangskode</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: Forbindelsessikkerhed</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroid er stødt på et ukendt certifikat. Vil du stole på det? </string>
+</resources>

app/src/davdroid/res/values-es/strings.xml

@@ -0,0 +1,245 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="help">Ayuda</string>
+  <string name="manage_accounts">Administrar cuentas</string>
+  <string name="please_wait">Por favor, espere...</string>
+  <string name="send">Enviar</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Optimización de batería</string>
+  <string name="startup_battery_optimization_message">Android puede desactivar/reducir la sincronización de DAVdroid después de unos días. Para prevenir esto, desactiva la optimización.</string>
+  <string name="startup_battery_optimization_disable">Apagar para DAVdroid</string>
+  <string name="startup_dont_show_again">No mostrar de nuevo</string>
+  <string name="startup_development_version">Versión candidata final de DAVdroid</string>
+  <string name="startup_development_version_message">Esta es una versión de desarrollo de DAVdroid. Tenga presente que puede que no todo funcione como espera. Por favor, denos una retroalimentación constructiva para mejorar DAVdroid.</string>
+  <string name="startup_development_version_give_feedback">Dar retroalimentación</string>
+  <string name="startup_donate">Información de código abierto</string>
+  <string name="startup_donate_message">Nos alegra que uses DAVdroid, que es software de código abierto (GPLv3). Debido al duro trabajo que supone el desarrollo de DAVdroid y los cientos de horas de trabajo, por favor, considera hacer una donación.</string>
+  <string name="startup_donate_now">Mostrar página de donación</string>
+  <string name="startup_donate_later">Quizás luego</string>
+  <string name="startup_google_play_accounts_removed">Información de error de DRM de Play Store</string>
+  <string name="startup_google_play_accounts_removed_message">Bajo ciertas condiciones, el DRM de Play Store puede causar que todas las cuentas de DAVdroid se desconfiguren tras un reinicio o una actualización de DAVdroid. Si esto le afecta (y sólo en ese caso), por favor, instale \"DAVdroid JB Workaround\" desde Play Store.</string>
+  <string name="startup_google_play_accounts_removed_more_info">Más información</string>
+  <string name="startup_opentasks_not_installed">OpenTasks no está instalado</string>
+  <string name="startup_opentasks_not_installed_message">La aplicación OpenTasks no está disponible. DAVdroid no podrá sincronizar listas de tareas.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Tras instalar OpenTasks, tendrás que re-instalar DAVdroid y añadir tus cuentas de nuevo (por un error de Android).</string>
+  <string name="startup_opentasks_not_installed_install">Instalar OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Términos de la licencia</string>
+  <string name="about_license_info_no_warranty">Este programa viene sin NINGÚN TIPO DE GARANTÍA. Es software libre, y cualquier contribución es bienvenida y redistribuida bajo ciertas condiciones.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">Archivo de registro de DAVdroid</string>
+  <string name="logging_to_external_storage">Registrar en almacenamiento externo: %s</string>
+  <string name="logging_to_external_storage_warning">¡Eliminar todos los registros tan pronto como sea posible!</string>
+  <string name="logging_couldnt_create_file">No se puede crear el archivo de registro externo: %s</string>
+  <string name="logging_no_external_storage">Almacenamiento externo no encontrado</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Abrir panel de navegación</string>
+  <string name="navigation_drawer_close">Cerrar panel de navegación</string>
+  <string name="navigation_drawer_subtitle">Adaptador de sincronización CalDAV/CardDAV</string>
+  <string name="navigation_drawer_about">Acerca de / Licencia</string>
+  <string name="navigation_drawer_settings">Ajustes</string>
+  <string name="navigation_drawer_news_updates">Noticias y actualizaciones</string>
+  <string name="navigation_drawer_external_links">Enlaces externos</string>
+  <string name="navigation_drawer_website">Sitio web</string>
+  <string name="navigation_drawer_faq">Preguntas frequentes</string>
+  <string name="navigation_drawer_forums">Comunidad</string>
+  <string name="navigation_drawer_donate">Donar</string>
+  <string name="account_list_empty">Bienvenido a DAVdroid!\n\nAhora puedes añadir una cuenta CalDAV/CardDAV.</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Falló la detección del servicio</string>
+  <string name="dav_service_refresh_couldnt_refresh">No se pudo refrescar lista de colección</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Ajustes</string>
+  <string name="app_settings_user_interface">Interfaz de usuario</string>
+  <string name="app_settings_reset_hints">Restablecer advertencias</string>
+  <string name="app_settings_reset_hints_summary">Habilita las advertencias que han sido rechazadas con anterioridad</string>
+  <string name="app_settings_reset_hints_success">Todas las advertencias se mostrarán nuevamente</string>
+  <string name="app_settings_connection">Conexión</string>
+  <string name="app_settings_override_proxy">Anular ajustes del proxy</string>
+  <string name="app_settings_override_proxy_on">Usar ajustes personalizados del proxy</string>
+  <string name="app_settings_override_proxy_off">Usar ajustes del proxy predefinidos por el sistema</string>
+  <string name="app_settings_override_proxy_host">Nombre del host del proxy HTTP</string>
+  <string name="app_settings_override_proxy_port">Puerto del proxy HTTP</string>
+  <string name="app_settings_security">Seguridad</string>
+  <string name="app_settings_distrust_system_certs">Invalidar los certificados del sistema</string>
+  <string name="app_settings_distrust_system_certs_on">Los CA del sistema y los añadidos por el usuario no serán válidos</string>
+  <string name="app_settings_distrust_system_certs_off">Los CA del sistema y los añadidos por el usuario serán usados y de confianza (recomendado)</string>
+  <string name="app_settings_reset_certificates">Reiniciar certificados (in)validados</string>
+  <string name="app_settings_reset_certificates_summary">Reinicia la validez de todos los certificados particulares</string>
+  <string name="app_settings_reset_certificates_success">Todos los certificados particulares han sido limpiados</string>
+  <string name="app_settings_debug">Depuración</string>
+  <string name="app_settings_log_to_external_storage">Registrar en fichero externo</string>
+  <string name="app_settings_log_to_external_storage_on">Registro en almacenamiento externo (si está disponible)</string>
+  <string name="app_settings_log_to_external_storage_off">El archivo de registro externo está deshabilitado</string>
+  <string name="app_settings_show_debug_info">Mostrar la información de depuración</string>
+  <string name="app_settings_show_debug_info_details">Ver/compartir detalles de software y configuración</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Sincronizar ahora</string>
+  <string name="account_synchronizing_now">Sincronizando...</string>
+  <string name="account_settings">Ajustes de cuenta</string>
+  <string name="account_rename">Renombrar cuenta</string>
+  <string name="account_rename_new_name">Información local no guardada puede ser desechada. Se requiere resincronizar después de renombrar. Nuevo nombre de cuenta:</string>
+  <string name="account_rename_rename">Renombrar</string>
+  <string name="account_delete">Eliminar cuenta</string>
+  <string name="account_delete_confirmation_title">¿Seguro que deseas eliminar la cuenta?</string>
+  <string name="account_delete_confirmation_text">Todas las copias locales de tus contactos, calendarios y tareas serán eliminadas.</string>
+  <string name="account_refresh_address_book_list">Refrescar contactos</string>
+  <string name="account_create_new_address_book">Crear nueva lista de contactos</string>
+  <string name="account_refresh_calendar_list">Refrescar calendario</string>
+  <string name="account_create_new_calendar">Crear nuevo calendario</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">Permisos de DAVdroid</string>
+  <string name="permissions_calendar">Permisos de calendario</string>
+  <string name="permissions_calendar_details">Para sincronizar eventos CalDAV con tus calendarios locales, DAVdroid necesita acceder a los mismos.</string>
+  <string name="permissions_calendar_request">Solicitar permisos sobre calendario</string>
+  <string name="permissions_contacts">Permisos de contactos</string>
+  <string name="permissions_contacts_details">Para sincronizar libretas de contactos CadDAV con tus contactos locales, DAVdroid necesita acceder a los mismos.</string>
+  <string name="permissions_contacts_request">Solicitar permisos sobre contactos</string>
+  <string name="permissions_opentasks">Permisos de OpenTasks</string>
+  <string name="permissions_opentasks_details">Para sincronizar listas de tareas CalDAV con tus listas de tareas locales, DAVdroid necesita acceder a OpenTasks.</string>
+  <string name="permissions_opentasks_request">Solicitar permisos sobre OpenTasks</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Añadir cuenta</string>
+  <string name="login_type_email">Acceder con cuenta de correo</string>
+  <string name="login_email_address">Dirección de correo</string>
+  <string name="login_email_address_error">Se requiere una dirección de correo válida</string>
+  <string name="login_password">Contraseña</string>
+  <string name="login_password_required">Contraseña requerida</string>
+  <string name="login_type_url">Acceder con URL y nombre de usuario</string>
+  <string name="login_url_must_be_http_or_https">La URL debe comenzar con http(s)://</string>
+  <string name="login_url_host_name_required">Nombre de servidor requerido</string>
+  <string name="login_user_name">Nombre de usuario</string>
+  <string name="login_user_name_required">Nombre de usuario requerido</string>
+  <string name="login_base_url">URL base</string>
+  <string name="login_login">Registrar</string>
+  <string name="login_back">Volver</string>
+  <string name="login_create_account">Crear cuenta</string>
+  <string name="login_account_name">Nombre de cuenta</string>
+  <string name="login_account_name_info">Usa tu dirección de correo como nombre de cuenta puesto que Android usará el nombre de la cuenta como campo de \"organizador\" en los eventos que cree. No puedes tener dos cuentas con el mismo nombre.</string>
+  <string name="login_account_contact_group_method">Método de contacto de grupo:</string>
+  <string name="login_account_name_required">Nombre de cuenta requerido</string>
+  <string name="login_account_not_created">La cuenta no pudo ser creada</string>
+  <string name="login_configuration_detection">Detectar configuración</string>
+  <string name="login_querying_server">Por favor espera, consultando al servidor...</string>
+  <string name="login_no_caldav_carddav">No se pudo encontrar el servicio CalDAV o CardDAV.</string>
+  <string name="login_view_logs">Ver registros</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Ajustes: %s</string>
+  <string name="settings_authentication">Autenticación</string>
+  <string name="settings_username">Nombre de usuario</string>
+  <string name="settings_enter_username">Introduce tu nombre de usuario:</string>
+  <string name="settings_password">Contraseña</string>
+  <string name="settings_password_summary">Actualiza la contraseña de acuerdo a tu servidor.</string>
+  <string name="settings_enter_password">Introduce tu contraseña:</string>
+  <string name="settings_sync">Sincronización</string>
+  <string name="settings_sync_interval_contacts">Intervalo de sincronización de contactos</string>
+  <string name="settings_sync_summary_manually">Solo manualmente</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Cada %d minutos + inmediatamente con cambios locales</string>
+  <string name="settings_sync_summary_not_available">No disponible</string>
+  <string name="settings_sync_interval_calendars">Intervalo de sincronización de calendarios</string>
+  <string name="settings_sync_interval_tasks">Intervalo de sincronizacion de Tasks</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Solo manualmente</item>
+    <item>Cada 5 minutos</item>
+    <item>Cada 10 minutos</item>
+    <item>Cada 15 minutos</item>
+    <item>Cada hora</item>
+    <item>Cada 2 horas</item>
+    <item>Cada 4 horas</item>
+    <item>Una vez al día</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Sincronizar sólo sobre WiFi</string>
+  <string name="settings_sync_wifi_only_on">La sincronización está restringida a conexiones WiFi</string>
+  <string name="settings_sync_wifi_only_off">Tipo de conexión no tenido en cuenta</string>
+  <string name="settings_sync_wifi_only_ssid">Restricción WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssid_on">Sólo se sincronizará sobre %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Todas las conexiones WiFi pueden ser usadas</string>
+  <string name="settings_sync_wifi_only_ssid_message">Introduce el nombre de una red WiFi (SSID) para restringir la sincronización a esta red, o deja el campo en blanco para usar todas las conexiones WiFi.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Método de contacto de grupo</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Los groups tienen VCards separadas</item>
+    <item>Los groups tienen una categoría por contacto</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Límite de tiempo de eventos pasados</string>
+  <string name="settings_sync_time_range_past_none">Todos los eventos serán sincronizados</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Los eventos anteriores a un día serán ignorados</item>
+    <item quantity="other">Los eventos anteriores a %d días serán ignorados</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Los eventos anteriores a este número de días serán ignorados (puede ser 0). Deja en blanco el campo para sincronizar todos los eventos.</string>
+  <string name="settings_manage_calendar_colors">Colores de calendario</string>
+  <string name="settings_manage_calendar_colors_on">Los colores de los calendarios son administrados por DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Los colores de los calendarios no son establecidos por DAVdroid</string>
+  <!--collection management-->
+  <string name="create_addressbook">Crear nueva lista de contactos</string>
+  <string name="create_addressbook_display_name_hint">Agendas</string>
+  <string name="create_calendar">Crear colección CalDAV</string>
+  <string name="create_calendar_display_name_hint">Mi calendario</string>
+  <string name="create_calendar_time_zone">Zona horaria:</string>
+  <string name="create_calendar_type">Tipo de colección:</string>
+  <string name="create_calendar_type_only_events">Calendario (sólo eventos)</string>
+  <string name="create_calendar_type_only_tasks">Lista de tareas (sólo tareas)</string>
+  <string name="create_calendar_type_events_and_tasks">Combinado (eventos y tareas)</string>
+  <string name="create_collection_color">Establecer un color</string>
+  <string name="create_collection_creating">Crear colección</string>
+  <string name="create_collection_display_name">Nombre mostrado (título):</string>
+  <string name="create_collection_display_name_required">Título requerido</string>
+  <string name="create_collection_description">Descripción (opcional):</string>
+  <string name="create_collection_home_set">Establecer localización:</string>
+  <string name="create_collection_create">Crear</string>
+  <string name="delete_collection">Eliminar colección</string>
+  <string name="delete_collection_confirm_title">¿Estás seguro/a?</string>
+  <string name="delete_collection_confirm_warning">Esta colección (%s) y toda su información será eliminada del servidor.</string>
+  <string name="delete_collection_deleting_collection">Eliminando colección</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Ocurrió un error.</string>
+  <string name="exception_httpexception">Ha ocurrido un error HTTP.</string>
+  <string name="exception_ioexception">Ha ocurrido un error I/O.</string>
+  <string name="exception_show_details">Mostrar detalles</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Información de depuración</string>
+  <string name="sync_error_permissions">Permisos de DAVdroid</string>
+  <string name="sync_error_permissions_text">Permisos adicionales requeridos</string>
+  <string name="sync_error_calendar">La sincronización de calendario falló (%s)</string>
+  <string name="sync_error_contacts">La sincronización de agenda falló (%s)</string>
+  <string name="sync_error_tasks">La sincronización de tareas falló (%s)</string>
+  <string name="sync_error">Error al %s</string>
+  <string name="sync_error_http_dav">Error de servidor al %s</string>
+  <string name="sync_error_local_storage">Error de base de datos al %s</string>
+  <string-array name="sync_error_phases">
+    <item>preparando sincronización</item>
+    <item>buscando capacidades</item>
+    <item>procesando entradas borradas localmente</item>
+    <item>preparando entradas creadas/modificadas</item>
+    <item>cargando entradas creadas/modificadas</item>
+    <item>comprobando estado de sincronización</item>
+    <item>enumerando entradas locales</item>
+    <item>enumerando entradas remotas</item>
+    <item>comparando entradas locales/remotas</item>
+    <item>descargando entradas remotas</item>
+    <item>post-procesando</item>
+    <item>guardando estado de sincronización</item>
+  </string-array>
+  <string name="sync_error_unauthorized">Nombre de usuario/contraseña erróneo</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: Seguridad de conexión</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroid ha encontrado un certificado desconocido. ¿Quieres que sea válido?</string>
+</resources>

app/src/davdroid/res/values-fr/strings.xml

@@ -0,0 +1,245 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="help">Aide</string>
+  <string name="manage_accounts">Gestion des comptes</string>
+  <string name="please_wait">SVP attendez ...</string>
+  <string name="send">Envoyer</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Optimisation de la batterie</string>
+  <string name="startup_battery_optimization_message">Android peut désactiver/réduire la synchronisation de DAVdroid après quelques jours. Pour éviter cela, désactivez l\'optimisation de la batterie.</string>
+  <string name="startup_battery_optimization_disable">Désactivez pour DAVdroid</string>
+  <string name="startup_dont_show_again">Ne plus afficher</string>
+  <string name="startup_development_version">Pré-version de DAVdroid</string>
+  <string name="startup_development_version_message">Il s\'agit d\'une version de développement de DAVdroid. Il se peut que les choses ne fonctionnent pas comme prévu. S’il vous plaît faites-nous un retour pour améliorer DAVdroid.</string>
+  <string name="startup_development_version_give_feedback">Faire un commentaire</string>
+  <string name="startup_donate">Open-Source Information</string>
+  <string name="startup_donate_message">Nous sommes heureux que vous utilisez DAVdroid, qui est un logiciel open-source (GPLv3). Parce que développer DAVdroid est un travail difficile et nous a pris de nombreuses heures, s\'il vous plaît envisager de faire un don.</string>
+  <string name="startup_donate_now">Faire un don</string>
+  <string name="startup_donate_later">Plus tard</string>
+  <string name="startup_google_play_accounts_removed">Erreur information Play Store DRM</string>
+  <string name="startup_google_play_accounts_removed_message">Dans certaines conditions, Play Store DRM peut provoquer la disparition de tous les comptes DAVdroid après un redémarrage ou après la mise à niveau de DAVdroid. Si vous êtes concerné par ce problème (et seulement alors), s\'il vous plaît installer \"DAVdroid JB Solution\" du Play Store.</string>
+  <string name="startup_google_play_accounts_removed_more_info">Plus d\'information</string>
+  <string name="startup_opentasks_not_installed">OpenTasks n\'est pas installé</string>
+  <string name="startup_opentasks_not_installed_message">L\'application OpenTasks n\'est pas disponible, donc DAVdroid ne pourra pas synchroniser des listes de tâches.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Après l\'installation OpenTasks, vous devez RE-INSTALLER DAVdroid et ajoutez vos comptes à nouveau (bug Android).</string>
+  <string name="startup_opentasks_not_installed_install">Installer OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Conditions d\'utilisation</string>
+  <string name="about_license_info_no_warranty">Ce programme est fourni sans AUCUNE GARANTIE. C\'est un logiciel libre, et vous êtes en droit de le redistribuer sous certaines conditions.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVdroid fichier de journalisation</string>
+  <string name="logging_to_external_storage">Se connecter au stockage externe: %s</string>
+  <string name="logging_to_external_storage_warning">Supprimer les journaux dès que possible!</string>
+  <string name="logging_couldnt_create_file">Impossible de créer le fichier journal externe: %s</string>
+  <string name="logging_no_external_storage">Stockage externe introuvable</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Ouvrir le tiroir de navigation</string>
+  <string name="navigation_drawer_close">Fermer le tiroir de navigation</string>
+  <string name="navigation_drawer_subtitle">Adaptateur de synchronisation CalDAV/CardDAV</string>
+  <string name="navigation_drawer_about">A propos / Licence</string>
+  <string name="navigation_drawer_settings">Paramètres</string>
+  <string name="navigation_drawer_news_updates">Actualité &amp; mise à jour</string>
+  <string name="navigation_drawer_external_links">Liens externes</string>
+  <string name="navigation_drawer_website">Site Web</string>
+  <string name="navigation_drawer_faq">FAQ</string>
+  <string name="navigation_drawer_forums">Communauté</string>
+  <string name="navigation_drawer_donate">Faire un don</string>
+  <string name="account_list_empty">Bienvenue sur DAVdroid!\n\nVous pouvez maintenant ajouter un compte CalDAV/CardDAV.</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">La détection du service a échoué</string>
+  <string name="dav_service_refresh_couldnt_refresh">Impossible d\'actualiser la liste de collection</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Paramètres</string>
+  <string name="app_settings_user_interface">Interface utilisateur</string>
+  <string name="app_settings_reset_hints">Réinitialiser les astuces</string>
+  <string name="app_settings_reset_hints_summary">Réactiver les astuces qui ont été vu précédemment</string>
+  <string name="app_settings_reset_hints_success">Toutes les astuces seront affichés à nouveau</string>
+  <string name="app_settings_connection">Connexion</string>
+  <string name="app_settings_override_proxy">Ignorer les paramètres proxy</string>
+  <string name="app_settings_override_proxy_on">Utiliser des paramètres proxy personnalisés</string>
+  <string name="app_settings_override_proxy_off">Utiliser les paramètres proxy du système</string>
+  <string name="app_settings_override_proxy_host">Nom de l\'hôte du proxy HTTP</string>
+  <string name="app_settings_override_proxy_port">Port du proxy HTTP</string>
+  <string name="app_settings_security">Sécurité</string>
+  <string name="app_settings_distrust_system_certs">Révoquer les certificats du système</string>
+  <string name="app_settings_distrust_system_certs_on">Les certificats du système et ceux ajoutés par l\'utilisateur ne seront pas  dignes de confiance</string>
+  <string name="app_settings_distrust_system_certs_off">Les certificats du système et ceux ajoutés par l\'utilisateur seront dignes de confiance (recommandé)</string>
+  <string name="app_settings_reset_certificates">Réinitialiser les certificats de (non)confiance</string>
+  <string name="app_settings_reset_certificates_summary">Réinitialiser la confiance de tous les certificats personnalisés</string>
+  <string name="app_settings_reset_certificates_success">Tous les certificats personnalisés ont été effacés</string>
+  <string name="app_settings_debug">Débogage</string>
+  <string name="app_settings_log_to_external_storage">Journaliser dans un fichier externe</string>
+  <string name="app_settings_log_to_external_storage_on">Journaliser sur le stockage externe (si disponible)</string>
+  <string name="app_settings_log_to_external_storage_off">Le fichier externe n\'est pas disponible.</string>
+  <string name="app_settings_show_debug_info">Afficher les infos de débogage</string>
+  <string name="app_settings_show_debug_info_details">Voir/partager l\'application et les détails de configuration</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Synchroniser maintenant</string>
+  <string name="account_synchronizing_now">Synchronisation en cours</string>
+  <string name="account_settings">Paramètres du compte</string>
+  <string name="account_rename">Renommer le compte</string>
+  <string name="account_rename_new_name">Les données locales non enregistrées pourraient être perdues. Une re-synchronisation est nécessaire après avoir renommé le compte. Nouveau nom du compte : </string>
+  <string name="account_rename_rename">Renommer</string>
+  <string name="account_delete">Supprimer le compte</string>
+  <string name="account_delete_confirmation_title">Voulez-vous vraiment supprimer le compte?</string>
+  <string name="account_delete_confirmation_text">Toutes les copies locales des carnets d\'adresses, des calendriers et des listes de tâches seront supprimées.</string>
+  <string name="account_refresh_address_book_list">Actualiser le carnet d\'adresse</string>
+  <string name="account_create_new_address_book">Créer un nouveau carnet d\'adresse</string>
+  <string name="account_refresh_calendar_list">Actualiser le calendrier</string>
+  <string name="account_create_new_calendar">Créer un nouveau calendrier</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">Autorisations DAVdroid</string>
+  <string name="permissions_calendar">Autorisations calendrier</string>
+  <string name="permissions_calendar_details">Pour synchroniser les événements CalDAV avec vos calendriers locaux, DAVdroid a besoin d\'accéder à vos calendriers.</string>
+  <string name="permissions_calendar_request">Demande d\'autorisations d\'accéder au calendrier</string>
+  <string name="permissions_contacts">Autorisations contacts</string>
+  <string name="permissions_contacts_details">Pour synchroniser les carnets d\'adresses de CardDAV avec votre carnet d\'adresses local, DAVdroid a besoin d\'accéder à vos contacts.</string>
+  <string name="permissions_contacts_request">Demande d\'autorisations d\'accéder aux contacts</string>
+  <string name="permissions_opentasks">Autorisations OpenTasks</string>
+  <string name="permissions_opentasks_details">Pour synchroniser les tâches de CalDAV avec vos listes de tâches locales, DAVdroid a besoin d\'accéder à OpenTasks.</string>
+  <string name="permissions_opentasks_request">Demande d\'autorisations d\'accéder à OpenTasks</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Ajouter un compte</string>
+  <string name="login_type_email">Connexion avec une adresse email</string>
+  <string name="login_email_address">Adresse mail</string>
+  <string name="login_email_address_error">Une adresse e-mail valide est requis</string>
+  <string name="login_password">Mot de passe</string>
+  <string name="login_password_required">Mot de passe requis</string>
+  <string name="login_type_url">Connexion avec une URL et un nom d\'utilisateur</string>
+  <string name="login_url_must_be_http_or_https">L\'URL doit commencer par http(s)://</string>
+  <string name="login_url_host_name_required">Nom d\'hôte requis</string>
+  <string name="login_user_name">Nom d\'utilisateur</string>
+  <string name="login_user_name_required">Nom d\'utilisateur requis</string>
+  <string name="login_base_url">URL de base</string>
+  <string name="login_login">Se connecter</string>
+  <string name="login_back">Retour</string>
+  <string name="login_create_account">Créer un compte</string>
+  <string name="login_account_name">Nom du compte</string>
+  <string name="login_account_name_info">Utilisez votre adresse e-mail comme nom de compte car Android utilisera ce nom en tant que champ ORGANISATEUR pour les événements que vous créerez. Vous ne pouvez pas avoir deux comptes avec le même nom.</string>
+  <string name="login_account_contact_group_method">Méthode pour les contacts de type groupe :</string>
+  <string name="login_account_name_required">Nom du compte requis</string>
+  <string name="login_account_not_created">Le compte n\'a pas pu être créé</string>
+  <string name="login_configuration_detection">Détection de la configuration</string>
+  <string name="login_querying_server">S\'il vous plaît patienter, nous interrogeons le serveur ...</string>
+  <string name="login_no_caldav_carddav">Aucun service CalDAV ou CardDAV trouvé.</string>
+  <string name="login_view_logs">Voir infos de débogage</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Paramètres: %s</string>
+  <string name="settings_authentication">Authentification</string>
+  <string name="settings_username">Nom d\'utilisateur</string>
+  <string name="settings_enter_username">Saisissez votre nom d\'utilisateur :</string>
+  <string name="settings_password">Mot de passe</string>
+  <string name="settings_password_summary">Mettre à jour le mot de passe </string>
+  <string name="settings_enter_password">Saisissez votre mot de passe :</string>
+  <string name="settings_sync">Synchronisation</string>
+  <string name="settings_sync_interval_contacts">Interval de synchronisation des carnets d\'adresses</string>
+  <string name="settings_sync_summary_manually">Manuellement</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Toutes les %d minutes et immédiatement après un changement local</string>
+  <string name="settings_sync_summary_not_available">Indisponible</string>
+  <string name="settings_sync_interval_calendars">Interval de synchronisation des agendas</string>
+  <string name="settings_sync_interval_tasks">Interval de synchronisation des tâches</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Manuellement</item>
+    <item>Toutes les 5 minutes</item>
+    <item>Toutes les 10 minutes</item>
+    <item>Toutes les 15 minutes</item>
+    <item>Toutes les heures</item>
+    <item>Toutes les 2 heures</item>
+    <item>Toutes les 4 heures</item>
+    <item>Une fois par jour</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Synchronisation en Wifi seulement</string>
+  <string name="settings_sync_wifi_only_on">La synchronisation est limitée aux connexions WiFi</string>
+  <string name="settings_sync_wifi_only_off">Le type de connexion n\'est pas pris en charge</string>
+  <string name="settings_sync_wifi_only_ssid">Restriction WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssid_on">Sera seulement synchroniser avec %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Toutes les connexions WiFi peuvent être utilisées</string>
+  <string name="settings_sync_wifi_only_ssid_message">Entrez le nom d\'un réseau WiFi (SSID) pour restreindre la synchronisation à ce réseau, ou laisser vide pour autoriser toutes les connexions WiFi.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Méthode pour les contacts de type groupe</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Les groupes sont des VCards indépendantes</item>
+    <item>Les groupes sont des catégories pour chacun des contacts</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Limite des événements passés</string>
+  <string name="settings_sync_time_range_past_none">Tous les événements seront synchronisés</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Les événements de plus d’un jour passé seront ignorés</item>
+    <item quantity="other">Les événements de plus de %d jours passés seront ignorés</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Les événements antérieurs à ce nombre de jours seront ignorés (peut être 0). Laissez vide pour synchroniser tous les événements.</string>
+  <string name="settings_manage_calendar_colors">Choisir couleur du calendrier</string>
+  <string name="settings_manage_calendar_colors_on">Les couleurs de calendrier sont gérées par DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Les couleurs de calendrier ne sont pas gérées par DAVdroid</string>
+  <!--collection management-->
+  <string name="create_addressbook">Créer un carnet d\'adresses</string>
+  <string name="create_addressbook_display_name_hint">Mon carnet d\'adresses</string>
+  <string name="create_calendar">Créer une collection CalDAV</string>
+  <string name="create_calendar_display_name_hint">Mon calendrier</string>
+  <string name="create_calendar_time_zone">Fuseau horaire:</string>
+  <string name="create_calendar_type">Type de collection:</string>
+  <string name="create_calendar_type_only_events">Calendrier (événements seulement)</string>
+  <string name="create_calendar_type_only_tasks">Liste de tâches (tâches seulement)</string>
+  <string name="create_calendar_type_events_and_tasks">Fusionner (événements et tâches)</string>
+  <string name="create_collection_color">Choisir une couleur pour la collection</string>
+  <string name="create_collection_creating">Création collection</string>
+  <string name="create_collection_display_name">Le nom affiché (titre) pour cette collection:</string>
+  <string name="create_collection_display_name_required">Titre requis</string>
+  <string name="create_collection_description">Description (facultatif)</string>
+  <string name="create_collection_home_set">Accueil:</string>
+  <string name="create_collection_create">Créer</string>
+  <string name="delete_collection">Supprimer la collection</string>
+  <string name="delete_collection_confirm_title">Êtes-vous sur?</string>
+  <string name="delete_collection_confirm_warning">Cette collection (%s) et toutes ses données seront supprimées du serveur.</string>
+  <string name="delete_collection_deleting_collection">Suppression de la collection</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Une erreur est survenue.</string>
+  <string name="exception_httpexception">Une erreur HTTP est survenue.</string>
+  <string name="exception_ioexception">Une erreur I/O est survenue.</string>
+  <string name="exception_show_details">Voir détails</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Infos de débogage</string>
+  <string name="sync_error_permissions">Autorisations DAVdroid</string>
+  <string name="sync_error_permissions_text">Autorisations supplémentaires demandées</string>
+  <string name="sync_error_calendar">Échec de la synchronisation du calendrier (%s)</string>
+  <string name="sync_error_contacts">Échec de la synchronisation du carnet d\'adresse (%s)</string>
+  <string name="sync_error_tasks">Échec de la synchronisation (%s)</string>
+  <string name="sync_error">Erreur durant %s</string>
+  <string name="sync_error_http_dav">Erreur de serveur durant %s</string>
+  <string name="sync_error_local_storage">Erreur de base de donnée durant %s</string>
+  <string-array name="sync_error_phases">
+    <item>prépare la synchronisation</item>
+    <item>demande les autorisations</item>
+    <item>procède à la suppression des entrées locales</item>
+    <item>prépare les entrées créées/modifiées</item>
+    <item>envoi les entrées créées/modifiées</item>
+    <item>vérifie l\'état de la synchronisation</item>
+    <item>liste les entrées locales</item>
+    <item>liste les entrées distantes</item>
+    <item>compare les entrées locales/distantes</item>
+    <item>télécharge les entrées distantes</item>
+    <item>post-traitement</item>
+    <item>enregistre l\'état de la synchronisation</item>
+  </string-array>
+  <string name="sync_error_unauthorized">Nom d\'utilisateur ou mot de passe erroné</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid : Sécurité de la connexion</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroid a rencontré un certificat inconnu. Voulez-vous lui faire confiance?</string>
+</resources>

app/src/davdroid/res/values-hu/strings.xml

@@ -0,0 +1,245 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="help">Súgó</string>
+  <string name="manage_accounts">Fiókok kezelése</string>
+  <string name="please_wait">Kérjük, várjon ...</string>
+  <string name="send">Küldés</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Akkumulátoroptimalizálás </string>
+  <string name="startup_battery_optimization_message">Az operációs rendszer a DAVdroid szinkronizálást pár nap után leállíthatja vagy visszafoghatja.  Ennek elkerülésére kapcsolja ki az akkumulátoroptimalizálást.</string>
+  <string name="startup_battery_optimization_disable">Kikapcsolás a DAVdroid kapcsán</string>
+  <string name="startup_dont_show_again">Ne jelenjen meg többet</string>
+  <string name="startup_development_version">DAVdroid előzetes kiadás</string>
+  <string name="startup_development_version_message">Ez a DAVdroid egy fejlesztői verziója.  Elképzelhető, hogy nem minden működik úgy, ahogyan kellene.  Ha így lenne, kérjük küldjön a tapasztaltakról visszajelzést.</string>
+  <string name="startup_development_version_give_feedback">Visszajelzés küldése</string>
+  <string name="startup_donate">A forrás nyíltságával kapcsolatos információk</string>
+  <string name="startup_donate_message">Örülünk, hogy használja a DAVdroidot.  A DAVdroid nyílt forráskódú (GPLv3) szoftver, de a fejlesztése kemény munkát jelent, már eddig több ezer munkaórát emésztett fel, ezért kérjük, fontolja meg, hogy támogassa munkánkat.</string>
+  <string name="startup_donate_now">Támogatás küldése</string>
+  <string name="startup_donate_later">Talán később</string>
+  <string name="startup_google_play_accounts_removed">Play Áruház DRM hibával kapcsolatos információ</string>
+  <string name="startup_google_play_accounts_removed_message">Bizonyos körülmények között  a Play Áruház DRM okozhatja azt, hogy az eszköz újraindítását vagy a DAVdroid frissítését követően a DAVdroid fiókok eltűnnek.  Amennyiben (és csak amennyiben) érinti Önt ez a probléma, telepítse a \"DAVdroid JB Workaround\" alkalmazást Play Áruházból.</string>
+  <string name="startup_google_play_accounts_removed_more_info">További információk</string>
+  <string name="startup_opentasks_not_installed">Az OpenTasks nincs telepítve</string>
+  <string name="startup_opentasks_not_installed_message">Az OpenTasks alkalmazás nincs telepítve, így a DAVdroid nem lesz képes szinkronizálni feladatlistákat.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Az OpenTasks telepítését követően újra kell telepíteni a DAVdroit alkalmazást és újra fel kell venni a fiókokat (Android hiba).</string>
+  <string name="startup_opentasks_not_installed_install">Az OpenTasks telepítése</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Licencfeltételek</string>
+  <string name="about_license_info_no_warranty">Ehhez a program SEMMIFÉLE GARANCIA NEM JÁR.   Ez a program szabad szoftver, ami a bizonyos feltételek mellett szabadon terjeszthető.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVdroid fájlalapú naplózás</string>
+  <string name="logging_to_external_storage">Naplózás külső tárhelyre: %s</string>
+  <string name="logging_to_external_storage_warning">Törölje a naplófájlt, amint lehetséges!</string>
+  <string name="logging_couldnt_create_file">Külső naplófájl létrehozása sikertelen: %s</string>
+  <string name="logging_no_external_storage">A külső tárhely nem érhető el</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Navigációs fiók megnyitása</string>
+  <string name="navigation_drawer_close">Navigációs fiók lezárása</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV szinkronizációs adapter</string>
+  <string name="navigation_drawer_about">Névjegy / Licenc</string>
+  <string name="navigation_drawer_settings">Beállítások</string>
+  <string name="navigation_drawer_news_updates">Hírek és frissítések</string>
+  <string name="navigation_drawer_external_links">Weblapok</string>
+  <string name="navigation_drawer_website">Honlap</string>
+  <string name="navigation_drawer_faq">GYIK</string>
+  <string name="navigation_drawer_forums">Közösség</string>
+  <string name="navigation_drawer_donate">Támogatás</string>
+  <string name="account_list_empty">Üdvözöljük a DAVdroid felhasználók között!\n\nMost már felvehet CalDAV/CardDav fiókokat.</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Szolgáltatások felderítése nem sikerült</string>
+  <string name="dav_service_refresh_couldnt_refresh">Gyűjteménylista frissítése nem sikerült</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Beállítások</string>
+  <string name="app_settings_user_interface">Felhasználói felület</string>
+  <string name="app_settings_reset_hints">Tippek visszaállítása</string>
+  <string name="app_settings_reset_hints_summary">Újra jelenjen meg az összes tipp</string>
+  <string name="app_settings_reset_hints_success">Az összes tipp újra meg fog jelenni</string>
+  <string name="app_settings_connection">Kapcsolat</string>
+  <string name="app_settings_override_proxy">Proxybeállítások felülírása</string>
+  <string name="app_settings_override_proxy_on">Egyedi proxybeállítások</string>
+  <string name="app_settings_override_proxy_off">Az alapértelmezett proxybeállítás használata</string>
+  <string name="app_settings_override_proxy_host">HTTP proxyállomás neve</string>
+  <string name="app_settings_override_proxy_port">HTTP proxy port</string>
+  <string name="app_settings_security">Biztonság</string>
+  <string name="app_settings_distrust_system_certs">A rendszertanúsítványok elfogadása</string>
+  <string name="app_settings_distrust_system_certs_on">A rendszer által kezelt, előre vagy felhasználó által telepített tanúsítványok figyelmen kívül lesznek hagyva</string>
+  <string name="app_settings_distrust_system_certs_off">A rendszer által kezelt, előre vagy felhasználó által telepített tanúsítványok megbízhatóak (javasolt)</string>
+  <string name="app_settings_reset_certificates">A tanúsítványok megbízhatóságának törlésére</string>
+  <string name="app_settings_reset_certificates_summary">A tanúsítványok megbízhatóságával kapcsolatos beállítások törlésére</string>
+  <string name="app_settings_reset_certificates_success">A tanúsítványok megbízhatóságával kapcsolatos beállítások törölve</string>
+  <string name="app_settings_debug">Hibakeresés</string>
+  <string name="app_settings_log_to_external_storage">Naplózás fájlba</string>
+  <string name="app_settings_log_to_external_storage_on">Naplózás külső tárhelyre (ha elérhető)</string>
+  <string name="app_settings_log_to_external_storage_off">Fájlalapú naplózás kikapcsolva</string>
+  <string name="app_settings_show_debug_info">Hibakeresési információ megtekintése</string>
+  <string name="app_settings_show_debug_info_details">Szoftver- és konfigurációs részletek megtekintése/megosztása</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Szinkronizálás most</string>
+  <string name="account_synchronizing_now">Szinkronizálás</string>
+  <string name="account_settings">Fiókbeállítások</string>
+  <string name="account_rename">Fiók átnevezése</string>
+  <string name="account_rename_new_name">Az elmentetlen helyben tárolt adatok elvesznek.  Az átnevezés után szinkronizálásra lesz szükség.  Új fióknév:</string>
+  <string name="account_rename_rename">Átnevez</string>
+  <string name="account_delete">Fiók törlése</string>
+  <string name="account_delete_confirmation_title">Valóban törölni akarja a fiókot?</string>
+  <string name="account_delete_confirmation_text">Az összes címjegyzék, naptár és feladatlista helyi példányai törölve lesznek.</string>
+  <string name="account_refresh_address_book_list">Címjegyzék-lista frissítése</string>
+  <string name="account_create_new_address_book">Új címjegyzék létrehozása</string>
+  <string name="account_refresh_calendar_list">Naptárlista frissítése</string>
+  <string name="account_create_new_calendar">Új naptár létrehozása</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid engedélyek </string>
+  <string name="permissions_calendar">Naptárengedély</string>
+  <string name="permissions_calendar_details">A CalDAV naptárak és a helyi naptárak szinkronizálásához a DAVdroid naptárhozzáférést igényel.</string>
+  <string name="permissions_calendar_request">Naptárhozzáférés igénylése</string>
+  <string name="permissions_contacts">Névjegyengedélyek</string>
+  <string name="permissions_contacts_details">A CardDAV címlisták és a helyi címlisták szinkronizálásához a névjegyhozzáférést igényel.</string>
+  <string name="permissions_contacts_request">Névjegyengedélyek igénylése</string>
+  <string name="permissions_opentasks">OpenTasks engedélyek</string>
+  <string name="permissions_opentasks_details">A CalDAV feladatlisták és a helyi feladatlisták szinkronizálásához a DAVdroid OpenTasks hozzáférést igényel.</string>
+  <string name="permissions_opentasks_request">OpenTasks engedélyek igénylése</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Fiók hozzáadása</string>
+  <string name="login_type_email">Bejelentkezés email cím segítségével</string>
+  <string name="login_email_address">Email cím:</string>
+  <string name="login_email_address_error">Érvényes email cím megadása feltétlenül szükséges</string>
+  <string name="login_password">Jelszó</string>
+  <string name="login_password_required">A jelszó megadása szükséges</string>
+  <string name="login_type_url">Bejelentkezés URL és felhasználónév segítségével</string>
+  <string name="login_url_must_be_http_or_https">Az URL elején szerepeljen http(s)://</string>
+  <string name="login_url_host_name_required">A szervernév megadása feltétlenül szükséges</string>
+  <string name="login_user_name">Felhasználónév</string>
+  <string name="login_user_name_required">A felhasználónév megadása feltétlenül szükséges</string>
+  <string name="login_base_url">URL-törzs</string>
+  <string name="login_login">Bejelentkezés</string>
+  <string name="login_back">Vissza</string>
+  <string name="login_create_account">Fiók létrehozása</string>
+  <string name="login_account_name">A fiók neve</string>
+  <string name="login_account_name_info">Használja az email címet fióknévként, mert később a létrehozandó események szervezőjeként (ORGANIZER mező) az Android ezt fogja használni. Két fiókot nem lehet azonos néven létrehozni.</string>
+  <string name="login_account_contact_group_method">A csoportok kezelésének módja:</string>
+  <string name="login_account_name_required">A fióknév megadása feltétlenül szükséges</string>
+  <string name="login_account_not_created">A fiók létrehozása nem sikerült</string>
+  <string name="login_configuration_detection">A konfiguráció felderítése</string>
+  <string name="login_querying_server">Kérjük, várjon, a szerver lekérdezése...</string>
+  <string name="login_no_caldav_carddav">Nem található CalDAV vagy CardDAV szolgáltatás.</string>
+  <string name="login_view_logs">Naplóbejegyzések megtekintése</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Beállítások: %s</string>
+  <string name="settings_authentication">Authentikáció</string>
+  <string name="settings_username">Felhasználónév</string>
+  <string name="settings_enter_username">Adja meg a felhasználónevet:</string>
+  <string name="settings_password">Jelszó</string>
+  <string name="settings_password_summary">Adja meg a szerveren érvényes új jelszót.</string>
+  <string name="settings_enter_password">Adja meg a jelszót:</string>
+  <string name="settings_sync">Szinkronizálás</string>
+  <string name="settings_sync_interval_contacts">Névjegyszinkronizálás sűrűsége</string>
+  <string name="settings_sync_summary_manually">Manuális</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Minden %d percben + az eszközön történt módosítás után</string>
+  <string name="settings_sync_summary_not_available">Nem elérhető</string>
+  <string name="settings_sync_interval_calendars">Naptárszinkronizálás sűrűsége</string>
+  <string name="settings_sync_interval_tasks">Feladatlisták szinkronizálásának sűrűsége</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Manuális</item>
+    <item>5 percenként</item>
+    <item>10 percenként</item>
+    <item>15 percenként</item>
+    <item>Óránként</item>
+    <item>2 óránként</item>
+    <item>4 óránként</item>
+    <item>Naponta</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Szinkronizálás csak WIFI-n</string>
+  <string name="settings_sync_wifi_only_on">Csak WIFI kapcsolat keresztül történjen szinkronizálás</string>
+  <string name="settings_sync_wifi_only_off">Szinkronizálás a kapcsolat típusától függetlenül</string>
+  <string name="settings_sync_wifi_only_ssid">WIFI SSID szűkítés</string>
+  <string name="settings_sync_wifi_only_ssid_on">Szinkronizálás csak a(z) %s hálózatra kapcsolódva</string>
+  <string name="settings_sync_wifi_only_ssid_off">Szinkronizálás bármely WIFI hálózaton</string>
+  <string name="settings_sync_wifi_only_ssid_message">Adja meg a WIFI hálózat nevét (SSID) a szinkronizálás egy hálózatra való korlátozához, vagy hagyja üresen, ha nem akar ilyen szűkítést.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">A csoportok kezelésének módja</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Minden csoport egy különálló VCard</item>
+    <item>A csoportok a kapcsolatonkéni kategóriák</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Múltbéli események időkorlátja</string>
+  <string name="settings_sync_time_range_past_none">Minden esemény szinkronizálása</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Az egy napnál régebbi események figyelmen kívül hagyása</item>
+    <item quantity="other">A %d napnál régebbi események figyelmen kívül hagyása</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Az ennyi napnál (lehet 0) régebbi események figyelmen kívül lesznek hagyva.  Hagyja üresen, ha minden múltbéli eseményt szinkronizálni akar.</string>
+  <string name="settings_manage_calendar_colors">Naptárszínek kezelése</string>
+  <string name="settings_manage_calendar_colors_on">A naptárszíneket a DAVdroid kezeli</string>
+  <string name="settings_manage_calendar_colors_off">A naptárszíneket nem a DAVdroid kezeli</string>
+  <!--collection management-->
+  <string name="create_addressbook">Címjegyzék létrehozása</string>
+  <string name="create_addressbook_display_name_hint">Új címjegyzék</string>
+  <string name="create_calendar">CalDAV gyűjtemény létrehozása</string>
+  <string name="create_calendar_display_name_hint">Új naptár</string>
+  <string name="create_calendar_time_zone">Időzóna:</string>
+  <string name="create_calendar_type">Gyűjtemény típusa:</string>
+  <string name="create_calendar_type_only_events">Naptár (csak események)</string>
+  <string name="create_calendar_type_only_tasks">Feladatlista (csak feladatok)</string>
+  <string name="create_calendar_type_events_and_tasks">Kombinált (események és feladatok)</string>
+  <string name="create_collection_color">A gyűjtemény színének kiválasztása</string>
+  <string name="create_collection_creating">Gyűjtemény létrehozása</string>
+  <string name="create_collection_display_name">A gyűjtemény megnevezése (címe)</string>
+  <string name="create_collection_display_name_required">A cím megadása feltétlenül szükséges</string>
+  <string name="create_collection_description">Leírás (opcionális):</string>
+  <string name="create_collection_home_set">Gyűjtemények tárolója:</string>
+  <string name="create_collection_create">Létrehozás</string>
+  <string name="delete_collection">Gyűjtemény törlése</string>
+  <string name="delete_collection_confirm_title">Biztos?</string>
+  <string name="delete_collection_confirm_warning">A gyűjtemény (%s) és a hozzá tartozó adatok törölve lesznek a szerverről.</string>
+  <string name="delete_collection_deleting_collection">Gyűjtemény törlése</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Hiba történt.</string>
+  <string name="exception_httpexception">HTTP hiba történt.</string>
+  <string name="exception_ioexception">I/O hiba történt.</string>
+  <string name="exception_show_details">Részletek megjelenítése</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Hibakeresési információ</string>
+  <string name="sync_error_permissions">DAVdroid engedélyek </string>
+  <string name="sync_error_permissions_text">További engedélyek szükségesek</string>
+  <string name="sync_error_calendar">A naptár szinkronizálása nem sikerült (%s)</string>
+  <string name="sync_error_contacts">A címjegyzék szinkronizálása nem sikerült (%s)</string>
+  <string name="sync_error_tasks">A feladatok szinkronizálása nem sikerült (%s)</string>
+  <string name="sync_error">Hiba az alábbi művelet közben: %s</string>
+  <string name="sync_error_http_dav">Szerver oldali hiba az alábbi művelet közben: %s</string>
+  <string name="sync_error_local_storage">Adatbázishiba az alábbi művelet közben: %s</string>
+  <string-array name="sync_error_phases">
+    <item>szinkronizáció előkészítése </item>
+    <item>szerver képességeinek lekérdezése</item>
+    <item>a helyben törölt bejegyzések feldolgozása</item>
+    <item>az új vagy módosított bejegyzések gyűjtése </item>
+    <item>az új vagy módosított bejegyzések feltöltése</item>
+    <item>szinkronizációs állapot ellenőrzése</item>
+    <item>helyi bejegyzések listázása</item>
+    <item>távoli bejegyzések listázása</item>
+    <item>helyi és távoli bejegyzések összehasonlítása</item>
+    <item>távoli bejegyzések letöltése</item>
+    <item>utófeldolgozás</item>
+    <item>szinkronizációs állapot mentése</item>
+  </string-array>
+  <string name="sync_error_unauthorized">A felhasználónév vagy jelszó hibás</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: kapcsolatbiztonság</string>
+  <string name="trust_certificate_unknown_certificate_found">Egy eddig ismeretlen tanúsítvány érkezett.  Megbízhatónak kívánja elfogadni?</string>
+</resources>

app/src/davdroid/res/values-it/strings.xml

@@ -0,0 +1,229 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="help">Aiuto</string>
+  <string name="manage_accounts">Gestione account</string>
+  <string name="please_wait">Attendere prego …</string>
+  <string name="send">Invia</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Ottimizazione della batteria</string>
+  <string name="startup_battery_optimization_message">Android può ridurre o disabilitare la sincronizzazione di DAVdroid dopo alcuni giorni. Per prevenire questo comportamento disabilita l\'ottimizzazione della batteria</string>
+  <string name="startup_battery_optimization_disable">Disabilita per DAVdroid</string>
+  <string name="startup_dont_show_again">Non mostrare più</string>
+  <string name="startup_development_version">Versione di sviluppo di DAVdroid</string>
+  <string name="startup_development_version_message">Questa è una versione di sviluppo di DAVdroid. Attenzione perché potrebbe avere malfunzionamenti. Inviateci consigli utili per migliorarlo.</string>
+  <string name="startup_development_version_give_feedback">Invia un rapporto</string>
+  <string name="startup_donate">Informazioni sull\'Open-Source</string>
+  <string name="startup_donate_message">Siamo soddisfatti del tuo uso di DAVdroid, programma Open-Source (GPLv3). Poiché lo sviluppo è un\'iniziativa complessa che comporta molte ore di lavoro ti invitiamo a fare una donazione.</string>
+  <string name="startup_donate_now">Mostra pagina donazioni</string>
+  <string name="startup_donate_later">Più tardi</string>
+  <string name="startup_google_play_accounts_removed">Informazioni sul bug del DRM di Play Store</string>
+  <string name="startup_google_play_accounts_removed_message">In alcune condizioni il DRM di Play Store può causare la perdita di tutti gli account DAVdroid dopo un riavvio o dopo un aggiornamento di DAVdroid. Se verificate questo problema installate successivamente \"DAVdroid JB Workaround\" da Play Store.</string>
+  <string name="startup_google_play_accounts_removed_more_info">Maggiori informazioni</string>
+  <string name="startup_opentasks_not_installed">OpenTasks non installata</string>
+  <string name="startup_opentasks_not_installed_message">L\'applicazione OpenTasks non è installata: di conseguenza DAVdroid non potrà sincronizzare l\'elenco delle attività.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Dopo l\'installazione di OpenTasks è necessario INSTALLARE NUOVAMENTE DAVdroid e aggiungere ancora gli account (per un bug di Android).</string>
+  <string name="startup_opentasks_not_installed_install">Installa OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Termini di licenza</string>
+  <string name="about_license_info_no_warranty">Il programma è distribuito SENZA ALCUNA GARANZIA. È software libero e può essere redistribuito sotto alcune condizioni.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">Invio del log di DAVdroid su file</string>
+  <string name="logging_to_external_storage">Log su dispositivo esterno: %s</string>
+  <string name="logging_to_external_storage_warning">Cancellare prima possibile i file di log!</string>
+  <string name="logging_couldnt_create_file">Non riesco a creare il file di log esterno: %s</string>
+  <string name="logging_no_external_storage">Dispositivo esterno non disponibile</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV adattatore di sincronizzazione</string>
+  <string name="navigation_drawer_about">Informazioni / Licenza</string>
+  <string name="navigation_drawer_settings">Impostazioni</string>
+  <string name="navigation_drawer_news_updates">Notizie &amp; aggiornamenti</string>
+  <string name="navigation_drawer_external_links">Link esterni</string>
+  <string name="navigation_drawer_website">Sito web</string>
+  <string name="navigation_drawer_faq">Domande Frequenti</string>
+  <string name="navigation_drawer_forums">Comunità</string>
+  <string name="navigation_drawer_donate">Donazione</string>
+  <string name="account_list_empty">Benvenuto a DAVdroid!\n\nÈ ora possibile aggiungere account CalDAV/CardDAV.</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Fallita l\'individuazione dei servizi</string>
+  <string name="dav_service_refresh_couldnt_refresh">Impossibile rinnovare la lista delle collezioni</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Impostazioni</string>
+  <string name="app_settings_user_interface">Interfaccia utente</string>
+  <string name="app_settings_reset_hints">Reimposta i suggerimenti</string>
+  <string name="app_settings_reset_hints_summary">Riabilita i suggerimenti precedentemente disabilitati</string>
+  <string name="app_settings_reset_hints_success">I suggerimenti verranno mostrati</string>
+  <string name="app_settings_connection">Connessione</string>
+  <string name="app_settings_override_proxy">Non rispettare la impostazioni del proxy</string>
+  <string name="app_settings_override_proxy_on">Impostazioni personalizzate del proxy</string>
+  <string name="app_settings_override_proxy_off">Usa le impostazioni di sistema del proxy</string>
+  <string name="app_settings_override_proxy_host">Nome host del proxy HTTP</string>
+  <string name="app_settings_override_proxy_port">Porta del proxy HTTP</string>
+  <string name="app_settings_security">Sicurezza</string>
+  <string name="app_settings_distrust_system_certs">Non ti fidare dei certificati di sistema</string>
+  <string name="app_settings_distrust_system_certs_on">Le CA di sistema e quelle aggiunte dall\'utente non sono affidabili</string>
+  <string name="app_settings_distrust_system_certs_off">Le CA di sistema e quelle aggiunte dall\'utente sono affidabili (raccomandato)</string>
+  <string name="app_settings_reset_certificates">Reimposta la fiducia in tutti i certificati</string>
+  <string name="app_settings_reset_certificates_summary">Reimposta la fiducia nei certificati aggiunti</string>
+  <string name="app_settings_reset_certificates_success">Sono stati cancellati tutti i certificati aggiunti</string>
+  <string name="app_settings_debug">Debug</string>
+  <string name="app_settings_log_to_external_storage">Log su file esterno</string>
+  <string name="app_settings_log_to_external_storage_on">Log su dispositivo esterno (se disponibile)</string>
+  <string name="app_settings_log_to_external_storage_off">Log su file esterno disabilitato</string>
+  <string name="app_settings_show_debug_info">Mostra informazioni di debug</string>
+  <string name="app_settings_show_debug_info_details">Mostra e condividi i dettagli del programma e della configurazione</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Sincronizza adesso</string>
+  <string name="account_synchronizing_now">Sincronizzazione in corso</string>
+  <string name="account_settings">Impostazioni account</string>
+  <string name="account_delete">Elimina account</string>
+  <string name="account_delete_confirmation_title">Cancellare l\'account?</string>
+  <string name="account_delete_confirmation_text">Tutte le copie locali delle rubriche, dei calendari e degli elenchi attività verranno eliminate.</string>
+  <string name="account_refresh_address_book_list">Aggiorna elenco degli indirizzari</string>
+  <string name="account_create_new_address_book">Crea un nuovo indirizzario</string>
+  <string name="account_refresh_calendar_list">Aggiorna lista calendari</string>
+  <string name="account_create_new_calendar">Crea nuovo calendario</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">Permessi DAVdroid</string>
+  <string name="permissions_calendar">Permessi calendario</string>
+  <string name="permissions_calendar_details">Per sincronizzare gli eventi CalDAV con i calendari locali DAVdroid deve avere l\'accesso ai tuoi calendari.</string>
+  <string name="permissions_calendar_request">Richiesta autorizzazione al calendario</string>
+  <string name="permissions_contacts">Permessi Contatti</string>
+  <string name="permissions_contacts_details">Per sincronizzare l\'indirizzario CardDAV con i contatti locali DAVdroid deve avere l\'accesso ai tuoi contatti.</string>
+  <string name="permissions_contacts_request">Richiesta autorizzazione ai contatti</string>
+  <string name="permissions_opentasks">Permessi OpenTasks</string>
+  <string name="permissions_opentasks_details">Per sincronizzazione l\'elenco attività di CalDAV con l\'elenco locale DAVdroid deve avere l\'accesso  ad OpenTasks.</string>
+  <string name="permissions_opentasks_request">Richiesta autorizzazione ad OpenTasks</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Aggiungi account</string>
+  <string name="login_type_email">Accedi con indirizzo email</string>
+  <string name="login_email_address">Indirizzo email</string>
+  <string name="login_email_address_error">È necessario un indirizzo email valido</string>
+  <string name="login_password">Password</string>
+  <string name="login_password_required">Password richiesta</string>
+  <string name="login_type_url">Accedi con URL e nome utente</string>
+  <string name="login_url_must_be_http_or_https">L\'URL deve iniziare con http(s)://</string>
+  <string name="login_url_host_name_required">Nome host richiesto</string>
+  <string name="login_user_name">Nome utente</string>
+  <string name="login_user_name_required">Nome utente richiesto</string>
+  <string name="login_base_url">Base URL</string>
+  <string name="login_login">Login</string>
+  <string name="login_back">Indietro</string>
+  <string name="login_create_account">Crea account</string>
+  <string name="login_account_name">Nome account</string>
+  <string name="login_account_name_info">Inserisci il tuo indirizzo email come nome dell\'account in quanto Android userà il nome dell\'account nel campo ORGANIZER degli eventi creati. Non è possibile avere due account con nome uguale.</string>
+  <string name="login_account_contact_group_method">Metodo del contact group:</string>
+  <string name="login_account_name_required">Richiesto il nome dell\'account</string>
+  <string name="login_account_not_created">L\'account non può essere creato</string>
+  <string name="login_configuration_detection">Rilevazione configurazione</string>
+  <string name="login_querying_server">Attendere, invio richiesta al server...</string>
+  <string name="login_no_caldav_carddav">Impossibile trovare servizi CalDAV o CardDAV.</string>
+  <string name="login_view_logs">Vedi i log</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Impostazioni: %s</string>
+  <string name="settings_authentication">Autenticazione</string>
+  <string name="settings_username">Nome utente</string>
+  <string name="settings_enter_username">Inserisci nome utente:</string>
+  <string name="settings_password">Password</string>
+  <string name="settings_password_summary">Aggiorna la password come sul tuo server.</string>
+  <string name="settings_enter_password">Inserisci la tua password:</string>
+  <string name="settings_sync">Sincronizzazione</string>
+  <string name="settings_sync_interval_contacts">Intervallo sincr. Contatti</string>
+  <string name="settings_sync_summary_manually">Solo manualmente</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Ogni %d minuti e a seguito di ogni cambiamento locale</string>
+  <string name="settings_sync_summary_not_available">Non disponile</string>
+  <string name="settings_sync_interval_calendars">Intervallo sincr. calendari</string>
+  <string name="settings_sync_interval_tasks">Intervallo sincr. attività</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Solo manualmente</item>
+    <item>Ogni 5 minuti</item>
+    <item>Ogni 10 minuti</item>
+    <item>Ogni 15 minuti</item>
+    <item>Ogni ora</item>
+    <item>Ogni 2 ore</item>
+    <item>Ogni 4 ore</item>
+    <item>Una volta al giorno</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Sincr. solo tramite WiFi</string>
+  <string name="settings_sync_wifi_only_on">La sincronizzazione è limitata alle connessioni WiFi</string>
+  <string name="settings_sync_wifi_only_ssid">Restrizione sul SSID del WiFi</string>
+  <string name="settings_sync_wifi_only_ssid_on">La sincronizzazione avverrà solo con %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Verranno usate tutte le connessioni WiFi</string>
+  <string name="settings_sync_wifi_only_ssid_message">Inserisci il nome di una rete WiFi (SSID) per limitare la sincronizzazione solo con questa rete o lasciare in bianco per usare tutte le connessioni WiFi.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>I gruppi sono VCards separate</item>
+    <item>I gruppi sono categorie per ogni contatto</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Limite di tempo per gli eventi trascorsi</string>
+  <string name="settings_sync_time_range_past_none">Verranno sincronizzati tutti gli eventi</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Eventi più vecchi di un giorno saranno ignorati</item>
+    <item quantity="other">Eventi più vecchi di %d giorni saranno ignorati</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Eventi più vecchi di questo numero di giorni verranno ignorati(può anche essere 0). Lasciare in bianco per sincronizzare tutti gli eventi.</string>
+  <string name="settings_manage_calendar_colors">Cambia il colore del calendario</string>
+  <string name="settings_manage_calendar_colors_on">I colori dei calendari sono gestiti da DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">I colori dei calendari non sono gestiti da DAVdroid</string>
+  <!--collection management-->
+  <string name="create_addressbook">Crea indirizzario</string>
+  <string name="create_addressbook_display_name_hint">Il mio indirizzario</string>
+  <string name="create_calendar_display_name_hint">Mio calendario</string>
+  <string name="create_calendar_time_zone">Fuso orario:</string>
+  <string name="create_calendar_type_only_events">Calendario (solo eventi)</string>
+  <string name="create_calendar_type_only_tasks">Elenco attività (solo attività)</string>
+  <string name="create_calendar_type_events_and_tasks">Combinato (eventi e attività)</string>
+  <string name="create_collection_display_name_required">Il titolo è richiesto</string>
+  <string name="create_collection_description">Descrizione (opzionale):</string>
+  <string name="create_collection_create">Crea</string>
+  <string name="delete_collection_confirm_title">Sei sicuro?</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Si è verificato un errore.</string>
+  <string name="exception_httpexception">Si è verificato un errore HTTP.</string>
+  <string name="exception_ioexception">Si è verificato un errore di I/O.</string>
+  <string name="exception_show_details">Mostra dettagli</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Informazioni di debug</string>
+  <string name="sync_error_permissions">Autorizzazioni DAVdroid</string>
+  <string name="sync_error_permissions_text">Autorizzazioni addizionali richieste</string>
+  <string name="sync_error_calendar">Sincronizzazione del calendario fallita (%s)</string>
+  <string name="sync_error_contacts">Sincronizzazione dell\'indirizzario fallita (%s)</string>
+  <string name="sync_error_tasks">Sincronizzazione delle attività fallita (%s)</string>
+  <string name="sync_error">Errore nel %s</string>
+  <string name="sync_error_http_dav">Errore del server nel %s</string>
+  <string name="sync_error_local_storage">Errore del database nel %s</string>
+  <string-array name="sync_error_phases">
+    <item>inizio sincronizzazione</item>
+    <item>controllo caratteristiche del server</item>
+    <item>elaborazione voci cancellate in locale</item>
+    <item>elaborazione voci create o modificate</item>
+    <item>invio voci create o modificate</item>
+    <item>controllo stato della sincronizzazione</item>
+    <item>elenco voci locali</item>
+    <item>elenco voci remote</item>
+    <item>confronto voci locali e remote</item>
+    <item>download voci remote</item>
+    <item>post-processing</item>
+    <item>salvataggio stato della sincronizzazione</item>
+  </string-array>
+  <string name="sync_error_unauthorized">Nome utente o password errati</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: sicurezza della connessione</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroid ha trovato un certificato sconosciuto. Ritenerlo affidabile?</string>
+</resources>

app/src/davdroid/res/values-ja/strings.xml

@@ -0,0 +1,237 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="account_title_address_book">DAVdroid アドレス帳</string>
+  <string name="address_books_authority_title">アドレス帳</string>
+  <string name="help">ヘルプ</string>
+  <string name="manage_accounts">アカウントの管理</string>
+  <string name="please_wait">しばらくお待ちください …</string>
+  <string name="send">送信</string>
+  <string name="homepage_url">https://davdroid.bitfire.at/?pk_campaign=davdroid-app</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">バッテリー最適化</string>
+  <string name="startup_battery_optimization_message">Android は数日後に DAVdroid の同期を無効にする/減らすことがあります。これを防止するには、バッテリー最適化をオフにしてください。</string>
+  <string name="startup_battery_optimization_disable">DAVdroid 用にオフにする</string>
+  <string name="startup_dont_show_again">次回から表示しない</string>
+  <string name="startup_development_version">DAVdroid プレビュー リリース</string>
+  <string name="startup_development_version_message">これは DAVdroid の開発版です。期待した通りに動作しない可能性があることにご注意ください。私たちが DAVdroid を改善するために、建設的なフィードバックをお願いします。</string>
+  <string name="startup_development_version_give_feedback">フィードバックする</string>
+  <string name="startup_donate">オープンソース情報</string>
+  <string name="startup_donate_message">あなたがオープンソース ソフトウェア (GPLv3) の DAVdroid を使用していただくことに、私たちは満足しています。 DAVdroid の開発はハードワークで、何千もの作業時間がかかりました。寄付をご検討ください。</string>
+  <string name="startup_donate_now">寄付ページを表示</string>
+  <string name="startup_donate_later">たぶん後で</string>
+  <string name="startup_google_play_accounts_removed">Play ストア DRM バグ情報</string>
+  <string name="startup_google_play_accounts_removed_message">特定の条件下で、DAVdroid を再起動後またはアップグレードした後、Play ストア DRM によりすべての DAVdroid アカウントがなくなる可能性があります。この問題の影響を受けている場合 (のみ)、Play ストアから「DAVdroid JB 回避策」をインストールしてください。</string>
+  <string name="startup_google_play_accounts_removed_more_info">追加情報</string>
+  <string name="startup_opentasks_not_installed">OpenTasks がインストールされていません</string>
+  <string name="startup_opentasks_not_installed_message">OpenTasks アプリが利用できないため、DAVdroid はタスクリストを同期することができません。</string>
+  <string name="startup_opentasks_reinstall_davdroid">OpenTasks をインストールした後で、DAVdroidを再インストールして、再度アカウントを追加してください (Android のバグ)。</string>
+  <string name="startup_opentasks_not_installed_install">OpenTasks をインストール</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">ライセンス規約</string>
+  <string name="about_license_info_no_warranty">このプログラムは完全に無保証で提供されます。これはフリーソフトウェアで、特定の条件下での再頒布を歓迎します。</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVdroid ファイルログ</string>
+  <string name="logging_to_external_storage">外部ストレージにログ: %s</string>
+  <string name="logging_to_external_storage_warning">できる限り早くログを削除してください!</string>
+  <string name="logging_couldnt_create_file">外部ログファイルを作成できませんでした: %s</string>
+  <string name="logging_no_external_storage">外部ストレージが見つかりません</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">ナビゲーションドロワーを開く</string>
+  <string name="navigation_drawer_close">ナビゲーションドロワーを閉じる</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV 同期アダプター</string>
+  <string name="navigation_drawer_about">アプリについて / ライセンス</string>
+  <string name="navigation_drawer_settings">設定</string>
+  <string name="navigation_drawer_news_updates">ニュース &amp; 更新</string>
+  <string name="navigation_drawer_external_links">外部リンク</string>
+  <string name="navigation_drawer_website">Web サイト</string>
+  <string name="navigation_drawer_faq">FAQ</string>
+  <string name="navigation_drawer_faq_url">https://davdroid.bitfire.at/faq/?pk_campaign=davdroid-app</string>
+  <string name="navigation_drawer_forums">コミュニティ</string>
+  <string name="navigation_drawer_donate">寄付</string>
+  <string name="account_list_empty">DAVdroid にようこそ!\n\nCalDAV/CardDAV アカウントを追加できるようになりました。</string>
+  <string name="accounts_global_sync_disabled">システム全体の自動同期が無効です</string>
+  <string name="accounts_global_sync_enable">有効</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">サービスの検出に失敗しました</string>
+  <string name="dav_service_refresh_couldnt_refresh">コレクション リストを更新できません</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">設定</string>
+  <string name="app_settings_user_interface">ユーザーインターフェイス</string>
+  <string name="app_settings_reset_hints">ヒントをリセット</string>
+  <string name="app_settings_reset_hints_summary">以前非表示にしたヒントを、再度有効にします</string>
+  <string name="app_settings_reset_hints_success">すべてのヒントが再度表示されます</string>
+  <string name="app_settings_connection">接続</string>
+  <string name="app_settings_override_proxy">プロキシ設定を上書き</string>
+  <string name="app_settings_override_proxy_on">カスタムのプロキシ設定を使用する</string>
+  <string name="app_settings_override_proxy_off">システムデフォルトのプロキシ設定を使用する</string>
+  <string name="app_settings_override_proxy_host">HTTP プロキシのホスト名</string>
+  <string name="app_settings_override_proxy_port">HTTP プロキシのポート</string>
+  <string name="app_settings_security">セキュリティ</string>
+  <string name="app_settings_distrust_system_certs">システム証明書の信頼を解除</string>
+  <string name="app_settings_distrust_system_certs_on">システムとユーザーが追加したCAを信頼しない</string>
+  <string name="app_settings_distrust_system_certs_off">システムとユーザーが追加したCAを信頼する (推奨)</string>
+  <string name="app_settings_reset_certificates">(未)信頼済証明書をリセット</string>
+  <string name="app_settings_reset_certificates_summary">すべてのカスタム証明書の信頼をリセット</string>
+  <string name="app_settings_reset_certificates_success">すべてのカスタム証明書をクリアしました</string>
+  <string name="app_settings_debug">デバッグ</string>
+  <string name="app_settings_log_to_external_storage">外部ファイルにログ出力</string>
+  <string name="app_settings_log_to_external_storage_on">(可能な場合) 外部ストレージにログ出力します</string>
+  <string name="app_settings_log_to_external_storage_off">外部ファイルログ出力は無効です</string>
+  <string name="app_settings_show_debug_info">デバッグ情報を表示</string>
+  <string name="app_settings_show_debug_info_details">ソフトウェアと設定の詳細を表示/共有</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">今すぐ同期</string>
+  <string name="account_synchronizing_now">同期中</string>
+  <string name="account_settings">アカウント設定</string>
+  <string name="account_rename">アカウントの名前を変更</string>
+  <string name="account_rename_new_name">未保存のローカルデータが破棄されることがあります。 名前の変更後に再同期が必要です。 新しいアカウント名:</string>
+  <string name="account_rename_rename">名前を変更</string>
+  <string name="account_delete">アカウントを削除</string>
+  <string name="account_delete_confirmation_title">アカウントを削除してもよろしいですか?</string>
+  <string name="account_delete_confirmation_text">アドレス帳、カレンダー、タスクリストのローカルコピーがすべて削除されます。</string>
+  <string name="account_refresh_address_book_list">アドレス帳リストを更新</string>
+  <string name="account_create_new_address_book">新しいアドレス帳を作成</string>
+  <string name="account_refresh_calendar_list">カレンダーリストを更新</string>
+  <string name="account_create_new_calendar">新しいカレンダーを作成</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid アクセス許可</string>
+  <string name="permissions_calendar">カレンダー アクセス許可</string>
+  <string name="permissions_calendar_details">ローカルのカレンダーと CalDAV イベントを同期するため、DAVdroid がカレンダーにアクセスする必要があります。</string>
+  <string name="permissions_calendar_request">カレンダー アクセス許可の要求</string>
+  <string name="permissions_contacts">連絡先アクセス許可</string>
+  <string name="permissions_contacts_details">ローカルの連絡先と CalDAV アドレス帳を同期するため、DAVdroid が連絡先にアクセスする必要があります。</string>
+  <string name="permissions_contacts_request">連絡先アクセス許可の要求</string>
+  <string name="permissions_opentasks">OpenTasks アクセス許可</string>
+  <string name="permissions_opentasks_details">ローカルのタスクリストと CalDAV タスクを同期するため、DAVdroid が OpenTasks にアクセスする必要があります。</string>
+  <string name="permissions_opentasks_request">OpenTasks アクセス許可の要求</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://davdroid.bitfire.at/configuration/?pk_campaign=davdroid-app</string>
+  <string name="login_title">アカウントを追加</string>
+  <string name="login_type_email">メールアドレスでログイン</string>
+  <string name="login_email_address">メールアドレス</string>
+  <string name="login_email_address_error">有効なメールアドレスが必要です</string>
+  <string name="login_password">パスワード</string>
+  <string name="login_password_required">パスワードが必要です</string>
+  <string name="login_type_url">URL とユーザー名でログイン</string>
+  <string name="login_url_must_be_http_or_https">URL は http(s):// で始まる必要があります</string>
+  <string name="login_url_host_name_required">ホスト名が必要です</string>
+  <string name="login_user_name">ユーザー名</string>
+  <string name="login_user_name_required">ユーザー名が必要です</string>
+  <string name="login_base_url">ベース URL</string>
+  <string name="login_login">ログイン</string>
+  <string name="login_back">戻る</string>
+  <string name="login_create_account">アカウントを作成</string>
+  <string name="login_account_name">アカウント名</string>
+  <string name="login_account_name_info">Android はあなたが作成した予定の ORGANIZER フィールドとしてアカウント名を使用するので、アカウント名としてメールアドレスを使用してください。同じ名前のアカウントを 2 つ持つことはできません。</string>
+  <string name="login_account_contact_group_method">連絡先グループ方法:</string>
+  <string name="login_account_name_required">アカウント名が必要です</string>
+  <string name="login_account_not_created">アカウントを作成できません</string>
+  <string name="login_configuration_detection">設定の検出</string>
+  <string name="login_querying_server">しばらくお待ちください。サーバーに問い合わせ中…</string>
+  <string name="login_no_caldav_carddav">CalDAV または CardDAV サービスが見つかりません。</string>
+  <string name="login_view_logs">ログを表示</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">設定: %s</string>
+  <string name="settings_authentication">認証</string>
+  <string name="settings_username">ユーザー名</string>
+  <string name="settings_enter_username">ユーザー名を入力:</string>
+  <string name="settings_password">パスワード</string>
+  <string name="settings_password_summary">ご利用のサーバーに従ってパスワードを更新します。</string>
+  <string name="settings_enter_password">パスワードを入力:</string>
+  <string name="settings_sync">同期</string>
+  <string name="settings_sync_interval_contacts">連絡先同期間隔</string>
+  <string name="settings_sync_summary_manually">手動のみ</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%d 分ごと + ローカルの変更時はすぐに</string>
+  <string name="settings_sync_summary_not_available">利用不可</string>
+  <string name="settings_sync_interval_calendars">カレンダー同期間隔</string>
+  <string name="settings_sync_interval_tasks">タスク同期間隔</string>
+  <string-array name="settings_sync_interval_names">
+    <item>手動のみ</item>
+    <item>5 分ごと</item>
+    <item>10 分ごと</item>
+    <item>15 分ごと</item>
+    <item>1 時間ごと</item>
+    <item>2 時間ごと</item>
+    <item>4 時間ごと</item>
+    <item>1 日 1 回</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">WiFi でのみ同期</string>
+  <string name="settings_sync_wifi_only_on">同期は WiFi 接続に制限されます</string>
+  <string name="settings_sync_wifi_only_off">接続の種類は考慮されません</string>
+  <string name="settings_sync_wifi_only_ssid">WiFi SSID 制限</string>
+  <string name="settings_sync_wifi_only_ssid_on">%s でのみ同期します</string>
+  <string name="settings_sync_wifi_only_ssid_off">すべての WiFi 接続を使用することができます</string>
+  <string name="settings_sync_wifi_only_ssid_message">このネットワークで同期を制限する WiFi ネットワーク (SSID) の名前を入力してください。すべての WiFi 接続は空白のままにします。</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">連絡先グループ方法</string>
+  <string-array name="settings_contact_group_method_entries">
+    <item>グループは個別の VCards</item>
+    <item>グループは連絡先カテゴリーごと</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">過去イベントの時間限度</string>
+  <string name="settings_sync_time_range_past_none">すべてのイベントが同期されます</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="other">%d 日より前のイベントは無視されます</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">この日数より過去のイベントは無視されます (0 も可)。すべてのイベントを同期させるには、空白のままにしてください。</string>
+  <string name="settings_manage_calendar_colors">カレンダーの色を管理</string>
+  <string name="settings_manage_calendar_colors_on">カレンダーの色は DAVdroid が管理します</string>
+  <string name="settings_manage_calendar_colors_off">カレンダーの色を DAVdroid が設定しません</string>
+  <!--collection management-->
+  <string name="create_addressbook">アドレス帳を作成</string>
+  <string name="create_addressbook_display_name_hint">マイ アドレス帳</string>
+  <string name="create_calendar">CalDAV コレクションを作成</string>
+  <string name="create_calendar_display_name_hint">マイ カレンダー</string>
+  <string name="create_calendar_time_zone">タイムゾーン:</string>
+  <string name="create_calendar_type">コレクションの種類:</string>
+  <string name="create_calendar_type_only_events">カレンダー (イベントのみ)</string>
+  <string name="create_calendar_type_only_tasks">タスクリスト (タスクのみ)</string>
+  <string name="create_calendar_type_events_and_tasks">組み合わせ (イベントとタスク)</string>
+  <string name="create_collection_color">コレクションの色を設定</string>
+  <string name="create_collection_creating">コレクションの作成中</string>
+  <string name="create_collection_display_name">このコレクションの表示名 (タイトル):</string>
+  <string name="create_collection_display_name_required">タイトルが必要です</string>
+  <string name="create_collection_description">説明 (オプション):</string>
+  <string name="create_collection_home_set">ホーム セット:</string>
+  <string name="create_collection_create">作成</string>
+  <string name="delete_collection">コレクションを削除</string>
+  <string name="delete_collection_confirm_title">よろしいですか?</string>
+  <string name="delete_collection_confirm_warning">このコレクション (%s) とそのすべてのデータがサーバーから削除されます。</string>
+  <string name="delete_collection_deleting_collection">コレクションの削除中</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">エラーが発生しました。</string>
+  <string name="exception_httpexception">HTTP エラーが発生しました。</string>
+  <string name="exception_ioexception">I/O エラーが発生しました。</string>
+  <string name="exception_show_details">詳細を表示</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">デバッグ情報</string>
+  <string name="sync_error_permissions">DAVdroid アクセス許可</string>
+  <string name="sync_error_permissions_text">追加のアクセス許可が必要です</string>
+  <string name="sync_error_calendar">カレンダーの同期に失敗しました (%s)</string>
+  <string name="sync_error_contacts">アドレス帳の同期に失敗しました (%s)</string>
+  <string name="sync_error_tasks">タスクの同期に失敗しました (%s)</string>
+  <string name="sync_error">%s 時にエラー</string>
+  <string name="sync_error_http_dav">%s 時にサーバーエラー</string>
+  <string name="sync_error_local_storage">%s 時にデータベースエラー</string>
+  <string-array name="sync_error_phases">
+    <item>同期の準備中</item>
+    <item>機能の問い合わせ中</item>
+    <item>ローカルで削除されたエントリーの処理中</item>
+    <item>作成済/更新済エントリーの準備中</item>
+    <item>作成済/更新済エントリーのアップロード中</item>
+    <item>同期の状態を確認中</item>
+    <item>ローカルのエントリーをリスト中</item>
+    <item>リモートのエントリーをリスト中</item>
+    <item>ローカル/リモートのエントリーを比較中</item>
+    <item>リモートのエントリーをダウンロード中</item>
+    <item>後処理中</item>
+    <item>同期の状態を保存中</item>
+  </string-array>
+  <string name="sync_error_unauthorized">ユーザー名/パスワードが間違っています</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: 接続セキュリティ</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroidは、未知の証明書を検出しました。それを信頼しますか?</string>
+</resources>

app/src/davdroid/res/values-nl/strings.xml

@@ -0,0 +1,252 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="account_title_address_book">DAVdroid Adresboek</string>
+  <string name="address_books_authority_title">Adresboeken</string>
+  <string name="help">Help</string>
+  <string name="manage_accounts">Beheer accounts</string>
+  <string name="please_wait">Een moment geduld...</string>
+  <string name="send">Verzenden</string>
+  <string name="homepage_url">https://davdroid.bitfire.at/?pk_campaign=davdroid-app</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Batterij optimalisatie</string>
+  <string name="startup_battery_optimization_message">Android kan mogelijk de DAVdroid synchronisatie stoppen na een paar dagen. Om dit te voorkomen zet u de batterij optimalisatie uit.</string>
+  <string name="startup_battery_optimization_disable">DAVdroid afsluiten</string>
+  <string name="startup_dont_show_again">Niet opnieuw weergeven</string>
+  <string name="startup_development_version">DAVdroid voorlopige versie</string>
+  <string name="startup_development_version_message">Dit is een ontwikkelversie van DAVdroid. Het kan zijn dat dingen niet werken zoals verwacht. Geef ons constructieve feedback om DAVdroid te verbeteren.</string>
+  <string name="startup_development_version_give_feedback">Feedback geven</string>
+  <string name="startup_donate">Open-Source informatie</string>
+  <string name="startup_donate_message">We zijn blij dat je DAVdroid gebruikt, wat open-source software (GPLv3) is. Omdat de ontwikkeling van DAVdroid hard werk is en duizenden uren in beslag neemt. overweeg alstublieft een donatie.</string>
+  <string name="startup_donate_now">Toon donatie pagina</string>
+  <string name="startup_donate_later">Misschien later</string>
+  <string name="startup_google_play_accounts_removed">Play Store DRM fout-informatie</string>
+  <string name="startup_google_play_accounts_removed_message">Onder bepaalde omstandigheden, kan Play Store DRM ervoor zorgen dat accounts kwijt zijn na een herstart of na een DAVdroid update. Als dit probleem zich bij je voordoet (en alleen dan), Installeer dan \"DAVdroid JB Workaround\" vanuit de Play Store</string>
+  <string name="startup_google_play_accounts_removed_more_info">Meer informatie</string>
+  <string name="startup_opentasks_not_installed">OpenTasks niet geinstalleerd</string>
+  <string name="startup_opentasks_not_installed_message">De OpenTasks app is niet beschikbaar, Hierdoor is het voor DAVdroid niet mogelijk om uw taken te synchroniseren.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Na installatie van OpenTasks dient u DAVdroid opnieuw te installeren en de accounts toe te voegen (Android bug).</string>
+  <string name="startup_opentasks_not_installed_install">OpenTasks installeren</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Licentie voorwaarden</string>
+  <string name="about_license_info_no_warranty">Dit programma kom met ABSOLUUT GEEN GARANTIE. Het is gratis software, en je bent welkom dit te herdistribueren onder bepaalde voorwaarden.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVDroid bestand loggen</string>
+  <string name="logging_to_external_storage">Loggen naar externe opslag: %s</string>
+  <string name="logging_to_external_storage_warning">Verwijder logs zo snel mogelijk</string>
+  <string name="logging_couldnt_create_file">Kon extern log bestand niet verwijderen: %s</string>
+  <string name="logging_no_external_storage">Externe opslag niet gevonden</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Open navigatie drawer</string>
+  <string name="navigation_drawer_close">Sluit navigatie drawer</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDav Sync adapter</string>
+  <string name="navigation_drawer_about">Over / Licentie</string>
+  <string name="navigation_drawer_settings">Instellingen</string>
+  <string name="navigation_drawer_news_updates">Nieuws &amp; updates</string>
+  <string name="navigation_drawer_external_links">Externe links</string>
+  <string name="navigation_drawer_website">Website</string>
+  <string name="navigation_drawer_faq">FAQ</string>
+  <string name="navigation_drawer_faq_url">https://davdroid.bitfire.at/faq/?pk_campaign=davdroid-app</string>
+  <string name="navigation_drawer_forums">Community</string>
+  <string name="navigation_drawer_donate">Doneren</string>
+  <string name="account_list_empty">Welkom bij DAVdroid!\n\nJe kunt nu een CalDAV/CardDAv account toevoegen.</string>
+  <string name="accounts_global_sync_disabled">Systeembrede automatische synchronisatie is uitgeschakeld</string>
+  <string name="accounts_global_sync_enable">Inschakelen</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Service herkenning is mislukt</string>
+  <string name="dav_service_refresh_couldnt_refresh">Kon de collectie lijst niet vernieuwen</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Instellingen</string>
+  <string name="app_settings_user_interface">Gebruikers interface</string>
+  <string name="app_settings_reset_hints">Hints resetten </string>
+  <string name="app_settings_reset_hints_summary">Hints die al gezien zijn opnieuw weergeven</string>
+  <string name="app_settings_reset_hints_success">Alle hints worden opnieuw weergegeven</string>
+  <string name="app_settings_connection">Verbinding</string>
+  <string name="app_settings_override_proxy">Proxy instellingen overschrijven</string>
+  <string name="app_settings_override_proxy_on">Eigen proxy instellingen gebruiken</string>
+  <string name="app_settings_override_proxy_off">Systeem proxy instellingen gebruiken</string>
+  <string name="app_settings_override_proxy_host">HTTP proxy beheerder naam</string>
+  <string name="app_settings_override_proxy_port">HTTP proxy poort</string>
+  <string name="app_settings_security">Beveiliging</string>
+  <string name="app_settings_distrust_system_certs">Systeem certificaten niet vertrouwen</string>
+  <string name="app_settings_distrust_system_certs_on">Systeem en CAs van toegevoegde gebruiker wordt niet vertrouwd</string>
+  <string name="app_settings_distrust_system_certs_off">Systeem en CAs van toegevoegde gebruiker wordt vertrouwd (aanbevolen)</string>
+  <string name="app_settings_reset_certificates">Resetten (niet) vertrouwde certificaten</string>
+  <string name="app_settings_reset_certificates_summary">Resetten alle bewerkte certificaten</string>
+  <string name="app_settings_reset_certificates_success">Alle bewerkte certificaten zijn vrijgemaakt</string>
+  <string name="app_settings_debug">Debuggen</string>
+  <string name="app_settings_log_to_external_storage">Log naar extern bestand</string>
+  <string name="app_settings_log_to_external_storage_on">Loggen naar externe opslag (wanneer beschikbaar)</string>
+  <string name="app_settings_log_to_external_storage_off">Extern bestands loggen uitgeschakeld</string>
+  <string name="app_settings_show_debug_info">Debug info tonen</string>
+  <string name="app_settings_show_debug_info_details">Bekijk/deel software configuratie details</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Synchroniseer nu</string>
+  <string name="account_synchronizing_now">Aan het synchronizeren...</string>
+  <string name="account_settings">Account instellingen</string>
+  <string name="account_rename">Account hernoemen</string>
+  <string name="account_rename_new_name">Niet opgeslagen lokale informatie mag verloren gaan. Synchronisatie is noodzakelijk na hernoemen. Nieuw account naam:</string>
+  <string name="account_rename_rename">Hernoemen</string>
+  <string name="account_delete">Account verwijderen</string>
+  <string name="account_delete_confirmation_title">Account echt verwijderen?</string>
+  <string name="account_delete_confirmation_text">Alle lokale kopieën van adresboeken, agenda\'s en taken worden verwijderd.</string>
+  <string name="account_refresh_address_book_list">Adresboeken vernieuwen</string>
+  <string name="account_create_new_address_book">Maak een nieuw adresboek</string>
+  <string name="account_refresh_calendar_list">Agenda\'s vernieuwen</string>
+  <string name="account_create_new_calendar">Maak een nieuwe agenda</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid rechten</string>
+  <string name="permissions_calendar">Agenda rechten</string>
+  <string name="permissions_calendar_details">Om CalDAV afspraken te synchroniseren met u agenda dient DAVdroid toegang te verkrijgen. </string>
+  <string name="permissions_calendar_request">Agenda rechten verkrijgen</string>
+  <string name="permissions_contacts">Contact rechten</string>
+  <string name="permissions_contacts_details">Om CalDAV afspraken te synchroniseren met u contacten dient DAVdroid toegang te verkrijgen. </string>
+  <string name="permissions_contacts_request">Contacten rechten verkrijgen</string>
+  <string name="permissions_opentasks">OpenTasks rechten</string>
+  <string name="permissions_opentasks_details">Om CalDAV taken te synchroniseren met uw local takenlijst dient DAVdroid toegang te hebben tot OpenTasks</string>
+  <string name="permissions_opentasks_request">OpenTasks rechten verkrijgen</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://davdroid.bitfire.at/configuration/?pk_campaign=davdroid-app</string>
+  <string name="login_title">Account toevoegen</string>
+  <string name="login_type_email">Inloggen met e-mailadres</string>
+  <string name="login_email_address">Email adres</string>
+  <string name="login_email_address_error">Geldig email adres vereist</string>
+  <string name="login_password">Wachtwoord</string>
+  <string name="login_password_required">Wachtwoord vereist</string>
+  <string name="login_type_url">Inloggen met URL en gebruikersnaam</string>
+  <string name="login_url_must_be_http_or_https">URL moet met http(s):// beginnen</string>
+  <string name="login_url_host_name_required">Hostnaam vereist</string>
+  <string name="login_user_name">Gebruikersnaam</string>
+  <string name="login_user_name_required">Gebruikersnaam vereist</string>
+  <string name="login_base_url">Basis URL</string>
+  <string name="login_login">Login</string>
+  <string name="login_back">Terug</string>
+  <string name="login_create_account">Maak een account</string>
+  <string name="login_account_name">Accountnaam</string>
+  <string name="login_account_name_info">Gebruik je email adres als account naam want Android zal je account naam gebruiken als ORGANIZER veld voor gemaakte afspraken. Je kunt geen 2 accounts met dezelfde naam hebben,</string>
+  <string name="login_account_contact_group_method">Contact groep methode:</string>
+  <string name="login_account_name_required">Accountnaam vereist</string>
+  <string name="login_account_not_created">Account kon niet gemaakt worden.</string>
+  <string name="login_configuration_detection">Configuratie detectie</string>
+  <string name="login_querying_server">Even geduld, verzoek naar server...</string>
+  <string name="login_no_caldav_carddav">Kon geen CalDAV of CardDAV service vinden.</string>
+  <string name="login_view_logs">Bekijk logs</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Instellingen: %s</string>
+  <string name="settings_authentication">Authenticatie</string>
+  <string name="settings_username">Gebruikersnaam</string>
+  <string name="settings_enter_username">Gebruikersnaam invoeren:</string>
+  <string name="settings_password">Wachtwoord</string>
+  <string name="settings_password_summary">Gebruik het zelfde wachtwoord als op de server.</string>
+  <string name="settings_enter_password">Wachtwoord invoeren:</string>
+  <string name="settings_sync">Synchronisatie</string>
+  <string name="settings_sync_interval_contacts">Contacten verversen</string>
+  <string name="settings_sync_summary_manually">Alleen handmatig</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Elke %d minuten + meteen na wijziging</string>
+  <string name="settings_sync_summary_not_available">Niet beschikbaar</string>
+  <string name="settings_sync_interval_calendars">Agenda\'s verversen</string>
+  <string name="settings_sync_interval_tasks">Taak sync. tussentijd</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Alleen handmatig</item>
+    <item>Elke 5 minuten</item>
+    <item>Elke 10 minuten</item>
+    <item>Elke 15 minuten</item>
+    <item>Elk uur</item>
+    <item>Elke 2 uur</item>
+    <item>Elke 4 uur</item>
+    <item>Dagelijks</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Sync alleen tijdens WiFi</string>
+  <string name="settings_sync_wifi_only_on">Synchronisatie is voorbehouden tijdens WiFi verbindingen</string>
+  <string name="settings_sync_wifi_only_off">Verbinding type is niet overwogen</string>
+  <string name="settings_sync_wifi_only_ssid">WiFi SSID beperking</string>
+  <string name="settings_sync_wifi_only_ssid_on">Zal alleen synchroniseren over %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Alle WiFI verbindingen mogen worden gebruikt</string>
+  <string name="settings_sync_wifi_only_ssid_message">Type de naam van het WiFi netwerk (SSID) om synchronisatie tot dit netwerk te beperken. Leeg laten voor sync over alle netwerken.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Contact groep methode</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Groepen zijn apparte VCards</item>
+    <item>Groepen zijn per-contact categories</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Tijdslimiet verleden afspraken</string>
+  <string name="settings_sync_time_range_past_none">Alle afspraken worden gesynchronizeerd</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Afspraken ouder dan een dag worden genegeerd</item>
+    <item quantity="other">Afspraken ouder dan %d dagen worden genegeerd</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Afspraken ouder dan dit aantal dagen worden genegeerd (mag 0 zijn). Laat leeg om alle afspraken te synchronizeren.</string>
+  <string name="settings_manage_calendar_colors">Agenda kleuren beheren</string>
+  <string name="settings_manage_calendar_colors_on">Agenda kleuren worden door DAVdroid beheerd.</string>
+  <string name="settings_manage_calendar_colors_off">Agenda kleuren worden niet door DAVdroid ingesteld</string>
+  <!--collection management-->
+  <string name="create_addressbook">Maak adresboek</string>
+  <string name="create_addressbook_display_name_hint">Mijn adresboek</string>
+  <string name="create_calendar">Maak CalDAV collectie</string>
+  <string name="create_calendar_display_name_hint">Mijn agenda</string>
+  <string name="create_calendar_time_zone">Tijdzone:</string>
+  <string name="create_calendar_type">Collectie type:</string>
+  <string name="create_calendar_type_only_events">Agenda (alleen afspraken)</string>
+  <string name="create_calendar_type_only_tasks">Takenlijst (alleen taken)</string>
+  <string name="create_calendar_type_events_and_tasks">Gecombineerd (afspraken en taken)</string>
+  <string name="create_collection_color">Stel een collectie kleur in</string>
+  <string name="create_collection_creating">Collectie aan het maken</string>
+  <string name="create_collection_display_name">Weergave naam (titel) van deze collectie:</string>
+  <string name="create_collection_display_name_required">Titel is vereist</string>
+  <string name="create_collection_description">Beschrijving (optioneel):</string>
+  <string name="create_collection_home_set">Begin map:</string>
+  <string name="create_collection_create">Maak</string>
+  <string name="delete_collection">Verwijder collectie</string>
+  <string name="delete_collection_confirm_title">Weet je het zeker?</string>
+  <string name="delete_collection_confirm_warning">Deze collectie (%s) en alle data zal verwijderd worden van de server.</string>
+  <string name="delete_collection_deleting_collection">Collectie aan het verwijderen</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Er is een fout opgetreden.</string>
+  <string name="exception_httpexception">Er is een HTTP fout opgetreden.</string>
+  <string name="exception_ioexception">Er is een I/O fout opgetreden.</string>
+  <string name="exception_show_details">Toon details</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Debug informatie</string>
+  <string name="sync_error_permissions">DAVdroid rechten</string>
+  <string name="sync_error_permissions_text">Aanvullende rechten vereist</string>
+  <string name="sync_error_calendar">Agenda synchronisatie is mislukt (%s)</string>
+  <string name="sync_error_contacts">Adresboek synchronisatie is mislukt (%s)</string>
+  <string name="sync_error_tasks">Taak synchronisatie is mislukt (%s)</string>
+  <string name="sync_error">Fout tijdens %s</string>
+  <string name="sync_error_http_dav">Serverfout tijdens %s</string>
+  <string name="sync_error_local_storage">Database fout tijdens %s</string>
+  <string-array name="sync_error_phases">
+    <item>synchronisatie voorbereiden</item>
+    <item>querying mogelijkheden</item>
+    <item>verwerken van lokaal verwijderde data</item>
+    <item>voorberteiding maken/wijzigen data</item>
+    <item>uploaden maken/bewerken data</item>
+    <item>controleren syngronisatie voortgang</item>
+    <item>lijst lokale data</item>
+    <item>lijst remote data</item>
+    <item>vergelijken lokale/remote data</item>
+    <item>downloaden remote data</item>
+    <item>nabewerking</item>
+    <item>opslaan sync voortgang</item>
+  </string-array>
+  <string name="sync_error_unauthorized">Gebruikersnaam/wachtwoord onjuist</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: Verbinding beveiliging</string>
+  <string name="trust_certificate_unknown_certificate_found">Davdroid is benaderd door een onbekend certificaat. Vertrouwd u dit?</string>
+</resources>

app/src/davdroid/res/values-pl/strings.xml

@@ -0,0 +1,247 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="account_title_address_book">Książka adresowa DAVdroid</string>
+  <string name="address_books_authority_title">Książka adresowa</string>
+  <string name="help">Pomoc</string>
+  <string name="manage_accounts">Zadządzaj kontami</string>
+  <string name="please_wait">Proszę czekać</string>
+  <string name="send">Wyślij</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Optymalizacja baterii</string>
+  <string name="startup_battery_optimization_message">Android może wyłączyć/zmniejszyć synchronizacje DAVdroid po kilku dniach. Aby temu zapobiec należy wyłączyć optymalizację baterii.</string>
+  <string name="startup_battery_optimization_disable">Wyłącz dla DAVdroid</string>
+  <string name="startup_dont_show_again">Nie pokazuj ponownie</string>
+  <string name="startup_development_version">DAVdroid Preview Release</string>
+  <string name="startup_development_version_message">Jest to wersja rozwojowa DAVdroid. Należy pamiętać, że rzeczy mogą nie działać zgodnie z oczekiwaniami. Prosimy o konstruktywny informacje zwrotne, aby ulepszyć DAVdroid.</string>
+  <string name="startup_development_version_give_feedback">Przekaż opinię</string>
+  <string name="startup_donate">Informacje Open-Source</string>
+  <string name="startup_donate_message">Jesteśmy szczęśliwi, że używasz DAVdroid, który jest oprogramowaniem open-source (GPLv3). Ponieważ rozwijanie DAVdroid jest ciężką pracą i zajęło nam tysiące godzin pracy, prosimy o rozważenie darowizny.</string>
+  <string name="startup_donate_now">Pokaż stronę darowizny</string>
+  <string name="startup_donate_later">Może później</string>
+  <string name="startup_google_play_accounts_removed">Informacje o błędzie DRM Sklepu Play</string>
+  <string name="startup_google_play_accounts_removed_message">Pod pewnymi warunkami, DRM Sklepu Play może powodować, że wszystkie konta DAVdroid mogą zostać usunięte po uruchomieniu lub po uaktualnieniu DAVdroid. Jeśli jesteś dotknięty tym problemem (i tylko wtedy) należy zainstalować \"DAVdroid JB Obejście\" ze Sklepu Play.</string>
+  <string name="startup_google_play_accounts_removed_more_info">Więcej informacji</string>
+  <string name="startup_opentasks_not_installed">OpenTasks nie jest zainstalowany</string>
+  <string name="startup_opentasks_not_installed_message">Aplikacja Open Tasks nie jest dostępna, więc DAVdroid nie będzie mógł synchronizować listy zadań. </string>
+  <string name="startup_opentasks_reinstall_davdroid">Po zainstalowaniu OpenTasks konieczne jest PRZEINSTALOWANIE DAVdroid i ponowne dodanie twoich kont (błąd Androida).</string>
+  <string name="startup_opentasks_not_installed_install">Zainstaluj OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Warunki licencji</string>
+  <string name="about_license_info_no_warranty">Ten program jest ABSOLUTNIE BEZ GWARANCJI. To jest wolne oprogramowanie i mile widziane jest dalsze rozpowszechnianie go pod pewnymi warunkami.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">Plik logów DAVdroid</string>
+  <string name="logging_to_external_storage">Logowanie do zewnątrznej pamięci: %s</string>
+  <string name="logging_to_external_storage_warning">Usuń logi tak szybko jak to możliwe!</string>
+  <string name="logging_couldnt_create_file">Nie można stworzyć zewnętrznego pliku logów: %s</string>
+  <string name="logging_no_external_storage">Zewnętrzna pamięci nie została naleziona</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Otwórz menu nawigacji</string>
+  <string name="navigation_drawer_close">Zamknij menu nawigacji</string>
+  <string name="navigation_drawer_subtitle">Adapter synchronizacji CalDAV/CardDAV</string>
+  <string name="navigation_drawer_about">O DAVdroid / Licencja</string>
+  <string name="navigation_drawer_settings">Ustawienia</string>
+  <string name="navigation_drawer_news_updates">Nowości &amp; aktualizacje</string>
+  <string name="navigation_drawer_external_links">Zewnętrzne odnośniki</string>
+  <string name="navigation_drawer_website">Strona WWW</string>
+  <string name="navigation_drawer_faq">FQA</string>
+  <string name="navigation_drawer_forums">Społeczność</string>
+  <string name="navigation_drawer_donate">Dotacja</string>
+  <string name="account_list_empty">Witamy w DAVdroid!\n\nMożesz teraz dodać konto CalDAV/CardDAV.</string>
+  <string name="accounts_global_sync_disabled">Automatyczna synchronizacja dla całego systemu jest wyłączona</string>
+  <string name="accounts_global_sync_enable">Włącz</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Wykrycie serwisu nie powiodło się</string>
+  <string name="dav_service_refresh_couldnt_refresh">Nie można odświeżyć listy kolekcji</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Ustawienia</string>
+  <string name="app_settings_user_interface">Interfejs użytkownika</string>
+  <string name="app_settings_reset_hints">Zresetuj podpowiedzi</string>
+  <string name="app_settings_reset_hints_summary">Ponownie włącz wskazówki, które zostały usunięte wcześniej</string>
+  <string name="app_settings_reset_hints_success">Wszystkie wskazówki pojawią się ponownie</string>
+  <string name="app_settings_connection">Łączność</string>
+  <string name="app_settings_override_proxy">Nadpisz ustawienia proxy</string>
+  <string name="app_settings_override_proxy_on">Użyj niestandardowych ustawień proxy </string>
+  <string name="app_settings_override_proxy_off">Użyj systemowych ustawień proxy</string>
+  <string name="app_settings_override_proxy_host">Nazwa hosta HTTP proxy</string>
+  <string name="app_settings_override_proxy_port">Port HTTP proxy</string>
+  <string name="app_settings_security">Bezpieczeństwo</string>
+  <string name="app_settings_distrust_system_certs">Usuń certyfikaty systemowe</string>
+  <string name="app_settings_distrust_system_certs_on">CA systemowe i użytkownika nie zostaną dodane</string>
+  <string name="app_settings_distrust_system_certs_off">CA systemowe i użytkownika zostaną dodane (zalecane)</string>
+  <string name="app_settings_reset_certificates">Zresetuj (nie)zaufane certyfikaty</string>
+  <string name="app_settings_reset_certificates_summary">Zresetuj wszystkie niestandardowe certyfikaty.</string>
+  <string name="app_settings_reset_certificates_success">Wszystkie niestandardowe certyfikaty zostały wyczyszczone</string>
+  <string name="app_settings_debug">Debugowanie</string>
+  <string name="app_settings_log_to_external_storage">Loguj to zewnętrznego pliku</string>
+  <string name="app_settings_log_to_external_storage_on">Logowanie do zewnętrznej pamięci (jeśli jest dostępna)</string>
+  <string name="app_settings_log_to_external_storage_off">Logowanie do zewnętrznego pliku jest niedostępne</string>
+  <string name="app_settings_show_debug_info">Pokaż informacje do debug\'owania</string>
+  <string name="app_settings_show_debug_info_details">Przeglądaj/udostępnij oprogramowanie i szczegóły konfiguracji </string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Synchronizuj teraz</string>
+  <string name="account_synchronizing_now">Synchronizcja w toku</string>
+  <string name="account_settings">Ustawienia konta</string>
+  <string name="account_rename">Zmień nazwę konta</string>
+  <string name="account_rename_new_name">Niezapisane dane lokalne mogą zostać usunięte. Ponowna synchronizacja jest wymagana po zmianie nazwy. Nowa nazwa konta:</string>
+  <string name="account_rename_rename">Zmień nazwę</string>
+  <string name="account_delete">Usuń konto</string>
+  <string name="account_delete_confirmation_title">Naprawdę chcesz usunąć konto?</string>
+  <string name="account_delete_confirmation_text">Wszystkie lokalne kopie książek adresowych, kalendarzy i list zadań zostaną usunięte.</string>
+  <string name="account_refresh_address_book_list">Odśwież list książek adresowych</string>
+  <string name="account_create_new_address_book">Stwórz nową książkę adresową</string>
+  <string name="account_refresh_calendar_list">Odśwież liste kalendarzy</string>
+  <string name="account_create_new_calendar">Stwórz nowy kalendarz</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">Uprawnienia DAVdroid</string>
+  <string name="permissions_calendar">Uprawnienia kalendarza</string>
+  <string name="permissions_calendar_details">Aby synchronizować wydarzenia CalDav z lokalnymi kalendarzami, DAVdroid potrzebuje dostępu do twoich kalendarzy.</string>
+  <string name="permissions_calendar_request">Zezwól na uprawnienia kalendarza</string>
+  <string name="permissions_contacts">Uprawnienia kontaktów</string>
+  <string name="permissions_contacts_details">Aby synchronizować książki adresowe CardDAV z lokalnymi kontaktami, DAVdroid potrzebuje dostępu do twoich kontaktów.</string>
+  <string name="permissions_contacts_request">Zezwól na uprawnienia kontaktów</string>
+  <string name="permissions_opentasks">Uprawnienia OpenTasks</string>
+  <string name="permissions_opentasks_details">Aby synchronizować zadania CalDav z lokalnymi listami zadań, DAVdroid potrzebuje dostępu do OpenTasks.</string>
+  <string name="permissions_opentasks_request">Zezwól na uprawnienia OpenTasks</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Dodaj konto</string>
+  <string name="login_type_email">Logowanie za pomocą adresu e-mail</string>
+  <string name="login_email_address">Adres e-mail</string>
+  <string name="login_email_address_error">Wymanagny poprawny adres e-mail</string>
+  <string name="login_password">Hasło</string>
+  <string name="login_password_required">Wymagane hasło</string>
+  <string name="login_type_url">Logowanie za pomocą adresu URL i nazwy użytkownika</string>
+  <string name="login_url_must_be_http_or_https">URL musi zaczynać się z http(s)://</string>
+  <string name="login_url_host_name_required">Wymagana nazwa hosta</string>
+  <string name="login_user_name">Nazwa użytkownika</string>
+  <string name="login_user_name_required">Wymagana nazwa użtkonika</string>
+  <string name="login_base_url">Podstawowy URL</string>
+  <string name="login_login">Zaloguj</string>
+  <string name="login_back">Wróć</string>
+  <string name="login_create_account">Stwórz konto</string>
+  <string name="login_account_name">Nazwa konta</string>
+  <string name="login_account_name_info">Użyj swojego adresu e-mail jako nazwy konta, ponieważ Android będzie używał nazwy konta jako pola ORGANIZATOR dla wydarzeń, które stworzysz. Nie możesz posiadać dwóch kont o takiej samej nazwie.</string>
+  <string name="login_account_contact_group_method">Metoda grupowania kontaktów:</string>
+  <string name="login_account_name_required">Wymagana nazwa konta</string>
+  <string name="login_account_not_created">Konto nie mogło zostać stworzone</string>
+  <string name="login_configuration_detection">Wykrywanie konfiguracji</string>
+  <string name="login_querying_server">Proszę czekać, odpytywanie serwera...</string>
+  <string name="login_no_caldav_carddav">Nie można znaleźć usługi CalDAV lub CardDAV.</string>
+  <string name="login_view_logs">Pokaż logi</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Ustawienia: %s</string>
+  <string name="settings_authentication">Uwierzytelnianie</string>
+  <string name="settings_username">Nazwa użytkownika</string>
+  <string name="settings_enter_username">Wpisz nazwe użytkownika:</string>
+  <string name="settings_password">Hasło</string>
+  <string name="settings_password_summary">Zaktualizuj hasło zgodnie z serwerem.</string>
+  <string name="settings_enter_password">Wpisz hasło:</string>
+  <string name="settings_sync">Synchronizacja</string>
+  <string name="settings_sync_interval_contacts">Okres synchronizacji kontktów</string>
+  <string name="settings_sync_summary_manually">Tylko ręcznie</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Co %d minut oraz natychmiast przy zmianach lokalnych</string>
+  <string name="settings_sync_summary_not_available">Niedostępne</string>
+  <string name="settings_sync_interval_calendars">Okres synchronizacji kalendarzy</string>
+  <string name="settings_sync_interval_tasks">Okres synchronizacji list zadań</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Tylko ręcznie</item>
+    <item>Co 5 minut</item>
+    <item>Co 10 minut</item>
+    <item>Co 15 minut</item>
+    <item>Co godzinę</item>
+    <item>Co 2 godziny</item>
+    <item>Co 4 godziny</item>
+    <item>Raz dziennie</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Synchronizuj tylko przez WiFi</string>
+  <string name="settings_sync_wifi_only_on">Synchronizacja jest ograniczony do połączeń WiFi</string>
+  <string name="settings_sync_wifi_only_off">Rodzaj połączenia nie jest brany pod uwagę</string>
+  <string name="settings_sync_wifi_only_ssid">Organicznie WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssid_on">Będzie synchronizować tylko przez %s.</string>
+  <string name="settings_sync_wifi_only_ssid_off">Wszystkie połączenia WiFi mogą zostać wykorzystane</string>
+  <string name="settings_sync_wifi_only_ssid_message">Wprowadź nazwę sieci WiFi (SSID), aby ograniczyć synchronizację do tej sieci lub pozostaw puste dla wszystkich połączeń WiFi.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Metoda grupowania kontaktów</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Limit czasowy przeszłych wydarzeń</string>
+  <string name="settings_sync_time_range_past_none">Wszystkie wydarzenia zostaną synchronizowane</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Wydarzenia starsze niż jeden dzień zostaną zignorowane.</item>
+    <item quantity="few">Wydarzenia starsze niż %d dni zostaną zignorowane.</item>
+    <item quantity="many">Wydarzenia starsze niż %d dni zostaną zignorowane.</item>
+    <item quantity="other">Wydarzenia starsze niż %d dni zostaną zignorowane.</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Wydarzenia, które są starsze niż podana liczba dni zostaną zignorowane (może być 0). Zostaw puste, aby synchronizować wszystkie wydarzenia.</string>
+  <string name="settings_manage_calendar_colors">Zarządzaj kolorami kalendarza</string>
+  <string name="settings_manage_calendar_colors_on">Kolory kalendarza są zarządzane przez DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Kolory kalendarze nie są ustawiane przez DAVdroid</string>
+  <!--collection management-->
+  <string name="create_addressbook">Stwórz książkę adresową</string>
+  <string name="create_addressbook_display_name_hint">Moja książka adresowa</string>
+  <string name="create_calendar">Stwórz kolekcje CalDAV</string>
+  <string name="create_calendar_display_name_hint">Mój kalendarz</string>
+  <string name="create_calendar_time_zone">Strefa czasowa:</string>
+  <string name="create_calendar_type">Typ kolekcji:</string>
+  <string name="create_calendar_type_only_events">Kalendarz (tylko wydarzenia)</string>
+  <string name="create_calendar_type_only_tasks">Lista zadań (tylko zadań)</string>
+  <string name="create_calendar_type_events_and_tasks">Połączone (wydarzenia i zadania)</string>
+  <string name="create_collection_color">Ustaw kolor kolekcji</string>
+  <string name="create_collection_creating">Tworzenie kolekcji</string>
+  <string name="create_collection_display_name">Nazwa wyświetlana (tytuł) kolekcji:</string>
+  <string name="create_collection_display_name_required">Tytuł jest wymagany</string>
+  <string name="create_collection_description">Opis (opcjoalnie)</string>
+  <string name="create_collection_home_set">Ustaw początek:</string>
+  <string name="create_collection_create">Stwórz</string>
+  <string name="delete_collection">Usuń kolekcje</string>
+  <string name="delete_collection_confirm_title">Jesteś pewien?</string>
+  <string name="delete_collection_confirm_warning">Kolekcja (%s) i jej wszystkie dane zostaną usunięte z serwera.</string>
+  <string name="delete_collection_deleting_collection">Usuwanie kolekcji</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Wystąpił błąd.</string>
+  <string name="exception_httpexception">Wystąpił błąd HTTP.</string>
+  <string name="exception_ioexception">Wystąpił błąd I/O.</string>
+  <string name="exception_show_details">Pokaż szczegóły</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Informacje debugowe</string>
+  <string name="sync_error_permissions">Uprawnienia DAVdroid</string>
+  <string name="sync_error_permissions_text">Wymagane dodatkowe uprawnienia</string>
+  <string name="sync_error_calendar">Synchronizacja kalendarza nie powiodała się (%s)</string>
+  <string name="sync_error_contacts">Synchronizacja książki adresowej nie powiodała się (%s)</string>
+  <string name="sync_error_tasks">Synchronizacja zadań nie powiodała się (%s)</string>
+  <string name="sync_error">Błąd podczas %s</string>
+  <string name="sync_error_http_dav">Błąd servera podczas %s</string>
+  <string name="sync_error_local_storage">Bład bazy danych podczas %s</string>
+  <string-array name="sync_error_phases">
+    <item>przygotowanie synchronizacji</item>
+    <item>odpytywanie możliwości</item>
+    <item>przetwarzanie lokalnie usuniętych wpisów</item>
+    <item>przygotowanie stworzonych/zmodyfikowanych wpisów</item>
+    <item>wysyłanie stworzonych/zmodyfikowanych wpisów</item>
+    <item>sprawdzanie stanu synchronizacji</item>
+    <item>listowanie lokalnych wpisów</item>
+    <item>listowanie zdalnych wpisów</item>
+    <item>porównywanie lokalnych/zdalnych wpisów</item>
+    <item>pobieranie zdalnych wpisów</item>
+    <item>przetwarzanie końcowe</item>
+    <item>zapisywanie stanu synchronizacji</item>
+  </string-array>
+  <string name="sync_error_unauthorized">Błędna nazwa użytkownika lub hasło</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: Bezpieczeństwo połączenia</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroid napotkał nieznany certyfikat. Czy chcesz go dodać?</string>
+</resources>

app/src/davdroid/res/values-pt-rBR/strings.xml

@@ -0,0 +1,249 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="account_title_address_book">Livro de endereços DAVdroid</string>
+  <string name="address_books_authority_title">Livros de endereços</string>
+  <string name="help">Ajuda</string>
+  <string name="manage_accounts">Gerenciar contas</string>
+  <string name="please_wait">Por favor, aguarde...</string>
+  <string name="send">Enviar</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Otimização da bateria</string>
+  <string name="startup_battery_optimization_message">O Android pode desativar/reduzir a sincronização do DAVdroid depois de alguns dias. Para evitar isso, desligue a otimização da bateria.</string>
+  <string name="startup_battery_optimization_disable">Desligar para o DAVdroid</string>
+  <string name="startup_dont_show_again">Não mostrar novamente</string>
+  <string name="startup_development_version">Versão prévia do DAVdroid</string>
+  <string name="startup_development_version_message">Esta é uma versão de desenvolvimento do DAVdroid. Lembre-se de que as coisas podem não funcionar como esperado. Por favor, envie sugestões e comentários construtivos para melhorar o DAVdroid.</string>
+  <string name="startup_development_version_give_feedback">Enviar sugestões</string>
+  <string name="startup_donate">Informação sobre Código Aberto</string>
+  <string name="startup_donate_message">Estamos felizes que você usa o DAVdroid, um software de código aberto (GPLv3). O desenvolvimento do DAVdroid é trabalhoso e consome muitas horas de trabalho. Por esse motivo, considere fazer uma doação.</string>
+  <string name="startup_donate_now">Mostrar a página de doações</string>
+  <string name="startup_donate_later">Talvez depois</string>
+  <string name="startup_google_play_accounts_removed">Informação sobre o erro de DRM da Play Store</string>
+  <string name="startup_google_play_accounts_removed_message">Sob certas condições, o DRM da Play Store pode fazer com que todas as contas DAVdroid sejam perdidas depois de uma reinicialização ou atualização do DAVdroid. Se você for afetado por esse problema, instale o \"DAVdroid JB Workaround\" a partir da Play Store.</string>
+  <string name="startup_google_play_accounts_removed_more_info">Mais informações</string>
+  <string name="startup_opentasks_not_installed">O OpenTasks não está instalado</string>
+  <string name="startup_opentasks_not_installed_message">O aplicativo OpenTasks não está disponível, não sendo possível sincronizar as listas de tarefas pelo DAVdroid.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Depois da instalação do OpenTasks, torna-se necessário REINSTALAR o DAVdroid e adicionar suas contas novamente (erro do Android).</string>
+  <string name="startup_opentasks_not_installed_install">Instalar o OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Termos da Licença</string>
+  <string name="about_license_info_no_warranty">Este programa é distribuído SEM NENHUMA GARANTIA. Ele é software livre e pode ser redistribuído sob algumas condições.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">Registro do arquivo do DAVdroid</string>
+  <string name="logging_to_external_storage">Registrando no arquivo externo: %s</string>
+  <string name="logging_to_external_storage_warning">Excluir os registros assim que possível!</string>
+  <string name="logging_couldnt_create_file">Não foi possível criar o arquivo de registro externo: %s</string>
+  <string name="logging_no_external_storage">Armazenamento externo não encontrado</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Abrir a gaveta de navegação</string>
+  <string name="navigation_drawer_close">Fechar gaveta de navegação</string>
+  <string name="navigation_drawer_subtitle">Sincronização de CalDAV/CardDAV</string>
+  <string name="navigation_drawer_about">Sobre / Licença</string>
+  <string name="navigation_drawer_settings">Configurações</string>
+  <string name="navigation_drawer_news_updates">Novidades e atualizações</string>
+  <string name="navigation_drawer_external_links">Links externos</string>
+  <string name="navigation_drawer_website">Site na Web</string>
+  <string name="navigation_drawer_faq">Perguntas fequentes</string>
+  <string name="navigation_drawer_forums">Comunidade</string>
+  <string name="navigation_drawer_donate">Doações</string>
+  <string name="account_list_empty">Bem-vindo ao DAVdroid!\n\nVocê pode adicionar uma conta CalDAV/CardDAV agora.</string>
+  <string name="accounts_global_sync_disabled">A sincronização automática pelo sistema está desativada</string>
+  <string name="accounts_global_sync_enable">Ativar</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Falha na detecção do serviço</string>
+  <string name="dav_service_refresh_couldnt_refresh">Não foi possível atualizar a lista da coleção</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Configurações</string>
+  <string name="app_settings_user_interface">Interface de usuário</string>
+  <string name="app_settings_reset_hints">Restaurar sugestões</string>
+  <string name="app_settings_reset_hints_summary">Restaura as sugestões que foram descartadas anteriormente</string>
+  <string name="app_settings_reset_hints_success">Todas as sugestões serão exibidas novamente</string>
+  <string name="app_settings_connection">Conexão</string>
+  <string name="app_settings_override_proxy">Substituir as configurações de proxy</string>
+  <string name="app_settings_override_proxy_on">Usar configurações de proxy personalizadas</string>
+  <string name="app_settings_override_proxy_off">Usar configurações de proxy padrão do sistema</string>
+  <string name="app_settings_override_proxy_host">Nome do servidor proxy HTTP</string>
+  <string name="app_settings_override_proxy_port">Porta do proxy HTTP</string>
+  <string name="app_settings_security">Segurança</string>
+  <string name="app_settings_distrust_system_certs">Desconfiar dos certificados de sistema</string>
+  <string name="app_settings_distrust_system_certs_on">ACs adicionadas pelo usuário e pelo sistema não serão confiáveis</string>
+  <string name="app_settings_distrust_system_certs_off">ACs adicionadas pelo usuário e pelo sistema serão confiáveis (recomendado)</string>
+  <string name="app_settings_reset_certificates">Restaurar certificados não-confiáveis</string>
+  <string name="app_settings_reset_certificates_summary">Restaura a confiança de todos os certificados personalizados</string>
+  <string name="app_settings_reset_certificates_success">Todos os certificados personalizados foram restaurados</string>
+  <string name="app_settings_debug">Depuração</string>
+  <string name="app_settings_log_to_external_storage">Registrar em arquivo externo</string>
+  <string name="app_settings_log_to_external_storage_on">Registrando no armazenamento externo (se disponível)</string>
+  <string name="app_settings_log_to_external_storage_off">O registro em arquivo externo está desativado</string>
+  <string name="app_settings_show_debug_info">Mostrar informações de depuração</string>
+  <string name="app_settings_show_debug_info_details">Exibe/compartilha o software e os detalhes da configuração</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Sincronizar agora</string>
+  <string name="account_synchronizing_now">Sincronizando</string>
+  <string name="account_settings">Configurações da conta</string>
+  <string name="account_rename">Renomear conta</string>
+  <string name="account_rename_new_name">Dados locais que não foram salvos podem ser descartados. É necessário efetuar uma nova sincronização após renomear. Novo nome da conta:</string>
+  <string name="account_rename_rename">Renomear</string>
+  <string name="account_delete">Excluir conta</string>
+  <string name="account_delete_confirmation_title">Deseja excluir a conta?</string>
+  <string name="account_delete_confirmation_text">Todas as cópias locais dos livros de endereços, calendários e listas de tarefas serão excluídas.</string>
+  <string name="account_refresh_address_book_list">Atualizar lista de livros de endereços</string>
+  <string name="account_create_new_address_book">Criar novo livro de endereços</string>
+  <string name="account_refresh_calendar_list">Atualizar lista de calendários</string>
+  <string name="account_create_new_calendar">Criar novo calendário</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">Permissões do DAVdroid</string>
+  <string name="permissions_calendar">Permissões do calendário</string>
+  <string name="permissions_calendar_details">Para sincronizar os eventos CalDAV com seus calendários locais, o DAVdroid precisa acessar seus calendários.</string>
+  <string name="permissions_calendar_request">Solicitar permissão do calendário</string>
+  <string name="permissions_contacts">Permissões dos contados</string>
+  <string name="permissions_contacts_details">Para sincronizar livros de endereços CardDAV com seus contatos locais, o DAVdroid precisa acessar seus contatos.</string>
+  <string name="permissions_contacts_request">Solicitar permissão dos contatos</string>
+  <string name="permissions_opentasks">Permissões do OpenTasks</string>
+  <string name="permissions_opentasks_details">Para sincronizar tarefas CalDAV com suas listas de tarefas locais, o DAVdroid precisa acessar o OpenTasks.</string>
+  <string name="permissions_opentasks_request">Solicitar permissão do OpenTasks</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Adicionar conta</string>
+  <string name="login_type_email">Autenticação com endereço de e-mail</string>
+  <string name="login_email_address">Endereço de e-mail</string>
+  <string name="login_email_address_error">É necessário um e-mail válido</string>
+  <string name="login_password">Senha</string>
+  <string name="login_password_required">É necessário uma senha</string>
+  <string name="login_type_url">Autenticação com usuário e URL</string>
+  <string name="login_url_must_be_http_or_https">A URL deve começar com http(s)://</string>
+  <string name="login_url_host_name_required">É necessário um nome de máquina</string>
+  <string name="login_user_name">Usuário</string>
+  <string name="login_user_name_required">É necessário um nome de usuário</string>
+  <string name="login_base_url">URL base</string>
+  <string name="login_login">Autenticar</string>
+  <string name="login_back">Voltar</string>
+  <string name="login_create_account">Criar conta</string>
+  <string name="login_account_name">Nome da conta</string>
+  <string name="login_account_name_info">Use seu endereço de e-mail como nome da conta porque o Android irá usar esse nome como campo AGENDA nos eventos que você criar. Não é possível ter duas contas com o mesmo nome.</string>
+  <string name="login_account_contact_group_method">Método do grupo Contato:</string>
+  <string name="login_account_name_required">É necessário um nome de conta</string>
+  <string name="login_account_not_created">A conta não pôde ser criada</string>
+  <string name="login_configuration_detection">Detecção de configuração</string>
+  <string name="login_querying_server">Aguarde, procurando servidor...</string>
+  <string name="login_no_caldav_carddav">Não foi possível encontrar o serviço CalDAV ou CardDAV.</string>
+  <string name="login_view_logs">Exibir registros</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Configurações: %s</string>
+  <string name="settings_authentication">Autenticação</string>
+  <string name="settings_username">Nome do usuário</string>
+  <string name="settings_enter_username">Digite o nome do usuário:</string>
+  <string name="settings_password">Senha</string>
+  <string name="settings_password_summary">Atualize a senha de acordo com seu servidor</string>
+  <string name="settings_enter_password">Digite sua senha:</string>
+  <string name="settings_sync">Sincronização</string>
+  <string name="settings_sync_interval_contacts">Intervalo sinc. de contatos</string>
+  <string name="settings_sync_summary_manually">Apenas manualmente</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">A cada %d minutos + imediatamente nas alterações locais</string>
+  <string name="settings_sync_summary_not_available">Indisponível</string>
+  <string name="settings_sync_interval_calendars">Intervalo sinc. de calendários</string>
+  <string name="settings_sync_interval_tasks">Intervalo sinc. de tarefas</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Apenas manualmente</item>
+    <item>A cada 5 minutos</item>
+    <item>A cada 10 minutos</item>
+    <item>A cada 15 minutos</item>
+    <item>A cada hora</item>
+    <item>A cada 2 horas</item>
+    <item>A cada 4 horas</item>
+    <item>Uma vez por dia</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Sincronizar apenas por Wi-Fi</string>
+  <string name="settings_sync_wifi_only_on">Sincronização restrita a conexões Wi-Fi</string>
+  <string name="settings_sync_wifi_only_off">O tipo de conexão não é considerado</string>
+  <string name="settings_sync_wifi_only_ssid">Restrição de SSID Wi-Fi</string>
+  <string name="settings_sync_wifi_only_ssid_on">Sincronizará apenas com %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Qualquer conexão Wi-Fi pode ser utilizada</string>
+  <string name="settings_sync_wifi_only_ssid_message">Informe o nome da rede Wi-Fi (SSID) que será usada para sincronização ou deixe em branco para usar qualquer conexão Wi-Fi.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Método do grupo Contato</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Grupos são VCards separados</item>
+    <item>Grupos são categorias por contato</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Limite de tempo para eventos passados</string>
+  <string name="settings_sync_time_range_past_none">Todos os eventos serão sincronizados</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Os eventos que ocorreram a mais de um dia serão ignorados</item>
+    <item quantity="other">Eventos que ocorreram a mais de %d dias serão ignorados</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Os eventos que ocorreram antes desse número de dias serão ignorados (pode ser 0). Deixe em branco para sincronizar todos os eventos.</string>
+  <string name="settings_manage_calendar_colors">Gerenciar cores dos calendários</string>
+  <string name="settings_manage_calendar_colors_on">Cores dos calendários definidas pelo DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Cores dos calendários não definidas pelo DAVdroid</string>
+  <!--collection management-->
+  <string name="create_addressbook">Criar livro de endereços</string>
+  <string name="create_addressbook_display_name_hint">Meu livro de endereços</string>
+  <string name="create_calendar">Criar coleção CalDAV</string>
+  <string name="create_calendar_display_name_hint">Meu calendário</string>
+  <string name="create_calendar_time_zone">Fuso horário:</string>
+  <string name="create_calendar_type">Tipo de coleção:</string>
+  <string name="create_calendar_type_only_events">Calendário (apenas eventos)</string>
+  <string name="create_calendar_type_only_tasks">Lista de tarefas (apenas tarefas)</string>
+  <string name="create_calendar_type_events_and_tasks">Combinado (eventos e tarefas)</string>
+  <string name="create_collection_color">Definir a cor da coleção</string>
+  <string name="create_collection_creating">Criando a coleção</string>
+  <string name="create_collection_display_name">Mostrar o nome (título) desta coleção:</string>
+  <string name="create_collection_display_name_required">É necessário um título</string>
+  <string name="create_collection_description">Descrição (opcional):</string>
+  <string name="create_collection_home_set">Indique o endereço:</string>
+  <string name="create_collection_create">Criar</string>
+  <string name="delete_collection">Excluir coleção</string>
+  <string name="delete_collection_confirm_title">Tem certeza?</string>
+  <string name="delete_collection_confirm_warning">Esta coleção (%s) e todos os seus dados serão removidos do servidor.</string>
+  <string name="delete_collection_deleting_collection">Excluindo coleção</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Ocorreu um erro.</string>
+  <string name="exception_httpexception">Ocorreu um erro de HTTP.</string>
+  <string name="exception_ioexception">Ocorreu um erro de leitura/gravação.</string>
+  <string name="exception_show_details">Mostrar detalhes</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Informações de depuração</string>
+  <string name="sync_error_permissions">Permissões do DAVdroid</string>
+  <string name="sync_error_permissions_text">É necessário permissões adicionais</string>
+  <string name="sync_error_calendar">Falha na sincronização do calendário (%s)</string>
+  <string name="sync_error_contacts">Falha na sincronização do livro de endereços (%s)</string>
+  <string name="sync_error_tasks">Falha na sincronização das tarefas (%s)</string>
+  <string name="sync_error">Erro ao %s</string>
+  <string name="sync_error_http_dav">Erro do servidor ao %s</string>
+  <string name="sync_error_local_storage">Erro do banco de dados ao %s</string>
+  <string-array name="sync_error_phases">
+    <item>preparando sincronização</item>
+    <item>procurando habilidades</item>
+    <item>processando os itens excluídos localmente</item>
+    <item>preparando os itens criados/modificados</item>
+    <item>enviando os itens criados/modificados</item>
+    <item>verificando o estado da sincronização</item>
+    <item>listando os itens locais</item>
+    <item>listando os itens remotos</item>
+    <item>comparando os itens locais/remotos</item>
+    <item>baixando os itens remotos</item>
+    <item>pós-processamento</item>
+    <item>salvando o estado da sincronização</item>
+  </string-array>
+  <string name="sync_error_unauthorized">Usuário/senha incorreto</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: Segurança da conexão</string>
+  <string name="trust_certificate_unknown_certificate_found">O DAVdroid encontrou um certificado desconhecido. Deseja torná-lo confiável?</string>
+</resources>

app/src/davdroid/res/values-pt/strings.xml

@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVDroid</string>
+  <string name="help">Ajuda</string>
+  <!--startup dialogs-->
+  <!--AboutActivity-->
+  <!--global settings-->
+  <!--AccountsActivity-->
+  <!--DavService-->
+  <!--AppSettingsActivity-->
+  <!--AccountActivity-->
+  <!--PermissionsActivity-->
+  <!--AddAccountActivity-->
+  <string name="login_type_email">Login com seu enderço de email</string>
+  <string name="login_type_url">Login com URL e nome do usuário</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_authentication">Autenticação</string>
+  <string name="settings_username">Nome de usuário</string>
+  <string name="settings_enter_username">Informe o nome de usuário:</string>
+  <string name="settings_password">Senha</string>
+  <string name="settings_password_summary">Atualize sua denha de acordo com a do seu servidor.</string>
+  <string name="settings_enter_password">Informe sua senha:</string>
+  <string name="settings_sync">Sincronização</string>
+  <string name="settings_sync_interval_contacts">Intervalo de sincronização dos contatos</string>
+  <string name="settings_sync_summary_manually">Manualmente apenas</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">A cada %d minutos + imediatamente em alterações locais</string>
+  <string name="settings_sync_summary_not_available">Não avaliado</string>
+  <string name="settings_sync_interval_calendars">Intervalo de sincronização do calendário</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Apenas manualmente</item>
+    <item>A cada 5 minutos</item>
+    <item>A cada 10 minutos</item>
+    <item>A cada 15 minutos</item>
+    <item>A cada hora</item>
+    <item>A cada 2 horas</item>
+    <item>A cada 4 horas</item>
+    <item>Diáriamente</item>
+  </string-array>
+  <!--collection management-->
+  <!--ExceptionInfoFragment-->
+  <!--sync errors and DebugInfoActivity-->
+  <!--cert4android-->
+</resources>

app/src/davdroid/res/values-ru/strings.xml

@@ -0,0 +1,243 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="help">Помощь</string>
+  <string name="manage_accounts">Управление аккаунтами</string>
+  <string name="please_wait">Пожалуйста подождите...</string>
+  <string name="send">Отправить</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Оптимизация батареи</string>
+  <string name="startup_battery_optimization_message">Андроид может отключить/уменьшить синхронизацию DAVdroid через несколько дней. Чтобы этого не произошло, выключите оптимизацию батареи.</string>
+  <string name="startup_battery_optimization_disable">Отключить для DAVdroid</string>
+  <string name="startup_dont_show_again">Больше не показывать</string>
+  <string name="startup_development_version">DAVdroid Предварительный Релиз</string>
+  <string name="startup_development_version_message">Это разрабатываемая версия DAVdroid. Она может не работать как Вы ожидаете. Пожалуйста, присылайте нам конструктивные отзывы, чтобы улучшить DAVdroid.</string>
+  <string name="startup_development_version_give_feedback">Оставить отзыв</string>
+  <string name="startup_donate">Open-Source информация</string>
+  <string name="startup_donate_message">Мы рады, что вы используете DAVdroid, который является программным обеспечением с открытым исходным кодом (GPLv3). Разработка DAVdroid является сложной задачей, потребовавшей от нас тысяч рабочих часов. Пожалуйста, рассмотрите возможность поддержать проект.</string>
+  <string name="startup_donate_now">Поддержать проект</string>
+  <string name="startup_donate_later">Возможно, позже</string>
+  <string name="startup_google_play_accounts_removed">Информация об ошибке в Play Store DRM</string>
+  <string name="startup_google_play_accounts_removed_message">При определённых условиях Play Store DRM может стать причиной потери всех DAVdroid аккаунтов после перезагрузки устройства или после обновления DAVdroid. Если Вы столкнулись с этой проблемой (и только в этом случае), установите \"DAVdroid JB Workaround\" из Play Store.</string>
+  <string name="startup_google_play_accounts_removed_more_info">Дополнительно</string>
+  <string name="startup_opentasks_not_installed">OpenTasks не установлен</string>
+  <string name="startup_opentasks_not_installed_message">OpenTasks недоступен, DAVdroid не сможет синхронизировать список задач</string>
+  <string name="startup_opentasks_reinstall_davdroid">После установки OpenTasks необходимо ПЕРЕУСТАНОВИТЬ DAVdroid и добавить Ваши аккаунты ещё раз (ошибка Android).</string>
+  <string name="startup_opentasks_not_installed_install">Установить OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Лицензионное соглашение</string>
+  <string name="about_license_info_no_warranty">Эта программа поставляется АБСОЛЮТНО БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ. Это свободная программа, и вы приглашаетесь повторно распространять ее при определенных условиях.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">Файл логов DAVdroid</string>
+  <string name="logging_to_external_storage">Сохранение логов во внешнем хранилище: %s</string>
+  <string name="logging_to_external_storage_warning">Удалять логи насколько возможно быстро!</string>
+  <string name="logging_couldnt_create_file">Не удалось создать внешний лог файл: %s</string>
+  <string name="logging_no_external_storage">Внешнее хранилище не найдено</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Открыть панель навигации</string>
+  <string name="navigation_drawer_close">Закрыть панель навигации</string>
+  <string name="navigation_drawer_subtitle">Адаптер синхронизации CalDAV/CardDAV</string>
+  <string name="navigation_drawer_about">О программе / Лицензия</string>
+  <string name="navigation_drawer_settings">Настройки</string>
+  <string name="navigation_drawer_news_updates">Новости и обновления</string>
+  <string name="navigation_drawer_external_links">Внешние ссылки</string>
+  <string name="navigation_drawer_website">Веб сайт</string>
+  <string name="navigation_drawer_faq">ЧАВО</string>
+  <string name="navigation_drawer_forums">Сообщество</string>
+  <string name="navigation_drawer_donate">Пожертвовать</string>
+  <string name="account_list_empty">Вас приветствует DAVdroid\n\nМожете добавить CalDAV/CardDAV аккаунт сейчас.</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Не удалось обнаружить сервисы</string>
+  <string name="dav_service_refresh_couldnt_refresh">Невозможно обновить список коллекций</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Настройки</string>
+  <string name="app_settings_user_interface">Интерфейс пользователя</string>
+  <string name="app_settings_reset_hints">Включить подсказки</string>
+  <string name="app_settings_reset_hints_summary">Включить подсказки, которые были отключены ранее</string>
+  <string name="app_settings_reset_hints_success">Все подсказки будут показаны снова</string>
+  <string name="app_settings_connection">Соединение</string>
+  <string name="app_settings_override_proxy">Переопределить настройки прокси-сервера</string>
+  <string name="app_settings_override_proxy_on">Использовать пользовательские настройки прокси-сервера</string>
+  <string name="app_settings_override_proxy_off">Использовать системные настройки прокси-сервера</string>
+  <string name="app_settings_override_proxy_host">Имя хоста HTTP прокси-сервера</string>
+  <string name="app_settings_override_proxy_port">Порт HTTP прокси-сервера</string>
+  <string name="app_settings_security">Безопасность</string>
+  <string name="app_settings_distrust_system_certs">Не доверять системным сертификатам</string>
+  <string name="app_settings_distrust_system_certs_on">Не доверять системным и добавленным пользователем CA</string>
+  <string name="app_settings_distrust_system_certs_off">Доверять системным и добавленным пользователем CA (рекомендуется)</string>
+  <string name="app_settings_reset_certificates">Сброс (не)доверенных сертификатов</string>
+  <string name="app_settings_reset_certificates_summary">Отменить доверие ко всем пользовательским сертификатам</string>
+  <string name="app_settings_reset_certificates_success">Все пользовательские сертификаты были очищены</string>
+  <string name="app_settings_debug">Отладка</string>
+  <string name="app_settings_log_to_external_storage">Сохранять лог во внешний файл</string>
+  <string name="app_settings_log_to_external_storage_on">Сохранение логов во внешнем хранилище (если доступно)</string>
+  <string name="app_settings_log_to_external_storage_off">Сохранение логов во внешний файл отключено</string>
+  <string name="app_settings_show_debug_info">Отладочная информация</string>
+  <string name="app_settings_show_debug_info_details">Просмотреть/поделиться программой и настройками</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Синхронизировать</string>
+  <string name="account_synchronizing_now">Синхронизация</string>
+  <string name="account_settings">Настройки аккаунта</string>
+  <string name="account_rename">Переименовать аккаунт</string>
+  <string name="account_rename_new_name">Несохранённые локальные данные могут быть потеряны. Требуется выполнить синхронизацию после переименования. Новое имя аккаунта:</string>
+  <string name="account_rename_rename">Переименовать</string>
+  <string name="account_delete">Удалить аккаунт</string>
+  <string name="account_delete_confirmation_title">Вы действительно хотите удалить аккаунт?</string>
+  <string name="account_delete_confirmation_text">Все локальные копии контактов, календарей и задач будут удалены.</string>
+  <string name="account_refresh_address_book_list">Обновить список адресных книг</string>
+  <string name="account_create_new_address_book">Создать новую адресную книгу</string>
+  <string name="account_refresh_calendar_list">Обновить календарь</string>
+  <string name="account_create_new_calendar">Создать новый календарь</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">Разрешения DAVdroid</string>
+  <string name="permissions_calendar">Разрешения для календаря</string>
+  <string name="permissions_calendar_details">Для синхронизации CalDAV событий с Вашими локальными календарями DAVdroid должен иметь доступ к Вашим календарям.</string>
+  <string name="permissions_calendar_request">Запрос разрешений для календаря</string>
+  <string name="permissions_contacts">Разрешения для контактов</string>
+  <string name="permissions_contacts_details">Для синхронизации CardDAV адресных книг с Вашими локальными контактами DAVdroid должен иметь доступ к Вашим контактам.</string>
+  <string name="permissions_contacts_request">Запрос разрешений для контактов</string>
+  <string name="permissions_opentasks">Разрешения OpenTasks</string>
+  <string name="permissions_opentasks_details">Для синхронизации CalDAV задач с Вашими локальными списками задач DAVdroid должен иметь доступ к OpenTasks.</string>
+  <string name="permissions_opentasks_request">Запрос разрешений для OpenTasks</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Добавить аккаунт</string>
+  <string name="login_type_email">Вход по адресу электронной почты</string>
+  <string name="login_email_address">Адрес электронной почты</string>
+  <string name="login_email_address_error">Требуется действующий адрес электронной почты</string>
+  <string name="login_password">Пароль</string>
+  <string name="login_password_required">Требуется пароль</string>
+  <string name="login_type_url">Вход через URL и имя пользователя</string>
+  <string name="login_url_must_be_http_or_https">URL должен начинаться с http(s)://</string>
+  <string name="login_url_host_name_required">Требуется имя хоста</string>
+  <string name="login_user_name">Имя</string>
+  <string name="login_user_name_required">Требуется имя</string>
+  <string name="login_base_url">Базовый URL</string>
+  <string name="login_login">Логин</string>
+  <string name="login_back">Назад</string>
+  <string name="login_create_account">Создать аккаунт</string>
+  <string name="login_account_name">Имя аккаунта</string>
+  <string name="login_account_name_info">Используйте Ваш адрес адрес электронной почты в качестве имени аккаунта, так как Android будет использовать имя аккаунта в поле ORGANIZER для событий, которые Вы создаёте. Вы не можете иметь два аккаунта с одинаковыми именами.</string>
+  <string name="login_account_contact_group_method">Метод группировки контактов:</string>
+  <string name="login_account_name_required">Требуется имя аккаунта</string>
+  <string name="login_account_not_created">Аккаунт не может быть создан</string>
+  <string name="login_configuration_detection">Обнаружение конфигурации</string>
+  <string name="login_querying_server">Пожалуйста, подождите, выполняется запрос к серверу...</string>
+  <string name="login_no_caldav_carddav">Не найдены CalDAV или CardDAV сервисы.</string>
+  <string name="login_view_logs">Просмотр логов</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Настройки: %s</string>
+  <string name="settings_authentication">Аутентификация</string>
+  <string name="settings_username">Имя</string>
+  <string name="settings_enter_username">Введите имя пользователя:</string>
+  <string name="settings_password">Пароль</string>
+  <string name="settings_password_summary">Обновить пароль в соответствии с вашим сервером.</string>
+  <string name="settings_enter_password">Введите свой пароль:</string>
+  <string name="settings_sync">Синхронизация</string>
+  <string name="settings_sync_interval_contacts">Интервал синхронизации контактов</string>
+  <string name="settings_sync_summary_manually">Вручную</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Каждые %d минут и немедленно при локальных изменениях</string>
+  <string name="settings_sync_summary_not_available">Недоступно</string>
+  <string name="settings_sync_interval_calendars">Интервал синхронизации календарей</string>
+  <string name="settings_sync_interval_tasks">Интервал синхронизации задач</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Вручную</item>
+    <item>Каждые 5 минут</item>
+    <item>Каждые 10 минут</item>
+    <item>Каждые 15 минут</item>
+    <item>Каждый час</item>
+    <item>Каждые 2 часа</item>
+    <item>Каждые 4 часа</item>
+    <item>Раз в сутки</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Синхронизировать только через WiFi</string>
+  <string name="settings_sync_wifi_only_on">Разрешить синхронизацию только через WiFi</string>
+  <string name="settings_sync_wifi_only_off">Не учитывать тип соединения</string>
+  <string name="settings_sync_wifi_only_ssid">Разрешённые WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssid_on">Синхронизировать только через %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Могут использоваться все WiFi подключения</string>
+  <string name="settings_sync_wifi_only_ssid_message">Укажите имя WiFi сети (SSID), чтобы разрешить синхронизацию только через эту сеть. Или оставьте пустым для синхронизации через любые WiFi соединения.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Метод группировки контактов</string>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Группы как отдельные vCards</item>
+    <item>Группы как категории внутри контакта</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Интервал синхронизации</string>
+  <string name="settings_sync_time_range_past_none">Все события будут синхронизированы</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">События старше одного дня будут игнорироваться</item>
+    <item quantity="few">События старше %d дней будут игнорироваться</item>
+    <item quantity="many">События старше %d дней будут игнорироваться</item>
+    <item quantity="other">События старше %d дней будут игнорироваться</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">События старше указанного количества дней будут игнорироваться (может быть 0). Оставьте пустым для синхронизации всех событий.</string>
+  <string name="settings_manage_calendar_colors">Управление цветами календаря</string>
+  <string name="settings_manage_calendar_colors_on">Цвета календаря управляются DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Цвета календаря не управляются DAVdroid</string>
+  <!--collection management-->
+  <string name="create_addressbook">Создать адресную книгу</string>
+  <string name="create_addressbook_display_name_hint">Моя Адресная книга</string>
+  <string name="create_calendar">Создать CalDAV коллекцию</string>
+  <string name="create_calendar_display_name_hint">Мой Календарь</string>
+  <string name="create_calendar_time_zone">Часовой пояс:</string>
+  <string name="create_calendar_type">Тип коллекции:</string>
+  <string name="create_calendar_type_only_events">Календарь (только события)</string>
+  <string name="create_calendar_type_only_tasks">Список задач (только задачи)</string>
+  <string name="create_calendar_type_events_and_tasks">Совмещённый (события и задачи)</string>
+  <string name="create_collection_color">Установить цвет коллекции</string>
+  <string name="create_collection_creating">Создание коллекции</string>
+  <string name="create_collection_display_name">Отображаемое имя (название) этой коллекции:</string>
+  <string name="create_collection_display_name_required">Требуется название</string>
+  <string name="create_collection_description">Описание (необязательно):</string>
+  <string name="create_collection_home_set">Главная папка:</string>
+  <string name="create_collection_create">Создать</string>
+  <string name="delete_collection">Удалить коллекцию</string>
+  <string name="delete_collection_confirm_title">Вы уверены?</string>
+  <string name="delete_collection_confirm_warning">Коллекция (%s) и все её данные будут удалены с сервера.</string>
+  <string name="delete_collection_deleting_collection">Удаление коллекции</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Произошла ошибка.</string>
+  <string name="exception_httpexception">Произошла ошибка HTTP</string>
+  <string name="exception_ioexception">Произошла ошибка ввода/вывода.</string>
+  <string name="exception_show_details">Подробнее</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Отладочная информация</string>
+  <string name="sync_error_permissions">Разрешения DAVdroid</string>
+  <string name="sync_error_permissions_text">Требуются дополнительные разрешения</string>
+  <string name="sync_error_calendar">Ошибка при синхронизации Календаря (%s)</string>
+  <string name="sync_error_contacts">Ошибка при синхронизации Контактов (%s)</string>
+  <string name="sync_error_tasks">Ошибка при синхронизации Задачи (%s)</string>
+  <string name="sync_error">Ошибка %s</string>
+  <string name="sync_error_http_dav">Ошибка сервера %s</string>
+  <string name="sync_error_local_storage">Ошибка базы данных %s</string>
+  <string-array name="sync_error_phases">
+    <item>подготовка синхронизации</item>
+    <item>запрос поддерживаемых возможностей</item>
+    <item>обработка локально удалённых записей</item>
+    <item>подготовка созданных/изменённых записей</item>
+    <item>загрузка созданных/изменённых записей</item>
+    <item>проверка статуса синхронизации</item>
+    <item>просмотр локальных записей</item>
+    <item>просмотр серверных записей</item>
+    <item>сравнение локальных/серверных записей</item>
+    <item>загрузка серверных записей</item>
+    <item>пост-обработка</item>
+    <item>сохранение статуса синхронизации</item>
+  </string-array>
+  <string name="sync_error_unauthorized">Имя пользователя/пароль неверные</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: Безопасность подключения</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroid обнаружил неизвестный сертификат. Вы хотите доверять ему?</string>
+</resources>

app/src/davdroid/res/values-sr/strings.xml

@@ -0,0 +1,250 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">ДАВдроид</string>
+  <string name="account_title_address_book">ДАВдроид адресар</string>
+  <string name="address_books_authority_title">Адресари</string>
+  <string name="help">Помоћ</string>
+  <string name="manage_accounts">Управљај налозима</string>
+  <string name="please_wait">Сачекајте…</string>
+  <string name="send">Пошаљи</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Оптимизација батерије</string>
+  <string name="startup_battery_optimization_message">Андроид може да искључи/умањи синхронизацију ДАВдроида након неколико дана. Да бисте спречили ово, искључите оптимизацију батерије.</string>
+  <string name="startup_battery_optimization_disable">Искључи за ДАВдроид</string>
+  <string name="startup_dont_show_again">Не приказуј поново</string>
+  <string name="startup_development_version">ДАВдроид прелиминарно издање</string>
+  <string name="startup_development_version_message">Ово је развојно издање ДАВдроида. Имајте на уму да можда неће радити очекивано. Замољавамо вас за конструктивне повратне информације како бисмо га побољшали.</string>
+  <string name="startup_development_version_give_feedback">Повратне информације</string>
+  <string name="startup_donate">Подаци о отвореном кôду</string>
+  <string name="startup_donate_message">Драго нам је да користите ДАВдроид, софтвер отвореног кôда (ГПЛв3). Развој ДАВдроида није баш лак посао и захтева хиљаде радних сати, стога вас молимо да размотрите донацију.</string>
+  <string name="startup_donate_now">Прикажи страницу за донације</string>
+  <string name="startup_donate_later">Можда касније</string>
+  <string name="startup_google_play_accounts_removed">Грешка ДРМ-а Плеј продавнице</string>
+  <string name="startup_google_play_accounts_removed_message">Под одређеним околностима ДРМ Плеј продавнице може да узрокује да сви налози ДАВдроида нестане након рестарта или ажурирања ДАВдроида. Ако и само ако имате овај проблем, инсталирајте „DAVdroid JB Workaround“ са Плеј продавнице.</string>
+  <string name="startup_google_play_accounts_removed_more_info">Још информација</string>
+  <string name="startup_opentasks_not_installed">Отворени задаци нису инсталирани</string>
+  <string name="startup_opentasks_not_installed_message">Отворени задаци нису доступни па ДАВдроид неће моћи да синхронизује листе задатака. </string>
+  <string name="startup_opentasks_reinstall_davdroid">Након инсталирања Отворених задатака, морате поново да инсталирате ДАВдроид и поново додате ваше налоге (због грешке у Андроиду).</string>
+  <string name="startup_opentasks_not_installed_install">Инсталирај Отворене задатке</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Услови лиценце</string>
+  <string name="about_license_info_no_warranty">Овај програм НЕМА НИКАКВЕ ГАРАНЦИЈЕ. Бесплатан је софтвер којег можете слободно да делите под одређеним условима.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">ДАВдроид евиденција</string>
+  <string name="logging_to_external_storage">Уписивање евиденције у спољашње складиште: %s</string>
+  <string name="logging_to_external_storage_warning">Обришите записе што пре!</string>
+  <string name="logging_couldnt_create_file">Не могох да направим спољашњи фајл записа: %s</string>
+  <string name="logging_no_external_storage">Спољашње складиште није нађено</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Отвори навигациону фиоку</string>
+  <string name="navigation_drawer_close">Затвори навигациону фиоку</string>
+  <string name="navigation_drawer_subtitle">КалДАВ/КардДАВ адаптер синхронизације</string>
+  <string name="navigation_drawer_about">О програму/лиценца</string>
+  <string name="navigation_drawer_settings">Поставке</string>
+  <string name="navigation_drawer_news_updates">Новости и ажурирања</string>
+  <string name="navigation_drawer_external_links">Вањске везе</string>
+  <string name="navigation_drawer_website">Веб-сајт</string>
+  <string name="navigation_drawer_faq">ЧПП</string>
+  <string name="navigation_drawer_forums">Заједница</string>
+  <string name="navigation_drawer_donate">Донирај</string>
+  <string name="account_list_empty">Добро дошли у ДАВдроид!\n\nМожете сада да додате КалДАВ/КардДАВ налог.</string>
+  <string name="accounts_global_sync_disabled">Синхронизација је системски искључена</string>
+  <string name="accounts_global_sync_enable">Укључи</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Откривање услуге није успело</string>
+  <string name="dav_service_refresh_couldnt_refresh">Не могох да освежим списак збирки</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Поставке</string>
+  <string name="app_settings_user_interface">Корисничко сучеље</string>
+  <string name="app_settings_reset_hints">Ресетуј савете</string>
+  <string name="app_settings_reset_hints_summary">Поновно приказивање претходно одбачених савета</string>
+  <string name="app_settings_reset_hints_success">Сви савети ће поново бити приказани</string>
+  <string name="app_settings_connection">Повезивање</string>
+  <string name="app_settings_override_proxy">Надјачај поставке проксија</string>
+  <string name="app_settings_override_proxy_on">Користи прилагођене поставке проксија</string>
+  <string name="app_settings_override_proxy_off">Користи системски подразумеване поставке проксија</string>
+  <string name="app_settings_override_proxy_host">ХТТП прокси домаћин</string>
+  <string name="app_settings_override_proxy_port">ХТТП прокси порт</string>
+  <string name="app_settings_security">Безбедност</string>
+  <string name="app_settings_distrust_system_certs">Посумњај у системске сертификате</string>
+  <string name="app_settings_distrust_system_certs_on">Системски и кориснички додати сертификати неће бити поуздани</string>
+  <string name="app_settings_distrust_system_certs_off">Системски и кориснички додати сертификати ће бити поуздани (препоручљиво)</string>
+  <string name="app_settings_reset_certificates">Ресетуј (не)поуздане сертификате</string>
+  <string name="app_settings_reset_certificates_summary">Ресетуј поуздање свих прилагођених сертификата</string>
+  <string name="app_settings_reset_certificates_success">Сви прилагођени сертификати су уклоњени</string>
+  <string name="app_settings_debug">Тражење грешака</string>
+  <string name="app_settings_log_to_external_storage">Уписуј у спољашњи фајл</string>
+  <string name="app_settings_log_to_external_storage_on">Уписивање евиденције у спољашње складиште (ако је доступно)</string>
+  <string name="app_settings_log_to_external_storage_off">Уписивање евиденције у спољашње складиште је искључено</string>
+  <string name="app_settings_show_debug_info">Прикажи податке за исправљање грешака</string>
+  <string name="app_settings_show_debug_info_details">Приказ/дељење детаља софтвера и поставки</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Синхронизуј одмах</string>
+  <string name="account_synchronizing_now">Синхронизујем</string>
+  <string name="account_settings">Поставке налога</string>
+  <string name="account_rename">Преименуј налог</string>
+  <string name="account_rename_new_name">Несачувани локални подаци могу бити изгубљни. Потребна је ресинхронизација након преименовања. Нови назив налога:</string>
+  <string name="account_rename_rename">Преименуј</string>
+  <string name="account_delete">Обриши налог</string>
+  <string name="account_delete_confirmation_title">Заиста обрисати налог?</string>
+  <string name="account_delete_confirmation_text">Све локалне копије адресара, календара и листи задатака ће бити обрисане.</string>
+  <string name="account_refresh_address_book_list">Освежи списак адресара</string>
+  <string name="account_create_new_address_book">Направи нови адресар</string>
+  <string name="account_refresh_calendar_list">Освежи списак календара</string>
+  <string name="account_create_new_calendar">Направи нови календар</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">ДАВдроид дозволе</string>
+  <string name="permissions_calendar">Дозволе за календар</string>
+  <string name="permissions_calendar_details">Да би синхронизовао КалДАВ догађаје са вашим локалним календарима, ДАВдроиду треба приступ вашим календарима.</string>
+  <string name="permissions_calendar_request">Захтевај дозволе за календар</string>
+  <string name="permissions_contacts">Дозволе за контакте</string>
+  <string name="permissions_contacts_details">Да би синхронизовао КардДАВ адресаре са вашим локалним контактима, ДАВдроиду треба приступ вашим контактима.</string>
+  <string name="permissions_contacts_request">Захтевај дозволе за контакте</string>
+  <string name="permissions_opentasks">Дозволе за задатке</string>
+  <string name="permissions_opentasks_details">Да би синхронизовао КалДАВ задатке са вашим локалним листама задатака, ДАВдроиду треба приступ Задацима.</string>
+  <string name="permissions_opentasks_request">Захтевај дозволе за задатке</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Додај налог</string>
+  <string name="login_type_email">Пријавите се адресом е-поште</string>
+  <string name="login_email_address">Е-адреса</string>
+  <string name="login_email_address_error">Исправна е-адреса је обавезна</string>
+  <string name="login_password">Лозинка</string>
+  <string name="login_password_required">Лозинка је обавезна</string>
+  <string name="login_type_url">Пријавите се УРЛ-ом и корисничким именом</string>
+  <string name="login_url_must_be_http_or_https">УРЛ мора започињати са http(s)://</string>
+  <string name="login_url_host_name_required">Име домаћина је обавезно</string>
+  <string name="login_user_name">Корисничко име</string>
+  <string name="login_user_name_required">Корисничко име је обавезно</string>
+  <string name="login_base_url">Корени УРЛ</string>
+  <string name="login_login">Пријава</string>
+  <string name="login_back">Назад</string>
+  <string name="login_create_account">Направи налог</string>
+  <string name="login_account_name">Назив налога</string>
+  <string name="login_account_name_info">Користите вашу е-адресу за назив налога јер Андроид користи назив налога за поље ОРГАНИЗАТОР за догађаје које направите. Не можете имати два налога истог назива.</string>
+  <string name="login_account_contact_group_method">Режим група контаката:</string>
+  <string name="login_account_name_required">Назив налога је обавезан</string>
+  <string name="login_account_not_created">Не могох направити налог</string>
+  <string name="login_configuration_detection">Откривање конфигурације</string>
+  <string name="login_querying_server">Сачекајте, шаљем упит серверу…</string>
+  <string name="login_no_caldav_carddav">Не могох да нађем КалДАВ или КардДАВ услугу.</string>
+  <string name="login_view_logs">Прикажи записе</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Поставке: %s</string>
+  <string name="settings_authentication">Аутентификација</string>
+  <string name="settings_username">Корисничко име</string>
+  <string name="settings_enter_username">Унесите корисничко име:</string>
+  <string name="settings_password">Лозинка</string>
+  <string name="settings_password_summary">Ажурирајте лозинку за ваш сервер.</string>
+  <string name="settings_enter_password">Унесите лозинку:</string>
+  <string name="settings_sync">Синхронизација</string>
+  <string name="settings_sync_interval_contacts">Интервал синх. контаката</string>
+  <string name="settings_sync_summary_manually">Само ручно</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Сваких %d минута + одмах по локалним изменама</string>
+  <string name="settings_sync_summary_not_available">Није доступно</string>
+  <string name="settings_sync_interval_calendars">Интервал синх. календара</string>
+  <string name="settings_sync_interval_tasks">Интервал синх. задатака</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Само ручно</item>
+    <item>Сваких 5 минута</item>
+    <item>Сваких 10 минута</item>
+    <item>Сваких 15 минута</item>
+    <item>Сваког сата</item>
+    <item>Свака 2 сата</item>
+    <item>Свака 4 сата</item>
+    <item>Једном дневно</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Само преко бежичног</string>
+  <string name="settings_sync_wifi_only_on">Синхронизовање само преко бежичних мрежа</string>
+  <string name="settings_sync_wifi_only_off">Тип везе није узет у обзир</string>
+  <string name="settings_sync_wifi_only_ssid">Ограничења ССИД-а бежичних</string>
+  <string name="settings_sync_wifi_only_ssid_on">Синхронизовање само преко %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Коришћење свих бежичних мрежа</string>
+  <string name="settings_sync_wifi_only_ssid_message">Унесите назив бежичне мреже (њен ССИД) да бисте ограничили синхронизацију само на ту мрежу, или оставите празно за синхронизовање преко било које бежичне мреже.</string>
+  <string name="settings_carddav">КардДАВ</string>
+  <string name="settings_contact_group_method">Режим група контаката</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Групе су одвојене В-карте</item>
+    <item>Групе су категорије по контакту</item>
+  </string-array>
+  <string name="settings_caldav">КалДАВ</string>
+  <string name="settings_sync_time_range_past">Ограничење догађаја у прошлости</string>
+  <string name="settings_sync_time_range_past_none">Сви догађаји се синхронизују</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Догађаји старији од једног дана ће бити занемарени</item>
+    <item quantity="few">Догађаји старији од %d дана ће бити занемарени</item>
+    <item quantity="other">Догађаји старији од %d дана ће бити занемарени</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Догађаји старији од овог броја дана ће бити занемарени (може бити 0). Оставите празно за синхронизацију свих догађаја.</string>
+  <string name="settings_manage_calendar_colors">Управљај бојама календара</string>
+  <string name="settings_manage_calendar_colors_on">Бојама календара управља ДАВдроид</string>
+  <string name="settings_manage_calendar_colors_off">Боје календара није поставио ДАВдроид</string>
+  <!--collection management-->
+  <string name="create_addressbook">Направи адресар</string>
+  <string name="create_addressbook_display_name_hint">Мој адресар</string>
+  <string name="create_calendar">Направи КалДАВ збирку</string>
+  <string name="create_calendar_display_name_hint">Мој календар</string>
+  <string name="create_calendar_time_zone">Временска зона:</string>
+  <string name="create_calendar_type">Тип збирке:</string>
+  <string name="create_calendar_type_only_events">Календар (само догађаји)</string>
+  <string name="create_calendar_type_only_tasks">Листе задатака (само задаци)</string>
+  <string name="create_calendar_type_events_and_tasks">Комбиновано (догађаји и задаци)</string>
+  <string name="create_collection_color">Боја збирке</string>
+  <string name="create_collection_creating">Правим збирку</string>
+  <string name="create_collection_display_name">Назив (наслов) ове збирке:</string>
+  <string name="create_collection_display_name_required">Наслов је обавезан</string>
+  <string name="create_collection_description">Опис (необавезан):</string>
+  <string name="create_collection_home_set">Домаћа фасцикла:</string>
+  <string name="create_collection_create">Направи</string>
+  <string name="delete_collection">Обриши збирку</string>
+  <string name="delete_collection_confirm_title">Да ли сте сигурни?</string>
+  <string name="delete_collection_confirm_warning">Ова збирка (%s) и сви њени подаци ће бити уклоњени са сервера.</string>
+  <string name="delete_collection_deleting_collection">Бришем збирку</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Десила се грешка.</string>
+  <string name="exception_httpexception">Десила се ХТТП грешка.</string>
+  <string name="exception_ioexception">Десила се У/И грешка.</string>
+  <string name="exception_show_details">Прикажи детаље</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Подаци за исправљање грешака</string>
+  <string name="sync_error_permissions">ДАВдроид дозволе</string>
+  <string name="sync_error_permissions_text">Потребне су додатне доволе</string>
+  <string name="sync_error_calendar">Синхронизација календара није успела (%s)</string>
+  <string name="sync_error_contacts">Синхронизација адресара није успела (%s)</string>
+  <string name="sync_error_tasks">Синхронизација задатака није успела (%s)</string>
+  <string name="sync_error">Грешка током %s</string>
+  <string name="sync_error_http_dav">Грешка сервера током %s</string>
+  <string name="sync_error_local_storage">Грешка базе података током %s</string>
+  <string-array name="sync_error_phases">
+    <item>припремам синхронизацију</item>
+    <item>проверавам могућности</item>
+    <item>обрађујем локално обрисане уносе</item>
+    <item>припремам направљене/измењене уносе</item>
+    <item>отпремам направљене/измењене уносе</item>
+    <item>проверавам стање синхронизације</item>
+    <item>излиставам локалне уносе</item>
+    <item>излиставам удаљене уносе</item>
+    <item>упоређујем локалне/удаљене уносе</item>
+    <item>преузимам удаљене уносе</item>
+    <item>додатна обрада</item>
+    <item>уписујем стање синхронизације</item>
+  </string-array>
+  <string name="sync_error_unauthorized">Корисничко име или лозинка погрешни</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">ДАВдроид: Безбедност везе</string>
+  <string name="trust_certificate_unknown_certificate_found">ДАВдроид је наишао на непознат сертификат. Желите ли да се поуздате у њега?</string>
+</resources>

app/src/davdroid/res/values-tr-rTR/strings.xml

@@ -0,0 +1,201 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="help">Yardım</string>
+  <string name="manage_accounts">Hesapları yönet</string>
+  <string name="please_wait">Lütfen bekle ...</string>
+  <string name="send">Gönder</string>
+  <!--startup dialogs-->
+  <string name="startup_dont_show_again">Bir daha gösterme</string>
+  <string name="startup_development_version">DAVDroid Önizlenim Dağıtımı</string>
+  <string name="startup_development_version_message">Bu DAVdroid\'in bir geliştirme sürümüdür. Bazı şeyler beklendiği gibi çalışmayabilir. DAVdroid\'i iyileştirmek için bize lütfen yapıcı eleştirilerini ilet.</string>
+  <string name="startup_development_version_give_feedback">Geribildirim ver</string>
+  <string name="startup_donate">Açık-Kaynak Bilgisi</string>
+  <string name="startup_donate_message">Açık kaynaklı yazılım (GPLv3) olan DAVdroid\'i kullandığına çok mutluyuz. DAVdroid\'i geliştirmek zor bir iş ve üzerinde binlerce saat çalıştığımızdan, lütfen bir bağışta bulunmayı düşün.</string>
+  <string name="startup_donate_now">Bağış sayfasını göster</string>
+  <string name="startup_donate_later">Belki sonra</string>
+  <string name="startup_google_play_accounts_removed">Play Store DRM hata bilgisi</string>
+  <string name="startup_google_play_accounts_removed_message">Bazı durumlarda Play Store DRM\'i, cihazı yeniden başlatınca veya DAVdroid\'i yükseltince DAVdroid hesaplarının yokolmasına sebep olabiliyor. Bu sorundan etkileniyorsan (ve sadece bu durumda), lütfen Play Store\'daki \"DAVdroid JB Workaround\" uygulamasını kur.</string>
+  <string name="startup_google_play_accounts_removed_more_info">Daha fazla bilgi</string>
+  <string name="startup_opentasks_not_installed">OpenTasks kurulu değil</string>
+  <string name="startup_opentasks_not_installed_message">OpenTasks uygulaması yok, dolayısıyla DAVdroid iş listelerini senkronize edemeyecektir.</string>
+  <string name="startup_opentasks_reinstall_davdroid">OpenTasks\'i kurduktan sonra, DAVdroid\'i YENİDEN KURMAN ve hesaplarını yeniden eklemen gerek. (Android hatası).</string>
+  <string name="startup_opentasks_not_installed_install">OpenTasks kur</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Lisans şartları</string>
+  <string name="about_license_info_no_warranty">Bu uygulama HİÇ BİR GARANTİ ile gelmemektedir. Bedava bir yazılımdır ve belli koşullar altında dağıtabilirsiniz.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVdroid dosya jurnallemesi</string>
+  <string name="logging_to_external_storage">Harici depolamaya jurnalleniyor: %s</string>
+  <string name="logging_to_external_storage_warning">Jurnalleri bir an önce silin!</string>
+  <string name="logging_couldnt_create_file">Harici jurnal dosyası yaratılamadı: %s </string>
+  <string name="logging_no_external_storage">Harici depolama alanı bulunamadı</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Navigasyon çekmecesini aç</string>
+  <string name="navigation_drawer_close">Navigasyon çekmecesini kapat</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV Senkronizasyon Adaptörü</string>
+  <string name="navigation_drawer_about">Hakkında / Lisans</string>
+  <string name="navigation_drawer_settings">Ayarlar</string>
+  <string name="navigation_drawer_news_updates">Haberler  &amp; güncellemeler </string>
+  <string name="navigation_drawer_external_links">Harici bağlantılar</string>
+  <string name="navigation_drawer_website">Web sitesi</string>
+  <string name="navigation_drawer_faq">SSS</string>
+  <string name="navigation_drawer_forums">Camia</string>
+  <string name="navigation_drawer_donate">Bağış yap</string>
+  <string name="account_list_empty">DAVdroid\'e hoşgeldin!\n\nŞimdi bir CalDAV/CardDAV hesabı ekleyebilirsin.</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Servis keşfi başarısız</string>
+  <string name="dav_service_refresh_couldnt_refresh">Kolleksiyon listesi yenilenemedi</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Ayarlar</string>
+  <string name="app_settings_user_interface">Kullanıcı arayüzü</string>
+  <string name="app_settings_reset_hints">İpuçlarını sıfırla</string>
+  <string name="app_settings_reset_hints_summary">Daha önceden azat edilen ipuçlarını yeniden etkinleştirir</string>
+  <string name="app_settings_reset_hints_success">Tüm ipuçları artık gösterilecek</string>
+  <string name="app_settings_security">Güvenlik</string>
+  <string name="app_settings_debug">Hata ayıklama</string>
+  <string name="app_settings_log_to_external_storage">Harici dosyaya jurnalle</string>
+  <string name="app_settings_log_to_external_storage_on">Harici depolamaya jurnalleniyor (eğer uygunsa)</string>
+  <string name="app_settings_log_to_external_storage_off">Harici depolama mevcut değil</string>
+  <string name="app_settings_show_debug_info">Hata ayıklama bilgilerini göster</string>
+  <string name="app_settings_show_debug_info_details">Yazılım ve konfigürasyon detaylarına bak/paylaş</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Şimdi senkronize et</string>
+  <string name="account_synchronizing_now">Senkronize ediyor</string>
+  <string name="account_settings">Hesap ayarları</string>
+  <string name="account_delete">Hesabı sil</string>
+  <string name="account_delete_confirmation_title">Hesap gerçekten silinsin mi?</string>
+  <string name="account_delete_confirmation_text">Rehber, takvim ve iş listelerinin tüm yerel kopyaları silinecektir.</string>
+  <string name="account_refresh_address_book_list">Rehber listesini yenile</string>
+  <string name="account_create_new_address_book">Yeni rehber oluştur</string>
+  <string name="account_refresh_calendar_list">Takvim listesini yenile</string>
+  <string name="account_create_new_calendar">Yeni takvim oluştur</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid izinleri</string>
+  <string name="permissions_calendar">Takvim izinleri</string>
+  <string name="permissions_calendar_details">Takvim (sadece olaylar)
+</string>
+  <string name="permissions_calendar_request">Takvim izinleri iste</string>
+  <string name="permissions_contacts">Kişiler izinleri</string>
+  <string name="permissions_contacts_details">CardDAV rehberlerinin cihazınızdaki kişilerinizle senkronize edebilmek için, DAVdroid cihazınızdaki kişilerinize erişime ihtiyacı vardır.</string>
+  <string name="permissions_contacts_request">Kişiler izinleri iste</string>
+  <string name="permissions_opentasks">OpenTasks izinleri</string>
+  <string name="permissions_opentasks_details">CalDav iş listelerinizi yerel iş listelerinizle senkronize edebilmek için DAVdroid\'in OpenTasks\'e erişime ihtiyacı vardır.</string>
+  <string name="permissions_opentasks_request">OpenTasks izinleri iste</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Hesap ekle</string>
+  <string name="login_type_email">Eposta adresi ile giriş yap</string>
+  <string name="login_email_address">Eposta adresi</string>
+  <string name="login_email_address_error">Geçerli eposta adresi zorunludur</string>
+  <string name="login_password">Parola</string>
+  <string name="login_password_required">Parola zorunludur</string>
+  <string name="login_type_url">URL ve kullanıcı adı ile giriş yap</string>
+  <string name="login_url_must_be_http_or_https">URL http(s):// ile başlamalıdır</string>
+  <string name="login_url_host_name_required">Sunucu adı zorunludur</string>
+  <string name="login_user_name">Kullanıcı adı</string>
+  <string name="login_user_name_required">Kullanıcı adı zorunludur</string>
+  <string name="login_base_url">Baz URL</string>
+  <string name="login_login">Giriş</string>
+  <string name="login_back">Geri</string>
+  <string name="login_create_account">Hesap yarat</string>
+  <string name="login_account_name">Hesap adı</string>
+  <string name="login_account_name_info">Hesap ismi olarak e-posta adresini kullan çünkü Android hesap ismini yarattığın olaylarda DÜZENLEYEN alanında kullanacaktır. Aynı isimde iki faklı hesabın olamaz.</string>
+  <string name="login_account_name_required">Hesap adı zorunludur</string>
+  <string name="login_account_not_created">Hesap yaratılamadı</string>
+  <string name="login_configuration_detection">Konfigürasyon keşfi</string>
+  <string name="login_querying_server">Lütfen bekle, sunucu sorgulanıyor...</string>
+  <string name="login_no_caldav_carddav">CalDAV veya CardDAV servisi bulunamadı.</string>
+  <string name="login_view_logs">Jurnallere bak</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Ayarlar: %s</string>
+  <string name="settings_authentication">Doğrulama</string>
+  <string name="settings_username">Kullanıcı adı</string>
+  <string name="settings_enter_username">Kullanıcı adı girin:</string>
+  <string name="settings_password">Parola</string>
+  <string name="settings_password_summary">Parolayı sunucunuza göre güncelleyin.</string>
+  <string name="settings_enter_password">Parola girin:</string>
+  <string name="settings_sync">Senkronizasyon</string>
+  <string name="settings_sync_interval_contacts">Kişiler senk. aralığı</string>
+  <string name="settings_sync_summary_manually">Sadece elle</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Her %d dakika + yerel değişikliklerde hemen</string>
+  <string name="settings_sync_summary_not_available">Mevcut değil</string>
+  <string name="settings_sync_interval_calendars">Takvimler senk. aralığı</string>
+  <string name="settings_sync_interval_tasks">İşler senk. aralığı</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Sadece elle</item>
+    <item>Her 5 dakikada bir</item>
+    <item>Her 10 dakikada bir</item>
+    <item>Her 15 dakikada bir</item>
+    <item>Her saatte bir</item>
+    <item>Her 2 saatte bir</item>
+    <item>Her 4 saatte bir</item>
+    <item>Günde bir</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Sadece WiFi üzerinden senkronize et</string>
+  <string name="settings_sync_wifi_only_on">Senkronizasyon WiFi bağlantıları ile kısıtlıdır</string>
+  <string name="settings_sync_wifi_only_off">Bağlantı tipi göz önünde bulundurulmaz</string>
+  <string name="settings_sync_wifi_only_ssid">WiFi SSID kısıtlaması</string>
+  <string name="settings_sync_wifi_only_ssid_on">Sadece %s üzerinden senkronize olur</string>
+  <string name="settings_sync_wifi_only_ssid_off">Tüm WiFi bağlantıları kullanılabilir</string>
+  <string name="settings_sync_wifi_only_ssid_message">Senkronizasyonu sadece bir WiFi ağına kısıtlamak için bu ağın adını (SSID) gir, veya tüm WiFi bağlantıları için boş bırak.</string>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Geçmiş olay zaman sınırı</string>
+  <string name="settings_sync_time_range_past_none">Tüm olaylar senkronize edilecek</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="other">%d günden daha eski olaylar göz ardı edilecektir</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Bu sayıdan daha eski olan olaylar yok sayılacaktır (0 olabilir). Tüm olayları senkronize etmek için boş bırak.</string>
+  <string name="settings_manage_calendar_colors">Takvim renklerini yönet</string>
+  <string name="settings_manage_calendar_colors_on">Takvim renkleri DAVdroid tarafından yönetilmekte</string>
+  <string name="settings_manage_calendar_colors_off">Takvim renkleri DAVdroid tarafından ayarlanmadı</string>
+  <!--collection management-->
+  <string name="create_addressbook">Rehber yarat</string>
+  <string name="create_addressbook_display_name_hint">Benim Rehberim</string>
+  <string name="create_calendar">CalDav koleksiyonu yarat</string>
+  <string name="create_calendar_display_name_hint">Benim Takvimim</string>
+  <string name="create_calendar_time_zone">Saat dilimi:</string>
+  <string name="create_calendar_type">Koleksiyon Tipi:</string>
+  <string name="create_calendar_type_only_events">Takvim (sadece olaylar)</string>
+  <string name="create_calendar_type_only_tasks">İşler listesi (sadece işler)
+</string>
+  <string name="create_calendar_type_events_and_tasks">Birleşik (olaylar ve işler)</string>
+  <string name="create_collection_color">Bir koleksiyon rengi tanımla</string>
+  <string name="create_collection_creating">Koleksiyon yaratılıyor</string>
+  <string name="create_collection_display_name">Bu koleksiyonun gösterilen adı (başlığı):</string>
+  <string name="create_collection_display_name_required">Başlık zorunlu</string>
+  <string name="create_collection_description">Açıklama (isteğe bağlı):</string>
+  <string name="create_collection_home_set">Ev seti:</string>
+  <string name="create_collection_create">Yarat</string>
+  <string name="delete_collection">Koleksiyonu sil</string>
+  <string name="delete_collection_confirm_title">Emin misin?</string>
+  <string name="delete_collection_confirm_warning">Bu koleksiyon (%s) ve tüm verisi sunucudan silinecek.</string>
+  <string name="delete_collection_deleting_collection">Koleksiyon siliniyor</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Bir hata oluştu.</string>
+  <string name="exception_httpexception">Bir HTTP hatası oluştu.</string>
+  <string name="exception_ioexception">Bir I/O hatası oluştu.</string>
+  <string name="exception_show_details">Detayları göster</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Hata ayıklama bilgisi</string>
+  <string name="sync_error_permissions">DAVdroid izinleri</string>
+  <string name="sync_error_permissions_text">Ek izinler zorunludur</string>
+  <string name="sync_error_calendar">Takvim senkronizasyonu başarısız (%s)</string>
+  <string name="sync_error_contacts">Rehber senkronizasyonu başarısız (%s)</string>
+  <string name="sync_error_tasks">İş senkronizasyonu başarısız (%s)</string>
+  <string name="sync_error">%s yaparken hata</string>
+  <string name="sync_error_http_dav">%s yaparken sunucu hatası</string>
+  <string name="sync_error_local_storage">%s yaparken veritabanı hatası</string>
+  <string name="sync_error_unauthorized">Kullanıcı adı/parola yanlış</string>
+  <!--cert4android-->
+</resources>

app/src/davdroid/res/values-uk/strings.xml

@@ -0,0 +1,246 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="account_title_address_book">Адресна книга DAVdroid</string>
+  <string name="address_books_authority_title">Адресні книги</string>
+  <string name="help">Допомога</string>
+  <string name="manage_accounts">Керування обліковими записами</string>
+  <string name="please_wait">Будь ласка, зачекайте...</string>
+  <string name="send">Відправити</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Оптимізація енергоспоживання</string>
+  <string name="startup_battery_optimization_message">Android може вимкнути, чи призупинити синхронізацію DAVdroid через деякий час. Аби запобігти цьому, вимкніть оптимізацію енергоспоживання для додатку.</string>
+  <string name="startup_battery_optimization_disable">Вимкнути для DAVdroid</string>
+  <string name="startup_dont_show_again">Не показувати знову</string>
+  <string name="startup_development_version">DAVdroid попередній випуск</string>
+  <string name="startup_development_version_message">Це версія DAVdroid для розробників. Майте на увазі, дещо може працювати не так, як заплановано. Будь ласка, залиште конструктивний відгук для поліпшення DAVdroid.</string>
+  <string name="startup_development_version_give_feedback">Залишити відгук</string>
+  <string name="startup_donate">Інформація Open-Source</string>
+  <string name="startup_donate_message">Ми раді, що Ви використовуєте DAVdroid, який є програмним засобом з відкритим джерельним кодом (GPLv3). Розробка DAVdroid є досить складним завданням і потребує від нас тисячі годин роботи. Будь ласка, розгляньте можливість підтримати проект.</string>
+  <string name="startup_donate_now">Показати сторінку пожертви</string>
+  <string name="startup_donate_later">Можливо пізніше</string>
+  <string name="startup_google_play_accounts_removed">Інформація про ваду в Play Store DRM</string>
+  <string name="startup_google_play_accounts_removed_message">При деяких обставинах Play Store DRM може стати причиною втрати всіх облікових записів DAVdroid після перезавантаження пристрою чи оновлення DAVdroid. Якщо ви зіткнулися із цим (і лише у цьому випадку), будь ласка, встановіть \"DAVdroid JB Workaround\" з Play Store.</string>
+  <string name="startup_google_play_accounts_removed_more_info">Детальніше</string>
+  <string name="startup_opentasks_not_installed">OpenTasks не встановлено</string>
+  <string name="startup_opentasks_not_installed_message">Додаток OpenTasks не встановлено, ото ж DAVdroid не зможе синхронізувати завдання.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Після встановлення OpenTasks, необхідно перевстановити DAVdroid та додати облікові записи знову (Вада системи Android).</string>
+  <string name="startup_opentasks_not_installed_install">Встановити OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Умови ліцензії</string>
+  <string name="about_license_info_no_warranty">Цей програмний засіб постачається АБСОЛЮТНО БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ. Це вільне програмне забезпечення, і ви можете поширювати її, за деякими умовами.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">Файл звітування DAVdroid</string>
+  <string name="logging_to_external_storage">Звітування до зовнішнього сховища: %s</string>
+  <string name="logging_to_external_storage_warning">Вилучіть звіт якомога швидше!</string>
+  <string name="logging_couldnt_create_file">Не вдалося створити файл зовнішнього звіту: %s</string>
+  <string name="logging_no_external_storage">Не знайдено зовнішнього сховища</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Відкрити панель навігації</string>
+  <string name="navigation_drawer_close">Закрити панель навігації</string>
+  <string name="navigation_drawer_subtitle">Адаптер синхронізації CalDAV/CardDAV</string>
+  <string name="navigation_drawer_about">Про / Ліцензія</string>
+  <string name="navigation_drawer_settings">Налаштування</string>
+  <string name="navigation_drawer_news_updates">Новини та оновлення</string>
+  <string name="navigation_drawer_external_links">Зовнішні посилання</string>
+  <string name="navigation_drawer_website">Веб сайт</string>
+  <string name="navigation_drawer_faq">Питання/Відповіді</string>
+  <string name="navigation_drawer_forums">Спільнота</string>
+  <string name="navigation_drawer_donate">Підтримка</string>
+  <string name="account_list_empty">Вітаємо у DAVdroid!\n\nТепер можете додавати облікові записи CalDAV/CardDAV.</string>
+  <string name="accounts_global_sync_disabled">Автоматичну синхронізацію вимкнено зі сторони системи</string>
+  <string name="accounts_global_sync_enable">Увімкнути</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Не вдалося виявити сервіси</string>
+  <string name="dav_service_refresh_couldnt_refresh">Не вдалося оновити перелік колекції</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Налаштування</string>
+  <string name="app_settings_user_interface">Інтерфейс користувача</string>
+  <string name="app_settings_reset_hints">Скинути підказки</string>
+  <string name="app_settings_reset_hints_summary">Включення підказок, які раніше були вимкнуті</string>
+  <string name="app_settings_reset_hints_success">Всі підказки будуть показані знову</string>
+  <string name="app_settings_connection">З\'єднання</string>
+  <string name="app_settings_override_proxy">Перевизначити налаштування проксі</string>
+  <string name="app_settings_override_proxy_on">Власні налаштування проксі</string>
+  <string name="app_settings_override_proxy_off">Типові системні налаштування проксі</string>
+  <string name="app_settings_override_proxy_host">Ім\'я хосту HTTP проксі</string>
+  <string name="app_settings_override_proxy_port">Порт HTTP проксі</string>
+  <string name="app_settings_security">Безпека</string>
+  <string name="app_settings_distrust_system_certs">Не довіряти системним сертифікатам</string>
+  <string name="app_settings_distrust_system_certs_on">Не довіряти системним та доданим користувачем сертифікатам</string>
+  <string name="app_settings_distrust_system_certs_off">Довіряти системним та доданим користувачем сертифікатам (рекомендується)</string>
+  <string name="app_settings_reset_certificates">Скидання (не)довірених сертифікатів</string>
+  <string name="app_settings_reset_certificates_summary">Скинути довіру до всіх призначених користувачу сертифікатів</string>
+  <string name="app_settings_reset_certificates_success">Всі сертифікати, що призначені користувачу очищено</string>
+  <string name="app_settings_debug">Зневадження</string>
+  <string name="app_settings_log_to_external_storage">Звіт до зовнішнього файлу</string>
+  <string name="app_settings_log_to_external_storage_on">Звітування до зовнішнього файлу (якщо доступно)</string>
+  <string name="app_settings_log_to_external_storage_off">Звітування у зовнішній файл вимкнено</string>
+  <string name="app_settings_show_debug_info">Показати інформацію зневадження</string>
+  <string name="app_settings_show_debug_info_details">Переглянути/поділитися програмним засобом та деталями конфігурації</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Синхронізувати зараз</string>
+  <string name="account_synchronizing_now">Синхронізація</string>
+  <string name="account_settings">Налаштування облікового запису</string>
+  <string name="account_rename">Перейменувати обліковий запис</string>
+  <string name="account_rename_new_name">Незбережені локальні дані можуть бути втрачені. Необхідно виконати синхронізацію після перейменування. Нова назва облікового запису:</string>
+  <string name="account_rename_rename">Перейменувати</string>
+  <string name="account_delete">Видалити запис</string>
+  <string name="account_delete_confirmation_title">Дійсно видалити обліковий запис?</string>
+  <string name="account_delete_confirmation_text">Всі локальні копії адресних книг, календарів та завдань будуть вилучені.</string>
+  <string name="account_refresh_address_book_list">Оновити перелік адресних книг</string>
+  <string name="account_create_new_address_book">Створити нову адресну книгу</string>
+  <string name="account_refresh_calendar_list">Оновити перелік каленарів</string>
+  <string name="account_create_new_calendar">Створити новий календар</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">Дозволи DAVdroid</string>
+  <string name="permissions_calendar">Дозволи календаря</string>
+  <string name="permissions_calendar_details">Для синхронізації CalDAV подій з локальним календарем необхідний дозвіл до Ваших календарів.</string>
+  <string name="permissions_calendar_request">Запит дозволів календаря</string>
+  <string name="permissions_contacts">Дозволи контактів</string>
+  <string name="permissions_contacts_details">Для синхронізації адресної книги CalDAV з локальними контактами необхідний дозвіл до Ваших контактів.</string>
+  <string name="permissions_contacts_request">Запит дозволів контактів</string>
+  <string name="permissions_opentasks">Дозволи OpenTasks</string>
+  <string name="permissions_opentasks_details">Для синхронізації CalDAV завдань з локальним списком завдань необхідний дозвіл до OpenTasks.</string>
+  <string name="permissions_opentasks_request">Запит дозволів OpenTasks</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Додати запис</string>
+  <string name="login_type_email">Увійти за допомогою електронної пошти</string>
+  <string name="login_email_address">Адреса пошти</string>
+  <string name="login_email_address_error">Потребує валідну електронну адресу</string>
+  <string name="login_password">Пароль</string>
+  <string name="login_password_required">Потребує пароль</string>
+  <string name="login_type_url">Увійти за допомогою URL та імені користувача</string>
+  <string name="login_url_must_be_http_or_https">URL адреса повинна починатися з http(s)://</string>
+  <string name="login_url_host_name_required">Потребує назву хосту</string>
+  <string name="login_user_name">Ім\'я користувача</string>
+  <string name="login_user_name_required">Потребує ім\'я користувача</string>
+  <string name="login_base_url">Базовий URL</string>
+  <string name="login_login">Увійти</string>
+  <string name="login_back">Назад</string>
+  <string name="login_create_account">Створити запис</string>
+  <string name="login_account_name">Назва запису</string>
+  <string name="login_account_name_info">Використовуйте вашу електронну адресу як ім\'я облікового запису, так як Android буде використовувати ім\'я облікового запису в полі ORGANIZER для подій, які ви створюватимете. Ви не можете мати два облікових записи з однаковими іменами.</string>
+  <string name="login_account_contact_group_method">Метод групування контактів:</string>
+  <string name="login_account_name_required">Потребує назви облікового запису</string>
+  <string name="login_account_not_created">Обліковий запис не може бути створений</string>
+  <string name="login_configuration_detection">Виявлення конфігурації</string>
+  <string name="login_querying_server">Будь ласка, зачекайте, запит до серверу...</string>
+  <string name="login_no_caldav_carddav">Не вдалося знайти  CalDAV чи CardDAV сервіс.</string>
+  <string name="login_view_logs">Переглянути звіти</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Налаштування: %s</string>
+  <string name="settings_authentication">Автентифікація</string>
+  <string name="settings_username">Ім\'я користувача</string>
+  <string name="settings_enter_username">Введіть ім\'я користувача:</string>
+  <string name="settings_password">Пароль</string>
+  <string name="settings_password_summary">Оновити пароль, згідно налаштувань Вашого сервера.</string>
+  <string name="settings_enter_password">Введіть Ваш пароль:</string>
+  <string name="settings_sync">Синхронізація</string>
+  <string name="settings_sync_interval_contacts">Інтервал синхронізації контактів</string>
+  <string name="settings_sync_summary_manually">Лише вручну</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Кожних %d хвилин, а також негайно при внесенні локальних змін</string>
+  <string name="settings_sync_summary_not_available">Не доступно</string>
+  <string name="settings_sync_interval_calendars">Інтервал синхронізації календарів</string>
+  <string name="settings_sync_interval_tasks">Інтервал синхронізації завдань</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>Лише вручну</item>
+    <item>Кожних 5 хвилин</item>
+    <item>Кожних 10 хвилин</item>
+    <item>Кожних 15 хвилин</item>
+    <item>Щогодини</item>
+    <item>Кожних 2 години</item>
+    <item>Кожних 4 години</item>
+    <item>Раз на добу</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Синхронізувати лише через Wi-Fi</string>
+  <string name="settings_sync_wifi_only_on">Виконувати синхронізацію лише через Wi-Fi</string>
+  <string name="settings_sync_wifi_only_off">Не враховувати тип з\'єднання</string>
+  <string name="settings_sync_wifi_only_ssid">Обмеження WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssid_on">Синхронізувати лише через %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Може використовуватись всі Wi-Fi з\'єднання</string>
+  <string name="settings_sync_wifi_only_ssid_message">Вкажіть назву Wi-Fi мережі (SSID), аби дозволити синхронізацію лише через неї. Або залиште пустим, для синхронізації через будь-які Wi-Fi мережі.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Метод групування контактів</string>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Групи як окремі VCard</item>
+    <item>Групи як категорії в середині контактів</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Інтервал синхронізації</string>
+  <string name="settings_sync_time_range_past_none">Всі події будуть синхронізовані</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Події старші одного дня будуть проігноровані</item>
+    <item quantity="few">Події старші %d днів будуть проігноровані</item>
+    <item quantity="other">Події старші %d днів будуть проігноровані</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Події старші вказаного часу будуть проігноровані (може бути 0). Залиште порожнім, аби синхронізувати всі події.</string>
+  <string name="settings_manage_calendar_colors">Керування кольорами календаря</string>
+  <string name="settings_manage_calendar_colors_on">Кольори календаря керуються DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Кольори календаря не керуються DAVdroid</string>
+  <!--collection management-->
+  <string name="create_addressbook">Створити адресну книгу</string>
+  <string name="create_addressbook_display_name_hint">Моя адресна книга</string>
+  <string name="create_calendar">Створити CalDAV колекцію</string>
+  <string name="create_calendar_display_name_hint">Мій календар</string>
+  <string name="create_calendar_time_zone">Часова зона:</string>
+  <string name="create_calendar_type">Тип колекції:</string>
+  <string name="create_calendar_type_only_events">Календар (лише події)</string>
+  <string name="create_calendar_type_only_tasks">Список завдань (лише завдання)</string>
+  <string name="create_calendar_type_events_and_tasks">Об\'єднаний (події та завдання)</string>
+  <string name="create_collection_color">Встановити колір колекції</string>
+  <string name="create_collection_creating">Створення колекції</string>
+  <string name="create_collection_display_name">Ім\'я, що показуватиметься (назва ) для колекції</string>
+  <string name="create_collection_display_name_required">Потребує назву</string>
+  <string name="create_collection_description">Опис (за бажанням):</string>
+  <string name="create_collection_home_set">Головна тека:</string>
+  <string name="create_collection_create">Створити</string>
+  <string name="delete_collection">Видалити колекцію</string>
+  <string name="delete_collection_confirm_title">Ви впевнені?</string>
+  <string name="delete_collection_confirm_warning">Колекція (%s) та всі пов\'язані данні будуть вилучені з даного серверу.</string>
+  <string name="delete_collection_deleting_collection">Видалення колекції</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Трапилась помилка.</string>
+  <string name="exception_httpexception">Трапилась помилка HTTP.</string>
+  <string name="exception_ioexception">Трапилась помилка I/O.</string>
+  <string name="exception_show_details">Показати подробиці</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">Інформація зневадження</string>
+  <string name="sync_error_permissions">Дозволи DAVdroid</string>
+  <string name="sync_error_permissions_text">Потребує додаткові дозволи</string>
+  <string name="sync_error_calendar">Помилка синхронізації календаря (%s)</string>
+  <string name="sync_error_contacts">Помилка синхронізації адресної книги (%s)</string>
+  <string name="sync_error_tasks">Помилка синхронізації завдань (%s)</string>
+  <string name="sync_error">Помилка під час %s</string>
+  <string name="sync_error_http_dav">Помилка серверу під час %s</string>
+  <string name="sync_error_local_storage">Помилка серверу під час %s</string>
+  <string-array name="sync_error_phases">
+    <item>підготовка синхронізації</item>
+    <item>опитування можливостей</item>
+    <item>обробка локально вилучених записів</item>
+    <item>підготовка створених/змінених записів</item>
+    <item>вивантаження створених/змінених записів</item>
+    <item>перевірка стану синхронізації</item>
+    <item>перелік локальних записів</item>
+    <item>перелік віддалених записів</item>
+    <item>порівняння локальних/віддалених записів</item>
+    <item>завантаження віддалених записів</item>
+    <item>після обробка</item>
+    <item>збереження стану синхронізації</item>
+  </string-array>
+  <string name="sync_error_unauthorized">Невірне ім\'я користувача чи пароль</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: Безпека з\'єднання</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroid зіткнувся з невідомим сертифікатом. Чи довіряти йому?</string>
+</resources>

app/src/davdroid/res/values-v21/styles.xml

@@ -0,0 +1,18 @@
+<!--
+  ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+  ~ All rights reserved. This program and the accompanying materials
+  ~ are made available under the terms of the GNU Public License v3.0
+  ~ which accompanies this distribution, and is available at
+  ~ http://www.gnu.org/licenses/gpl.html
+  -->
+
+<resources>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+</resources>

app/src/davdroid/res/values-zh-rCN/strings.xml

@@ -0,0 +1,251 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVdroid</string>
+  <string name="account_title_address_book">DAVdroid 通讯录</string>
+  <string name="address_books_authority_title">通讯录</string>
+  <string name="help">帮助</string>
+  <string name="manage_accounts">管理账户</string>
+  <string name="please_wait">请稍等...</string>
+  <string name="send">发送</string>
+  <string name="homepage_url">https://davdroid.bitfire.at/?pk_campaign=davdroid-app</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">电池优化</string>
+  <string name="startup_battery_optimization_message">系统可能会在几天后减少或停用 DAVdroid 同步。为了避免这一情况，请禁用对 DAVdroid 的电池优化。</string>
+  <string name="startup_battery_optimization_disable">禁用电池优化</string>
+  <string name="startup_dont_show_again">不再显示</string>
+  <string name="startup_development_version">DAVdroid 预览版</string>
+  <string name="startup_development_version_message">这是 DAVdroid 的开发版本，部分功能可能无法正常工作。请您提出建设性反馈，帮助我们完善 DAVdroid。</string>
+  <string name="startup_development_version_give_feedback">反馈</string>
+  <string name="startup_donate">开源信息</string>
+  <string name="startup_donate_message">欢迎使用 DAVdroid，这是一款开源软件 (GPLv3)。开发 DAVdroid 的工作花费了数千小时，请您考虑捐助我们。</string>
+  <string name="startup_donate_now">显示捐助页面</string>
+  <string name="startup_donate_later">稍后提示</string>
+  <string name="startup_google_play_accounts_removed">Play 商店 DRM 问题提醒</string>
+  <string name="startup_google_play_accounts_removed_message">在某些情况下，Play 商店的 DRM 可能会导致所有 DAVdroid 账户在设备重启或升级 DAVdroid 后消失。如果你遇到了该问题，请从 Play 商店安装“DAVdroid JB Workaround”，否则请不要安装修复程序。</string>
+  <string name="startup_google_play_accounts_removed_more_info">更多信息</string>
+  <string name="startup_opentasks_not_installed">OpenTasks 未安装</string>
+  <string name="startup_opentasks_not_installed_message">未安装 OpenTasks 应用，故 DAVdroid 无法同步任务列表。</string>
+  <string name="startup_opentasks_reinstall_davdroid">安装 OpenTasks 后，由于 Android 的限制，请重新安装 DAVdroid 并重新创建账户。</string>
+  <string name="startup_opentasks_not_installed_install">安装 OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">许可协议</string>
+  <string name="about_license_info_no_warranty">本程序不附带任何担保。这是一款自由软件，你可以有条件地传播它。</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVdroid 文件日志</string>
+  <string name="logging_to_external_storage">记录日志到外部存储 %s</string>
+  <string name="logging_to_external_storage_warning">请尽快删除日志！</string>
+  <string name="logging_couldnt_create_file">无法创建外部日志文件 %s</string>
+  <string name="logging_no_external_storage">找不到外部存储</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">打开导航抽屉</string>
+  <string name="navigation_drawer_close">关闭导航抽屉</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV 同步器</string>
+  <string name="navigation_drawer_about">关于 / 许可</string>
+  <string name="navigation_drawer_settings">设置</string>
+  <string name="navigation_drawer_news_updates">最新消息</string>
+  <string name="navigation_drawer_external_links">外部链接</string>
+  <string name="navigation_drawer_website">应用网站</string>
+  <string name="navigation_drawer_faq">常见问题</string>
+  <string name="navigation_drawer_faq_url">https://davdroid.bitfire.at/faq/?pk_campaign=davdroid-app</string>
+  <string name="navigation_drawer_forums">社区</string>
+  <string name="navigation_drawer_donate">捐助</string>
+  <string name="account_list_empty">欢迎使用 DAVdroid！\n\n现在你可以增加 CalDAV/CardDAV 账户。</string>
+  <string name="accounts_global_sync_disabled">系统全局自动同步已禁用</string>
+  <string name="accounts_global_sync_enable">启用</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">服务配置检测失败</string>
+  <string name="dav_service_refresh_couldnt_refresh">无法刷新集合列表</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">设置</string>
+  <string name="app_settings_user_interface">用户界面</string>
+  <string name="app_settings_reset_hints">重设提示</string>
+  <string name="app_settings_reset_hints_summary">重新显示之前忽略过的提示</string>
+  <string name="app_settings_reset_hints_success">所有提示将会再次显示</string>
+  <string name="app_settings_connection">连接</string>
+  <string name="app_settings_override_proxy">覆盖代理设置</string>
+  <string name="app_settings_override_proxy_on">使用自定义代理设置</string>
+  <string name="app_settings_override_proxy_off">使用系统默认代理设置</string>
+  <string name="app_settings_override_proxy_host">HTTP 代理主机名</string>
+  <string name="app_settings_override_proxy_port">HTTP 代理端口</string>
+  <string name="app_settings_security">安全</string>
+  <string name="app_settings_distrust_system_certs">不信任系统证书</string>
+  <string name="app_settings_distrust_system_certs_on">系统和用户增加的发布者不会被信任</string>
+  <string name="app_settings_distrust_system_certs_off">系统和用户增加的发布者会被信任（推荐）</string>
+  <string name="app_settings_reset_certificates">重设证书信任状态</string>
+  <string name="app_settings_reset_certificates_summary">重设所有自定义证书的信任状态</string>
+  <string name="app_settings_reset_certificates_success">所有自定义证书已清除</string>
+  <string name="app_settings_debug">调试</string>
+  <string name="app_settings_log_to_external_storage">外部文件日志</string>
+  <string name="app_settings_log_to_external_storage_on">记录日志到外部存储（如果可用）</string>
+  <string name="app_settings_log_to_external_storage_off">外部文件日志已禁用</string>
+  <string name="app_settings_show_debug_info">显示调试信息</string>
+  <string name="app_settings_show_debug_info_details">查看软件和配置信息</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now"> 立即同步</string>
+  <string name="account_synchronizing_now">正在同步</string>
+  <string name="account_settings">账户设置</string>
+  <string name="account_rename">重命名账户</string>
+  <string name="account_rename_new_name">重命名后，未上传的本地修改会被撤销，您需要重新执行同步。新账户名：</string>
+  <string name="account_rename_rename">重命名</string>
+  <string name="account_delete">删除账户</string>
+  <string name="account_delete_confirmation_title">真的要删除账户吗？</string>
+  <string name="account_delete_confirmation_text">所有通讯录、日历和任务列表的本机存储将被删除。</string>
+  <string name="account_refresh_address_book_list">刷新通讯录列表</string>
+  <string name="account_create_new_address_book">创建通讯录</string>
+  <string name="account_refresh_calendar_list">刷新日历列表</string>
+  <string name="account_create_new_calendar">创建日历</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid 权限</string>
+  <string name="permissions_calendar">日历权限</string>
+  <string name="permissions_calendar_details">要把 CalDAV 事件与本地日历同步，DAVdroid 需要日历权限。</string>
+  <string name="permissions_calendar_request">请求日历权限</string>
+  <string name="permissions_contacts">通讯录权限</string>
+  <string name="permissions_contacts_details">要把 CardDAV 通讯录与本地通讯录同步，DAVdroid 需要通讯录权限。</string>
+  <string name="permissions_contacts_request">请求通讯录权限</string>
+  <string name="permissions_opentasks">OpenTasks 权限</string>
+  <string name="permissions_opentasks_details">要把 CalDAV 任务与本地任务列表同步，DAVdroid 需要访问 OpenTasks。</string>
+  <string name="permissions_opentasks_request">请求 OpenTasks 权限</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://davdroid.bitfire.at/configuration/?pk_campaign=davdroid-app</string>
+  <string name="login_title">增加账户</string>
+  <string name="login_type_email">使用邮箱地址登录</string>
+  <string name="login_email_address">Email 地址</string>
+  <string name="login_email_address_error">请输入有效 Email 地址</string>
+  <string name="login_password">密码</string>
+  <string name="login_password_required">请输入密码</string>
+  <string name="login_type_url">使用 URL 和用户名登录</string>
+  <string name="login_url_must_be_http_or_https">URL 必须以 http(s):// 为开头</string>
+  <string name="login_url_host_name_required">请输入主机名</string>
+  <string name="login_user_name">用户名</string>
+  <string name="login_user_name_required">请输入用户名</string>
+  <string name="login_base_url">根地址</string>
+  <string name="login_login">登录</string>
+  <string name="login_back">返回</string>
+  <string name="login_create_account">创建账户</string>
+  <string name="login_account_name">账户显示名</string>
+  <string name="login_account_name_info">请使用你的邮箱地址作为帐户名，因为 Android 会将你创建的日历事件的创建者项设置为帐户名。你不能拥有多个帐户名相同的账户。</string>
+  <string name="login_account_contact_group_method">联系人分组方式</string>
+  <string name="login_account_name_required">请输入账户名</string>
+  <string name="login_account_not_created">账户无法创建</string>
+  <string name="login_configuration_detection">正在配置</string>
+  <string name="login_querying_server">正在与服务器通信，请稍等...</string>
+  <string name="login_no_caldav_carddav">找不到 CalDAV 或 CardDAV 服务。</string>
+  <string name="login_view_logs">查看日志</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">设置：%s</string>
+  <string name="settings_authentication">认证</string>
+  <string name="settings_username">用户名</string>
+  <string name="settings_enter_username">输入用户名</string>
+  <string name="settings_password">密码</string>
+  <string name="settings_password_summary">修改服务器密码</string>
+  <string name="settings_enter_password">输入密码</string>
+  <string name="settings_sync">同步</string>
+  <string name="settings_sync_interval_contacts">通讯录自动同步间隔</string>
+  <string name="settings_sync_summary_manually">手动同步</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">每 %d 分钟或本地修改后</string>
+  <string name="settings_sync_summary_not_available">不可用</string>
+  <string name="settings_sync_interval_calendars">日历自动同步间隔</string>
+  <string name="settings_sync_interval_tasks">任务自动同步间隔</string>
+  <string-array name="settings_sync_interval_seconds">
+    <item>-1</item>
+    <item>300</item>
+    <item>600</item>
+    <item>900</item>
+    <item>3600</item>
+    <item>7200</item>
+    <item>14400</item>
+    <item>86400</item>
+  </string-array>
+  <string-array name="settings_sync_interval_names">
+    <item>手动同步</item>
+    <item>每 5 分钟</item>
+    <item>每 10 分钟</item>
+    <item>每 15 分钟</item>
+    <item>每 1 小时</item>
+    <item>每 2 小时</item>
+    <item>每 4 小时</item>
+    <item>每 24 小时</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">只在 WiFi 下同步</string>
+  <string name="settings_sync_wifi_only_on">同步只在 WiFi 连接下进行</string>
+  <string name="settings_sync_wifi_only_off">同步不受数据连接类型限制</string>
+  <string name="settings_sync_wifi_only_ssid">WiFi SSID 限制</string>
+  <string name="settings_sync_wifi_only_ssid_on">同步只在 %s 网络下进行</string>
+  <string name="settings_sync_wifi_only_ssid_off">任何 WiFi 网络下均会同步</string>
+  <string name="settings_sync_wifi_only_ssid_message">输入 WiFi 网络的名称 (SSID) ，即可限制同步只在此网络下进行。留空则不限制。</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">联系人分组方式</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>分为不同的 VCards</item>
+    <item>每个联系人的分类</item>
+  </string-array>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">旧日程时间限制</string>
+  <string name="settings_sync_time_range_past_none">同步所有日程</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="other">%d 天前的日程不会被同步</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">超过这个数字的天数的旧日程将会被忽略（可以为 0）。留空则同步所有日程。</string>
+  <string name="settings_manage_calendar_colors">管理日历颜色</string>
+  <string name="settings_manage_calendar_colors_on">日历颜色由 DAVdroid 设置</string>
+  <string name="settings_manage_calendar_colors_off">日历颜色不由 DAVdroid 设置</string>
+  <!--collection management-->
+  <string name="create_addressbook">创建通讯录</string>
+  <string name="create_addressbook_display_name_hint">我的通讯录</string>
+  <string name="create_calendar">创建 CalDAV 集合</string>
+  <string name="create_calendar_display_name_hint">我的日历</string>
+  <string name="create_calendar_time_zone">时区</string>
+  <string name="create_calendar_type">集合类型</string>
+  <string name="create_calendar_type_only_events">日历（只有日程）</string>
+  <string name="create_calendar_type_only_tasks">任务列表（只有任务）</string>
+  <string name="create_calendar_type_events_and_tasks">混合（日程和任务）</string>
+  <string name="create_collection_color">设置集合颜色</string>
+  <string name="create_collection_creating">正在创建集合</string>
+  <string name="create_collection_display_name">集合显示名称（标题）</string>
+  <string name="create_collection_display_name_required">请输入标题</string>
+  <string name="create_collection_description">简介（可选）</string>
+  <string name="create_collection_home_set">主集合</string>
+  <string name="create_collection_create">创建</string>
+  <string name="delete_collection">删除集合</string>
+  <string name="delete_collection_confirm_title">你确定吗？</string>
+  <string name="delete_collection_confirm_warning">这个集合 %s 及其所有数据将会从服务器删除。</string>
+  <string name="delete_collection_deleting_collection">正在删除集合</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">出现错误</string>
+  <string name="exception_httpexception">出现 HTTP 错误</string>
+  <string name="exception_ioexception">出现 I/O 错误</string>
+  <string name="exception_show_details">显示详情</string>
+  <!--sync errors and DebugInfoActivity-->
+  <string name="debug_info_title">调试信息</string>
+  <string name="sync_error_permissions">DAVdroid 权限</string>
+  <string name="sync_error_permissions_text">需要额外权限</string>
+  <string name="sync_error_calendar">日历同步失败（%s）</string>
+  <string name="sync_error_contacts">通讯录同步失败（%s）</string>
+  <string name="sync_error_tasks">任务同步失败（%s）</string>
+  <string name="sync_error">%s时错误</string>
+  <string name="sync_error_http_dav">%s时服务器错误</string>
+  <string name="sync_error_local_storage">%s时数据库错误</string>
+  <string-array name="sync_error_phases">
+    <item>准备同步</item>
+    <item>请求功能列表</item>
+    <item>处理本地删除项目</item>
+    <item>准备创建/修改项目</item>
+    <item>上传创建/修改项目</item>
+    <item>检查同步状态</item>
+    <item>检查本地数据</item>
+    <item>检查远程数据</item>
+    <item>比较本地和远程数据</item>
+    <item>下载远程数据</item>
+    <item>预处理</item>
+    <item>保存同步状态</item>
+  </string-array>
+  <string name="sync_error_unauthorized">用户名或密码错误</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: 连接安全性</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroid 遇到了未知证书。你是否要信任该证书？</string>
+</resources>

app/src/davdroid/res/xml/sync_prefs.xml

@@ -9,10 +9,10 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
     
-    <PreferenceScreen android:title="@string/settings_title" >
+    <PreferenceScreen android:title="@string/manage_accounts">
         <intent
             android:targetPackage="at.bitfire.davdroid"
-            android:targetClass="at.bitfire.davdroid.syncadapter.SettingsActivity"
+            android:targetClass="at.bitfire.davdroid.ui.AccountsActivity"
             android:action="ACTION_VIEW" />
     </PreferenceScreen>
 

app/src/gplay/res/menu/activity_accounts_drawer.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+  ~ All rights reserved. This program and the accompanying materials
+  ~ are made available under the terms of the GNU Public License v3.0
+  ~ which accompanies this distribution, and is available at
+  ~ http://www.gnu.org/licenses/gpl.html
+  -->
+
+<menu xmlns:tools="http://schemas.android.com/tools"
+      xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/nav_about"
+        android:icon="@drawable/ic_info_dark"
+        android:title="@string/navigation_drawer_about"/>
+    <item
+        android:id="@+id/nav_app_settings"
+        android:icon="@drawable/ic_settings_action"
+        android:title="@string/navigation_drawer_settings"/>
+
+    <item android:title="@string/navigation_drawer_news_updates">
+        <menu>
+            <item
+                android:id="@+id/nav_twitter"
+                android:icon="@drawable/twitter"
+                android:title="\@davdroidapp"
+                tools:ignore="HardcodedText"/>
+        </menu>
+    </item>
+
+    <item android:title="@string/navigation_drawer_external_links">
+        <menu>
+            <item
+                android:id="@+id/nav_website"
+                android:icon="@drawable/ic_home_dark"
+                android:title="@string/navigation_drawer_website"/>
+            <item
+                android:id="@+id/nav_faq"
+                android:icon="@drawable/ic_help_action"
+                android:title="@string/navigation_drawer_faq"/>
+            <item
+                android:id="@+id/nav_forums"
+                android:icon="@drawable/ic_forum_dark"
+                android:title="@string/navigation_drawer_forums"/>
+            <item
+                android:id="@+id/nav_donate"
+                android:icon="@drawable/ic_attach_money_dark"
+                android:title="@string/navigation_drawer_donate"
+                android:visible="false"/>
+        </menu>
+    </item>
+
+</menu>

app/src/main/AndroidManifest.xml

@@ -5,90 +5,237 @@
   ~ are made available under the terms of the GNU Public License v3.0
   ~ which accompanies this distribution, and is available at
   ~ http://www.gnu.org/licenses/gpl.html
-  -->
+-->
+<manifest package="at.bitfire.davdroid"
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          android:installLocation="internalOnly">
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="at.bitfire.davdroid"
-    android:versionCode="55" android:versionName="0.7"
-    android:installLocation="internalOnly">
+    <!-- normal permissions -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
+    <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
 
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="21" />
+    <!-- account management permissions not required for own accounts since API level 22 -->
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" android:maxSdkVersion="22"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" android:maxSdkVersion="22"/>
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" android:maxSdkVersion="22"/>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_CALENDAR" />
-    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <!--
+         for writing external log files; permission only required for SDK <= 18 because since then,
+         writing to app-private directory doesn't require extra permissions
+    -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="18"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18"/>
+
+    <!-- other permissions -->
+    <!-- android.permission-group.CONTACTS -->
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+    <!-- android.permission-group.CALENDAR -->
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
+    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+
+    <!-- ical4android declares task access permissions -->
 
     <application
+        android:name=".App"
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:fullBackupContent="false"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        android:process=":sync">
+        tools:ignore="UnusedAttribute">
 
+        <receiver
+            android:name=".App$ReinitSettingsReceiver"
+            android:exported="false"
+            android:process=":sync">
+            <intent-filter>
+                <action android:name="at.bitfire.davdroid.REINIT_SETTINGS"/>
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name=".AccountSettings$AppUpdatedReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REPLACED" />
+                <data android:scheme="package" android:path="at.bitfire.davdroid" />
+            </intent-filter>
+        </receiver>
+
+        <!-- account type "DAVdroid" -->
         <service
             android:name=".syncadapter.AccountAuthenticatorService"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator" />
+                <action android:name="android.accounts.AccountAuthenticator"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/account_authenticator" />
-        </service>
-        <service
-            android:name=".syncadapter.ContactsSyncAdapterService"
-            android:exported="true" >
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.content.SyncAdapter"
-                android:resource="@xml/sync_contacts" />
-            <meta-data
-                android:name="android.provider.CONTACTS_STRUCTURE"
-                android:resource="@xml/contacts" />
+                android:resource="@xml/account_authenticator"/>
         </service>
         <service
             android:name=".syncadapter.CalendarsSyncAdapterService"
-            android:exported="true" >
+            android:exported="true"
+            android:process=":sync"
+            tools:ignore="ExportedService">
             <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
+                <action android:name="android.content.SyncAdapter"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.content.SyncAdapter"
-                android:resource="@xml/sync_calendars" />
+                android:resource="@xml/sync_calendars"/>
         </service>
 
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name" >
+        <service
+            android:name=".syncadapter.TasksSyncAdapterService"
+            android:exported="true"
+            android:process=":sync"
+            tools:ignore="ExportedService">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.content.SyncAdapter"/>
+            </intent-filter>
+
+            <meta-data
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/sync_tasks"/>
+        </service>
+
+        <!-- account type "DAVdroid Address book" -->
+        <service
+            android:name=".syncadapter.NullAuthenticatorService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator"/>
+            </intent-filter>
+
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/account_authenticator_address_book"/>
+        </service>
+        <provider
+            android:authorities="@string/address_books_authority"
+            android:exported="false"
+            android:label="@string/address_books_authority_title"
+            android:name=".syncadapter.AddressBookProvider"
+            android:multiprocess="false"/>
+        <service
+            android:name=".syncadapter.AddressBooksSyncAdapterService"
+            android:exported="true"
+            android:process=":sync"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter"/>
+            </intent-filter>
+
+            <meta-data
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/sync_address_books"/>
+        </service>
+        <service
+            android:name=".syncadapter.ContactsSyncAdapterService"
+            android:exported="true"
+            android:process=":sync"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter"/>
+            </intent-filter>
+
+            <meta-data
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/sync_contacts"/>
+            <meta-data
+                android:name="android.provider.CONTACTS_STRUCTURE"
+                android:resource="@xml/contacts"/>
+        </service>
+
+        <service
+            android:name=".DavService"
+            android:enabled="true">
+        </service>
+
+        <receiver android:name=".AccountsChangedReceiver">
+            <intent-filter>
+                <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name=".PackageChangedReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_ADDED"/>
+                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED"/>
+                <data android:scheme="package"/>
+            </intent-filter>
+        </receiver>
+
+        <activity
+            android:name=".ui.AccountsActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
         <activity
-            android:name=".syncadapter.AddAccountActivity"
-            android:excludeFromRecents="true" >
-        </activity>
+            android:name=".ui.AboutActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:parentActivityName=".ui.AccountsActivity"/>
+
         <activity
-            android:name=".syncadapter.SettingsActivity"
-            android:label="@string/settings_title" >
+            android:name=".ui.AppSettingsActivity"
+            android:label="@string/app_settings"
+            android:parentActivityName=".ui.AccountsActivity"/>
+
+        <activity android:name=".ui.PermissionsActivity"
+                  android:label="@string/permissions_title"
+                  android:parentActivityName=".ui.AccountsActivity"/>
+
+        <activity
+            android:name=".ui.setup.LoginActivity"
+            android:label="@string/login_title"
+            android:parentActivityName=".ui.AccountsActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
+                <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
+
+        <activity
+            android:name=".ui.AccountActivity"
+            android:parentActivityName=".ui.AccountsActivity">
+        </activity>
+        <activity android:name=".ui.AccountSettingsActivity"/>
+        <activity android:name=".ui.CreateAddressBookActivity"
+            android:label="@string/create_addressbook"/>
+        <activity android:name=".ui.CreateCalendarActivity"
+                  android:label="@string/create_calendar"/>
+
+        <activity
+            android:name=".ui.DebugInfoActivity"
+            android:exported="true"
+            android:label="@string/debug_info_title">
+        </activity>
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="@string/authority_log_provider"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/log_paths" />
+        </provider>
+
+
     </application>
 
 </manifest>

app/src/main/assets/apache2.html

@@ -0,0 +1,153 @@
+<h3>Apache License, Version 2.0, January 2004</h3>
+<p><a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a> </p>
+<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
+<p><strong><a name="definitions">1. Definitions</a></strong>.</p>
+<p>"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.</p>
+<p>"Licensor" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.</p>
+<p>"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.</p>
+<p>"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.</p>
+<p>"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation source,
+and configuration files.</p>
+<p>"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.</p>
+<p>"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).</p>
+<p>"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.</p>
+<p>"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."</p>
+<p>"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.</p>
+<p><strong><a name="copyright">2. Grant of Copyright License</a></strong>. 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.</p>
+<p><strong><a name="patent">3. Grant of Patent License</a></strong>. 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.</p>
+<p><strong><a name="redistribution">4. Redistribution</a></strong>. 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:</p>
+
+<p>a. You must give any other recipients of the Work or Derivative Works a
+copy of this License; and</p>
+
+<p>b. You must cause any modified files to carry prominent notices stating
+that You changed the files; and</p>
+
+<p>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</p>
+
+<p>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.
+<br/>
+<br/>
+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.
+</p>
+
+<p><strong><a name="contributions">5. Submission of Contributions</a></strong>. 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.</p>
+<p><strong><a name="trademarks">6. Trademarks</a></strong>. 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.</p>
+<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>. 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.</p>
+<p><strong><a name="no-liability">8. Limitation of Liability</a></strong>. 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.</p>
+<p><strong><a name="additional">9. Accepting Warranty or Additional Liability</a></strong>.
+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.</p>
+
+<p>END OF TERMS AND CONDITIONS</p>

app/src/main/assets/bsd-3clause.html

@@ -0,0 +1,28 @@
+<h3>BSD License (3-clause)</h3>
+
+<p>Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:</p>
+
+<p>o Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.</p>
+
+<p>o Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.</p>
+
+<p>o Neither the name of Ben Fortuna nor the names of any other contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.</p>
+
+<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>

app/src/main/assets/bsd.html

@@ -0,0 +1,23 @@
+<h3>BSD License</h3>
+
+<p>Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:</p>
+
+<p>1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.</p>
+
+<p>2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.</p>
+
+<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+

app/src/main/assets/gpl-3.0-standalone.html

@@ -0,0 +1,628 @@
+<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
+<p style="text-align: center;">Version 3, 29 June 2007</p>
+
+<p>Copyright &copy; 2007 Free Software Foundation, Inc.
+ &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p><p>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.</p>
+
+<h3><a name="preamble"></a>Preamble</h3>
+
+<p>The GNU General Public License is a free, copyleft license for
+software and other kinds of works.</p>
+
+<p>The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.</p>
+
+<p>When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.</p>
+
+<p>To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.</p>
+
+<p>For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.</p>
+
+<p>Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.</p>
+
+<p>For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.</p>
+
+<p>Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.</p>
+
+<p>Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.</p>
+
+<p>The precise terms and conditions for copying, distribution and
+modification follow.</p>
+
+<h3><a name="terms"></a>TERMS AND CONDITIONS</h3>
+
+<h4><a name="section0"></a>0. Definitions.</h4>
+
+<p>&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
+
+<p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.</p>
+ 
+<p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
+&ldquo;recipients&rdquo; may be individuals or organizations.</p>
+
+<p>To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a &ldquo;modified version&rdquo; of the
+earlier work or a work &ldquo;based on&rdquo; the earlier work.</p>
+
+<p>A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
+on the Program.</p>
+
+<p>To &ldquo;propagate&rdquo; a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.</p>
+
+<p>To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.</p>
+
+<p>An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo;
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.</p>
+
+<h4><a name="section1"></a>1. Source Code.</h4>
+
+<p>The &ldquo;source code&rdquo; for a work means the preferred form of the work
+for making modifications to it.  &ldquo;Object code&rdquo; means any non-source
+form of a work.</p>
+
+<p>A &ldquo;Standard Interface&rdquo; means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.</p>
+
+<p>The &ldquo;System Libraries&rdquo; of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+&ldquo;Major Component&rdquo;, in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.</p>
+
+<p>The &ldquo;Corresponding Source&rdquo; for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.</p>
+
+<p>The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.</p>
+
+<p>The Corresponding Source for a work in source code form is that
+same work.</p>
+
+<h4><a name="section2"></a>2. Basic Permissions.</h4>
+
+<p>All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.</p>
+
+<p>You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.</p>
+
+<p>Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.</p>
+
+<h4><a name="section3"></a>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
+
+<p>No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.</p>
+
+<p>When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.</p>
+
+<h4><a name="section4"></a>4. Conveying Verbatim Copies.</h4>
+
+<p>You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.</p>
+
+<p>You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.</p>
+
+<h4><a name="section5"></a>5. Conveying Modified Source Versions.</h4>
+
+<p>You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:</p>
+
+<ul>
+<li>a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.</li>
+
+<li>b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    &ldquo;keep intact all notices&rdquo;.</li>
+
+<li>c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.</li>
+
+<li>d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.</li>
+</ul>
+
+<p>A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+&ldquo;aggregate&rdquo; if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.</p>
+
+<h4><a name="section6"></a>6. Conveying Non-Source Forms.</h4>
+
+<p>You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:</p>
+
+<ul>
+<li>a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.</li>
+
+<li>b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.</li>
+
+<li>c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.</li>
+
+<li>d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.</li>
+
+<li>e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.</li>
+</ul>
+
+<p>A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.</p>
+
+<p>A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, &ldquo;normally used&rdquo; refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.</p>
+
+<p>&ldquo;Installation Information&rdquo; for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.</p>
+
+<p>If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).</p>
+
+<p>The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.</p>
+
+<p>Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.</p>
+
+<h4><a name="section7"></a>7. Additional Terms.</h4>
+
+<p>&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.</p>
+
+<p>When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.</p>
+
+<p>Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:</p>
+
+<ul>
+<li>a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or</li>
+
+<li>b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or</li>
+
+<li>c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or</li>
+
+<li>d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or</li>
+
+<li>e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or</li>
+
+<li>f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.</li>
+</ul>
+
+<p>All other non-permissive additional terms are considered &ldquo;further
+restrictions&rdquo; within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.</p>
+
+<p>If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.</p>
+
+<p>Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.</p>
+
+<h4><a name="section8"></a>8. Termination.</h4>
+
+<p>You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).</p>
+
+<p>However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.</p>
+
+<p>Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.</p>
+
+<p>Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.</p>
+
+<h4><a name="section9"></a>9. Acceptance Not Required for Having Copies.</h4>
+
+<p>You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.</p>
+
+<h4><a name="section10"></a>10. Automatic Licensing of Downstream Recipients.</h4>
+
+<p>Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.</p>
+
+<p>An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.</p>
+
+<p>You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.</p>
+
+<h4><a name="section11"></a>11. Patents.</h4>
+
+<p>A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's &ldquo;contributor version&rdquo;.</p>
+
+<p>A contributor's &ldquo;essential patent claims&rdquo; are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, &ldquo;control&rdquo; includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.</p>
+
+<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.</p>
+
+<p>In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To &ldquo;grant&rdquo; such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.</p>
+
+<p>If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  &ldquo;Knowingly relying&rdquo; means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.</p>
+  
+<p>If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.</p>
+
+<p>A patent license is &ldquo;discriminatory&rdquo; if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.</p>
+
+<p>Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.</p>
+
+<h4><a name="section12"></a>12. No Surrender of Others' Freedom.</h4>
+
+<p>If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.</p>
+
+<h4><a name="section13"></a>13. Use with the GNU Affero General Public License.</h4>
+
+<p>Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.</p>
+
+<h4><a name="section14"></a>14. Revised Versions of this License.</h4>
+
+<p>The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.</p>
+
+<p>Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License &ldquo;or any later version&rdquo; applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.</p>
+
+<p>If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.</p>
+
+<p>Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.</p>
+
+<h4><a name="section15"></a>15. Disclaimer of Warranty.</h4>
+
+<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
+
+<h4><a name="section16"></a>16. Limitation of Liability.</h4>
+
+<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.</p>
+
+<h4><a name="section17"></a>17. Interpretation of Sections 15 and 16.</h4>
+
+<p>If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.</p>
+
+<p>END OF TERMS AND CONDITIONS</p>

app/src/main/assets/mit.html

@@ -0,0 +1,7 @@
+<h3>The MIT License (MIT)</h3>
+
+<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
+
+<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
+
+<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>

app/src/main/java/at/bitfire/davdroid/AccountSettings.java

@@ -0,0 +1,491 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+package at.bitfire.davdroid;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.content.BroadcastReceiver;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.PeriodicSync;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.provider.CalendarContract;
+import android.provider.ContactsContract;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+
+import at.bitfire.davdroid.model.CollectionInfo;
+import at.bitfire.davdroid.model.ServiceDB;
+import at.bitfire.davdroid.model.ServiceDB.Collections;
+import at.bitfire.davdroid.model.ServiceDB.HomeSets;
+import at.bitfire.davdroid.model.ServiceDB.Services;
+import at.bitfire.davdroid.resource.LocalAddressBook;
+import at.bitfire.davdroid.resource.LocalCalendar;
+import at.bitfire.davdroid.resource.LocalTaskList;
+import at.bitfire.ical4android.CalendarStorageException;
+import at.bitfire.ical4android.TaskProvider;
+import at.bitfire.vcard4android.ContactsStorageException;
+import at.bitfire.vcard4android.GroupMethod;
+import lombok.Cleanup;
+import okhttp3.HttpUrl;
+
+public class AccountSettings {
+    private final static int CURRENT_VERSION = 6;
+    private final static String
+            KEY_SETTINGS_VERSION = "version",
+
+            KEY_USERNAME = "user_name",
+
+            KEY_WIFI_ONLY = "wifi_only",            // sync on WiFi only (default: false)
+            KEY_WIFI_ONLY_SSID = "wifi_only_ssid";  // restrict sync to specific WiFi SSID
+
+    /** Time range limitation to the past [in days]
+        value = null            default value (DEFAULT_TIME_RANGE_PAST_DAYS)
+              < 0 (-1)          no limit
+              >= 0              entries more than n days in the past won't be synchronized
+     */
+    private final static String KEY_TIME_RANGE_PAST_DAYS = "time_range_past_days";
+    private final static int DEFAULT_TIME_RANGE_PAST_DAYS = 90;
+
+    /* Whether DAVdroid sets the local calendar color to the value from service DB at every sync
+       value = null (not existing)     true (default)
+               "0"                     false */
+    private final static String KEY_MANAGE_CALENDAR_COLORS = "manage_calendar_colors";
+
+    /** Contact group method:
+        value = null (not existing)     groups as separate VCards (default)
+                "CATEGORIES"            groups are per-contact CATEGORIES
+    */
+    private final static String KEY_CONTACT_GROUP_METHOD = "contact_group_method";
+
+    public final static long SYNC_INTERVAL_MANUALLY = -1;
+
+    final Context context;
+    final AccountManager accountManager;
+    final Account account;
+
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public AccountSettings(@NonNull Context context, @NonNull Account account) throws InvalidAccountException {
+        this.context = context;
+        this.account = account;
+
+        accountManager = AccountManager.get(context);
+
+        synchronized(AccountSettings.class) {
+            String versionStr = accountManager.getUserData(account, KEY_SETTINGS_VERSION);
+            if (versionStr == null)
+                throw new InvalidAccountException(account);
+
+            int version = 0;
+            try {
+                version = Integer.parseInt(versionStr);
+            } catch (NumberFormatException ignored) {
+            }
+            App.log.fine("Account " + account.name + " has version " + version + ", current version: " + CURRENT_VERSION);
+
+            if (version < CURRENT_VERSION)
+                update(version);
+        }
+    }
+
+    public static Bundle initialUserData(String userName) {
+        Bundle bundle = new Bundle();
+        bundle.putString(KEY_SETTINGS_VERSION, String.valueOf(CURRENT_VERSION));
+        bundle.putString(KEY_USERNAME, userName);
+        return bundle;
+    }
+
+
+    // authentication settings
+
+    public String username() { return accountManager.getUserData(account, KEY_USERNAME); }
+    public void username(@NonNull String userName) { accountManager.setUserData(account, KEY_USERNAME, userName); }
+
+    public String password() { return accountManager.getPassword(account); }
+    public void password(@NonNull String password) { accountManager.setPassword(account, password); }
+
+
+    // sync. settings
+
+    public Long getSyncInterval(@NonNull String authority) {
+        if (ContentResolver.getIsSyncable(account, authority) <= 0)
+            return null;
+
+        if (ContentResolver.getSyncAutomatically(account, authority)) {
+            List<PeriodicSync> syncs = ContentResolver.getPeriodicSyncs(account, authority);
+            if (syncs.isEmpty())
+                return SYNC_INTERVAL_MANUALLY;
+            else
+                return syncs.get(0).period;
+        } else
+            return SYNC_INTERVAL_MANUALLY;
+    }
+
+    public void setSyncInterval(@NonNull String authority, long seconds) {
+        if (seconds == SYNC_INTERVAL_MANUALLY) {
+            ContentResolver.setSyncAutomatically(account, authority, false);
+        } else {
+            ContentResolver.setSyncAutomatically(account, authority, true);
+            ContentResolver.addPeriodicSync(account, authority, new Bundle(), seconds);
+        }
+    }
+
+    public boolean getSyncWifiOnly() {
+        return accountManager.getUserData(account, KEY_WIFI_ONLY) != null;
+    }
+
+    public void setSyncWiFiOnly(boolean wiFiOnly) {
+        accountManager.setUserData(account, KEY_WIFI_ONLY, wiFiOnly ? "1" : null);
+    }
+
+    @Nullable
+    public String getSyncWifiOnlySSID() {
+        return accountManager.getUserData(account, KEY_WIFI_ONLY_SSID);
+    }
+
+    public void setSyncWifiOnlySSID(String ssid) {
+        accountManager.setUserData(account, KEY_WIFI_ONLY_SSID, ssid);
+    }
+
+
+    // CalDAV settings
+
+    @Nullable
+    public Integer getTimeRangePastDays() {
+        String strDays = accountManager.getUserData(account, KEY_TIME_RANGE_PAST_DAYS);
+        if (strDays != null) {
+            int days = Integer.valueOf(strDays);
+            return days < 0 ? null : days;
+        } else
+            return DEFAULT_TIME_RANGE_PAST_DAYS;
+    }
+
+    public void setTimeRangePastDays(@Nullable Integer days) {
+        accountManager.setUserData(account, KEY_TIME_RANGE_PAST_DAYS, String.valueOf(days == null ? -1 : days));
+    }
+
+    public boolean getManageCalendarColors() {
+        return accountManager.getUserData(account, KEY_MANAGE_CALENDAR_COLORS) == null;
+    }
+
+    public void setManageCalendarColors(boolean manage) {
+        accountManager.setUserData(account, KEY_MANAGE_CALENDAR_COLORS, manage ? null : "0");
+    }
+
+
+    // CardDAV settings
+
+    @NonNull
+    public GroupMethod getGroupMethod() {
+        if (BuildConfig.settingContactGroupMethod != null)
+            return BuildConfig.settingContactGroupMethod;
+
+        final String name = accountManager.getUserData(account, KEY_CONTACT_GROUP_METHOD);
+        return name != null ?
+                GroupMethod.valueOf(name) :
+                GroupMethod.GROUP_VCARDS;
+    }
+
+    public void setGroupMethod(@NonNull GroupMethod method) {
+        if (BuildConfig.settingContactGroupMethod == null) {
+            final String name = method == GroupMethod.GROUP_VCARDS ? null : method.name();
+            accountManager.setUserData(account, KEY_CONTACT_GROUP_METHOD, name);
+        } else if (BuildConfig.settingContactGroupMethod != method)
+            throw new UnsupportedOperationException("Setting is read-only");
+    }
+
+
+    // update from previous account settings
+
+    private void update(int fromVersion) {
+        for (int toVersion = fromVersion + 1; toVersion <= CURRENT_VERSION; toVersion++) {
+            App.log.info("Updating account " + account.name + " from version " + fromVersion + " to " + toVersion);
+            try {
+                Method updateProc = getClass().getDeclaredMethod("update_" + fromVersion + "_" + toVersion);
+                updateProc.invoke(this);
+                accountManager.setUserData(account, KEY_SETTINGS_VERSION, String.valueOf(toVersion));
+            } catch (Exception e) {
+                App.log.log(Level.SEVERE, "Couldn't update account settings", e);
+            }
+            fromVersion = toVersion;
+        }
+    }
+
+    @SuppressWarnings({ "Recycle", "unused" })
+    private void update_1_2() throws ContactsStorageException {
+        /* - KEY_ADDRESSBOOK_URL ("addressbook_url"),
+           - KEY_ADDRESSBOOK_CTAG ("addressbook_ctag"),
+           - KEY_ADDRESSBOOK_VCARD_VERSION ("addressbook_vcard_version") are not used anymore (now stored in ContactsContract.SyncState)
+           - KEY_LAST_ANDROID_VERSION ("last_android_version") has been added
+        */
+
+        // move previous address book info to ContactsContract.SyncState
+        @Cleanup("release") ContentProviderClient provider = context.getContentResolver().acquireContentProviderClient(ContactsContract.AUTHORITY);
+        if (provider == null)
+            throw new ContactsStorageException("Couldn't access Contacts provider");
+
+        LocalAddressBook addr = new LocalAddressBook(context, account, provider);
+
+        // until now, ContactsContract.Settings.UNGROUPED_VISIBLE was not set explicitly
+        ContentValues values = new ContentValues();
+        values.put(ContactsContract.Settings.UNGROUPED_VISIBLE, 1);
+        addr.updateSettings(values);
+
+        String url = accountManager.getUserData(account, "addressbook_url");
+        if (!TextUtils.isEmpty(url))
+            addr.setURL(url);
+        accountManager.setUserData(account, "addressbook_url", null);
+
+        String cTag = accountManager.getUserData(account, "addressbook_ctag");
+        if (!TextUtils.isEmpty(cTag))
+            addr.setCTag(cTag);
+        accountManager.setUserData(account, "addressbook_ctag", null);
+    }
+
+    @SuppressWarnings({ "Recycle", "unused" })
+    private void update_2_3() {
+        // Don't show a warning for Android updates anymore
+        accountManager.setUserData(account, "last_android_version", null);
+
+        Long serviceCardDAV = null, serviceCalDAV = null;
+
+        ServiceDB.OpenHelper dbHelper = new ServiceDB.OpenHelper(context);
+        try {
+            SQLiteDatabase db = dbHelper.getWritableDatabase();
+            // we have to create the WebDAV Service database only from the old address book, calendar and task list URLs
+
+            // CardDAV: migrate address books
+            ContentProviderClient client = context.getContentResolver().acquireContentProviderClient(ContactsContract.AUTHORITY);
+            if (client != null)
+                try {
+                    LocalAddressBook addrBook = new LocalAddressBook(context, account, client);
+                    String url = addrBook.getURL();
+                    if (url != null) {
+                        App.log.fine("Migrating address book " + url);
+
+                        // insert CardDAV service
+                        ContentValues values = new ContentValues();
+                        values.put(Services.ACCOUNT_NAME, account.name);
+                        values.put(Services.SERVICE, Services.SERVICE_CARDDAV);
+                        serviceCardDAV = db.insert(Services._TABLE, null, values);
+
+                        // insert address book
+                        values.clear();
+                        values.put(Collections.SERVICE_ID, serviceCardDAV);
+                        values.put(Collections.URL, url);
+                        values.put(Collections.SYNC, 1);
+                        db.insert(Collections._TABLE, null, values);
+
+                        // insert home set
+                        HttpUrl homeSet = HttpUrl.parse(url).resolve("../");
+                        values.clear();
+                        values.put(HomeSets.SERVICE_ID, serviceCardDAV);
+                        values.put(HomeSets.URL, homeSet.toString());
+                        db.insert(HomeSets._TABLE, null, values);
+                    }
+
+                } catch (ContactsStorageException e) {
+                    App.log.log(Level.SEVERE, "Couldn't migrate address book", e);
+                } finally {
+                    client.release();
+                }
+
+            // CalDAV: migrate calendars + task lists
+            Set<String> collections = new HashSet<>();
+            Set<HttpUrl> homeSets = new HashSet<>();
+
+            client = context.getContentResolver().acquireContentProviderClient(CalendarContract.AUTHORITY);
+            if (client != null)
+                try {
+                    LocalCalendar calendars[] = (LocalCalendar[])LocalCalendar.find(account, client, LocalCalendar.Factory.INSTANCE, null, null);
+                    for (LocalCalendar calendar : calendars) {
+                        String url = calendar.getName();
+                        App.log.fine("Migrating calendar " + url);
+                        collections.add(url);
+                        homeSets.add(HttpUrl.parse(url).resolve("../"));
+                    }
+                } catch (CalendarStorageException e) {
+                    App.log.log(Level.SEVERE, "Couldn't migrate calendars", e);
+                } finally {
+                    client.release();
+                }
+
+            TaskProvider provider = LocalTaskList.acquireTaskProvider(context.getContentResolver());
+            if (provider != null)
+                try {
+                    LocalTaskList[] taskLists = (LocalTaskList[])LocalTaskList.find(account, provider, LocalTaskList.Factory.INSTANCE, null, null);
+                    for (LocalTaskList taskList : taskLists) {
+                        String url = taskList.getSyncId();
+                        App.log.fine("Migrating task list " + url);
+                        collections.add(url);
+                        homeSets.add(HttpUrl.parse(url).resolve("../"));
+                    }
+                } catch (CalendarStorageException e) {
+                    App.log.log(Level.SEVERE, "Couldn't migrate task lists", e);
+                } finally {
+                    provider.close();
+                }
+
+            if (!collections.isEmpty()) {
+                // insert CalDAV service
+                ContentValues values = new ContentValues();
+                values.put(Services.ACCOUNT_NAME, account.name);
+                values.put(Services.SERVICE, Services.SERVICE_CALDAV);
+                serviceCalDAV = db.insert(Services._TABLE, null, values);
+
+                // insert collections
+                for (String url : collections) {
+                    values.clear();
+                    values.put(Collections.SERVICE_ID, serviceCalDAV);
+                    values.put(Collections.URL, url);
+                    values.put(Collections.SYNC, 1);
+                    db.insert(Collections._TABLE, null, values);
+                }
+
+                // insert home sets
+                for (HttpUrl homeSet : homeSets) {
+                    values.clear();
+                    values.put(HomeSets.SERVICE_ID, serviceCalDAV);
+                    values.put(HomeSets.URL, homeSet.toString());
+                    db.insert(HomeSets._TABLE, null, values);
+                }
+            }
+        } finally {
+            dbHelper.close();
+        }
+
+        // initiate service detection (refresh) to get display names, colors etc.
+        Intent refresh = new Intent(context, DavService.class);
+        refresh.setAction(DavService.ACTION_REFRESH_COLLECTIONS);
+        if (serviceCardDAV != null) {
+            refresh.putExtra(DavService.EXTRA_DAV_SERVICE_ID, serviceCardDAV);
+            context.startService(refresh);
+        }
+        if (serviceCalDAV != null) {
+            refresh.putExtra(DavService.EXTRA_DAV_SERVICE_ID, serviceCalDAV);
+            context.startService(refresh);
+        }
+    }
+
+    @SuppressWarnings({ "Recycle", "unused" })
+    private void update_3_4() {
+        setGroupMethod(GroupMethod.CATEGORIES);
+    }
+
+    /* Android 7.1.1 OpenTasks fix */
+    @SuppressWarnings({ "Recycle", "unused" })
+    private void update_4_5() {
+        // call PackageChangedReceiver which then enables/disables OpenTasks sync when it's (not) available
+        PackageChangedReceiver.updateTaskSync(context);
+    }
+
+    @SuppressWarnings({ "Recycle", "unused" })
+    private void update_5_6() throws ContactsStorageException {
+        @Cleanup("release") ContentProviderClient provider = context.getContentResolver().acquireContentProviderClient(ContactsContract.AUTHORITY);
+        if (provider == null)
+            // no access to contacts provider
+            return;
+
+        // don't run syncs during the migration
+        ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 0);
+        ContentResolver.setIsSyncable(account, App.getAddressBooksAuthority(), 0);
+        ContentResolver.cancelSync(account, null);
+
+        try {
+            // get previous address book settings (including URL)
+            @Cleanup("recycle") Parcel parcel = Parcel.obtain();
+            byte[] raw = ContactsContract.SyncState.get(provider, account);
+            if (raw == null)
+                App.log.info("No contacts sync state, ignoring account");
+            else {
+                parcel.unmarshall(raw, 0, raw.length);
+                parcel.setDataPosition(0);
+                Bundle params = parcel.readBundle();
+                String url = params.getString("url");
+                if (url == null)
+                    App.log.info("No address book URL, ignoring account");
+                else {
+                    // create new address book
+                    CollectionInfo info = new CollectionInfo();
+                    info.type = CollectionInfo.Type.ADDRESS_BOOK;
+                    info.url = url;
+                    info.displayName = account.name;
+                    App.log.log(Level.INFO, "Creating new address book account", url);
+                    Account addressBookAccount = new Account(LocalAddressBook.accountName(account, info), App.getAddressBookAccountType());
+                    if (!accountManager.addAccountExplicitly(addressBookAccount, null, LocalAddressBook.initialUserData(account, info.url)))
+                        throw new ContactsStorageException("Couldn't create address book account");
+                    LocalAddressBook addressBook = new LocalAddressBook(context, addressBookAccount, provider);
+
+                    // move contacts to new address book
+                    App.log.info("Moving contacts from " + account + " to " + addressBookAccount);
+                    ContentValues newAccount = new ContentValues(2);
+                    newAccount.put(ContactsContract.RawContacts.ACCOUNT_NAME, addressBookAccount.name);
+                    newAccount.put(ContactsContract.RawContacts.ACCOUNT_TYPE, addressBookAccount.type);
+                    int affected = provider.update(ContactsContract.RawContacts.CONTENT_URI.buildUpon()
+                                    .appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
+                                    .appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type)
+                                    .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true").build(),
+                            newAccount,
+                            ContactsContract.RawContacts.ACCOUNT_NAME + "=? AND " + ContactsContract.RawContacts.ACCOUNT_TYPE + "=?",
+                            new String[]{account.name, account.type});
+                    App.log.info(affected + " contacts moved to new address book");
+                }
+
+                ContactsContract.SyncState.set(provider, account, null);
+            }
+        } catch(RemoteException e) {
+            throw new ContactsStorageException("Couldn't migrate contacts to new address book", e);
+        }
+
+        // update version number so that further syncs don't repeat the migration
+        accountManager.setUserData(account, KEY_SETTINGS_VERSION, "6");
+
+        // request sync of new address book account
+        ContentResolver.setIsSyncable(account, App.getAddressBooksAuthority(), 1);
+        setSyncInterval(App.getAddressBooksAuthority(), Constants.DEFAULT_SYNC_INTERVAL);
+    }
+
+
+    public static class AppUpdatedReceiver extends BroadcastReceiver {
+
+        @Override
+        @SuppressLint("UnsafeProtectedBroadcastReceiver,MissingPermission")
+        public void onReceive(Context context, Intent intent) {
+            App.log.info("DAVdroid was updated, checking for AccountSettings version");
+
+            // peek into AccountSettings to initiate a possible migration
+            AccountManager accountManager = AccountManager.get(context);
+            for (Account account : accountManager.getAccountsByType(context.getString(R.string.account_type)))
+                try {
+                    App.log.info("Checking account " + account.name);
+                    new AccountSettings(context, account);
+                } catch (InvalidAccountException e) {
+                    App.log.log(Level.SEVERE, "Couldn't check for updated account settings", e);
+                }
+        }
+
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/AccountsChangedReceiver.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid;
+
+import android.accounts.AccountManager;
+import android.accounts.OnAccountsUpdateListener;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class AccountsChangedReceiver extends BroadcastReceiver {
+
+    protected static final List<OnAccountsUpdateListener> listeners = new LinkedList<>();
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION.equals(intent.getAction())) {
+            Intent serviceIntent = new Intent(context, DavService.class);
+            serviceIntent.setAction(DavService.ACTION_ACCOUNTS_UPDATED);
+            context.startService(serviceIntent);
+
+            for (OnAccountsUpdateListener listener : listeners)
+                listener.onAccountsUpdated(null);
+        }
+    }
+
+    public static void registerListener(OnAccountsUpdateListener listener, boolean callImmediately) {
+        listeners.add(listener);
+        if (callImmediately)
+            listener.onAccountsUpdated(null);
+    }
+
+    public static void unregisterListener(OnAccountsUpdateListener listener) {
+        listeners.remove(listener);
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/App.java

@@ -0,0 +1,198 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid;
+
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.app.Application;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Process;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v7.app.NotificationCompat;
+import android.util.Log;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.FileHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.net.ssl.HostnameVerifier;
+
+import at.bitfire.cert4android.CustomCertManager;
+import at.bitfire.davdroid.log.LogcatHandler;
+import at.bitfire.davdroid.log.PlainTextFormatter;
+import at.bitfire.davdroid.model.ServiceDB;
+import at.bitfire.davdroid.model.Settings;
+import lombok.Cleanup;
+import lombok.Getter;
+import okhttp3.internal.tls.OkHostnameVerifier;
+
+public class App extends Application {
+    public static final String
+            FLAVOR_GOOGLE_PLAY = "gplay",
+            FLAVOR_ICLOUD = "icloud",
+            FLAVOR_SOLDUPE = "soldupe",
+            FLAVOR_STANDARD = "standard";
+
+    public static final String
+            DISTRUST_SYSTEM_CERTIFICATES = "distrustSystemCerts",
+            LOG_TO_EXTERNAL_STORAGE = "logToExternalStorage",
+            OVERRIDE_PROXY = "overrideProxy",
+            OVERRIDE_PROXY_HOST = "overrideProxyHost",
+            OVERRIDE_PROXY_PORT = "overrideProxyPort";
+
+    public static final String OVERRIDE_PROXY_HOST_DEFAULT = "localhost";
+    public static final int OVERRIDE_PROXY_PORT_DEFAULT = 8118;
+
+    @Getter
+    private CustomCertManager certManager;
+
+    @Getter
+    private static SSLSocketFactoryCompat sslSocketFactoryCompat;
+
+    @Getter
+    private static HostnameVerifier hostnameVerifier;
+
+    public final static Logger log = Logger.getLogger("davdroid");
+    static {
+        at.bitfire.dav4android.Constants.log = Logger.getLogger("davdroid.dav4android");
+        at.bitfire.cert4android.Constants.log = Logger.getLogger("davdroid.cert4android");
+    }
+
+    @Getter
+    private static String addressBookAccountType;
+    @Getter
+    private static String addressBooksAuthority;
+
+    @Override
+    @SuppressLint("HardwareIds")
+    public void onCreate() {
+        super.onCreate();
+
+        reinitCertManager();
+        reinitLogger();
+
+        addressBookAccountType = getString(R.string.account_type_address_book);
+        addressBooksAuthority = getString(R.string.address_books_authority);
+    }
+
+    public void reinitCertManager() {
+        if (BuildConfig.customCerts) {
+            if (certManager != null)
+                certManager.close();
+
+            @Cleanup ServiceDB.OpenHelper dbHelper = new ServiceDB.OpenHelper(this);
+            Settings settings = new Settings(dbHelper.getReadableDatabase());
+
+            certManager = new CustomCertManager(this, !settings.getBoolean(DISTRUST_SYSTEM_CERTIFICATES, false));
+            sslSocketFactoryCompat = new SSLSocketFactoryCompat(certManager);
+            hostnameVerifier = certManager.hostnameVerifier(OkHostnameVerifier.INSTANCE);
+        }
+    }
+
+    public void reinitLogger() {
+        @Cleanup ServiceDB.OpenHelper dbHelper = new ServiceDB.OpenHelper(this);
+        Settings settings = new Settings(dbHelper.getReadableDatabase());
+
+        boolean logToFile = settings.getBoolean(LOG_TO_EXTERNAL_STORAGE, false),
+                logVerbose = logToFile || Log.isLoggable(log.getName(), Log.DEBUG);
+
+        App.log.info("Verbose logging: " + logVerbose);
+
+        // set logging level according to preferences
+        final Logger rootLogger = Logger.getLogger("");
+        rootLogger.setLevel(logVerbose ? Level.ALL : Level.INFO);
+
+        // remove all handlers and add our own logcat handler
+        rootLogger.setUseParentHandlers(false);
+        for (Handler handler : rootLogger.getHandlers())
+            rootLogger.removeHandler(handler);
+        rootLogger.addHandler(LogcatHandler.INSTANCE);
+
+        NotificationManagerCompat nm = NotificationManagerCompat.from(this);
+        // log to external file according to preferences
+        if (logToFile) {
+            NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+            builder .setSmallIcon(R.drawable.ic_sd_storage_light)
+                    .setLargeIcon(getLauncherBitmap(this))
+                    .setContentTitle(getString(R.string.logging_davdroid_file_logging))
+                    .setLocalOnly(true);
+
+            File dir = getExternalFilesDir(null);
+            if (dir != null)
+                try {
+                    String fileName = new File(dir, "davdroid-" + Process.myPid() + "-" +
+                            DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMdd-HHmmss") + ".txt").toString();
+                    log.info("Logging to " + fileName);
+
+                    FileHandler fileHandler = new FileHandler(fileName);
+                    fileHandler.setFormatter(PlainTextFormatter.DEFAULT);
+                    log.addHandler(fileHandler);
+                    builder .setContentText(dir.getPath())
+                            .setSubText(getString(R.string.logging_to_external_storage_warning))
+                            .setCategory(NotificationCompat.CATEGORY_STATUS)
+                            .setPriority(NotificationCompat.PRIORITY_HIGH)
+                            .setStyle(new NotificationCompat.BigTextStyle()
+                                    .bigText(getString(R.string.logging_to_external_storage, dir.getPath())))
+                            .setOngoing(true);
+
+                } catch (IOException e) {
+                    log.log(Level.SEVERE, "Couldn't create external log file", e);
+
+                    builder .setContentText(getString(R.string.logging_couldnt_create_file, e.getLocalizedMessage()))
+                            .setCategory(NotificationCompat.CATEGORY_ERROR);
+                }
+            else
+                builder.setContentText(getString(R.string.logging_no_external_storage));
+
+            nm.notify(Constants.NOTIFICATION_EXTERNAL_FILE_LOGGING, builder.build());
+        } else
+            nm.cancel(Constants.NOTIFICATION_EXTERNAL_FILE_LOGGING);
+    }
+
+    @Nullable
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public static Bitmap getLauncherBitmap(@NonNull Context context) {
+        Bitmap bitmapLogo = null;
+        Drawable drawableLogo = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP ?
+                context.getDrawable(R.mipmap.ic_launcher) :
+                context.getResources().getDrawable(R.mipmap.ic_launcher);
+        if (drawableLogo instanceof BitmapDrawable)
+            bitmapLogo = ((BitmapDrawable)drawableLogo).getBitmap();
+        return bitmapLogo;
+    }
+
+
+    public static class ReinitSettingsReceiver extends BroadcastReceiver {
+
+        public static final String ACTION_REINIT_SETTINGS = "at.bitfire.davdroid.REINIT_SETTINGS";
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            log.info("Received broadcast: re-initializing settings (logger/cert manager)");
+
+            App app = (App)context.getApplicationContext();
+            app.reinitLogger();
+            app.reinitCertManager();
+        }
+
+    }
+}

app/src/main/java/at/bitfire/davdroid/ArrayUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at

app/src/main/java/at/bitfire/davdroid/Constants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
@@ -7,10 +7,20 @@
  */
 package at.bitfire.davdroid;
 
+import android.net.Uri;
+
 public class Constants {
-	public static final String
-		APP_VERSION = "0.7",
-		ACCOUNT_TYPE = "bitfire.at.davdroid",
-		WEB_URL_HELP = "https://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app",
-		WEB_URL_VIEW_LOGS = "https://github.com/bitfireAT/davdroid/wiki/How-to-view-the-logs";
+
+    // notification IDs
+    public final static int
+            NOTIFICATION_EXTERNAL_FILE_LOGGING = 1,
+            NOTIFICATION_REFRESH_COLLECTIONS = 2,
+            NOTIFICATION_CONTACTS_SYNC = 10,
+            NOTIFICATION_CALENDAR_SYNC = 11,
+            NOTIFICATION_TASK_SYNC = 12,
+            NOTIFICATION_PERMISSIONS = 20,
+            NOTIFICATION_SUBSCRIPTION = 21;
+
+    public static final int DEFAULT_SYNC_INTERVAL = 4 * 3600;  // 4 hours
+
 }

app/src/main/java/at/bitfire/davdroid/DavService.java

@@ -0,0 +1,445 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.annotation.SuppressLint;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Binder;
+import android.os.IBinder;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v7.app.NotificationCompat;
+import android.text.TextUtils;
+
+import org.apache.commons.collections4.iterators.IteratorChain;
+import org.apache.commons.collections4.iterators.SingletonIterator;
+
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+
+import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.UrlUtils;
+import at.bitfire.dav4android.exception.DavException;
+import at.bitfire.dav4android.exception.HttpException;
+import at.bitfire.dav4android.property.AddressbookHomeSet;
+import at.bitfire.dav4android.property.CalendarHomeSet;
+import at.bitfire.dav4android.property.CalendarProxyReadFor;
+import at.bitfire.dav4android.property.CalendarProxyWriteFor;
+import at.bitfire.dav4android.property.GroupMembership;
+import at.bitfire.davdroid.model.CollectionInfo;
+import at.bitfire.davdroid.model.ServiceDB.Collections;
+import at.bitfire.davdroid.model.ServiceDB.HomeSets;
+import at.bitfire.davdroid.model.ServiceDB.OpenHelper;
+import at.bitfire.davdroid.model.ServiceDB.Services;
+import at.bitfire.davdroid.resource.LocalAddressBook;
+import at.bitfire.davdroid.ui.DebugInfoActivity;
+import at.bitfire.vcard4android.ContactsStorageException;
+import lombok.Cleanup;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+
+public class DavService extends Service {
+
+    public static final String
+            ACTION_ACCOUNTS_UPDATED = "accountsUpdated",
+            ACTION_REFRESH_COLLECTIONS = "refreshCollections",
+            EXTRA_DAV_SERVICE_ID = "davServiceID";
+
+    private final IBinder binder = new InfoBinder();
+
+    private final Set<Long> runningRefresh = new HashSet<>();
+    private final List<WeakReference<RefreshingStatusListener>> refreshingStatusListeners = new LinkedList<>();
+
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (intent != null) {
+            String action = intent.getAction();
+            long id = intent.getLongExtra(EXTRA_DAV_SERVICE_ID, -1);
+
+            switch (action) {
+                case ACTION_ACCOUNTS_UPDATED:
+                    cleanupAccounts();
+                    break;
+                case ACTION_REFRESH_COLLECTIONS:
+                    if (runningRefresh.add(id)) {
+                        new Thread(new RefreshCollections(id)).start();
+                        for (WeakReference<RefreshingStatusListener> ref : refreshingStatusListeners) {
+                            RefreshingStatusListener listener = ref.get();
+                            if (listener != null)
+                                listener.onDavRefreshStatusChanged(id, true);
+                        }
+                    }
+                    break;
+            }
+        }
+
+        return START_NOT_STICKY;
+    }
+
+
+    /* BOUND SERVICE PART
+       for communicating with the activities
+    */
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return binder;
+    }
+
+    public interface RefreshingStatusListener {
+        void onDavRefreshStatusChanged(long id, boolean refreshing);
+    }
+
+    public class InfoBinder extends Binder {
+        public boolean isRefreshing(long id) {
+            return runningRefresh.contains(id);
+        }
+
+        public void addRefreshingStatusListener(@NonNull RefreshingStatusListener listener, boolean callImmediate) {
+            refreshingStatusListeners.add(new WeakReference<>(listener));
+            if (callImmediate)
+                for (long id : runningRefresh)
+                    listener.onDavRefreshStatusChanged(id, true);
+        }
+
+        public void removeRefreshingStatusListener(@NonNull RefreshingStatusListener listener) {
+            for (Iterator<WeakReference<RefreshingStatusListener>> iterator = refreshingStatusListeners.iterator(); iterator.hasNext(); ) {
+                RefreshingStatusListener item = iterator.next().get();
+                if (listener.equals(item))
+                    iterator.remove();
+            }
+        }
+    }
+
+
+    /* ACTION RUNNABLES
+       which actually do the work
+     */
+
+    @SuppressLint("MissingPermission")
+    void cleanupAccounts() {
+        App.log.info("Cleaning up orphaned accounts");
+
+        final OpenHelper dbHelper = new OpenHelper(this);
+        try {
+            SQLiteDatabase db = dbHelper.getWritableDatabase();
+
+            List<String> sqlAccountNames = new LinkedList<>();
+            Set<String> accountNames = new HashSet<>();
+            AccountManager am = AccountManager.get(this);
+            for (Account account : am.getAccountsByType(getString(R.string.account_type))) {
+                sqlAccountNames.add(DatabaseUtils.sqlEscapeString(account.name));
+                accountNames.add(account.name);
+            }
+
+            // delete orphaned address book accounts
+            for (Account addrBookAccount : am.getAccountsByType(App.getAddressBookAccountType())) {
+                LocalAddressBook addressBook = new LocalAddressBook(this, addrBookAccount, null);
+                try {
+                    if (!accountNames.contains(addressBook.getMainAccount().name))
+                        addressBook.delete();
+                } catch(ContactsStorageException e) {
+                    App.log.log(Level.SEVERE, "Couldn't get address book main account", e);
+                }
+            }
+
+            // delete orphaned services in DB
+            if (sqlAccountNames.isEmpty())
+                db.delete(Services._TABLE, null, null);
+            else
+                db.delete(Services._TABLE, Services.ACCOUNT_NAME + " NOT IN (" + TextUtils.join(",", sqlAccountNames) + ")", null);
+        } finally {
+            dbHelper.close();
+        }
+    }
+
+    private class RefreshCollections implements Runnable {
+        final long service;
+        final OpenHelper dbHelper;
+        SQLiteDatabase db;
+
+        RefreshCollections(long davServiceId) {
+            this.service = davServiceId;
+            dbHelper = new OpenHelper(DavService.this);
+        }
+
+        @Override
+        public void run() {
+            Account account = null;
+
+            try {
+                db = dbHelper.getWritableDatabase();
+
+                String serviceType = serviceType();
+                App.log.info("Refreshing " + serviceType + " collections of service #" + service);
+
+                // get account
+                account = account();
+
+                // create authenticating OkHttpClient (credentials taken from account settings)
+                OkHttpClient httpClient = HttpClient.create(DavService.this, account);
+
+                // refresh home sets: principal
+                Set<HttpUrl> homeSets = readHomeSets();
+                HttpUrl principal = readPrincipal();
+                if (principal != null) {
+                    App.log.fine("Querying principal for home sets");
+                    DavResource dav = new DavResource(httpClient, principal);
+                    queryHomeSets(serviceType, dav, homeSets);
+
+                    // refresh home sets: calendar-proxy-read/write-for
+                    CalendarProxyReadFor proxyRead = (CalendarProxyReadFor)dav.properties.get(CalendarProxyReadFor.NAME);
+                    if (proxyRead != null)
+                        for (String href : proxyRead.principals) {
+                            App.log.fine("Principal is a read-only proxy for " + href + ", checking for home sets");
+                            queryHomeSets(serviceType, new DavResource(httpClient, dav.location.resolve(href)), homeSets);
+                        }
+                    CalendarProxyWriteFor proxyWrite = (CalendarProxyWriteFor)dav.properties.get(CalendarProxyWriteFor.NAME);
+                    if (proxyWrite != null)
+                        for (String href : proxyWrite.principals) {
+                            App.log.fine("Principal is a read-write proxy for " + href + ", checking for home sets");
+                            queryHomeSets(serviceType, new DavResource(httpClient, dav.location.resolve(href)), homeSets);
+                        }
+
+                    // refresh home sets: direct group memberships
+                    GroupMembership groupMembership = (GroupMembership)dav.properties.get(GroupMembership.NAME);
+                    if (groupMembership != null)
+                        for (String href : groupMembership.hrefs) {
+                            App.log.fine("Principal is member of group " + href + ", checking for home sets");
+                            DavResource group = new DavResource(httpClient, dav.location.resolve(href));
+                            try {
+                                queryHomeSets(serviceType, group, homeSets);
+                            } catch(HttpException|DavException e) {
+                                App.log.log(Level.WARNING, "Couldn't query member group ", e);
+                            }
+                        }
+                }
+
+                // now refresh collections (taken from home sets)
+                Map<HttpUrl, CollectionInfo> collections = readCollections();
+
+                // (remember selections before)
+                Set<HttpUrl> selectedCollections = new HashSet<>();
+                for (CollectionInfo info : collections.values())
+                    if (info.selected)
+                        selectedCollections.add(HttpUrl.parse(info.url));
+
+                for (Iterator<HttpUrl> itHomeSets = homeSets.iterator(); itHomeSets.hasNext(); ) {
+                    HttpUrl homeSet = itHomeSets.next();
+                    App.log.fine("Listing home set " + homeSet);
+
+                    DavResource dav = new DavResource(httpClient, homeSet);
+                    try {
+                        dav.propfind(1, CollectionInfo.DAV_PROPERTIES);
+                        IteratorChain<DavResource> itCollections = new IteratorChain<>(dav.members.iterator(), new SingletonIterator(dav));
+                        while (itCollections.hasNext()) {
+                            DavResource member = itCollections.next();
+                            CollectionInfo info = CollectionInfo.fromDavResource(member);
+                            info.confirmed = true;
+                            App.log.log(Level.FINE, "Found collection", info);
+
+                            if ((serviceType.equals(Services.SERVICE_CARDDAV) && info.type == CollectionInfo.Type.ADDRESS_BOOK) ||
+                                (serviceType.equals(Services.SERVICE_CALDAV) && info.type == CollectionInfo.Type.CALENDAR))
+                                collections.put(member.location, info);
+                        }
+                    } catch(HttpException e) {
+                        if (e.status == 403 || e.status == 404 || e.status == 410)
+                            // delete home set only if it was not accessible (40x)
+                            itHomeSets.remove();
+                    }
+                }
+
+                // check/refresh unconfirmed collections
+                for (Iterator<Map.Entry<HttpUrl, CollectionInfo>> iterator = collections.entrySet().iterator(); iterator.hasNext(); ) {
+                    Map.Entry<HttpUrl, CollectionInfo> entry = iterator.next();
+                    HttpUrl url = entry.getKey();
+                    CollectionInfo info = entry.getValue();
+
+                    if (!info.confirmed)
+                        try {
+                            DavResource dav = new DavResource(httpClient, url);
+                            dav.propfind(0, CollectionInfo.DAV_PROPERTIES);
+                            info = CollectionInfo.fromDavResource(dav);
+                            info.confirmed = true;
+
+                            // remove unusable collections
+                            if ((serviceType.equals(Services.SERVICE_CARDDAV) && info.type != CollectionInfo.Type.ADDRESS_BOOK) ||
+                                (serviceType.equals(Services.SERVICE_CALDAV) && info.type != CollectionInfo.Type.CALENDAR))
+                                iterator.remove();
+                        } catch(HttpException e) {
+                            if (e.status == 403 || e.status == 404 || e.status == 410)
+                                // delete collection only if it was not accessible (40x)
+                                iterator.remove();
+                            else
+                                throw e;
+                        }
+                }
+
+                // restore selections
+                for (HttpUrl url : selectedCollections) {
+                    CollectionInfo info = collections.get(url);
+                    if (info != null)
+                        info.selected = true;
+                }
+
+                db.beginTransactionNonExclusive();
+                try {
+                    saveHomeSets(homeSets);
+                    saveCollections(collections.values());
+                    db.setTransactionSuccessful();
+                } finally {
+                    db.endTransaction();
+                }
+
+            } catch(InvalidAccountException e) {
+                App.log.log(Level.SEVERE, "Invalid account", e);
+            } catch(IOException|HttpException|DavException e) {
+                App.log.log(Level.SEVERE, "Couldn't refresh collection list", e);
+
+                Intent debugIntent = new Intent(DavService.this, DebugInfoActivity.class);
+                debugIntent.putExtra(DebugInfoActivity.KEY_THROWABLE, e);
+                if (account != null)
+                    debugIntent.putExtra(DebugInfoActivity.KEY_ACCOUNT, account);
+
+                NotificationManagerCompat nm = NotificationManagerCompat.from(DavService.this);
+                Notification notify = new NotificationCompat.Builder(DavService.this)
+                        .setSmallIcon(R.drawable.ic_error_light)
+                        .setLargeIcon(App.getLauncherBitmap(DavService.this))
+                        .setContentTitle(getString(R.string.dav_service_refresh_failed))
+                        .setContentText(getString(R.string.dav_service_refresh_couldnt_refresh))
+                        .setContentIntent(PendingIntent.getActivity(DavService.this, 0, debugIntent, PendingIntent.FLAG_UPDATE_CURRENT))
+                        .build();
+                nm.notify(Constants.NOTIFICATION_REFRESH_COLLECTIONS, notify);
+            } finally {
+                dbHelper.close();
+
+                runningRefresh.remove(service);
+                for (WeakReference<RefreshingStatusListener> ref : refreshingStatusListeners) {
+                    RefreshingStatusListener listener = ref.get();
+                    if (listener != null)
+                        listener.onDavRefreshStatusChanged(service, false);
+                }
+            }
+        }
+
+        /**
+         * Checks if the given URL defines home sets and adds them to the home set list.
+         * @param serviceType       CalDAV/CardDAV (calendar home set / addressbook home set)
+         * @param dav               DavResource to check
+         * @param homeSets          set where found home set URLs will be put into
+         */
+        private void queryHomeSets(String serviceType, DavResource dav, Set<HttpUrl> homeSets) throws IOException, HttpException, DavException {
+            if (Services.SERVICE_CARDDAV.equals(serviceType)) {
+                dav.propfind(0, AddressbookHomeSet.NAME, GroupMembership.NAME);
+                AddressbookHomeSet addressbookHomeSet = (AddressbookHomeSet)dav.properties.get(AddressbookHomeSet.NAME);
+                if (addressbookHomeSet != null)
+                    for (String href : addressbookHomeSet.hrefs)
+                        homeSets.add(UrlUtils.withTrailingSlash(dav.location.resolve(href)));
+            } else if (Services.SERVICE_CALDAV.equals(serviceType)) {
+                dav.propfind(0, CalendarHomeSet.NAME, CalendarProxyReadFor.NAME, CalendarProxyWriteFor.NAME, GroupMembership.NAME);
+                CalendarHomeSet calendarHomeSet = (CalendarHomeSet)dav.properties.get(CalendarHomeSet.NAME);
+                if (calendarHomeSet != null)
+                    for (String href : calendarHomeSet.hrefs)
+                        homeSets.add(UrlUtils.withTrailingSlash(dav.location.resolve(href)));
+            }
+        }
+
+
+        @NonNull
+        private Account account() {
+            @Cleanup Cursor cursor = db.query(Services._TABLE, new String[] { Services.ACCOUNT_NAME }, Services.ID + "=?", new String[] { String.valueOf(service) }, null, null, null);
+            if (cursor.moveToNext()) {
+                return new Account(cursor.getString(0), getString(R.string.account_type));
+            } else
+                throw new IllegalArgumentException("Service not found");
+        }
+
+        @NonNull
+        private String serviceType() {
+            @Cleanup Cursor cursor = db.query(Services._TABLE, new String[] { Services.SERVICE }, Services.ID + "=?", new String[] { String.valueOf(service) }, null, null, null);
+            if (cursor.moveToNext())
+                return cursor.getString(0);
+            else
+                throw new IllegalArgumentException("Service not found");
+        }
+
+        @Nullable
+        private HttpUrl readPrincipal() {
+            @Cleanup Cursor cursor = db.query(Services._TABLE, new String[] { Services.PRINCIPAL }, Services.ID + "=?", new String[] { String.valueOf(service) }, null, null, null);
+            if (cursor.moveToNext()) {
+                String principal = cursor.getString(0);
+                if (principal != null)
+                    return HttpUrl.parse(cursor.getString(0));
+            }
+            return null;
+        }
+
+        @NonNull
+        private Set<HttpUrl> readHomeSets() {
+            Set<HttpUrl> homeSets = new LinkedHashSet<>();
+            @Cleanup Cursor cursor = db.query(HomeSets._TABLE, new String[] { HomeSets.URL }, HomeSets.SERVICE_ID + "=?", new String[] { String.valueOf(service) }, null, null, null);
+            while (cursor.moveToNext())
+                homeSets.add(HttpUrl.parse(cursor.getString(0)));
+            return homeSets;
+        }
+
+        private void saveHomeSets(Set<HttpUrl> homeSets) {
+            db.delete(HomeSets._TABLE, HomeSets.SERVICE_ID + "=?", new String[] { String.valueOf(service) });
+            for (HttpUrl homeSet : homeSets) {
+                ContentValues values = new ContentValues(1);
+                values.put(HomeSets.SERVICE_ID, service);
+                values.put(HomeSets.URL, homeSet.toString());
+                db.insertOrThrow(HomeSets._TABLE, null, values);
+            }
+        }
+
+        @NonNull
+        private Map<HttpUrl, CollectionInfo> readCollections() {
+            Map<HttpUrl, CollectionInfo> collections = new LinkedHashMap<>();
+            @Cleanup Cursor cursor = db.query(Collections._TABLE, null, Collections.SERVICE_ID + "=?", new String[]{String.valueOf(service)}, null, null, null);
+            while (cursor.moveToNext()) {
+                ContentValues values = new ContentValues();
+                DatabaseUtils.cursorRowToContentValues(cursor, values);
+                collections.put(HttpUrl.parse(values.getAsString(Collections.URL)), CollectionInfo.fromDB(values));
+            }
+            return collections;
+        }
+
+        private void saveCollections(Iterable<CollectionInfo> collections) {
+            db.delete(Collections._TABLE, HomeSets.SERVICE_ID + "=?", new String[] { String.valueOf(service) });
+            for (CollectionInfo collection : collections) {
+                ContentValues values = collection.toDB();
+                App.log.log(Level.FINE, "Saving collection", values);
+                values.put(Collections.SERVICE_ID, service);
+                db.insertWithOnConflict(Collections._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE);
+            }
+        }
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/DavUtils.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid;
+
+import android.support.annotation.NonNull;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import okhttp3.HttpUrl;
+
+public class DavUtils {
+
+    public static String ARGBtoCalDAVColor(int colorWithAlpha) {
+        byte alpha = (byte)(colorWithAlpha >> 24);
+        int color = colorWithAlpha & 0xFFFFFF;
+        return String.format("#%06X%02X", color, alpha);
+    }
+
+    public static String lastSegmentOfUrl(@NonNull String url) {
+        // the list returned by HttpUrl.pathSegments() is unmodifiable, so we have to create a copy
+        List<String> segments = new LinkedList<>(HttpUrl.parse(url).pathSegments());
+        Collections.reverse(segments);
+
+        for (String segment : segments)
+            if (!StringUtils.isEmpty(segment))
+                return segment;
+
+        return "/";
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/HttpClient.java

@@ -0,0 +1,180 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import at.bitfire.dav4android.BasicDigestAuthHandler;
+import at.bitfire.dav4android.UrlUtils;
+import at.bitfire.davdroid.model.ServiceDB;
+import at.bitfire.davdroid.model.Settings;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.logging.HttpLoggingInterceptor;
+
+public class HttpClient {
+    private static final OkHttpClient client = new OkHttpClient();
+    private static final UserAgentInterceptor userAgentInterceptor = new UserAgentInterceptor();
+
+    private static final String productName, userAgent;
+    static {
+        if (BuildConfig.FLAVOR == App.FLAVOR_ICLOUD)
+            productName = "MultiSync for Cloud";
+        else if (BuildConfig.FLAVOR == App.FLAVOR_SOLDUPE)
+            productName = "Soldupe Sync";
+        else
+            productName = "DAVdroid";
+
+        String date = new SimpleDateFormat("yyyy/MM/dd", Locale.US).format(new Date(BuildConfig.buildTime));
+        userAgent = productName + "/" + BuildConfig.VERSION_NAME + " (" + date + "; dav4android; okhttp3) Android/" + Build.VERSION.RELEASE;
+    }
+
+    private HttpClient() {
+    }
+
+    public static OkHttpClient create(@Nullable Context context, @NonNull AccountSettings settings, @NonNull final Logger logger) {
+        OkHttpClient.Builder builder = defaultBuilder(context, logger);
+
+        // use account settings for authentication
+        builder = addAuthentication(builder, null, settings.username(), settings.password());
+
+        return builder.build();
+    }
+
+    public static OkHttpClient create(@NonNull Context context, @NonNull Logger logger) {
+        return defaultBuilder(context, logger).build();
+    }
+
+    public static OkHttpClient create(@NonNull Context context, @NonNull AccountSettings settings) {
+        return create(context, settings, App.log);
+    }
+
+    public static OkHttpClient create(@NonNull Context context, @NonNull Account account) throws InvalidAccountException {
+        AccountSettings settings = new AccountSettings(context, account);
+        return create(context, settings, App.log);
+    }
+
+    public static OkHttpClient create(@Nullable Context context) {
+        return create(context, App.log);
+    }
+
+
+    private static OkHttpClient.Builder defaultBuilder(@Nullable Context context, @NonNull final Logger logger) {
+        OkHttpClient.Builder builder = client.newBuilder();
+
+        // use MemorizingTrustManager to manage self-signed certificates
+        if (context != null) {
+            App app = (App)context.getApplicationContext();
+            if (App.getSslSocketFactoryCompat() != null && app.getCertManager() != null)
+                builder.sslSocketFactory(App.getSslSocketFactoryCompat(), app.getCertManager());
+            if (App.getHostnameVerifier() != null)
+                builder.hostnameVerifier(App.getHostnameVerifier());
+        }
+
+        // set timeouts
+        builder.connectTimeout(30, TimeUnit.SECONDS);
+        builder.writeTimeout(30, TimeUnit.SECONDS);
+        builder.readTimeout(120, TimeUnit.SECONDS);
+
+        // don't allow redirects, because it would break PROPFIND handling
+        builder.followRedirects(false);
+
+        // custom proxy support
+        if (context != null) {
+            SQLiteOpenHelper dbHelper = new ServiceDB.OpenHelper(context);
+            try {
+                Settings settings = new Settings(dbHelper.getReadableDatabase());
+                if (settings.getBoolean(App.OVERRIDE_PROXY, false)) {
+                    InetSocketAddress address = new InetSocketAddress(
+                            settings.getString(App.OVERRIDE_PROXY_HOST, App.OVERRIDE_PROXY_HOST_DEFAULT),
+                            settings.getInt(App.OVERRIDE_PROXY_PORT, App.OVERRIDE_PROXY_PORT_DEFAULT)
+                    );
+
+                    Proxy proxy = new Proxy(Proxy.Type.HTTP, address);
+                    builder.proxy(proxy);
+                    App.log.log(Level.INFO, "Using proxy", proxy);
+                }
+            } catch(IllegalArgumentException|NullPointerException e) {
+                App.log.log(Level.SEVERE, "Can't set proxy, ignoring", e);
+            } finally {
+                dbHelper.close();
+            }
+        }
+
+        // add User-Agent to every request
+        builder.addNetworkInterceptor(userAgentInterceptor);
+
+        // add cookie store for non-persistent cookies (some services like Horde use cookies for session tracking)
+        builder.cookieJar(new MemoryCookieStore());
+
+        // add network logging, if requested
+        if (logger.isLoggable(Level.FINEST)) {
+            HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() {
+                @Override
+                public void log(String message) {
+                    logger.finest(message);
+                }
+            });
+            loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+            builder.addInterceptor(loggingInterceptor);
+        }
+
+        return builder;
+    }
+
+    private static OkHttpClient.Builder addAuthentication(@NonNull OkHttpClient.Builder builder, @Nullable String host, @NonNull String username, @NonNull String password) {
+        BasicDigestAuthHandler authHandler = new BasicDigestAuthHandler(UrlUtils.hostToDomain(host), username, password);
+        return builder
+                .addNetworkInterceptor(authHandler)
+                .authenticator(authHandler);
+    }
+
+    public static OkHttpClient addAuthentication(@NonNull OkHttpClient client, @NonNull String username, @NonNull String password) {
+        OkHttpClient.Builder builder = client.newBuilder();
+        addAuthentication(builder, null, username, password);
+        return builder.build();
+    }
+
+    public static OkHttpClient addAuthentication(@NonNull OkHttpClient client, @NonNull String host, @NonNull String username, @NonNull String password) {
+        OkHttpClient.Builder builder = client.newBuilder();
+        addAuthentication(builder, host, username, password);
+        return builder.build();
+    }
+
+
+    static class UserAgentInterceptor implements Interceptor {
+        @Override
+        public Response intercept(Chain chain) throws IOException {
+            Locale locale = Locale.getDefault();
+            Request request = chain.request().newBuilder()
+                    .header("User-Agent", userAgent)
+                    .header("Accept-Language", locale.getLanguage() + "-" + locale.getCountry() + ", " + locale.getLanguage() + ";q=0.7, *;q=0.5")
+                    .build();
+            return chain.proceed(request);
+        }
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/InvalidAccountException.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid;
+
+import android.accounts.Account;
+
+public class InvalidAccountException extends Exception {
+
+    public InvalidAccountException(Account account) {
+        super("Invalid account: " + account);
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/MainActivity.java

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.TextView;
-
-import at.bitfire.davdroid.syncadapter.AddAccountActivity;
-import at.bitfire.davdroid.syncadapter.SettingsActivity;
-
-public class MainActivity extends Activity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		
-		setContentView(R.layout.activity_main);
-		
-		TextView tvWorkaround = (TextView)findViewById(R.id.text_workaround);
-		if (fromPlayStore()) {
-			tvWorkaround.setVisibility(View.VISIBLE);
-			tvWorkaround.setText(Html.fromHtml(getString(R.string.html_main_workaround)));
-		    tvWorkaround.setMovementMethod(LinkMovementMethod.getInstance());
-		}
-		
-		TextView tvInfo = (TextView)findViewById(R.id.text_info);
-		tvInfo.setText(Html.fromHtml(getString(R.string.html_main_info, Constants.APP_VERSION)));
-		tvInfo.setMovementMethod(LinkMovementMethod.getInstance());
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = getMenuInflater();
-	    inflater.inflate(R.menu.main_activity, menu);
-	    return true;
-	}
-
-	
-	public void addAccount(MenuItem item) {
-		startActivity(new Intent(this, AddAccountActivity.class));
-	}
-
-	public void showSettings(MenuItem item) {
-		startActivity(new Intent(this, SettingsActivity.class));
-	}
-	
-	public void showSyncSettings(MenuItem item) {
-		Intent intent = new Intent(Settings.ACTION_SYNC_SETTINGS);
-		startActivity(intent);
-	}
-
-	public void showWebsite(MenuItem item) {
-		Intent intent = new Intent(Intent.ACTION_VIEW);
-		intent.setData(Uri.parse(Constants.WEB_URL_HELP + "&pk_kwd=main-activity"));
-		startActivity(intent);
-	}
-	
-	
-	private boolean fromPlayStore() {
-		try {
-			return "com.android.vending".equals(getPackageManager().getInstallerPackageName("at.bitfire.davdroid"));
-		} catch(IllegalArgumentException e) {
-            return false;
-		}
-	}
-}

app/src/main/java/at/bitfire/davdroid/MemoryCookieStore.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid;
+
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.keyvalue.MultiKey;
+import org.apache.commons.collections4.map.HashedMap;
+import org.apache.commons.collections4.map.MultiKeyMap;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import okhttp3.Cookie;
+import okhttp3.CookieJar;
+import okhttp3.HttpUrl;
+
+/**
+ * Primitive cookie store that stores cookies in a (volatile) hash map.
+ * Will be sufficient for session cookies.
+ */
+public class MemoryCookieStore implements CookieJar {
+
+    /**
+     * Stored cookies. The multi-key consists of three parts: name, domain, and path.
+     * This ensures that cookies can be overwritten. [RFC 6265 5.3 Storage Model]
+     * Not thread-safe!
+     */
+    protected final MultiKeyMap<String, Cookie> storage = MultiKeyMap.multiKeyMap(new HashedMap<MultiKey<? extends String>, Cookie>());
+
+    @Override
+    public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
+        synchronized(storage) {
+            for (Cookie cookie : cookies)
+                storage.put(cookie.name(), cookie.domain(), cookie.path(), cookie);
+        }
+    }
+
+    @Override
+    public List<Cookie> loadForRequest(HttpUrl url) {
+        List<Cookie> cookies = new LinkedList<>();
+
+        synchronized(storage) {
+            MapIterator<MultiKey<? extends String>, Cookie> iter = storage.mapIterator();
+            while (iter.hasNext()) {
+                iter.next();
+                Cookie cookie = iter.getValue();
+
+                // remove expired cookies
+                if (cookie.expiresAt() <= System.currentTimeMillis()) {
+                    iter.remove();
+                    continue;
+                }
+
+                // add applicable cookies
+                if (cookie.matches(url))
+                    cookies.add(cookie);
+            }
+        }
+
+        return cookies;
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/PackageChangedReceiver.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright © Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid;
+
+import android.accounts.Account;
+import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+
+import at.bitfire.davdroid.model.ServiceDB;
+import at.bitfire.davdroid.model.ServiceDB.Services;
+import at.bitfire.davdroid.resource.LocalTaskList;
+import at.bitfire.ical4android.TaskProvider;
+import lombok.Cleanup;
+
+public class PackageChangedReceiver extends BroadcastReceiver {
+
+    @Override
+    @SuppressLint("MissingPermission")
+    public void onReceive(Context context, Intent intent) {
+        if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction()) ||
+            Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(intent.getAction()))
+            updateTaskSync(context);
+    }
+
+    static void updateTaskSync(@NonNull Context context) {
+        boolean tasksInstalled = LocalTaskList.tasksProviderAvailable(context);
+        App.log.info("Package (un)installed; OpenTasks provider now available = " + tasksInstalled);
+
+        // check all accounts and (de)activate OpenTasks if a CalDAV service is defined
+        @Cleanup ServiceDB.OpenHelper dbHelper = new ServiceDB.OpenHelper(context);
+        SQLiteDatabase db = dbHelper.getReadableDatabase();
+
+        @Cleanup Cursor cursor = db.query(Services._TABLE, new String[] { Services.ACCOUNT_NAME },
+                Services.SERVICE + "=?", new String[] { Services.SERVICE_CALDAV }, null, null, null);
+        while (cursor.moveToNext()) {
+            Account account = new Account(cursor.getString(0), context.getString(R.string.account_type));
+
+            if (tasksInstalled) {
+                if (ContentResolver.getIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority) <= 0) {
+                    ContentResolver.setIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority, 1);
+                    ContentResolver.setSyncAutomatically(account, TaskProvider.ProviderName.OpenTasks.authority, true);
+                    ContentResolver.addPeriodicSync(account, TaskProvider.ProviderName.OpenTasks.authority, new Bundle(), Constants.DEFAULT_SYNC_INTERVAL);
+                }
+            } else
+                ContentResolver.setIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority, 0);
+
+        }
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/SSLSocketFactoryCompat.java

@@ -0,0 +1,169 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid;
+
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.security.GeneralSecurityException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.X509TrustManager;
+
+import lombok.Cleanup;
+
+public class SSLSocketFactoryCompat extends SSLSocketFactory {
+
+    private SSLSocketFactory delegate;
+
+    // Android 5.0+ (API level21) provides reasonable default settings
+    // but it still allows SSLv3
+    // https://developer.android.com/reference/javax/net/ssl/SSLSocket.html
+    static String protocols[] = null, cipherSuites[] = null;
+    static {
+        try {
+            @Cleanup SSLSocket socket = (SSLSocket)SSLSocketFactory.getDefault().createSocket();
+            if (socket != null) {
+                /* set reasonable protocol versions */
+                // - enable all supported protocols (enables TLSv1.1 and TLSv1.2 on Android <5.0)
+                // - remove all SSL versions (especially SSLv3) because they're insecure now
+                List<String> protocols = new LinkedList<>();
+                for (String protocol : socket.getSupportedProtocols())
+                    if (!protocol.toUpperCase(Locale.US).contains("SSL"))
+                        protocols.add(protocol);
+                App.log.info("Setting allowed TLS protocols: " + TextUtils.join(", ", protocols));
+                SSLSocketFactoryCompat.protocols = protocols.toArray(new String[protocols.size()]);
+
+                /* set up reasonable cipher suites */
+                // choose known secure cipher suites
+                List<String> allowedCiphers = Arrays.asList(
+                        // TLS 1.2
+                        "TLS_RSA_WITH_AES_256_GCM_SHA384",
+                        "TLS_RSA_WITH_AES_128_GCM_SHA256",
+                        "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
+                        "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
+                        "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
+                        "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
+                        "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+                        // maximum interoperability
+                        "TLS_RSA_WITH_3DES_EDE_CBC_SHA",
+                        "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
+                        "TLS_RSA_WITH_AES_128_CBC_SHA",
+                        // additionally
+                        "TLS_RSA_WITH_AES_256_CBC_SHA",
+                        "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
+                        "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
+                        "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
+                        "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"
+                );
+                List<String> availableCiphers = Arrays.asList(socket.getSupportedCipherSuites());
+                App.log.info("Available cipher suites: " + TextUtils.join(", ", availableCiphers));
+
+                /* For maximum security, preferredCiphers should *replace* enabled ciphers (thus
+                 * disabling ciphers which are enabled by default, but have become unsecure), but for
+                 * the security level of DAVdroid and maximum compatibility, disabling of insecure
+                 * ciphers should be a server-side task */
+
+                // for the final set of enabled ciphers, take the ciphers enabled by default, ...
+                HashSet<String> enabledCiphers = new HashSet<>(Arrays.asList(socket.getEnabledCipherSuites()));
+                App.log.info("Cipher suites enabled by default: " + TextUtils.join(", ", enabledCiphers));
+                // ... add explicitly allowed ciphers ...
+                enabledCiphers.addAll(allowedCiphers);
+                // ... and keep only those which are actually available
+                enabledCiphers.retainAll(availableCiphers);
+
+                App.log.info("Enabling (only) those TLS ciphers: " + TextUtils.join(", ", enabledCiphers));
+                SSLSocketFactoryCompat.cipherSuites = enabledCiphers.toArray(new String[enabledCiphers.size()]);
+            }
+        } catch (IOException e) {
+            App.log.severe("Couldn't determine default TLS settings");
+        }
+    }
+
+    public SSLSocketFactoryCompat(@NonNull X509TrustManager trustManager) {
+        try {
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(null, new X509TrustManager[] { trustManager }, null);
+            delegate = sslContext.getSocketFactory();
+        } catch (GeneralSecurityException e) {
+            throw new AssertionError(); // The system has no TLS. Just give up.
+        }
+    }
+
+    private void upgradeTLS(SSLSocket ssl) {
+        if (protocols != null)
+            ssl.setEnabledProtocols(protocols);
+
+        if (cipherSuites != null)
+            ssl.setEnabledCipherSuites(cipherSuites);
+    }
+
+
+    @Override
+    public String[] getDefaultCipherSuites() {
+        return cipherSuites;
+    }
+
+    @Override
+    public String[] getSupportedCipherSuites() {
+        return cipherSuites;
+    }
+
+    @Override
+    public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
+        Socket ssl = delegate.createSocket(s, host, port, autoClose);
+        if (ssl instanceof SSLSocket)
+            upgradeTLS((SSLSocket)ssl);
+        return ssl;
+    }
+
+    @Override
+    public Socket createSocket(String host, int port) throws IOException {
+        Socket ssl = delegate.createSocket(host, port);
+        if (ssl instanceof SSLSocket)
+            upgradeTLS((SSLSocket)ssl);
+        return ssl;
+    }
+
+    @Override
+    public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException {
+        Socket ssl = delegate.createSocket(host, port, localHost, localPort);
+        if (ssl instanceof SSLSocket)
+            upgradeTLS((SSLSocket)ssl);
+        return ssl;
+    }
+
+    @Override
+    public Socket createSocket(InetAddress host, int port) throws IOException {
+        Socket ssl = delegate.createSocket(host, port);
+        if (ssl instanceof SSLSocket)
+            upgradeTLS((SSLSocket)ssl);
+        return ssl;
+    }
+
+    @Override
+    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
+        Socket ssl = delegate.createSocket(address, port, localAddress, localPort);
+        if (ssl instanceof SSLSocket)
+            upgradeTLS((SSLSocket)ssl);
+        return ssl;
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/URIUtils.java

@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid;
-
-import android.util.Log;
-
-import org.apache.commons.codec.EncoderException;
-import org.apache.commons.codec.net.URLCodec;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-public class URIUtils {
-	private static final String TAG = "davdroid.URIUtils";
-
-	
-	public static String ensureTrailingSlash(String href) {
-		if (!href.endsWith("/")) {
-			Log.d(TAG, "Implicitly appending trailing slash to collection " + href);
-			return href + "/";
-		} else
-			return href;
-	}
-	
-	public static URI ensureTrailingSlash(URI href) {
-		if (!href.getPath().endsWith("/")) {
-			try {
-				URI newURI = new URI(href.getScheme(), href.getAuthority(), href.getPath() + "/", null, null);
-				Log.d(TAG, "Appended trailing slash to collection " + href + " -> " + newURI);
-				href = newURI;
-			} catch (URISyntaxException e) {
-			}
-		}
-		return href;
-	}
-
-
-	/**
-	 * Parse a received absolute/relative URL and generate a normalized URI that can be compared.
-	 * @param original	    URI to be parsed, may be absolute or relative
-     * @param mustBePath    true if it's known that original is a path (may contain ":") and not an URI, i.e. ":" is not the scheme separator
-	 * @return			    normalized URI
-	 * @throws URISyntaxException
-	 */
-	public static URI parseURI(String original, boolean mustBePath) throws URISyntaxException {
-        if (mustBePath) {
-            // may contain ":"
-            // case 1: "my:file"        won't be parsed by URI correctly because it would consider "my" as URI scheme
-            // case 2: "path/my:file"   will be parsed by URI correctly
-            // case 3: "my:path/file"   won't be parsed by URI correctly because it would consider "my" as URI scheme
-            int idxSlash = original.indexOf('/'),
-                idxColon = original.indexOf(':');
-            if (idxColon != -1) {
-                // colon present
-                if ((idxSlash != -1) && idxSlash < idxColon)     // There's a slash, and it's before the colon → everything OK
-                    ;
-                else    // No slash before the colon; we have to put it there
-                    original = "./" + original;
-            }
-        }
-
-        // escape some common invalid characters – servers keep sending unescaped crap like "my calendar.ics" or "{guid}.vcf"
-        // this is only a hack, because for instance, "[" may be valid in URLs (IPv6 literal in host name)
-        String repaired = original
-                .replaceAll(" ", "%20")
-                .replaceAll("\\{", "%7B")
-                .replaceAll("\\}", "%7D");
-        if (!repaired.equals(original))
-            Log.w(TAG, "Repaired invalid URL: " + original + " -> " + repaired);
-
-		URI uri = new URI(repaired);
-		URI normalized = new URI(uri.getScheme(), uri.getAuthority(), uri.getPath(), uri.getQuery(), uri.getFragment());
-		Log.v(TAG, "Normalized URL " + original + " -> " + normalized.toASCIIString());
-		return normalized;
-	}
-
-}

app/src/main/java/at/bitfire/davdroid/log/LogcatHandler.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.log;
+
+import android.util.Log;
+
+import org.apache.commons.lang3.math.NumberUtils;
+
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+public class LogcatHandler extends Handler {
+    private static final int MAX_LINE_LENGTH = 3000;
+    public static final LogcatHandler INSTANCE = new LogcatHandler();
+
+    private LogcatHandler() {
+        super();
+        setFormatter(PlainTextFormatter.LOGCAT);
+        setLevel(Level.ALL);
+    }
+
+    @Override
+    public void publish(LogRecord r) {
+        String text = getFormatter().format(r);
+        int level = r.getLevel().intValue();
+
+        int end = text.length();
+        for (int pos = 0; pos < end; pos += MAX_LINE_LENGTH) {
+            String line = text.substring(pos, NumberUtils.min(pos + MAX_LINE_LENGTH, end));
+
+            if (level >= Level.SEVERE.intValue())
+                Log.e(r.getLoggerName(), line);
+            else if (level >= Level.WARNING.intValue())
+                Log.w(r.getLoggerName(), line);
+            else if (level >= Level.CONFIG.intValue())
+                Log.i(r.getLoggerName(), line);
+            else if (level >= Level.FINER.intValue())
+                Log.d(r.getLoggerName(), line);
+            else
+                Log.v(r.getLoggerName(), line);
+        }
+    }
+
+    @Override
+    public void flush() {
+    }
+
+    @Override
+    public void close() {
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/log/PlainTextFormatter.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.log;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
+
+public class PlainTextFormatter extends Formatter {
+    public final static PlainTextFormatter
+            LOGCAT = new PlainTextFormatter(true),
+            DEFAULT = new PlainTextFormatter(false);
+
+    private final boolean logcat;
+
+    private PlainTextFormatter(boolean onLogcat) {
+        this.logcat = onLogcat;
+    }
+
+    @Override
+    @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
+    public String format(LogRecord r) {
+        StringBuilder builder = new StringBuilder();
+
+        if (!logcat)
+            builder .append(DateFormatUtils.format(r.getMillis(), "yyyy-MM-dd HH:mm:ss"))
+                    .append(" ").append(r.getThreadID()).append(" ");
+
+        if (!r.getSourceClassName().replaceFirst("\\$.*", "").equals(r.getLoggerName()))
+            builder.append("[").append(shortClassName(r.getSourceClassName())).append("] ");
+
+        builder.append(r.getMessage());
+
+        if (r.getThrown() != null)
+            builder .append("\nEXCEPTION ")
+                    .append(ExceptionUtils.getStackTrace(r.getThrown()));
+
+        if (r.getParameters() != null) {
+            int idx = 1;
+            for (Object param : r.getParameters())
+                builder.append("\n\tPARAMETER #").append(idx++).append(" = ").append(param);
+        }
+
+        if (!logcat)
+            builder.append("\n");
+
+        return builder.toString();
+    }
+
+    private String shortClassName(String className) {
+        String s = StringUtils.replace(className, "at.bitfire.davdroid.", "");
+        return StringUtils.replace(s, "at.bitfire.", "");
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/log/StringHandler.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.log;
+
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
+
+public class StringHandler extends Handler {
+
+    StringBuilder builder = new StringBuilder();
+
+    public StringHandler() {
+        super();
+        setFormatter(PlainTextFormatter.DEFAULT);
+    }
+
+    @Override
+    public void publish(LogRecord record) {
+        builder.append(getFormatter().format(record));
+    }
+
+    @Override
+    public void flush() {
+    }
+
+    @Override
+    public void close() {
+    }
+
+    @Override
+    public String toString() {
+        return builder.toString();
+    }
+}

app/src/main/java/at/bitfire/davdroid/model/CollectionInfo.java

@@ -0,0 +1,163 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.model;
+
+import android.content.ContentValues;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+
+import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.Property;
+import at.bitfire.dav4android.property.AddressbookDescription;
+import at.bitfire.dav4android.property.CalendarColor;
+import at.bitfire.dav4android.property.CalendarDescription;
+import at.bitfire.dav4android.property.CalendarTimezone;
+import at.bitfire.dav4android.property.CurrentUserPrivilegeSet;
+import at.bitfire.dav4android.property.DisplayName;
+import at.bitfire.dav4android.property.ResourceType;
+import at.bitfire.dav4android.property.SupportedAddressData;
+import at.bitfire.dav4android.property.SupportedCalendarComponentSet;
+import at.bitfire.davdroid.model.ServiceDB.Collections;
+import lombok.ToString;
+
+@ToString
+public class CollectionInfo implements Serializable {
+    public long id;
+    public Long serviceID;
+
+    public enum Type {
+        ADDRESS_BOOK,
+        CALENDAR
+    }
+    public Type type;
+
+    public String url;
+
+    public boolean readOnly;
+    public String displayName, description;
+    public Integer color;
+
+    public String timeZone;
+    public Boolean supportsVEVENT;
+    public Boolean supportsVTODO;
+
+    public boolean selected;
+
+    // non-persistent properties
+    public boolean confirmed;
+
+
+    public static final Property.Name[] DAV_PROPERTIES = {
+            ResourceType.NAME,
+            CurrentUserPrivilegeSet.NAME,
+            DisplayName.NAME,
+            AddressbookDescription.NAME, SupportedAddressData.NAME,
+            CalendarDescription.NAME, CalendarColor.NAME, SupportedCalendarComponentSet.NAME
+    };
+
+    public static CollectionInfo fromDavResource(DavResource dav) {
+        CollectionInfo info = new CollectionInfo();
+        info.url = dav.location.toString();
+
+        ResourceType type = (ResourceType)dav.properties.get(ResourceType.NAME);
+        if (type != null) {
+            if (type.types.contains(ResourceType.ADDRESSBOOK))
+                info.type = Type.ADDRESS_BOOK;
+            else if (type.types.contains(ResourceType.CALENDAR))
+                info.type = Type.CALENDAR;
+        }
+
+        info.readOnly = false;
+        CurrentUserPrivilegeSet privilegeSet = (CurrentUserPrivilegeSet)dav.properties.get(CurrentUserPrivilegeSet.NAME);
+        if (privilegeSet != null)
+            info.readOnly = !privilegeSet.mayWriteContent;
+
+        DisplayName displayName = (DisplayName)dav.properties.get(DisplayName.NAME);
+        if (displayName != null && !StringUtils.isEmpty(displayName.displayName))
+            info.displayName = displayName.displayName;
+
+        if (info.type == Type.ADDRESS_BOOK) {
+            AddressbookDescription addressbookDescription = (AddressbookDescription)dav.properties.get(AddressbookDescription.NAME);
+            if (addressbookDescription != null)
+                info.description = addressbookDescription.description;
+
+        } else if (info.type == Type.CALENDAR) {
+            CalendarDescription calendarDescription = (CalendarDescription)dav.properties.get(CalendarDescription.NAME);
+            if (calendarDescription != null)
+                info.description = calendarDescription.description;
+
+            CalendarColor calendarColor = (CalendarColor)dav.properties.get(CalendarColor.NAME);
+            if (calendarColor != null)
+                info.color = calendarColor.color;
+
+            CalendarTimezone timeZone = (CalendarTimezone)dav.properties.get(CalendarTimezone.NAME);
+            if (timeZone != null)
+                info.timeZone = timeZone.vTimeZone;
+
+            info.supportsVEVENT = info.supportsVTODO = true;
+            SupportedCalendarComponentSet supportedCalendarComponentSet = (SupportedCalendarComponentSet)dav.properties.get(SupportedCalendarComponentSet.NAME);
+            if (supportedCalendarComponentSet != null) {
+                info.supportsVEVENT = supportedCalendarComponentSet.supportsEvents;
+                info.supportsVTODO = supportedCalendarComponentSet.supportsTasks;
+            }
+        }
+
+        return info;
+    }
+
+
+    public static CollectionInfo fromDB(ContentValues values) {
+        CollectionInfo info = new CollectionInfo();
+        info.id = values.getAsLong(Collections.ID);
+        info.serviceID = values.getAsLong(Collections.SERVICE_ID);
+
+        info.url = values.getAsString(Collections.URL);
+        info.readOnly = values.getAsInteger(Collections.READ_ONLY) != 0;
+        info.displayName = values.getAsString(Collections.DISPLAY_NAME);
+        info.description = values.getAsString(Collections.DESCRIPTION);
+
+        info.color = values.getAsInteger(Collections.COLOR);
+
+        info.timeZone = values.getAsString(Collections.TIME_ZONE);
+        info.supportsVEVENT = getAsBooleanOrNull(values, Collections.SUPPORTS_VEVENT);
+        info.supportsVTODO = getAsBooleanOrNull(values, Collections.SUPPORTS_VTODO);
+
+        info.selected = values.getAsInteger(Collections.SYNC) != 0;
+        return info;
+    }
+
+    public ContentValues toDB() {
+        ContentValues values = new ContentValues();
+        // Collections.SERVICE_ID is never changed
+
+        values.put(Collections.URL, url);
+        values.put(Collections.READ_ONLY, readOnly ? 1 : 0);
+        values.put(Collections.DISPLAY_NAME, displayName);
+        values.put(Collections.DESCRIPTION, description);
+        values.put(Collections.COLOR, color);
+
+        values.put(Collections.TIME_ZONE, timeZone);
+        if (supportsVEVENT != null)
+            values.put(Collections.SUPPORTS_VEVENT, supportsVEVENT ? 1 : 0);
+        if (supportsVTODO != null)
+            values.put(Collections.SUPPORTS_VTODO, supportsVTODO ? 1 : 0);
+
+        values.put(Collections.SYNC, selected ? 1 : 0);
+        return values;
+    }
+
+
+    private static Boolean getAsBooleanOrNull(ContentValues values, String field) {
+        Integer i = values.getAsInteger(field);
+        return (i == null) ? null : (i != 0);
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/model/ServiceDB.java

@@ -0,0 +1,195 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.model;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.RequiresApi;
+
+import at.bitfire.davdroid.App;
+import lombok.Cleanup;
+
+public class ServiceDB {
+
+    public static class Settings {
+        public static final String
+                _TABLE = "settings",
+                NAME = "setting",
+                VALUE = "value";
+    }
+
+    public static class Services {
+        public static final String
+                _TABLE = "services",
+                ID = "_id",
+                ACCOUNT_NAME = "accountName",
+                SERVICE = "service",
+                PRINCIPAL = "principal";
+
+        // allowed values for SERVICE column
+        public static final String
+                SERVICE_CALDAV = "caldav",
+                SERVICE_CARDDAV = "carddav";
+    }
+
+    public static class HomeSets {
+        public static final String
+                _TABLE = "homesets",
+                ID = "_id",
+                SERVICE_ID = "serviceID",
+                URL = "url";
+    }
+
+    public static class Collections {
+        public static final String
+                _TABLE = "collections",
+                ID = "_id",
+                SERVICE_ID = "serviceID",
+                URL = "url",
+                READ_ONLY = "readOnly",
+                DISPLAY_NAME = "displayName",
+                DESCRIPTION = "description",
+                COLOR = "color",
+                TIME_ZONE = "timezone",
+                SUPPORTS_VEVENT = "supportsVEVENT",
+                SUPPORTS_VTODO = "supportsVTODO",
+                SYNC = "sync";
+    }
+
+
+    public static class OpenHelper extends SQLiteOpenHelper {
+        private static final String DATABASE_NAME = "services.db";
+        private static final int DATABASE_VERSION = 1;
+
+        public OpenHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onOpen(SQLiteDatabase db) {
+            if (Build.VERSION.SDK_INT < 16)
+                db.execSQL("PRAGMA foreign_keys=ON;");
+        }
+
+        @Override
+        @RequiresApi(16)
+        public void onConfigure(SQLiteDatabase db) {
+            setWriteAheadLoggingEnabled(true);
+            db.setForeignKeyConstraintsEnabled(true);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+            App.log.info("Creating database " + db.getPath());
+
+            db.execSQL("CREATE TABLE " + Settings._TABLE + "(" +
+                    Settings.NAME + " TEXT NOT NULL," +
+                    Settings.VALUE + " TEXT NOT NULL" +
+            ")");
+            db.execSQL("CREATE UNIQUE INDEX settings_name ON " + Settings._TABLE + " (" + Settings.NAME + ")");
+
+            db.execSQL("CREATE TABLE " + Services._TABLE + "(" +
+                    Services.ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    Services.ACCOUNT_NAME + " TEXT NOT NULL," +
+                    Services.SERVICE + " TEXT NOT NULL," +
+                    Services.PRINCIPAL + " TEXT NULL" +
+            ")");
+            db.execSQL("CREATE UNIQUE INDEX services_account ON " + Services._TABLE + " (" + Services.ACCOUNT_NAME + "," + Services.SERVICE + ")");
+
+            db.execSQL("CREATE TABLE " + HomeSets._TABLE + "(" +
+                    HomeSets.ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    HomeSets.SERVICE_ID + " INTEGER NOT NULL REFERENCES " + Services._TABLE +" ON DELETE CASCADE," +
+                    HomeSets.URL + " TEXT NOT NULL" +
+             ")");
+            db.execSQL("CREATE UNIQUE INDEX homesets_service_url ON " + HomeSets._TABLE + "(" + HomeSets.SERVICE_ID + "," + HomeSets.URL + ")");
+
+            db.execSQL("CREATE TABLE " + Collections._TABLE + "(" +
+                    Collections.ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
+                    Collections.SERVICE_ID + " INTEGER NOT NULL REFERENCES " + Services._TABLE +" ON DELETE CASCADE," +
+                    Collections.URL + " TEXT NOT NULL," +
+                    Collections.READ_ONLY + " INTEGER DEFAULT 0 NOT NULL," +
+                    Collections.DISPLAY_NAME + " TEXT NULL," +
+                    Collections.DESCRIPTION + " TEXT NULL," +
+                    Collections.COLOR + " INTEGER NULL," +
+                    Collections.TIME_ZONE + " TEXT NULL," +
+                    Collections.SUPPORTS_VEVENT + " INTEGER NULL," +
+                    Collections.SUPPORTS_VTODO + " INTEGER NULL," +
+                    Collections.SYNC + " INTEGER DEFAULT 0 NOT NULL" +
+            ")");
+            db.execSQL("CREATE UNIQUE INDEX collections_service_url ON " + Collections._TABLE + "(" + Collections.SERVICE_ID + "," + Collections.URL + ")");
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            // no different versions yet
+        }
+
+
+        public void dump(StringBuilder sb) {
+            SQLiteDatabase db = getReadableDatabase();
+            db.beginTransactionNonExclusive();
+
+            // iterate through all tables
+            @Cleanup Cursor cursorTables = db.query("sqlite_master", new String[] { "name" }, "type='table'", null, null, null, null);
+            while (cursorTables.moveToNext()) {
+                String table = cursorTables.getString(0);
+                sb.append(table).append("\n");
+                @Cleanup Cursor cursor = db.query(table, null, null, null, null, null, null);
+
+                // print columns
+                int cols = cursor.getColumnCount();
+                sb.append("\t| ");
+                for (int i = 0; i < cols; i++) {
+                    sb.append(" ");
+                    sb.append(cursor.getColumnName(i));
+                    sb.append(" |");
+                }
+                sb.append("\n");
+
+                // print rows
+                while (cursor.moveToNext()) {
+                    sb.append("\t| ");
+                    for (int i = 0; i < cols; i++) {
+                        sb.append(" ");
+                        try {
+                            String value = cursor.getString(i);
+                            if (value != null)
+                                sb.append(value
+                                        .replace("\r", "<CR>")
+                                        .replace("\n", "<LF>"));
+                            else
+                                sb.append("<null>");
+
+                        } catch (SQLiteException e) {
+                            sb.append("<unprintable>");
+                        }
+                        sb.append(" |");
+                    }
+                    sb.append("\n");
+                }
+                sb.append("----------\n");
+            }
+            db.endTransaction();
+        }
+    }
+
+
+    public static void onRenameAccount(@NonNull SQLiteDatabase db, @NonNull String oldName, @NonNull String newName) {
+        ContentValues values = new ContentValues(1);
+        values.put(Services.ACCOUNT_NAME, newName);
+        db.update(Services._TABLE, values, Services.ACCOUNT_NAME + "=?", new String[] { oldName });
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/model/Settings.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.model;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.support.annotation.Nullable;
+
+import lombok.Cleanup;
+
+public class Settings {
+
+    final SQLiteDatabase db;
+
+    public Settings(SQLiteDatabase db) {
+        this.db = db;
+    }
+
+
+    public boolean getBoolean(String name, boolean defaultValue) {
+        @Cleanup Cursor cursor = db.query(ServiceDB.Settings._TABLE, new String[] { ServiceDB.Settings.VALUE },
+                ServiceDB.Settings.NAME + "=?", new String[] { name }, null, null, null);
+        if (cursor.moveToNext() && !cursor.isNull(0))
+            return cursor.getInt(0) != 0;
+        else
+            return defaultValue;
+    }
+
+    public void putBoolean(String name, boolean value) {
+        ContentValues values = new ContentValues(2);
+        values.put(ServiceDB.Settings.NAME, name);
+        values.put(ServiceDB.Settings.VALUE, value ? 1 : 0);
+        db.insertWithOnConflict(ServiceDB.Settings._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE);
+    }
+
+
+    public int getInt(String name, int defaultValue) {
+        @Cleanup Cursor cursor = db.query(ServiceDB.Settings._TABLE, new String[] { ServiceDB.Settings.VALUE },
+                ServiceDB.Settings.NAME + "=?", new String[] { name }, null, null, null);
+        if (cursor.moveToNext() && !cursor.isNull(0))
+            return cursor.isNull(0) ? defaultValue : cursor.getInt(0);
+        else
+            return defaultValue;
+    }
+
+    public void putInt(String name, int value) {
+        ContentValues values = new ContentValues(2);
+        values.put(ServiceDB.Settings.NAME, name);
+        values.put(ServiceDB.Settings.VALUE, value);
+        db.insertWithOnConflict(ServiceDB.Settings._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE);
+    }
+
+
+    @Nullable
+    public String getString(String name, @Nullable String defaultValue) {
+        @Cleanup Cursor cursor = db.query(ServiceDB.Settings._TABLE, new String[] { ServiceDB.Settings.VALUE },
+                ServiceDB.Settings.NAME + "=?", new String[] { name }, null, null, null);
+        if (cursor.moveToNext())
+            return cursor.getString(0);
+        else
+            return defaultValue;
+    }
+
+    public void putString(String name, @Nullable String value) {
+        ContentValues values = new ContentValues(2);
+        values.put(ServiceDB.Settings.NAME, name);
+        values.put(ServiceDB.Settings.VALUE, value);
+        db.insertWithOnConflict(ServiceDB.Settings._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE);
+    }
+
+
+    public void remove(String name) {
+        db.delete(ServiceDB.Settings._TABLE, ServiceDB.Settings.NAME + "=?", new String[] { name });
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/model/UnknownProperties.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.model;
+
+import android.provider.ContactsContract.RawContacts;
+
+public class UnknownProperties {
+
+    public static final String CONTENT_ITEM_TYPE = "x.davdroid/unknown-properties";
+
+    public static final String
+            MIMETYPE = RawContacts.Data.MIMETYPE,
+            RAW_CONTACT_ID = RawContacts.Data.RAW_CONTACT_ID,
+            UNKNOWN_PROPERTIES = RawContacts.Data.DATA1;
+
+}

app/src/main/java/at/bitfire/davdroid/resource/CalDavCalendar.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid.resource;
-
-import org.apache.http.impl.client.CloseableHttpClient;
-
-import java.net.URISyntaxException;
-
-import at.bitfire.davdroid.webdav.DavMultiget;
-
-public class CalDavCalendar extends RemoteCollection<Event> { 
-	//private final static String TAG = "davdroid.CalDavCalendar";
-	
-	@Override
-	protected String memberContentType() {
-		return "text/calendar";
-	}
-
-	@Override
-	protected DavMultiget.Type multiGetType() {
-		return DavMultiget.Type.CALENDAR;
-	}
-	
-	@Override
-	protected Event newResourceSkeleton(String name, String ETag) {
-		return new Event(name, ETag);
-	}
-	
-	
-	public CalDavCalendar(CloseableHttpClient httpClient, String baseURL, String user, String password, boolean preemptiveAuth) throws URISyntaxException {
-		super(httpClient, baseURL, user, password, preemptiveAuth);
-	}
-}

app/src/main/java/at/bitfire/davdroid/resource/CardDavAddressBook.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid.resource;
-
-import org.apache.http.impl.client.CloseableHttpClient;
-
-import java.net.URISyntaxException;
-
-import at.bitfire.davdroid.webdav.DavMultiget;
-
-public class CardDavAddressBook extends RemoteCollection<Contact> {
-	//private final static String TAG = "davdroid.CardDavAddressBook"; 
-	
-	@Override
-	protected String memberContentType() {
-		return Contact.MIME_TYPE;
-	}
-	
-	@Override
-	protected DavMultiget.Type multiGetType() {
-		return DavMultiget.Type.ADDRESS_BOOK;
-	}
-
-	@Override
-	protected Contact newResourceSkeleton(String name, String ETag) {
-		return new Contact(name, ETag);
-	}
-	
-
-	public CardDavAddressBook(CloseableHttpClient httpClient, String baseURL, String user, String password, boolean preemptiveAuth) throws URISyntaxException {
-		super(httpClient, baseURL, user, password, preemptiveAuth);
-	}
-}