Merge remote-tracking branch 'upstream/master' into refactorNearbyClassesMVP

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

@@ -167,7 +167,7 @@ public class CommonsApplication extends Application {
         String logFileName = isBeta ? "CommonsBetaAppLogs" : "CommonsAppLogs";
         String logDirectory = LogUtils.getLogDirectory();
         FileLoggingTree tree = new FileLoggingTree(
-                Log.DEBUG,
+                Log.VERBOSE,
                 logFileName,
                 logDirectory,
                 1000,

app/src/main/java/fr/free/nrw/commons/OkHttpConnectionFactory.java

@@ -31,7 +31,7 @@ public final class OkHttpConnectionFactory {
         return new OkHttpClient.Builder()
                 .cookieJar(SharedPreferenceCookieManager.getInstance())
                 .cache(NET_CACHE)
-                .addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BASIC))
+                .addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
                 .addInterceptor(new UnsuccessfulResponseInterceptor())
                 .addInterceptor(new CommonHeaderRequestInterceptor())
                 .build();

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

@@ -530,6 +530,12 @@
   <string name="dialog_box_text_nomination">Kial %1$s foriĝu?</string>
   <string name="review_is_uploaded_by">%1$s estas alŝutita de: %2$s</string>
   <string name="default_description_language">Implicita priskriba lingvo</string>
+  <string name="delete_helper_make_deletion_toast">Provante proponi la forigon de %1$s</string>
+  <string name="delete_helper_show_deletion_title">Proponi forigon</string>
+  <string name="delete_helper_show_deletion_title_success">Sukcesis</string>
+  <string name="delete_helper_show_deletion_message_if">Sukcese proponis la forigon de %1$s.</string>
+  <string name="delete_helper_show_deletion_title_failed">Malsukcesis</string>
+  <string name="delete_helper_show_deletion_message_else">Ne povis proponi forigon.</string>
   <string name="delete_helper_ask_spam_selfie">Memfoto</string>
   <string name="delete_helper_ask_spam_blurry">Malklara</string>
   <string name="delete_helper_ask_spam_nonsense">Sensencaĵo</string>
@@ -538,4 +544,5 @@
   <string name="delete_helper_ask_reason_copyright_internet_photo">Hazarda foto el Interreto</string>
   <string name="delete_helper_ask_reason_copyright_logo">Emblemo</string>
   <string name="delete_helper_ask_reason_copyright_other">Alia</string>
+  <string name="delete_helper_ask_alert_set_positive_button_reason">Ĉar ĝi estas</string>
 </resources>

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

@@ -547,6 +547,8 @@
   <string name="dialog_box_text_nomination">¿Por qué debe borrarse %1$s?</string>
   <string name="review_is_uploaded_by">%1$s fue subida por: %2$s</string>
   <string name="default_description_language">Idioma por defecto de la descripción</string>
+  <string name="delete_helper_make_deletion_toast">Intentando nominar %1$s para su borrado</string>
+  <string name="delete_helper_show_deletion_title_failed">Falló</string>
   <string name="delete_helper_ask_spam_selfie">Un autorretrato</string>
   <string name="delete_helper_ask_spam_blurry">Borrosa</string>
   <string name="delete_helper_ask_spam_nonsense">Sinsentido</string>

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

@@ -56,7 +56,7 @@
   <string name="provider_contributions">Nire igoerak</string>
   <string name="menu_share">Partekatu</string>
   <string name="menu_open_in_browser">Ikusi nabigatzailean</string>
-  <string name="share_title_hint" fuzzy="true">Izenburua</string>
+  <string name="share_title_hint">Izenburua (beharrezkoa)</string>
   <string name="add_title_toast">Mesedez, eman izenburu bat fitxategi honetarako</string>
   <string name="share_description_hint">Deskribapena</string>
   <string name="login_failed_network">Ezin izan da sartu - sarean akatsa</string>
@@ -77,10 +77,10 @@
   <string name="gps_disabled">GPSa desgaituta dago gailu honetan. Gaitu nahi duzu?</string>
   <string name="enable_gps">GPSa gaitu</string>
   <string name="contributions_subtitle_zero">Oraindik ez da ezer igo</string>
-  <plurals name="contributions_subtitle" fuzzy="true">
+  <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">igoera 1</item>
-    <item quantity="other">%1$d igoera</item>
+    <item quantity="one">igoera (%1$d)</item>
+    <item quantity="other">(%1$d) igoera</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Karga %1$d hasten</item>
@@ -110,7 +110,10 @@
   <string name="no_uploads_yet">Oraindik ez duzu argazkirik igo.</string>
   <string name="menu_retry_upload">Berriz saiatu</string>
   <string name="menu_cancel_upload">Utzi</string>
-  <string name="share_license_summary" fuzzy="true">Irudi hau %1$s lizentziapean egongo da</string>
+  <plurals name="share_license_summary">
+    <item quantity="one">Irudi hau %1$s lizentziapean egongo da</item>
+    <item quantity="other">Irudi hauek %1$s lizentziapean egongo dira</item>
+  </plurals>
   <string name="media_upload_policy">Irudi hau bidaltzen, nire lan propioa dela aitortzen dut, copyrighta duten materiala edo selfiak ez duela, eta beste motatakoak &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Ohikoaren arauak&lt;/a&gt;</string>
   <string name="menu_download">Jaitsi</string>
   <string name="preference_license">Berezko lizentzia</string>
@@ -165,7 +168,7 @@
   <string name="detail_license_empty">Lizentzia ezezaguna</string>
   <string name="menu_refresh">Eguneratu</string>
   <string name="read_storage_permission_rationale">Nahitaezko baimena: kanpo-biltegiaren irakurketa. Aplikazioa ezin da zure galeriara sartu hau gabe.</string>
-  <string name="write_storage_permission_rationale" fuzzy="true">Nahitaezko baimena: kanpo-biltegiaren idazketa. Aplikazioa ezin da zure kamerara sartu hau gabe.</string>
+  <string name="write_storage_permission_rationale">Nahitaezko baimena: kanpo-biltegiratzearen idazketa. Aplikazioa ezin da zure kamerara/galeriara sartu hau gabe.</string>
   <string name="location_permission_rationale">Aukerako baimena: momentuko kokapena zehaztu kategoriak iradokitzeko</string>
   <string name="ok">Ados</string>
   <string name="title_activity_nearby">Gertuko lekuak</string>
@@ -230,7 +233,7 @@
   <string name="use_external_storage_summary">Aplikazioaren kamerarekin ateratako argazkiak zure gailuan gorde</string>
   <string name="login_to_your_account">Zure kontuan saioa hasi</string>
   <string name="send_log_file">Erregistro fitxategia bidali</string>
-  <string name="send_log_file_description" fuzzy="true">Bidali erregistro fitxategia garatzaileei emailaren bitartez</string>
+  <string name="send_log_file_description">Bidali erregistro fitxategia garatzaileei emailaren bitartez aplikazioaren dauden arazoak konpontzeko. Oharra: erregistroek identifika zaitzaken informazioa eduki dezakete</string>
   <string name="no_web_browser">Ez da URLa irekitzeko nabigatzailerik aurkitu</string>
   <string name="null_url">Errorea! Ez da URLa aurkitu</string>
   <string name="nominate_deletion">Ezabaketarako izendatu</string>
@@ -239,22 +242,22 @@
   <string name="skip_login">Jauzi</string>
   <string name="navigation_item_login">Hasi saioa</string>
   <string name="skip_login_title">Benetan saioa hastea jauzi nahi duzula?</string>
-  <string name="skip_login_message" fuzzy="true">Ezin izango duzu argazkirik igo.</string>
+  <string name="skip_login_message">Argazkiak igotzeko saioa hasi beharko duzu.</string>
   <string name="login_alert_message">Mesedez, hasi saioa funtzio hau erabili ahal izateko</string>
   <string name="nearby_location_has_not_changed">Kokapena ez da aldatu.</string>
   <string name="nearby_location_not_available">Kokapena ez dago erabilgarri.</string>
   <string name="location_permission_rationale_nearby">Baimena beharrezkoa da hurbil dauden lekuen zerrende ikusteko</string>
-  <string name="get_directions" fuzzy="true">NORABIDEAK JASO</string>
-  <string name="read_article" fuzzy="true">IRAKURRI ARTIKULUA</string>
+  <string name="get_directions">Nola iritsi</string>
+  <string name="read_article">Artikulua irakurri</string>
   <string name="notifications_welcome">Ongi etorria Wikimedia Commons-era! Pozten gara zu hemen egoteaz.</string>
   <string name="notifications_talk_page_message">%1$s-(e)k mezu bat utzi du zure eztabaida orrian</string>
   <string name="notifications_thank_you_edit">Eskerrik asko aldaketa bat egiteagatik</string>
   <string name="notifications_mention">%1$s(e)k %2$s(e)an aipatu zaitu.</string>
   <string name="toggle_view_button">Toggle ikuspegia</string>
-  <string name="nearby_directions" fuzzy="true">NOLA HELDU</string>
-  <string name="nearby_wikidata" fuzzy="true">WIKIDATA</string>
-  <string name="nearby_wikipedia" fuzzy="true">WIKIPEDIA</string>
-  <string name="nearby_commons" fuzzy="true">COMMONS</string>
+  <string name="nearby_directions">Nola iritsi</string>
+  <string name="nearby_wikidata">Wikidata</string>
+  <string name="nearby_wikipedia">Wikipedia</string>
+  <string name="nearby_commons">Commons</string>
   <string name="about_rate_us">&lt;u&gt;Baloratu gaitzazu&lt;/u&gt;</string>
   <string name="about_faq">&lt;u&gt;Maiz egindako galderak&lt;/u&gt;</string>
   <string name="welcome_skip_button">Tutoriala jauzi</string>
@@ -269,7 +272,7 @@
   <string name="about_translate_cancel">Utzi</string>
   <string name="retry">Saiatu berriro</string>
   <string name="showcase_view_got_it_button">Ulertu dut!</string>
-  <string name="showcase_view_whole_nearby_activity" fuzzy="true">Zugandik hurbil dauden leku hauek irudiak behar dituzte beren Wikipedia artikuluak hornitzeko</string>
+  <string name="showcase_view_whole_nearby_activity">Zugandik hurbil dauden leku hauek irudiak behar dituzte beren Wikipedia artikuluak hornitzeko.\n\nSakatu \'EREMU HONETAN BILATU\' mapa zentratzeko eta kokapen horren inguruan bilaketa hasteko.</string>
   <string name="showcase_view_list_icon">Botoi hau sakatzeak leku hauetako zerrenda eskeiniko dizu</string>
   <string name="showcase_view_plus_fab">Edozein lekutako irudi bat igo dezakezu zure kamera edo galeriatik</string>
   <string name="no_images_found">Ez da irudirik aurkitu!</string>
@@ -315,10 +318,10 @@
   <string name="delete_recent_searches_dialog">Ziur zaude zure bilaketen historia garbitu nahi duzula?</string>
   <string name="search_history_deleted">Bilaketa historia ezabatuta</string>
   <string name="Achievements">Lorpenak</string>
-  <string name="statistics" fuzzy="true">ESTATISTIKAK</string>
+  <string name="statistics">Estatistikak</string>
   <string name="statistics_thanks">Jasotako eskerrak</string>
   <string name="statistics_featured">Nabarmendutako irudiak</string>
-  <string name="level" fuzzy="true">MAILA</string>
+  <string name="level">Maila</string>
   <string name="images_uploaded">Irudiak igo dira</string>
   <string name="images_used_by_wiki">Erabilitako irudiak</string>
   <string name="achievements_share_message">Partekatu zure lorpenak lagunekin!</string>

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

@@ -550,7 +550,11 @@
   <string name="review_is_uploaded_by">%1$s est téléversé par&amp;nbsp;: %2$s</string>
   <string name="default_description_language">Langue de description par défaut</string>
   <string name="delete_helper_make_deletion_toast">Tentative de signalement de %1$s pour la suppression</string>
+  <string name="delete_helper_show_deletion_title">Nominé pour suppression</string>
+  <string name="delete_helper_show_deletion_title_success">Succès</string>
+  <string name="delete_helper_show_deletion_message_if">%1$s bien nominé pour suppression.</string>
   <string name="delete_helper_show_deletion_title_failed">Échec</string>
+  <string name="delete_helper_show_deletion_message_else">Impossible de requêter la suppression.</string>
   <string name="delete_helper_ask_spam_selfie">Un selfie</string>
   <string name="delete_helper_ask_spam_blurry">Flou</string>
   <string name="delete_helper_ask_spam_nonsense">Non-sens</string>
@@ -559,4 +563,5 @@
   <string name="delete_helper_ask_reason_copyright_internet_photo">Photo aléatoire sur internet</string>
   <string name="delete_helper_ask_reason_copyright_logo">Logo</string>
   <string name="delete_helper_ask_reason_copyright_other">Autre</string>
+  <string name="delete_helper_ask_alert_set_positive_button_reason">Parce qu’elle est</string>
 </resources>

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

@@ -323,6 +323,7 @@
   <string name="search_recent_header">最近の検索:</string>
   <string name="provider_searches">最近、検索したクエリ</string>
   <string name="error_loading_categories">カテゴリの読み込み中にエラーが発生しました。</string>
+  <string name="error_loading_subcategories">下位カテゴリの読み込み中にエラーが発生しました。</string>
   <string name="search_tab_title_media">メデイア</string>
   <string name="search_tab_title_categories">カテゴリ</string>
   <string name="explore_tab_title_mobile">モバイル機器からアップロード</string>
@@ -449,6 +450,8 @@
   <string name="nominate_for_deletion_done">完了</string>
   <string name="nominate_for_deletion_notify_user">ユーザーのトークページに連絡</string>
   <string name="nominate_for_deletion_edit_deletion_request_log">削除依頼ログにファイルを追加</string>
+  <string name="nominate_for_deletion_create_deletion_request">削除のリクエスト用に下位ページを作成する</string>
+  <string name="notsure">不確実</string>
   <string name="send_thank_success_title">感謝の送信：完了</string>
   <string name="send_thank_success_message">%1$sさんに感謝の送信が完了しました</string>
   <string name="send_thank_failure_message">%1$sさんへ感謝を送信できませんでした</string>
@@ -516,5 +519,16 @@
   <string name="upload_cancelled">アップロードを中止しました</string>
   <string name="previous_image_title_description_not_found">以前の題名もしくは説明文のデータが見つかりません</string>
   <string name="dialog_box_text_nomination">%1$sを削除しなければならないのはなぜですか？</string>
+  <string name="review_is_uploaded_by">%1$s のアップロード者：%2$sさん</string>
   <string name="default_description_language">既定の説明用言語</string>
+  <string name="delete_helper_show_deletion_title">削除の対象に指定する</string>
+  <string name="delete_helper_show_deletion_title_success">成功しました</string>
+  <string name="delete_helper_show_deletion_title_failed">失敗しました</string>
+  <string name="delete_helper_show_deletion_message_else">削除のリクエストができません。</string>
+  <string name="delete_helper_ask_spam_selfie">自撮り</string>
+  <string name="delete_helper_ask_spam_blurry">ぼやけている</string>
+  <string name="delete_helper_ask_spam_other">それ以外</string>
+  <string name="delete_helper_ask_reason_copyright_press_photo">広報用の写真</string>
+  <string name="delete_helper_ask_reason_copyright_other">その他</string>
+  <string name="delete_helper_ask_alert_set_positive_button_reason">その根拠</string>
 </resources>

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

@@ -469,6 +469,8 @@
   <string name="no_categories_found">분류가 없습니다</string>
   <string name="upload_cancelled">업로드 취소됨</string>
   <string name="default_description_language">기본 설명 언어</string>
+  <string name="delete_helper_show_deletion_title_success">성공</string>
+  <string name="delete_helper_show_deletion_title_failed">실패</string>
   <string name="delete_helper_ask_spam_selfie">셀카</string>
   <string name="delete_helper_ask_spam_other">기타</string>
   <string name="delete_helper_ask_reason_copyright_internet_photo">인터넷의 임의 사진</string>

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

@@ -361,4 +361,5 @@
   <string name="image_info">ရုပ်ပုံ အချက်အလက်</string>
   <string name="no_categories_found">ကဏ္ဍများ မတွေ့ရှိပါ</string>
   <string name="dialog_box_text_nomination">%1$ ဟာ ဘာကြောင့် ဖျက်သင့်သလဲ?</string>
+  <string name="delete_helper_show_deletion_title_success">အောင်မြင်</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -540,6 +540,12 @@
   <string name="dialog_box_text_nomination">Por que %1$s deve ser excluído?</string>
   <string name="review_is_uploaded_by">%1$s é carregado por: %2$s</string>
   <string name="default_description_language">Idioma de descrição padrão</string>
+  <string name="delete_helper_make_deletion_toast">Tentando nomear %1$s para exclusão</string>
+  <string name="delete_helper_show_deletion_title">Nomeação para exclusão</string>
+  <string name="delete_helper_show_deletion_title_success">Sucesso</string>
+  <string name="delete_helper_show_deletion_message_if">%1$s foi nomeado para eliminação.</string>
+  <string name="delete_helper_show_deletion_title_failed">Falhou</string>
+  <string name="delete_helper_show_deletion_message_else">Não foi possível pedir eliminação.</string>
   <string name="delete_helper_ask_spam_selfie">Uma selfie</string>
   <string name="delete_helper_ask_spam_blurry">Embaçado</string>
   <string name="delete_helper_ask_spam_nonsense">Absurdo</string>
@@ -548,4 +554,5 @@
   <string name="delete_helper_ask_reason_copyright_internet_photo">Foto aleatória da internet</string>
   <string name="delete_helper_ask_reason_copyright_logo">Logótipo</string>
   <string name="delete_helper_ask_reason_copyright_other">Outro</string>
+  <string name="delete_helper_ask_alert_set_positive_button_reason">Porque é</string>
 </resources>

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

@@ -540,6 +540,12 @@
   <string name="dialog_box_text_nomination">Porque deve %1$s ser eliminado?</string>
   <string name="review_is_uploaded_by">%1$s é carregada por: %2$s</string>
   <string name="default_description_language">Língua de descrição padrão</string>
+  <string name="delete_helper_make_deletion_toast">A tentar nomear %1$s para eliminação</string>
+  <string name="delete_helper_show_deletion_title">A nomear para eliminação</string>
+  <string name="delete_helper_show_deletion_title_success">Sucesso</string>
+  <string name="delete_helper_show_deletion_message_if">%1$s foi nomeado para eliminação.</string>
+  <string name="delete_helper_show_deletion_title_failed">Falhou</string>
+  <string name="delete_helper_show_deletion_message_else">Não foi possível pedir eliminação.</string>
   <string name="delete_helper_ask_spam_selfie">Um autorretrato</string>
   <string name="delete_helper_ask_spam_blurry">Desfocada</string>
   <string name="delete_helper_ask_spam_nonsense">Sem sentido</string>
@@ -548,4 +554,5 @@
   <string name="delete_helper_ask_reason_copyright_internet_photo">Fotografia aleatória da Internet</string>
   <string name="delete_helper_ask_reason_copyright_logo">Logótipo</string>
   <string name="delete_helper_ask_reason_copyright_other">Outro</string>
+  <string name="delete_helper_ask_alert_set_positive_button_reason">Porque é</string>
 </resources>

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

@@ -547,6 +547,12 @@
   <string name="dialog_box_text_nomination">Почему %1$s должно быть удалено?</string>
   <string name="review_is_uploaded_by">%1$s загружено с помощью: %2$s</string>
   <string name="default_description_language">Язык описаний по умолчанию</string>
+  <string name="delete_helper_make_deletion_toast">Номинирование %1$s к удалению</string>
+  <string name="delete_helper_show_deletion_title">Номинирование к удалению</string>
+  <string name="delete_helper_show_deletion_title_success">Успешно</string>
+  <string name="delete_helper_show_deletion_message_if">Успешно номинировано %1$s к удалению.</string>
+  <string name="delete_helper_show_deletion_title_failed">Не удалось</string>
+  <string name="delete_helper_show_deletion_message_else">Невозможно запросить удаление.</string>
   <string name="delete_helper_ask_spam_selfie">Селфи</string>
   <string name="delete_helper_ask_spam_blurry">Размыто</string>
   <string name="delete_helper_ask_spam_nonsense">Бессмыслица</string>
@@ -555,4 +561,5 @@
   <string name="delete_helper_ask_reason_copyright_internet_photo">Случайное фото из интернет</string>
   <string name="delete_helper_ask_reason_copyright_logo">Логотип</string>
   <string name="delete_helper_ask_reason_copyright_other">Другое</string>
+  <string name="delete_helper_ask_alert_set_positive_button_reason">Поскольку</string>
 </resources>

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

@@ -546,6 +546,12 @@
   <string name="dialog_box_text_nomination">Чому %1$s має бути видалено?</string>
   <string name="review_is_uploaded_by">%1$s завантажено з допомогою: %2$s</string>
   <string name="default_description_language">Усталена мова описів</string>
+  <string name="delete_helper_make_deletion_toast">Номінування %1$s до вилучення</string>
+  <string name="delete_helper_show_deletion_title">Номінування до вилучення</string>
+  <string name="delete_helper_show_deletion_title_success">Успішно</string>
+  <string name="delete_helper_show_deletion_message_if">Успішно номіновано %1$s до вилучення.</string>
+  <string name="delete_helper_show_deletion_title_failed">Не вдалося</string>
+  <string name="delete_helper_show_deletion_message_else">Неможливо запитати видалення.</string>
   <string name="delete_helper_ask_spam_selfie">Селфі</string>
   <string name="delete_helper_ask_spam_blurry">Розмито</string>
   <string name="delete_helper_ask_spam_nonsense">Безглуздя</string>
@@ -554,4 +560,5 @@
   <string name="delete_helper_ask_reason_copyright_internet_photo">Випадкове фото з інтернет</string>
   <string name="delete_helper_ask_reason_copyright_logo">Логотип</string>
   <string name="delete_helper_ask_reason_copyright_other">Інше</string>
+  <string name="delete_helper_ask_alert_set_positive_button_reason">Оскільки</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -536,6 +536,12 @@
   <string name="dialog_box_text_nomination">為何應刪除%1$s？</string>
   <string name="review_is_uploaded_by">%1$s 是由 %2$s 所上傳</string>
   <string name="default_description_language">預設描述語言</string>
+  <string name="delete_helper_make_deletion_toast">嘗試向%1$s提名刪除</string>
+  <string name="delete_helper_show_deletion_title">提名刪除</string>
+  <string name="delete_helper_show_deletion_title_success">成功</string>
+  <string name="delete_helper_show_deletion_message_if">成功向%1$s提名刪除。</string>
+  <string name="delete_helper_show_deletion_title_failed">失敗</string>
+  <string name="delete_helper_show_deletion_message_else">無法請求刪除。</string>
   <string name="delete_helper_ask_spam_selfie">自拍</string>
   <string name="delete_helper_ask_spam_blurry">糢糊</string>
   <string name="delete_helper_ask_spam_nonsense">無意義</string>
@@ -544,4 +550,5 @@
   <string name="delete_helper_ask_reason_copyright_internet_photo">來自網路的隨意照片</string>
   <string name="delete_helper_ask_reason_copyright_logo">標誌</string>
   <string name="delete_helper_ask_reason_copyright_other">其它</string>
+  <string name="delete_helper_ask_alert_set_positive_button_reason">因為這</string>
 </resources>