diff --git a/app/src/main/java/de/baumann/diaspora/MainActivity.java b/app/src/main/java/de/baumann/diaspora/MainActivity.java
index f2f24c03..50a00696 100644
--- a/app/src/main/java/de/baumann/diaspora/MainActivity.java
+++ b/app/src/main/java/de/baumann/diaspora/MainActivity.java
@@ -991,7 +991,7 @@ public class MainActivity extends AppCompatActivity
break;
case R.id.nav_license_help: {
- final CharSequence[] options = {getString(R.string.help_license), getString(R.string.help_about), getString(R.string.help_help), getString(R.string.help_donate)};
+ final CharSequence[] options = {getString(R.string.help_license), getString(R.string.help_about), getString(R.string.help_help)};
new AlertDialog.Builder(MainActivity.this)
.setItems(options, new DialogInterface.OnClickListener() {
@Override
@@ -1037,24 +1037,6 @@ public class MainActivity extends AppCompatActivity
}
}).show();
}
- if (options[item].equals(getString(R.string.help_donate))) {
- new AlertDialog.Builder(MainActivity.this)
- .setMessage(getString(R.string.donate_text))
- .setPositiveButton(getString(R.string.yes),
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- dialog.cancel();
- }
- })
- .setNegativeButton(getString(R.string.donate_1),
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("http://martinv.tip.me/"));
- startActivity(i);
- dialog.cancel();
- }
- }).show();
- }
}
}).show();
}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bd9ae305..0722ca6a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -121,10 +121,10 @@
<b>Sonderzeichen</b><br>
Du kannst Symbole und Sonderzeichen nutzen, indem du bestimmte Zeichenfolgen verwendest. Z.B.:<br>
(c) = © ; (r) = ® ; x^2 = x²"
- <i>Zuerst einmal: ich bin kein Entwickler. Ich verstehe ein paar Grundlagen, aber das Meiste meiner
- Arbeit ist mit \"Copy and Paste\" passiert. Diese App ist ein Fork der original \"DiasporaNativeWebApp\"
- von \"martinchodev\" (der die allermeiste Arbeit erledigt hat -> mein großer Dank gilt ihm), welche unter der GPL-Lizenz
- veröffentlicht wurde.</i> <br> <br>
+ <b>Beteiligte:</b><br>
+
+ • de-live-gdev https://de-live-gdev.github.io<br>
+ • scoute-dich https://github.com/scoute-dich<br> <br>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -139,15 +139,12 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses.<br> <br>
- <i>Die Bilder des Startbildschirms können auf Flickr gefunden werden:
+ <i>Die App ist ein Fork von \"DiasporaNativeWebApp\"
+ von \"martinchodev\". Die Bilder des Startbildschirms können auf Flickr gefunden werden:
https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
Sie wurden von \"Lydia\" veröffentlicht und stehen unter der cc by-nc-sa Lizenz.</i>
Suche nach Personen …
Suche nach Tags …
- per Bitcoin
- Wenn dir die App gefällt, kannst du dem Entwickler der original \"DiasporaNativeWebApp\"
- eine Kleinigkeit spenden:
- Spenden
Startbildschirm
Ungelesene Unterhaltung. Öffnen?
Ungelesene Benachrichtigung. Lesen?
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a712e0b4..903822db 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -69,7 +69,6 @@
License
Markdown formating
- Donate
Changelog
Taking screenshot …
@@ -131,9 +130,6 @@
You can create the following symbols and other special characters using a combination of characters:<br>
(c) = © ; (r) = ® ; x^2 = x²"
- If you like the app fell free to donate to the devoloper of the original \"DiasporaNativeWebApp\":
- Via Bitcoin
-
<i>For more informations visit the Projectsite on github:<br>
https://github.com/scoute-dich/Diaspora</i><br><br>
@@ -167,10 +163,11 @@
• implemented swipe to refresh
- Copyright © 2016 by scoute-dich
- <i>First of all: I am not a developer. I understand a few basics and most of my work is done
- by copy and paste. This app is a fork of the original \"DiasporaNativeWebApp\"
- from \"martinchodev\" (who did most of the work -> big thanks to him), which is released under the GPL-license.</i> <br> <br>
+ Copyright © 2016
+ <b>Contributors:</b><br>
+
+ • de-live-gdev https://de-live-gdev.github.io<br>
+ • scoute-dich https://github.com/scoute-dich<br> <br>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -185,7 +182,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses.<br> <br>
- <i>The splashscreen images can be found on flickr:
+ <i>This app is a fork of the original \"DiasporaNativeWebApp\"
+ from \"martinchodev\". The splashscreen images can be found on flickr:
https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
They were published by \"Lydia\" and are licensed under cc by-nc-sa.</i>