From 8eb203ad0dc21fbd1b0bf2bba4920118592cb6f8 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 07:02:14 +0000
Subject: [PATCH 01/47] New translations strings.xml (Italian)

---
 app/src/main/res/values-it/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3f1391f6d..f572bb9b2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -838,8 +838,8 @@
     <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>
     <plurals name="number_of_vote">
         <item quantity="one">%d voto</item>
         <item quantity="other">%d voti</item>

From b10e2cc566630dd5c70e340c836f18dc25528286 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 15:12:27 +0000
Subject: [PATCH 02/47] New translations strings.xml (Galician)

---
 app/src/main/res/values-gl/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 22bfc957e..7148e33c8 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -839,8 +839,8 @@
     <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>
     <plurals name="number_of_vote">
         <item quantity="one">%d voto</item>
         <item quantity="other">%d votos</item>

From 61c492fd0dd691a36b869f0a308d9c930b2d0b48 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 17:51:43 +0200
Subject: [PATCH 03/47] Fix bugs

---
 .../fr/gouv/etalab/mastodon/activities/BaseMainActivity.java  | 2 ++
 .../gouv/etalab/mastodon/fragments/DisplayStatusFragment.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
index eb83792a5..8a83d5d13 100644
--- 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
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
index 53f06b76f..d05582cdb 100644
--- 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,7 +927,7 @@ 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;

From ee2b397a8eaa93ea03ff59cb88a8bab08332d705 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 18:15:45 +0200
Subject: [PATCH 04/47] Forward tags in replies

---
 .../etalab/mastodon/activities/TootActivity.java  | 15 +++++++++++++++
 .../mastodon/fragments/SettingsFragment.java      | 13 +++++++++++++
 .../fr/gouv/etalab/mastodon/helper/Helper.java    |  1 +
 .../main/res/layout-sw600dp/fragment_settings.xml |  9 +++++++++
 app/src/main/res/layout/fragment_settings.xml     |  8 ++++++++
 app/src/main/res/values/strings.xml               |  1 +
 6 files changed, 47 insertions(+)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index ad829fc6d..75d7e9f24 100644
--- 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();
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
index 592e3425f..a92e415db 100644
--- 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}";
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index f116a3fe8..33a90a03f 100644
--- 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";
diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml
index 1a73e33f0..f30481ada 100644
--- 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"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 1347fe518..faedf109c 100644
--- 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"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f04d332e7..8ee494859 100644
--- 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>

From 7704c97d98079a6304f96621ff200ae6b3559101 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:28:37 +0000
Subject: [PATCH 05/47] New translations strings.xml (Czech)

---
 app/src/main/res/values-cs/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9910b8766..423d26d4a 100644
--- 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>

From 5901858f3a79337ebeb591e4877f6d4ed65cebaf Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:28:42 +0000
Subject: [PATCH 06/47] New translations strings.xml (Hindi)

---
 app/src/main/res/values-hi/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 9e00ecbfd..98068be7f 100644
--- 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>

From 1a64ed56feda723eede32f3bd2d49a3d7bcce21a Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:28:46 +0000
Subject: [PATCH 07/47] New translations strings.xml (Serbian (Cyrillic))

---
 app/src/main/res/values-sr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index b691e82c9..f2af80098 100644
--- 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>

From fec8c14b351aa6b7e6c6ae4d2496514a2b7005e8 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:28:50 +0000
Subject: [PATCH 08/47] New translations strings.xml (Russian)

---
 app/src/main/res/values-ru/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 75f9b7828..71b18f5d5 100644
--- 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>

From 2136ab2f957e5a394b7a550f559ad9b5e914ec08 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:28:54 +0000
Subject: [PATCH 09/47] New translations strings.xml (Romanian)

---
 app/src/main/res/values-ro/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 8156e3ac7..3d52812de 100644
--- 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>

From 2ee7c7b219144bd94dca3101e9c4d7756c6a95c3 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:28:59 +0000
Subject: [PATCH 10/47] New translations strings.xml (Portuguese)

---
 app/src/main/res/values-pt/strings.xml | 249 +++++++++++++------------
 1 file changed, 125 insertions(+), 124 deletions(-)

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index bb99d7aac..049f0dac8 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -44,11 +44,11 @@
     <string name="camera">Câmera</string>
     <string name="speech_prompt">Por favor, diga algo</string>
     <string name="speech_not_supported">Desculpe! Seu dispositivo não suporta entrada por voz!</string>
-    <string name="delete_all">Excluir tudo</string>
+    <string name="delete_all">Remover todas</string>
     <string name="translate_toot">Traduzir este toot.</string>
     <string name="schedule">Agendar</string>
-    <string name="text_size">Tamanho dos textos e dos ícones</string>
-    <string name="text_size_change">Mudar o tamanho atual dos textos:</string>
+    <string name="text_size">Tamanho do texto e dos ícones</string>
+    <string name="text_size_change">Mudar o tamanho atual do texto:</string>
     <string name="icon_size_change">Mudar o tamanho atual dos ícones:</string>
     <string name="next">Próximo</string>
     <string name="previous">Anterior</string>
@@ -81,7 +81,7 @@
     <string name="blocked_menu">Usuários bloqueados</string>
     <string name="remote_follow_menu">Seguir remotamente</string>
     <string name="notifications">Notificações</string>
-    <string name="follow_request">Solicitações de seguidor</string>
+    <string name="follow_request">Solicitação para seguir</string>
     <string name="optimization">Otimização</string>
     <string name="settings">Configurações</string>
     <string name="profile">Perfil</string>
@@ -94,21 +94,21 @@
     <string name="click_to_change">Toque no caminho para mudá-lo</string>
     <string name="failed">Falhou!</string>
     <string name="scheduled_toots">Toots agendados</string>
-    <string name="disclaimer_full">As informações abaixo podem refletir incompletamente o perfil do usuário.</string>
+    <string name="disclaimer_full">As informações abaixo podem refletir o perfil do usuário incompletamente.</string>
     <string name="insert_emoji">Inserir emoji</string>
     <string name="no_emoji">O aplicativo não achou emojis personalizados no momento.</string>
     <string name="live_notif">Notificações ao vivo</string>
     <!-- Status -->
     <string name="no_status">Sem toots</string>
-    <string name="fav_added">Toot adicionado aos favoritos!</string>
+    <string name="fav_added">Toot adicionado aos favoritos</string>
     <string name="fav_removed">Toot removido dos favoritos!</string>
-    <string name="reblog_added">Você deu boost!</string>
-    <string name="reblog_removed">Você desfez o boost!</string>
-    <string name="reblog_by">Boost foi dado por %1$s</string>
-    <string name="favourite_add">Favoritar toot?</string>
-    <string name="favourite_remove">Desfavoritar toot?</string>
-    <string name="reblog_add">Dar boost?</string>
-    <string name="reblog_remove">Desfazer boost?</string>
+    <string name="reblog_added">Toot compartilhado!</string>
+    <string name="reblog_removed">Toot descompartilhado!</string>
+    <string name="reblog_by">Compartilhado por %1$s</string>
+    <string name="favourite_add">Adicionar este toot aos favoritos?</string>
+    <string name="favourite_remove">Remover este toot dos favoritos?</string>
+    <string name="reblog_add">Compartilhar este toot?</string>
+    <string name="reblog_remove">Desfazer compartilhamento?</string>
     <string name="pin_add">Fixar este toot?</string>
     <string name="pin_remove">Desafixar este toot?</string>
     <string name="more_action_1">Silenciar</string>
@@ -145,31 +145,31 @@
     <string name="bookmark_remove">Remover dos Salvos</string>
     <string name="bookmarks_empty">Sem toots salvos</string>
     <string name="status_bookmarked">Toot foi salvo!</string>
-    <string name="status_unbookmarked">Toot foi removido do Salvos!</string>
+    <string name="status_unbookmarked">Toot foi removido dos Salvos!</string>
     <!-- Date -->
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
     <!-- TOOT -->
-    <string name="toot_cw_placeholder">Aviso de conteúdo</string>
+    <string name="toot_cw_placeholder">Alerta de conteúdo</string>
     <string name="toot_placeholder">No que você está pensando?</string>
     <string name="toot_it">TOOT!</string>
     <string name="queet_it">QUEET!</string>
-    <string name="cw">ac</string>
-    <string name="toot_title">Compor toot</string>
-    <string name="toot_title_reply">Responder toot</string>
-    <string name="queet_title">Compor queet</string>
-    <string name="queet_title_reply">Responder queet</string>
+    <string name="cw">cw</string>
+    <string name="toot_title">Digite um toot</string>
+    <string name="toot_title_reply">Responder um toot</string>
+    <string name="queet_title">Digite um queet</string>
+    <string name="queet_title_reply">Responder um queet</string>
     <string name="toot_no_space">Você excedeu os 500 caracteres permitidos!</string>
     <string name="toot_select_image">Selecionar mídia</string>
-    <string name="toot_select_image_error">Ocorreu um erro ao selecionar a mídia!</string>
-    <string name="toot_delete_media">Remover mídia?</string>
+    <string name="toot_select_image_error">Ocorreu um erro enquanto ao selecionar a mídia!</string>
+    <string name="toot_delete_media">Excluir mídia?</string>
     <string name="toot_error_no_content">Toot vazio!</string>
     <string name="toot_visibility_tilte">Visibilidade do toot</string>
     <string name="toots_visibility_tilte">Visibilidade padrão dos toots: </string>
     <string name="toot_sent">Toot enviado!</string>
-    <string name="toot_reply_content_title">Você está respondendo este toot:</string>
+    <string name="toot_reply_content_title">Você está respondendo a este toot:</string>
     <string name="toot_sensitive">Conteúdo sensível?</string>
     <string-array name="toot_visibility">
         <item>Postar em timelines públicas</item>
@@ -180,7 +180,7 @@
     <string name="no_draft">Sem rascunhos!</string>
     <string name="choose_toot">Escolha um toot</string>
     <string name="choose_accounts">Escolha uma conta</string>
-    <string name="select_accounts">Selecionar contas</string>
+    <string name="select_accounts">Selecione algumas contas</string>
     <string name="remove_draft">Excluir rascunho?</string>
     <string name="show_reply">Clique no botão para mostrar toot original</string>
     <string name="upload_form_description">Descreva para os deficientes visuais</string>
@@ -193,15 +193,15 @@
     <string name="about_license_action">GNU GPL V3</string>
     <string name="about_code">Código-fonte: </string>
     <string name="about_yandex">Tradução dos toots:</string>
-    <string name="about_thekinrar">Procure instâncias:</string>
+    <string name="about_thekinrar">Pesquisar instâncias:</string>
     <string name="about_thekinrar_action">instances.social</string>
     <string name="thanks_text_logo">Designer do ícone:</string>
-    <string name="thanks_text_banner">Designer da capa:</string>
+    <string name="thanks_text_banner">Designer do banner:</string>
     <!-- Conversation -->
-    <string name="conversation">Sequência</string>
+    <string name="conversation">Conversa</string>
     <!-- Accounts -->
-    <string name="no_accounts">Sem conta</string>
-    <string name="no_follow_request">Sem solicitações de seguidor</string>
+    <string name="no_accounts">Sem contas</string>
+    <string name="no_follow_request">Sem solicitações de seguidores</string>
     <string name="status_cnt">Toots \n %1$s</string>
     <string name="following_cnt">Seguindo \n %1$s</string>
     <string name="followers_cnt">Seguidores \n %1$s</string>
