Update translations, project info

2023-01-28 17:21:07 +01:00 · 2023-01-28 17:21:07 +01:00 · c65aab3840
parent c2bea7bec0
commit c65aab3840
43 changed files with 57 additions and 179 deletions
--- a/64
+++ b/64
@ -10,36 +10,47 @@ env-%:
 DIST_DIR = dist
 MOVE = mv

-all: $(DIST_DIR) lint test build
+all: $(DIST_DIR) spellcheck lint deptree test build aapt_dump_badging

 ####################################################################################

 $(DIST_DIR):
 	mkdir -p ${DIST_DIR}

-.NOTPARALLEL: gradle gradle-check-error
+ANDROID_BUILD_TOOLS := $(shell test -n "$ANDROID_SDK_ROOT" && find "${ANDROID_SDK_ROOT}/build-tools" -iname "aapt" | sort -r | head -n1 | xargs dirname)
+TOOL_SPELLCHECKING_ISPELL := $(shell command -v ispell 2> /dev/null)
+
+FLAVOR := $(or ${FLAVOR},${FLAVOR},Atest)
+
+.NOTPARALLEL: gradle gradle-analyze-log
 gradle: env-ANDROID_SDK_ROOT
 	mkdir -p $(DIST_DIR)/log/
 	chmod +x gradlew
 	./gradlew --no-daemon --parallel --stacktrace $A  2>&1 | tee "$(DIST_DIR)/log/gradle.log"
 	@echo "-----------------------------------------------------------------------------------"

-gradle-check-error:
+gradle-analyze-log:
 	mv  "$(DIST_DIR)/log/gradle.log" "$(DIST_DIR)/log/gradle$A.log"
 	cat "$(DIST_DIR)/log/gradle$A.log" | grep "BUILD " | tail -n1 | grep -q "BUILD SUCCESSFUL in"

