arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-13 03:09:10 +00:00
Code Issues Releases Wiki Activity

Version update to 0.8.4.1

Browse Source 
* minor (crash) bug fixes
* updated translations
This commit is contained in:
Ricki Hirner 2015-08-31 16:31:12 +02:00
parent 5bf3aad575
commit a198309df5
17 changed files with 98 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -50,7 +50,7 @@ dependencies {
// Lombok for useful @helpers
provided 'org.projectlombok:lombok:1.16.6'
// ical4j for parsing/generating iCalendars
compile('org.mnode.ical4j:ical4j:2.0-beta1') {
compile('org.mnode.ical4j:ical4j:2.0-beta1') { // update ICAL_PRODID in Constants too!
// we don't need content builders, see https://github.com/ical4j/ical4j/wiki/Groovy
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
}

2
app/src/main/AndroidManifest.xml
View File

@ -9,7 +9,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="at.bitfire.davdroid"
android:versionCode="71" android:versionName="0.8.4"
android:versionCode="72" android:versionName="0.8.4.1"
android:installLocation="internalOnly">
<uses-sdk

5
app/src/main/java/at/bitfire/davdroid/Constants.java
View File

@ -11,10 +11,11 @@ import net.fortuna.ical4j.model.property.ProdId;
public class Constants {
public static final String
APP_VERSION = "0.8.4",
APP_VERSION = "0.8.4.1",
ACCOUNT_TYPE = "bitfire.at.davdroid",
WEB_URL_MAIN = "https://davdroid.bitfire.at/?pk_campaign=davdroid-app",
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";
public static final ProdId ICAL_PRODID = new ProdId("-//bitfire web engineering//DAVdroid " + Constants.APP_VERSION + " (ical4j 2.0-alpha1)//EN");
public static final ProdId ICAL_PRODID = new ProdId("-//bitfire web engineering//DAVdroid " + Constants.APP_VERSION + " (ical4j 2.0-beta1)//EN");
}

56
app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java
View File

@ -336,21 +336,22 @@ public class LocalAddressBook extends LocalCollection<Contact> {
protected void populateEmailAddress(Contact c, ContentValues row) {
ezvcard.property.Email email = new ezvcard.property.Email(row.getAsString(Email.ADDRESS));
switch (row.getAsInteger(Email.TYPE)) {
case Email.TYPE_HOME:
email.addType(EmailType.HOME);
break;
case Email.TYPE_WORK:
email.addType(EmailType.WORK);
break;
case Email.TYPE_MOBILE:
email.addType(Contact.EMAIL_TYPE_MOBILE);
break;
case Email.TYPE_CUSTOM:
String customType = row.getAsString(Email.LABEL);
if (StringUtils.isNotEmpty(customType))
email.addType(EmailType.get(labelToXName(customType)));
}
if (row.containsKey(Email.TYPE))
switch (row.getAsInteger(Email.TYPE)) {
case Email.TYPE_HOME:
email.addType(EmailType.HOME);
break;
case Email.TYPE_WORK:
email.addType(EmailType.WORK);
break;
case Email.TYPE_MOBILE:
email.addType(Contact.EMAIL_TYPE_MOBILE);
break;
case Email.TYPE_CUSTOM:
String customType = row.getAsString(Email.LABEL);
if (StringUtils.isNotEmpty(customType))
email.addType(EmailType.get(labelToXName(customType)));
}
if (row.getAsInteger(Email.IS_PRIMARY) != 0)
email.addType(EmailType.PREF);
c.getEmails().add(email);
@ -430,18 +431,19 @@ public class LocalAddressBook extends LocalCollection<Contact> {
}
if (impp != null) {
switch (row.getAsInteger(Im.TYPE)) {
case Im.TYPE_HOME:
impp.addType(ImppType.HOME);
break;
case Im.TYPE_WORK:
impp.addType(ImppType.WORK);
break;
case Im.TYPE_CUSTOM:
String customType = row.getAsString(Im.LABEL);
if (StringUtils.isNotEmpty(customType))
impp.addType(ImppType.get(labelToXName(customType)));
}
if (row.containsKey(Im.TYPE))
switch (row.getAsInteger(Im.TYPE)) {
case Im.TYPE_HOME:
impp.addType(ImppType.HOME);
break;
case Im.TYPE_WORK:
impp.addType(ImppType.WORK);
break;
case Im.TYPE_CUSTOM:
String customType = row.getAsString(Im.LABEL);
if (StringUtils.isNotEmpty(customType))
impp.addType(ImppType.get(labelToXName(customType)));
}
c.getImpps().add(impp);
}

2
app/src/main/java/at/bitfire/davdroid/ui/MainActivity.java
View File

@ -68,7 +68,7 @@ public class MainActivity extends Activity {
public void showWebsite(MenuItem item) {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(Constants.WEB_URL_HELP + "&pk_kwd=main-activity"));
intent.setData(Uri.parse(Constants.WEB_URL_MAIN + "&pk_kwd=main-activity"));
startActivity(intent);
}

2
app/src/main/java/at/bitfire/davdroid/ui/setup/AddAccountActivity.java
View File

@ -54,7 +54,7 @@ public class AddAccountActivity extends Activity {
}
public void showHelp(MenuItem item) {
startActivityForResult(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.WEB_URL_HELP)), 0);
startActivityForResult(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.WEB_URL_HELP + "&pk_kwd=add-account-activity")), 0);
}
}