@@ -210,7 +210,7 @@
     <string name="reject">Rejeitar</string>
     <!-- Scheduled toots -->
     <string name="no_scheduled_toots">Sem toots agendados!</string>
-    <string name="no_scheduled_toots_indications">Componha um toot e toque em <b>Agendar</b> no topo do menu.</string>
+    <string name="no_scheduled_toots_indications">Digite um toot e então toque em <b>Agendar</b> no topo do menu.</string>
     <string name="remove_scheduled">Excluir toot agendado?</string>
     <string name="media_count">Mídia: %d</string>
     <string name="toot_scheduled">Toot agendado!</string>
@@ -223,17 +223,17 @@
     <!-- Notifications -->
     <string name="no_notifications">Sem notificações</string>
     <string name="notif_mention">te mencionou</string>
-    <string name="notif_reblog">deu boost no seu toot</string>
+    <string name="notif_reblog">compartilhou seu toot</string>
     <string name="notif_favourite">favoritou seu toot</string>
-    <string name="notif_follow">te seguiu</string>
+    <string name="notif_follow">seguiu você</string>
     <string name="notif_pouet">Novo toot de %1$s</string>
     <plurals name="other_notifications">
         <item quantity="one">e outra %d notificação</item>
         <item quantity="other">e outras %d notificações</item>
     </plurals>
     <plurals name="other_notif_hometimeline">
-        <item quantity="one">e outro %d toot para ver</item>
-        <item quantity="other">e outros %d toots para ver</item>
+        <item quantity="one">e outro %d toot para descobrir</item>
+        <item quantity="other">e outros %d toots para descobrir</item>
     </plurals>
     <plurals name="likes">
         <item quantity="one">%d favoritou</item>
@@ -252,21 +252,21 @@
     <string name="no_internet">Sem conexão com a internet!</string>
     <string name="toast_block">Conta bloqueada!</string>
     <string name="toast_unblock">Conta desbloqueada!</string>
-    <string name="toast_mute">Silêncio ativado!</string>
+    <string name="toast_mute">Conta silenciada!</string>
     <string name="toast_unmute">Silêncio desativado!</string>
     <string name="toast_follow">Você seguiu a conta!</string>
     <string name="toast_unfollow">Você deixou de seguir a conta!</string>
-    <string name="toast_reblog">Você deu boost!</string>
-    <string name="toast_unreblog">Boost desfeito!</string>
+    <string name="toast_reblog">Toot compartilhado!</string>
+    <string name="toast_unreblog">Toot descompartilhado!</string>
     <string name="toast_favourite">Toot adicionado aos favoritos!</string>
     <string name="toast_unfavourite">Toot removido dos favoritos!</string>
     <string name="toast_report">Toot denunciado!</string>
     <string name="toast_unstatus">Toot excluído!</string>
     <string name="toast_pin">Toot fixado!</string>
     <string name="toast_unpin">Toot desafixado!</string>
-    <string name="toast_error">Opa! Ocorreu um erro!</string>
+    <string name="toast_error">Oops! Ocorreu um erro!</string>
     <string name="toast_code_error">Ocorreu um erro! A instância não retornou um código de autorização!</string>
-    <string name="toast_error_instance">Parece que o domínio da instância não é válido!</string>
+    <string name="toast_error_instance">O domínio da instância parece não ser válido!</string>
     <string name="toast_error_loading_account">Ocorreu um erro ao alternar entre as contas!</string>
     <string name="toast_error_search">Ocorreu um erro na pesquisa!</string>
     <string name="toast_error_login">Não foi possível entrar!</string>
@@ -277,13 +277,13 @@
     <string name="toast_error_translations_disabled">Tradução está desativada nas configurações</string>
     <string name="toast_toot_saved">Rascunho salvo!</string>
     <string name="toast_error_char_limit">Você tem certeza que sua instância permite esse número de caracteres? Geralmente, são 500 caracteres.</string>
-    <string name="toast_visibility_changed">Visibilidade dos toots foi alterada na conta %1$s</string>
+    <string name="toast_visibility_changed">Visibilidade dos toots foi mudada para a conta %1$s</string>
     <string name="toast_empty_search">Nome da instância e nome de exibição não podem ser vazios!</string>
     <!-- Settings -->
-    <string name="settings_title_optimisation">Otimização da timeline</string>
-    <string name="set_toots_page">Número de toots por vez</string>
-    <string name="set_accounts_page">Número de contas por vez</string>
-    <string name="set_notifications_page">Número de notificações por vez</string>
+    <string name="settings_title_optimisation">Otimização do carregamento</string>
+    <string name="set_toots_page">Número de toots por atualização</string>
+    <string name="set_accounts_page">Número de contas por atualização</string>
+    <string name="set_notifications_page">Número de notificações por atualização</string>
     <string name="set_attachment_always">Sempre</string>
     <string name="set_attachment_wifi">Wi-Fi</string>
     <string name="set_attachment_ask">Perguntar</string>
@@ -292,36 +292,36 @@
     <string name="load_attachment_spoiler">Mostrar mais…</string>
     <string name="load_attachment_spoiler_less">Mostrar menos…</string>
     <string name="load_sensitive_attachment">Conteúdo sensível</string>
-    <string name="set_display_reply">Mostrar toot anterior ao responder</string>
+    <string name="set_display_reply">Mostrar toot anterior nas respostas</string>
     <string name="set_display_local">Mostrar timeline local</string>
     <string name="set_display_global">Mostrar timeline global</string>
-    <string name="set_disable_gif">Desativar GIF</string>
+    <string name="set_disable_gif">Desativar avatares GIF</string>
     <string name="set_folder_title">Caminho: </string>
     <string name="set_auto_store_toot">Salvar rascunhos automaticamente</string>
     <string name="set_bubble_counter">Mostrar contadores</string>
     <string name="set_auto_add_media_url">Adicionar link da mídia nos toots</string>
     <string name="set_notif_follow">Notificar quando alguém te seguir</string>
     <string name="set_notif_follow_ask">Notificar quando alguém solicitar ser seu seguidor</string>
-    <string name="set_notif_follow_share">Notificar quando alguém der boost nos seus toots</string>
+    <string name="set_notif_follow_share">Notificar quando alguém compartilhar seus toots</string>
     <string name="set_notif_follow_add">Notificar quando alguém favoritar seus toots</string>
     <string name="set_notif_follow_mention">Notificar quando alguém te mencionar</string>
     <string name="set_notif_follow_poll">Notificar quando uma enquete terminar</string>
-    <string name="set_share_validation">Mostrar diálogo antes de dar boost</string>
-    <string name="set_share_validation_fav">Mostrar diálogo antes de favoritar</string>
+    <string name="set_share_validation">Mostrar diálogo antes de compartilhar</string>
+    <string name="set_share_validation_fav">Mostrar diálogo antes de adicionar aos favoritos</string>
     <string name="set_wifi_only">Notificar somente em Wi-Fi</string>
     <string name="set_notify">Notificar?</string>
     <string name="set_notif_silent">Silenciar notificações</string>
     <string name="set_night_mode">Modo noturno</string>
-    <string name="set_nsfw_timeout">Segundos para expirar a visualização de NSFW, 0 para desativar.</string>
+    <string name="set_nsfw_timeout">Segundos para a visualização de NSFW expirar, 0 para desativar</string>
     <string name="settings_title_profile">Editar perfil</string>
     <string name="settings_title_custom_sharing">Compartilhamento externo personalizado</string>
     <string name="settings_custom_sharing_url">Seu link de compartilhamento externo&#8230;</string>
-    <string name="set_profile_description">Biografia…</string>
-    <string name="set_lock_account">Trancar conta</string>
+    <string name="set_profile_description">Bio…</string>
+    <string name="set_lock_account">Bloquear conta</string>
     <string name="set_save_changes">Salvar mudanças</string>
-    <string name="set_header_picture_overlay">Escolher capa</string>
-    <string name="set_fit_preview">Ajustar prévias de imagens</string>
-    <string name="set_automatically_split_toot">Transformar toots com mais de 500 caracteres em sequência</string>
+    <string name="set_header_picture_overlay">Escolher cabeçalho</string>
+    <string name="set_fit_preview">Ajustar visualização de imagens</string>
+    <string name="set_automatically_split_toot">Transformar toots com mais de 500 caracteres em sequências</string>
     <string name="note_no_space">Você excedeu os 160 caracteres permitidos!</string>
     <string name="username_no_space">Você excedeu os 30 caracteres permitidos!</string>
     <string name="settings_time_from">Entre</string>
@@ -333,7 +333,7 @@
     <string name="embedded_browser">Usar navegador interno</string>
     <string name="custom_tabs">Abas personalizadas</string>
     <string name="use_javascript">Ativar Javascript</string>
-    <string name="expand_cw">Expandir ac automaticamente</string>
+    <string name="expand_cw">Expandir cw automaticamente</string>
     <string name="use_cookies">Permitir cookies de terceiros</string>
     <string name="settings_ui_layout">Modelo das timelines: </string>
     <string-array name="battery_profiles">
@@ -351,11 +351,11 @@
         <item>DeepL</item>
         <item>Não</item>
     </string-array>
-    <string name="your_api_key">Você pode deixar sua chave de API em branco para Yandex</string>
+    <string name="your_api_key">Sua chave de API, você pode deixar em branco para Yandex</string>
     <string-array name="settings_theme">
-        <item>Noturno</item>
-        <item>Diurno</item>
-        <item>AMOLED</item>
+        <item>Escuro</item>
+        <item>Claro</item>
+        <item>Preto</item>
     </string-array>
     <string-array name="settings_resize_picture">
         <item>Não</item>
@@ -457,7 +457,7 @@
     <string name="privacy_API_yandex_authorizations">        O aplicativo oferece a habilidade de traduzir toots usando o idioma do aparelho e a API do Yandex.\n
         Yandex tem a sua própria política de privacidade, que pode ser lida aqui: https://yandex.ru/legal/confidential/?lang=en
     </string>
-    <string name="thanks_text">        Agradecimentos a Stéphane pela logo.
+    <string name="thanks_text">        Agradecimentos à Stéphane pelo logo.
     </string>
     <string name="thanks_text_dev">        Agradecimentos aos:
     </string>
@@ -471,16 +471,16 @@
     <string name="action_lists_empty_content">Não há nada nesta lista ainda. Quando membros desta lista postarem novos toots, eles aparecerão aqui.</string>
     <string name="action_lists_add_to">Adicionar à lista</string>
     <string name="action_lists_remove_from">Remover da lista</string>
-    <string name="action_lists_create">Criar lista</string>
+    <string name="action_lists_create">Adicionar lista</string>
     <string name="action_lists_delete">Excluir lista</string>
     <string name="action_lists_update">Editar lista</string>
-    <string name="action_lists_title_placeholder">Nome da nova lista</string>
-    <string name="action_lists_search_users">Pesquisar entre pessoas que você segue</string>
+    <string name="action_lists_title_placeholder">Título da nova lista</string>
+    <string name="action_lists_search_users">Procure entre pessoas que você segue</string>
     <string name="action_lists_owner">Suas listas</string>
     <!-- Migration -->
-    <string name="account_moved_to">%1$s mudou-se para %2$s</string>
+    <string name="account_moved_to">%1$s foi movido para %2$s</string>
     <string name="show_boost_count">Mostrar número de boosts/favoritos</string>
