From 8d5024b04f56582eda601f0df7e32c9fe8dfae51 Mon Sep 17 00:00:00 2001
From: massimiliano <massimiliano@disroot.org>
Date: Sun, 30 Dec 2018 10:52:32 +0100
Subject: [PATCH] Added extra info for notes + Corrected typos and updated
translations
---
.../disroot/disrootapp/ui/MainActivity.java | 16 +++----
.../disroot/disrootapp/utils/Constants.java | 1 +
app/src/main/res/values-es/strings.xml | 2 +-
app/src/main/res/values-fr/strings.xml | 46 +++++++++++--------
app/src/main/res/values-it/strings.xml | 2 +-
app/src/main/res/values-nl/strings.xml | 11 +++--
app/src/main/res/values-pt/strings.xml | 2 +-
app/src/main/res/values-sr/strings.xml | 2 +-
app/src/main/res/values/strings.xml | 18 ++++----
app/src/main/res/xml/changelog_master.xml | 5 ++
10 files changed, 60 insertions(+), 45 deletions(-)
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
index c350b06..c02591d 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@@ -1077,14 +1077,14 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setTitle(R.string.NotesTitle);
builder.setMessage(getString(R.string.NotesInfo));
builder.setPositiveButton(R.string.global_ok, null);
- //builder.setNegativeButton(R.string.tell_more, new DialogInterface.OnClickListener() {
- // @Override
- // public void onClick(DialogInterface dialog, int which) {
- // webView.loadUrl(Constants.URL_DisApp_NOTESHELP);
- // webView.setVisibility(View.VISIBLE);
- // dashboard.setVisibility(View.GONE);
- // }
- //});
+ builder.setNegativeButton(R.string.tell_more, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ webView.loadUrl(Constants.URL_DisApp_NOTESHELP);
+ webView.setVisibility(View.VISIBLE);
+ dashboard.setVisibility(View.GONE);
+ }
+ });
builder.show();
}
private void showNotesDialog(){
diff --git a/app/src/main/java/org/disroot/disrootapp/utils/Constants.java b/app/src/main/java/org/disroot/disrootapp/utils/Constants.java
index 68d148a..dfc7ba4 100644
--- a/app/src/main/java/org/disroot/disrootapp/utils/Constants.java
+++ b/app/src/main/java/org/disroot/disrootapp/utils/Constants.java
@@ -46,4 +46,5 @@ public class Constants {
public static final String URL_DisApp_UPLOADHELP = "https://howto.disroot.org/en/lufi";
public static final String URL_DisApp_POLLHELP = "https://howto.disroot.org/polls";
public static final String URL_DisApp_BOARDHELP = "https://disroot.org/services/project-board";
+ public static final String URL_DisApp_NOTESHELP = "https://howto.disroot.org/en/nextcloud/sync-with-your-cloud/android/using-notes";
}
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 199d873..b033432 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -153,7 +153,7 @@
<string name="Investigating">Investigando</string>
<string name="Identified">Identificado</string>
<string name="NotesTitle">Notas de Nextcloud Info</string>
- <string name="NotesInfo">La aplicación Notas es un programa de Nextcloud para tomar notas sin distracciones</string>
+ <string name="NotesInfo">La aplicación Notas es un programa de Nextcloud para tomar notas sin distracciones.\n\nDirección del servidor:\n https://cloud.disroot.org\n\nUsuario: tu_usuario_de_disroot\nContraseña:tu_contraseña_de_Disroot</string>
<string name="action_notes">Notes</string>
<string name="NotesDialog">Para continuar, primero necesitas instalar Notas.\nPor favor, selecciona Instalar para continuar con la instalación desde F-Droid.</string>
</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 69a13f6..89b2566 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -164,25 +164,33 @@
<string name="MailDialog">Pour continuer, vous devez d\'abord installer K9-Mail.\nVeuillez sélectionner Installer pour continuer l\'installation avec F-Droid.</string>
<string name="CloudDialog">Pour continuer, vous devez d\'abord installer l\'application Nextcloud.\nVeuillez sélectionner Installer pour continuer l\'installation avec F-Droid.</string>
<string name="ChatDialog">Pour continuer, vous devez d\'abord installer Conversations.\nVeuillez sélectionner Installer pour continuer l\'installation avec F-Droid.</string>
- <string name="app_state">Disroot state</string>
- <string name="Operational">Operational</string>
- <string name="MajorOutage">Major Outage</string>
- <string name="EmailService">Email Service</string>
- <string name="LastUpdated">Last updated: \</string>
- <string name="WebmailService">WebMail Service</string>
+ <string name="app_state">État Disroot</string>
+ <string name="Operational">Opérationnel</string>
+ <string name="MajorOutage">Panne majeure</string>
+ <string name="EmailService">Service d\'email</string>
+ <string name="LastUpdated">Dernière mise à jour: \</string>
+ <string name="WebmailService">Service WebMail</string>
<string name="Cloud">Cloud</string>
- <string name="PerformanceIssues">Performance Issues</string>
- <string name="Notification">No issues</string>
- <string name="Notificationissues">Some systems are experiencing issues</string>
- <string name="state_messages_btn">Show State messages</string>
- <string name="state_btn">Show Service State</string>
- <string name="ScheduledAt">Scheduled at:</string>
- <string name="NotificationTitle">Message from Disroot State!</string>
- <string name="Scheduled">Scheduled</string>
- <string name="Investigating">Investigating</string>
- <string name="Identified">Identified</string>
- <string name="NotesTitle">Nextcloud Notes Info</string>
- <string name="NotesInfo">The notes app is a distraction free notes taking app for Nextcloud</string>
- <string name="NotesDialog">To continue you need to install Notes first.\nPlease select install to continue with the installatin on F-Droid.</string>
+ <string name="PerformanceIssues">Problèmes de performance</string>
+ <string name="Notification">Aucun problème</string>
+ <string name="Notificationissues">Certains systèmes connaissent des problèmes</string>
+ <string name="state_messages_btn">Afficher les messages d\'état</string>
+ <string name="state_btn">Afficher l\'état de service</string>
+ <string name="ScheduledAt">Programmé le :</string>
+ <string name="NotificationTitle">Message de l\'état de Disroot!</string>
+ <string name="Scheduled">Programmé</string>
+ <string name="Investigating">Enquêter</string>
+ <string name="Identified">Identifié</string>
+ <string name="NotesTitle">Notes Nextcloud Info</string>
+ <string name="NotesInfo">L\'application notes est une application de prise de notes sans distraction pour Nextcloud.\n
+\nAdresse du serveur :
+\n https://cloud.disroot.org
+\n
+\nNom d\'utilisateur :
+\n votre_nom_d\'utilisateur_disroot
+\n
+\nMot de passe :
+\n votre_mot_de_passe_disroot</string>
+ <string name="NotesDialog">Pour continuer, vous devez d\'abord installer Notes.\nVeuillez sélectionner Installer pour continuer l\'installation avec F-Droid.</string>
<string name="action_notes">Notes</string>
</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index de49c11..1d19999 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -152,7 +152,7 @@
<string name="Investigating">Indagando</string>
<string name="Identified">Identificato</string>
<string name="NotesTitle">Info su Nextcloud Notes</string>
- <string name="NotesInfo">L\'app notes è un\'app che prende note senza distrazioni per Nextcloud</string>
+ <string name="NotesInfo">L\'app notes è un\'app che prende note senza distrazioni per Nextcloud.\n\nIndirizzo del server:\n https://cloud.disroot.org\n\nnnome utente:\n il_tuo_nome_utente_disroot\n\nPassword:\n la_tua_password_disroot</string>
<string name="NotesDialog">Per continuare è necessario installare Notes.\nSelezionate installa per continuare con l\'installazione su F-Droid.</string>
<string name="action_notes">Note</string>
</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index dfd463e..5129b3d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -44,10 +44,11 @@
<string name="licenseTitle">Licentie</string>
<string name="license_button">GNU LGPLv3.0 Licentie</string>
- <string translatable="false" name="licenseText">Copyright © 2007 Free Software Foundation, Inc.\n
- This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, version 3 of the License only.\n\n
- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- </string>
+ <!--Non translatable
+ <string translatable="false" name="licenseText">Copyright © 2007 Free Software Foundation, Inc.\n
+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, version 3 of the License only.\n\n
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ </string>-->
<string name="maintainersTitle">Onderhouders</string>
<string name="maintainersText">Deze app wordt momenteel ontwikkeld en onderhouden door\n\n</string>
@@ -153,7 +154,7 @@
<string name="Investigating">Aan het onderzoeken</string>
<string name="Identified">Geïdentificeerd</string>
<string name="NotesTitle">Nextcloud Notes Info</string>
- <string name="NotesInfo">De notes app is een afleidingsvrije notities app voor Nextcloud.</string>
+ <string name="NotesInfo">De notes app is een afleidingsvrije notities app voor Nextcloud.\n\nServer adres:\n https://cloud.disroot.org\n\nGebruikersnaam:\n uw_disroot_gebruikersnaam\n\nWachtwoord:\n uw_disroot_wachtwoord</string>
<string name="NotesDialog">Om verder te gaan moet u eerst Notes installeren.\nSelecteer Installeren om verder te gaan met de installatie op F-Droid.</string>
<string name="action_notes">Notes</string>
</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 714bbc5..d7f17de 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -152,7 +152,7 @@
<string name="Investigating">Investigating</string>
<string name="Identified">Identified</string>
<string name="NotesTitle">Nextcloud Notes Info</string>
- <string name="NotesInfo">The notes app is a distraction free notes taking app for Nextcloud</string>
+ <string name="NotesInfo">The notes app is a distraction free notes taking app for Nextcloud.\n\nEndereço do servidor:\n https://cloud.disroot.org\n\nNome de utilizador:\n O_seu_nome_de_utilizador_disroot\n\nPassword:\n a_sua_password_do_disroot</string>
<string name="NotesDialog">To continue you need to install Notes first.\nPlease select install to continue with the installatin on F-Droid.</string>
<string name="action_notes">Notes</string>
</resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index b85e7d8..8a96b3a 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -153,7 +153,7 @@
<string name="Investigating">Upit</string>
<string name="Identified">Prepoznato</string>
<string name="NotesTitle">Nextcloud Beleške Info</string>
- <string name="NotesInfo">Ova aplikacija omogućava lako pravljenje beleški na platformi Nextcloud</string>
+ <string name="NotesInfo">Ova aplikacija omogućava lako pravljenje beleÅ¡ki na platformi Nextcloud.\n\nAdresa server:\n https://cloud.disroot.org\n\nKorisniÄko ime:\n vaÅ¡e_disroot_korisniÄko ime\n\nLozinka:\n vaÅ¡a_disroot_lozinka</string>
<string name="NotesDialog">Za nastavak je potrebno instalirati aplikaciju Beleške (Notes).\nIzaberite \'instaliraj\' i preuzmite aplikaciju pomoću F-Droid-a.</string>
<string name="action_notes">Beleške</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c97ce26..65d76bc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,9 +57,9 @@
<string name="contributors"><b> • muppeth:</b>\n Disroot admin\n\n<b> • antilopa:</b>\n Disroot admin\n\n<b> • Massimiliano:</b>\n Developer\n\n<b> • Fede:</b>\n Content contributor\n\n<b> • Meaz:</b>\n Content contributor\n\n<b> • maryjane:</b>\n Content contributor\n\n<b> • userdebug:</b>\n Content contributor\n\n</string>
<string name="fDroid">F-Droid</string>
<string name="thirdparty">Third-Party Libraries</string>
- <string name="thirdpartyText"><a href="https://github.com/cketti/ckChangeLog">ckCangelog: </a>Apache License 2.0\n\n<a href="https://github.com/wsdfhjxc/taponium/">Taponium: </a>GNU General Public License v3.0</string>
+ <string name="thirdpartyText"><a href="https://github.com/cketti/ckChangeLog">ckChangelog: </a>Apache License 2.0\n\n<a href="https://github.com/wsdfhjxc/taponium/">Taponium: </a>GNU General Public License v3.0</string>
<string name="misc">Miscellaneous</string>
- <string name="miscDio">We used Diolinx as our starting base to create this app. Go check it out, it\'s free software as well!</string>
+ <string name="miscDio">We used Diolinux as our starting base to create this app. Go check it out, it\'s free software as well!</string>
<string name="miscDioBtn">Tell me more</string>
<string name="AppSection">Application</string>
<string name="AppVersion">App Version: %1$s</string>
@@ -115,7 +115,7 @@
<string name="logo">Logo</string>
<string name="xmppBtn"> \ \ • State on xmpp</string>
<string name="matrixBtn"> \ \ • State on Matrix</string>
- <string name="SocialBtn"> \ \ • State on hubzilla/diaspora/mastodon</string>
+ <string name="SocialBtn"> \ \ • State on Hubzilla/diaspora/mastodon</string>
<string name="NewsBtn"> \ \ • State updates via email</string>
<string name="RssBtn"> \ \ • State RSS feed</string>
<string name="ChooseChatTitle">You have two XMPP clients installed!</string>
@@ -128,12 +128,12 @@
<string name="title_activity_tap">TapActivity</string>
<string name="action_clear_cookies">Clear cookies</string>
<string name="DiaInstallTitle">Installation request</string>
- <string name="DiasporaDialog">To continue you need to install Dandelion first.\nPlease select install to continue with the installatin on F-Droid.</string>
+ <string name="DiasporaDialog">To continue you need to install Dandelion first.\nPlease select install to continue with the installation on F-Droid.</string>
<string name="global_cancel">Cancel</string>
<string name="global_install">Install</string>
- <string name="MailDialog">To continue you need to install K9-Mail first.\nPlease select install to continue with the installatin on F-Droid.</string>
- <string name="CloudDialog">To continue you need to install the Nextcloud app first.\nPlease select install to continue with the installatin on F-Droid.</string>
- <string name="ChatDialog">To continue you need to install Conversations first.\nPlease select install to continue with the installatin on F-Droid.</string>
+ <string name="MailDialog">To continue you need to install K9-Mail first.\nPlease select install to continue with the installation on F-Droid.</string>
+ <string name="CloudDialog">To continue you need to install the Nextcloud app first.\nPlease select install to continue with the installation on F-Droid.</string>
+ <string name="ChatDialog">To continue you need to install Conversations first.\nPlease select install to continue with the installation on F-Droid.</string>
<string name="title_activity_state" translatable="false">StateActivity</string>
<string name="app_state">Disroot state</string>
<string name="Operational">Operational</string>
@@ -153,7 +153,7 @@
<string name="Investigating">Investigating</string>
<string name="Identified">Identified</string>
<string name="NotesTitle">Nextcloud Notes Info</string>
- <string name="NotesInfo">The notes app is a distraction free notes taking app for Nextcloud</string>
- <string name="NotesDialog">To continue you need to install Notes first.\nPlease select install to continue with the installatin on F-Droid.</string>
+ <string name="NotesInfo">The notes app is a distraction free notes taking app for Nextcloud.\n\nServer Address:\n https://cloud.disroot.org\n\nUsername:\n your_disroot_username\n\nPassword:\n your_disroot_password</string>
+ <string name="NotesDialog">To continue you need to install Notes first.\nPlease select install to continue with the installation on F-Droid.</string>
<string name="action_notes">Notes</string>
</resources>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 3031b13..9537ab1 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog>
+ <release version="1.1.1" versioncode="14" >
+ <change>Added more info for notes app</change>
+ <change>Corrected some typos</change>
+ <change>Spanish, Serbian and French translation updated</change>
+ </release>
<release version="1.1.0" versioncode="13" >
<change>State page is api based instead of webview</change>
<change>In State page is possible to view state messages on separate tab</change>
--
GitLab