6
app/src/main/res/values-ca/strings.xml
View File

@ -58,9 +58,9 @@
els vostres contactes i events.</p>
<p><b>En cas de problemes, sisplau llegiu el <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">FAQ</a> primer.
Si trobeu una errada que està clarament relacionada amb el DAVdroid, afegiu-la directament a
<a href="https://github.com/rfc2822/davdroid">Github</a> en comptes de contactar-nos directament o de donar una
valoració pobra de l\'aplicació.</b></p>
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>
<h1>Codi Obert</h1>
<p>DAVdroid està disenyat per a ser un proejcte de codi obert desde bon principi. Sempres es possible compilar l\'aplicació per la vostra part

58
app/src/main/res/values-de/strings.xml
View File

@ -27,7 +27,7 @@
<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>1. DAVdroid-Accounts verschwinden nach einem Neustart</h2>
<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
@ -36,7 +36,7 @@
* 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>2. DAVdroid-Accounts verschwinden nach einer DAVdroid-Aktualisierung</h2>
<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>,
@ -51,47 +51,47 @@
<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 werden dann automatisch in beide Richtungen synchronisiert.</p>
<p>Wenn Sie CyanogenMod benutzen, muss die "Datenschutz"-Funktion für DAVdroid deaktiviert sein, da DAVdroid sonst
keinen Zugriff auf die Kontakte und Kalendar hat und auch nicht synchronisieren kann.</p>
<p>Weitere Informationen erhalten Sie auf der <a href="http://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">DAVdroid-Homepage</a>.
Dort finden Sie auch eine <a href="http://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="http://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="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">häufig gestellten Fragen</a>.
Im Falle eines Fehlers, der eindeutig durch DAVdroid verursacht wird, berichten Sie diesen wenn möglich auf
<a href="https://github.com/rfc2822/davdroid">Github Issues</a>, anstatt uns direkt zu kontaktieren oder die App
schlecht zu bewerten.</b></p>
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 Quellcode ist
<a href="https://github.com/rfc2822/davdroid">auf Github verfügbar</a>, die App kann auch
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 ist jedoch 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 das Projekt unterstützen wollen, können Sie
<a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">für DAVdroid spenden</a> oder die App kaufen.</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 für über den jeweiligen Markt heruntergeladene
Apps diese Bedingungen.</p>
Sofern Google Play oder Samsung Store andere Bedingungen benötigen, gelten diese Bedingungen nur für über den jeweiligen
Markt heruntergeladene Apps.</p>
<p>Die Übersetzung auf Deutsch wird von den Autoren zur Verfügung gestellt. Übersetzungen für andere Sprachen
wurden von verschiedenen Leuten beigetragen, die in der jeweiligen Sprachversion erwähnt sind.</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="http://ical4j.sourceforge.net/">iCal4j<a> – <a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a><br/>
* <a href="https://code.google.com/p/ez-vcard/">ez-vcard</a> – <a href="http://opensource.org/licenses/BSD-3-Clause">New BSD License</a><br/>
* <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="http://projectlombok.org/">Project Lombok</a> – <a href="http://opensource.org/licenses/mit-license.php">MIT License</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>

45
app/src/main/res/values-es/strings.xml
View File