-    <string name="issue_login_title">Falha ao autenticar?</string>
+    <string name="issue_login_title">Autenticação não funciona?</string>
     <string name="issue_login_message">        <b>Aqui estão algumas verificações que podem ajudar:</b>\n\n
         - Verifique se não há erros de digitação no nome da instância\n\n
         - Verifique se a sua instância não está fora do ar\n\n
@@ -492,19 +492,19 @@
     <string name="data_export_start">Esta ação pode ser demorada. Você será notificado quando ela terminar.</string>
     <string name="data_export_running">Ainda em execução, por favor, aguarde…</string>
     <string name="data_export">Exportar toots</string>
-    <string name="data_export_toots">Exportar toots de %1$s</string>
+    <string name="data_export_toots">Exportar toots para %1$s</string>
     <string name="data_export_success">%1$s toots de %2$s foram exportados.</string>
-    <string name="data_export_error">Algo deu errado enquanto exportava dados de %1$s</string>
+    <string name="data_export_error">Algo deu errado enquanto exportava dados para %1$s</string>
     <string name="data_export_error_simple">Algo deu errado ao exportar dados!</string>
     <string name="data_import_success_simple">Dados foram importados!</string>
     <string name="data_import_error_simple">Algo deu errado ao importar dados!</string>
     <!-- Proxy -->
     <string name="proxy_set">Proxy</string>
     <string name="proxy_type">Tipo</string>
-    <string name="proxy_enable">Ativar proxy?</string>
+    <string name="proxy_enable">Ativar o proxy?</string>
     <string name="poxy_host">Servidor</string>
     <string name="poxy_port">Porta</string>
-    <string name="poxy_login">Entrar</string>
+    <string name="poxy_login">Login</string>
     <string name="poxy_password">Senha</string>
     <string name="set_theme">Tema:</string>
     <string name="set_compact_mode">Modo compacto</string>
@@ -513,20 +513,20 @@
     <string name="alert_regex">Há um erro na expressão regular!</string>
     <string name="no_account_yet">Sem conta ainda?</string>
     <string name="toast_instance_unavailable">Nenhuma timeline foi encontrada nesta instância!</string>
-    <string name="delete_instance">Deixar de seguir esta instância?</string>
-    <string name="warning_delete_instance">Você vai deixar de seguir a instância %s.</string>
+    <string name="delete_instance">Remover esta instância?</string>
+    <string name="warning_delete_instance">Você vai remover %s de suas instâncias seguidas.</string>
     <string name="which_language">Traduzir em %s</string>
     <string name="crash_title">Fedilab parou :(</string>
     <string name="crash_message">Você pode me enviar por e-mail o relatório de erros. Irá me ajudar a corrigí-los :) \n\nVocê pode adicionar conteúdo adicional. Obrigado!</string>
     <string name="send_crash_report">Perguntar para enviar relatórios de erros por e-mail?</string>
     <string name="follow_instance">Seguir instância</string>
     <string name="toast_instance_already_added">Você já segue esta instância!</string>
-    <string name="toast_instance_followed">Você seguiu a instância!</string>
+    <string name="toast_instance_followed">A instância está sendo seguida!</string>
     <string name="action_partnership">Parcerias</string>
     <string name="neutral_menu_information">Informação</string>
     <string name="hide_boost">Ocultar boosts de %s</string>
     <string name="endorse">Apresentar no perfil</string>
-    <string name="hide_everything">Ocultar tudo de %s</string>
+    <string name="hide_everything">Esconder tudo de %s</string>
     <string name="show_boost">Mostrar boosts de %s</string>
     <string name="unendorse">Não apresentar no perfil</string>
     <string name="show_everything">Mostrar tudo de %s</string>
@@ -541,7 +541,7 @@
     <string name="context_home">Página Inicial</string>
     <string name="context_public">Timelines públicas</string>
     <string name="context_notification">Notificações</string>
-    <string name="context_conversation">Sequências</string>
+    <string name="context_conversation">Conversas</string>
     <string name="filter_keyword_explanations">Serão correspondidas independente de maiúsculas ou minúsculas no texto ou no alerta de conteúdo de um toot</string>
     <string name="context_drop">Apagar ao invés de ocultar</string>
     <string name="context_drop_explanations">Os toots filtrados desaparecerão irreversivelmente, mesmo se o filtro for removido mais tarde</string>
@@ -550,26 +550,26 @@
     <string name="filter_context">Contextos do filtro</string>
     <string name="filter_context_explanations">Um ou mais contextos onde o filtro deve ser aplicado</string>
     <string name="filter_expire">Expira após</string>
-    <string name="add_new_filter">Criar novo filtro</string>
+    <string name="add_new_filter">Adicionar novo filtro</string>
     <string name="action_filter_delete">Excluir filtro?</string>
     <string name="action_update_filter">Atualizar filtro</string>
     <string name="action_filter_create">Criar filtro</string>
     <string name="how_to_follow">Quem seguir</string>
     <string name="action_who_to_follow_empty_content">Não há contas listadas no momento!</string>
     <string name="follow_account">Seguir</string>
-    <string name="select_all">Selecionar tudo</string>
-    <string name="unselect_all">Desmarcar tudo</string>
-    <string name="follow_trunk">Você segue %s!</string>
+    <string name="select_all">Selecionar todos</string>
+    <string name="unselect_all">Desmarcar todos</string>
+    <string name="follow_trunk">%s está sendo seguido!</string>
     <string name="create_list_trunk">Criando a lista %s</string>
     <string name="add_account_list_trunk">Adicionar contas à lista</string>
     <string name="account_added_list_trunk">Contas adicionadas à lista</string>
     <string name="adding_account_list_trunk">Adicionando contas à lista</string>
     <string name="action_list_add">Sem listas. Você pode criar uma tocando no botão \"+\".</string>
-    <string name="action_remote_instance_add">Sem instâncias. Você pode seguir uma tocando no botão \"+\".</string>
+    <string name="action_remote_instance_add">Sem instâncias remotas. Você pode seguir uma tocando no botão \"+\".</string>
     <string name="about_trunk">Quem seguir</string>
     <string name="about_trunk_action">API Trunk</string>
-    <string name="toast_impossible_to_follow">Desculpe, é impossível seguir</string>
-    <string name="retrieve_remote_account">Carregando conta remota!</string>
+    <string name="toast_impossible_to_follow">A(s) conta(s) não pode(m) ser seguida(s)</string>
+    <string name="retrieve_remote_account">Carregando conta remota</string>
     <string name="expand_image">Expandir automaticamente mídias ocultas</string>
     <string name="set_display_follow_instance">Mostrar botão de seguir instâncias</string>
     <string name="channel_notif_follow">Novo seguidor</string>
@@ -579,48 +579,48 @@
     <string name="channel_notif_poll">Enquete terminada</string>
     <string name="channel_notif_toot">Novo toot</string>
     <string name="channel_notif_backup">Backup de Toots</string>
-    <string name="channel_notif_media">Download de mídia</string>
+    <string name="channel_notif_media">Baixar mídia</string>
     <string name="set_notif_sound">Mudar som de notificação</string>
     <string name="select_sound">Selecionar toque</string>
-    <string name="set_enable_time_slot">Ativar definição de momento</string>
+    <string name="set_enable_time_slot">Ativar intervalo de tempo</string>
     <string name="how_to_videos">Tutoriais em vídeo</string>
     <string name="retrieve_remote_conversation">Carregando sequência remota!</string>
-    <string name="no_blocked_domain">Sem instâncias bloqueadas!</string>
-    <string name="unblock_domain_confirm">Desbloquear instância</string>
-    <string name="unblock_domain_confirm_message">Tem certeza de que quer desbloquear %s?</string>
-    <string name="block_domain_confirm_message">Tem certeza de que quer bloquear %s?\n\nSeus seguidores desta instância serão removidos, e você não verá nenhum conteúdo ou notificação desta instância.</string>
-    <string name="blocked_domains">Instâncias bloqueadas</string>
-    <string name="block_domain">Bloquear instância</string>
-    <string name="toast_block_domain">Instância bloqueada!</string>
-    <string name="toast_unblock_domain">Instância desbloqueada!</string>
-    <string name="retrieve_remote_status">Carregando toot remoto!</string>
+    <string name="no_blocked_domain">Não há domínios bloqueados!</string>
+    <string name="unblock_domain_confirm">Desbloquear o domínio</string>
+    <string name="unblock_domain_confirm_message">Tem certeza que quer desbloquear %s?</string>
+    <string name="block_domain_confirm_message">Tem certeza que quer bloquear %s?</string>
+    <string name="blocked_domains">Domínios bloqueados</string>
+    <string name="block_domain">Bloquear domínio</string>
+    <string name="toast_block_domain">O domínio está bloqueado</string>
+    <string name="toast_unblock_domain">O domínio não está mais bloqueado!</string>
+    <string name="retrieve_remote_status">Carregando toot remoto</string>
     <string name="comment">Comentar</string>
     <string name="peertube_instance">Instância Peertube</string>
-    <string name="set_display_direct">Mostrar timeline de mensagens diretas</string>
+    <string name="set_display_direct">Mostrar timeline de mensagens privadas</string>
     <string name="set_keep_background_process">Manter processo em segundo plano quando o aplicativo for fechado</string>
     <string name="no_comments">Seja o primeiro a comentar o vídeo tocando no botão superior direito!</string>
     <string name="number_view_video">%s visualizações</string>
     <string name="duration_video">Duração: %s</string>
     <string name="add_remote_instance">Adicionar instância</string>
-    <string name="comment_no_allowed_peertube">Os comentários deste vídeo foram desativados!</string>
+    <string name="comment_no_allowed_peertube">Os comentários foram desabilitados neste vídeo!</string>
     <string name="pickup_resolution">Selecione uma resolução</string>
     <string name="peertube_favorites">Favoritos do Peertube</string>
     <string name="bookmark_add_peertube">O vídeo foi adicionado aos favoritos!</string>
     <string name="bookmark_remove_peertube">O vídeo foi removido dos favoritos!</string>
     <string name="bookmark_peertube_empty">Não há vídeos do Peertube em seus favoritos!</string>
     <string name="channel">Canal</string>
-    <string name="no_peertube_channels">Sem canais Peertube</string>
-    <string name="no_peertube_instances">Sem instâncias Peertube</string>
-    <string name="no_mastodon_instances">Sem instâncias Mastodon</string>
+    <string name="no_peertube_channels">Sem canais do Peertube</string>
+    <string name="no_peertube_instances">Sem instâncias do Peertube</string>
+    <string name="no_mastodon_instances">Sem instâncias do Mastodon</string>
     <string name="no_lists">Sem listas</string>
     <string name="videos">Vídeos</string>
     <string name="channels">Canais</string>
     <string name="set_display_emoji">Usar Emoji One</string>
     <string name="information">Informação</string>
-    <string name="set_display_card">Mostrar prévias em todos os toots</string>
+    <string name="set_display_card">Mostrar pré-visualizações em todos os toots</string>
     <string name="thanks_text_ux">Designer da nova UX/UI</string>
     <string name="set_old_direct_timeline">Usar a timeline direta anterior ao Mastodon 2.6</string>
-    <string name="set_display_video_preview">Mostrar prévias de vídeo</string>
+    <string name="set_display_video_preview">Mostrar pré-visualizações do vídeo</string>
     <string name="thanks_text_support">Suporte no Gitlab</string>
     <string name="action_bug_report">Relatório de erros</string>
     <string name="no_mail_client">Não há nenhum cliente de email instalado.</string>