+adb: env-ANDROID_SDK_ROOT
+	"${ANDROID_SDK_ROOT}/platform-tools/adb" $A 2>&1 | tee "$(DIST_DIR)/log/adb-$L.log"
+
+aapt: env-ANDROID_SDK_ROOT
+	"${ANDROID_BUILD_TOOLS}/aapt" $A 2>&1 | grep -v 'application-label-' | tee "$(DIST_DIR)/log/aapt$L.log"
+
 build:
 	rm -f $(DIST_DIR)/*.apk
-	$(MAKE) A="clean assembleFlavorAtest -x lint" gradle
-	find app -type f -iname '*.apk' | grep -v 'unsigned.apk' | xargs cp -R -t $(DIST_DIR)/
-	$(MAKE) A="-build" gradle-check-error
+	$(MAKE) A="clean assembleFlavor$(FLAVOR) -x lint" gradle
+	find app -type f -newermt '-300 seconds' -iname '*.apk' -not -iname '*unsigned.apk' | xargs cp -R -t $(DIST_DIR)/
+	$(MAKE) A="-build" gradle-analyze-log

 lint:
 	rm -Rf $(DIST_DIR)/lint
 	mkdir -p $(DIST_DIR)/lint/
 	$(MAKE) A="lintFlavorDefaultDebug" gradle
-	find app -type f -iname 'lint-results-*' | xargs cp -R -t $(DIST_DIR)/lint
-	$(MAKE) A="-lint" gradle-check-error
+	find app -type f -iname 'lint-results-*' | grep -v 'intermediates' | xargs cp -R -t $(DIST_DIR)/lint
+	$(MAKE) A="-lint" gradle-analyze-log

 test:
 	rm -Rf $(DIST_DIR)/tests
@ -47,9 +58,42 @@ test:
 	mkdir -p app/build/test-results/testFlavorDefaultDebugUnitTest && echo 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHRlc3RzdWl0ZSBuYW1lPSJkdW1teSIgdGVzdHM9IjEiIHNraXBwZWQ9IjAiIGZhaWx1cmVzPSIwIiBlcnJvcnM9IjAiIHRpbWVzdGFtcD0iMjAyMC0xMi0wOFQwMDowMDowMCIgaG9zdG5hbWU9ImxvY2FsaG9zdCIgdGltZT0iMC4wMSI+CiAgPHByb3BlcnRpZXMvPgogIDx0ZXN0Y2FzZSBuYW1lPSJkdW1teSIgY2xhc3NuYW1lPSJkdW1teSIgdGltZT0iMC4wMSIvPgogIDxzeXN0ZW0tb3V0PjwhW0NEQVRBW11dPjwvc3lzdGVtLW91dD4KICA8c3lzdGVtLWVycj48IVtDREFUQVtdXT48L3N5c3RlbS1lcnI+CjwvdGVzdHN1aXRlPgo=' | base64 -d > 'app/build/test-results/testFlavorDefaultDebugUnitTest/TEST-dummy.xml'
 	find app -type d -iname 'testFlavorDefaultDebugUnitTest' | xargs cp -R -t $(DIST_DIR)/
 	mv ${DIST_DIR}/testFlavorDefaultDebugUnitTest $(DIST_DIR)/tests
-	$(MAKE) A="-test" gradle-check-error
+	$(MAKE) A="-test" gradle-analyze-log
+
+deptree:
+	$(MAKE) A="app:dependencies --configuration flavor$(FLAVOR)DebugRuntimeClasspath" gradle
+	$(MAKE) A="-dependency-tree" gradle-analyze-log

 clean:
 	$(MAKE) A="clean" gradle
-	rm -Rf $(DIST_DIR) app/build app/flavor*
+	rm -Rf $(DIST_DIR) app/build app/flavor* .idea dist
+	find . -type f -iname "*.iml" -delete
 	$(MAKE) $(DIST_DIR)
+	@echo "-----------------------------------------------------------------------------------"
+
+install:
+	$(MAKE) A="install -r $(DIST_DIR)/*.apk" L="install" adb
+
+run:
+	$(MAKE) A="shell monkey -p $$(aapt dump badging $(DIST_DIR)/*.apk | grep package: | sed 's@.* name=@@' | sed 's@ .*@@' | xargs | head -n1) -c android.intent.category.LAUNCHER 1" L="run" adb
+
+aapt_dump_badging:
+	$(MAKE) A="dump badging $(DIST_DIR)/*.apk" aapt
+	@echo "-----------------------------------------------------------------------------------"
+
+spellcheck:
+	mkdir -p "$(DIST_DIR)/lint/"
+ifndef TOOL_SPELLCHECKING_ISPELL
+	@echo "Tool ispell (spellcheck) not found in PATH. Spellcheck skipped." > "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+else
+	@echo "Use ispell for spellchecking the original values/strings.xml"
+	find . -iname "strings.xml" -path "*/main*/values/*" | head -n1 | xargs cat \
+	   | grep "<string name=" | sed 's@.*">@@' | sed 's@</string>@@' | sed 's@\\n@  @g' | sed 's@\\@@g'  \
+	   | ispell -W3 -a | grep ^\& | sed 's@[0-9]@@g' | sort | uniq | cut -d, -f1-4 \
+	   | sed 's@^..@- @' | column -t -s: \
+	   > "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+	@echo "\nPotential words with bad spelling:"
+endif
+	@cat "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+	@echo "-----------------------------------------------------------------------------------"
+
--- a/README.md
+++ b/README.md
@ -1,7 +1,6 @@
 [![GitHub releases](https://img.shields.io/github/tag/gsantner/dandelion.svg)](https://github.com/gsantner/dandelion/releases)
 [![GitHub downloads](https://img.shields.io/github/downloads/gsantner/dandelion/total.svg?logo=github&logoColor=lime)](https://github.com/gsantner/dandelion/releases)
 [![Translate on Crowdin](https://img.shields.io/badge/translate-crowdin-green.svg)](https://crowdin.com/project/diaspora-for-android/invite)
-[![Donate - say thanks](https://img.shields.io/badge/donate-say%20thanks-red.svg)](https://gsantner.net/page/supportme.html?project=dandelion&source=readme)
 [![Chat on Matrix](https://img.shields.io/badge/chat-matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org)
 [![GitHub CI](https://github.com/gsantner/dandelion/workflows/CI/badge.svg)](https://github.com/gsantner/dandelion/actions)
 [![Codacy code quality](https://img.shields.io/codacy/grade/aff869c440bc48b7bd64680e97cbc453)](https://www.codacy.com/app/gsantner/dandelion)
@ -78,7 +77,5 @@ For more licensing informations, see [`3rd party licenses`](/app/src/main/res/ra

 ### Notice
 #### Maintainers
- gsantner ([GitHub](https://github.com/gsantner), [Web](https://gsantner.net/page/supportme.html?project=dandelion&source=gh_readme), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))
-  - Bitcoin: [1B9ZyYdQoY9BxMe9dRUEKaZbJWsbQqfXU5](https://gsantner.net/page/supportme.html?project=dandelion&source=gh_readme)
+- gsantner ([GitHub](https://github.com/gsantner), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))
 - vanitasvitae ([GitHub](https://github.com/vanitasvitae), [diaspora*](https://pod.geraspora.de/people/bbd7af90fbec013213e34860008dbc6c))
-  - Bitcoin: 1Ao3W6NaQv3xKppviB7RSFKjHo6PGd8RTy
--- 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
@ -90,7 +90,6 @@ import com.github.dfa.diaspora_android.web.WebHelper;
 import com.github.dfa.diaspora_android.web.custom_tab.CustomTabActivityHelper;

 import net.gsantner.opoc.format.markdown.SimpleMarkdownParser;
-import net.gsantner.opoc.util.AndroidSupportMeWrapper;

 import java.io.IOException;

@ -664,7 +663,6 @@ public class MainActivity extends ThemedActivity
    protected void onResume() {
        AppLog.v(this, "onResume()");
        super.onResume();
-        //new AndroidSupportMeWrapper(this).mainOnResume();
        AppLog.v(this, "Register BroadcastReceivers");
        LocalBroadcastManager.getInstance(this).registerReceiver(brSetTitle, new IntentFilter(ACTION_UPDATE_TITLE_FROM_URL));
        LocalBroadcastManager.getInstance(this).registerReceiver(brOpenExternalLink, new IntentFilter(ACTION_OPEN_EXTERNAL_URL));
--- a/app/src/main/java/net/gsantner/opoc/util/AndroidSupportMeWrapper.java
+++ b/app/src/main/java/net/gsantner/opoc/util/AndroidSupportMeWrapper.java
@ -1,72 +0,0 @@
-/*#######################################################
- *
- *   Maintained by Gregor Santner, 2018-
- *   https://gsantner.net/
- *
- *   License of this file: Apache 2.0 (Commercial upon request)
- *     https://www.apache.org/licenses/LICENSE-2.0
- *     https://github.com/gsantner/opoc/#licensing
- *
-#########################################################*/
-package net.gsantner.opoc.util;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.support.v7.app.AlertDialog;
-
-import com.github.dfa.diaspora_android.R;
-
-import net.gsantner.opoc.preference.SharedPreferencesPropertyBackend;
-
-public class AndroidSupportMeWrapper extends ActivityUtils {
-    private LocalSettingsImpl _localSettingsImpl;
-
-    public AndroidSupportMeWrapper(Activity activity) {
-        super(activity);
-        _localSettingsImpl = new LocalSettingsImpl(_context.getApplicationContext());
-    }
-
-    public void openPayPalDonationPage() {
-        String id = getPackageIdManifest();
-        String url = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TVV24QBGMN23C&source=self.gsantner.net%2F" + id;
-        openWebpageInExternalBrowser(url);
-    }
-
-
-    public void openGeneralDonatePage() {
-        openWebpageInExternalBrowser(_context.getString(R.string.app_donate_url));
-    }
-
-    public void mainOnResume() {
-        if (_localSettingsImpl.all14dRequest()) {
-            AlertDialog.Builder dialog = new AlertDialog.Builder(_context);
-            dialog.setTitle(R.string.donate_)
-                    .setCancelable(false)
-                    .setNegativeButton(R.string.close, (dialogInterface, i) -> dialogInterface.dismiss())
-                    .setPositiveButton("PayPal", (dialogInterface, i) -> {
-                        openPayPalDonationPage();
-                        dialogInterface.dismiss();
-                    })
-                    .setNeutralButton(R.string.donate_, (dialogInterface, i) -> {
-                        openGeneralDonatePage();
-                        dialogInterface.dismiss();
-                    })
-                    .setMessage(R.string.do_you_like_this_project_want_donate_to_keep_alive);
-            dialog.show();
-        }
-    }
-
-    private class LocalSettingsImpl extends SharedPreferencesPropertyBackend {
-        private final SharedPreferences _prefCache;
-
-        public LocalSettingsImpl(Context _context) {
-            super(_context, "AndroidSupportMeWrapper.LocalSettingsImpl");
-            _prefCache = _context.getSharedPreferences("cache", Context.MODE_PRIVATE);
-        }
-
-        public boolean all14dRequest() {
-            return afterDaysTrue("all14dRequest", 31, 3);
-        }
-    }
-}
--- a/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java
+++ b/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java
@ -365,26 +365,6 @@ public class ContextUtils {
        return bcbool("IS_FOSS_BUILD", false);
    }