@ -36,51 +36,6 @@ que ocasiona que las cuentas de las aplicaciones de pago se eliminen cuando se a
<p><strong>Si estás afectado por uno de estos bugs, por favor <a href="market://details?id=at.bitfire.davdroid.jbworkaround">instala
DAVdroid JB Workaround</a>.</strong></p>
]]></string>
<string name="html_main_info"><![CDATA[
<h1>Bienvenido a DAVdroid/%s!</h1>
<p>DAVdroid es un adaptador de sincronización entre Android 4+ y CalDAV/CardDAV. Para usarlo, simplemente añade una cuenta DAVdroid
para tu servidor de CalDAV/CardDAV, así tus contactos y eventos serán sincronizados en ambas direcciones.</p>
<p>Para más información, por favor, visita la <a href="http://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">web de DAVdroid</a>.
Hay una <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Guía de configuración</a>, también. DAVdroid respeta
tu privacidad, lee nuestra <a href="http://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Política de Privacidad</a>.</p>
<p>Si usas CyanogenMod, debes desactivar "Privacy Guard" para DAVdroid. De otro modo, DAVdroid no tendrá autorización para acceder y sincronizar tus contactos y eventos.</p>
<p><b>Si tienes problemas, por favor lee primero las <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">FAQ</a>.
Si te encuentras un bug que esté claramente relacionado con DAVdroid, entra en
<a href="https://github.com/rfc2822/davdroid">Github issues</a> en lugar de contactar con nosotros directamente o de darle una mala
votación a la aplicación.</b></p>
<h1>Código abierto</h1>
<p>DAVdroid ha sido diseñado como un proyecto de código abierto desde sus inicios. Siempre es posible compilar la
app por ti mismo y usarla de forma gratuita sin ninguna obligación. El código fuente está
<a href="https://github.com/rfc2822/davdroid">disponible en Github</a>, y puedes
<a href="https://f-droid.org/app/at.bitfire.davdroid">descargar la app desde F-droid</a>.</p>
<p>Sin embargo, hay mucho trabajo detrás de la creación de esta aplicación, así que hemos decidido ponerla en las tiendas a cambio de un pequeño pago.
Si quieres apoyar este proyecto, por favor piensa en <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">hacer una donación a DAVdroid</a>
o en comprar la app.</p>
<h1>Licencia</h1>
<p>Copyright © 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). Todos los derechos reservados.
Este programa y los materiales que la acompañan está disponible bajo las condiciones de la GNU Public License v3.0
que acompaña a esta distribución, y está a tu disposición en <a
href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>. En lo relativo a Google Play, Samsung
Store y Amazon Appstore requiren de otras condiciones, las condiciones respectivas se aplican para las versiones
que se descarguen a través de estos servicios.</p>
<p>Translations.
Catalanian: <a href="https://github.com/pokoli">@pokoli</a>,
Chinese (simplified): <a href="https://github.com/phy25">@phy25</a>,
Czech: <a href="https://github.com/svetlemodry">Jaroslav Lichtblau</a>,
Serbian: <a href="https://github.com/pejakm">@pejakm</a>,
Spanish: <a href="https://github.com/xphnx">@xphnx</a>
</p>
<h2>Librerías de terceros usadas</h2>
<p>
* <a href="http://hc.apache.org">Apache HttpClient</a> (Android port) – <a href="http://www.apache.org/licenses/">Licencia Apache Versión 2.0</a><br/>
* <a href="http://ical4j.sourceforge.net/">iCal4j<a> - <a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">Licencia New BSD</a><br/>
* <a href="https://code.google.com/p/ez-vcard/">ez-vcard</a> - <a href="http://opensource.org/licenses/BSD-3-Clause">Licencia New BSD</a><br/>
* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> - <a href="http://www.apache.org/licenses/LICENSE-2.0">Licencia Apache Versión 2.0</a><br/>
* <a href="http://projectlombok.org/">Project Lombok</a> - <a href="http://opensource.org/licenses/mit-license.php">Licencia MIT</a></p>
* <a href="http://www.xbill.org/dnsjava/">dnsjava</a> - <a href="http://www.xbill.org/dnsjava/dnsjava-current/LICENSE">Licencia BSD</a></p>
]]></string>
<!-- AddAccountActivity -->
<string name="login_type_email">Acceder con cuenta de correo</string>
<string name="login_type_email_description">Los detalles del servicio serán detectados automáticamente por el nombre de dominio. Ejemplo: myaccount@icloud.com</string>

49
app/src/main/res/values-fr/strings.xml
View File

@ -39,55 +39,6 @@
<string name="main_manage_accounts">Gérer les comptes synchronisés</string>
<string name="davdroid_website">Site Web de DAVdroid</string>
<string name="html_main_info"><![CDATA[
<h1>Bienvenue dans DAVdroid/%s!</h1>
<p>DAVdroid est un connecteur de synhronisation entre Android 4+ et CalDAV/CardDAV. Pour l\'utiliser, il suffit d\'ajouter un compte DAVdroid
pour votre serveur CalDAV/CardDAV, et vos contacts/évènements seront synchronisés dans les deux sens.</p>
<p>Si vous utilisez CyanogenMod, "Privacy Guard" doit être désactivé pour DAVdroid. Sinon DAVdroid ne sera pas en mesure d\'accéder
et synchroniser vos contacts et évènements</p>
<p>Pour plus d\'informations, visitez <a href="http://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">la page d\'accueil de DAVdroid</a>.
Il y a <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Un guide d\'installation</a> également. DAVdroid respecte
votre vie privée, see our <a href="http://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Politique de confidentialité</a>.</p>
<p><b>En cas de problème, merci de lire la <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">FAQ</a> en premier lieu.
Si vous rencontrer un bug qui est clairement lié à DAVdroid, svp saisissez le sur
<a href="https://github.com/rfc2822/davdroid">Github issues</a> au lieu de nous contacter directement ou d\'attribuer une mauvaise appréciation à l\'application.</b></p>
<h1>Open-source</h1>
<p>DAVdroid est conçu depuis le début comme étant open-source. Il est toujours possible de le compiler vous-même l\'application
et l\'utiliser gratuitement sans autre obligation. Le code source est
<a href="https://github.com/rfc2822/davdroid">disponible sur Github</a>, et vous pouvez
<a href="https://f-droid.org/app/at.bitfire.davdroid">télécharger l\'application sur F-droid</a>.</p>
<p>Néanmoins étant donné que créer cette application nécessite du travail, nous avons décidé de la mettre sur les Stores (Google Play,
Samsung Store) pour un faible coût.
Si vous voulez aider ce projet <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">faites un don à DAVdroid</a> ou achetez le</p>
<h1>License</h1>
<p>Copyright © 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). All rights reserved.
Ce programme et les documents qui l\'accompagnent sont mis à disposition sous les termes de la Licence Public GNU v3.0 qui
accompagne cette distribution, et est disponible à <a
href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>. En ce qui concerne Google Play ou Samsung Store, les conditions respectives s\'appliquent pour les versions qui sont téléchargées via ces services.</p>
<p>Translations.
Catalanian: <a href="https://github.com/pokoli">@pokoli</a>,
Chinese (simplified): <a href="https://github.com/phy25">@phy25</a>,
Czech: <a href="https://github.com/svetlemodry">Jaroslav Lichtblau</a>,
Serbian: <a href="https://github.com/pejakm">@pejakm</a>,
Spanish: <a href="https://github.com/xphnx">@xphnx</a>
</p>
<h2>Bibliothèques tiers</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="http://ical4j.sourceforge.net/">iCal4j<a> (<a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
* <a href="https://code.google.com/p/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="http://projectlombok.org/">Project Lombok</a> (<a href="http://opensource.org/licenses/mit-license.php">MIT License</a>)</p>
]]></string>
<string name="setup_account_details">Détails du compte</string>
<string name="setup_account_name">Nom du compte:</string>
<string name="setup_account_name_hint">Mon compte CalDAV/CardDAV</string>

