From 1d1a5f908b1806a8bab1f5b9cd7b56917c1d4383 Mon Sep 17 00:00:00 2001
From: massimiliano <massimiliano@disroot.org>
Date: Fri, 25 Jan 2019 16:31:35 +0100
Subject: [PATCH] Fixed string pad info
---
.idea/caches/build_file_checksums.ser | Bin 534 -> 534 bytes
app/build.gradle | 4 ++--
.../org/disroot/disrootapp/ui/MainActivity.java | 2 +-
app/src/main/res/values-es/strings.xml | 1 +
app/src/main/res/values-fr/strings.xml | 1 +
app/src/main/res/values-it/strings.xml | 1 +
app/src/main/res/values-nl/strings.xml | 1 +
app/src/main/res/values-pt/strings.xml | 1 +
app/src/main/res/values-sr/strings.xml | 1 +
app/src/main/res/values/strings.xml | 1 +
app/src/main/res/xml/changelog_master.xml | 3 +++
11 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 60daae9812039754a0e62d040a13f47f7d2951a4..2da3581a490812f77f3dc5bb52cfcd2a2d96fa48 100644
GIT binary patch
delta 33
rcmV++0N($W1eOGlm;{BOFx|17X#o)^l?J!2snS}k@Tic?VI~B4@`Dch
delta 33
rcmV++0N($W1eOGlm;@-~mS3@)X#o*I_Vd#p0{jQwBm*SP(u#+8?BWib
diff --git a/app/build.gradle b/app/build.gradle
index 5d07f40..1172ec3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
applicationId "org.disroot.disrootapp"
minSdkVersion 15
targetSdkVersion 28
- versionCode 15
- versionName "1.1.2"
+ versionCode 16
+ versionName "1.1.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
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 8d86cee..04f6c66 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@@ -961,7 +961,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.DiaInstallTitle);
- builder.setMessage(getString(R.string.ChatDialog));
+ builder.setMessage(getString(R.string.PadDialog));
builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() {
String Padland = "com.mikifus.padland";
Intent pad = getPackageManager().getLaunchIntentForPackage(Padland);
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b033432..30bc282 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -156,4 +156,5 @@
<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>
+ <string name="PadDialog">Para continuar, primero necesitas instalar Padland.\nPor favor, selecciona Instalar para continuar 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 89b2566..f5d6309 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -193,4 +193,5 @@
\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>
+ <string name="PadDialog">Pour continuer, vous devez d\'abord installer Padland.\nVeuillez sélectionner Installer pour continuer l\'installation avec F-Droid.</string>
</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1d19999..7a7ff41 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -155,4 +155,5 @@
<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>
+ <string name="PadDialog">Per continuare è necessario installare Padland.\nSelezionate installa per continuare con l\'installazione su F-Droid.</string>
</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 5129b3d..a0b0116 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -157,4 +157,5 @@
<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>
+ <string name="PadDialog">Om verder te gaan moet u eerst Padland installeren.\nSelecteer Installeren om verder te gaan met de installatie op F-Droid.</string>
</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d7f17de..91d87dd 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -155,4 +155,5 @@
<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>
+ <string name="PadDialog">To continue you need to install Padland first.\nPlease select install to continue with the installatin on F-Droid.</string>
</resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 8a96b3a..d64973e 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -156,4 +156,5 @@
<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>
+ <string name="PadDialog">Za nastavak je potrebno instalirati aplikaciju Padland.\nIzaberite \'instaliraj\' i preuzmite aplikaciju pomoću F-Droid-a.</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 65d76bc..6db3d7b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -156,4 +156,5 @@
<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>
+ <string name="PadDialog">To continue you need to install Padland first.\nPlease select install to continue with the installation on F-Droid.</string>
</resources>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 82cb878..c80257c 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog>
+ <release version="1.1.3" versioncode="16" >
+ <change>Fixed string on Etherpad dialog</change>
+ </release>
<release version="1.1.2" versioncode="15" >
<change>Fixed layout for small screens</change>
</release>
--
GitLab