Merge branch 'develop'

2019-05-13 19:41:28 +02:00 · 2019-05-13 19:41:28 +02:00 · 8fca668f3a
parent 9b9e3a6d3b 7114839418
commit 8fca668f3a
50 changed files with 137 additions and 45 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -7,8 +7,8 @@ android {
        applicationId "fr.gouv.etalab.mastodon"
        minSdkVersion 16
        targetSdkVersion 28
-        versionCode 265
-        versionName "1.81.1"
+        versionCode 266
+        versionName "1.81.2"
        multiDexEnabled true
        renderscriptTargetApi 28 as int
        renderscriptSupportModeEnabled true
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
@ -1756,7 +1756,9 @@ public abstract class BaseMainActivity extends BaseActivity
        }else{
            tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE);
        }
+        adapter.notifyDataSetChanged();
        viewPager.setAdapter(adapter);
+
        viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
        tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
            @Override
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@ -131,6 +131,7 @@ import fr.gouv.etalab.mastodon.client.Entities.PollOptions;
 import fr.gouv.etalab.mastodon.client.Entities.Results;
 import fr.gouv.etalab.mastodon.client.Entities.Status;
 import fr.gouv.etalab.mastodon.client.Entities.StoredStatus;
+import fr.gouv.etalab.mastodon.client.Entities.Tag;
 import fr.gouv.etalab.mastodon.client.Entities.Version;
 import fr.gouv.etalab.mastodon.client.HttpsConnection;
 import fr.gouv.etalab.mastodon.drawers.AccountsReplyAdapter;
@ -483,6 +484,8 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface,
            toot_content.setText(String.format("\n\nvia @%s\n\n%s\n\n", tootMention, urlMention));
            toot_space_left.setText(String.valueOf(toot_content.length()));
        }
+
+
        initialContent = toot_content.getText().toString();


@ -526,6 +529,8 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface,
                toot_space_left.setText(String.valueOf(toot_content.length()));
            }
        }
+
+
        attachments = new ArrayList<>();
        int charsInCw = 0;
        int charsInToot = 0;
@ -2691,6 +2696,16 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface,
                    toot_content.setSelection(toot_content.getText().length()); //Put cursor at the end
                }
            }
+            boolean forwardTags = sharedpreferences.getBoolean(Helper.SET_FORWARD_TAGS_IN_REPLY, false);
+            if( tootReply != null && forwardTags && tootReply.getTags() != null && tootReply.getTags().size() > 0){
+                int currentCursorPosition = toot_content.getSelectionStart();
+                toot_content.setText(toot_content.getText() +"\n");
+                for(Tag tag: tootReply.getTags()){
+                    toot_content.setText(toot_content.getText() +" #"+tag.getName());
+                }
+                toot_content.setSelection(currentCursorPosition);
+                toot_space_left.setText(String.valueOf(toot_content.length()));
+            }

        }
        initialContent = toot_content.getText().toString();
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
@ -313,7 +313,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                        Date bookmarkL = statuses.get(firstVisibleItem).getCreated_at();
                        updatedBookMark = statuses.get(firstVisibleItem).getId();
                        updatedBookMarkDate = statuses.get(firstVisibleItem).getCreated_at();
-                        if( lastReadTootDate == null || bookmarkL.after(lastReadTootDate)){
+                        if( lastReadTootDate == null || (bookmarkL != null && bookmarkL.after(lastReadTootDate))){
                         //Last read toot, only incremented if the id of the toot is greater than the recorded one
                            lastReadTootDate = bookmarkL;
                        }
@ -927,12 +927,14 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
            return;
        }
        List<Status> statuses = apiResponse.getStatuses();
-        if( statuses == null || statuses.size() == 0 )
+        if( statuses == null || statuses.size() == 0 || this.statuses == null )
            return;
        //Find the position of toots between those already present
        int position = 0;