50
app/src/main/res/values-hu/strings.xml
View File

@ -47,56 +47,6 @@
<p><strong>A probléma a <a href="market://details?id=at.bitfire.davdroid.jbworkaround">JB DAVdroid gyorsjavítás</a>
telepítésével kiküszöbölhető.</strong></p>
]]></string>
<string name="html_main_info"><![CDATA[
<h1>Üdvözöljük a DAVdroid/%s felhasználók között!</h1>
<p>DAVdroid egy Android 4+ CalDAV/CardDAV szinkronizációs adapter. Használatához hozzon létre egy DAVdroid fiókot a használni
kívánt CalDAV/CardDav szerverhez. Ezt követően a névjegyek és események szinkronizálva lesznek, mindkét irányban.</p>
<p>További információkat a <a href="http://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">DAVdroid
honlap</a> tartalmaz. A beállításokkal kapcsolatban a
<a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">beállítások</a> oldalon
találhat információkat. A DAVdroid tiszteletben tartja adatait bizalmasságát, részleteket az
<a href="http://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">adatkezelési nyilatkozat</a>
tartalmaz.</p>
<p>Ha Ön CyanogenMod felhasználó, vonja ki a DAVdroidot a "Privacy Guard" hatálya alól, különben a DAVdroid nem fog tudni
hozzáférni a névjegyekhez és eseményekhez.</p>
<p><b>Probléma esetén olvassa el a
<a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">GYIK</a>-et. Ha
egyértelműen a DAVdroidhoz köthető hibába ütközik, ahelyett, hogy közvetlenül keresne minket, vagy lepontozná az alkalmazást,
inkább a <a href="https://github.com/rfc2822/davdroid">Problémák</a> oldalon jelentse be.</b></p>
<h1>Nyílt forráskód</h1>
<p>A DAVdroid kezdettől fogva nyílt forráskódú projekt. Bármikor lehetősége van az alkalmazást lefordítani és használni,
mindenféle kötelezettség nélkül. A forráskód elérhető a <a href="https://github.com/rfc2822/davdroid">Github</a>on, a
lefordított alkalmazás pedig az
<a href="https://f-droid.org/app/at.bitfire.davdroid">F-droid</a>on.</p>
<p>Mindemellett, az alkalmazás kifejlesztése sok munkát igényelt, ezért úgy döntöttünk, hogy az alkalmazást más áruházakban
is elérhetővé tesszük, egy szerény díj ellenében. Ha szeretné támogatni ezt a projektet, kérjük, fontolja meg az alkalmazás
megvásárlását vagy <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">közvetlen
támogatását</a>.</p>
<h1>Licenc</h1>
<p>Copyright © 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). Minden jog fenntartva.
Ez a program és a kapcsolódó anyagok a GNU Public License v3.0 hatálya alatt állnak, amely részét képezi a jelen csomagnak, és
amely elérhető
<a href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a> oldalon. Amennyiben a Google Play, Samsung
Store, AndroidPit App Center vagy Amazon Appstore áruház eltérő feltételeket szab, akkor annak az áruháznak a szabályai
irányadóak, ahonnan az alkalmazást letöltötte.</p>
<p>Fordítások.
cseh: <a href="https://github.com/svetlemodry">Jaroslav Lichtblau</a>,
katalán: <a href="https://github.com/pokoli">@pokoli</a>,
kínai (egyszerűsített): <a href="https://github.com/phy25">@phy25</a>,
magyar: <a href="https://github.com/gjtoth">Gábor J.Tóth</a>,
szerb: <a href="https://github.com/pejakm">@pejakm</a>,
spanyol: <a href="https://github.com/xphnx">@xphnx</a>.
</p>
<h2>Harmadik felek által fejlesztett programcsomagok</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="http://ical4j.sourceforge.net/">iCal4j<a> – <a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">
New BSD License</a><br/>
* <a href="https://code.google.com/p/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="http://projectlombok.org/">Project Lombok</a> – <a href="http://opensource.org/licenses/mit-license.php">MIT License</a></p>
]]></string>
<!-- AddAccountActivity -->
<string name="login_type_email">Bejelentkezés email cím segítségével</string>

