Merge backend-overhaul to master (#3198)

* Migrated logEvents to retrofit (#3087)

* Switched wikimedia-android-data-client for new features

* Added UserCLient and UserInterface

* Migrated ContributionsSyncAdapter to UserClient
Fixed sync related bugs

* Removed unused code

* Removed unused code

* Updated wikimedia-android-data-client to new version

* Update library for data client (#3131)

* Backend overhaul fetch media by filename (#3081)

* Added class MwParseResponse and MwParseResult for receiving parse output

* Migrated fetchMediaByFilename to retrofit

* Removed unused code

* Added tests

* Migrated isUserBlockedFromCommons to retrofit (#3085)

* Switched wikimedia-android-data-client for new features

* Added UserCLient and UserInterface

* Migrated isUserBlockedFromCommons to retrofit

* Added tests and removed dead code

* Implemented ban checking functionality in UploadActivity

* Removed unused class AuthenticatedActivity

* Fixed tests

* Fixed NullPointerException when a user accessed image details without logging in.

* * Login the login token way, handle LoginResult minutely, add account based on LoginResult (#3151)

* Added progress updater in UploadService to show upload progress in no… (#3156)

* added progress updater in UploadService to show upload progress in notification

* formatting changes

* [Dependency: Quadtree] Remove unused code from cache controller (#3163)

* Basic logging with redacted sensitive headers (#3159)

* As per #3026, removed the obsolete classes in package mwapi (#3150)

* fixed compile time error (#3165)

* [Dependency fluent]: Remove unused dependency fluent (#3164)

* Donot init quiz checker in onResume (#3167)

* clear image cache on logout (#3168)

* Fixed default locale and upload locales in descrptions (#3166)

* Fix 2FA login (#3170)

* Fix build (#3172)

* Localisation updates from https://translatewiki.net.

* Closes #3094 (#3095)

* BugFix in SpinnerDescriptionsAdapter and SpinnerLanguagesAdapter (use the langguage code provided by the spinner, donot set the language to the one returned by the locale)

* Update changelog.md

* Versioning for v2.11.0

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Center map on location clicked in nearby list and notification card(#2060) (#2366)

* center map on location clicked in nearby (#2060)

* improved animation

* Center map on location clicked in nearby list

* removed unnecessary methods

* center map on location clicked in nearby notification card

* some minor changes

* travis build error

* resolved errors

* Tidy up PR

* removed swipe to delete (#2589)

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* edited CREDITS file (#3145)

* Unused dependencies are removed (#3141)

Part of #3128

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Working with #3129 issue (#3146)

* Replace Hard-Coded strings with those from strings.xml.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* delete res/values-en-gb (#3153)

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* First commit (#3093)

Fixes info icon color is Review

* Solution #3126 (#3155)

Fixed wrong upload dates after image upload

* Bugfix/fix upload presenter tests (#3158)

* Revert "Merge branch 'backend-overhaul' into master"

This reverts commit 0090f24257, reversing
changes made to 9bccbfe443.

* * Fixed upload presenter tests
* Deleted app/src/main/res/values-en-gb/error.xml

* Localisation updates from https://translatewiki.net.

* Remove dependency on Exif parsing library. (#2947)

* Remove dependency on Exif parsing library.

* Fix test.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Refactor nearby classes mvp (#2969)

* Create parent contract

* Create map child contract and fill methods

* Add javadocs and specific interfaces for list

* Move general method to parent and add javadocs for parent

* Add explanation for keeping an emty View interface under NearbyListContract

* Move constracts under contract package

* Create presenters for map and list and implement user actions accordingly

* Add javadocs

* Add presenter, contract and fragment for parent Fragment of both NearyListFragment and NearbyMapFragment

* Implement missing methods

* Fix typo

* Add main views on fragment

* İmplement child fragment logic and their retain

* Relate parent presenter with parent fragment

* Add all location permission related methods to view contract and implement in fragment. Call them from presenter by passing locationServiceManager parameter

* Define refreshView method as updateMapAndList which is a better naming. Define it at presenter part.

* Define a presenter variable in fragment and call updateMapAndList method from there, if permissions are okay

* Add lock neabry method to unlisten nearby operations during updates

* Add network connection established check on view side, check it from presenter

* try to simplify previous method during refactor

* Add missing methods for NearbyMap

* Connect child fragment and prent fragment with presenter

* Change nearby design, first create views then register listeners

* AddnetworkBroadcatsReceiver on view side, call it from presenter

* Add comments

* Change the old NearbyFragment by our new NearbyParentFragment for first tests

* Prevent crash caused child fragment is actually null by checking if it is attached or not.

* Makes sure that initialize nearby operations method is called just after all views and fragments are ready and attached

* Make sure updateMAoAndList method is called when everything ready

* Rename a method with prepoer name

* Call update map and add required markers

* Find out zoom level problem

* Implement add nearby markers and add current marker methods

* remove unneeded codes copied from previous implementation

* Revert "remove unneeded codes copied from previous implementation"

This reverts commit 42539651de.

* add some commits and clear code

* Remove location listener implementation from view, handle them in presenter instead. And add timber debug notes and required method calls

* Style ,issues

* Refactor a variable name to camel case and bind search this area view

* Search this area button action is added

* Mostly implement search this area methods, not tested yet even once

* Make sure everything is called in required order and seach this area method basically works

* Rename methods accordingly and add Javadocs

* Add current location marker and remove circle around it

* Remove unused methods

* Add current location marker with object animator and remove previous marker is exists

* include clear map into add markers method and reorder methods

* Make search this area button appear at correct time

* Try to load un search this area is called

* Clear logs

* Add changes for permission made by Vivek to newly added fragments along with our nearby classes

* Add a view to nearby map ragment and insert map view as an item inside it

* Add logs to uınderstand why on meap ready callback is never called

* Add list item clicked and bottom sheet for list of nearby items is expanded

* Make nearby map ready callback came

* Add required methods to be called after map view is ready

* State: Map ready call is not called but permissions and methods are in correct order

* Remove unused logs

* Try to use SupportMapFragment instead, still no success...

* use SupportMapFragment instead

* Remove unused Near

* Upgrade mapbox sdk versions

* Remove Style import from fragment/NearbyMapFragment

* Remove Style import from **fragments/NearbyParentFragment

* Remove nearby/NearbyMapFragment

* Remove unused/old NearbyFragment and NearbyMapFragment

* Remove import of already removed class

* Make sure you removed everything related with mapbox implementation

* Update mapbox map

* Remove unused classes, do not forget centerMapToPlace doesn't work on this branch

* Remove Style class it required updated version of mapbox map

* Add base codes for new activity

* Prove that our mapbox sdk let us implement the map directly inside the activity

* Add base codes for testing mapbox activity in a single fragment inside activity

* Add codes from mapbox demo repository to test support fragment, map works in a single layer fragment

* Add base codes for test layered fragment activity

* Add Support fragment inside a fragment and proves that layered fragmentw with map works

* Test view pager and tab layout with support map fragment to see it works, it works!

* Move Contributions Fragment related codes to test activity

* Move nearby card methods

* Inject location manager and implement NerabyParentFragmentContract.View on test fragment

* Coppy the content of SupportMapFragment from mapbox repository, use this code to modify later. This method war suggested by mapbox team instead of extending the class

* Implement NearbyMapContract.View on our new SupportMapFragment

* Start to mplement logic of checking permissions

* Fix small dagger issue to inject location manager properly

* Request permission for nearby places if fragment is loaded and tab is selected

* Initialize map operations if map ready and tab is selected

* Markers loads at correct time

* Style the map according to new version of mapbox map

* Add some map elements like FABs and give their actions

* Implement map marker click actions

* Implement nearby Fabs logic with a small issue

* fix FABs are not closing problem

* Unkown problem occurs at map load when I try to use MainActivity again.

* Revert "Unkown problem occurs at map load when I try to use MainActivity again."

This reverts commit 3dc084415b.

* Search this area buttons are added but button function does not work and button visibility is problematic

* Fix issue with MainActivity with the help of Ashish

* Fix search this area button visibility issue

* Fix the issues with updating search nearby markers and camera position together

* Fix progress bar visibility issue

* Prevent loding map each time tab selected

* Take toolbar back

* Implement back button with presenter

* Add click actoion to bottom sheet details

* Add nearby list into bottom sheeet

* Make reuse existing fragments if there is any

* Code cleanup

* Cleanup

* Code cleanup

* Add lifecyle codes to prevent leaks

* Cleanup

* Code cleanup

* cleanup

* Make list item clicked and map focus to same place

* Add bookmark from list fragment

* Make nearby card click action work

* Revert "Fix conflicts"

This reverts commit f3451745d3, reversing
changes made to c5d4d5533d.

* Code cleanup

* Cleanup

* Make recenter button work when list sheet is expanded

* Cleanup

* Code cleanups

* NPE issue is not detected for now, can be solved on seperate PR

* Update map after Wikidata edit

* Cherry picked previously reverted merge, hoping this will fix enourmus amounts of diff files

* Previous merge bringed an file which should be deleted. Delete it.

* Revert irrelevant changes on build.gradle

* Revert irrelevant changes

* Jetbrains annotation is not included to build gradle, this issue caused build issues on my branch so I removed it to be able to build

* Rename ListView

* Use a singleton to access the presenter, instead of passing it to a variable inside fragment

* Fix code style issues

* Move hardcoded colors to colors.xml file

* Make larger methods smaller

* Make current location marker follow

* Do not track users position if user is searching around

* Revert irrelevant shanges at build gradle

* Remove unneeded variable

* Remove mvp directory, add sub directories directly under nearby directory instead

* Remove unneeded public definiton

* Remove unneeded namespace

* Add public defiiton, it is needed to reach the constructor.

* On Logout, fetch the CSRF token and then make the post logout call (#3182)

* Api call for logout

* call clear cached onCompleteSessionLogout

* Correction is passed file name to checkPageExistsUsingTitle, function expects file name prefixed with File: (#3194)

* Merge master (#3196)

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Mapped values-en-gb to values-en-rGB (#3161)

Fixes "Error: Invalid resource directory name" bug.

* Localisation updates from https://translatewiki.net.

* Removes the "Other" deletion option mentioned in #3174 (#3183)

* Localisation updates from https://translatewiki.net.

* Renamed resource file to prevent build from failing (#3189)

* Localisation updates from https://translatewiki.net.

* Removed some jargon/slang from strings.xml (#3162)

* Localisation updates from https://translatewiki.net.

* solve issue Avoid 'form movements' in the login screen #1107 (#2936)

* Disabled review buttons while an image is being loaded (#3185)

* Disabled review buttons while an image is being loaded

* Added javadocs for the new methods

* Fix build

app/src/main/res/layout-land/activity_login.xml

@@ -150,7 +150,7 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/_2fa_code"
                         android:imeOptions="flagNoExtractUi"
-                        android:inputType="textNoSuggestions"
+                        android:inputType="number"
                         android:visibility="gone"
                         tools:visibility="visible" />
 

app/src/main/res/layout-xlarge/activity_login.xml

@@ -151,7 +151,7 @@
                             android:layout_height="wrap_content"
                             android:hint="@string/_2fa_code"
                             android:imeOptions="flagNoExtractUi"
-                            android:inputType="textNoSuggestions"
+                            android:inputType="number"
                             android:visibility="gone"
                             tools:visibility="visible" />
 

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

@@ -156,7 +156,7 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/_2fa_code"
                         android:imeOptions="flagNoExtractUi"
-                        android:inputType="textNoSuggestions"
+                        android:inputType="number"
                         android:visibility="gone"
                         tools:visibility="visible" />
 

app/src/main/res/values-b+tg+Cyrl/error.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
 * Ibrahim
-* ToJack
 -->
 <resources>
-  <string name="crash_dialog_title">Хаиогии Викианбор</string>
-  <string name="crash_dialog_text">Упс. Чизе хато пеш рафт!</string>
-  <string name="crash_dialog_comment_prompt">Ба мо бигуед, ки шумо чӣ кор кардед, ба мо дар имайл нависед. Мо ба шумо кӯмак мерасонем.</string>
   <string name="crash_dialog_ok_toast">Ташаккур!</string>
 </resources>

app/src/main/res/values-b+tg+Cyrl/strings.xml

@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Authors:
-* Ibrahim
-* ToJack
-* Vashgird
--->
 <resources>
   <string name="title_activity_explore">Омӯзиш</string>
   <string name="navigation_item_explore">Омӯзиш</string>
@@ -12,9 +7,7 @@
   <string name="preference_category_feedback">Пешниҳод</string>
   <string name="preference_category_privacy">Ҳарими хусусӣ</string>
   <string name="preference_category_location">Мавқеъ</string>
-  <string name="app_name">Викианбор</string>
   <string name="menu_settings">Танзимот</string>
-  <string name="intent_share_upload_label">Ирсолнамоӣ ба Викианбор</string>
   <string name="username">Номи корбар</string>
   <string name="password">Гузарвожа</string>
   <string name="login_credential">Вурудшавӣ ба ҳисоби Commons Beta</string>
@@ -35,11 +28,10 @@
   <string name="contribution_state_starting">Дар ҳоли боркунӣ</string>
   <string name="menu_from_gallery">Аз Нигористон</string>
   <string name="menu_from_camera">Гирифтани акс</string>
-  <string name="menu_nearby">Наздикӣ</string>
   <string name="provider_contributions">Боргузориҳои ман</string>
   <string name="menu_share">Бо ҳам дидан</string>
   <string name="menu_open_in_browser">Дидан дар Мурургар</string>
-  <string name="share_title_hint" fuzzy="true">Унвон</string>
+  <string name="share_title_hint">Унвон</string>
   <string name="share_description_hint">Тавзеҳот</string>
   <string name="login_failed_generic">Вуруд номуваффақ шуд</string>
   <string name="share_upload_button">Боркунӣ</string>
@@ -97,26 +89,6 @@
   <string name="media_detail_uploaded_date">Рӯзи боркунӣ</string>
   <string name="media_detail_license">Иҷозатнома</string>
   <string name="media_detail_coordinates">Координатҳо</string>
-  <string name="media_detail_coordinates_empty">Пешниҳод нашудааст</string>
-  <string name="commons_logo">Логотипи Викианбор</string>
-  <string name="commons_website">Сомонаи Викианбор</string>
-  <string name="commons_facebook">Викианбор дар Фейсбук</string>
-  <string name="no_image_found">Аксе пайдо нашуд</string>
-  <string name="no_subcategory_found">Ягон зергурӯҳе пайдо нашуд</string>
-  <string name="welcome_image_welcome_wikipedia">Ба Википедиа хуш омадед.</string>
-  <string name="cancel">Пӯшидан</string>
-  <string name="navigation_drawer_open">Кушодан</string>
-  <string name="navigation_drawer_close">Пӯшидан</string>
-  <string name="navigation_item_home">Хона</string>
-  <string name="navigation_item_upload">Боркунӣ</string>
-  <string name="navigation_item_nearby">Наздикӣ</string>
-  <string name="navigation_item_about">Дар бораи</string>
-  <string name="navigation_item_settings">Танзимот</string>
-  <string name="navigation_item_feedback">Пешниҳод</string>
-  <string name="navigation_item_logout">Баромад</string>
-  <string name="navigation_item_notification">Огоҳиҳо</string>
-  <string name="navigation_item_featured_images">Баргузида</string>
-  <string name="navigation_item_review">Тафтиш</string>
   <string name="nearby_info_menu_wikidata_article">Унсури Викидода</string>
   <string name="error_while_cache">Хатогӣ ҳангоми кэшкунии тасвир</string>
   <string name="navigation_item_login">Вуруд</string>

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

@@ -553,7 +553,6 @@
   <string name="delete_helper_show_deletion_title_success">Éxito</string>
   <string name="delete_helper_show_deletion_message_if" fuzzy="true">Se nominó exitosamente  %1$s para ser borrada.</string>
   <string name="delete_helper_show_deletion_title_failed">Falló</string>
-  <string name="delete_helper_show_deletion_message_else">No se pudo solicitar el borrado.</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-gl/strings.xml

@@ -17,7 +17,6 @@
   <string name="preference_category_appearance">Aparencia</string>
   <string name="preference_category_general">Xeral</string>
   <string name="preference_category_feedback">Comentarios</string>
-  <string name="preference_category_privacy">Privacidade</string>
   <string name="preference_category_location">Localización</string>
   <string name="app_name">Commons</string>
   <string name="bullet">•</string>
@@ -99,7 +98,6 @@
   <string name="title_activity_signup">Rexistrarse</string>
   <string name="title_activity_featured_images">Imaxes destacadas</string>
   <string name="title_activity_category_details">Categoría</string>
-  <string name="title_activity_review">Revisión por pares</string>
   <string name="menu_about">Acerca de</string>
   <string name="about_license">A aplicación Wikimedia Commons é unha aplicación de código aberto creada e mantida polos cesionarios e voluntarios da comunidade de Wikimedia. A Fundación Wikimedia non está involucrada na creación, desenvolvemento ou mantemento da aplicación.</string>
   <string name="about_improve">Crear unha nova &lt;a href=\"%1$s\"&gt;incidencia&lt;/a&gt; para informar de problemas e suxestións.</string>
@@ -170,13 +168,11 @@
   <string name="detail_panel_cats_loading">Cargando…</string>
   <string name="detail_panel_cats_none">Ningunha seleccionada</string>
   <string name="detail_description_empty">Sen descrición</string>
-  <string name="detail_discussion_empty">Sen conversas</string>
   <string name="detail_license_empty">Licenza descoñecida</string>
   <string name="menu_refresh">Refrescar</string>
   <string name="storage_permission_title">Pedindo permiso de almacenamento</string>
   <string name="read_storage_permission_rationale">Permiso necesarioː ler un almacenamento externo. A aplicación non pode acceder á súa galería sen isto.</string>
-  <string name="write_storage_permission_rationale">Permiso necesario: Escribir en almacenamento externo. A aplicación non pode acceder á súa cámara/galería sen el.</string>
-  <string name="location_permission_title">Pedindo Permiso de Localización</string>
+  <string name="write_storage_permission_rationale" fuzzy="true">Permiso necesario: Escribir en almacenamento externo. A aplicación non pode acceder á súa cámara sen el.</string>
   <string name="location_permission_rationale">Permiso opcionalː obter a localización actual para suxerir categorías</string>
   <string name="ok">Aceptar</string>
   <string name="title_activity_nearby">Lugares próximos</string>
@@ -187,7 +183,6 @@
   <string name="no">Non</string>
   <string name="media_detail_title">Título</string>
   <string name="media_detail_description">Descrición</string>
-  <string name="media_detail_discussion">Conversa</string>
   <string name="media_detail_author">Autor</string>
   <string name="media_detail_uploaded_date">Data de suba</string>
   <string name="media_detail_license">Licenza</string>
@@ -203,7 +198,7 @@
   <string name="maximum_limit_alert">Non se poden amosar máis de 500</string>
   <string name="enter_valid">Indique un número válido</string>
   <string name="cannot_be_zero">O límite de subas non pode ser 0</string>
-  <string name="set_limit">Establecer o límite de subas recentes</string>
+  <string name="set_limit" fuzzy="true">Establecer o límite de subas recentes</string>
   <string name="login_failed_2fa_not_supported">Actualmente non se permite a autenticación de dous factores.</string>
   <string name="logout_verification">Está seguro de querer saír?</string>
   <string name="commons_logo">Logo de Commons</string>
@@ -238,7 +233,6 @@
   <string name="navigation_item_info">Titorial</string>
   <string name="navigation_item_notification">Notificacións</string>
   <string name="navigation_item_featured_images">Destacados</string>
-  <string name="navigation_item_review">Revisar</string>
   <string name="nearby_needs_permissions">Os sitios situados preto non poden visualizarse sen permisos de localización</string>
   <string name="no_description_found">non se atopou descrición</string>
   <string name="nearby_info_menu_commons_article">Páxina do ficheiro en Commons</string>
@@ -254,7 +248,6 @@
   <string name="upload_problem_image_blurry">A imaxe está borrosa.</string>
   <string name="upload_problem_image_duplicate">A imaxe xa está en Commons.</string>
   <string name="upload_problem_different_geolocation">Esta imaxe foi realizada nunha localización diferente.</string>
-  <string name="upload_problem_fbmd">Por favor sube so fotografías feitas por ti mesmo. Non subas imaxes ou fotografías que atopes nas contas de Facebook de outros.</string>
   <string name="upload_problem_do_you_continue">Aínda quere subir esta imaxe?</string>
   <string name="internet_downloaded">Por favor suba so fotografías feitas por vostede mesmo. Non suba imaxes ou fotografías que descargara da Internet.</string>
   <string name="give_permission">Outorgar permiso</string>
@@ -268,8 +261,6 @@
   <string name="nominate_deletion">Nomear para borrado</string>
   <string name="nominated_for_deletion">Esta imaxe foi nomeada para borrar.</string>
   <string name="nominated_see_more">&lt;u&gt;Consulte a páxina web para ter máis para detalles&lt;/u&gt;</string>
-  <string name="nominating_file_for_deletion">Nomeando %1$d para borrado.</string>
-  <string name="nominating_for_deletion_status">Nomeando ficheiro para borradoː %1$s</string>
   <string name="view_browser">Ver en navegador</string>
   <string name="skip_login">Omitir</string>
   <string name="navigation_item_login">Acceder ao sistema</string>
@@ -281,17 +272,17 @@
   <string name="nearby_location_has_not_changed">A localización non cambiou.</string>
   <string name="nearby_location_not_available">A localización non está dispoñible.</string>
   <string name="location_permission_rationale_nearby">Precísase permiso para amosar unha lista de lugares preto de aquí</string>
-  <string name="get_directions">Obter direccións</string>
-  <string name="read_article">Ler artigo</string>
+  <string name="get_directions" fuzzy="true">OBTER DIRECCIÓNS</string>
+  <string name="read_article" fuzzy="true">LER ARTIGO</string>
   <string name="notifications_welcome">Benvido a Wikimedia Commons, %1$s! Alegrámonos de que estea aquí.</string>
   <string name="notifications_talk_page_message">%1$s deixoulle unha mensaxe na súa páxina de conversa</string>
   <string name="notifications_thank_you_edit">Grazas por realizar unha edición</string>
   <string name="notifications_mention">%1$s mencionouno en %2$s.</string>
   <string name="toggle_view_button">Cambiar modo de visualización</string>
-  <string name="nearby_directions">Como chegar</string>
-  <string name="nearby_wikidata">Wikidata</string>
-  <string name="nearby_wikipedia">Wikipedia</string>
-  <string name="nearby_commons">Commons</string>
+  <string name="nearby_directions" fuzzy="true">COMO CHEGAR</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="about_rate_us">&lt;u&gt;Avalíenos&lt;/u&gt;</string>
   <string name="about_faq">&lt;u&gt;FAQ&lt;/u&gt;</string>
   <string name="welcome_skip_button">Saltar titorial</string>
@@ -308,7 +299,7 @@
   <string name="about_translate_cancel">Cancelar</string>
   <string name="retry">Reintentar</string>
   <string name="showcase_view_got_it_button">Entendido!</string>
-  <string name="showcase_view_whole_nearby_activity">Hai sitios preto de vostede que precisan fotos para ilustrar os seus artigos de Wikipedia.\n\nPremendo en \"Procurar nesta área\" bloquea a localización do mapa e comeza unha procura de lugares na área circundante.</string>
+  <string name="showcase_view_whole_nearby_activity" fuzzy="true">Hai sitios preto de vostede que precisan fotos para ilustrar os seus artigos de Wikipedia</string>
   <string name="showcase_view_list_icon">Premendo neste botón aparecerá unha lista destes lugares</string>
   <string name="showcase_view_plus_fab">Pode cargar unha imaxe de calquera lugar dende a galería ou a cámara</string>
   <string name="no_images_found">Non se atopou ningunha imaxeǃ</string>
@@ -359,16 +350,14 @@
   <string name="add_description">+ Engadir descrición</string>
   <string name="no_recent_searches">Non hai procuras recentes</string>
   <string name="delete_recent_searches_dialog">Está seguro de querer borrar o seu historial de procuras?</string>
-  <string name="delete_search_dialog">Queres borrar esta procura?</string>
   <string name="search_history_deleted">Eliminouse o historial de procuras</string>
   <string name="nominate_delete">Nomear para borrado</string>
-  <string name="delete">Borrar</string>
   <string name="Achievements">Logros</string>
-  <string name="statistics">Estatísticas</string>
+  <string name="statistics" fuzzy="true">ESTATÍSTICAS</string>
   <string name="statistics_thanks">Agradecementos recibidos</string>
   <string name="statistics_featured">Imaxes destacadas</string>
   <string name="statistics_wikidata_edits">Imaxes vía \"Lugares próximos\"</string>
-  <string name="level">Nivel</string>
+  <string name="level" fuzzy="true">NIVEL</string>
   <string name="images_uploaded">Imaxes cargadas</string>
   <string name="image_reverts">Imaxes non revertidas</string>
   <string name="images_used_by_wiki">Imaxes usadas</string>
@@ -466,35 +455,12 @@
   <string name="no_image">Ningunha imaxe usada</string>
   <string name="no_image_reverted">Ningunha imaxe revertida</string>
   <string name="no_image_uploaded">Ningunha imaxe subida</string>
-  <string name="no_notification">Non ten ningunha notificación sen ler</string>
-  <string name="no_archived_notification">Non ten notificacións arquivadas</string>
+  <string name="no_notification" fuzzy="true">Non ten ningunha notificación sen ler</string>
+  <string name="no_archived_notification" fuzzy="true">Non ten notificacións arquivadas</string>
   <string name="share_logs_using">Compartir os rexistros usando</string>
   <string name="menu_option_archived">Ver arquivadas</string>
   <string name="menu_option_unread">Ver as non lidas</string>
   <string name="error_occurred_in_picking_images">Houbo un erro ó escoller as imaxes</string>
   <string name="image_chooser_title">Escoller imaxes a subir</string>
   <string name="please_wait">Por favor, agarde…</string>
-  <string name="skip_image">Saltar esta imaxe</string>
-  <string name="exif_tag_name_author">Autor</string>
-  <string name="exif_tag_name_copyright">Dereitos de autoría</string>
-  <string name="exif_tag_name_location">Localización</string>
-  <string name="exif_tag_name_cameraModel">Modelo da cámara</string>
-  <string name="exif_tag_name_lensModel">Modelo de lente</string>
-  <string name="exif_tag_name_serialNumbers">Números de serie</string>
-  <string name="exif_tag_name_software">Software</string>
-  <string name="share_via">Compartir a aplicación vía...</string>
-  <string name="image_info">Información da imaxe</string>
-  <string name="no_categories_found">Non se atoparon categorías</string>
-  <string name="upload_cancelled">Cancelouse a carga</string>
-  <string name="delete_helper_show_deletion_title_success">Todo correcto</string>
-  <string name="delete_helper_show_deletion_title_failed">Fallou</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">Sen sentido</string>
-  <string name="delete_helper_ask_spam_other">Outro</string>
-  <string name="delete_helper_ask_reason_copyright_press_photo">Foto de prensa</string>
-  <string name="delete_helper_ask_reason_copyright_internet_photo">Foto aleatoria de internet</string>
-  <string name="delete_helper_ask_reason_copyright_logo">Logo</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-hr/strings.xml

@@ -3,7 +3,6 @@
 * Abijeet Patro
 * Anarhistička Maca
 * Astrind
-* Bugoslav
 * MaGa
 -->
 <resources>
@@ -264,7 +263,7 @@
   <string name="no_images_found">Slike nisu pronađene!</string>
   <string name="error_loading_images">Pogrješka prilikom učitavanja slika.</string>
   <string name="image_uploaded_by">Postavio: %1$s</string>
-  <string name="search_tab_title_media">Mediji</string>
+  <string name="search_tab_title_media">Medija</string>
   <string name="search_tab_title_categories">Kategorije</string>
   <string name="explore_tab_title_featured">Istaknuto</string>
   <string name="explore_tab_title_mobile">Učitaj pomoću mobitela</string>

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

@@ -157,5 +157,4 @@
   <string name="title_page_bookmarks_locations">محل وقوع</string>
   <string name="provider_bookmarks">کتاب نشان</string>
   <string name="provider_bookmarks_location">کتاب نشان</string>
-  <string name="delete_helper_show_deletion_title_failed">ناکام تھیا</string>
 </resources>

app/src/main/res/values-tt-cyrl/error.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Authors:
-* Ерней
--->
-<resources>
-  <string name="crash_dialog_ok_toast">Рәхмәт!</string>
-</resources>

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

@@ -316,6 +316,7 @@
   <string name="error_loading_images">Error occurred while loading images.</string>
   <string name="image_uploaded_by">Uploaded by: %1$s</string>
 
+  <string name="block_notification_title">Blocked</string>
   <string name="block_notification">You are blocked from editing Commons</string>
   <string name="appwidget_img">Pic of the Day</string>
   <string name="app_widget_heading">Pic of the Day</string>
@@ -581,4 +582,5 @@ Upload your first media by tapping on the add button.</string>
   <string name="text_copy">Text copied to clipboard</string>
   <string name="notification_mark_read">Notification marked as read</string>
   <string name="some_error">There was some error!</string>
+  <string name="you_must_reset_your_passsword">Something went wrong with login, you must reset your password !!</string>
 </resources>

app/src/main/res/xml/preferences.xml

@@ -70,7 +70,6 @@
         <fr.free.nrw.commons.ui.LongTitlePreferences.LongTitleMultiSelectListPreference
             android:entries="@array/pref_exifTag_entries"
             android:entryValues="@array/pref_exifTag_values"
-            android:defaultValue="@array/pref_exifTag_values"
             android:key="manageExifTags"
             android:title="@string/manage_exif_tags"
             android:summary="@string/manage_exif_tags_summary"/>