Merge branch 'commons-app:main' into main

app/src/main/java/fr/free/nrw/commons/feedback/FeedbackContentCreator.java

@@ -6,6 +6,9 @@
 import fr.free.nrw.commons.feedback.model.Feedback;
 import fr.free.nrw.commons.utils.LangCodeUtils;
 import java.util.Locale;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
 
 /**
  * Creates a wikimedia recognizable format
@@ -32,11 +35,19 @@ public void init() {
         /*
          * Construct the feedback section title
          */
+
+        //Get the UTC Date and Time and add it to the Title
+        final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss", Locale.ENGLISH);
+        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        final String UTC_FormattedDate = dateFormat.format(new Date());
+
         sectionTitleBuilder = new StringBuilder();
         sectionTitleBuilder.append("Feedback from  ");
         sectionTitleBuilder.append(AccountUtil.getUserName(context));
         sectionTitleBuilder.append(" for version ");
         sectionTitleBuilder.append(feedback.getVersion());
+        sectionTitleBuilder.append(" on ");
+        sectionTitleBuilder.append(UTC_FormattedDate);
 
         /*
          * Construct the feedback section text
@@ -96,6 +107,7 @@ public void init() {
         }
         sectionTextBuilder.append("~~~~");
         sectionTextBuilder.append("\n");
+
     }
 
     public String getSectionText() {

app/src/main/res/layout/welcome_bullet.xml

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:orientation="vertical"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="top">
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingRight="@dimen/tiny_margin"
-        android:text="@string/bullet"
+        android:text="&#8226;"
         android:textColor="@android:color/white"
-        android:textSize="@dimen/normal_text" />
+        android:textSize="@dimen/normal_text"
+        tools:ignore="HardcodedText" />
 </LinearLayout>

app/src/main/res/values-ar/strings.xml

@@ -113,7 +113,6 @@
   <string name="preference_category_feedback">التعليقات</string>
   <string name="preference_category_privacy">الخصوصية</string>
   <string name="app_name">المشاعات</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">الإعدادات</string>
   <string name="intent_share_upload_label">رفع إلى المشاعات</string>
   <string name="upload_in_progress">جار الرفع</string>

app/src/main/res/values-as/strings.xml

@@ -18,7 +18,6 @@
   <string name="preference_category_feedback">প্ৰতিক্ৰিয়া</string>
   <string name="preference_category_privacy">গোপনিয়তা</string>
   <string name="app_name">ক\'ম\'ঞ্চ</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">ছেটিংছ</string>
   <string name="intent_share_upload_label">ক\'ম\'ঞ্চত আপল\'ড কৰক</string>
   <string name="username">ব্যৱহাৰকাৰীনাম</string>

app/src/main/res/values-ast/strings.xml

@@ -63,7 +63,6 @@
   <string name="preference_category_feedback">La to opinión</string>
   <string name="preference_category_privacy">Intimidá</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Configuración</string>
   <string name="intent_share_upload_label">Xubir a Commons</string>
   <string name="username">Nome d\'usuariu</string>

app/src/main/res/values-b+roa+tara/strings.xml

@@ -32,7 +32,6 @@
   <string name="preference_category_feedback">Segnalazione</string>
   <string name="preference_category_privacy">Privacy</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">\'Mbostaziune</string>
   <string name="intent_share_upload_label">Careche sus a Commons</string>
   <string name="username">Nome de l\'utende</string>

app/src/main/res/values-b+sr+Latn/strings.xml

@@ -59,7 +59,6 @@
   <string name="preference_category_feedback">Povratne informacije</string>
   <string name="preference_category_privacy">Privatnost</string>
   <string name="app_name">Ostava</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Podešavanja</string>
   <string name="intent_share_upload_label">Otpremi na Ostavu</string>
   <string name="upload_in_progress">Otpremanje u toku</string>

app/src/main/res/values-ba/strings.xml

@@ -52,7 +52,6 @@
   <string name="preference_category_feedback">Кире бәйләнеш</string>
   <string name="preference_category_privacy">Сер һаҡлау</string>
   <string name="app_name">Викимилек</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Көйләүҙәр</string>
   <string name="intent_share_upload_label">Викимилеккә йөкләргә</string>
   <string name="username">Ҡатнашыусы исеме</string>

app/src/main/res/values-ban/strings.xml

@@ -51,7 +51,6 @@
   <string name="preference_category_feedback">Umpan walik</string>
   <string name="preference_category_privacy">Paragaan</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Setélan</string>
   <string name="intent_share_upload_label">Unggah nuju Commons</string>
   <string name="upload_in_progress">Pangunggahan kantun mamargi</string>

app/src/main/res/values-bg/strings.xml

@@ -42,7 +42,6 @@
   <string name="preference_category_feedback">Обратна връзка</string>
   <string name="preference_category_privacy">Поверителност</string>
   <string name="app_name">Общомедия</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Настройки</string>
   <string name="intent_share_upload_label">Качване в Общомедия</string>
   <string name="username">Потребителско име</string>

app/src/main/res/values-bn/strings.xml

@@ -75,7 +75,6 @@
   <string name="preference_category_feedback">প্রতিক্রিয়া</string>
   <string name="preference_category_privacy">গোপনীয়তা</string>
   <string name="app_name">কমন্স</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">সেটিং</string>
   <string name="intent_share_upload_label">কমন্সে আপলোড করুন</string>
   <string name="upload_in_progress">আপলোড করা হচ্ছে</string>
@@ -527,4 +526,7 @@
   <string name="report_content">এই বিষয়বস্তু সম্পর্কে অভিযোগ জানান</string>
   <string name="request_user_block">এই ব্যবহারকারীকে বাধাদনের অনুরোধ করুন</string>
   <string name="permissions_are_required_for_functionality">কার্যকারিতার জন্য অনুমতি প্রয়োজন</string>
+  <string name="uploads">আপলোড</string>
+  <string name="pending">অমীমাংসিত</string>
+  <string name="failed">ব্যর্থ হয়েছে</string>
 </resources>

app/src/main/res/values-br/strings.xml

@@ -59,7 +59,6 @@
   <string name="preference_category_feedback">Sonjoù</string>
   <string name="preference_category_privacy">Prevezded</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Arventennoù</string>
   <string name="intent_share_upload_label">Enporzhiañ e Commons</string>
   <string name="username">Anv implijer</string>

app/src/main/res/values-cs/strings.xml

@@ -65,7 +65,6 @@
   <string name="preference_category_feedback">Zpětná vazba</string>
   <string name="preference_category_privacy">Soukromí</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Nastavení</string>
   <string name="intent_share_upload_label">Nahrát na Commons</string>
   <string name="username">Uživatelské jméno</string>

app/src/main/res/values-cy/strings.xml

@@ -48,7 +48,6 @@
   <string name="preference_category_feedback">Adborth</string>
   <string name="preference_category_privacy">Preifatrwydd</string>
   <string name="app_name">Comin Wicimedia</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Gosodiadau</string>
   <string name="intent_share_upload_label">Uwchlwytho i Comin</string>
   <string name="username">Enw defnyddiwr</string>

app/src/main/res/values-da/strings.xml

@@ -67,7 +67,6 @@
   <string name="preference_category_feedback">Feedback</string>
   <string name="preference_category_privacy">Privatliv</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Indstillinger</string>
   <string name="intent_share_upload_label">Upload til Commons</string>
   <string name="upload_in_progress">Upload i gang</string>

app/src/main/res/values-de/strings.xml

@@ -97,7 +97,6 @@
   <string name="preference_category_feedback">Rückmeldung</string>
   <string name="preference_category_privacy">Datenschutz</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Einstellungen</string>
   <string name="intent_share_upload_label">Zu Commons hochladen</string>
   <string name="upload_in_progress">Hochladen läuft</string>

app/src/main/res/values-diq/strings.xml

@@ -53,7 +53,6 @@
   <string name="preference_category_feedback">Peyderıştış</string>
   <string name="preference_category_privacy">Dızdêniye</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Eyari</string>
   <string name="intent_share_upload_label">Barê Embari ke</string>
   <string name="username">Namey karberi</string>

app/src/main/res/values-el/strings.xml

@@ -20,6 +20,7 @@
 * Nikosguard
 * Norhorn
 * Panos78
+* PeachyOne
 * Protnet
 * Tgkarounos
 * Vtalos
@@ -81,7 +82,6 @@
   <string name="preference_category_feedback">Ανατροφοδότηση</string>
   <string name="preference_category_privacy">Απόρρητο</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Ρυθμίσεις</string>
   <string name="intent_share_upload_label">Μεταφόρτωση στα Commons</string>
   <string name="upload_in_progress">Μεταφόρτωση σε εξέλιξη</string>
@@ -419,7 +419,7 @@
   <string name="provider_bookmarks">Σελιδοδείκτες</string>
   <string name="bookmark_empty">Δεν έχετε προσθέσει σελιδοδείκτες</string>
   <string name="provider_bookmarks_location">Σελιδοδείκτες</string>
-  <string name="log_collection_started">Η συλλογή αρχείων καταγραφής ξεκίνησε. ΕΠΑΝΕΚΚΙΝΗΣΤΕ την εφαρμογή, εκτελέστε την ενέργεια που επιθυμείτε να καταγράψετε και, στη συνέχεια, πατήστε ξανά «Αποστολή αρχείου καταγραφής»</string>
+  <string name="log_collection_started">Η συλλογή αρχείων καταγραφής ξεκίνησε. Παρακαλώ ΕΠΑΝΕΚΚΙΝΗΣΤΕ την εφαρμογή, εκτελέστε την ενέργεια που επιθυμείτε να καταγράψετε και, στη συνέχεια, πατήστε ξανά «Αποστολή αρχείου καταγραφής»</string>
   <string name="deletion_reason_uploaded_by_mistake">Το μεταφόρτωσα κατά λάθος</string>
   <string name="deletion_reason_publicly_visible">Δεν ήξερα ότι θα ήταν δημόσια ορατό</string>
   <string name="deletion_reason_bad_for_my_privacy">Συνειδητοποίησα ότι είναι κακό για την ιδιωτικότητά μου</string>

app/src/main/res/values-eo/strings.xml

@@ -68,7 +68,6 @@
   <string name="preference_category_feedback">Prikomentado</string>
   <string name="preference_category_privacy">Privateco</string>
   <string name="app_name">Komunejo</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Agordoj</string>
   <string name="intent_share_upload_label">Alŝuti al la Komunejo</string>
   <string name="upload_in_progress">Alŝutante</string>

app/src/main/res/values-es/strings.xml

@@ -108,7 +108,6 @@
   <string name="preference_category_feedback">Sugerencias</string>
   <string name="preference_category_privacy">Privacidad</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Configuración</string>
   <string name="intent_share_upload_label">Subir a Commons</string>
   <string name="upload_in_progress">Carga en curso</string>

app/src/main/res/values-eu/strings.xml

@@ -62,7 +62,6 @@
   <string name="preference_category_feedback">Feedback</string>
   <string name="preference_category_privacy">Pribatutasuna</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Hobespenak</string>
   <string name="intent_share_upload_label">Commons-en kargatu</string>
   <string name="username">Erabiltzaile izena</string>

app/src/main/res/values-fa/strings.xml

@@ -73,7 +73,6 @@
   <string name="preference_category_feedback">بازخورد</string>
   <string name="preference_category_privacy">حریم خصوصی</string>
   <string name="app_name">ویکی‌انبار</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">تنظیمات</string>
   <string name="intent_share_upload_label">بارگذاری در انبار</string>
   <string name="upload_in_progress">بارگذاری در جریان است</string>

app/src/main/res/values-fi/strings.xml

@@ -68,7 +68,6 @@
   <string name="preference_category_feedback">Palaute</string>
   <string name="preference_category_privacy">Yksityisyys</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Asetukset</string>
   <string name="intent_share_upload_label">Tallenna Commonsiin</string>
   <string name="upload_in_progress">Tallennus käynnissä</string>

app/src/main/res/values-fr/strings.xml

@@ -101,7 +101,6 @@
   <string name="preference_category_feedback">Commentaire</string>
   <string name="preference_category_privacy">Confidentialité</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•&amp;#32;</string>
   <string name="menu_settings">Paramètres</string>
   <string name="intent_share_upload_label">Téléverser sur Commons</string>
   <string name="upload_in_progress">Chargement en cours</string>
@@ -815,6 +814,8 @@
   <string name="please_enter_some_comments">Merci de saisir vos commentaires</string>
   <string name="talk">Discussion</string>
   <string name="write_something_about_the_item">Ecrivez quelque chose sur l\'article \"%1$s\". Il sera visible par le public\nAjouter une définition terminologique pour ce terme</string>
+  <string name="does_not_exist_anymore_no_picture_can_ever_be_taken_of_it">\'%1$s\' n\'existe plus, aucune photo ne pourra jamais en être prise.</string>
+  <string name="is_at_a_different_place_please_specify_the_correct_place_below_if_possible_tell_us_the_correct_latitude_longitude">\'%1$s\' se trouve à un endroit différent. Veuillez indiquer l\'endroit correct ci-dessous et, si possible, indiquez la latitude et la longitude correctes.</string>
   <string name="other_problem_or_information_please_explain_below">Autre problème ou information (merci d\'expliquer ci-dessous).</string>
   <string name="feedback_destination_note">Vos commentaires sont publiés sur la page wiki suivante : &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Mobile_app/Feedback\"&gt;Commons:Mobile app/Feedback&lt;/a&gt;</string>
   <string name="could_not_load_place_data">Ne peut pas supporter les données</string>

app/src/main/res/values-gl/strings.xml

@@ -66,7 +66,6 @@
   <string name="preference_category_feedback">Comentarios</string>
   <string name="preference_category_privacy">Privacidade</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Configuracións</string>
   <string name="intent_share_upload_label">Cargar en Commons</string>
   <string name="upload_in_progress">Envío en curso</string>

app/src/main/res/values-hi/strings.xml

@@ -61,7 +61,6 @@
   <string name="preference_category_feedback">आपके सुझाव</string>
   <string name="preference_category_privacy">गोपनीयता</string>
   <string name="app_name">कॉमन्स</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">सेटिंग्स</string>
   <string name="intent_share_upload_label">कॉमन्स पर अपलोड करें</string>
   <string name="username">सदस्य नाम</string>

app/src/main/res/values-hr/strings.xml

@@ -37,7 +37,6 @@
   <string name="preference_category_feedback">Povratna informacija</string>
   <string name="preference_category_privacy">Privatnost</string>
   <string name="app_name">Zajednički poslužitelj</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Postavke</string>
   <string name="intent_share_upload_label">Prenesi na Zajednički poslužitelj</string>
   <string name="username">Suradničko ime</string>

app/src/main/res/values-hu/strings.xml

@@ -58,7 +58,6 @@
   <string name="preference_category_feedback">Visszajelzés</string>
   <string name="preference_category_privacy">Adatvédelem</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Beállítások</string>
   <string name="intent_share_upload_label">Feltöltés a Commonsra</string>
   <string name="upload_in_progress">Feltöltés folyamatban</string>

app/src/main/res/values-ia/strings.xml

@@ -766,7 +766,7 @@
   <string name="please_enter_some_comments">Per favor insere alcun commentos</string>
   <string name="talk">Discussion</string>
   <string name="does_not_exist_anymore_no_picture_can_ever_be_taken_of_it">‘%1$s’ non existe plus, necun imagine pote jammais esser prendite de illo.</string>
-  <string name="is_at_a_different_place_please_specify_the_correct_place_below_if_possible_tell_us_the_correct_latitude_longitude" fuzzy="true">\'%1$s\' es in un altere loco (per favor specifica le loco correcte hic infra, si possibile indica le latitude/longitude correcte).</string>
+  <string name="is_at_a_different_place_please_specify_the_correct_place_below_if_possible_tell_us_the_correct_latitude_longitude">‘%1$s’ es in un altere loco. Per favor specifica le loco correcte hic infra, e si possibile, indica le latitude e longitude correcte.</string>
   <string name="other_problem_or_information_please_explain_below">Altere problema o information (per favor explica hic infra).</string>
   <string name="feedback_destination_note">Tu retroaction apparera sur le sequente pagina wiki: &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Mobile_app/Feedback\"&gt;Commons:Mobile app/Feedback&lt;/a&gt;</string>
 </resources>

app/src/main/res/values-in/strings.xml

@@ -69,7 +69,6 @@
   <string name="preference_category_feedback">Umpan balik</string>
   <string name="preference_category_privacy">Privasi</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Pengaturan</string>
   <string name="intent_share_upload_label">Unggah ke Commons</string>
   <string name="upload_in_progress">Pengunggahan sedang berlangsung</string>

app/src/main/res/values-is/strings.xml

@@ -60,7 +60,6 @@
   <string name="preference_category_feedback">Umsagnir</string>
   <string name="preference_category_privacy">Persónuvernd</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•  \\</string>
   <string name="menu_settings">Stillingar</string>
   <string name="intent_share_upload_label">Senda inn á Commons</string>
   <string name="username">Notandanafn</string>

app/src/main/res/values-it/strings.xml

@@ -79,7 +79,6 @@
   <string name="preference_category_feedback">Feedback</string>
   <string name="preference_category_privacy">Privacy</string>
   <string name="app_name">Commons</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">Impostazioni</string>
   <string name="intent_share_upload_label">Carica su Commons</string>
   <string name="upload_in_progress">Caricamento in corso</string>

app/src/main/res/values-iw/strings.xml

@@ -91,7 +91,6 @@
   <string name="preference_category_feedback">משוב</string>
   <string name="preference_category_privacy">פרטיות</string>
   <string name="app_name">ויקישיתוף</string>
-  <string name="bullet">•</string>
   <string name="menu_settings">הגדרות</string>
   <string name="intent_share_upload_label">להעלות לוויקישיתוף</string>
   <string name="upload_in_progress">מתבצעת העלאה</string>