-        while (position < this.statuses.size() && statuses.get(0).getCreated_at().before(this.statuses.get(position).getCreated_at())) {
-            position++;
+        if( statuses.get(0).getCreated_at() != null && this.statuses.get(position).getCreated_at() != null) {
+            while (position < this.statuses.size() && statuses.get(0).getCreated_at().before(this.statuses.get(position).getCreated_at())) {
+                position++;
+            }
        }
        ArrayList<Status> tmpStatuses = new ArrayList<>();
        for (Status tmpStatus : statuses) {
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
@ -650,6 +650,19 @@ public class SettingsFragment extends Fragment {
            }
        });

+        // forward tags in replies
+        boolean forward_tags = sharedpreferences.getBoolean(Helper.SET_FORWARD_TAGS_IN_REPLY, false);
+        final CheckBox set_forward_tags = rootView.findViewById(R.id.set_forward_tags);
+        set_forward_tags.setChecked(forward_tags);
+        set_forward_tags.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                SharedPreferences.Editor editor = sharedpreferences.edit();
+                editor.putBoolean(Helper.SET_FORWARD_TAGS_IN_REPLY, set_forward_tags.isChecked());
+                editor.apply();
+            }
+        });
+
        String custom_sharing_url = sharedpreferences.getString(Helper.SET_CUSTOM_SHARING_URL,"");
        if (custom_sharing_url.equals("")) {
            custom_sharing_url = "http://cs.example.net/add?token=umVe1zurZk47ihElSOQcBG05KUSA2v-GSet4_fFnJ4M&url=${url}&title=${title}&source=${source}&id=${id}&description=${description}&keywords=${keywords}&creator=${creator}&thumbnailurl=${thumbnailurl}";
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@ -308,6 +308,7 @@ public class Helper {
    public static final String SET_CAPITALIZE = "set_capitalize";
    public static final String SET_PICTURE_RESIZE = "set_picture_resize";
    public static final String SET_SHOW_BOOKMARK = "set_show_bookmark";
+    public static final String SET_FORWARD_TAGS_IN_REPLY = "set_forward_tags_in_reply";
    public static final String SET_FULL_PREVIEW = "set_full_preview";
    public static final String SET_COMPACT_MODE = "set_compact_mode";
    public static final String SET_CONSOLE_MODE = "set_console_mode";
--- a/app/src/main/res/layout-sw600dp/fragment_settings.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml
@ -362,6 +362,15 @@
            android:text="@string/settings_title_custom_sharing"
            android:layout_height="wrap_content" />

+        <!-- ADD TAGS  -->
+        <CheckBox
+            android:id="@+id/set_forward_tags"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_forward_tags"
+            android:layout_height="wrap_content" />
+
        <EditText
            android:hint="@string/settings_custom_sharing_url"
            android:id="@+id/custom_sharing_url"
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@ -367,6 +367,14 @@
            android:layout_marginBottom="@dimen/settings_checkbox_margin"
            android:text="@string/settings_title_custom_sharing"
            android:layout_height="wrap_content" />
+        <!-- ADD TAGS  -->
+        <CheckBox
+            android:id="@+id/set_forward_tags"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_forward_tags"
+            android:layout_height="wrap_content" />

        <EditText
            android:hint="@string/settings_custom_sharing_url"
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@ -840,6 +840,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -854,6 +854,7 @@
    <string name="set_sensitive_content">اعتبار الوسائط دائما كحساسة</string>
    <string name="gnu_instance">مثيل خادم GNU</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="zero">لا صوت</item>
        <item quantity="one">صوت واحد</item>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -831,6 +831,7 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
    <string name="set_sensitive_content">Tots els mèdia són material sensible</string>
    <string name="gnu_instance">Instància de GNU</string>
    <string name="cached_status">Estatus en memòria cau</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vot</item>
        <item quantity="other">%d vots</item>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -845,6 +845,7 @@ Uživatelské jméno a heslo nejsou nikdy ukládány. Jsou použity pouze během
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d hlas</item>
        <item quantity="few">%d hlasy</item>
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@ -855,6 +855,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="zero">%d votes</item>
        <item quantity="one">%d vote</item>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -840,6 +840,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -828,6 +828,7 @@ Sobald Sie die ersten Buchstaben eintippen, werden Namensvorschläge angezeigt\n
    <string name="set_sensitive_content">Medien immer als vertraulich kennzeichnen</string>
    <string name="gnu_instance">GNU-Instanz</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d Stimme</item>
        <item quantity="other">%d Stimmen</item>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -840,6 +840,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d ψήφοι</item>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -834,6 +834,7 @@ https://yandex.ru/legal/confidential/?lang=en    </string>
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@ -838,6 +838,7 @@
    <string name="set_sensitive_content">Beti markatu multimedia mingarri gisa</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">boto %d</item>
        <item quantity="other">%d boto</item>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -840,6 +840,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -840,6 +840,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -837,6 +837,7 @@ Le bouton de connexion s’activera une fois qu’un domaine valide sera renseig
    <string name="set_sensitive_content">Toujours marquer le média comme sensible</string>
    <string name="gnu_instance">Instance GNU</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d voix</item>
        <item quantity="other">%d voix</item>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -839,8 +839,9 @@
    <string name="action_bbcode">BBCode</string>
    <string name="add_timeline">Engadir liña temporal</string>
    <string name="set_sensitive_content">Marcar os medios sempre como sensibles</string>
-    <string name="gnu_instance">GNU instance</string>
-    <string name="cached_status">Cached status</string>
+    <string name="gnu_instance">Instancia GNU</string>
+    <string name="cached_status">Estado almacenado</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d voto</item>
        <item quantity="other">%d votos</item>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -848,6 +848,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="two">%d votes</item>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@ -829,6 +829,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -837,6 +837,7 @@ A Yandexnek megvan a saját adatvédelmi szabályzata, ami itt található: http
    <string name="set_sensitive_content">Minden médiát jelölj meg érzékenynek</string>
    <string name="gnu_instance">GNU szerver</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d szavazat</item>
        <item quantity="other">%d szavazat</item>
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@ -839,6 +839,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@ -838,6 +838,7 @@ https://yandex.ru/legal/confidential/?lang=en
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="other">%d votes</item>
    </plurals>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -838,8 +838,9 @@
    <string name="action_bbcode">BBCode</string>
    <string name="add_timeline">Aggiungi una timeline</string>
    <string name="set_sensitive_content">Segna sempre media come sensibili</string>
-    <string name="gnu_instance">GNU instance</string>
-    <string name="cached_status">Cached status</string>
+    <string name="gnu_instance">Istanza GNU</string>
+    <string name="cached_status">Stato in cache</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d voto</item>
        <item quantity="other">%d voti</item>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -828,6 +828,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="other">%d votes</item>
    </plurals>
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@ -840,6 +840,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -836,6 +836,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="other">%d votes</item>
    </plurals>
--- a/app/src/main/res/values-lmo/strings.xml
+++ b/app/src/main/res/values-lmo/strings.xml
@ -840,6 +840,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@ -840,6 +840,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -837,6 +837,7 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n
    <string name="set_sensitive_content">Media altijd als gevoelig markeren</string>
    <string name="gnu_instance">GNU social-server</string>
    <string name="cached_status">Gebufferd bericht</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d stem</item>
        <item quantity="other">%d stemmen</item>
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@ -828,6 +828,7 @@ Adresser vil bli foreslått når du begynner å skrive.\n\n
    <string name="set_sensitive_content">Marker alltid media som sensitivt</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d stemme</item>
        <item quantity="other">%d stemmer</item>
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@ -840,6 +840,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -842,6 +842,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="few">%d votes</item>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -840,6 +840,7 @@
    <string name="set_sensitive_content">Sempre marcar mídia como sensível</string>
    <string name="gnu_instance">Instância GNU</string>
    <string name="cached_status">Toots em cache</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d voto</item>
        <item quantity="other">%d votos</item>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -841,6 +841,7 @@ Aceste date sunt strict confidențiale și pot fi folosite doar de aplicație.
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="few">%d votes</item>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -848,6 +848,7 @@
    <string name="set_sensitive_content">Всегда отмечать медиафайлы как деликатный контент</string>
    <string name="gnu_instance">Сервер GNU</string>
    <string name="cached_status">Состояние кэша</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d голос</item>
        <item quantity="few">%d голоса</item>
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@ -839,6 +839,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@ -848,6 +848,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="two">%d votes</item>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -844,6 +844,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="few">%d votes</item>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -840,6 +840,7 @@
    <string name="set_sensitive_content">Markera alltid media som känsligt</string>
    <string name="gnu_instance">GNU-instans</string>
    <string name="cached_status">Cachadstatus</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d röst</item>
        <item quantity="other">%d röster</item>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -833,6 +833,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="other">%d votes</item>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -838,6 +838,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>
        <item quantity="few">%d votes</item>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -834,6 +834,7 @@ và %d toots khác để khám phá</item>
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="other">%d votes</item>
    </plurals>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -836,6 +836,7 @@
    <string name="set_sensitive_content">总是标记媒体为敏感</string>
    <string name="gnu_instance">GNU实例</string>
    <string name="cached_status">高速缓冲的状态</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="other">%d 票</item>
    </plurals>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -4,7 +4,7 @@
    <string name="navigation_drawer_open">打開選單</string>
    <string name="navigation_drawer_close">關閉選單</string>
    <string name="action_about">關於</string>
-    <string name="action_about_instance">關於實體</string>
+    <string name="action_about_instance">關於站台</string>
    <string name="action_privacy">隱私權</string>
    <string name="action_cache">快取</string>
    <string name="action_logout">登出</string>
@ -29,10 +29,10 @@
    <string name="save">儲存</string>
    <string name="restore">還原</string>
    <string name="two_factor_authentification">兩步驟驗證？</string>
-    <string name="other_instance">除了 mastodon.etalab.gouv.fr 以外的實體？</string>
+    <string name="other_instance">除了 mastodon.etalab.gouv.fr 以外的站台？</string>
    <string name="no_result">沒有結果！</string>
-    <string name="instance">實體</string>
-    <string name="instance_example">實體：mastodon.social</string>
+    <string name="instance">站台</string>
+    <string name="instance_example">站台：mastodon.social</string>
    <string name="toast_account_changed" formatted="false">現在使用帳號 %1$s</string>
    <string name="add_account">新增帳號</string>
    <string name="clipboard">已將嘟文的內容複製到剪貼簿</string>
@ -192,7 +192,7 @@
    <string name="about_license_action">GNU GPL V3</string>
    <string name="about_code">原始碼：</string>
    <string name="about_yandex">嘟文翻譯提供者：</string>
-    <string name="about_thekinrar">搜尋實例：</string>
+    <string name="about_thekinrar">搜尋站台：</string>
    <string name="about_thekinrar_action">instances.social</string>
    <string name="thanks_text_logo">圖示設計者：</string>
    <string name="thanks_text_banner">橫幅設計師：</string>
@ -261,8 +261,8 @@
    <string name="toast_pin">嘟文已被釘選！</string>
    <string name="toast_unpin">嘟文已被取消釘選！</string>
    <string name="toast_error">唉呀！發生錯誤！</string>
-    <string name="toast_code_error">發生錯誤！實體未回傳授權代碼！</string>
-    <string name="toast_error_instance">實體網域似乎不是有效的網域！</string>
+    <string name="toast_code_error">發生錯誤！站台未回傳授權代碼！</string>
+    <string name="toast_error_instance">站台網域似乎不是有效的網域！</string>
    <string name="toast_error_loading_account">在帳號間切換時發生錯誤！</string>
    <string name="toast_error_search">搜尋時發生錯誤！</string>
    <string name="toast_error_login">無法登入！</string>
@ -272,9 +272,9 @@
    <string name="toast_error_translate">翻譯時發生錯誤！</string>
    <string name="toast_error_translations_disabled">已在設定中停用翻譯</string>
    <string name="toast_toot_saved">草稿已儲存！</string>
-    <string name="toast_error_char_limit">您確定此實體允許此數量的字元嗎？一般來說，此值約為 500 個字元左右。</string>
+    <string name="toast_error_char_limit">您確定此站台允許此數量的字元嗎？一般來說，此值約為 500 個字元左右。</string>
    <string name="toast_visibility_changed">%1$s 帳號的嘟文可見度已變更</string>
-    <string name="toast_empty_search">實體名稱與畫面名稱不能為空！</string>
+    <string name="toast_empty_search">站台名稱與畫面名稱不能為空！</string>
    <!-- Settings -->
    <string name="settings_title_optimisation">載入最佳化</string>
    <string name="set_toots_page">每次載入的嘟文數量</string>
@ -426,11 +426,11 @@
    <string name="privacy_data">        只有帳號中的基本資訊才會儲存在裝置上。\n
 這些資料嚴格保密，僅能由應用程式使用。\n
 刪除應用程式將會立即移除這些資料。\n
-&#9888; 不會儲存密碼與登入資訊。它們僅會在有安全驗證 (SSL) 的實體上使用。
+&#9888; 不會儲存密碼與登入資訊。它們僅會在有安全驗證 (SSL) 的站台上使用。
    </string>
    <string name="privacy_authorizations_title">權限：</string>
    <string name="privacy_authorizations">        - <b>ACCESS_NETWORK_STATE</b>：用於偵測裝置是否連線至 WIFI 網路。\n
- <b>INTERNET</b>：用於查詢實體。\n
+- <b>INTERNET</b>：用於查詢站台。\n
 - <b>WRITE_EXTERNAL_STORAGE</b>：用於儲存媒體或將應用程式移動到記憶卡上。\n
 - <b>READ_EXTERNAL_STORAGE</b>：用於將媒體新增到嘟文中。\n
 - <b>BOOT_COMPLETED</b>：用於啟動通知服務。\n
@ -478,9 +478,9 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
    <string name="show_boost_count">顯示嘟文／最愛計數</string>
    <string name="issue_login_title">身份驗證無法運作？</string>
    <string name="issue_login_message">        <b>這裡有一些可能會有幫助的檢查：</b>\n\n
-        - 檢查實體名稱沒有拼字錯誤\n\n
-        - 檢查您的實體是否仍在運行\n\n
-        - 若您使用雙因素驗證 (2FA)，請使用下方的連結（填寫實體名稱後）\n\n
+        - 檢查站台名稱沒有拼字錯誤\n\n
+        - 檢查您的站台是否仍在運行\n\n
+        - 若您使用雙因素驗證 (2FA)，請使用下方的連結（填寫站台名稱後）\n\n
        - 您也可以在不使用 2FA 的狀況下使用此連結\n\n
        - 若還是無法運作，請在 GitHub 上回報問題，網址為 https://github.com/stom79/mastalab/issues
    </string>
@ -508,16 +508,16 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
    <string name="support_the_app_on_liberapay">在 Liberpay 上支援應用程式</string>
    <string name="alert_regex">在正規表達式中有錯誤！</string>
    <string name="no_account_yet">還沒有帳號？</string>
-    <string name="toast_instance_unavailable">在此實體上找不到時間軸！</string>
-    <string name="delete_instance">刪除此實體？</string>
-    <string name="warning_delete_instance">您將要從您追蹤的實體中刪除 %s。</string>
+    <string name="toast_instance_unavailable">在此站台上找不到時間軸！</string>
+    <string name="delete_instance">刪除此站台？</string>
+    <string name="warning_delete_instance">您將要從您追蹤的站台中刪除 %s。</string>
    <string name="which_language">翻譯成</string>
    <string name="crash_title">Mastalab 已停止 :(</string>
    <string name="crash_message">您可以透過電子郵件傳送當機報告給我。這可以協助我修復它 :)\n\n您可以加入鵝外的內容。感謝您！</string>
    <string name="send_crash_report">是否要透過電子郵件傳送當機報告？</string>
-    <string name="follow_instance">追蹤實體</string>
-    <string name="toast_instance_already_added">您已經追蹤此實體了！</string>
-    <string name="toast_instance_followed">實體已被追蹤！</string>
+    <string name="follow_instance">追蹤站台</string>
+    <string name="toast_instance_already_added">您已經追蹤此站台了！</string>
+    <string name="toast_instance_followed">站台已被追蹤！</string>
    <string name="action_partnership">夥伴</string>
    <string name="neutral_menu_information">資訊</string>
    <string name="hide_boost">隱藏由 %s 轉嘟的嘟文</string>
@ -561,13 +561,13 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
    <string name="account_added_list_trunk">帳號已新增至列表</string>
    <string name="adding_account_list_trunk">正在新增帳號到列表</string>
    <string name="action_list_add">您尚未建立列表。點選 \"+\" 按鈕以新增一個新的。</string>
-    <string name="action_remote_instance_add">您未關注任何遠端實體。點選 \"+\" 按鈕以新增一個新的。</string>
+    <string name="action_remote_instance_add">您未關注任何遠端站台。點選 \"+\" 按鈕以新增一個新的。</string>
    <string name="about_trunk">要關注誰</string>
    <string name="about_trunk_action">Trunk API</string>
    <string name="toast_impossible_to_follow">無法關注帳號</string>
    <string name="retrieve_remote_account">正在擷取遠端帳號</string>
    <string name="expand_image">自動展開隱藏的媒體</string>
-    <string name="set_display_follow_instance">顯示關注實體按鈕</string>
+    <string name="set_display_follow_instance">顯示關注站台按鈕</string>
    <string name="channel_notif_follow">新關注</string>
    <string name="channel_notif_boost">新轉嘟</string>
    <string name="channel_notif_fav">新最愛</string>
@ -591,13 +591,13 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
    <string name="toast_unblock_domain">網域不再被封鎖！</string>
    <string name="retrieve_remote_status">正在擷取遠端狀態</string>
    <string name="comment">評論</string>
-    <string name="peertube_instance">PeerTube 實體</string>
+    <string name="peertube_instance">PeerTube 站台</string>
    <string name="set_display_direct">顯示私人訊息時間軸</string>
    <string name="set_keep_background_process">當應用程式關閉時，保留背景處理程序</string>
    <string name="no_comments">使用右上角的按鈕來成為第一個對這部影片留下評論的人！</string>
    <string name="number_view_video">%s 次檢視</string>
    <string name="duration_video">長度：%s</string>
-    <string name="add_remote_instance">新增實體</string>
+    <string name="add_remote_instance">新增站台</string>
    <string name="comment_no_allowed_peertube">此影片未啟用評論！</string>
    <string name="pickup_resolution">選擇解析度</string>
    <string name="peertube_favorites">Peertube 最愛</string>
@ -606,8 +606,8 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
    <string name="bookmark_peertube_empty">您的最愛中沒有 PeerTube 影片！</string>
    <string name="channel">頻道</string>
    <string name="no_peertube_channels">沒有 PeerTube 頻道</string>
-    <string name="no_peertube_instances">沒有 PeerTube 實體</string>
-    <string name="no_mastodon_instances">沒有 Mastodon 實體</string>
+    <string name="no_peertube_instances">沒有 PeerTube 站台</string>
+    <string name="no_mastodon_instances">沒有 Mastodon 站台</string>
    <string name="no_lists">沒有列表</string>
    <string name="videos">影片</string>
    <string name="channels">頻道</string>
@ -645,7 +645,7 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
    <string name="app_logo">應用程式圖示</string>
    <string name="profile_picture">個人檔案照片</string>
    <string name="profile_banner">個人檔案封面照片</string>
-    <string name="contact_instance_admin">聯絡實體的管理員</string>
+    <string name="contact_instance_admin">聯絡站台的管理員</string>
    <string name="add_new">加入新的</string>
    <string name="mastohost_logo">MastoHost 圖示</string>
    <string name="emoji_picker">顏文字選擇器</string>
@ -669,9 +669,9 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
        <item>1 天</item>
        <item>1 週</item>
    </string-array>
-    <string name="showcase_instance">        在此欄位，您必須填寫您的實體主機名稱。\n舉例來說，如果您在 https://mastodon.social 上建立帳號\n只要填寫 <b>mastodon.social</b>（不要填寫 https://）\n
+    <string name="showcase_instance">        在此欄位，您必須填寫您的站台主機名稱。\n舉例來說，如果您在 https://mastodon.social 上建立帳號\n只要填寫 <b>mastodon.social</b>（不要填寫 https://）\n
        您可以填寫首字母，然後就會有建議的名稱。\n\n
-        ⚠ 登入按鈕將只在實體名稱有效且實體正常運作時才會運作！
+        ⚠ 登入按鈕將只在站台名稱有效且站台正常運作時才會運作！
    </string>
    <string name="showcase_uid">        在此欄位，填寫要連結到您的 Mastodon 帳號的電子郵件。
    </string>
@ -688,9 +688,9 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
    <string name="translation_app">應用程式翻譯</string>
    <string name="about_crowdin">關於 Crowdin</string>
    <string name="bot">機器人</string>
-    <string name="pixelfed_instance">Pixelfed 實體</string>
-    <string name="mastodon_instance">Mastodon 實體</string>
-    <string name="no_pixelfed_instance">沒有 Pixelfed 實體</string>
+    <string name="pixelfed_instance">Pixelfed 站台</string>
+    <string name="mastodon_instance">Mastodon 站台</string>
+    <string name="no_pixelfed_instance">沒有 Pixelfed 站台</string>
    <string name="any_tags">這些裡面的任何一個</string>
    <string name="all_tags">這些全部</string>
    <string name="none_tags">這些都不要</string>
@ -698,8 +698,8 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
    <string name="some_words_all">這些字詞全部（以空格分開）</string>
    <string name="some_words_none">這些字詞都不要（以空格分開）</string>
    <string name="change_tag_column">變更欄位名稱</string>
-    <string name="no_misskey_instance">沒有 Misskey 實體</string>
-    <string name="misskey_instance">Misskey 實體</string>
+    <string name="no_misskey_instance">沒有 Misskey 站台</string>
+    <string name="misskey_instance">Misskey 站台</string>
    <string name="toast_no_apps">您的裝置上沒有安裝任何支援此連結的應用程式。</string>
    <string name="subscriptions">訂閱</string>
    <string name="overview">概覽</string>
@ -834,8 +834,9 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
    <string name="action_bbcode">BBCode</string>
    <string name="add_timeline">加入動態時報</string>
    <string name="set_sensitive_content">一律將媒體標記為敏感訊息</string>
-    <string name="gnu_instance">GNU 實體</string>
+    <string name="gnu_instance">GNU 站台</string>
    <string name="cached_status">已快取嘟文</string>
+    <string name="set_forward_tags">Forward tags in replies</string>
    <plurals name="number_of_vote">
        <item quantity="other">%d 人投票</item>
    </plurals>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -946,6 +946,7 @@
    <string name="set_sensitive_content">Always mark media as sensitive</string>
    <string name="gnu_instance">GNU instance</string>
    <string name="cached_status">Cached status</string>
+    <string name="set_forward_tags">Forward tags in replies</string>

    <plurals name="number_of_vote">
        <item quantity="one">%d vote</item>