@@ -644,7 +644,7 @@
     <string name="no_scheduled_boosts">Nenhum toot agendado para mostrar!</string>
     <string name="no_scheduled_boosts_indications"><![CDATA[Abra o menu de um toot e escolha <b>Agendar boost</b>.]]></string>
     <string name="art_menu">Timeline de Arte</string>
-    <string name="open_menu">Abrir menu</string>
+    <string name="open_menu">Abrir um menu</string>
     <string name="go_back">Voltar</string>
     <string name="app_logo">Logo do aplicativo</string>
     <string name="profile_picture">Foto do perfil</string>
@@ -654,16 +654,16 @@
     <string name="mastohost_logo">Logo do MastoHost</string>
     <string name="emoji_picker">Seletor de emoji</string>
     <string name="refresh">Atualizar</string>
-    <string name="expand_conversation">Expandir a sequência</string>
+    <string name="expand_conversation">Expandir a conversa</string>
     <string name="remove_account">Sair de uma conta</string>
-    <string name="delete_domain">Desbloquear instância</string>
+    <string name="delete_domain">Remover o domínio bloqueado</string>
     <string name="custom_emoji_picker">Seletor de emoji personalizado</string>
     <string name="play_video">Reproduzir vídeo</string>
     <string name="new_toot">Novo toot</string>
     <string name="card_view_image">Imagem do cartão</string>
     <string name="hide_media">Ocultar mídia</string>
     <string name="favicon">Favicon</string>
-    <string name="media_description">Adicionar descrição da mídia (para deficientes visuais)</string>
+    <string name="media_description">Adicionar descrição da mídia</string>
     <string-array name="filter_expire">
         <item>Nunca</item>
         <item>30 minutos</item>
@@ -694,7 +694,7 @@
     <string name="bot">Robô</string>
     <string name="pixelfed_instance">Instância Pixelfed</string>
     <string name="mastodon_instance">Instância Mastodon</string>
-    <string name="no_pixelfed_instance">Sem instância Pixelfed</string>
+    <string name="no_pixelfed_instance">Nenhuma instância Pixelfed</string>
     <string name="any_tags">Qualquer um</string>
     <string name="all_tags">Todos</string>
     <string name="none_tags">Nenhum</string>
@@ -708,10 +708,10 @@
     <string name="subscriptions">Inscrições</string>
     <string name="overview">Visão geral</string>
     <string name="trending">Destaques</string>
-    <string name="recently_added">Recentemente adicionado</string>
+    <string name="recently_added">Recentemente adicionado(a)</string>
     <string name="local">Local</string>
     <string name="upload_video">Enviar</string>
-    <string name="reply">Responder</string>
+    <string name="reply">Resposta</string>
     <string name="delete_comment">Excluir comentário</string>
     <string name="delete_comment_confirm">Tem certeza de que deseja excluir este comentário?</string>
     <string name="fullscreen">Vídeo em tela cheia</string>
@@ -724,25 +724,25 @@
     <string name="category">Categoria</string>
     <string name="language">Idioma</string>
     <string name="peertube_nsfw">Este vídeo possui conteúdo adulto ou explícito</string>
-    <string name="peertube_enable_comments">Ativar comentários do vídeo</string>
-    <string name="update_video">Atualizar vídeo</string>
+    <string name="peertube_enable_comments">Ativar comentários no vídeo</string>
+    <string name="update_video">Atualizar o vídeo</string>
     <string name="description">Descrição</string>
     <string name="toast_peertube_video_updated">O vídeo foi atualizado!</string>
     <string name="toast_cancelled">Envio cancelado!</string>
     <string name="upload_video_success">O vídeo foi enviado!</string>
-    <string name="uploading">Enviando, por favor, aguarde…</string>
+    <string name="uploading">Enviando, por favor aguarde…</string>
     <string name="video_uploaded_action">Toque aqui para editar os dados do vídeo.</string>
     <string name="delete_video">Excluir vídeo</string>
     <string name="delete_video_confirmation">Tem certeza de que deseja excluir este vídeo?</string>
-    <string name="no_video_uploaded">Sem vídeos enviados!</string>
+    <string name="no_video_uploaded">Nenhum vídeo enviado ainda!</string>
     <string name="display_nsfw_videos">Mostrar vídeos NSFW</string>
     <string name="default_channel_of">Canal %s por padrão</string>
     <string name="no_video_to_display">Sem vídeos!</string>
     <string name="add_image_to_favorite">Adicionar mídia aos favoritos</string>
-    <string name="leave_a_comment">Deixe um comentário!</string>
+    <string name="leave_a_comment">Comente</string>
     <string name="share">Compartilhar</string>
     <string name="my_pictures">Minhas imagens</string>
-    <string name="choose_schedule">Escolher como agendar</string>
+    <string name="choose_schedule">Escolher um modo de agendamento</string>
     <string name="device_schedule">Do dispositivo</string>
     <string name="server_schedule">Do servidor</string>
     <string name="toots_server">Toots (Servidor)</string>
@@ -778,7 +778,7 @@
     <string name="action_markdown">Markdown</string>
     <string name="action_logout_account">Sair da conta</string>
     <string name="set_optimize_loading">Otimizar o tempo de carregamento</string>
-    <string name="all">Tudo</string>
+    <string name="all">Todos</string>
     <string name="about_opencollective">Apoie o aplicativo</string>
     <string name="more_about_opencollective">Open Collective permite aos grupos criar rapidamente um coletivo, angariar fundos e gerí-los de forma transparente.</string>
     <string name="copy_link">Copiar link</string>
@@ -798,7 +798,7 @@
     <string name="filter_timeline_with_a_tag">Filtrar timeline com tags</string>
     <string name="no_tags">Sem tags</string>
     <string name="set_hide_delete_notification_on_tab">Ocultar o botão de excluir notificação na aba das notificações</string>
-    <string name="set_retrieve_metadata_share_from_extras">Anexar uma imagem ao compartilhar um link</string>
+    <string name="set_retrieve_metadata_share_from_extras">Recuperar os metadados se se tratar duma URL que partilha doutras aplicações</string>
     <!-- end languages -->
     <string name="poll">Enquete</string>
     <string name="polls">Enquetes</string>
@@ -810,15 +810,15 @@
     <string name="poll_invalid_choices">Você precisa de pelo menos duas opções para a enquete!</string>
     <string name="done">Feito</string>
     <string name="poll_finish_at">termina em %s</string>
-    <string name="refresh_poll">Atualizar</string>
+    <string name="refresh_poll">Atualizar enquete</string>
     <string name="vote">Votar</string>
-    <string name="poll_not_private">Uma mensagem direta não pode conter uma enquete!</string>
+    <string name="poll_not_private">Uma enquete não pode ser anexada a uma mensagem direta!</string>
     <string name="notif_poll">Uma enquete em que você votou terminou</string>
-    <string name="notif_poll_self">Uma enquete sua terminou</string>
+    <string name="notif_poll_self">Uma enquete que você publicou terminou</string>
     <string name="settings_category_notif_customize">Personalizar</string>
     <string name="settings_category_notif_categories">Categorias</string>
-    <string name="settings_category_notif_news">Novos!</string>
-    <string name="settings_category_notif_time_slot">Definição de momento para notificações</string>
+    <string name="settings_category_notif_news">Notícias</string>
+    <string name="settings_category_notif_time_slot">Intervalo de tempo para notificações</string>
     <string name="settings_category_notif_advanced">Avançado</string>
     <string name="set_display_new_badge">Mostrar etiqueta \'new\' em toots não lidos</string>
     <string name="set_display_peertube">Mostrar timeline do Peertube</string>
@@ -840,12 +840,13 @@
     <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>
+        <item quantity="one">%d votou</item>
+        <item quantity="other">%d votaram</item>
     </plurals>
     <string-array name="poll_choice_type">
-        <item>Uma opção</item>
+        <item>Única opção</item>
         <item>Múltiplas opções</item>
     </string-array>
     <string-array name="poll_duration">
@@ -859,6 +860,6 @@
     </string-array>
     <string-array name="settings_video_mode">
         <item>Webview</item>
-        <item>Stream direto</item>
+        <item>Stream direta</item>
     </string-array>
 </resources>

From 83edeefaa4a66e83a0b3ecc0dd57267489a9ec0c Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:04 +0000
Subject: [PATCH 11/47] New translations strings.xml (Polish)

---
 app/src/main/res/values-pl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 58d03d5c6..023b8caf1 100644
--- 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>

From b165625addf8d8287c882ba08bec11e89d00c891 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:08 +0000
Subject: [PATCH 12/47] New translations strings.xml (Persian)

---
 app/src/main/res/values-fa/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index a3ae3dac2..1dd77c014 100644
--- 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>

From 53b85beba36f40bf4a75e9e0f6afc9e7c0d41297 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:12 +0000
Subject: [PATCH 13/47] New translations strings.xml (Occitan)

---
 app/src/main/res/values-oc/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index c0ca09065..337528669 100644
--- 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>

From 1b4818c379817133ab433d59e9283f5b1fc4d404 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:15 +0000
Subject: [PATCH 14/47] New translations strings.xml (Norwegian)

---
 app/src/main/res/values-no/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 51dcd287d..8be1aef35 100644
--- 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>

From f0ee35eff907c0e5c378fc4a96816a5e071a5555 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:19 +0000
Subject: [PATCH 15/47] New translations strings.xml (Macedonian)

---
 app/src/main/res/values-mk/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index c0ca09065..337528669 100644
--- 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>

From 14ae3dc9152d7317e751b08469384d105f526f5c Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:24 +0000
Subject: [PATCH 16/47] New translations strings.xml (Korean)

---
 app/src/main/res/values-ko/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 2c7c925f4..73afb80eb 100644
--- 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>

From 5cbf36da62c35dba0d729e6a94fd301775ef5fb4 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:28 +0000
Subject: [PATCH 17/47] New translations strings.xml (Kabyle)

---
 app/src/main/res/values-kab/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index d231a3e2b..13a196440 100644
--- 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>

From e1622c40dde8875d263d036bdebfead2202f9e67 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:32 +0000
Subject: [PATCH 18/47] New translations strings.xml (Italian)

---
 app/src/main/res/values-it/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f572bb9b2..f5ba4b446 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -840,6 +840,7 @@
     <string name="set_sensitive_content">Segna sempre media come sensibili</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>

From 0a3ccbb6f543c6109e3e77d3d38a1df63b239f38 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:37 +0000
Subject: [PATCH 19/47] New translations strings.xml (Indonesian)

---
 app/src/main/res/values-id/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 693d97e5a..4dfe57721 100644
--- 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>

From f04d76010f83cbbab78fbc7075f651078eb2f2ca Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:41 +0000
Subject: [PATCH 20/47] New translations strings.xml (Hungarian)

---
 app/src/main/res/values-hu/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 9221e7dec..0a8132408 100644
--- 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>

From 2a71dcd5f75078df5f836c329afae4f2830302fa Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:46 +0000
Subject: [PATCH 21/47] New translations strings.xml (Japanese)

---
 app/src/main/res/values-ja/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 75365681d..020938d0f 100644
--- 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>

From 5e23f9685261e1583bbf0894b44adb9f57cab85a Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:52 +0000
Subject: [PATCH 22/47] New translations strings.xml (Hebrew)

