diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index 9229987a..fa0df4ca 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -938,7 +938,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)}; + final CharSequence[] options = {getString(R.string.help_license), getString(R.string.help_help)}; new AlertDialog.Builder(MainActivity.this) .setItems(options, new DialogInterface.OnClickListener() { @Override @@ -953,16 +953,6 @@ public class MainActivity extends AppCompatActivity d.show(); ((TextView) d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); } - if (options[item].equals(getString(R.string.help_about))) { - final SpannableString s = new SpannableString(Html.fromHtml(getString(R.string.about_text))); - Linkify.addLinks(s, Linkify.WEB_URLS); - final AlertDialog d = new AlertDialog.Builder(MainActivity.this) - .setTitle(R.string.help_about) - .setMessage(s) - .setPositiveButton(android.R.string.yes, null).show(); - d.show(); - ((TextView) d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); - } if (options[item].equals(getString(R.string.help_help))) { new AlertDialog.Builder(MainActivity.this) .setTitle(R.string.help_help) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 562b62fb..18643d09 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -126,6 +126,7 @@ • gsantner https://gsantner.github.io<br> • martinchodev https://github.com/martinchodev<br> • scoute-dich https://github.com/scoute-dich<br> <br> + • vanitasvitae https://github.com/vanitasvitae<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 @@ -145,7 +146,6 @@ along with this program. If not, see http://www.gnu.org/licenses.<br> <br Sie wurden von \"Lydia\" veröffentlicht und stehen unter der cc by-nc-sa Lizenz.</i> Startbildschirm Ungelesene Benachrichtigung. Lesen? - Changelog Profil *[geteilt durch #DiasporaForAndroid]* Bild speichern diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 2b5cf02d..da1c1469 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -64,7 +64,6 @@ Licence Mise en page Markdown - Changelog Enregistrer la capture d\'écran sous : @@ -122,6 +121,7 @@ • gsantner https://gsantner.github.io<br> • martinchodev https://github.com/martinchodev<br> • scoute-dich https://github.com/scoute-dich<br> <br> + • vanitasvitae https://github.com/vanitasvitae<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 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4324ebac..eb1cf7a4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -73,7 +73,6 @@ License Markdown formating - Changelog Saving screenshot as: @@ -131,45 +130,13 @@ You can create the following symbols and other special characters using a combination of characters:<br> (c) = © ; (r) = ® ; x^2 = x²" - - <i>For more informations visit the Projectsite on github:<br> - https://github.com/scoute-dich/Diaspora</i><br><br> - - <b>v1.3.</b><br> - <i>big thanks to gsantner</i><br> - - • gitignore<br> - • Link to profile<br> - • Move menu actions<br> - • Refactoring part1<br> - • bump libs<br><br> - - <b>v1.2.</b><br> - • using strings in podactivity<br> - • improved share activity<br><br> - - <b>v1.1.</b><br> - • new about app and help dialogs<br> - • better snackbar integration<br><br> - - <b>v1.0.1.</b><br> - • click on titelbar to load stream<br><br> - - <b>v1.0.</b><br> - • all features of original Diaspora-Native-Webapp<br> - • popup menus (view settings, diaspora settings, share function)<br> - • share function (link, screenshot)<br> - • design improvements<br> - • implemented android marshmallow perimssion model<br> - • implemented swipe to refresh - - Copyright © 2015–2016 <b>Main Contributors:</b><br> • gsantner https://gsantner.github.io<br> • martinchodev https://github.com/martinchodev<br> • scoute-dich https://github.com/scoute-dich<br> <br> + • vanitasvitae https://github.com/vanitasvitae<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