45
app/src/main/res/values-nl/strings.xml
View File

@ -43,51 +43,6 @@
<p><strong>Als je getroffen ben door een van deze bugs, <a href="market://details?id=at.bitfire.davdroid.jbworkaround">instaleer de
DAVdroid JB Workaround</a>.</strong></p>
]]></string>
<string name="html_main_info"><![CDATA[
<h1>Welkome bij DAVdroid/%s!</h1>
<p>DAVdroid is een Android 4+ sync adapter voor CalDAV/CardDAV. Om het te gebruiken, voegt u eerst een DAVdroid account toe
voor uw CalDAV/CardDAV server en uw contacten/afspraken zullen worden synchronizeerd in beide directies.</p>
<p>Voor meer informatie, Bekijk de <a href="http://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">DAVdroid homepage</a>.
Er is een ook een <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Setup handleiding</a>. DAVdroid respecteerd
uw privacy, Zie onze <a href="http://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Privacybeleid</a>.</p>
<p>Als u CyanogenMod gebruikt, moet "Privacy Guard" worden uitgeschakeld voor DAVdroid. Anders krijgt DAVdroid geen toegang voor het
synchroniseren van je contacten en afspraken.</p>
<p><b>In geval van problemen, lees dan de <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">FAQ</a> eerst.
Als je een bug tegenkomt die duidelijk gerelateerd is aan DAVdroid, meld het bij
<a href="https://github.com/rfc2822/davdroid">Github issues</a> in plaats van ons direct to contacteren of ons een slechte rating voor de app te geven.</b></p>
<h1>Open-source</h1>
<p>DAVdroid is vanaf het begin ontworpen om een open-source project te zijn. Het is altijd mogelijk om het zelf the compileren vanaf bron code en het gratis en vrijblijvend te gebruiken. De broncode is
<a href="https://github.com/rfc2822/davdroid">beschikbaar op Github</a>, en j kunt
<a href="https://f-droid.org/app/at.bitfire.davdroid">de app op F-droid downloaden</a>.</p>
<p>HHet was echter veel werk om deze app te maken, dus hebben we besloten om het in de commerciële winkels te plaatsen voor een kleine vergoeding.
Wilt u dit project steunen, kunt u overwegen <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">een donatie aan DAVdroid</a> te plaatsen of om het te kopen.</p>
<h1>Licentie</h1>
<p>Copyright © 2013 – 2015 Ricki Hirner, Bernhard Stockmann (<a href="http://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 for versions
that are downloaded via these services.</p>
<p>Vertalen in het Duits wordt door de auteurs verzorgd. Vertalingen naar andere talen zijn bijgedragen door
verschillende mensen die worden genoemd in hun respectieve taal versie.</p>
<h2>Gebruik van third-party 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="http://ical4j.sourceforge.net/">iCal4j<a> – <a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
* <a href="https://code.google.com/p/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="http://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">Inloggen met e-mailadres</string>

40
app/src/main/res/values-pt/strings.xml
View File

@ -35,46 +35,6 @@
para instalar a sulução DAVdroid</a>.</strong></p>
]]></string>
<string name="html_main_info"><![CDATA[
<h1>Bem vindo ao DAVDroid</h1>
<p>DAVDroid é uma aplicativo de sincronização entre Android 4+ e CalDAV/CardDAV baseado no aplicativo DAVdroid. Para usar o aplicativo basta adicionar uma conta
DAVDroid para seu servidor de CalDAV/CardDAV e seus contatos e eventos serão sincronizados.</p>
<p>Se você usa o CyanogenMod, deve desativar o "Privacy Guard" para DAVDroid, caso contrário o DAVDroid não terá autorização para
acessar e sincronizar seus contatos e eventos.</p>
<p><b>Em caso de problemas, por favor leia o <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">FAQ</a> (em inglês).
Se você encontrar algum problema claramente relacionado ao DAVDroid, informe-o em
<a href="https://github.com/rfc2822/davdroid">Github issues</a> ao invés de dar uma avaliação negativa ao aplicativo</b></p>
<h1>Software Livre</h1>
<p>O DAVDroid foi criado como um projeto de código aberto desde o início, permitindo que você mesmo compile a aplicação e use de forma gratuíta
sem nenhuma obrigação. O código fonte está disponível em <a href="https://github.com/rfc2822/ExpressoDav">Github</a>, e você pode
<a href="https://f-droid.org/app/at.bitfire.DAVDroid">também baixar o app em F-droid</a>.</p>
<p>Foi muito trabalhoso criar este aplicativo por isso decidimos coloca-lo nas lojas comerciais por uma pequena taxa.
Se você quiser apoiar este projeto considere uma <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">doação</a> ou compre-o</p>
<h1>Licença do DAVdroid</h1>
<p>Copyright © 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). Todos os direitos reservados.
Este programa e os materias que o acompanham estão de acordo com a GNU Public License v3.0 e está disponível em <a
href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>. Em relação ao Google Play, Samsung Store ou Amazon Appstore são requeridas outras condições, realize o download destas nestes serviços.</p>
<p>Traduções.
</p>
<h2>Bibliotecas de terceiros utilizadas</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="http://ical4j.sourceforge.net/">iCal4j<a> (<a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">Licencia New BSD</a>)<br/>
* <a href="https://code.google.com/p/ez-vcard/">ez-vcard</a> (<a href="http://opensource.org/licenses/BSD-3-Clause">Licencia New BSD</a>)<br/>
* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> (<a href="http://www.apache.org/licenses/LICENSE-2.0">Licencia Apache Version 2.0</a>)<br/>
* <a href="http://projectlombok.org/">Project Lombok</a> (<a href="http://opensource.org/licenses/mit-license.php">Licencia MIT</a>)</p>
]]></string>
<!-- AddAccountActivity -->
<string name="login_type_email">Login com seu enderço de email</string>
<string name="login_type_email_description">Detalhes do serviço poderão ser detectados automaticamente pelo nome do

51
app/src/main/res/values-ru/strings.xml
View File

@ -44,57 +44,6 @@
<p><strong>Если вы столкнулись с этими ошибками, пожалуйста установите дополнительное приложение <a href="market://details?id=at.bitfire.davdroid.jbworkaround">
DAVdroid JB Workaround</a> для их устранения.</strong></p>
]]></string>
<string name="html_main_info"><![CDATA[
<h1>Добро пожаловать в DAVdroid/%s!</h1>
<p>DAVdroid это адаптер синхронизации CalDAV/CardDAV для Android 4+. Для его использования просто добавьте аккаунт DAVdroid
для вашего сервера CalDAV/CardDAV после чего ваши контакты и события календаря будут синхронизироваться в оба направления.</p>
<p>Для более подробной информации, просмотрите веб-сайт <a href="http://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">DAVdroid</a>,
Руководство <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">по установке</a>. Также прочитайте
<a href="http://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Политику Конфиденциальности</a> DAVdroid.</p>
<p>Если вы пользователь CyanogenMod, "Privacy Guard" должно быть отключено для DAVdroid. Если этого не сделать,
DAVdroid не получит необходимый доступ для синхронизации ваших контактов и календарей.</p>
<p><b>В случае каких либо проблем, прожалуйста сначала прочитайте <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">FAQ</a>.
Если вы столкнулись с ошибкой, которая явно связана с DAVdroid, опишите её в соответствующем разделе
<a href="https://github.com/rfc2822/davdroid">Issues at Github</a> вместо связи с нами напрямую или
плохой оценки приложения.</b></p>
<h1>ПО с открытым исходным кодом</h1>
<p>С самого начала DAVdroid был задуман как проект с отрытым исходным кодом. Всегда можно скомпилировать
это приложение для себя и использовать его бесплатно без каких-либо обязательств. Исходный код
<a href="https://github.com/rfc2822/davdroid">доступен на Github</a>, и вы всегда сможете
<a href="https://f-droid.org/app/at.bitfire.davdroid">скачать</a> программу через сайт F-droid.</p>
<p>Тем не менее, командой разработчиков была проделана большая работа чтобы создать это приложение, поэтому мы решили сделать программу доступной через коммерческие сервисы приложений.
Если вы хотите поддержать этот проект, рассмотрите возможность <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">пожертования на DAVdroid</a>
или его приобретения.</p>
<h1>Лицензия</h1>
<p>Авторское право © 2013 – 2015 Ricki Hirner, Bernhard Stockmann (<a href="http://www.bitfire.at">bitfire web engineering</a>). Все права защищены.
Эта программа и сопутствующие материалы предоставлены на условиях лицензии GNU Public License v3.0 доступной
по адресу <a
href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>.
Ввиду того, что Google Play, Samsung
Store или Amazon Appstore требуют иные условия лицензирования,
их требования распространяются на версии, которые загружены через соответствующие сервисы.</p>
<p>Перевод на Немецкий язык выполнен авторами программы. Переводы на остальные языки предоставлены разными людьми, которые
перечислены в соответствующей языковой версии программы.</p>
<p>Перевод на русский язык Василий Поломарь (vasp@zabmail.ru).</p>
<h2>Использованные библиотеки</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="http://ical4j.sourceforge.net/">iCal4j<a> – <a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
* <a href="https://code.google.com/p/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="http://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">Вход по адресу email</string>

45
app/src/main/res/values-sr/strings.xml
View File

@ -44,51 +44,6 @@
<p><strong>Ако имате један од наведених проблема, <a href="market://details?id=at.bitfire.davdroid.jbworkaround">инсталирајте „DAVdroid JB Workaround“</a>.</strong></p>
]]></string>
<string name="html_main_info"><![CDATA[
<h1>Добро дошли у ДАВдроид/%s!</h1>
<p>ДАВдроид (DAVdroid) је Андроид 4+ адаптер синхронизације за КалДАВ/КардДАВ (CalDAV/CardDAV). Да бисте га користили,
само додајте ДАВдроид налог за ваш КалДАВ/КардДАВ сервер и ваши контакти/догађаји ће бити синхронизовани у оба смера.</p>
<p>За више информација погледајте <a href="http://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">ДАВдроид вебсајт</a>.
Постоји и <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">водич за поставку</a>. ДАВдроид поштује
вашу приватност, погледајте нашу <a href="http://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">политику приватности</a>.</p>
<p>Ако користите Цијаноген Мод, „Privacy Guard“ мора бити онемогућен за ДАВдроид. У супротном, ДАВдроиду неће бити дозвољени
приступ и синхронизација ваших контаката и догађаја.</p>
<p><b>У случају проблема, најпре прочитајте <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">често постављана питања</a>.
Ако вам се деси грешка која је сигурно везана за ДАВдроид, поднесите пријаву на
<a href="https://github.com/rfc2822/davdroid">Гитхабовом пратиоцу</a> уместо да нас контактирате директно или да апликацији дате лошу оцену.</b></p>
<h1>Отворени кôд</h1>
<p>ДАВдроид је испочетка дизајниран као пројекат отвореног кôда. Увек је могуће да сами компајлирате
апликацију и да је слободно користите без икаквих обавеза. Изворни кôд је
<a href="https://github.com/rfc2822/davdroid">доступан на Гитхабу</a>, а можете и
<a href="https://f-droid.org/app/at.bitfire.davdroid">преузети апликацију са Ф-дроида</a>.</p>
<p>Међутим, уложено је много рада у ову апликацију па смо одлучили да је ставимо у комерцијалне продавнице за малу накнаду.
Ако желите да подржите овај пројекат, <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">донирајте ДАВдроиду</a>
или га купите.</p>
<h1>Лиценца</h1>
<p>Ауторско право © 2013 – 2014 Рики Хирнер (Ricki Hirner), Бернхарт Стокман (Bernhard Stockmann) (<a href="http://www.bitfire.at">Битфајер веб инжињеринг</a>). Сва права задржана.
Овај програм и пратећи материјали су доступни под условима ГНУ-ове Јавне Лиценце в3.0 која је приложена,
и доступна на <a href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>. Ако сервиси „Google Play“,
„Samsung Store“, „AndroidPit App Center“ или „Amazon Appstore“ захтевају друге услове, исти важе за издања преузета са ових сервиса.</p>
<p>Превод на српски: <a href="https://github.com/pejakm">@pejakm</a>. Превод на немачки: аутори. Остале преводе
допринели су људи поменути у преводима одговарајућих језика.</p>
<h2>Коришћене друге библиотеке</h2>
<p>
* <a href="http://hc.apache.org">Апачи ХТТП клијент</a> (Android port) – <a href="http://www.apache.org/licenses/">Апачи лиценца, издање 2.0</a><br/>
* <a href="http://ical4j.sourceforge.net/">iCal4j<a> – <a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">Нова БСД лиценца</a>)<br/>
* <a href="https://code.google.com/p/ez-vcard/">ez-vcard</a> – <a href="http://opensource.org/licenses/BSD-3-Clause">Нова БСД лиценца</a><br/>
* <a href="http://simple.sourceforge.net/">Симпле ИксМЛ серијализација</a> – <a href="http://www.apache.org/licenses/LICENSE-2.0">Апачи лиценца, издање 2.0</a><br/>
* <a href="http://projectlombok.org/">Пројекат Ломбок</a> – <a href="http://opensource.org/licenses/mit-license.php">МИТ лиценца</a><br/>
* <a href="http://www.xbill.org/dnsjava/">dnsjava</a> – <a href="http://www.xbill.org/dnsjava/dnsjava-current/LICENSE">БСД лиценца</a></p>
]]></string>
<!-- AddAccountActivity -->
<string name="login_type_email">Пријавите се адресом е-поште</string>

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