---
 app/src/main/res/values-he/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 3ddb3a81f..3618c8bcf 100644
--- 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>

From 1636ac5ad4a67a3c903aee30a477e435347fad8c Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:29:56 +0000
Subject: [PATCH 23/47] New translations strings.xml (Chinese Simplified)

---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index eeaa1f359..985b4adf4 100644
--- 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>

From 68ccbeadf1c8974fc3c166ed5503eeb3f2583c9d Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:00 +0000
Subject: [PATCH 24/47] New translations strings.xml (Greek)

---
 app/src/main/res/values-el/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 703ce3457..b52717072 100644
--- 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>

From 12ca4d8f8766bf7eaa3847856280b44c223efc03 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:06 +0000
Subject: [PATCH 25/47] New translations strings.xml (Afrikaans)

---
 app/src/main/res/values-af/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index c0ca09065..337528669 100644
--- 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>

From 1dff6555d957717457aba54ed97cb1bbee614327 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:10 +0000
Subject: [PATCH 26/47] New translations strings.xml (Arabic)

---
 app/src/main/res/values-ar/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index c457d666e..efb0955ef 100644
--- 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>

From dee553857171351ca2aaec6689bae3901de7491f Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:14 +0000
Subject: [PATCH 27/47] New translations strings.xml (German)

---
 app/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2abb738bb..a6521221a 100644
--- 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>

From 5c1161154232a40327ef386d047cd4c6107bedcf Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:19 +0000
Subject: [PATCH 28/47] New translations strings.xml (Basque)

---
 app/src/main/res/values-eu/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 667cc2f97..808d101b1 100644
--- 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>

From e485b144d51eae2904ac27325136f1815ecd0872 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:23 +0000
Subject: [PATCH 29/47] New translations strings.xml (Catalan)

---
 app/src/main/res/values-ca/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 34dfc4676..87f05c9d6 100644
--- 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>

From 172c7920c48f62f8504276ceceda299cff1c7d43 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:28 +0000
Subject: [PATCH 30/47] New translations strings.xml (Armenian)

---
 app/src/main/res/values-hy/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index ef12ae822..e72708d50 100644
--- 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>

From 7f0bd70b00a571fc6c9a994d3508839885c86f5a Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:32 +0000
Subject: [PATCH 31/47] New translations strings.xml (Chinese Traditional)

---
 app/src/main/res/values-zh-rTW/strings.xml | 71 +++++++++++-----------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 121055daa..a71a56d18 100644
--- 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>

From fc615ac0c44b552e2a0abcc7d0364313595d51e4 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:36 +0000
Subject: [PATCH 32/47] New translations strings.xml (Danish)

---
 app/src/main/res/values-da/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index c0ca09065..337528669 100644
--- 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>

From 15e1b5678b40d54b84f6b9c53ef4352d6a775a58 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:41 +0000
Subject: [PATCH 33/47] New translations strings.xml (Dutch)

---
 app/src/main/res/values-nl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index bce355b84..b9089f08f 100644
--- 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>

From 06881807a6dc397cd1d5c06c9ec958370375cead Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:45 +0000
Subject: [PATCH 34/47] New translations strings.xml (Finnish)

---
 app/src/main/res/values-fi/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index c0ca09065..337528669 100644
--- 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>

From 65bf04a9bb00de20bc0fdb7100fccbdb8d6a2b1f Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:50 +0000
Subject: [PATCH 35/47] New translations strings.xml (French)

---
 app/src/main/res/values-fr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b9ff72c77..b57f8cfc2 100644
--- 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>

From aa21aa0768ccc23afa39127e954d292e85f8b7b9 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:55 +0000
Subject: [PATCH 36/47] New translations strings.xml (Galician)

---
 app/src/main/res/values-gl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 7148e33c8..19c2f66a2 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -841,6 +841,7 @@
     <string name="set_sensitive_content">Marcar os medios sempre como sensibles</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>

From 19d006f29611ff049568aedb62f444dcb37c374d Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:30:59 +0000
Subject: [PATCH 37/47] New translations strings.xml (Portuguese, Brazilian)

---
 app/src/main/res/values-pt/strings.xml | 248 ++++++++++++-------------
 1 file changed, 124 insertions(+), 124 deletions(-)

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 049f0dac8..0823cebd4 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -44,11 +44,11 @@
     <string name="camera">Câmera</string>
     <string name="speech_prompt">Por favor, diga algo</string>
     <string name="speech_not_supported">Desculpe! Seu dispositivo não suporta entrada por voz!</string>
-    <string name="delete_all">Remover todas</string>
+    <string name="delete_all">Excluir tudo</string>
     <string name="translate_toot">Traduzir este toot.</string>
     <string name="schedule">Agendar</string>
-    <string name="text_size">Tamanho do texto e dos ícones</string>
-    <string name="text_size_change">Mudar o tamanho atual do texto:</string>
+    <string name="text_size">Tamanho dos textos e dos ícones</string>
+    <string name="text_size_change">Mudar o tamanho atual dos textos:</string>
     <string name="icon_size_change">Mudar o tamanho atual dos ícones:</string>
     <string name="next">Próximo</string>
     <string name="previous">Anterior</string>
@@ -81,7 +81,7 @@
     <string name="blocked_menu">Usuários bloqueados</string>
     <string name="remote_follow_menu">Seguir remotamente</string>
     <string name="notifications">Notificações</string>
-    <string name="follow_request">Solicitação para seguir</string>
+    <string name="follow_request">Solicitações de seguidor</string>
     <string name="optimization">Otimização</string>
     <string name="settings">Configurações</string>
     <string name="profile">Perfil</string>
@@ -94,21 +94,21 @@
     <string name="click_to_change">Toque no caminho para mudá-lo</string>
     <string name="failed">Falhou!</string>
     <string name="scheduled_toots">Toots agendados</string>
-    <string name="disclaimer_full">As informações abaixo podem refletir o perfil do usuário incompletamente.</string>
+    <string name="disclaimer_full">As informações abaixo podem refletir incompletamente o perfil do usuário.</string>
     <string name="insert_emoji">Inserir emoji</string>
     <string name="no_emoji">O aplicativo não achou emojis personalizados no momento.</string>
     <string name="live_notif">Notificações ao vivo</string>
     <!-- Status -->
     <string name="no_status">Sem toots</string>
-    <string name="fav_added">Toot adicionado aos favoritos</string>
+    <string name="fav_added">Toot adicionado aos favoritos!</string>
     <string name="fav_removed">Toot removido dos favoritos!</string>
-    <string name="reblog_added">Toot compartilhado!</string>
-    <string name="reblog_removed">Toot descompartilhado!</string>
-    <string name="reblog_by">Compartilhado por %1$s</string>
-    <string name="favourite_add">Adicionar este toot aos favoritos?</string>
-    <string name="favourite_remove">Remover este toot dos favoritos?</string>
-    <string name="reblog_add">Compartilhar este toot?</string>
-    <string name="reblog_remove">Desfazer compartilhamento?</string>
+    <string name="reblog_added">Você deu boost!</string>
+    <string name="reblog_removed">Você desfez o boost!</string>
+    <string name="reblog_by">Boost foi dado por %1$s</string>
+    <string name="favourite_add">Favoritar toot?</string>
+    <string name="favourite_remove">Desfavoritar toot?</string>
+    <string name="reblog_add">Dar boost?</string>
+    <string name="reblog_remove">Desfazer boost?</string>
     <string name="pin_add">Fixar este toot?</string>
     <string name="pin_remove">Desafixar este toot?</string>
     <string name="more_action_1">Silenciar</string>
@@ -145,31 +145,31 @@
     <string name="bookmark_remove">Remover dos Salvos</string>
     <string name="bookmarks_empty">Sem toots salvos</string>
     <string name="status_bookmarked">Toot foi salvo!</string>
-    <string name="status_unbookmarked">Toot foi removido dos Salvos!</string>
+    <string name="status_unbookmarked">Toot foi removido do Salvos!</string>
     <!-- Date -->
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
     <!-- TOOT -->
-    <string name="toot_cw_placeholder">Alerta de conteúdo</string>
+    <string name="toot_cw_placeholder">Aviso de conteúdo</string>
     <string name="toot_placeholder">No que você está pensando?</string>
     <string name="toot_it">TOOT!</string>
     <string name="queet_it">QUEET!</string>
-    <string name="cw">cw</string>
-    <string name="toot_title">Digite um toot</string>
-    <string name="toot_title_reply">Responder um toot</string>
-    <string name="queet_title">Digite um queet</string>
-    <string name="queet_title_reply">Responder um queet</string>
+    <string name="cw">ac</string>
+    <string name="toot_title">Compor toot</string>
+    <string name="toot_title_reply">Responder toot</string>
+    <string name="queet_title">Compor queet</string>
+    <string name="queet_title_reply">Responder queet</string>
     <string name="toot_no_space">Você excedeu os 500 caracteres permitidos!</string>
     <string name="toot_select_image">Selecionar mídia</string>
-    <string name="toot_select_image_error">Ocorreu um erro enquanto ao selecionar a mídia!</string>
-    <string name="toot_delete_media">Excluir mídia?</string>
+    <string name="toot_select_image_error">Ocorreu um erro ao selecionar a mídia!</string>
+    <string name="toot_delete_media">Remover mídia?</string>
     <string name="toot_error_no_content">Toot vazio!</string>
     <string name="toot_visibility_tilte">Visibilidade do toot</string>
     <string name="toots_visibility_tilte">Visibilidade padrão dos toots: </string>
     <string name="toot_sent">Toot enviado!</string>
-    <string name="toot_reply_content_title">Você está respondendo a este toot:</string>
+    <string name="toot_reply_content_title">Você está respondendo este toot:</string>
     <string name="toot_sensitive">Conteúdo sensível?</string>
     <string-array name="toot_visibility">
         <item>Postar em timelines públicas</item>
@@ -180,7 +180,7 @@
     <string name="no_draft">Sem rascunhos!</string>
     <string name="choose_toot">Escolha um toot</string>
     <string name="choose_accounts">Escolha uma conta</string>
-    <string name="select_accounts">Selecione algumas contas</string>
+    <string name="select_accounts">Selecionar contas</string>
     <string name="remove_draft">Excluir rascunho?</string>
     <string name="show_reply">Clique no botão para mostrar toot original</string>
     <string name="upload_form_description">Descreva para os deficientes visuais</string>
@@ -193,15 +193,15 @@
     <string name="about_license_action">GNU GPL V3</string>
     <string name="about_code">Código-fonte: </string>
     <string name="about_yandex">Tradução dos toots:</string>
-    <string name="about_thekinrar">Pesquisar instâncias:</string>
+    <string name="about_thekinrar">Procure instâncias:</string>
     <string name="about_thekinrar_action">instances.social</string>
     <string name="thanks_text_logo">Designer do ícone:</string>
-    <string name="thanks_text_banner">Designer do banner:</string>
+    <string name="thanks_text_banner">Designer da capa:</string>
     <!-- Conversation -->
-    <string name="conversation">Conversa</string>
+    <string name="conversation">Sequência</string>
     <!-- Accounts -->
-    <string name="no_accounts">Sem contas</string>
-    <string name="no_follow_request">Sem solicitações de seguidores</string>
+    <string name="no_accounts">Sem conta</string>
+    <string name="no_follow_request">Sem solicitações de seguidor</string>
     <string name="status_cnt">Toots \n %1$s</string>
     <string name="following_cnt">Seguindo \n %1$s</string>
     <string name="followers_cnt">Seguidores \n %1$s</string>
