Merge branch 'develop'

12 files changed, 85 insertions, 90 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 2f3e86741..c0c2473ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "fr.gouv.etalab.mastodon"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 257
-        versionName "1.80.0"
+        versionCode 258
+        versionName "1.80.1"
         multiDexEnabled true
     }
     dexOptions {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
index 7b2c50505..944126670 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
@@ -569,8 +569,10 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
                                 items.add(bar);
                             }
                         }
-                        holder.choices.init(context).hasAnimation(true).removeAll();
-                        holder.choices.init(context).hasAnimation(true).addAll(items).build();
+                        holder.rated.removeAllViews();
+                        HorizontalBar horizontalBar = new HorizontalBar(context);
+                        horizontalBar.hasAnimation(true).addAll(items).build();
+                        holder.rated.addView(horizontalBar);
                     }else {
                         if( poll.isMultiple()){
                             if((holder.multiple_choice).getChildCount() > 0)
@@ -1347,7 +1349,6 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
         //Poll
         LinearLayout poll_container, single_choice, multiple_choice, rated;
         RadioGroup radio_group;
-        HorizontalBar choices;
         TextView number_votes, remaining_time;
         Button submit_vote, refresh_poll;
 
@@ -1399,7 +1400,6 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
             multiple_choice = itemView.findViewById(R.id.multiple_choice);
             rated = itemView.findViewById(R.id.rated);
             radio_group = itemView.findViewById(R.id.radio_group);
-            choices = itemView.findViewById(R.id.choices);
             number_votes = itemView.findViewById(R.id.number_votes);
             remaining_time = itemView.findViewById(R.id.remaining_time);
             submit_vote = itemView.findViewById(R.id.submit_vote);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index c9200e7b4..ac84a4a0c 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -356,7 +356,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         LinearLayout poll_container, single_choice, multiple_choice, rated;
         RadioGroup radio_group;
 
-        HorizontalBar choices;
         TextView number_votes, remaining_time;
         Button submit_vote, refresh_poll;
 
@@ -453,7 +452,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             multiple_choice = itemView.findViewById(R.id.multiple_choice);
             rated = itemView.findViewById(R.id.rated);
             radio_group = itemView.findViewById(R.id.radio_group);
-            choices = itemView.findViewById(R.id.choices);
             number_votes = itemView.findViewById(R.id.number_votes);
             remaining_time = itemView.findViewById(R.id.remaining_time);
             submit_vote = itemView.findViewById(R.id.submit_vote);
@@ -557,15 +555,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     || (status.getReblog() != null && status.getReblog().getPoll() != null && status.getReblog().getPoll().getOptionsList() != null)
                 ){
                     Poll poll;
-                    int choiceCount;
                     if( status.getReblog() != null) {
                         poll = status.getReblog().getPoll();
-                        choiceCount = status.getReblog().getPoll().getOptionsList().size();
                     }else {
                         poll = status.getPoll();
-                        choiceCount = status.getPoll().getOptionsList().size();
                     }
-
                     if( poll.isVoted() || poll.isExpired()){
                         holder.rated.setVisibility(View.VISIBLE);
                         List<BarItem> items = new ArrayList<>();
@@ -592,8 +586,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                 items.add(bar);
                             }
                         }
-                        holder.choices.init(context).hasAnimation(true).removeAll();
-                        holder.choices.init(context).hasAnimation(true).addAll(items).build();
+                        holder.rated.removeAllViews();
+                        HorizontalBar horizontalBar = new HorizontalBar(context);
+                        horizontalBar.hasAnimation(true).addAll(items).build();
+                        holder.rated.addView(horizontalBar);
                     }else {
                         if( poll.isMultiple()){
 
@@ -1331,7 +1327,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             List<ManageTimelines> timelines = new TimelinesDAO(context, db).getDisplayedTimelines();
                             for(ManageTimelines tl: timelines) {
                                 if( tl.getType() == ManageTimelines.Type.HOME) {
-                                    FragmentTransaction fragTransaction = ((MainActivity)context).getSupportFragmentManager().beginTransaction();
                                     DisplayStatusFragment homeFragment = (DisplayStatusFragment) mPageReferenceMap.get(tl.getPosition());
                                     if (homeFragment != null)
                                         homeFragment.fetchMore(status.getId());
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFiltersFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFiltersFragment.java
index 1982d5530..ffac13abb 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFiltersFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFiltersFragment.java
@@ -56,6 +56,7 @@ import fr.gouv.etalab.mastodon.interfaces.OnFilterActionInterface;
 import fr.gouv.etalab.mastodon.sqlite.Sqlite;
 import fr.gouv.etalab.mastodon.sqlite.TimelinesDAO;
 
+import static fr.gouv.etalab.mastodon.activities.BaseMainActivity.mPageReferenceMap;
 import static fr.gouv.etalab.mastodon.sqlite.Sqlite.DB_NAME;
 
 
@@ -266,9 +267,9 @@ public class DisplayFiltersFragment extends Fragment implements OnFilterActionIn
         List<ManageTimelines> timelines = new TimelinesDAO(context, db).getDisplayedTimelines();
         for(ManageTimelines tl: timelines) {
             if( tl.getType() == ManageTimelines.Type.HOME || tl.getType() == ManageTimelines.Type.LOCAL || tl.getType() == ManageTimelines.Type.PUBLIC) {
-                DisplayStatusFragment homeFragment = (DisplayStatusFragment) ((MainActivity) context).getSupportFragmentManager().getFragments().get(tl.getPosition());
-                if (homeFragment != null)
-                    homeFragment.refreshFilter();
+                DisplayStatusFragment displayStatusFragment = (DisplayStatusFragment) mPageReferenceMap.get(tl.getPosition());
+                if (displayStatusFragment != null)
+                    displayStatusFragment.refreshFilter();
             }
         }
 
diff --git a/app/src/main/res/layout/layout_poll.xml b/app/src/main/res/layout/layout_poll.xml
index a2d51e0da..91e475278 100644
--- a/app/src/main/res/layout/layout_poll.xml
+++ b/app/src/main/res/layout/layout_poll.xml
@@ -54,10 +54,6 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-        <br.com.felix.horizontalbargraph.HorizontalBar
-            android:id="@+id/choices"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e19d1ba7f..00c7a34cc 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -289,7 +289,7 @@
     <string name="nothing_to_do">لا يمكن اتخاذ أي إجراء</string>
     <string name="toast_saved">تم حفظ الصورة بنجاح!</string>
     <string name="toast_error_translate">وقع خطاء أثناء عملية الترجمة!</string>
-    <string name="toast_error_translations_disabled">Translations are disabled in settings</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_visibility_changed">لقد تم تغيير نمط عرض التبويقات على الحساب %1$s</string>
@@ -835,11 +835,11 @@
     <string name="move_timeline">نقل الخيط الزمني</string>
     <string name="hide_timeline">إخفاء الخيط الزمني</string>
     <string name="reorder_timelines">إعادة ترتيب الخيوط الزمنية</string>
-    <string name="undo">Undo</string>
+    <string name="undo">إلغاء</string>
     <string name="visible_tabs_needed">You need to keep two visible tabs!</string>
-    <string name="action_reorder_timeline">Reorder timelines</string>
+    <string name="action_reorder_timeline">إعادة ترتيب الخيوط الزمنية</string>
     <string name="warning_list_deletion">Use the lists entry for deleting this list!</string>
-    <string name="warning_main_timeline">Main timelines can only be hidden!</string>
+    <string name="warning_main_timeline">الخيوط الرئيسية يمكن فقط إخفاءها!</string>
     <string name="action_bbcode">BBCode</string>
     <plurals name="number_of_vote">
         <item quantity="zero">%d votes</item>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 606563af5..cd7c82c2a 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -273,7 +273,7 @@
     <string name="nothing_to_do">No es pot endegar cap acció</string>
     <string name="toast_saved">El mèdia s\'ha guardat!</string>
     <string name="toast_error_translate">Hi ha hagut un error durant la traducció!</string>
-    <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
+    <string name="toast_error_translations_disabled">Opció de traducció deshabilitada</string>
     <string name="toast_toot_saved">S\'ha desat l\'esborrany!</string>
     <string name="toast_error_char_limit">Estàs segur que aquesta instància permet tants caràcters? El valor usual s\'aproxima a 500 caràcters.</string>
     <string name="toast_visibility_changed">S\'ha canviat la visibilitat dels toots d\'aquest compte %1$s</string>
@@ -798,26 +798,26 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="poll_finish_at">acaba a %s</string>
     <string name="refresh_poll">Actualitza l\'enquesta</string>
     <string name="vote">Vota</string>
-    <string name="poll_not_private">A poll cannot be attached to a direct message!</string>
+    <string name="poll_not_private">No es pot adjuntar enquestes a un missatge directe!</string>
     <string name="notif_poll">S\'ha acabat una enquesta en què havies participat</string>
-    <string name="settings_category_notif_customize">Customize</string>
+    <string name="settings_category_notif_customize">Personalitza</string>
     <string name="settings_category_notif_categories">Categories</string>
-    <string name="settings_category_notif_news">News</string>
-    <string name="settings_category_notif_time_slot">Time slot</string>
-    <string name="settings_category_notif_advanced">Advanced</string>
-    <string name="set_display_new_badge">Display \'new\' badge on unread toots</string>
-    <string name="set_display_peertube">Display Peertube timeline</string>
-    <string name="peertube_menu">Peertube</string>
-    <string name="hide_tab">Hide the tab</string>
-    <string name="move_timeline">Move timeline</string>
-    <string name="hide_timeline">Hide timeline</string>
-    <string name="reorder_timelines">Reorder timelines</string>
-    <string name="undo">Undo</string>
-    <string name="visible_tabs_needed">You need to keep two visible tabs!</string>
-    <string name="action_reorder_timeline">Reorder timelines</string>
-    <string name="warning_list_deletion">Use the lists entry for deleting this list!</string>
-    <string name="warning_main_timeline">Main timelines can only be hidden!</string>
-    <string name="action_bbcode">BBCode</string>
+    <string name="settings_category_notif_news">Notícies</string>
+    <string name="settings_category_notif_time_slot">Franja horària</string>
+    <string name="settings_category_notif_advanced">Avançat</string>
+    <string name="set_display_new_badge">Mostra el senyal \'nou\' en brams no llegits</string>
+    <string name="set_display_peertube">Mostra pissarra del Peertube</string>
+    <string name="peertube_menu">Canal de paers</string>
+    <string name="hide_tab">Amaga la pestanya</string>
+    <string name="move_timeline">Mou la pissarra</string>
+    <string name="hide_timeline">Amaga el cronograma</string>
+    <string name="reorder_timelines">Reordenar els cronogrames</string>
+    <string name="undo">Desfés</string>
+    <string name="visible_tabs_needed">Cal que restin visibles dues pestanyes!</string>
+    <string name="action_reorder_timeline">Reordenar les pissarres</string>
+    <string name="warning_list_deletion">Per esborrar aquesta llista, cal fer-ho des de les llistes entrades!</string>
+    <string name="warning_main_timeline">Les pissarres principals només es poden amagar!</string>
+    <string name="action_bbcode">Codi-BB</string>
     <plurals name="number_of_vote">
         <item quantity="one">%d vot</item>
         <item quantity="other">%d vots</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 2d571fa0c..56eb34132 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -829,8 +829,8 @@ Uživatelské jméno a heslo nejsou nikdy ukládány. Jsou použity pouze během
     <string name="undo">Vrátit zpět</string>
     <string name="visible_tabs_needed">Musíte si nechat dvě viditelné karty!</string>
     <string name="action_reorder_timeline">Změnit pořadí časových os</string>
-    <string name="warning_list_deletion">Use the lists entry for deleting this list!</string>
-    <string name="warning_main_timeline">Main timelines can only be hidden!</string>
+    <string name="warning_list_deletion">Použijte položky seznamu k odstranění tohoto seznamu!</string>
+    <string name="warning_main_timeline">Hlavní časové linie mohou být pouze skryty!</string>
     <string name="action_bbcode">BBCode</string>
     <plurals name="number_of_vote">
         <item quantity="one">%d hlas</item>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 0d5b51ca8..1e7a0d274 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -223,7 +223,7 @@
     <string name="no_notifications">Καμία ειδοποίηση προς εμφάνιση</string>
     <string name="notif_mention">σε ανέφερε</string>
     <string name="notif_reblog">ενίσχυσε την κατάστασή σου</string>
-    <string name="notif_favourite">favourited your status</string>
+    <string name="notif_favourite">έδειξε προτίμηση στην κατάστασή σου</string>
     <string name="notif_follow">άρχισε να σε παρακολουθεί</string>
     <string name="notif_pouet">Νέα φωνή από %1$s</string>
     <plurals name="other_notifications">
@@ -273,7 +273,7 @@
     <string name="nothing_to_do">Δεν μπορεί να εκτελεστεί καμία ενέργεια</string>
     <string name="toast_saved">Το πολυμέσο αποθηκεύθηκε.</string>
     <string name="toast_error_translate">Παρουσιάστηκε κάποιο σφάλμα κατά την μετάφραση.</string>
-    <string name="toast_error_translations_disabled">Translations are disabled in settings</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_visibility_changed">Έχει αλλαχτεί η αναγνωσιμότητα των φωνών, για το λογαριασμό %1$s</string>
@@ -466,7 +466,7 @@
     <!-- About lists -->
     <string name="action_lists">Κατάστιχα</string>
     <string name="action_lists_confirm_delete">Σίγουρα, να διαγραφεί αυτό το κατάστιχο, αμετάκλητα;</string>
-    <string name="action_lists_empty_content">There is nothing in this list yet. When members of this list post new statuses, they will appear here.</string>
+    <string name="action_lists_empty_content">Ακόμη δεν υπάρχει τίποτα σε αυτό το κατάστιχο. Όταν κάποια μέλη αυτού του κατάστιχου θα δημοσιεύσουν νέες καταστάσεις, αυτές θα εμφανιστούν εδώ.</string>
     <string name="action_lists_add_to">Προσθήκη στο κατάστιχο</string>
     <string name="action_lists_remove_from">Απομάκρυνση από το κατάστιχο</string>
     <string name="action_lists_create">Προσθήκη κατάστιχου</string>
@@ -659,7 +659,7 @@
     <string name="card_view_image">Εικόνα της κάρτας</string>
     <string name="hide_media">Απόκρυψη πολυμέσων</string>
     <string name="favicon">Έμβλημα</string>
-    <string name="media_description">Add description for media (for the visually impaired)</string>
+    <string name="media_description">Προσθήκη περιγραφής των πολυμέσων (για όσους έχουν προβλήματα όρασης)</string>
     <string-array name="filter_expire">
         <item>Ποτέ</item>
         <item>30 λεπτά</item>
@@ -669,16 +669,16 @@
         <item>1 ημέρα</item>
         <item>1 εβδομάδα</item>
     </string-array>
-    <string name="showcase_instance">        In this field, you need to write your instance host name.\nFor example, if you created your account on https://mastodon.social\nJust write <b>mastodon.social</b> (without https://)\n
-        You can start writing first letters and names will be suggested.\n\n
-        ⚠ The Login button will only work if the instance name is valid and the instance is up!
+    <string name="showcase_instance">        Σε αυτό το πεδίο, χρειάζεται να συμπληρώσεις το όνομα του οικοδεσπότη της υπόστασής σου.\nΓια παράδειγμα, αν δημιούργησες τον λογαριασμό σου στο https://mastodon.social\nΑπλά γράψε <b>mastodon.social</b> (χωρίς το https://)\n
+        Μπορείς να ξεκινήσεις να γράφεις τα πρώτα γράμματα, και θα προταθούν ολόκληρες οι ονομασίες.\n\n
+        ⚠ Το πλήκτρο Σύνδεσης λειτουργεί, μόνο όταν είναι έγκυρο το όνομα της υπόστασης, και είναι η υπόσταση σε λειτουργία!
     </string>
     <string name="showcase_uid">        Στο αυτό πεδίο, εισήγαγε το λογαριασμό του ηλεκτρονικού ταχυδρομείου, ο οποίος είναι συνδεμένος με το λογαριασμό σου στο Μαστόδοντο.
     </string>
     <string name="showcase_pwd">        Τα τελευταία βήματα, είναι η εισαγωγή του συνθηματικού, και το κλικάρισμα στη Σύνδεση.
     </string>
     <string name="more_information">Περισσότερες πληροφορίες</string>
-    <string name="showcase_2FA">If you use 2FA (Two-factor authentication), you need to use this link.\nYou can also use it if you do not want to enter your credentials here.</string>
+    <string name="showcase_2FA">Αν χρησιμοποιείς 2FA (έλεγχο ταυτότητας δύο παραγόντων), θα πρέπει να χρησιμοποιήσεις και αυτόν τον δεσμό.\nΕπίσης, μπορείς να τον χρησιμοποιήσεις, αν δεν θες να εισάγεις, εδώ, τα διαπιστευτήριά σου.</string>
     <!-- languages not translated -->
     <string name="languages">Γλώσσες</string>
     <string name="show_media_only">Μόνο πολυμέσα</string>
@@ -808,24 +808,24 @@
     <string name="refresh_poll">Ανανέωση της ψηφοφορίας</string>
     <string name="vote">Ψήφισμα</string>
     <string name="poll_not_private">Μία ψηφοφορίας δεν μπορεί να προσκολληθεί σε ένα άμεσο μήνυμα.</string>
-    <string name="notif_poll">A poll you have voted in has ended</string>
-    <string name="settings_category_notif_customize">Customize</string>
-    <string name="settings_category_notif_categories">Categories</string>
-    <string name="settings_category_notif_news">News</string>
-    <string name="settings_category_notif_time_slot">Time slot</string>
-    <string name="settings_category_notif_advanced">Advanced</string>
-    <string name="set_display_new_badge">Display \'new\' badge on unread toots</string>
-    <string name="set_display_peertube">Display Peertube timeline</string>
+    <string name="notif_poll">Μία ψηφοφορία στην οποία συμμετείχες έχει τελειώσει</string>
+    <string name="settings_category_notif_customize">Προσαρμογή</string>
+    <string name="settings_category_notif_categories">Κατηγορίες</string>
+    <string name="settings_category_notif_news">Νέα</string>
+    <string name="settings_category_notif_time_slot">Χρονική Περίοδος</string>
+    <string name="settings_category_notif_advanced">Προχωρημένα</string>
+    <string name="set_display_new_badge">Εμφάνιση το σήματος «νέο», στις αδιάβαστες φωνές</string>
+    <string name="set_display_peertube">Εμφάνιση της χρονοστήλης του Πειρτιούμπιου</string>
     <string name="peertube_menu">Peertube</string>
-    <string name="hide_tab">Hide the tab</string>
-    <string name="move_timeline">Move timeline</string>
-    <string name="hide_timeline">Hide timeline</string>
-    <string name="reorder_timelines">Reorder timelines</string>
-    <string name="undo">Undo</string>
-    <string name="visible_tabs_needed">You need to keep two visible tabs!</string>
-    <string name="action_reorder_timeline">Reorder timelines</string>
+    <string name="hide_tab">Απόκρυψη της καρτέλας</string>
+    <string name="move_timeline">Μετακίνηση της χρονοστήλης</string>
+    <string name="hide_timeline">Απόκρυψη της χρονοστήλης</string>
+    <string name="reorder_timelines">Αναδιάταξη των χρονοστήλων</string>
+    <string name="undo">Αναίρεση</string>
+    <string name="visible_tabs_needed">Θα πρέπει να διατηρείς δύο καρτέλες ορατές.</string>
+    <string name="action_reorder_timeline">Αναδιάταξη των χρονοστήλων</string>
     <string name="warning_list_deletion">Use the lists entry for deleting this list!</string>
-    <string name="warning_main_timeline">Main timelines can only be hidden!</string>
+    <string name="warning_main_timeline">Η κύρια χρονοστήλη μπορεί, μονάχα, να κρυφτεί.</string>
     <string name="action_bbcode">BBCode</string>
     <plurals name="number_of_vote">
         <item quantity="one">%d vote</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ecbddd97a..6d786ca39 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -818,9 +818,9 @@ Le bouton de connexion s’activera une fois qu’un domaine valide sera renseig
     <string name="move_timeline">Déplacer le fil</string>
     <string name="hide_timeline">Cacher le fil</string>
     <string name="reorder_timelines">Réorganiser les fils</string>
-    <string name="undo">Undo</string>
+    <string name="undo">Annuler</string>
     <string name="visible_tabs_needed">You need to keep two visible tabs!</string>
-    <string name="action_reorder_timeline">Reorder timelines</string>
+    <string name="action_reorder_timeline">Réorganiser les fils</string>
     <string name="warning_list_deletion">Use the lists entry for deleting this list!</string>
     <string name="warning_main_timeline">Main timelines can only be hidden!</string>
     <string name="action_bbcode">BBCode</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index da51109b3..e7c07e2cc 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -273,7 +273,7 @@
     <string name="nothing_to_do">Nessuna azione può essere intrapresa</string>
     <string name="toast_saved">Il media è stato salvato!</string>
     <string name="toast_error_translate">Si è verificato un errore durante la traduzione!</string>
-    <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
+    <string name="toast_error_translations_disabled">Le traduzioni sono disabilitate nelle impostazioni</string>
     <string name="toast_toot_saved">Bozza salvata!</string>
     <string name="toast_error_char_limit">Sei sicuro che questa istanza permetta questo numero di caratteri? Normalmente, questo valore è più vicino ai 500 caratteri.</string>
     <string name="toast_visibility_changed">La visibilità dei toot è stata cambiata per l\'account %1$s</string>
@@ -809,23 +809,23 @@
     <string name="vote">Vota</string>
     <string name="poll_not_private">Un sondaggio non può essere allegato ad un messaggio diretto!</string>
     <string name="notif_poll">Un sondaggio in cui hai votato è terminato</string>
-    <string name="settings_category_notif_customize">Customize</string>
-    <string name="settings_category_notif_categories">Categories</string>
-    <string name="settings_category_notif_news">News</string>
-    <string name="settings_category_notif_time_slot">Time slot</string>
-    <string name="settings_category_notif_advanced">Advanced</string>
-    <string name="set_display_new_badge">Display \'new\' badge on unread toots</string>
-    <string name="set_display_peertube">Display Peertube timeline</string>
+    <string name="settings_category_notif_customize">Personalizza</string>
+    <string name="settings_category_notif_categories">Categorie</string>
+    <string name="settings_category_notif_news">Novità</string>
+    <string name="settings_category_notif_time_slot">Fascia oraria</string>
+    <string name="settings_category_notif_advanced">Avanzate</string>
+    <string name="set_display_new_badge">Mostra l\'icona \'nuovo\' sui toot non letti</string>
+    <string name="set_display_peertube">Mostra timeline di Peertube</string>
     <string name="peertube_menu">Peertube</string>
-    <string name="hide_tab">Hide the tab</string>
-    <string name="move_timeline">Move timeline</string>
-    <string name="hide_timeline">Hide timeline</string>
-    <string name="reorder_timelines">Reorder timelines</string>
-    <string name="undo">Undo</string>
-    <string name="visible_tabs_needed">You need to keep two visible tabs!</string>
-    <string name="action_reorder_timeline">Reorder timelines</string>
-    <string name="warning_list_deletion">Use the lists entry for deleting this list!</string>
-    <string name="warning_main_timeline">Main timelines can only be hidden!</string>
+    <string name="hide_tab">Nascondi la scheda</string>
+    <string name="move_timeline">Sposta timeline</string>
+    <string name="hide_timeline">Nascondi timeline</string>
+    <string name="reorder_timelines">Riordina timeline</string>
+    <string name="undo">Annulla</string>
+    <string name="visible_tabs_needed">Devi mantenere almeno due schede visibili!</string>
+    <string name="action_reorder_timeline">Riordina timeline</string>
+    <string name="warning_list_deletion">Usa la voce delle liste per eliminare questa lista!</string>
+    <string name="warning_main_timeline">Le timeline principali possono solo essere nascoste!</string>
     <string name="action_bbcode">BBCode</string>
     <plurals name="number_of_vote">
         <item quantity="one">%d voto</item>
diff --git a/fastlane/metadata/android/en-US/changelogs/258.txt b/fastlane/metadata/android/en-US/changelogs/258.txt
new file mode 100644
index 000000000..e27c04627
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/258.txt
@@ -0,0 +1,3 @@
+Fixed
+* Fix an issue when refreshing polls
+* Fix an issue when accessing to filters
\ No newline at end of file