Changed source strings

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

@@ -8,6 +8,7 @@
 
 package at.bitfire.davdroid.log;
 
+import android.app.Activity;
 import android.content.Context;
 
 import java.io.Closeable;
@@ -20,7 +21,7 @@ public class ExternalFileLogger extends CustomLogger implements Closeable {
     public ExternalFileLogger(Context context, String fileName, boolean verbose) throws IOException {
         this.verbose = verbose;
 
-        File dir = context.getExternalFilesDir(null);
+        File dir = getDirectory(context);
         if (dir == null)
             throw new IOException("External media not available for log creation");
 
@@ -28,10 +29,13 @@ public class ExternalFileLogger extends CustomLogger implements Closeable {
         writer = new PrintWriter(log);
     }
 
+    public static File getDirectory(Context context) {
+        return context.getExternalFilesDir(null);
+    }
+
     @Override
     public void close() throws IOException {
         writer.close();
     }
 
-
 }

app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java

@@ -52,9 +52,7 @@ public class DebugInfoActivity extends Activity implements LoaderManager.LoaderC
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.debug_info_activity);
-
         tvReport = (TextView)findViewById(R.id.text_report);
-        //tvReport.setText(report = generateReport(getIntent().getExtras()));
 
         getLoaderManager().initLoader(0, getIntent().getExtras(), this);
     }
@@ -186,9 +184,10 @@ public class DebugInfoActivity extends Activity implements LoaderManager.LoaderC
                         "  Account: " + acc.name + "\n" +
                                 "    Address book synchronization: " + syncStatus(acc, ContactsContract.AUTHORITY) + "\n" +
                                 "    Calendar     synchronization: " + syncStatus(acc, CalendarContract.AUTHORITY) + "\n" +
-                                "    OpenTasks    synchronization: " + syncStatus(acc, "org.dmfs.tasks") + "\n\n"
+                                "    OpenTasks    synchronization: " + syncStatus(acc, "org.dmfs.tasks") + "\n"
                 );
             }