@@ -210,7 +210,7 @@
     <string name="reject">Rejeitar</string>
     <!-- Scheduled toots -->
     <string name="no_scheduled_toots">Sem toots agendados!</string>
-    <string name="no_scheduled_toots_indications">Digite um toot e então toque em <b>Agendar</b> no topo do menu.</string>
+    <string name="no_scheduled_toots_indications">Componha um toot e toque em <b>Agendar</b> no topo do menu.</string>
     <string name="remove_scheduled">Excluir toot agendado?</string>
     <string name="media_count">Mídia: %d</string>
     <string name="toot_scheduled">Toot agendado!</string>
@@ -223,17 +223,17 @@
     <!-- Notifications -->
     <string name="no_notifications">Sem notificações</string>
     <string name="notif_mention">te mencionou</string>
-    <string name="notif_reblog">compartilhou seu toot</string>
+    <string name="notif_reblog">deu boost no seu toot</string>
     <string name="notif_favourite">favoritou seu toot</string>
-    <string name="notif_follow">seguiu você</string>
+    <string name="notif_follow">te seguiu</string>
     <string name="notif_pouet">Novo toot de %1$s</string>
     <plurals name="other_notifications">
         <item quantity="one">e outra %d notificação</item>
         <item quantity="other">e outras %d notificações</item>
     </plurals>
     <plurals name="other_notif_hometimeline">
-        <item quantity="one">e outro %d toot para descobrir</item>
-        <item quantity="other">e outros %d toots para descobrir</item>
+        <item quantity="one">e outro %d toot para ver</item>
+        <item quantity="other">e outros %d toots para ver</item>
     </plurals>
     <plurals name="likes">
         <item quantity="one">%d favoritou</item>
@@ -252,21 +252,21 @@
     <string name="no_internet">Sem conexão com a internet!</string>
     <string name="toast_block">Conta bloqueada!</string>
     <string name="toast_unblock">Conta desbloqueada!</string>
-    <string name="toast_mute">Conta silenciada!</string>
+    <string name="toast_mute">Silêncio ativado!</string>
     <string name="toast_unmute">Silêncio desativado!</string>
     <string name="toast_follow">Você seguiu a conta!</string>
     <string name="toast_unfollow">Você deixou de seguir a conta!</string>
-    <string name="toast_reblog">Toot compartilhado!</string>
-    <string name="toast_unreblog">Toot descompartilhado!</string>
+    <string name="toast_reblog">Você deu boost!</string>
+    <string name="toast_unreblog">Boost desfeito!</string>
     <string name="toast_favourite">Toot adicionado aos favoritos!</string>
     <string name="toast_unfavourite">Toot removido dos favoritos!</string>
     <string name="toast_report">Toot denunciado!</string>
     <string name="toast_unstatus">Toot excluído!</string>
     <string name="toast_pin">Toot fixado!</string>
     <string name="toast_unpin">Toot desafixado!</string>
-    <string name="toast_error">Oops! Ocorreu um erro!</string>
+    <string name="toast_error">Opa! Ocorreu um erro!</string>
     <string name="toast_code_error">Ocorreu um erro! A instância não retornou um código de autorização!</string>
-    <string name="toast_error_instance">O domínio da instância parece não ser válido!</string>
+    <string name="toast_error_instance">Parece que o domínio da instância não é válido!</string>
     <string name="toast_error_loading_account">Ocorreu um erro ao alternar entre as contas!</string>
     <string name="toast_error_search">Ocorreu um erro na pesquisa!</string>
     <string name="toast_error_login">Não foi possível entrar!</string>
@@ -277,13 +277,13 @@
     <string name="toast_error_translations_disabled">Tradução está desativada nas configurações</string>
     <string name="toast_toot_saved">Rascunho salvo!</string>
     <string name="toast_error_char_limit">Você tem certeza que sua instância permite esse número de caracteres? Geralmente, são 500 caracteres.</string>
-    <string name="toast_visibility_changed">Visibilidade dos toots foi mudada para a conta %1$s</string>
+    <string name="toast_visibility_changed">Visibilidade dos toots foi alterada na conta %1$s</string>
     <string name="toast_empty_search">Nome da instância e nome de exibição não podem ser vazios!</string>
     <!-- Settings -->
-    <string name="settings_title_optimisation">Otimização do carregamento</string>
-    <string name="set_toots_page">Número de toots por atualização</string>
-    <string name="set_accounts_page">Número de contas por atualização</string>
-    <string name="set_notifications_page">Número de notificações por atualização</string>
+    <string name="settings_title_optimisation">Otimização da timeline</string>
+    <string name="set_toots_page">Número de toots por vez</string>
+    <string name="set_accounts_page">Número de contas por vez</string>
+    <string name="set_notifications_page">Número de notificações por vez</string>
     <string name="set_attachment_always">Sempre</string>
     <string name="set_attachment_wifi">Wi-Fi</string>
     <string name="set_attachment_ask">Perguntar</string>
@@ -292,36 +292,36 @@
     <string name="load_attachment_spoiler">Mostrar mais…</string>
     <string name="load_attachment_spoiler_less">Mostrar menos…</string>
     <string name="load_sensitive_attachment">Conteúdo sensível</string>
-    <string name="set_display_reply">Mostrar toot anterior nas respostas</string>
+    <string name="set_display_reply">Mostrar toot anterior ao responder</string>
     <string name="set_display_local">Mostrar timeline local</string>
     <string name="set_display_global">Mostrar timeline global</string>
-    <string name="set_disable_gif">Desativar avatares GIF</string>
+    <string name="set_disable_gif">Desativar GIF</string>
     <string name="set_folder_title">Caminho: </string>
     <string name="set_auto_store_toot">Salvar rascunhos automaticamente</string>
     <string name="set_bubble_counter">Mostrar contadores</string>
     <string name="set_auto_add_media_url">Adicionar link da mídia nos toots</string>
     <string name="set_notif_follow">Notificar quando alguém te seguir</string>
     <string name="set_notif_follow_ask">Notificar quando alguém solicitar ser seu seguidor</string>
-    <string name="set_notif_follow_share">Notificar quando alguém compartilhar seus toots</string>
+    <string name="set_notif_follow_share">Notificar quando alguém der boost nos seus toots</string>
     <string name="set_notif_follow_add">Notificar quando alguém favoritar seus toots</string>
     <string name="set_notif_follow_mention">Notificar quando alguém te mencionar</string>
     <string name="set_notif_follow_poll">Notificar quando uma enquete terminar</string>
-    <string name="set_share_validation">Mostrar diálogo antes de compartilhar</string>
-    <string name="set_share_validation_fav">Mostrar diálogo antes de adicionar aos favoritos</string>
+    <string name="set_share_validation">Mostrar diálogo antes de dar boost</string>
+    <string name="set_share_validation_fav">Mostrar diálogo antes de favoritar</string>
     <string name="set_wifi_only">Notificar somente em Wi-Fi</string>
     <string name="set_notify">Notificar?</string>
     <string name="set_notif_silent">Silenciar notificações</string>
     <string name="set_night_mode">Modo noturno</string>
-    <string name="set_nsfw_timeout">Segundos para a visualização de NSFW expirar, 0 para desativar</string>
+    <string name="set_nsfw_timeout">Segundos para expirar a visualização de NSFW, 0 para desativar.</string>
     <string name="settings_title_profile">Editar perfil</string>
     <string name="settings_title_custom_sharing">Compartilhamento externo personalizado</string>
     <string name="settings_custom_sharing_url">Seu link de compartilhamento externo&#8230;</string>
-    <string name="set_profile_description">Bio…</string>
-    <string name="set_lock_account">Bloquear conta</string>
+    <string name="set_profile_description">Biografia…</string>
+    <string name="set_lock_account">Trancar conta</string>
     <string name="set_save_changes">Salvar mudanças</string>
-    <string name="set_header_picture_overlay">Escolher cabeçalho</string>
-    <string name="set_fit_preview">Ajustar visualização de imagens</string>
-    <string name="set_automatically_split_toot">Transformar toots com mais de 500 caracteres em sequências</string>
+    <string name="set_header_picture_overlay">Escolher capa</string>
+    <string name="set_fit_preview">Ajustar prévias de imagens</string>
+    <string name="set_automatically_split_toot">Transformar toots com mais de 500 caracteres em sequência</string>
     <string name="note_no_space">Você excedeu os 160 caracteres permitidos!</string>
     <string name="username_no_space">Você excedeu os 30 caracteres permitidos!</string>
     <string name="settings_time_from">Entre</string>
@@ -333,7 +333,7 @@
     <string name="embedded_browser">Usar navegador interno</string>
     <string name="custom_tabs">Abas personalizadas</string>
     <string name="use_javascript">Ativar Javascript</string>
-    <string name="expand_cw">Expandir cw automaticamente</string>
+    <string name="expand_cw">Expandir ac automaticamente</string>
     <string name="use_cookies">Permitir cookies de terceiros</string>
     <string name="settings_ui_layout">Modelo das timelines: </string>
     <string-array name="battery_profiles">
@@ -351,11 +351,11 @@
         <item>DeepL</item>
         <item>Não</item>
     </string-array>
-    <string name="your_api_key">Sua chave de API, você pode deixar em branco para Yandex</string>
+    <string name="your_api_key">Você pode deixar sua chave de API em branco para Yandex</string>
     <string-array name="settings_theme">
-        <item>Escuro</item>
-        <item>Claro</item>
-        <item>Preto</item>
+        <item>Noturno</item>
+        <item>Diurno</item>
+        <item>AMOLED</item>
     </string-array>
     <string-array name="settings_resize_picture">
         <item>Não</item>
@@ -457,7 +457,7 @@
     <string name="privacy_API_yandex_authorizations">        O aplicativo oferece a habilidade de traduzir toots usando o idioma do aparelho e a API do Yandex.\n
         Yandex tem a sua própria política de privacidade, que pode ser lida aqui: https://yandex.ru/legal/confidential/?lang=en
     </string>
-    <string name="thanks_text">        Agradecimentos à Stéphane pelo logo.
+    <string name="thanks_text">        Agradecimentos a Stéphane pela logo.
     </string>
     <string name="thanks_text_dev">        Agradecimentos aos:
     </string>
@@ -471,16 +471,16 @@
     <string name="action_lists_empty_content">Não há nada nesta lista ainda. Quando membros desta lista postarem novos toots, eles aparecerão aqui.</string>
     <string name="action_lists_add_to">Adicionar à lista</string>
     <string name="action_lists_remove_from">Remover da lista</string>
-    <string name="action_lists_create">Adicionar lista</string>
+    <string name="action_lists_create">Criar lista</string>
     <string name="action_lists_delete">Excluir lista</string>
     <string name="action_lists_update">Editar lista</string>
-    <string name="action_lists_title_placeholder">Título da nova lista</string>
-    <string name="action_lists_search_users">Procure entre pessoas que você segue</string>
+    <string name="action_lists_title_placeholder">Nome da nova lista</string>
+    <string name="action_lists_search_users">Pesquisar entre pessoas que você segue</string>
     <string name="action_lists_owner">Suas listas</string>
     <!-- Migration -->