@ -40,45 +40,6 @@
<p><strong>如果您遇到了这些问题，请<a href="market://details?id=at.bitfire.davdroid.jbworkaround">安装
DAVdroid JB 修复程序</a>。</strong></p>
]]></string>
<string name="html_main_info"><![CDATA[
<h1>欢迎使用 DAVdroid/%s！</h1>
<p>DAVdroid 是一个 Android 4+ 的 CalDAV/CardDAV 同步程序。<strong>开始使用本程序，只需增加一个 DAVdroid 账户，在其中设置 CalDAV/CardDAV 服务器，您的通讯录和日程就可以被双向同步了。</strong></p>
<p>更多信息请查阅 <a href="http://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">DAVdroid 英文主页</a>，其中包括<a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">首次使用的配置指南</a>。DAVdroid 尊重您的隐私，请查阅我们的<a href="http://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">隐私政策</a>。</p>
<p>如果您使用 CyanogenMod 等修改版系统，请停用针对 DAVdroid 的“隐私防护”功能，否则 DAVdroid 无法访问、同步您的通讯录和日程。</p>
<p><b>如果您在使用中遇到问题，请先阅读 <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">FAQ</a>。如果您遇到了明显与 DAVdroid 有关的 BUG，请在 <a href="https://github.com/rfc2822/davdroid">Github issues</a> 上提交，不要直接联系我们，甚至给应用差评。</b></p>
<h1>开源</h1>
<p>DAVdroid 从一开始就是开源项目。您可以自己编译应用，并可以没有限制地免费使用。源代码
<a href="https://github.com/rfc2822/davdroid">存放在 Github 上</a>，您也可以
<a href="https://f-droid.org/app/at.bitfire.davdroid">在 F-droid 上下载应用</a>。</p>
<p>然而，编写这个应用是一个大工程，所以我们已经决定把它作为付费应用放在应用商店上，收一笔小费。
如果您想支持这个项目，请考虑 <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">给 DAVdroid 捐款</a> 或购买其付费版。</p>
<h1>许可</h1>
<p>Copyright © 2013 – 2015 Ricki Hirner, Bernhard Stockmann (<a href="http://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 for versions
that are downloaded via these services.</p>
<p>Translation for German is provided by the authors. Translation for Chinese Simplified is by <a href="https://github.com/phy25">@phy25</a>. Translations to other languages have been contributed by
various people which are mentioned in their respective language version.</p>
<h2>使用的第三方程序库</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="http://ical4j.sourceforge.net/">iCal4j<a> – <a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
* <a href="https://code.google.com/p/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="http://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">使用邮箱地址登录</string>

61
app/src/main/res/values/strings.xml
View File

@ -27,16 +27,17 @@
<string name="html_main_workaround"><![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>
<h2><a href="https://davdroid.bitfire.at/faq/entry/account-gone-after-reboot">1. Accounts may be gone after a reboot</a></h2>
<p>You may encounter the problem that all your <strong>DAVdroid accounts (including contacts and events) are gone
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>
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>
<p>Affected users:<br/>
* all Android 4.1 users who have got DAVdroid from Play Store;<br/>
* Android 4.2 users who have got DAVdroid from Play Store only with certain devices (for instance, most Samsung devices)</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>2. Accounts may be gone after upgrading DAVdroid</h2>
<h2><a href="https://davdroid.bitfire.at/faq/entry/account-gone-after-updating">2. Accounts may be gone after upgrading DAVdroid</a></h2>
<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>
@ -49,48 +50,46 @@
<h1>Welcome to DAVdroid/%s!</h1>
<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 will be synchronized in both directions.</p>
<p>For more information, please see the <a href="http://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">DAVdroid homepage</a>.
There\'s a <a href="http://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="http://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Privacy Policy</a>.</p>
<p>If you use CyanogenMod, "Privacy Guard" must be disabled for DAVdroid. Otherwise, DAVdroid is not allowed to access
and synchronize your contacts and events.</p>
<p><b>In case of problems, please read the <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">FAQ</a> first.
If you encounter a bug that is clearly related to DAVdroid, enter it on
<a href="https://github.com/rfc2822/davdroid">Github issues</a> instead of contacting us directly or giving a poor
rating for the app.</b></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><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>
<p>If you use a privacy guard (default in CyanogenMod), please remember you have to allow contact and calendar access for DAVdroid.</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 source code is
<a href="https://github.com/rfc2822/davdroid">available on Github</a>, and you can
<a href="https://f-droid.org/app/at.bitfire.davdroid">download the app on F-droid</a>.</p>
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>
<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.
If you want to support this project, please consider <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">donating to DAVdroid</a>
or purchasing it.</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="http://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
<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 for versions
that are downloaded via these services.</p>
Store or Amazon Appstore require other terms, the respective terms apply only to versions
that are downloaded using these services.</p>
<p>Translation for German is provided by the authors. Translations to other languages have been contributed by
<p>Translations to other languages than English and German have been contributed by
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="http://ical4j.sourceforge.net/">iCal4j<a> – <a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
* <a href="https://code.google.com/p/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/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="http://projectlombok.org/">Project Lombok</a> – <a href="http://opensource.org/licenses/mit-license.php">MIT License</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>