+            report.append("\n");
 
             try {
                 report.append(

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

@@ -11,7 +11,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Debug;
 import android.provider.Settings;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
@@ -29,23 +28,65 @@ import at.bitfire.davdroid.ui.setup.AddAccountActivity;
 
 public class MainActivity extends Activity {
 
-	@Override
+    private static final String libraries =
+            "· <a href=\"https://commons.apache.org/\">Apache Commons</a> – <a href=\"https://www.apache.org/licenses/\">Apache License, Version 2.0</a>" +
+            "· <a href=\"http://www.xbill.org/dnsjava/\">dnsjava</a> – <a href=\"http://www.xbill.org/dnsjava/dnsjava-current/LICENSE\">BSD License</a>" +
+            "· <a href=\"https://github.com/mangstadt/ez-vcard\">ez-vcard</a> – <a href=\"http://opensource.org/licenses/BSD-3-Clause\">New BSD License</a><br/>" +
+            "· <a href=\"https://github.com/ical4j/ical4j\">iCal4j</a> – <a href=\"https://github.com/ical4j/ical4j/blob/master/LICENSE\">New BSD License</a><br/>" +
+            "· <a href=\"https://github.com/ge0rg/MemorizingTrustManager\">MemorizingTrustManager</a> – <a href=\"https://raw.githubusercontent.com/ge0rg/MemorizingTrustManager/master/LICENSE.txt\">MIT License</a><br/>" +
+            "· <a href=\"https://square.github.io/okhttp/\">okhttp</a> – <a href=\"https://square.github.io/okhttp/#license\">Apache License, Version 2.0</a>" +
+            "· <a href=\"https://projectlombok.org/\">Project Lombok</a> – <a href=\"http://opensource.org/licenses/mit-license.php\">MIT License</a><br/>" +
+            "· <a href=\"https://commons.apache.org/\">SLF4j</a> (Simple Logging Facade for Java) – <a href=\"http://www.slf4j.org/license.html\">MIT License</a>";
+
+    @Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		
 		setContentView(R.layout.main_activity);
 		
-		TextView tvWorkaround = (TextView)findViewById(R.id.text_workaround);
+		TextView tv = (TextView)findViewById(R.id.text_store_specific);
-		if (fromPlayStore()) {
+        if (installedFrom("org.fdroid.fdroid"))
-			tvWorkaround.setVisibility(View.VISIBLE);
+            setHtmlText(R.id.text_store_specific, R.string.main_fdroid_donation_html);
-			tvWorkaround.setText(Html.fromHtml(getString(R.string.html_main_workaround)));
+		else if (installedFrom("com.android.vending"))
-		    tvWorkaround.setMovementMethod(LinkMovementMethod.getInstance());
+            setHtmlText(R.id.text_store_specific, R.string.main_play_workaround_html);
-		}
+
-		
+        setPlainText(R.id.text_welcome, R.string.main_welcome, BuildConfig.VERSION_NAME);
-		TextView tvInfo = (TextView)findViewById(R.id.text_info);
+        setHtmlText(R.id.text_what_is_davdroid, R.string.main_what_is_davdroid_html);
-		tvInfo.setText(Html.fromHtml(getString(R.string.html_main_info, BuildConfig.VERSION_NAME)));
+        setHtmlText(R.id.text_how_to_setup, R.string.main_how_to_setup_html);
-		tvInfo.setMovementMethod(LinkMovementMethod.getInstance());
+        setHtmlText(R.id.text_support, R.string.main_support_html);
-	}
+        setHtmlText(R.id.text_open_source_disclaimer, R.string.main_open_source_disclaimer_html);
+        setHtmlText(R.id.text_license, R.string.main_license_html);
+        setPlainText(R.id.text_libraries_heading, R.string.main_used_libraries_heading);
+        setHtmlText(R.id.text_libraries_list, libraries);
+    }
+
+    private void setPlainText(int viewId, int stringId, Object... args) {
+        TextView tv = (TextView)findViewById(viewId);
+        tv.setVisibility(View.VISIBLE);
+        tv.setText(getString(stringId, args));
+    }
+
+    private void setHtmlText(int viewId, int stringId, Object... args) {
+        TextView tv = (TextView)findViewById(viewId);
+        tv.setVisibility(View.VISIBLE);
+        tv.setText(trim(Html.fromHtml(getString(stringId, args))));
+        tv.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+
+    private void setHtmlText(int viewId, String html) {
+        TextView tv = (TextView)findViewById(viewId);
+        tv.setVisibility(View.VISIBLE);
+        tv.setText(trim(Html.fromHtml(html)));
+        tv.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+
+    private CharSequence trim(CharSequence text) {
+        while (text.charAt(text.length() - 1) == '\n') {
+            text = text.subSequence(0, text.length() - 1);
+        }
+        return text;
+    }
+
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
@@ -79,9 +120,9 @@ public class MainActivity extends Activity {
 	}
 	
 	
-	private boolean fromPlayStore() {
+	private boolean installedFrom(String packageName) {
 		try {
-			return "com.android.vending".equals(getPackageManager().getInstallerPackageName("at.bitfire.davdroid"));
+			return packageName.equals(getPackageManager().getInstallerPackageName("at.bitfire.davdroid"));
 		} catch(IllegalArgumentException e) {
             return false;
 		}

app/src/main/java/at/bitfire/davdroid/ui/settings/AccountFragment.java

@@ -12,6 +12,8 @@ import android.accounts.Account;
 import android.app.AlertDialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
@@ -22,6 +24,7 @@ import android.provider.CalendarContract;
 import android.provider.ContactsContract;
 
 import at.bitfire.davdroid.R;
+import at.bitfire.davdroid.log.ExternalFileLogger;
 import at.bitfire.davdroid.syncadapter.AccountSettings;
 import at.bitfire.ical4android.TaskProvider;
 
@@ -140,10 +143,11 @@ public class AccountFragment extends PreferenceFragment {
 
         final SwitchPreference prefLogExternalFile = (SwitchPreference)findPreference("log_external_file");
         prefLogExternalFile.setChecked(settings.logToExternalFile());
+        prefLogExternalFile.setSummaryOn(getString(R.string.settings_log_to_external_file_on, ExternalFileLogger.getDirectory(getActivity()).getPath()));
         prefLogExternalFile.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
-                Boolean external = (Boolean)newValue;
+                Boolean external = (Boolean) newValue;
                 if (external) {
                     getFragmentManager().beginTransaction()
                             .add(LogExternalFileDialogFragment.newInstance(account), null)
@@ -151,7 +155,8 @@ public class AccountFragment extends PreferenceFragment {
                     return false;
                 } else {
                     settings.logToExternalFile(false);
-                    refresh(); return false;
+                    refresh();
+                    return false;
                 }
             }
         });

app/src/main/res/layout/main_activity.xml

@@ -19,19 +19,73 @@
         android:orientation="vertical" >
 
         <TextView
-            android:id="@+id/text_workaround"
+            android:id="@+id/text_store_specific"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
-            android:linksClickable="true" />
+            android:layout_marginBottom="40dp"
-        
-        <TextView
-            android:id="@+id/text_info"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
             android:linksClickable="true"
             android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:id="@+id/text_welcome"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/main_welcome"
+            android:layout_marginBottom="20dp"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
         
+        <TextView
+            android:id="@+id/text_what_is_davdroid"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/main_what_is_davdroid_html"
+            android:layout_marginBottom="20dp"
+            android:linksClickable="true"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            android:id="@+id/text_how_to_setup"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/main_how_to_setup_html"
+            android:layout_marginBottom="20dp"
+            android:linksClickable="true"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            android:id="@+id/text_support"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/main_support_html"
+            android:layout_marginBottom="20dp"
+            android:linksClickable="true"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            android:id="@+id/text_open_source_disclaimer"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/main_open_source_disclaimer_html"
+            android:layout_marginBottom="20dp"
+            android:linksClickable="true"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            android:id="@+id/text_license"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/main_license_html"
+            android:layout_marginBottom="20dp"
+            android:linksClickable="true" />
+        <TextView
+            android:id="@+id/text_libraries_heading"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/main_used_libraries_heading"
+            android:linksClickable="true" />
+        <TextView
+            android:id="@+id/text_libraries_list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:linksClickable="true" />
+
     </LinearLayout>
 
 </ScrollView>

app/src/main/res/menu/exception_details_activity.xml

@@ -11,7 +11,7 @@
 
     <item
         android:icon="@android:drawable/ic_menu_share"
-        android:title="@string/share"
+        android:title="@string/send"
         android:showAsAction="always"
         android:onClick="onShare" />
 

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

@@ -10,7 +10,7 @@
   <string name="exception_uri_syntax">URI invàlida: %s</string>
   <!--MainActivity-->
   <string name="main_manage_accounts">Gestioneu els comptes a sincronitzar</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
 		<p>Gràcies per comprar DAVDroid a travès de Google Play i així donar suport al projecte. De totes formes, hi ha dos incidències amb el Google Play:</p>
 
 		<h2>1. Les comptes poden desaparèixer desprès de reiniciar</h2>

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

@@ -12,7 +12,7 @@
   <string name="exception_uri_syntax">Neplatné URI: %s</string>
   <!--MainActivity-->
   <string name="main_manage_accounts">Spravovat synchronizované účty</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
 		<p>Thank you for buying DAVdroid via Google Play and thus supporting the project. Unfortunately, there are two issues with Google Play:</p>
 		
 		<h2>1. Accounts may be gone after a reboot</h2>

app/src/main/res/values-de/strings.xml

@@ -4,7 +4,7 @@
   <string name="app_name">DAVdroid</string>
   <string name="help">Hilfe</string>
   <string name="next">Weiter</string>
-  <string name="share">Senden</string>
+  <string name="send">Senden</string>
   <string name="skip">Überspringen</string>
   <string name="exception_cert_path_validation">Nicht vertrauenswürdiges Zertifikat in der Zertifikatskette (siehe FAQ)</string>
   <string name="exception_http">HTTP-Fehler: %s</string>
@@ -14,77 +14,6 @@
   <!--MainActivity-->
   <string name="main_manage_accounts">Sync-Konten anzeigen</string>
   <string name="main_show_debug_info">Debug-Info anzeigen</string>
-  <string name="html_main_workaround"><![CDATA[
-        <p>Vielen Dank, dass Sie DAVdroid im Play Store erworben haben und das Projekt dadurch unterstützen.       
-        Leider gibt es derzeit zwei Probleme, die vom Play Store verursacht werden:</p>
-
-		<h2><a href=\"https://davdroid.bitfire.at/faq/entry/account-gone-after-reboot\">1. DAVdroid-Accounts verschwinden nach einem Neustart</a></h2>
-		<p>Möglicherweise <strong>verschwinden alle Ihre DAVdroid-Accounts samt Kontakten und Terminen nach einem Neustart</strong>
-		des Geräts. Die Ursache ist ein <a href=\"https://code.google.com/p/android/issues/detail?id=34880\">Fehler in Android</a>,
-		der zur irrtümlichen Entfernung von Accounts von Bezahlapps bei einem Neustart führt, da die Prüfung auf verwaiste
-		und damit zu löschende Accounts schon *vor* dem Entschlüsseln der App erfolgt.</p>
-        <p>Betroffene Benutzer*Innen:<br/>
-        * alle mit Android 4.1, die DAVdroid über Play Store bezogen haben;<br/>
-        * einige mit Android 4.2, die DAVdroid über Play Store bezogen und bestimmte Geräte haben (zB die meisten Samsung-Geräte)</p>
-        
-        <h2><a href=\"https://davdroid.bitfire.at/faq/entry/account-gone-after-updating\">2. DAVdroid-Accounts verschwinden nach einer DAVdroid-Aktualisierung</a></h2>
-        <p>Möglicherweise <strong>verschwinden alle Ihre DAVdroid-Accounts samt Kontakten und Terminen während eines
-        DAVdroid-Updates</strong>, das von Play Store durchgeführt wird. Die Ursache ist ein
-        <a href=\"https://code.google.com/p/android/issues/detail?id=66905\">anderer Fehler in Android</a>,
-		der zur irrtümlichen Entfernung von Accounts von Bezahlapps bei der Aktualisierung dieser Apps führt.</p>
-        <p>Betroffene Benutzer*Innen:<br/>
-        einige mit Android 4.4.2, die DAVdroid über Play Store bezogen haben (bekannt sind Nexus-Geräte und Moto G)</p>
-        
-        <p><strong>Sollten Sie von einem dieser Fehler betroffen sein, <a href=\"market://details?id=at.bitfire.davdroid.jbworkaround\">installieren
-        Sie den DAVdroid JB Workaround</a>.</strong></p>
-    ]]></string>
-  <string name="html_main_info"><![CDATA[
-       <h1>Willkommen bei DAVdroid/%s!</h1>
-       
-       <p>DAVdroid ist ein Android 4+-CalDAV/CardDAV-Sync-Adapter. Um ihn zu verwenden, müssen Sie ein DAVdroid-Konto
-       für Ihren Server hinzufügen. Die Kontakte/Termine/Aufgaben werden dann automatisch in beide Richtungen synchronisiert.
-       Weitere Informationen erhalten Sie auf der <a href=\"https://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity\">DAVdroid-Homepage</a>.
-       Dort finden Sie auch eine <a href=\"https://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity\">Anleitung zum Einrichten</a>.
-       DAVdroid respektiert Ihre Privatsphäre (siehe <a href=\"https://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity\">Datenschutzrichtlinie</a>).</p>
-
-       <p><b>Bei Problemen lesen Sie bitte die <a href=\"https://davdroid.bitfire.at/faq?pk_campaign=davdroid-app&amp;pk_kwd=main-activity\">häufig gestellten Fragen</a>.
-       Um Hilfe zu erhalten oder über DAVdroid-bezogene Themen zu diskutieren, gibt es unsere
-       <a href=\"https://davdroid.bitfire.at/forums?pk_campaign=davdroid-app&amp;pk_kwd=main-activity\">DAVdroid-Foren</a>.</b>
-       Bitte erpressen Sie uns nicht mit schlechten Bewertungen in den App-Stores (das ist zwecklos und für beide Seiten demotivierend).</p>
-
-       <p>Wenn Sie eine Datenschutz-App (\"privacy guard\") benutzen (in CyanogenMod standardmäßig an), müssen Sie einstellen,
-       dass DAVdroid auf Kontakte und Kalender zugreifen darf.</p>
-
-	   <h1>Open-Source</h1>
-	   <p>DAVdroid ist von Anfang an als Open-Source-Projekt ausgelegt. Der Quellcode kann jederzeit selbst kompiliert und
-	   die App unter den Bedingungen der GPLv3 verwendet werden. Der
-	   <a href=\"https://davdroid.bitfire.at/source?pk_campaign=davdroid-app&amp;pk_kwd=main-activity\">Quellcode ist verfügbar</a>; die App kann auch
-	   <a href=\"https://f-droid.org/app/at.bitfire.davdroid\">über F-Droid bezogen werden</a>.</p>
-	   
-	   <p>Es bedeutet viel Arbeit, die App zu entwickeln und besser zu machen. Daher haben wir uns entschlossen, sie
-	   auch gegen eine kleine Gebühr in die kommerziellen App-Stores zu stellen. Wenn Sie DAVdroid über F-Droid bezogen haben,
-	   überlegen Sie bitte, ob Sie das Projekt <a href=\"http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity\">mit
-	   einer Spende unterstützen</a> wollen.</p>
-	   
-	   <h1>Lizenz</h1>
-	   <p>Copyright © 2013 – 2015 Ricki Hirner, Bernhard Stockmann (<a href=\"http://www.bitfire.at\">bitfire web engineering</a>), alle Rechte
-	   vorbehalten. Dieses Programm ist freie Software. Sie können es unter den Bedingungen der <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU
-	   General Public License Version 3</a>, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren.
-	   Sofern Google Play oder Samsung Store andere Bedingungen benötigen, gelten diese Bedingungen nur für über den jeweiligen
-	   Markt heruntergeladene Apps.</p>
-	   
-	   <p>Übersetzungen für andere Sprachen als Englisch und Deutsch
-	   wurden von verschiedenen Personen beigetragen, die in der jeweiligen Sprachversion erwähnt sind.</p>
-	   	   
-	   <h2>Verwendete Bibliotheken</h2>
-	   <p>
-	    * <a href=\"http://hc.apache.org\">Apache HttpClient</a> (Android port) – <a href=\"http://www.apache.org/licenses/\">Apache License, Version 2.0</a><br/>
-	   	* <a href=\"https://github.com/ical4j/ical4j\">iCal4j</a> – <a href=\"https://github.com/ical4j/ical4j/blob/master/LICENSE\">New BSD License</a><br/>
-	   	* <a href=\"https://github.com/mangstadt/ez-vcard\">ez-vcard</a> – <a href=\"http://opensource.org/licenses/BSD-3-Clause\">New BSD License</a><br/>
-	   	* <a href=\"http://simple.sourceforge.net/\">Simple XML Serialization</a> – <a href=\"http://www.apache.org/licenses/LICENSE-2.0\">Apache License, Version 2.0</a><br/>
-	   	* <a href=\"https://projectlombok.org/\">Project Lombok</a> – <a href=\"http://opensource.org/licenses/mit-license.php\">MIT License</a><br/>
-		* <a href=\"http://www.xbill.org/dnsjava/\">dnsjava</a> – <a href=\"http://www.xbill.org/dnsjava/dnsjava-current/LICENSE\">BSD License</a></p>
-    ]]></string>
   <!--AddAccountActivity-->
   <string name="login_type_email">Mit Email-Adresse anmelden</string>
   <string name="login_type_email_description">Domänenname wird verwendet, um die Servereinstellungen herauszufinden. Beispiel: myaccount@icloud.com</string>

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

@@ -11,7 +11,7 @@
   <string name="exception_uri_syntax">URI no válida: %s</string>
   <!--MainActivity-->
   <string name="main_manage_accounts">Administrar las cuentas sincronizadas</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
 <p>Gracias por haber comprado DAVdroid a través de Google Play y de esta manera apoyar este proyecto. Desafortunadamente, hay dos problemas con Google Play:</p>
 <h2>1. Las cuentas pueden desaparecer después de un reinicio</h2>
 <p>Puedes encontrar el problema de que todas tus <strong>cuentas de DAVdroid (incluyendo contactos y eventos) han desaparecido

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

@@ -12,7 +12,7 @@
   <string name="exception_uri_syntax">URI incorrecte : %s</string>
   <!--MainActivity-->
   <string name="main_manage_accounts">Gérer les comptes synchronisés</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
 <p>Merci d\'avoir acheter DAVDroid dans le Play Store Google. Malheureusement, il y a 2 soucis avec le Play Store:</p>
 <h2>1. Les comptes disparaissent après un redémarrage</h2>
 <p>La raison est un <a href=\"https://code.google.com/p/android/issues/detail?id=34880\">bug dans Android</a> qui supprime les comptes d\'application payantes au démarrage à cause de l\'ordre de chargement des applications chiffrées; elles sont chargées après la tâche de destruction des comptes orphelins.</p>

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

@@ -11,7 +11,7 @@
   <string name="exception_uri_syntax">Érvénytelen URI: %s</string>
   <!--MainActivity-->
   <string name="main_manage_accounts">Szinkronizációs fiókok kezelése</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
         <p>Köszönjük, hogy megvásárolta a DAVdroid alkalmazást a Google Play áruházban, támogatva ezzel a projektet.  Sajnos, 
         a Google Play áruházzal két probléma is van:</p>
         <h2>1. A fiókok az eszköz újraindítása után eltűnhetnek</h2>

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

@@ -11,7 +11,7 @@
   <string name="exception_uri_syntax">Ongeldige URI: %s</string>
   <!--MainActivity-->
   <string name="main_manage_accounts">Beheer sync accounts</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
 		<p>Dank u voor het kopen van DAVdroid via Google Play en dus ondersteuning van het project. Helaas, er zijn twee problemen met Google Play:</p>
 		
 		<h2>1. Accounts, kunnen na een reboot verdwijnen</h2>

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

@@ -4,7 +4,7 @@
   <string name="app_name">DAVdroid</string>
   <string name="help">Pomoc</string>
   <string name="next">Dalej</string>
-  <string name="share">Udostępnij</string>
+  <string name="send">Udostępnij</string>
   <string name="skip">Pomiń</string>
   <string name="exception_cert_path_validation">Niezaufany certyfikat w ścieżke certyfikatu. Zobacz FAQ, aby uzyskać więcej informacji.</string>
   <string name="exception_http">Błąd HTTP: %s</string>
@@ -14,7 +14,7 @@
   <!--MainActivity-->
   <string name="main_manage_accounts">Zadządzaj kontami synchronizacji</string>
   <string name="main_show_debug_info">Pokaż informacje do debug\'owania</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
         <p>Dziękujemy za zakup DAVdroid poprzez Google Play, a tym samym wsparcie projektu. Niestety, występują dwa problemy z Google Play:</p>
         
         <h2><a href=\"https://davdroid.bitfire.at/faq/entry/account-gone-after-reboot\">1. Konta mogą zniknąć po restarcie</a></h2>

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

@@ -11,7 +11,7 @@
   <string name="exception_uri_syntax">URI inválida: %s</string>
   <!--MainActivity-->
   <string name="main_manage_accounts">Administrar as contas sincronizadas</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
         <p>Obrigado por adquirir o DAVdroid pelo Google Play apoiando, assim, o projeto. Infelizmente existem dos problemas com o Google Play:</p>
         <h2>1. Contas podem desaparecer após reinicial</h2>
         <p>Você pode encontrar problemas com todas as suas <strong>contas DAVdroid (incluindo contatos e eventos) 

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

@@ -11,7 +11,7 @@
   <string name="exception_uri_syntax">Неверный URI: %s</string>
   <!--MainActivity-->
   <string name="main_manage_accounts">Управление аккаунтами синхронизации</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
 		<p>Благодарим за поддержку проекта через покупку DAVdroid на Google Play. К сожалению есть две небольших проблемы для программ приобретенных в Google Play:</p>
 		
 		<h2>1. Аккаунты могут исчезнуть после перезагрузки</h2>

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

@@ -12,7 +12,7 @@
   <string name="exception_uri_syntax">Неисправан УРИ: %s</string>
   <!--MainActivity-->
   <string name="main_manage_accounts">Управљај налозима синхронизације</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
 		<p>Хвала вам што сте купили ДАВдроид преко Гугловог Плеј сервиса и тиме подржали овај пројекат. Нажалост, постоје два проблема са Гугловим Плеј сервисом:</p>
 		
 		<h2>1. Налози могу нестати након поновног покретања</h2>

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

@@ -12,7 +12,7 @@
   <string name="exception_uri_syntax">Невірний URI: %s</string>
   <!--MainActivity-->
   <string name="main_manage_accounts">Керувати синхронізацією облікових записів</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
 		<p>Дякуємо за купівлю DAVdroid з використанням Google Play та підтримку цим проекту. На жаль, існують дві проблеми з Google Play:</p>
 		
 		<h2><a href=\"https://davdroid.bitfire.at/faq/entry/account-gone-after-reboot\">1. Облікові записи можуть зникати після перезавантаження</a></h2>

app/src/main/res/values-zh-rcn/strings.xml

@@ -12,7 +12,7 @@
   <string name="exception_uri_syntax">URI 无效: %s</string>
   <!--MainActivity-->
   <string name="main_manage_accounts">管理同步账户</string>
-  <string name="html_main_workaround"><![CDATA[
+  <string name="main_play_workaround_html"><![CDATA[
         <p>感谢您在 Google Play 上购买 DAVdroid 支持本项目。然而 Google Play 版应用有两个问题：</p>
         
         <h2>1. 账户可能在重启后消失</h2>

app/src/main/res/values/strings.xml

@@ -13,87 +13,68 @@
     <string name="app_name">DAVdroid</string>
     <string name="help">Help</string>
     <string name="next">Next</string>
-    <string name="share">Share</string>
+    <string name="send">Send</string>
     <string name="skip">Skip</string>
 
-    <string name="exception_cert_path_validation">Untrusted certificate in certificate path. See FAQ for more info.</string>
-    <string name="exception_http">HTTP error: %s</string>
-    <string name="exception_incapable_resource">Missing capabilities: %s</string>
-    <string name="exception_io">I/O error: %s</string>
-    <string name="exception_uri_syntax">Invalid URI: %s</string>
-    
     <!-- MainActivity -->
     <string name="main_manage_accounts">Manage sync accounts</string>
     <string name="main_show_debug_info">Show debug info</string>
 
-    <string name="html_main_workaround"><![CDATA[
+    <string name="main_fdroid_donation_html"><![CDATA[
-		<p>Thank you for buying DAVdroid via Google Play and thus supporting the project. Unfortunately, there are two issues with Google Play:</p>
+        <p>We\'re happy that you have downloaded DAVdroid from F-Droid. Developing DAVdroid is hard work and takes
+        thousands of working hours. <strong>If you like DAVdroid, please consider <a href="https://davdroid.bitfire.at/donate">giving a donation</a>.</strong></p>
+    ]]></string>
+    <string name="main_play_workaround_html"><![CDATA[
+		<p>Thank you for buying DAVdroid on Google Play, thus supporting the project. Unfortunately, there are two Google Play bugs
+		that may be of concern for you. Click on a link to view details.</p>
 		
-		<h2><a href="https://davdroid.bitfire.at/faq/entry/account-gone-after-reboot">1. Accounts may be gone after a reboot</a></h2>
+		<p><a href="https://davdroid.bitfire.at/faq/entry/account-gone-after-reboot">1. Accounts may be gone after a reboot</a>:
-		<p>You may encounter the problem that all your <strong>DAVdroid accounts (including contacts and events) are gone
+		affects Android 4.1, 4.2 with certain devices (for instance, most Samsung devices), possible some other devices. Most
-        after rebooting your device</strong>. The reason is a <a href="https://code.google.com/p/android/issues/detail?id=34880">bug in Android</a>
+		recent Android versions work fine.<br/>
-        that causes accounts of paid apps to be removed on start-up because the (encrypted) APK files are
+
-        loaded <i>after</i> checking for orphaned accounts.</p>
+        <a href="https://davdroid.bitfire.at/faq/entry/account-gone-after-updating">2. Accounts may be gone after upgrading DAVdroid</a>:
-        <p>Affected users:<br/>
+        affects some Android 4.4.2 devices (known for Nexus devices and Moto G), possible a few other ones. Most recent Android
-        * all Android 4.1 users who have got DAVdroid from Play Store;<br/>
+        versions work fine.</p>
-        * Android 4.2 users who have got DAVdroid from Play Store only with certain devices (for instance, most Samsung devices)
-        * maybe other users (LG G3 Android 4.4.2 for instance)</p>
         
-        <h2><a href="https://davdroid.bitfire.at/faq/entry/account-gone-after-updating">2. Accounts may be gone after upgrading DAVdroid</a></h2>
+        <p><strong>If you have such issues, please <a href="market://details?id=at.bitfire.davdroid.jbworkaround">install the
-        <p>You may encounter the problem that all your <strong>DAVdroid accounts (including contacts and events) when Play Store
-        updates DAVdroid</strong>. The reason is <a href="https://code.google.com/p/android/issues/detail?id=66905">another bug in Android</a>
-        that causes accounts of paid apps to be removed when upgrading for a similar reason.</p>
-        <p>Affected users: some Android 4.4.2 users who have got DAVdroid from Play Store (known for Nexus devices and Moto G)</p>
-        
-        <p><strong>If you\'re affected by one of these bugs, please <a href="market://details?id=at.bitfire.davdroid.jbworkaround">install the
         DAVdroid JB Workaround</a>.</strong></p>
     ]]></string>
-    <string name="html_main_info"><![CDATA[
+    <string name="main_welcome">Welcome to DAVdroid/%s!</string>
-       <h1>Welcome to DAVdroid/%s!</h1>
+    <string name="main_what_is_davdroid_html"><![CDATA[
-       
+        <p>DAVdroid is an Android 4+ sync adapter for CalDAV/CardDAV. To use it, just add a DAVdroid account
-       <p>DAVdroid is an Android 4+ sync adapter for CalDAV/CardDAV. To use it, just add a DAVdroid account
+        for your CalDAV/CardDAV server and your contacts/events/tasks will be synchronized in both directions.</p>
-       for your CalDAV/CardDAV server and your contacts/events/tasks will be synchronized in both directions.
-       For more information, please see the <a href="https://davdroid.bitfire.at/?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">DAVdroid homepage</a>.
-       There\'s a <a href="https://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">setup guide</a>, too. DAVdroid respects
-       your privacy, see our <a href="https://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">privacy policy</a>.</p>
 
+        <p>For more information, please see the <a href="https://davdroid.bitfire.at/?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">DAVdroid homepage</a>.
+        DAVdroid respects your privacy, see our <a href="https://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">privacy policy</a>.</p>
+    ]]></string>
+    <string name="main_how_to_setup_html"><![CDATA[
+        <p><b>How to configure</b></p>
+
+        <p>DAVdroid aims to support all standards-compliant CalDAV/CardDAV services. To see a list of tested services and related
+        setup info, together with some information about TLS and certificates, have a look at our
+        <a href="https://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">configuration page</a>.</p>
+    ]]></string>
+    <string name="main_support_html"><![CDATA[<p><b>Support</b></p>
        <p><b>In case of problems, check the <a href="https://davdroid.bitfire.at/faq?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">frequently
        asked questions</a> first. To get assistance or discuss about DAVdroid-related topics, have a look in our
        <a href="https://davdroid.bitfire.at/forums?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">DAVdroid forums</a>.</b>
        Please do not blackmail us with bad ratings in the stores (it\'s futile and discouraging for both sides).</p>
-
+    ]]></string>
-       <p>If you use a privacy guard (default in CyanogenMod), please remember you have to allow contact and calendar access for DAVdroid.</p>
+    <string name="main_open_source_disclaimer_html"><![CDATA[<p><b>Open source</b></p>
-
-	   <h1>Open-source</h1>
 	   <p>DAVdroid is designed to be an open-source project from the very first beginning. It is always possible to compile the
 	   app yourself and use it for free without any obligations. The
 	   <a href="https://davdroid.bitfire.at/source?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">source code is
-	   available</a>, and you can <a href="https://f-droid.org/app/at.bitfire.davdroid">download the app on F-Droid</a>.</p>
+	   available</a>, and you can <a href="https://f-droid.org/app/at.bitfire.davdroid">download the app on F-Droid</a>.</p></p>
-	   
+]]></string>
-	   <p>However, it was much work to create this app, so we have decided to put it into the commercial stores for a small fee.
+    <string name="main_license_html"><![CDATA[<p><b>License</b></p>
-	   If you have downloaded the app on F-Droid, please consider
-	   <a href="https://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">donating to DAVdroid</a>.</p>
-	   
-	   <h1>License</h1>
 	   <p>Copyright © 2013 – 2015 Ricki Hirner, Bernhard Stockmann (<a href="https://www.bitfire.at">bitfire web engineering</a>).
 	   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 <a
 	   href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>. As far as Google Play, Samsung
-	   Store or Amazon Appstore require other terms, the respective terms apply only to versions
+	   Store or Amazon Appstore require other terms, the respective terms apply only to versions that are downloaded using these services.</p>
-	   that are downloaded using these services.</p>
+	]]></string>
-	   
+    <string name="main_translation_info">Translations to other languages than English and German have been contributed by various people which are mentioned in their respective language version.</string>
-	   <p>Translations to other languages than English and German have been contributed by
+    <string name="main_used_libraries_heading">DAVdroid uses these libraries (alphabetical order):</string>
-	   various people which are mentioned in their respective language version.</p>
-	   
-	   <h2>Used third-party libraries</h2>
-	   <p>
-	    * <a href="http://hc.apache.org">Apache HttpClient</a> (Android port) – <a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a><br/>
-	   	* <a href="https://github.com/ical4j/ical4j">iCal4j</a> – <a href="https://github.com/ical4j/ical4j/blob/master/LICENSE">New BSD License</a><br/>
-	   	* <a href="https://github.com/mangstadt/ez-vcard">ez-vcard</a> – <a href="http://opensource.org/licenses/BSD-3-Clause">New BSD License</a><br/>
-	   	* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> – <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
-	   	* <a href="https://projectlombok.org/">Project Lombok</a> – <a href="http://opensource.org/licenses/mit-license.php">MIT License</a><br/>
-		* <a href="http://www.xbill.org/dnsjava/">dnsjava</a> – <a href="http://www.xbill.org/dnsjava/dnsjava-current/LICENSE">BSD License</a></p>
-    ]]></string>
 
     <!-- AddAccountActivity -->
     <string name="login_type_email">Login with email address</string>
@@ -158,7 +139,7 @@
     <string name="settings_security_warning">Potential security risk!</string>
     <string name="settings_log_to_external_file">Log to external file</string>
     <string name="settings_log_to_external_file_confirmation">External log files will contain private data and be accessible by other apps. Turn off external logging and delete the log files after use.</string>
-    <string name="settings_log_to_external_file_on">Logs are written to external files (if possible)</string>
+    <string name="settings_log_to_external_file_on">Logs are written to %s (if possible)</string>
     <string name="settings_log_to_external_file_off">Logs are written to ADB</string>
     <string name="settings_log_verbose">Verbose logging</string>
     <string name="settings_log_verbose_on">Log synchronization information and network traffic</string>