-    <string name="account_moved_to">%1$s foi movido para %2$s</string>
+    <string name="account_moved_to">%1$s mudou-se para %2$s</string>
     <string name="show_boost_count">Mostrar número de boosts/favoritos</string>
-    <string name="issue_login_title">Autenticação não funciona?</string>
+    <string name="issue_login_title">Falha ao autenticar?</string>
     <string name="issue_login_message">        <b>Aqui estão algumas verificações que podem ajudar:</b>\n\n
         - Verifique se não há erros de digitação no nome da instância\n\n
         - Verifique se a sua instância não está fora do ar\n\n
@@ -492,19 +492,19 @@
     <string name="data_export_start">Esta ação pode ser demorada. Você será notificado quando ela terminar.</string>
     <string name="data_export_running">Ainda em execução, por favor, aguarde…</string>
     <string name="data_export">Exportar toots</string>
-    <string name="data_export_toots">Exportar toots para %1$s</string>
+    <string name="data_export_toots">Exportar toots de %1$s</string>
     <string name="data_export_success">%1$s toots de %2$s foram exportados.</string>
-    <string name="data_export_error">Algo deu errado enquanto exportava dados para %1$s</string>
+    <string name="data_export_error">Algo deu errado enquanto exportava dados de %1$s</string>
     <string name="data_export_error_simple">Algo deu errado ao exportar dados!</string>
     <string name="data_import_success_simple">Dados foram importados!</string>
     <string name="data_import_error_simple">Algo deu errado ao importar dados!</string>
     <!-- Proxy -->
     <string name="proxy_set">Proxy</string>
     <string name="proxy_type">Tipo</string>
-    <string name="proxy_enable">Ativar o proxy?</string>
+    <string name="proxy_enable">Ativar proxy?</string>
     <string name="poxy_host">Servidor</string>
     <string name="poxy_port">Porta</string>
-    <string name="poxy_login">Login</string>
+    <string name="poxy_login">Entrar</string>
     <string name="poxy_password">Senha</string>
     <string name="set_theme">Tema:</string>
     <string name="set_compact_mode">Modo compacto</string>
@@ -513,20 +513,20 @@
     <string name="alert_regex">Há um erro na expressão regular!</string>
     <string name="no_account_yet">Sem conta ainda?</string>
     <string name="toast_instance_unavailable">Nenhuma timeline foi encontrada nesta instância!</string>
-    <string name="delete_instance">Remover esta instância?</string>
-    <string name="warning_delete_instance">Você vai remover %s de suas instâncias seguidas.</string>
+    <string name="delete_instance">Deixar de seguir esta instância?</string>
+    <string name="warning_delete_instance">Você vai deixar de seguir a instância %s.</string>
     <string name="which_language">Traduzir em %s</string>
     <string name="crash_title">Fedilab parou :(</string>
     <string name="crash_message">Você pode me enviar por e-mail o relatório de erros. Irá me ajudar a corrigí-los :) \n\nVocê pode adicionar conteúdo adicional. Obrigado!</string>
     <string name="send_crash_report">Perguntar para enviar relatórios de erros por e-mail?</string>
     <string name="follow_instance">Seguir instância</string>
     <string name="toast_instance_already_added">Você já segue esta instância!</string>
-    <string name="toast_instance_followed">A instância está sendo seguida!</string>
+    <string name="toast_instance_followed">Você seguiu a instância!</string>
     <string name="action_partnership">Parcerias</string>
     <string name="neutral_menu_information">Informação</string>
     <string name="hide_boost">Ocultar boosts de %s</string>
     <string name="endorse">Apresentar no perfil</string>
-    <string name="hide_everything">Esconder tudo de %s</string>
+    <string name="hide_everything">Ocultar tudo de %s</string>
     <string name="show_boost">Mostrar boosts de %s</string>
     <string name="unendorse">Não apresentar no perfil</string>
     <string name="show_everything">Mostrar tudo de %s</string>
@@ -541,7 +541,7 @@
     <string name="context_home">Página Inicial</string>
     <string name="context_public">Timelines públicas</string>
     <string name="context_notification">Notificações</string>
-    <string name="context_conversation">Conversas</string>
+    <string name="context_conversation">Sequências</string>
     <string name="filter_keyword_explanations">Serão correspondidas independente de maiúsculas ou minúsculas no texto ou no alerta de conteúdo de um toot</string>
     <string name="context_drop">Apagar ao invés de ocultar</string>
     <string name="context_drop_explanations">Os toots filtrados desaparecerão irreversivelmente, mesmo se o filtro for removido mais tarde</string>
@@ -550,26 +550,26 @@
     <string name="filter_context">Contextos do filtro</string>
     <string name="filter_context_explanations">Um ou mais contextos onde o filtro deve ser aplicado</string>
     <string name="filter_expire">Expira após</string>
-    <string name="add_new_filter">Adicionar novo filtro</string>
+    <string name="add_new_filter">Criar novo filtro</string>
     <string name="action_filter_delete">Excluir filtro?</string>
     <string name="action_update_filter">Atualizar filtro</string>
     <string name="action_filter_create">Criar filtro</string>
     <string name="how_to_follow">Quem seguir</string>
     <string name="action_who_to_follow_empty_content">Não há contas listadas no momento!</string>
     <string name="follow_account">Seguir</string>
-    <string name="select_all">Selecionar todos</string>
-    <string name="unselect_all">Desmarcar todos</string>
-    <string name="follow_trunk">%s está sendo seguido!</string>
+    <string name="select_all">Selecionar tudo</string>
+    <string name="unselect_all">Desmarcar tudo</string>
+    <string name="follow_trunk">Você segue %s!</string>
     <string name="create_list_trunk">Criando a lista %s</string>
     <string name="add_account_list_trunk">Adicionar contas à lista</string>
     <string name="account_added_list_trunk">Contas adicionadas à lista</string>
     <string name="adding_account_list_trunk">Adicionando contas à lista</string>
     <string name="action_list_add">Sem listas. Você pode criar uma tocando no botão \"+\".</string>
-    <string name="action_remote_instance_add">Sem instâncias remotas. Você pode seguir uma tocando no botão \"+\".</string>
+    <string name="action_remote_instance_add">Sem instâncias. Você pode seguir uma tocando no botão \"+\".</string>
     <string name="about_trunk">Quem seguir</string>
     <string name="about_trunk_action">API Trunk</string>
-    <string name="toast_impossible_to_follow">A(s) conta(s) não pode(m) ser seguida(s)</string>
-    <string name="retrieve_remote_account">Carregando conta remota</string>
+    <string name="toast_impossible_to_follow">Desculpe, é impossível seguir</string>
+    <string name="retrieve_remote_account">Carregando conta remota!</string>
     <string name="expand_image">Expandir automaticamente mídias ocultas</string>
     <string name="set_display_follow_instance">Mostrar botão de seguir instâncias</string>
     <string name="channel_notif_follow">Novo seguidor</string>
@@ -579,48 +579,48 @@
     <string name="channel_notif_poll">Enquete terminada</string>
     <string name="channel_notif_toot">Novo toot</string>
     <string name="channel_notif_backup">Backup de Toots</string>
-    <string name="channel_notif_media">Baixar mídia</string>
+    <string name="channel_notif_media">Download de mídia</string>
     <string name="set_notif_sound">Mudar som de notificação</string>
     <string name="select_sound">Selecionar toque</string>
-    <string name="set_enable_time_slot">Ativar intervalo de tempo</string>
+    <string name="set_enable_time_slot">Ativar definição de momento</string>
     <string name="how_to_videos">Tutoriais em vídeo</string>
     <string name="retrieve_remote_conversation">Carregando sequência remota!</string>
-    <string name="no_blocked_domain">Não há domínios bloqueados!</string>
-    <string name="unblock_domain_confirm">Desbloquear o domínio</string>
-    <string name="unblock_domain_confirm_message">Tem certeza que quer desbloquear %s?</string>
-    <string name="block_domain_confirm_message">Tem certeza que quer bloquear %s?</string>
-    <string name="blocked_domains">Domínios bloqueados</string>
-    <string name="block_domain">Bloquear domínio</string>
-    <string name="toast_block_domain">O domínio está bloqueado</string>
-    <string name="toast_unblock_domain">O domínio não está mais bloqueado!</string>
-    <string name="retrieve_remote_status">Carregando toot remoto</string>
+    <string name="no_blocked_domain">Sem instâncias bloqueadas!</string>
+    <string name="unblock_domain_confirm">Desbloquear instância</string>
+    <string name="unblock_domain_confirm_message">Tem certeza de que quer desbloquear %s?</string>
+    <string name="block_domain_confirm_message">Tem certeza de que quer bloquear %s?\n\nSeus seguidores desta instância serão removidos, e você não verá nenhum conteúdo ou notificação desta instância.</string>
+    <string name="blocked_domains">Instâncias bloqueadas</string>
+    <string name="block_domain">Bloquear instância</string>
+    <string name="toast_block_domain">Instância bloqueada!</string>
+    <string name="toast_unblock_domain">Instância desbloqueada!</string>
+    <string name="retrieve_remote_status">Carregando toot remoto!</string>
     <string name="comment">Comentar</string>
     <string name="peertube_instance">Instância Peertube</string>
-    <string name="set_display_direct">Mostrar timeline de mensagens privadas</string>
+    <string name="set_display_direct">Mostrar timeline de mensagens diretas</string>
     <string name="set_keep_background_process">Manter processo em segundo plano quando o aplicativo for fechado</string>
     <string name="no_comments">Seja o primeiro a comentar o vídeo tocando no botão superior direito!</string>
     <string name="number_view_video">%s visualizações</string>
     <string name="duration_video">Duração: %s</string>
     <string name="add_remote_instance">Adicionar instância</string>
-    <string name="comment_no_allowed_peertube">Os comentários foram desabilitados neste vídeo!</string>
+    <string name="comment_no_allowed_peertube">Os comentários deste vídeo foram desativados!</string>
     <string name="pickup_resolution">Selecione uma resolução</string>
     <string name="peertube_favorites">Favoritos do Peertube</string>
     <string name="bookmark_add_peertube">O vídeo foi adicionado aos favoritos!</string>
     <string name="bookmark_remove_peertube">O vídeo foi removido dos favoritos!</string>
     <string name="bookmark_peertube_empty">Não há vídeos do Peertube em seus favoritos!</string>
     <string name="channel">Canal</string>
-    <string name="no_peertube_channels">Sem canais do Peertube</string>
-    <string name="no_peertube_instances">Sem instâncias do Peertube</string>
-    <string name="no_mastodon_instances">Sem instâncias do Mastodon</string>
+    <string name="no_peertube_channels">Sem canais Peertube</string>
+    <string name="no_peertube_instances">Sem instâncias Peertube</string>
+    <string name="no_mastodon_instances">Sem instâncias Mastodon</string>
     <string name="no_lists">Sem listas</string>
     <string name="videos">Vídeos</string>
     <string name="channels">Canais</string>
     <string name="set_display_emoji">Usar Emoji One</string>
     <string name="information">Informação</string>
-    <string name="set_display_card">Mostrar pré-visualizações em todos os toots</string>
+    <string name="set_display_card">Mostrar prévias em todos os toots</string>
     <string name="thanks_text_ux">Designer da nova UX/UI</string>
     <string name="set_old_direct_timeline">Usar a timeline direta anterior ao Mastodon 2.6</string>