-    /**
-     * Request a bitcoin donation with given details.
-     * All parameters are awaited as string resource ids
-     */
-    public void showDonateBitcoinRequest(@StringRes final int srBitcoinId, @StringRes final int srBitcoinAmount, @StringRes final int srBitcoinMessage, @StringRes final int srAlternativeDonateUrl) {
-        if (!isGooglePlayBuild()) {
-            String btcUri = String.format("bitcoin:%s?amount=%s&label=%s&message=%s",
-                    rstr(srBitcoinId), rstr(srBitcoinAmount),
-                    rstr(srBitcoinMessage), rstr(srBitcoinMessage));
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(btcUri));
-            intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
-            try {
-                _context.startActivity(intent);
-            } catch (ActivityNotFoundException e) {
-                openWebpageInExternalBrowser(rstr(srAlternativeDonateUrl));
-            }
-        }
-    }
-
    public String readTextfileFromRawRes(@RawRes int rawResId, String linePrefix, String linePostfix) {
        StringBuilder sb = new StringBuilder();
        BufferedReader br = null;
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@ -154,5 +154,4 @@
    <string name="youtube_links">Youtube links</string>
    <string name="change_the_theme_of_your_account">Verander die tema van jou rekening</string>
    <string name="pull_to_refresh">Trek om te verfris</string>
-    <string name="donate">Skenk</string>
 </resources>
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -38,5 +38,4 @@
    <string name="license">ترخيص</string>
    <!-- License & help (large amount of text) -->
    <string name="contributors">المساهمون</string>
-    <string name="donate">تبرع</string>
 </resources>
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@ -38,6 +38,4 @@
    <string name="about">O programu</string>
    <!-- License & help (large amount of text) -->
    <string name="contributors">Saradnici</string>
-    <string name="donate">Doniraj</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Sviđa li Vam se ovaj projekat? Želite li da napreduje a problemi budu otklonjeni?\n\nRazvijanje aplikacija i pisanje članaka o njima uzima puno vremena! Ako biste voljeli pomoći da projekat opstane, molimo Vas da razmislite o skromnoj donaciji!\n\nRad na ovom projektu odvija se u slobodno vrijeme, a program je besplatan i ne sadrži nikakav vid reklama!</string>
 </resources>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -206,6 +206,4 @@ diaspora*. Si voleu contribuir, endavant! Actualment som un equip molt petit, de
    <string name="change_the_theme_of_your_account">Canvia el tema del vostre compte</string>
    <string name="pull_to_refresh">Feu lliscar per actualitzar</string>
    <string name="pulling_down_on_top_of_page_to_refresh">S\'està lliscant cap avall a la part superior de la pàgina per actualitzar.\nCal que reinicieu l\'aplicació perquè els canvis tinguin efecte.</string>
-    <string name="donate">Fes un donatiu</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Us agrada aquest projecte? Voleu que encara sigui millor i es solucionin els problemes?\n\nDesenvolupar aplicacions i escriure publicacions relacionades als blogs costa molt de temps! Si voleu ajudar perquè el projecte pugui continuar, considereu aportar una petita donació!\n\nAquest projecte es desenvolupa durant el temps lliure, completament gratis i sense publicitat!</string>
 </resources>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -200,5 +200,4 @@
    <string name="youtube_links">Youtube odkazy</string>
    <string name="change_the_theme_of_your_account">Změňte téma vašeho účtu</string>
    <string name="pull_to_refresh">Pull osvěžit</string>
-    <string name="donate">Krátce</string>
 </resources>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -90,5 +90,4 @@
    <!-- License & help (large amount of text) -->
    <string name="maintainers">Udviklere</string>
    <string name="contributors">Bidragsydere</string>
-    <string name="donate">Donér</string>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -209,6 +209,4 @@ nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - dandelion*.
    <string name="change_the_theme_of_your_account">Thema des Accounts ändern</string>
    <string name="pull_to_refresh">Pull-To-Refresh</string>
    <string name="pulling_down_on_top_of_page_to_refresh">In der Website von ganz oben nach unten ziehen um zu aktualisieren.\nDu musst die App neu starten damit die Änderungen wirksam werden.</string>
-    <string name="donate">Spenden</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Gefällt dir dieses Projekt? Möchtest du, dass es verbessert wird und Probleme behoben werden?\n\nDie Entwicklung von Apps und das schreiben von relevanten Blog-Einträgen kostet viel Zeit! Wenn du helfen möchtest, so dass das Projekt weitergehen kann, ziehe bitte eine kleine Spende in Betracht!\n\nDieses Projekt wird in der Freizeit, völlig kostenlos und ohne jegliche Werbeeinblendungen entwickelt &amp; angeboten!</string>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -204,6 +204,4 @@
    <string name="change_the_theme_of_your_account">Cambiar el tema de tu cuenta</string>
    <string name="pull_to_refresh">Tirar para refrescar</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Deslizar hacia abajo la parte superior de la página para refrescar.\n Necesita reiniciar la aplicación para que los cambios surtan efecto.</string>
-    <string name="donate">Donar</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">¿Te gusta este proyecto? ¿Quieres que se mejore y se corrijan problemas?\n\nEl desarrollo de aplicaciones y la escritura de entradas relacionadas del blog cuesta mucho tiempo. Si quieres ayudar a que el proyecto pueda continuar, por favor considera una pequeña donación!\n\nEste proyecto se desarrolla en tiempo de ocio, completamente gratis y sin publicidad!</string>
 </resources>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -32,5 +32,4 @@
    <string name="about">درباره مارکور</string>
    <!-- License & help (large amount of text) -->
    <string name="contributors">همکاران</string>
-    <string name="donate">کمک مالی</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -204,6 +204,4 @@
    <string name="change_the_theme_of_your_account">Changer le thème de votre compte</string>
    <string name="pull_to_refresh">Tirer vers le bas pour mettre à jour</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Tirez depuis le haut de la page vers le bas pour l\'actualiser.\nVous devez redémarrer l\'application pour que ces changements prennent effet.</string>
-    <string name="donate">Donner</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Vous aimez ce projet ? Vous voulez participer à son amélioration et corriger ses problèmes ?\n\nDévelopper des applications et écrire les posts de blog correspondants demande beaucoup de temps ! Si vous voulez aider à la poursuite du projet, merci de considérer une petite donation.\n\nCe projet est développé sur du temps libre, complètement gratuitement et sans publicité !</string>
 </resources>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -207,6 +207,4 @@
    <string name="change_the_theme_of_your_account">Cambiar o decorado da túa conta</string>
    <string name="pull_to_refresh">Tira para actualizar</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Tirar hacia abaixo na parte superior da páxina.\nDebes reiniciar a app para que os cambios se apliquen.</string>
-    <string name="donate">Doar</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Gústache este proxecto? Queres que siga mellorando e resolvendo os problemas?\n\nDesenvolver aplicacións e escribir a documentación leva moito tempo! Se queres apoiar ao proxecto para que continúe, por favor, considera facer unha pequena doazón!\n\nEste proxecto desenvólvese no tempo libre, ofrécese libre e gratuitamente e sen publicidade!</string>
 </resources>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@ -38,5 +38,4 @@
    <string name="license">लाइसेंस</string>
    <!-- License & help (large amount of text) -->
    <string name="contributors">योगदान कर्ता</string>
-    <string name="donate">दान करें</string>
 </resources>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -190,5 +190,4 @@
    <string name="the_following_libraries_are_used">A következő könyvtárak vannak használatban:</string>
    <string name="inspiration_from_leafpic__appspecific">A LeafPicből merítettünk némi inspirációt és programkódot. Próbáld ki, ez is szabad szoftver!</string>
    <string name="tell_me_more">Tudj meg többet</string>
-    <string name="donate">Adományozás</string>
 </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -210,6 +210,4 @@
    <string name="change_the_theme_of_your_account">Cambia il tema del tuo account</string>
    <string name="pull_to_refresh">Trascina per aggiornare</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Trascina dall\'alto al basso per aggiornare la pagina.\nDevi riavviare l\'app affinchè le modifiche abbiano effetto.</string>
-    <string name="donate">Dona</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Ti piace questo progetto? Vuoi vederlo ancora migliore e con i problemi risolti?\n\nSviluppare applicazioni e documentarle sul blog costa un sacco di tempo! Se vuoi aiutare lo sviluppo del progetto, puoi fare una piccola donazione!\n\nQuesto progetto è sviluppato nel tempo libero, completamente gratis e senza alcuna pubblicità!</string>
 </resources>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -34,5 +34,4 @@
    <string name="about">אודות</string>
    <!-- License & help (large amount of text) -->
    <string name="contributors">תורמים</string>
-    <string name="donate">תרום</string>
 </resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -204,6 +204,4 @@
    <string name="change_the_theme_of_your_account">アカウントのテーマを変更</string>
    <string name="pull_to_refresh">引き下げて更新</string>
    <string name="pulling_down_on_top_of_page_to_refresh">ページの上から下に引き下げて更新します。\n変更を反映するため、アプリを再起動する必要があります。</string>
-    <string name="donate">寄付</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">このプロジェクトを気に入っていただけましたか? 改善したい、あるいは問題を修正したいですか?\n\nアプリの開発や、関連するブログの記事を書くに多くの時間がかかります! プロジェクトを進めるために、支援をしていただける場合は、少しの寄付をご検討ください!\n\nこのプロジェクトは余暇に開発していて、完全に無料で、広告はありません!</string>
 </resources>
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@ -200,5 +200,4 @@
    <string name="the_following_libraries_are_used">Tinedlisin-agi ttwaseqdacent:</string>
    <string name="inspiration_from_leafpic__appspecific">Newwi kra n tiktiwin akked tengat si LeafPic. Duu ad ten-twaliḍ. D aseɣẓan ilellil!</string>
    <string name="tell_me_more">Ini-yid ugar</string>
-    <string name="donate">Mudd</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -193,5 +193,4 @@
    <string name="inspiration_from_leafpic__appspecific">LeafPic에서 약간의 영감을 받았으며, 코드들도 일부 차용했습니다.
 한번 사용해보세요! 무료 소프트웨어 입니다!</string>
    <string name="tell_me_more">더 자세히 보기</string>
-    <string name="donate">후원하기</string>
 </resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@ -37,5 +37,4 @@
    <string name="about">Om</string>
    <!-- License & help (large amount of text) -->
    <string name="contributors">Bidragsytere</string>
-    <string name="donate">Doner</string>
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -204,5 +204,4 @@
    <string name="change_the_theme_of_your_account">Wijzig het thema van uw account</string>
    <string name="pull_to_refresh">Trek om te vernieuwen</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Trek omlaag op de bovenkant van de pagina om te vernieuwen.\nU moet de app opnieuw opstarten om wijzigingen door te voeren.</string>
-    <string name="donate">Doneer</string>
 </resources>
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@ -115,5 +115,4 @@
    <string name="youtube_links">YouTube ଲିଙ୍କଗୁଡ଼ିକ</string>
    <string name="change_the_theme_of_your_account">ଆପଣଙ୍କ ଆକାଉଣ୍ଟର ଥିମ୍ ପରିବର୍ତ୍ତନ କରନ୍ତୁ</string>
    <string name="pull_to_refresh">ସତେଜ କରିବାକୁ ଟାଣନ୍ତୁ</string>
-    <string name="donate">ଦାନ କରନ୍ତୁ</string>
 </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -203,5 +203,4 @@
    <string name="youtube_links">Linki YouTube</string>
    <string name="change_the_theme_of_your_account">Zmień motyw konta</string>
    <string name="pull_to_refresh">Pociągnij aby odświeżyć</string>
-    <string name="donate">Wspomóż</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -174,6 +174,4 @@
    <string name="show_third_party_licenses">Bibliotecas de Terceiros</string>
    <string name="the_following_libraries_are_used">São usadas as seguintes bibliotecas:</string>
    <string name="tell_me_more">Conte-me mais</string>
-    <string name="donate">Doar</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Você gosta deste projeto? Você quer que ele fica melhor e com problemas corrigidos?\n\nDesenvolver aplicativos e escrever postagens relacionado em blog custa muito tempo! Se você quiser ajudar na continuação do projeto, por favor considere uma pequena doação!\n\nEsse projeto é desenvolvido durante o tempo de lazer, totalmente gratuito e sem propagandas!</string>
 </resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -202,6 +202,4 @@
    <string name="change_the_theme_of_your_account">Altera o tema da sua conta</string>
    <string name="pull_to_refresh">Puxar para atualizar</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Deslize de cima para baixo para recarregar.\nTem que reiniciar a aplicação para aplicar as alterações.</string>
-    <string name="donate">Donativos</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Gosta deste projeto? Deseja ajudar a melhorar a aplicação e a corrigir erros?\n\nO desenvolvimento de aplicações custa-me imenso tempo! Se quiser ajudar a manter o projeto, por favor considere a hipótese de um donativo!\n\nEsta aplicação é desenvolvida durante o meu tempo livre, é completamente livre e não tem anúncios!</string>
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -204,6 +204,4 @@
    <string name="change_the_theme_of_your_account">Изменить тему вашей учётной записи</string>
    <string name="pull_to_refresh">Потяните для обновления</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Потяните вниз, чтобы обновить страницу.\nВам нужно перезапустить приложение, чтобы изменения вступили в силу.</string>
-    <string name="donate">Поддержать проект</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Вам нравится этот проект? Вы хотите поддержать дальнейшие улучшения и исправления ошибок?\n\nРазработка приложений и написание связанных блогов занимает много времени! Если вы хотите помочь проекту продолжить, пожалуйста, рассмотрите возможность небольшого пожертвования!\n\nЭтот проект развивается в свободное время, полностью бесплатно и без рекламы!</string>
 </resources>
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@ -207,6 +207,4 @@
    <string name="change_the_theme_of_your_account">Muda su tema de su contu tuo</string>
    <string name="pull_to_refresh">Tira cara a bassu pro annoare</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Tira cara a bassu pro annoare sa pàgina.\nDepes torrare a allùghere s\'aplicatzione pro fàghere in modu chi sas modìficas tèngiant efetu.</string>
-    <string name="donate">Dona</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">T\'agradat custu progetu? Cheres chi bèngiat megioradu e chi sos problemas bèngiant isortos?\n\nS\'isvilupu de aplicatziones e s\'iscritura de publicatziones curreladas in sos blogs pigat unu muntone de tempus! Si cheres agiudare, pro fàghere in modu chi su progetu potzat sighire, pro praghere piga in cunsìderu s\'idea de fàghere una donatzione, fintzas si minore!\n\nCustu progetu est isvilupadu in su tempus lìberu, totu de badas e chene annùntzios publitzitàrios!</string>
 </resources>
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@ -78,5 +78,4 @@
    <!-- License & help (large amount of text) -->
    <string name="gnu_gplv3_license">ජීඑන්යූ ජීපීඑල්v3+ බලපත්‍රය</string>
    <string name="youtube_links">යූටියුබ් සබැඳිය</string>
-    <string name="donate">පරිත්‍යාග</string>
 </resources>
--- a/app/src/main/res/values-sr-rRS/strings.xml
+++ b/app/src/main/res/values-sr-rRS/strings.xml
@ -35,5 +35,4 @@
    <string name="contributors">Pomo\'nici</string>
    <string name="gnu_gplv3_license">Prikazi GNU GPLv3 licence</string>
    <string name="show_third_party_licenses">Prikaz licence trecih lica</string>
-    <string name="donate">Doniraj</string>
 </resources>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -37,5 +37,4 @@
    <!-- License & help (large amount of text) -->
    <string name="maintainers">Програмери</string>
    <string name="contributors">Сарадници</string>
-    <string name="donate">Doniraj</string>
 </resources>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -210,6 +210,4 @@
    <string name="change_the_theme_of_your_account">Ändra temat för ditt konto</string>
    <string name="pull_to_refresh">Dra för att uppdatera</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Dra ner på toppen av sidan för att uppdatera.\nDu måste starta om appen för att ändringarna ska träda i kraft.</string>
-    <string name="donate">Donera</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Gillar du detta projektet? Vill du att det förbättras och att buggar åtgärdas snabbt?\n\nAtt utveckla appar och skriva relaterade blogginlägg tar mycket tid! Om du vill hjälpa till så att projektet kan fortgå så kan du överväga att ge en liten donation!\n\nDetta projektet utvecklas av volontärer på fritiden och är helt utan reklam!</string>
 </resources>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -207,6 +207,4 @@
    <string name="change_the_theme_of_your_account">Hesabınızın temasını değiştirin</string>
    <string name="pull_to_refresh">Yenilemek için çek</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Yenilemek için sayfanın üst kısmından çekin\nDeğişikliklerin geçerli olması için uygulamayı yeniden başlat.</string>
-    <string name="donate">Bağış yap</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Bu projeyi beğendiniz mi? Projenin iyileştirilmesini ve sorunların çözülmesini istiyor musunuz?\n\nUygulama geliştirmek ve onunla ilgili blog gönderileri yazmak çok zaman alıyor! Projenin devam edebilmesi için yardım etmek istiyorsanız, lütfen küçük bir bağış yapmayı düşünün!\n\nBu proje boş zamanlarımda, tamamen ücretsiz ve reklamsız olarak geliştirilmiştir!</string>
 </resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -210,6 +210,4 @@
    <string name="change_the_theme_of_your_account">Змінити тему вашого облікового запису</string>
    <string name="pull_to_refresh">Потягніть, щоб оновити</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Потягніть сторінку згори вниз, щоб оновити.\nВам потрібно перезавантажити застосунок, щоб зміни набрали сили.</string>
-    <string name="donate">Пожертвувати</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Вам подобається цей проект? Бажаєте, щоб його покращували й виправляли помилки? \n\nРозробка застосунків та написання пов\'язаних статей у блозі займає багато часу! Якщо ви хочете допомогти цьому проекту розвиватися далі — зробіть маленьке пожертвування!\n\nЦей проект розроблений у вільний час, не містить реклами та є абсолютно безкоштовним!</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -210,6 +210,4 @@
    <string name="change_the_theme_of_your_account">更改您的帐户的主题</string>
    <string name="pull_to_refresh">下拉刷新</string>
    <string name="pulling_down_on_top_of_page_to_refresh">在页面顶部下拉刷新。\n您需要重新启动应用程序以使更改生效。</string>
-    <string name="donate">捐赠</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">你喜欢这个项目吗？你想要它得到改善并解决问题吗？\n\n开发应用并撰写相关博客文章需要花费大量时间！如果你想要帮助项目继续进行，请考虑小额捐赠！\n\n这个项目是在闲暇时间开发的，完全免费且没有任何广告！</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -205,6 +205,4 @@
    <string name="change_the_theme_of_your_account">修改帳號的佈景主題</string>
    <string name="pull_to_refresh">下拉可更新</string>
    <string name="pulling_down_on_top_of_page_to_refresh">從頁面的上方下拉一下可以更新內容。\n這個設定修改後需要重啟應用程式才會生效。</string>
-    <string name="donate">贊助</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">喜歡這個專案嗎？希望它繼續改善，而且問題得到解決嗎？\n\n無論是開發應用程式，還是撰寫相關部落格文章，都需要很多時間！如果你想要幫助專案持續發展，請考慮給我們小額捐款！\n\n這個專案是在閒暇時間開發的，完全免費，並且沒有任何廣告！</string>
 </resources>
--- a/app/src/main/res/values/strings-not_translatable.xml
+++ b/app/src/main/res/values/strings-not_translatable.xml
@ -13,9 +13,6 @@
    <string name="tor" translatable="false">Tor</string>
    <string name="HTTP" translatable="false">HTTP</string>

-    <string name="donate_" translatable="false">@string/donate</string>
-    <string name="app_donate_url" translatable="false"><![CDATA[https://gsantner.net/supportme/?project=markor&source=inapp_supdon]]></string>
-
    <string name="action_compose_new_post" translatable="false">@string/new_post</string>
    <string name="search_alert_title" translatable="false">@string/search</string>
    <string name="http" translatable="false">http</string>
@ -40,10 +37,6 @@


    <string name="not_implemented" translatable="false">not_implemented</string>
-    <string name="donate__bitcoin_id" translatable="false">@string/not_implemented</string>
-    <string name="donate__bitcoin_message" translatable="false">@string/not_implemented</string>
-    <string name="donate__bitcoin_amount" translatable="false">@string/not_implemented</string>
-    <string name="donate__bitcoin_url" translatable="false">@string/not_implemented</string>

    <!-- Rotation values -->
    <string name="rotation_val_system" translatable="false">auto</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -261,7 +261,4 @@
    <string name="pull_to_refresh">Pull to refresh</string>
    <string name="pulling_down_on_top_of_page_to_refresh">Pulling down on top of page to refresh.\nYou need to restart the app for changes to take effect.</string>

-    <string name="donate">Donate</string>
-    <string name="do_you_like_this_project_want_donate_to_keep_alive">Do you like this project? Do you want that it gets improved and problems fixed?\n\nDeveloping apps and writing related blog posts costs a lot of time! If you want to help so that the project can go on, please consider a small donation!\n\nThis project is developed in leisure time, completely for free and without any advertisements!</string>
-
 </resources>
--- a/metadata/de/full_description.txt
+++ b/metadata/de/full_description.txt
@ -19,10 +19,5 @@ Verbessere dein Netzwerk-Erlebnis durch nützliche Features:
 🌍 Hinweis: Die App nutzt Androids WebView Komponente um Inhalte von diaspora* Pods in der mobilen Ansicht anzuzeigen. Für fehlende Features frage bitte auf dem diaspora* Bug Tracker.

 <b>Weitere Informationen:</b>
-<a href="https://gsantner.net/index.html?project=dandelion&source=fdroid">Projekt Blog</a> | <a href="https://wiki.diasporafoundation.org/FAQ_for_users">diaspora* FAQ</a>
+<a href="https://github.com/gsantner/dandelion">Project site</a> | <a href="https://wiki.diasporafoundation.org/FAQ_for_users">diaspora* FAQ</a>

-<b>Unterstütze das Projekt:</b>
-<a href="https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git&mail=gro.xobliam@@rentnasg">Übersetze mit Stringlate</a> | <a 
-href="https://matrix.to/#/#dandelion:matrix.org">Nimm per Matrix and der Diskussion teil</a> | <a href="https://github.com/gsantner/dandelion#contributions">Mitwirkende</a> | <a 
-href="https://gsantner.net/android-contribution-guide/?packageid=com.github.dfa.diaspora_android&name=dandelion&web=https://github.com/gsantner/dandelion&source=fdroid">Leitfaden zur Mitwirkung</a> 
-| <a href="https://gsantner.net/supportme?project=dandelion&source=fdroid">Unterstütze den Hauptentwickler</a>
--- a/metadata/en-US/full_description.txt
+++ b/metadata/en-US/full_description.txt
@ -19,7 +19,4 @@ It adds useful features to your networking experience:
 🌍 Notice: The app uses the Android WebView component to display contents of diaspora* pods in the mobile view. For missing features and bugs in mobile view, ask at diaspora* bugtracker.

 <b> More information:</b>
-<a href="https://gsantner.net/index.html?project=dandelion&source=fdroid">Project Blog</a> | <a href="https://wiki.diasporafoundation.org/FAQ_for_users">diaspora* FAQ</a>
-
-<b>Support the project:</b>
-<a href="https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git&mail=gro.xobliam@@rentnasg">Translate using Stringlate</a> | <a href="https://matrix.to/#/#dandelion:matrix.org">Join discussion on Matrix</a> | <a href="https://github.com/gsantner/dandelion#contributions">Contribution information</a> | <a href="https://gsantner.net/android-contribution-guide/?packageid=com.github.dfa.diaspora_android&name=dandelion&web=https://github.com/gsantner/dandelion&source=fdroid">Android Contribution Guide</a> | <a href="https://gsantner.net/supportme?project=dandelion&source=fdroid">Support main developer</a>
+<a href="https://github.com/gsantner/dandelion">Project site</a> | <a href="https://wiki.diasporafoundation.org/FAQ_for_users">diaspora* FAQ</a>