-    <string name="set_display_video_preview">Mostrar pré-visualizações do vídeo</string>
+    <string name="set_display_video_preview">Mostrar prévias de vídeo</string>
     <string name="thanks_text_support">Suporte no Gitlab</string>
     <string name="action_bug_report">Relatório de erros</string>
     <string name="no_mail_client">Não há nenhum cliente de email instalado.</string>
@@ -644,7 +644,7 @@
     <string name="no_scheduled_boosts">Nenhum toot agendado para mostrar!</string>
     <string name="no_scheduled_boosts_indications"><![CDATA[Abra o menu de um toot e escolha <b>Agendar boost</b>.]]></string>
     <string name="art_menu">Timeline de Arte</string>
-    <string name="open_menu">Abrir um menu</string>
+    <string name="open_menu">Abrir menu</string>
     <string name="go_back">Voltar</string>
     <string name="app_logo">Logo do aplicativo</string>
     <string name="profile_picture">Foto do perfil</string>
@@ -654,16 +654,16 @@
     <string name="mastohost_logo">Logo do MastoHost</string>
     <string name="emoji_picker">Seletor de emoji</string>
     <string name="refresh">Atualizar</string>
-    <string name="expand_conversation">Expandir a conversa</string>
+    <string name="expand_conversation">Expandir a sequência</string>
     <string name="remove_account">Sair de uma conta</string>
-    <string name="delete_domain">Remover o domínio bloqueado</string>
+    <string name="delete_domain">Desbloquear instância</string>
     <string name="custom_emoji_picker">Seletor de emoji personalizado</string>
     <string name="play_video">Reproduzir vídeo</string>
     <string name="new_toot">Novo toot</string>
     <string name="card_view_image">Imagem do cartão</string>
     <string name="hide_media">Ocultar mídia</string>
     <string name="favicon">Favicon</string>
-    <string name="media_description">Adicionar descrição da mídia</string>
+    <string name="media_description">Adicionar descrição da mídia (para deficientes visuais)</string>
     <string-array name="filter_expire">
         <item>Nunca</item>
         <item>30 minutos</item>
@@ -694,7 +694,7 @@
     <string name="bot">Robô</string>
     <string name="pixelfed_instance">Instância Pixelfed</string>
     <string name="mastodon_instance">Instância Mastodon</string>
-    <string name="no_pixelfed_instance">Nenhuma instância Pixelfed</string>
+    <string name="no_pixelfed_instance">Sem instância Pixelfed</string>
     <string name="any_tags">Qualquer um</string>
     <string name="all_tags">Todos</string>
     <string name="none_tags">Nenhum</string>
@@ -708,10 +708,10 @@
     <string name="subscriptions">Inscrições</string>
     <string name="overview">Visão geral</string>
     <string name="trending">Destaques</string>
-    <string name="recently_added">Recentemente adicionado(a)</string>
+    <string name="recently_added">Recentemente adicionado</string>
     <string name="local">Local</string>
     <string name="upload_video">Enviar</string>
-    <string name="reply">Resposta</string>
+    <string name="reply">Responder</string>
     <string name="delete_comment">Excluir comentário</string>
     <string name="delete_comment_confirm">Tem certeza de que deseja excluir este comentário?</string>
     <string name="fullscreen">Vídeo em tela cheia</string>
@@ -724,25 +724,25 @@
     <string name="category">Categoria</string>
     <string name="language">Idioma</string>
     <string name="peertube_nsfw">Este vídeo possui conteúdo adulto ou explícito</string>
-    <string name="peertube_enable_comments">Ativar comentários no vídeo</string>
-    <string name="update_video">Atualizar o vídeo</string>
+    <string name="peertube_enable_comments">Ativar comentários do vídeo</string>
+    <string name="update_video">Atualizar vídeo</string>
     <string name="description">Descrição</string>
     <string name="toast_peertube_video_updated">O vídeo foi atualizado!</string>
     <string name="toast_cancelled">Envio cancelado!</string>
     <string name="upload_video_success">O vídeo foi enviado!</string>
-    <string name="uploading">Enviando, por favor aguarde…</string>
+    <string name="uploading">Enviando, por favor, aguarde…</string>
     <string name="video_uploaded_action">Toque aqui para editar os dados do vídeo.</string>
     <string name="delete_video">Excluir vídeo</string>
     <string name="delete_video_confirmation">Tem certeza de que deseja excluir este vídeo?</string>
-    <string name="no_video_uploaded">Nenhum vídeo enviado ainda!</string>
+    <string name="no_video_uploaded">Sem vídeos enviados!</string>
     <string name="display_nsfw_videos">Mostrar vídeos NSFW</string>
     <string name="default_channel_of">Canal %s por padrão</string>
     <string name="no_video_to_display">Sem vídeos!</string>
     <string name="add_image_to_favorite">Adicionar mídia aos favoritos</string>
-    <string name="leave_a_comment">Comente</string>
+    <string name="leave_a_comment">Deixe um comentário!</string>
     <string name="share">Compartilhar</string>
     <string name="my_pictures">Minhas imagens</string>
-    <string name="choose_schedule">Escolher um modo de agendamento</string>
+    <string name="choose_schedule">Escolher como agendar</string>
     <string name="device_schedule">Do dispositivo</string>
     <string name="server_schedule">Do servidor</string>
     <string name="toots_server">Toots (Servidor)</string>
@@ -778,7 +778,7 @@
     <string name="action_markdown">Markdown</string>
     <string name="action_logout_account">Sair da conta</string>
     <string name="set_optimize_loading">Otimizar o tempo de carregamento</string>
-    <string name="all">Todos</string>
+    <string name="all">Tudo</string>
     <string name="about_opencollective">Apoie o aplicativo</string>
     <string name="more_about_opencollective">Open Collective permite aos grupos criar rapidamente um coletivo, angariar fundos e gerí-los de forma transparente.</string>
     <string name="copy_link">Copiar link</string>
@@ -798,7 +798,7 @@
     <string name="filter_timeline_with_a_tag">Filtrar timeline com tags</string>
     <string name="no_tags">Sem tags</string>
     <string name="set_hide_delete_notification_on_tab">Ocultar o botão de excluir notificação na aba das notificações</string>
-    <string name="set_retrieve_metadata_share_from_extras">Recuperar os metadados se se tratar duma URL que partilha doutras aplicações</string>
+    <string name="set_retrieve_metadata_share_from_extras">Anexar uma imagem ao compartilhar um link</string>
     <!-- end languages -->
     <string name="poll">Enquete</string>
     <string name="polls">Enquetes</string>
@@ -810,15 +810,15 @@
     <string name="poll_invalid_choices">Você precisa de pelo menos duas opções para a enquete!</string>
     <string name="done">Feito</string>
     <string name="poll_finish_at">termina em %s</string>
-    <string name="refresh_poll">Atualizar enquete</string>
+    <string name="refresh_poll">Atualizar</string>
     <string name="vote">Votar</string>
-    <string name="poll_not_private">Uma enquete não pode ser anexada a uma mensagem direta!</string>
+    <string name="poll_not_private">Uma mensagem direta não pode conter uma enquete!</string>
     <string name="notif_poll">Uma enquete em que você votou terminou</string>
-    <string name="notif_poll_self">Uma enquete que você publicou terminou</string>
+    <string name="notif_poll_self">Uma enquete sua terminou</string>
     <string name="settings_category_notif_customize">Personalizar</string>
     <string name="settings_category_notif_categories">Categorias</string>
-    <string name="settings_category_notif_news">Notícias</string>
-    <string name="settings_category_notif_time_slot">Intervalo de tempo para notificações</string>
+    <string name="settings_category_notif_news">Novos!</string>
+    <string name="settings_category_notif_time_slot">Definição de momento para notificações</string>
     <string name="settings_category_notif_advanced">Avançado</string>
     <string name="set_display_new_badge">Mostrar etiqueta \'new\' em toots não lidos</string>
     <string name="set_display_peertube">Mostrar timeline do Peertube</string>
@@ -842,11 +842,11 @@
     <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 votou</item>
-        <item quantity="other">%d votaram</item>
+        <item quantity="one">%d voto</item>
+        <item quantity="other">%d votos</item>
     </plurals>
     <string-array name="poll_choice_type">
-        <item>Única opção</item>
+        <item>Uma opção</item>
         <item>Múltiplas opções</item>
     </string-array>
     <string-array name="poll_duration">
@@ -860,6 +860,6 @@
     </string-array>
     <string-array name="settings_video_mode">
         <item>Webview</item>
-        <item>Stream direta</item>
+        <item>Stream direto</item>
     </string-array>
 </resources>

From c81b005465c85d04ebe807f1115c9987da6a1bdf Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:31:03 +0000
Subject: [PATCH 38/47] New translations strings.xml (Swedish)

---
 app/src/main/res/values-sv/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 4274f6709..a3a11dfe9 100644
--- 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>

From bbedabe6aae520f0098be3c1a823f256bf93d390 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:31:08 +0000
Subject: [PATCH 39/47] New translations strings.xml (Sinhala)

---
 app/src/main/res/values-si/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index e98e06b56..513d032c1 100644
--- 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>

From 8daa4905df6b70d157526094b4d0d3ef7ca5ab09 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:31:12 +0000
Subject: [PATCH 40/47] New translations strings.xml (Slovenian)

---
 app/src/main/res/values-sl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 4ec87499a..5080a0362 100644
--- 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>

From 9813088346da24fcbdae5f904842b727e85cb68e Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:31:16 +0000
Subject: [PATCH 41/47] New translations strings.xml (Spanish)

---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 109b8ef98..6380b6ef5 100644
--- 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>

From 996203cc38564d0837bf06c5eb5352ac1ef7ebf1 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:31:22 +0000
Subject: [PATCH 42/47] New translations strings.xml (Turkish)

---
 app/src/main/res/values-tr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1474f0d85..7a45c24fe 100644
--- 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>

From e41eb3a26726a0df29e12198f985c4c013e56f08 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:31:28 +0000
Subject: [PATCH 43/47] New translations strings.xml (Ukrainian)

---
 app/src/main/res/values-uk/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index e3d6d3bc3..e895d881a 100644
--- 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>

From 09e8e1817433efebdbf4cdf77462492585d62a5b Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:31:32 +0000
Subject: [PATCH 44/47] New translations strings.xml (Vietnamese)

---
 app/src/main/res/values-vi/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 88bdf64c6..150144fab 100644
--- 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>

From 5856ca725348baaffa02b597eb782c6b6dafd24e Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:31:37 +0000
Subject: [PATCH 45/47] New translations strings.xml (Welsh)

---
 app/src/main/res/values-cy/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 453ac83fa..bf2e8c114 100644
--- 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>

From 68648fed3256eac1629b5bcb7d553b4e5f9e347c Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 16:31:42 +0000
Subject: [PATCH 46/47] New translations strings.xml (Lombard)

---
 app/src/main/res/values-lmo/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-lmo/strings.xml b/app/src/main/res/values-lmo/strings.xml
index c0ca09065..337528669 100644
--- 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>

From 71148394189fcfbc63d7c97e3ebdf41157bfaa27 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Mon, 13 May 2019 19:38:48 +0200
Subject: [PATCH 47/47] Fix a crash

---
 app/build.gradle                                            | 4 ++--
 .../etalab/mastodon/fragments/DisplayStatusFragment.java    | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 58697fcba..112dc0b80 100644
--- 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
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
index d05582cdb..822c5893d 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
@@ -931,8 +931,10 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
             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) {