From c38e98a49bbda29b4e94f7fb1419c63dff0702d8 Mon Sep 17 00:00:00 2001
From: veyndan <veyndan@gmail.com>
Date: Fri, 30 Jun 2017 21:43:45 +0100
Subject: [PATCH 1/9] Redesign Nearby Places list items

---
 app/src/main/res/layout/item_place.xml | 120 +++++++++++++------------
 app/src/main/res/values/colors.xml     |   1 -
 app/src/main/res/values/dimens.xml     |   3 -
 3 files changed, 61 insertions(+), 63 deletions(-)

diff --git a/app/src/main/res/layout/item_place.xml b/app/src/main/res/layout/item_place.xml
index 1c83aef53..88784857b 100644
--- a/app/src/main/res/layout/item_place.xml
+++ b/app/src/main/res/layout/item_place.xml
@@ -1,66 +1,68 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:foreground="?attr/selectableItemBackground"
-    android:layout_height="@dimen/icon_size"
+    android:layout_height="wrap_content"
+    android:foreground="?selectableItemBackground"
+    android:minHeight="72dp"
     >
 
-    <RelativeLayout
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:background="@android:color/white"
+        android:contentDescription="@string/no_image_found"
+        android:scaleType="centerCrop"
+        android:src="@drawable/empty_photo"
+        />
+
+    <TextView
+        android:id="@+id/distance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="16dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+        tools:text="@string/placeholder_place_distance"
+        />
+
+    <TextView
+        android:id="@+id/tvName"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/distance"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_toEndOf="@id/icon"
+        android:layout_toLeftOf="@id/distance"
+        android:layout_toRightOf="@id/icon"
+        android:layout_toStartOf="@id/distance"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+        tools:text="@string/placeholder_place_name"
+        />
 
-        <ImageView
-            android:id="@+id/icon"
-            android:layout_width="@dimen/icon_size"
-            android:layout_height="match_parent"
-            android:src="@drawable/empty_photo"
-            android:background="#ffffff"
-            android:scaleType="centerCrop"
-            android:contentDescription="@string/no_image_found"
-            />
+    <TextView
+        android:id="@+id/tvDesc"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignEnd="@id/distance"
+        android:layout_alignLeft="@id/tvName"
+        android:layout_alignRight="@id/distance"
+        android:layout_alignStart="@id/tvName"
+        android:layout_below="@id/tvName"
+        android:layout_marginBottom="16dp"
+        android:ellipsize="end"
+        android:maxLines="4"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        tools:text="@string/placeholder_place_description"
+        />
 
-        <TextView
-            android:id="@+id/distance"
-            android:layout_width="@dimen/icon_size"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/icon"
-            android:gravity="center"
-            android:padding="@dimen/tiny_margin"
-            style="?android:textAppearanceSmallInverse"
-            android:textColor="#ffffff"
-            android:background="@color/text_background"
-            tools:text="@string/placeholder_place_distance"
-            />
-
-        <TextView
-            android:id="@+id/tvName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@+id/icon"
-            android:layout_toRightOf="@+id/icon"
-            android:paddingTop="@dimen/small_margin"
-            android:paddingLeft="@dimen/small_margin"
-            android:paddingRight="@dimen/small_margin"
-            android:maxLines="2"
-            android:ellipsize="none"
-            style="?android:textAppearanceMedium"
-            tools:text="@string/placeholder_place_name"
-            />
-
-        <TextView
-            android:id="@+id/tvDesc"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@+id/icon"
-            android:layout_toRightOf="@+id/icon"
-            android:layout_below="@+id/tvName"
-            android:padding="@dimen/small_margin"
-            android:ellipsize="none"
-            android:maxLines="4"
-            style="?android:textAppearanceSmall"
-            tools:text="@string/placeholder_place_description"
-            />
-
-    </RelativeLayout>
-</FrameLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 01401aa47..828d5a600 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,6 @@
     <!-- Some colours are same for dark/light themes. They are written two times in case
     we want to change light ones later.
       -->
-    <color name="text_background">#90000000</color>
     <color name="item_white_background">#ffffffff</color>
     <color name="main_background_dark">#000000</color>
     <color name="main_background_light">#ffffff</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fe2674a9a..40c859118 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,7 +1,4 @@
 <resources>
-    <dimen name="icon_size">120dp</dimen>
-    <dimen name="tiny_margin">4dp</dimen>
-    <dimen name="small_margin">8dp</dimen>
     <dimen name="bottom_peak_height">240dp</dimen>
     <dimen name="overflow_button_dimen">48dp</dimen>
 </resources>

From 16487556dcc02ac0eb3376823d4d5c172bd5cd4a Mon Sep 17 00:00:00 2001
From: Vishan Seru <vishanseru9@gmail.com>
Date: Fri, 25 Aug 2017 11:42:17 +0530
Subject: [PATCH 2/9] Added callback when removing accounts on logout to ensure
 that post logout screen transition happens only after complete logout
 procedure is complete.

---
 .../free/nrw/commons/CommonsApplication.java  | 55 ++++++++++++++-----
 .../commons/theme/NavigationBaseActivity.java | 21 ++++---
 2 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
index 8d6332c6a..c8e7c7fa8 100644
--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -2,6 +2,8 @@ package fr.free.nrw.commons;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.app.Application;
@@ -11,6 +13,7 @@ import android.content.pm.PackageManager;
 import android.database.sqlite.SQLiteDatabase;
 import android.preference.PreferenceManager;
 import android.support.v4.util.LruCache;
+import android.util.Log;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.stetho.Stetho;
@@ -32,6 +35,7 @@ import fr.free.nrw.commons.modifications.ModifierSequence;
 import fr.free.nrw.commons.mwapi.ApacheHttpClientMediaWikiApi;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.nearby.NearbyPlaces;
+import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import fr.free.nrw.commons.utils.FileUtils;
 import timber.log.Timber;
 
@@ -190,7 +194,7 @@ public class CommonsApplication extends Application {
                 pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_FRONT);
     }
 
-    public void clearApplicationData(Context context) {
+    public void clearApplicationData(Context context, NavigationBaseActivity.LogoutCompleteListener logoutCompleteListener) {
         File cacheDirectory = context.getCacheDir();
         File applicationDirectory = new File(cacheDirectory.getParent());
         if (applicationDirectory.exists()) {
@@ -204,19 +208,44 @@ public class CommonsApplication extends Application {
 
         AccountManager accountManager = AccountManager.get(this);
         Account[] allAccounts = accountManager.getAccountsByType(AccountUtil.accountType());
-        for (Account allAccount : allAccounts) {
-            accountManager.removeAccount(allAccount, null, null);
-        }
 
-        //TODO: fix preference manager 
-        PreferenceManager.getDefaultSharedPreferences(getInstance()).edit().clear().commit();
-        SharedPreferences preferences = context
-                .getSharedPreferences("fr.free.nrw.commons", MODE_PRIVATE);
-        preferences.edit().clear().commit();
-        context.getSharedPreferences("prefs", Context.MODE_PRIVATE).edit().clear().commit();
-        preferences.edit().putBoolean("firstrun", false).apply();
-        updateAllDatabases();
-        currentAccount = null;
+        AccountManagerCallback<Boolean> accountManagerCallback = new AccountManagerCallback<Boolean>() {
+            int index = 0;
+            @Override
+            public void run(AccountManagerFuture<Boolean> accountManagerFuture) {
+                index++;
+
+                try {
+                    if(accountManagerFuture.getResult())
+                    {
+                        Timber.d("Account removed successfully.");
+                    }
+                }
+                catch (OperationCanceledException | NullPointerException | IOException | AuthenticatorException e) {
+                    e.printStackTrace();
+                }
+
+                if(index == allAccounts.length)
+                {
+                    Timber.d("All accounts have been removed");
+                    //TODO: fix preference manager
+                    PreferenceManager.getDefaultSharedPreferences(getInstance()).edit().clear().commit();
+                    SharedPreferences preferences = context
+                            .getSharedPreferences("fr.free.nrw.commons", MODE_PRIVATE);
+                    preferences.edit().clear().commit();
+                    context.getSharedPreferences("prefs", Context.MODE_PRIVATE).edit().clear().commit();
+                    preferences.edit().putBoolean("firstrun", false).apply();
+                    updateAllDatabases();
+                    currentAccount = null;
+
+                    logoutCompleteListener.onLogoutComplete();
+                }
+            }
+        };
+
+        for (Account account : allAccounts) {
+            accountManager.removeAccount(account, accountManagerCallback, null);
+        }
     }
 
     /**
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 6710b6367..41e9a40a9 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -25,6 +25,7 @@ import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.contributions.ContributionsActivity;
 import fr.free.nrw.commons.nearby.NearbyActivity;
 import fr.free.nrw.commons.settings.SettingsActivity;
+import timber.log.Timber;
 
 public class NavigationBaseActivity extends BaseActivity
         implements NavigationView.OnNavigationItemSelectedListener {
@@ -132,13 +133,15 @@ public class NavigationBaseActivity extends BaseActivity
                         .setCancelable(false)
                         .setPositiveButton(R.string.yes, (dialog, which) -> {
                             ((CommonsApplication) getApplicationContext())
-                                    .clearApplicationData(NavigationBaseActivity.this);
-                            Intent nearbyIntent = new Intent(
-                                    NavigationBaseActivity.this, LoginActivity.class);
-                            nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                            nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            startActivity(nearbyIntent);
-                            finish();
+                                    .clearApplicationData(NavigationBaseActivity.this, () -> {
+                                        Timber.d("Logout complete callback received.");
+                                        Intent nearbyIntent = new Intent(
+                                                NavigationBaseActivity.this, LoginActivity.class);
+                                        nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                                        nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                        startActivity(nearbyIntent);
+                                        finish();
+                                    });
                         })
                         .setNegativeButton(R.string.no, (dialog, which) -> dialog.cancel())
                         .show();
@@ -147,4 +150,8 @@ public class NavigationBaseActivity extends BaseActivity
                 return false;
         }
     }
+
+    public interface LogoutCompleteListener {
+        void onLogoutComplete();
+    }
 }

From ae0e051227711e85cf6bdd5387b687130bba85d2 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Mon, 28 Aug 2017 07:37:25 +0200
Subject: [PATCH 3/9] Localisation updates from https://translatewiki.net.

---
 app/src/main/res/values-ast/strings.xml    | 5 -----
 app/src/main/res/values-bn/strings.xml     | 4 ----
 app/src/main/res/values-csb/strings.xml    | 1 -
 app/src/main/res/values-da/strings.xml     | 5 -----
 app/src/main/res/values-de/strings.xml     | 5 -----
 app/src/main/res/values-es/strings.xml     | 5 -----
 app/src/main/res/values-eu/strings.xml     | 7 +------
 app/src/main/res/values-fi/strings.xml     | 1 -
 app/src/main/res/values-fr/strings.xml     | 7 +------
 app/src/main/res/values-gl/strings.xml     | 5 -----
 app/src/main/res/values-hi/error.xml       | 2 +-
 app/src/main/res/values-hi/strings.xml     | 7 +++----
 app/src/main/res/values-it/strings.xml     | 1 -
 app/src/main/res/values-iw/strings.xml     | 5 -----
 app/src/main/res/values-kab/strings.xml    | 5 -----
 app/src/main/res/values-ko/strings.xml     | 5 -----
 app/src/main/res/values-lb/strings.xml     | 3 ---
 app/src/main/res/values-lv/strings.xml     | 2 --
 app/src/main/res/values-mk/strings.xml     | 5 -----
 app/src/main/res/values-nb/strings.xml     | 5 -----
 app/src/main/res/values-nl/strings.xml     | 2 --
 app/src/main/res/values-pl/strings.xml     | 2 --
 app/src/main/res/values-pms/strings.xml    | 5 -----
 app/src/main/res/values-pt-rBR/strings.xml | 5 -----
 app/src/main/res/values-qq/strings.xml     | 2 --
 app/src/main/res/values-sk/strings.xml     | 1 -
 app/src/main/res/values-skr/strings.xml    | 1 -
 app/src/main/res/values-sr/strings.xml     | 1 -
 app/src/main/res/values-su/strings.xml     | 5 -----
 app/src/main/res/values-sv/strings.xml     | 5 -----
 app/src/main/res/values-vi/strings.xml     | 1 -
 app/src/main/res/values-zh-rTW/strings.xml | 5 -----
 app/src/main/res/values-zh/strings.xml     | 5 -----
 33 files changed, 6 insertions(+), 119 deletions(-)

diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index 0a77dc844..7caa2ea07 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Error al poner les fotos na caché</string>
   <string name="title_info">Un títulu descriptivu únicu pal ficheru, que sirvirá para da-y nome al ficheru. Se pue usar llinguax normal con espacios. Nun amiestes la estensión del ficheru</string>
   <string name="description_info">Por favor, describi l\'elementu multimedia tantu como sía posible: ¿ónde se tomó?, ¿qué amuesa?, ¿cuál ye\'l contestu? Por favor, describi los oxetos o persones. Revela la información que nun pueda aldovinase de mou cenciellu, por casu el momentu del día si ye un paisaxe. Si\'l mediu amuesa daqué desacostumao, esplica qué lo fai raro.</string>
-  <string name="feedback_popup_title">Agradecemos opiniones</string>
-  <string name="feedback_popup_description">Tamos planificando delles carauterístiques y ameyoramientos nuevos pa l\'aplicación. ¿Prestaríate revisales y dar la to opinión?\n\n(Siempres puedas aportar a esto escoyendo «Planes de los desendolcadores» nel caxón de navegación)</string>
-  <string name="feedback_popup_decline">Non, gracies</string>
-  <string name="feedback_popup_accept">Claro, ¡llévame ende!</string>
-  <string name="navigation_item_developer_plans">Planes de los desendolcadores</string>
 </resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 9227e104b..21a05851c 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -184,8 +184,4 @@
   <string name="no_description_found">কোন বিবরণ পাওয়া যায়নি</string>
   <string name="nearby_info_menu_commons_article">কমন্সে ফাইলের পাতা</string>
   <string name="nearby_info_menu_wikidata_article">উইকিউপাত্ত পদ</string>
-  <string name="feedback_popup_title">মতামত প্রয়োজন</string>
-  <string name="feedback_popup_decline">না, ধন্যবাদ</string>
-  <string name="feedback_popup_accept">নিশ্চয়ই, আমাকে সেখানে নিয়ে যান!</string>
-  <string name="navigation_item_developer_plans">উন্নয়নকারীর পরিকল্পনা</string>
 </resources>
diff --git a/app/src/main/res/values-csb/strings.xml b/app/src/main/res/values-csb/strings.xml
index de5ccab3f..01ceaea47 100644
--- a/app/src/main/res/values-csb/strings.xml
+++ b/app/src/main/res/values-csb/strings.xml
@@ -160,5 +160,4 @@
   <string name="no_description_found">felënk òpisënka</string>
   <string name="nearby_info_menu_commons_article">Starna lopka w Commons</string>
   <string name="nearby_info_menu_wikidata_article">Element Wikipòdôwków</string>
-  <string name="feedback_popup_decline">Nié, dzãkùjã</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index b3828fbd6..df53005b7 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Fejl under mellemlagring af billeder</string>
   <string name="title_info">En unik beskrivelse for filen, som vil fungere som et filnavn. Du kan bruge normalt sprog med mellemrum. Udelad filendelsen.</string>
   <string name="description_info">Beskriv mediet så godt som muligt: Hvor blev det taget? Hvad viser det? Hvad er konteksten? Beskriv objekterne eller personerne. Giv information som ikke nemt kan gættes, for eksempel hvornår på dagen billedet blev taget, om det er et landskabsbillede. Om billedet viser noget usædvanligt, forklar hvad som gør det usædvanlig.</string>
-  <string name="feedback_popup_title">Tilbagemelding ønskes</string>
-  <string name="feedback_popup_description">Vi planlægger flere funktioner og forbedringer i appen! Ønsker du at prøve dem ud og give tilbagemelding?\n\n(Du kan altid få tilgang til dette ved at vælge »Udviklerplaner« i navigationmenuen)</string>
-  <string name="feedback_popup_decline">Nej tak</string>
-  <string name="feedback_popup_accept">O.k., vis mig!</string>
-  <string name="navigation_item_developer_plans">Udviklerplaner</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0d0b054e1..31a9c8f9c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Fehler beim Zwischenspeichern der Bilder</string>
   <string name="title_info">Ein eindeutiger beschreibender Titel für die Datei, der als Dateiname dient. Du kannst Klartext mit Leerzeichen verwenden. Gib nicht die Dateierweiterung mit an.</string>
   <string name="description_info">Bitte beschreibe das Medium so gut wie möglich: Wo wurde es aufgenommen? Was zeigt es? Was ist der Kontext? Bitte beschreibe die Objekte oder Personen. Zeige Informationen auf, die nicht einfach erraten werden können, zum Beispiel die Tageszeit, falls es eine Landschaft ist. Falls das Medium etwas Ungewöhnliches zeigt, erkläre bitte, was es ungewöhnlich macht.</string>
-  <string name="feedback_popup_title">Rückmeldung erwünscht</string>
-  <string name="feedback_popup_description">Wir planen mehrere neue Funktionen und Verbesserungen für die App! Möchtest du sie dir anschauen und eine Rückmeldung geben?\n\nDu kannst immer auf diese Meldung zugreifen, indem du in der Navigation „Entwicklerpläne“ auswählst.</string>
-  <string name="feedback_popup_decline">Nein danke</string>
-  <string name="feedback_popup_accept">Sicher, bring mich dorthin!</string>
-  <string name="navigation_item_developer_plans">Entwicklerpläne</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3683e9ae3..16d345a37 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Error mientras se guardaban imágenes en la caché</string>
   <string name="title_info">Un título único descriptivo para el archivo, que servirá como un nombre de archivo. Puede usar un lenguaje claro con espacios. No incluya la extensión del archivo.</string>
   <string name="description_info">Por favor, describa el elemento multimedia tanto como sea posible: ¿dónde fue tomado?, ¿qué muestra?, ¿cuál es el contexto? Por favor, describa los objetos o personas. Ofrezca la información que no puede ser inferida tan facilmente, por ejemplo el momento del día si es un paisaje. Si el medio muestra algo inusual, explique qué lo hace insual.</string>
-  <string name="feedback_popup_title">Se aprecian comentarios</string>
-  <string name="feedback_popup_description">Estamos planeando muchas funcionalidades nuevas y mejoras para la aplicación. ¿Te gustaría reseñarlas y comentar tu opinión?\n\n(Siempre puedas acceder a esto seleccionando \"Planes de los desarrolladores\" en el cajón de navegación)</string>
-  <string name="feedback_popup_decline">No, gracias</string>
-  <string name="feedback_popup_accept">Seguro, ¡vamos ahí!</string>
-  <string name="navigation_item_developer_plans">Planes de los desarrolladores</string>
 </resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 0c8a67160..d74b5b900 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -23,7 +23,7 @@
   <string name="title_activity_contributions">Nire azken igoerak</string>
   <string name="contribution_state_queued">Itxoite-zerrendan</string>
   <string name="contribution_state_failed">Hutsegitea</string>
-  <string name="contribution_state_in_progress">%1$d%% egina</string>
+  <string name="contribution_state_in_progress">%% %1$d egina</string>
   <string name="contribution_state_starting">Igotzen</string>
   <string name="menu_from_gallery">Galeriatik</string>
   <string name="menu_from_camera">Argazkia egin</string>
@@ -137,9 +137,4 @@
   <string name="nearby_info_menu_commons_article">Artxibo orrialde komuna</string>
   <string name="nearby_info_menu_wikidata_article" fuzzy="true">WikiData Artikulua</string>
   <string name="error_while_cache">Argazkiak hartzerakoan sortutako akatsa</string>
-  <string name="feedback_popup_title">Kritika nahi da</string>
-  <string name="feedback_popup_description">Aplikaziorako karakteristika eta hobekuntza berriak prestatzen ari gara! Zure iritzia eman nahi diguzu hauen inguruan?\n\n(\"Garatzaile planak\" hautatuz sartu zaitezke)</string>
-  <string name="feedback_popup_decline">Ez, eskerrik asko</string>
-  <string name="feedback_popup_accept">Noski, eraman nazazu hara!</string>
-  <string name="navigation_item_developer_plans">Garatzaile planak</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 2ba7c87a8..eafc67609 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -168,5 +168,4 @@
   <string name="navigation_item_logout">Kirjaudu ulos</string>
   <string name="nearby_info_menu_commons_article">Commons-tiedostosivu</string>
   <string name="nearby_info_menu_wikidata_article">Wikidata-kohde</string>
-  <string name="feedback_popup_decline">Ei kiitos</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5bd20d56e..34d47a881 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -27,7 +27,7 @@
   <string name="title_activity_contributions">Mes téléversements récents</string>
   <string name="contribution_state_queued">Mis en file d\'attente</string>
   <string name="contribution_state_failed">Échoué</string>
-  <string name="contribution_state_in_progress">%1$d%% effectué</string>
+  <string name="contribution_state_in_progress">%1$d %% effectué</string>
   <string name="contribution_state_starting">Téléversement en cours</string>
   <string name="menu_from_gallery">Depuis la galerie</string>
   <string name="menu_from_camera">Prendre une photo</string>
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Erreur en mettant les images en cache</string>
   <string name="title_info">Un titre descriptif unique pour le fichier, qui servira de nom de fichier. Vous pouvez utiliser un langage simple avec des espaces. N’incluez pas l’extension du fichier</string>
   <string name="description_info">Veuillez décrire le média autant que possible : Où a-t-il été enregistré ? Que montre-t-il ? Quel est le contexte ? Veuillez décrire les objets ou les personnes. Révélez les informations qui ne peuvent pas être devinées facilement, par exemple l’heure de la journée si c’est un paysage. Si le média montre quelque chose d’inhabituel, veuillez expliquer ce qui le rend exceptionnel.</string>
-  <string name="feedback_popup_title">Avis demandé</string>
-  <string name="feedback_popup_description">Nous planifions plusieurs nouvelles fonctionnalités et améliorations pour l’application ! Voudriez-vous les voir et donner votre avis ? \n\n(Vous pouvez toujours accéder à cela en sélectionnant « Plans du développeur » dans le panneau de navigation)</string>
-  <string name="feedback_popup_decline">Non merci</string>
-  <string name="feedback_popup_accept">Bien sûr, amenez-y-moi !</string>
-  <string name="navigation_item_developer_plans">Plans du développeur</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 5c47c02d5..09c127df0 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Erro mentras se gardaban as imaxes na caché</string>
   <string name="title_info">Un título único descritivo para o ficheiro, que servirá como un nome de ficheiro. Pode usar unha linguaxe clara con espazos. Non inclúa a extensión do ficheiro</string>
   <string name="description_info">Por favor, describa o ficheiro todo o posibleː Onde se gravou? Cal é o contexto? Por favor, describa os obxectos ou persoas. Indique información que non pode ser adiviñada de forma doada, por exemplo, a hora do día se é unha paisaxe. Se o ficheiro amosa algo pouco habitual, por favor, explique que é o que o fai excepcional.</string>
-  <string name="feedback_popup_title">Aprécianse comentarios</string>
-  <string name="feedback_popup_description">Estamos planeando moitas funcionalidades novas e melloras para a aplicaciónǃ Gustaríalle revisalas e comentar a súa opinión?\n\n(Sempre pode acceder a isto seleccionando \"Plans dos desenvolvedores\" no panel de navegación)</string>
-  <string name="feedback_popup_decline">Non, grazas</string>
-  <string name="feedback_popup_accept">Claro, lévame alí!</string>
-  <string name="navigation_item_developer_plans">Plans de desenvolvedor</string>
 </resources>
diff --git a/app/src/main/res/values-hi/error.xml b/app/src/main/res/values-hi/error.xml
index e784afff2..d4a796db4 100644
--- a/app/src/main/res/values-hi/error.xml
+++ b/app/src/main/res/values-hi/error.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="crash_dialog_title">कॉमन्स क्रैश हो गया</string>
-  <string name="crash_dialog_text">ओह, कुछ गलती हो गया!</string>
+  <string name="crash_dialog_text">ओह, कुछ गलत हो गया!</string>
   <string name="crash_dialog_comment_prompt">कृपया हमें बतायें कि आप क्या कर रहे थे, और उस जानकारी को ईमेल से भेज दें, जिससे इसे सुधारा जा सके।</string>
   <string name="crash_dialog_ok_toast">धन्यवाद!</string>
 </resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index fe2cdc9cd..148fd908e 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">कॉमन्स</string>
-  <string name="menu_settings">पसंद</string>
+  <string name="menu_settings">सेटिंग्स</string>
   <string name="username">सदस्य नाम</string>
   <string name="password">पासवर्ड</string>
   <string name="login">प्रवेश</string>
@@ -117,9 +117,9 @@
   <string name="tutorial_3_subtext">- सेल्फी या अपने दोस्तों की तस्वीरें\n- इंटरनेट से डाउनलोड की गई तस्वीरें\n- किसी निजी एप का स्क्रीनशॉट</string>
   <string name="tutorial_4_text">अपलोड का उदाहरण:</string>
   <string name="tutorial_4_subtext">- शीर्षक: सिडनी ओपेरा हाउस\n- विवरण: सिडनी ओपेरा हाउस खाड़ी के पार से देखा गया\n- श्रेणियाँ: सिडनी ओपेरा हाउस, पश्चिम से सिडनी ओपेरा हाउस, सिडनी ओपेरा हाउस दूर से</string>
-  <string name="welcome_wikipedia_text">अपने छवियों का योगदान करें और विकिपीडिया के लेखों को जीवित करने में सहायता करें।</string>
+  <string name="welcome_wikipedia_text">अपने छवियों का योगदान करें। विकिपीडिया के लेखों को जीवित करने में सहायता करें।</string>
   <string name="welcome_wikipedia_subtext">विकिपीडिया में छवि विकिमीडिया कॉमन्स से आती है।</string>
-  <string name="welcome_copyright_text">आपके लिए चित्र पूरे विश्व के लोगों को शिक्षित करेंगे।</string>
+  <string name="welcome_copyright_text">आपके चित्र पूरे विश्व के लोगों को शिक्षित करेंगे।</string>
   <string name="welcome_copyright_subtext">इंटरनेट से मिली कोई कॉपीराइट सामग्री के साथ साथ पोस्टर, पुस्तक के खड्डे आदि को भी अपलोड करने से बचें।</string>
   <string name="welcome_final_text">जो आपने सोचा वो मिला?</string>
   <string name="welcome_final_button_text">हाँ!</string>
@@ -145,5 +145,4 @@
   <string name="become_a_tester_title">बीटा परीक्षक बनें</string>
   <string name="use_wikidata">विकिडेटा का प्रयोग करें</string>
   <string name="maximum_limit">अधिकतम सीमा</string>
-  <string name="feedback_popup_decline">नहीं, धन्यवाद</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6e7d8de5c..6f0cb7a18 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -166,5 +166,4 @@
   <string name="no_description_found">nessuna descrizione trovata</string>
   <string name="nearby_info_menu_commons_article">Pagina di Commons del file</string>
   <string name="nearby_info_menu_wikidata_article">Elemento Wikidata</string>
-  <string name="feedback_popup_decline">No, grazie</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index b1cd29955..aa6d1662d 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -190,9 +190,4 @@
   <string name="error_while_cache">שגיאה במשירת תמונות במטמון</string>
   <string name="title_info">כותרת מתארת ייחודית לקובץ, שתשמש שם קובץ. אפשר להשתמש בשפה פשוטה עם רווחים. אין לכלול סיומת קובץ</string>
   <string name="description_info">נא לתאר את המדיה כמה שיותר: איפה היא נוצרה? מה היא מראה? מה ההקשר? נא לתאר את העצמים או את האנשים. נא לחשוף מידע שאי־אפשר לנחש בקלות, למשל, הזמן ביום אם זאת תמונת נוף. אם המדיה מציגה משהו בלתי־רגיל, נא להסביר מה מיוחד בה.</string>
-  <string name="feedback_popup_title">אנחנו מזמינים משוב</string>
-  <string name="feedback_popup_description">אנחנו מתכננים מספר יכולות חדשות ושיפורים ליישום! האם מעניין אותך לסקור אותם ולשלוח משוב?\n\n(תמיד אפשר לגשת לזה באמצעות לחיצה על \"תוכניות מפתחים\" במגירת הניווט.)</string>
-  <string name="feedback_popup_decline">לא תודה</string>
-  <string name="feedback_popup_accept">בטח, קחו אותי לשם!</string>
-  <string name="navigation_item_developer_plans">תוכניות מפתחים</string>
 </resources>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index fc979a73e..d56c799d7 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Tuccḍa di tririt n tugniwin ar tuffirt</string>
   <string name="title_info">Azwul n useglem asuf i ufaylu, ara ttwasqedcen d isem n ufaylu. Tzemreḍ ad tesqedceḍ tutlayt fessusen s isekkilen ilmawen. Ur sedday ara asiɣzef n ufaylu</string>
   <string name="description_info">Ma ulac aɣilf, seglem amidya s wayen akk i tzemreḍ: Anida yettwasekles? Acu i d-yemmal? D acu-t usatal-is? Seglem tiɣawsiwin neɣ imdanen. Mudd-d talɣut ur yezmiren ad tettwaf s wudem fessusen, amedya akud n wass ma yella d agama. Ma yella admidya yaskan-d ayen ur nuɣ ara tanumi, ini-d d aci i tyettarran d ayen ifazen.</string>
-  <string name="feedback_popup_title">Tikti tettusuter</string>
-  <string name="feedback_popup_description">Nhegga ddeqs n tmahilin timaynutin deg usnas! Tebɣiḍ ad ten-twaliḍ sakin ad d-muddeḍ tikti? \n\n(Tzemreḍ yal tikelt ad tkecmeḍ ar waya s ufran n \"Iɣawasen n uneflay\" deh ugalis n tunigin)</string>
-  <string name="feedback_popup_decline">Uhu tanemmirt</string>
-  <string name="feedback_popup_accept">Amek ih, awi-yi ar din!</string>
-  <string name="navigation_item_developer_plans">Iɣawasen n uneflay</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 31331234a..5489d9e45 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -191,9 +191,4 @@
   <string name="nearby_info_menu_commons_article">공용 파일 문서</string>
   <string name="nearby_info_menu_wikidata_article">위키데이터 항목</string>
   <string name="error_while_cache">그림 캐시 처리 오류</string>
-  <string name="feedback_popup_title">피드백 필요</string>
-  <string name="feedback_popup_description">앱을 위한 일부 새로운 기능과 개선사항을 계획하고 있습니다. 검토해 보시고 의견을 주시겠습니까?\n\n(탐색 표시줄에서 \"개발자 계획\"을 선택하면 여기로 언제나 접근할 수 있습니다)</string>
-  <string name="feedback_popup_decline">괜찮습니다</string>
-  <string name="feedback_popup_accept">물론이죠, 거기 가고싶네요!</string>
-  <string name="navigation_item_developer_plans">개발자 계획</string>
 </resources>
diff --git a/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml
index e96dedfa7..55939f3d8 100644
--- a/app/src/main/res/values-lb/strings.xml
+++ b/app/src/main/res/values-lb/strings.xml
@@ -185,7 +185,4 @@
   <string name="no_description_found">keng Beschreiwung fonnt</string>
   <string name="nearby_info_menu_commons_article">Commons-Fichierssäit</string>
   <string name="nearby_info_menu_wikidata_article">Wikidata-Element</string>
-  <string name="feedback_popup_title">Feedback gewënscht</string>
-  <string name="feedback_popup_decline">Nee, merci</string>
-  <string name="feedback_popup_accept">Sécher, bréngt mech dohin!</string>
 </resources>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index a1dd09735..76413d697 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -87,6 +87,4 @@
   <string name="navigation_item_logout">Iziet</string>
   <string name="navigation_item_info" fuzzy="true">Ievads</string>
   <string name="no_description_found">apraksts nav atrasts</string>
-  <string name="feedback_popup_decline">Nē, paldies</string>
-  <string name="navigation_item_developer_plans">Izstrādātāju plāni</string>
 </resources>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index e9321ce3c..0880d4568 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Грешка при меѓускладирање на сликите</string>
   <string name="title_info">Краток и единствен наслов на податотеката, кој ќе служи како нејзин назив. Можете да користите прост јазик со меѓупростор, но не пишувајте ја податотечната наставка</string>
   <string name="description_info">Објаснете ја податотеката што подобро можете: Каде е направена? Што е прикажано на неа? Кој е контекстот? Опишете ги предметите, објектите и личностите. Дајте сознанија што не можат лесно да се погодат, како на пр. време од денот ако се работи за природен предел. Ако на неа е претставено нешто необично, објаснете зошто прикажаното е необично.</string>
-  <string name="feedback_popup_title">Потребно ни е вашето мислење</string>
-  <string name="feedback_popup_description">Планираме неколку нови можности и подобрувања на прилогот! Дали би сакале да ги прегледате и да ни дадете ваше мислење? \n\n(Ова можете да го сторите во секое време, избирајќи го „Планови за развој“ во изборникот)</string>
-  <string name="feedback_popup_decline">Не, благодарам</string>
-  <string name="feedback_popup_accept">Секако, ајде да видам!</string>
-  <string name="navigation_item_developer_plans">Планови за развој</string>
 </resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 82e18bdc7..4ba52837d 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Feil under mellomlagring av bilder</string>
   <string name="title_info">En unik beskrivende tittel for fila, som vil fungere som filnavn. Du kan bruke vanlig språk med mellomrom. Ikke ta med filendelsen</string>
   <string name="description_info">Beskriv bidraget så mye som mulig: Hvor ble det tatt? Hva viser det? Hva er konteksten? Beskriv objektene eller personene. Gi informasjon som ikke kan gjettes lett, for eksempel når på dagen bildet ble tatt om det er et landskapsbilde. Om bildet viser noe uvanlig, forklar hva som gjør det uvanlig.</string>
-  <string name="feedback_popup_title">Tilbakemelding ønskes</string>
-  <string name="feedback_popup_description">Vi planlegger flere funksjoner og forbedringer i appen! Ønsker du å prøve dem ut og gi tilbakemelding?\n\n(Du kan alltid få tilgang til dette ved å velge «Utviklerplaner» i navigasjonsmenyen)</string>
-  <string name="feedback_popup_decline">Nei takk</string>
-  <string name="feedback_popup_accept">Ok!</string>
-  <string name="navigation_item_developer_plans">Utviklerplaner</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index ec9fc3e4d..d948203aa 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -154,6 +154,4 @@
   <string name="navigation_item_feedback">Terugkoppeling</string>
   <string name="navigation_item_logout">Afmelden</string>
   <string name="error_while_cache">Error tijdens het laden van de afbeeldingen</string>
-  <string name="feedback_popup_decline">Neen, toch bedankt</string>
-  <string name="navigation_item_developer_plans">De plannen van de ontwikkelaar</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3f5ddd0f9..58d8f01e5 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -176,6 +176,4 @@
   <string name="no_description_found">nie znaleziono opisu</string>
   <string name="nearby_info_menu_wikidata_article">Element Wikidanych</string>
   <string name="title_info">Podaj krótką, opisową i unikalną nazwę, która będzie służyła jako nazwa pliku. Możesz używać prostego języka i spacji. Nie dodawaj rozszerzenia pliku.</string>
-  <string name="feedback_popup_decline">Nie, dziękuję</string>
-  <string name="feedback_popup_accept">Chętnie!</string>
 </resources>
diff --git a/app/src/main/res/values-pms/strings.xml b/app/src/main/res/values-pms/strings.xml
index ec8fd170a..5eefdacc6 100644
--- a/app/src/main/res/values-pms/strings.xml
+++ b/app/src/main/res/values-pms/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Eror antramentre ch\'as butavo le plance an memòria local</string>
   <string name="title_info">Un tìtol dëscritiv ùnich për l\'archivi, che a servirà com nòm d\'archivi. A peul dovré un lengagi sempi con djë spassi. Ch\'a ancluda pa l\'estension dl\'archivi</string>
   <string name="description_info">Për piasì, ch\'a descriva ël mojen mej ch\'a peul: Andoa a l\'é stàit fàit? Për piasì, ch\'a descriva j\'oget o le përson-e. Ch\'a arvela j\'anformassion ch\'a l\'é nen belfé andviné, për esempi l\'ora dël dì, s\'a l\'é un panorama. Si ël mojen a smon cheicòs ëd foravìa, për piasì ch\'a spiega lòn ch\'a lo rend foravìa.</string>
-  <string name="feedback_popup_title">Avis ciamà</string>
-  <string name="feedback_popup_description">I antivëddoma vàire neuve fonsionalità e ameliorassion për l\'aplicassion! Vorij-lo vëddje e dene soa opinion?\n\n(A peul sempe acede a sòn an selessionand «Pian dël dësvlupador» ant la plancia ëd navigassion)</string>
-  <string name="feedback_popup_decline">Nò, mersì</string>
-  <string name="feedback_popup_accept">Bò, mneme ambelelà!</string>
-  <string name="navigation_item_developer_plans">Pian dël dësvlupador</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f41b7d191..9ccaff78c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Erro durante o cache de imagens</string>
   <string name="title_info">Um título descritivo exclusivo para o arquivo, que servirá como um nome de arquivo. Você pode usar linguagem simples com espaços. Não inclua a extensão do arquivo</string>
   <string name="description_info">Por favor, descreva a mídia tanto quanto possível: onde foi tomada? O que isso mostra? Qual é o contexto? Descreva os objetos ou pessoas. Revelar informações que não podem ser facilmente adivinhadas, por exemplo, a hora do dia, se for uma paisagem. Se a mídia mostrar algo incomum, explique o que torna incomum.</string>
-  <string name="feedback_popup_title">Feedback desejado</string>
-  <string name="feedback_popup_description">Estamos planejando vários novos recursos e melhorias para o aplicativo! Gostaria de revisá-los e fornecer feedback?\n\n(Você sempre pode acessar isso selecionando \"Planos do desenvolvedor\" na gaveta de navegação)</string>
-  <string name="feedback_popup_decline">Não, obrigado</string>
-  <string name="feedback_popup_accept">Claro, leve-me lá!</string>
-  <string name="navigation_item_developer_plans">Planos de desenvolvedor</string>
 </resources>
diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml
index 57e4d35fc..1e3c13b81 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -112,6 +112,4 @@
   <string name="navigation_item_upload">{{Identical|Upload}}</string>
   <string name="navigation_item_nearby">{{Identical|Nearby}}</string>
   <string name="navigation_item_info">{{Identical|Tutorial}}</string>
-  <string name="feedback_popup_description">\"Developer plans\" is {{msg-wm|Commons-android-strings-navigation item developer plans}}.</string>
-  <string name="feedback_page_url">{{ignored}}</string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index fb6e34754..de36db04b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -152,5 +152,4 @@
   <string name="navigation_item_logout">Odhlásiť sa</string>
   <string name="navigation_item_info">Návod</string>
   <string name="no_description_found">nenašiel sa žiaden popis</string>
-  <string name="feedback_popup_decline">Nie, vďaka</string>
 </resources>
diff --git a/app/src/main/res/values-skr/strings.xml b/app/src/main/res/values-skr/strings.xml
index 024903346..e206e3b65 100644
--- a/app/src/main/res/values-skr/strings.xml
+++ b/app/src/main/res/values-skr/strings.xml
@@ -96,5 +96,4 @@
   <string name="navigation_item_feedback">تہاڈی رائے</string>
   <string name="navigation_item_logout">لاگ آؤٹ</string>
   <string name="nearby_info_menu_wikidata_article">وکی ڈیٹا آئٹم</string>
-  <string name="feedback_popup_decline">کو، شکریہ</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 3071801b1..708596b8b 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -186,5 +186,4 @@
   <string name="navigation_item_logout">Одјави ме</string>
   <string name="nearby_info_menu_commons_article" fuzzy="true">Чланак на Остави</string>
   <string name="nearby_info_menu_wikidata_article" fuzzy="true">Чланак на Википодацима</string>
-  <string name="feedback_popup_decline">Не, хвала</string>
 </resources>
diff --git a/app/src/main/res/values-su/strings.xml b/app/src/main/res/values-su/strings.xml
index b24cc1804..7b399043c 100644
--- a/app/src/main/res/values-su/strings.xml
+++ b/app/src/main/res/values-su/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Kasalahan nalika muat gambar</string>
   <string name="title_info">Judul déskriptif anu unik pikeun berkas, anu bakal miboga fungsi minangka ngaran berkas. Anjeun bisa maké basa basajan kalawan spasi. Ulah ngawuwuhkeun éksténsi berkas</string>
   <string name="description_info">Pék émbarkeun wincikan média saloba-lobabana: Dimana éta dicokot? Naon nu titojokeunna? Naon kontéksna? Pék jéntrékeun obyék atawa jalmana. Ébré informasi anu teu gampang kajudi, kawas wayah mun éta mangrupa pamandangan. Ari média nu némbongkeun perkara nu teu guyub, pék jéntrékeun naon nu ngabalukarkeun éta téh teu guyub.</string>
-  <string name="feedback_popup_title">Eupan balik dipiharep</string>
-  <string name="feedback_popup_description">Kami keur ngarencanakeun sawatara fitur jeung oméanan anyar pikeun ieu aplikasi! Anda daék mariksa jeung méré eupan balik?</string>
-  <string name="feedback_popup_decline">Teu nuhun</string>
-  <string name="feedback_popup_accept">Tangtu, bawa kuring kadinya!</string>
-  <string name="navigation_item_developer_plans">Rencana pangembang</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 318cbbd81..a92418bc4 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">Fel uppstod när bilder cachelagras</string>
   <string name="title_info">En unik beskrivande titel för filen, som kommer att fungera som ett filnamn. Du kan använda klarspråk med mellanslag. Ta inte med filändelsen</string>
   <string name="description_info">Beskriv mediafilen så mycket som möjligt. Var togs den? Vad visar den? Vad är sammanhanget? Beskriv föremålen eller personerna. Ge information som inte kan gissas fram, t.ex. tidpunkten om det är ett landskap. Om mediafilen visar någonting ovanligt, förklara vad som gör den ovanlig.</string>
-  <string name="feedback_popup_title">Återkoppling önskas</string>
-  <string name="feedback_popup_description">Vi planerar flera nya funktioner och förbättringar för appen! Vill du prova dem och ge återkoppling?\n\n(Kan kan alltid komma åt detta genom att markera \"Utvecklarplaner\" i navigeringsmenyn).</string>
-  <string name="feedback_popup_decline">Nej tack</string>
-  <string name="feedback_popup_accept">Visst, ta mig dit!</string>
-  <string name="navigation_item_developer_plans">Utvecklarplaner</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 2060f5ae1..f53e03169 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -163,5 +163,4 @@
   <string name="navigation_item_logout">Đăng xuất</string>
   <string name="navigation_item_info">Hướng dẫn</string>
   <string name="nearby_info_menu_wikidata_article">Khoản mục Wikidata</string>
-  <string name="feedback_popup_decline">Thôi</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a4b443a7a..bb8debaec 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">在快取圖片時發生錯誤</string>
   <string name="title_info">用於本檔案的唯一描述性標題。您可以使用帶有空格的簡明語言，另外請不要包含副檔名。</string>
   <string name="description_info">請盡可能說明媒體內容：拍攝於何處？是顯示什麼事物？有什麼脈絡？請描述對象或人物。透露出一些較不易猜測的訊息，例如是風景的話；可以是一天裡的時間。如果媒體顯示出一些不正常的事物，請說明出造成不正常原因。</string>
-  <string name="feedback_popup_title">需要意見回饋</string>
-  <string name="feedback_popup_description">我們正在為應用程式添加新功能以及改進！您會否想看看，並提供意見？\n\n（您可以隨時透過導覽選單選擇「開發者計劃」來存取該內容）</string>
-  <string name="feedback_popup_decline">不用了，謝謝</string>
-  <string name="feedback_popup_accept">當然，請帶我到那！</string>
-  <string name="navigation_item_developer_plans">開發者計劃</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index f784a6103..2ab5ad140 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -194,9 +194,4 @@
   <string name="error_while_cache">缓存图片时出错</string>
   <string name="title_info">用于文件的唯一描述性标题，它将作为文件名使用。您可以使用有空格的简明语言。请不要包含文件扩展名</string>
   <string name="description_info">请尽可能详细地描述媒体：拍摄在何地？显示什么？例文是什么？请描述对象或个人。透露一些不易猜想到的信息，例如这幅风景画的具体日期时间。如果媒体显示了一些不寻常的事物，请说明为什么它显得不寻常。</string>
-  <string name="feedback_popup_title">需要反馈</string>
-  <string name="feedback_popup_description">我们正在计划为应用添加多个新功能，以及进行多方面改进！您是否需要查阅它们，并提供反馈？\n\n（您随时都可以通过选择导航菜单的“开发人员计划”访问它）</string>
-  <string name="feedback_popup_decline">不用了，谢谢</string>
-  <string name="feedback_popup_accept">好的，带我看看！</string>
-  <string name="navigation_item_developer_plans">开发人员计划</string>
 </resources>

From b094d502d64c2f971bd663a89f38a96cd50ca966 Mon Sep 17 00:00:00 2001
From: Vishan Seru <vishanseru9@gmail.com>
Date: Mon, 28 Aug 2017 12:27:03 +0530
Subject: [PATCH 4/9] Took care of some issues pointed out by codacy in
 relation to the coding guidelines followed specifically to the changes made
 in this branch

---
 .../free/nrw/commons/CommonsApplication.java  | 35 ++++++++++++-------
 .../commons/theme/NavigationBaseActivity.java |  2 +-
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
index c8e7c7fa8..51e139e2b 100644
--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -194,7 +194,7 @@ public class CommonsApplication extends Application {
                 pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_FRONT);
     }
 
-    public void clearApplicationData(Context context, NavigationBaseActivity.LogoutCompleteListener logoutCompleteListener) {
+    public void clearApplicationData(Context context, NavigationBaseActivity.LogoutListener logoutListener) {
         File cacheDirectory = context.getCacheDir();
         File applicationDirectory = new File(cacheDirectory.getParent());
         if (applicationDirectory.exists()) {
@@ -209,24 +209,33 @@ public class CommonsApplication extends Application {
         AccountManager accountManager = AccountManager.get(this);
         Account[] allAccounts = accountManager.getAccountsByType(AccountUtil.accountType());
 
-        AccountManagerCallback<Boolean> accountManagerCallback = new AccountManagerCallback<Boolean>() {
-            int index = 0;
+        AccountManagerCallback<Boolean> amCallback = new AccountManagerCallback<Boolean>() {
+            
+            private int index = 0;
+            
+            void setIndex(int index) {
+                this.index = index;
+            }
+
+            int getIndex() {
+                return index;
+            }
+
             @Override
             public void run(AccountManagerFuture<Boolean> accountManagerFuture) {
-                index++;
+                setIndex(index++);
 
                 try {
-                    if(accountManagerFuture.getResult())
-                    {
-                        Timber.d("Account removed successfully.");
+                    if (accountManagerFuture != null) {
+                        if (accountManagerFuture.getResult()) {
+                            Timber.d("Account removed successfully.");
+                        }
                     }
-                }
-                catch (OperationCanceledException | NullPointerException | IOException | AuthenticatorException e) {
+                } catch (OperationCanceledException | IOException | AuthenticatorException e) {
                     e.printStackTrace();
                 }
 
-                if(index == allAccounts.length)
-                {
+                if (getIndex() == allAccounts.length) {
                     Timber.d("All accounts have been removed");
                     //TODO: fix preference manager
                     PreferenceManager.getDefaultSharedPreferences(getInstance()).edit().clear().commit();
@@ -238,13 +247,13 @@ public class CommonsApplication extends Application {
                     updateAllDatabases();
                     currentAccount = null;
 
-                    logoutCompleteListener.onLogoutComplete();
+                    logoutListener.onLogoutComplete();
                 }
             }
         };
 
         for (Account account : allAccounts) {
-            accountManager.removeAccount(account, accountManagerCallback, null);
+            accountManager.removeAccount(account, amCallback, null);
         }
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 41e9a40a9..8f86f08ab 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -151,7 +151,7 @@ public class NavigationBaseActivity extends BaseActivity
         }
     }
 
-    public interface LogoutCompleteListener {
+    public interface LogoutListener {
         void onLogoutComplete();
     }
 }

From 35fdb4350a8c9eba2074b1b4441306f1887768cb Mon Sep 17 00:00:00 2001
From: Vishan Seru <vishanseru9@gmail.com>
Date: Mon, 28 Aug 2017 12:44:19 +0530
Subject: [PATCH 5/9] Fixed small bug when incrementing counter in
 AccountManagerCallback

---
 app/src/main/java/fr/free/nrw/commons/CommonsApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
index 51e139e2b..02506b679 100644
--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -223,7 +223,7 @@ public class CommonsApplication extends Application {
 
             @Override
             public void run(AccountManagerFuture<Boolean> accountManagerFuture) {
-                setIndex(index++);
+                setIndex(getIndex() + 1);
 
                 try {
                     if (accountManagerFuture != null) {

From d4a89afafdb74003d732f3ddc8e885a0cafc780d Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Mon, 4 Sep 2017 08:58:05 +0200
Subject: [PATCH 6/9] Localisation updates from https://translatewiki.net.

---
 app/src/main/res/values-eu/strings.xml  | 22 ++++++++++++++++++++--
 app/src/main/res/values-hu/strings.xml  |  2 +-
 app/src/main/res/values-skr/strings.xml |  3 +++
 app/src/main/res/values-vi/strings.xml  | 11 +++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index d74b5b900..a9b886bcf 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -76,6 +76,8 @@
   <string name="preference_license">Lizentzia</string>
   <string name="use_previous">Aurreko izenburu/deskribapena erabili</string>
   <string name="allow_gps">Oraingo kokapena automatikoki lortu</string>
+  <string name="preference_theme">Gau modua</string>
+  <string name="preference_theme_summary">Gai iluna erabili</string>
   <string name="license_name_cc_by_sa_four"> Aitortu-PartekatuBerdin 4.0</string>
   <string name="license_name_cc_by_four">Aitortu 4.0</string>
   <string name="license_name_cc_by_sa"> Aitortu-PartekatuBerdin 3.0</string>
@@ -115,15 +117,29 @@
   <string name="media_detail_title">Izenburua</string>
   <string name="media_detail_media_title">Fitxategiaren izenburua</string>
   <string name="media_detail_description">Deskribapena</string>
+  <string name="media_detail_uploaded_date">Igoera data</string>
   <string name="media_detail_license">Lizentzia</string>
   <string name="media_detail_coordinates">Koordenatuak</string>
   <string name="media_detail_coordinates_empty">Ez da eskeini</string>
   <string name="become_a_tester_title">Beta testatzaile bihurtu</string>
   <string name="use_wikidata">Wikidata erabili</string>
   <string name="use_wikidata_summary">(Erne:hau kentzeak mugikorrak datu asko kontsumitzea ekar dezake)</string>
+  <string name="maximum_limit">Gehienezko muga</string>
+  <string name="maximum_limit_alert">500 baino gehiago ezin dira erakutsi</string>
   <string name="commons_logo">Commonsen logoa</string>
   <string name="background_image">Atzealdeko irudia</string>
+  <string name="mediaimage_failed">Media irudiak kale egin du</string>
+  <string name="no_image_found">Ez da irudirik aurkitu</string>
+  <string name="upload_image">Igo irudia</string>
+  <string name="welcome_image_mount_zao">Zao Mendia</string>
+  <string name="welcome_image_llamas">Llamak</string>
+  <string name="welcome_image_rainbow_bridge">Ortzadar zubia</string>
+  <string name="welcome_image_tulip">Tulipa</string>
   <string name="welcome_image_no_selfies">Selfirik ez</string>
+  <string name="welcome_image_proprietary">Jabetza irudia</string>
+  <string name="welcome_image_welcome_wikipedia">Ongi etorri Wikipedia</string>
+  <string name="welcome_image_welcome_copyright">Ongi etorri copyright-a</string>
+  <string name="welcome_image_sydney_opera_house">Sidneiko Opera Etxea</string>
   <string name="cancel">Utzi</string>
   <string name="navigation_drawer_open">Ireki</string>
   <string name="navigation_drawer_close">Itxi</string>
@@ -132,9 +148,11 @@
   <string name="navigation_item_nearby">Gertukoak</string>
   <string name="navigation_item_about">Honi buruz</string>
   <string name="navigation_item_settings">Ezarpenak</string>
+  <string name="navigation_item_feedback">Atzeraelikadura</string>
   <string name="navigation_item_logout">Saioa itxi</string>
-  <string name="navigation_item_info" fuzzy="true">Sarrera</string>
+  <string name="navigation_item_info">Tutoriala</string>
+  <string name="no_description_found">Deskripziorik ez da aurkitu</string>
   <string name="nearby_info_menu_commons_article">Artxibo orrialde komuna</string>
-  <string name="nearby_info_menu_wikidata_article" fuzzy="true">WikiData Artikulua</string>
+  <string name="nearby_info_menu_wikidata_article">Wikidata itema</string>
   <string name="error_while_cache">Argazkiak hartzerakoan sortutako akatsa</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 6736b0bb8..b33b59fba 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -176,5 +176,5 @@
   <string name="navigation_item_info">Bevezető</string>
   <string name="no_description_found">nincs leírás</string>
   <string name="nearby_info_menu_commons_article" fuzzy="true">Commons szócikk</string>
-  <string name="nearby_info_menu_wikidata_article">Wikidata tétel</string>
+  <string name="nearby_info_menu_wikidata_article">Wikidata-elem</string>
 </resources>
diff --git a/app/src/main/res/values-skr/strings.xml b/app/src/main/res/values-skr/strings.xml
index e206e3b65..a1c32f2ee 100644
--- a/app/src/main/res/values-skr/strings.xml
+++ b/app/src/main/res/values-skr/strings.xml
@@ -16,6 +16,7 @@
   <string name="upload_progress_notification_title_start">اپ لوڈ %1$s شروع تھیندا پئے</string>
   <string name="upload_progress_notification_title_in_progress">%1$s اپ لوڈ تھیندا پئے</string>
   <string name="upload_progress_notification_title_finishing">%1$s اپ لوڈ پورا تھیندا پئے</string>
+  <string name="upload_failed_notification_subtitle">ݙیکھݨ کیتے انگل پھیرو</string>
   <string name="title_activity_contributions">میݙے حالیہ اپ لوڈ</string>
   <string name="contribution_state_queued">قطار وچ</string>
   <string name="contribution_state_failed">ناکام</string>
@@ -50,6 +51,7 @@
   <string name="menu_download">ڈاؤن لوڈ ، لہاوݨ</string>
   <string name="preference_license">لائیسنس</string>
   <string name="preference_theme">رات آلا مزاج</string>
+  <string name="preference_theme_summary">گھاٹا تھیم ورتو</string>
   <string name="license_name_cc0">سی سی او</string>
   <string name="license_name_cc_zero">سی سی زیرو</string>
   <string name="tutorial_3_text">براہ مہربانی اپ لوڈ نہ کرو</string>
@@ -72,6 +74,7 @@
   <string name="media_detail_title">عنوان</string>
   <string name="media_detail_media_title">میڈیا دا عنوان</string>
   <string name="media_detail_description">تفصیل</string>
+  <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>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f53e03169..5b9d6192a 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -125,6 +125,7 @@
   <string name="location_permission_rationale">Tùy chọn cấp phép: Định vị hiện tại để nhận gợi ý thể loại</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Nơi Lân cận</string>
+  <string name="no_nearby">Không tìm thấy nơi lân cận</string>
   <string name="warning">Cảnh báo</string>
   <string name="file_exists">Tập tin này đã tồn tại ở Commons. Bạn có chắc chắn muốn tiếp tục?</string>
   <string name="yes">Có</string>
@@ -141,15 +142,23 @@
   <string name="become_a_tester_description">Tham gia kênh thử nghiệm của chúng tôi trên Google Play và nhận các tính năng mới cùng những bản sửa lỗi sớm hơn</string>
   <string name="use_wikidata">Dùng Wikidata</string>
   <string name="use_wikidata_summary">(Cảnh báo: tắt đi có thể tăng sử dụng dữ liệu di động rất lớn)</string>
+  <string name="_2fa_code">Mã Hai Nhân tố</string>
+  <string name="number_of_uploads">Giới hạn Tải lên Gần đây của Tôi</string>
   <string name="maximum_limit">Tối đa</string>
+  <string name="maximum_limit_alert">Không thể hiển thị hơn 500 cái</string>
+  <string name="set_limit">Đặt Giới hạn Tải lên Gần đây</string>
+  <string name="login_failed_2fa_not_supported">Hiện chưa hỗ trợ xác thực dùng hai nhân tố.</string>
+  <string name="logout_verification">Bạn có chắc chắn muốn đăng xuất?</string>
   <string name="commons_logo">Biểu trưng Commons</string>
   <string name="background_image">Hình nền</string>
+  <string name="mediaimage_failed">Hình ảnh bị Thất bại</string>
   <string name="no_image_found">Không tìm thấy Hình ảnh</string>
   <string name="upload_image">Tải lên Hình</string>
   <string name="welcome_image_mount_zao">Núi Zaō</string>
   <string name="welcome_image_llamas">Lạc đà không bướu</string>
   <string name="welcome_image_rainbow_bridge">Cầu Cầu vồng</string>
   <string name="welcome_image_tulip">Tu-líp</string>
+  <string name="welcome_image_no_selfies">Không cho phép Ảnh tự chụp</string>
   <string name="welcome_image_sydney_opera_house">Nhà hát Opera Sydney</string>
   <string name="cancel">Hủy bỏ</string>
   <string name="navigation_drawer_open">Mở</string>
@@ -162,5 +171,7 @@
   <string name="navigation_item_feedback">Phản hồi</string>
   <string name="navigation_item_logout">Đăng xuất</string>
   <string name="navigation_item_info">Hướng dẫn</string>
+  <string name="no_description_found">không tìm thấy miêu tả</string>
+  <string name="nearby_info_menu_commons_article">Trang tập tin Commons</string>
   <string name="nearby_info_menu_wikidata_article">Khoản mục Wikidata</string>
 </resources>

From ccce12ea019cc6ec8be916269b1866fd568dd3b5 Mon Sep 17 00:00:00 2001
From: Paul Hawke <paul.hawke@gmail.com>
Date: Mon, 4 Sep 2017 15:01:19 -0500
Subject: [PATCH 7/9] Removed grey box background on nearby icons

---
 app/src/main/res/drawable/round_icon_airport.xml          | 1 -
 app/src/main/res/drawable/round_icon_bridge.xml           | 1 -
 app/src/main/res/drawable/round_icon_church.xml           | 1 -
 app/src/main/res/drawable/round_icon_forest.xml           | 1 -
 app/src/main/res/drawable/round_icon_generic_building.xml | 1 -
 app/src/main/res/drawable/round_icon_house.xml            | 1 -
 app/src/main/res/drawable/round_icon_mountain.xml         | 1 -
 app/src/main/res/drawable/round_icon_park.xml             | 1 -
 app/src/main/res/drawable/round_icon_river.xml            | 1 -
 app/src/main/res/drawable/round_icon_road.xml             | 1 -
 app/src/main/res/drawable/round_icon_waterfall.xml        | 1 -
 11 files changed, 11 deletions(-)

diff --git a/app/src/main/res/drawable/round_icon_airport.xml b/app/src/main/res/drawable/round_icon_airport.xml
index 9e224165a..4a24f240b 100644
--- a/app/src/main/res/drawable/round_icon_airport.xml
+++ b/app/src/main/res/drawable/round_icon_airport.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#352200" android:pathData="M116.97,97.32c-38.84,0 -71.25,11.73 -78.86,27.34c0.63,7.06 2.16,13.86 4.51,20.28c12.15,12.41 40.86,21.13 74.35,21.13c35.18,0 65.08,-9.63 76.06,-23.04c1.76,-5.21 3,-10.67 3.65,-16.3C191.03,110.1 157.5,97.32 116.97,97.32z"/>
diff --git a/app/src/main/res/drawable/round_icon_bridge.xml b/app/src/main/res/drawable/round_icon_bridge.xml
index c85f8d6e2..efe428b80 100644
--- a/app/src/main/res/drawable/round_icon_bridge.xml
+++ b/app/src/main/res/drawable/round_icon_bridge.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#007F9F" android:pathData="M177.13,170.39c2.87,-3.23 5.47,-6.69 7.79,-10.36c-8.9,-5.09 -35.72,-8.79 -67.42,-8.79s-58.52,3.7 -67.42,8.79c2.32,3.66 4.92,7.13 7.79,10.36c12.51,3.49 34.53,5.81 59.63,5.81C142.6,176.2 164.63,173.88 177.13,170.39z"/>
diff --git a/app/src/main/res/drawable/round_icon_church.xml b/app/src/main/res/drawable/round_icon_church.xml
index e861822d1..c27a52669 100644
--- a/app/src/main/res/drawable/round_icon_church.xml
+++ b/app/src/main/res/drawable/round_icon_church.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#FF000000" android:pathData="M66.97,166.68a50.53,7.7 0,1 0,101.06 0a50.53,7.7 0,1 0,-101.06 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_forest.xml b/app/src/main/res/drawable/round_icon_forest.xml
index c735354bb..c04d643ab 100644
--- a/app/src/main/res/drawable/round_icon_forest.xml
+++ b/app/src/main/res/drawable/round_icon_forest.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="112.8"
     android:viewportWidth="112.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h112.8v112.8h-112.8z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.28 -47.52,47.52c0,26.24 21.27,47.52 47.52,47.52c26.25,0 47.52,-21.28 47.52,-47.52C103.92,30.16 82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03c0,-22.66 18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03C97.43,79.06 79.06,97.43 56.4,97.43z"/>
     <path android:fillColor="#54B948" android:pathData="M56.4,56.73m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
     <path android:fillColor="#352200" android:pathData="M28.6,69.79a27.8,10.31 0,1 0,55.6 0a27.8,10.31 0,1 0,-55.6 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_generic_building.xml b/app/src/main/res/drawable/round_icon_generic_building.xml
index a3b26f7b3..9e8f13593 100644
--- a/app/src/main/res/drawable/round_icon_generic_building.xml
+++ b/app/src/main/res/drawable/round_icon_generic_building.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.001" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48s85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M117.5,117.5m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
     <path android:fillColor="#FF000000" android:pathData="M73.44,165.32a44.06,7.71 0,1 0,88.13 0a44.06,7.71 0,1 0,-88.13 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_house.xml b/app/src/main/res/drawable/round_icon_house.xml
index 35bf984a6..e69e05eba 100644
--- a/app/src/main/res/drawable/round_icon_house.xml
+++ b/app/src/main/res/drawable/round_icon_house.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#FF000000" android:pathData="M64.19,148.92a53.31,8.12 0,1 0,106.62 0a53.31,8.12 0,1 0,-106.62 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_mountain.xml b/app/src/main/res/drawable/round_icon_mountain.xml
index 1551ede7f..46c9999a0 100644
--- a/app/src/main/res/drawable/round_icon_mountain.xml
+++ b/app/src/main/res/drawable/round_icon_mountain.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.68,0 99,-44.33 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#54B948" android:pathData="M117.5,118.19m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
     <path android:fillColor="#FF000000" android:pathData="M54.44,151.1a62.06,8.91 0,1 0,124.12 0a62.06,8.91 0,1 0,-124.12 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_park.xml b/app/src/main/res/drawable/round_icon_park.xml
index 877c5fcd4..ed19fe8de 100644
--- a/app/src/main/res/drawable/round_icon_park.xml
+++ b/app/src/main/res/drawable/round_icon_park.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#54B948" android:pathData="M50.99,153.38a65.64,7.45 0,1 0,131.28 0a65.64,7.45 0,1 0,-131.28 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_river.xml b/app/src/main/res/drawable/round_icon_river.xml
index c7304cc10..27dbaab62 100644
--- a/app/src/main/res/drawable/round_icon_river.xml
+++ b/app/src/main/res/drawable/round_icon_river.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="112.801"
     android:viewportWidth="112.801" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h112.8v112.8h-112.8z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.27 -47.52,47.52c0,26.24 21.27,47.52 47.52,47.52c26.25,0 47.52,-21.27 47.52,-47.52C103.92,30.16 82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03c0,-22.66 18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03C97.43,79.06 79.06,97.43 56.4,97.43z"/>
     <path android:fillColor="#54B948" android:pathData="M56.4,56.4m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
     <path android:fillColor="#352200" android:pathData="M19.31,61.45a36.97,17.44 0,1 0,73.93 0a36.97,17.44 0,1 0,-73.93 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_road.xml b/app/src/main/res/drawable/round_icon_road.xml
index a556a9efc..4c5cb98ef 100644
--- a/app/src/main/res/drawable/round_icon_road.xml
+++ b/app/src/main/res/drawable/round_icon_road.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="234.999"
     android:viewportWidth="235.001" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48s85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#352200" android:pathData="M195.22,99.74c-4.62,-1.5 -10.24,-2.97 -14.99,-3.58l-37.11,-5.24c-42.73,-5.28 -76.6,-2.88 -101.46,1.97c-2.52,7.75 -3.89,16.02 -3.89,24.61c0,44.03 35.69,79.72 79.73,79.72c44.03,0 79.73,-35.69 79.73,-79.72C197.23,111.39 196.52,105.46 195.22,99.74z"/>
diff --git a/app/src/main/res/drawable/round_icon_waterfall.xml b/app/src/main/res/drawable/round_icon_waterfall.xml
index 420704690..0d71b45b1 100644
--- a/app/src/main/res/drawable/round_icon_waterfall.xml
+++ b/app/src/main/res/drawable/round_icon_waterfall.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.68,0 99,-44.33 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#54B948" android:pathData="M117.5,118.19m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
     <path android:fillColor="#58595B" android:pathData="M117.5,197.91c44.03,0 79.73,-35.69 79.73,-79.72c0,-7.58 -1.08,-14.9 -3.06,-21.85c-27.77,-4.05 -53.39,-3.37 -55.11,0.61H91.73c-3.07,-5.81 -25.77,-5.67 -49.91,-3.83c-2.61,7.89 -4.04,16.31 -4.04,25.07C37.77,162.22 73.47,197.91 117.5,197.91z"/>

From b9dbdfb337bf677e6e662c28df574b0a23a23a2b Mon Sep 17 00:00:00 2001
From: Paul Hawke <paul.hawke@gmail.com>
Date: Tue, 5 Sep 2017 22:01:36 -0500
Subject: [PATCH 8/9] Fixed remaining icons missed in the first pass, removing
 the grey background.

---
 app/src/main/res/drawable/round_icon_city.xml |  1 -
 .../res/drawable/round_icon_gatehouse.xml     |  1 -
 .../main/res/drawable/round_icon_island.xml   |  1 -
 .../res/drawable/round_icon_milestone.xml     |  1 -
 .../main/res/drawable/round_icon_ocean.xml    |  1 -
 .../drawable/round_icon_railway_station.xml   |  1 -
 .../main/res/drawable/round_icon_school.xml   |  1 -
 .../res/drawable/round_icon_waterfall.xml     | 30 +++++++++----------
 8 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/drawable/round_icon_city.xml b/app/src/main/res/drawable/round_icon_city.xml
index 6723ab959..ce4cc5c44 100644
--- a/app/src/main/res/drawable/round_icon_city.xml
+++ b/app/src/main/res/drawable/round_icon_city.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.001" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48s85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M117.5,117.5m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
     <path android:fillColor="#FF000000" android:pathData="M49.31,154.69a68.19,8.86 0,1 0,136.39 0a68.19,8.86 0,1 0,-136.39 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_gatehouse.xml b/app/src/main/res/drawable/round_icon_gatehouse.xml
index 8c282ac82..7d04491fa 100644
--- a/app/src/main/res/drawable/round_icon_gatehouse.xml
+++ b/app/src/main/res/drawable/round_icon_gatehouse.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#FF000000" android:pathData="M56.94,153.5a60.56,8.91 0,1 0,121.12 0a60.56,8.91 0,1 0,-121.12 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_island.xml b/app/src/main/res/drawable/round_icon_island.xml
index 0f70b5aab..940ccd9d4 100644
--- a/app/src/main/res/drawable/round_icon_island.xml
+++ b/app/src/main/res/drawable/round_icon_island.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="112.801"
     android:viewportWidth="112.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h112.8v112.8h-112.8z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.28 -47.52,47.52s21.27,47.52 47.52,47.52c26.25,0 47.52,-21.28 47.52,-47.52S82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03c0,-22.66 18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03C97.43,79.06 79.06,97.43 56.4,97.43z"/>
     <path android:fillColor="#54B948" android:pathData="M56.4,56.73m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
     <path android:fillColor="#007F9F" android:pathData="M18.13,56.73c0,21.13 17.13,38.27 38.27,38.27c21.14,0 38.27,-17.13 38.27,-38.27c0,-4.1 -0.65,-8.03 -1.84,-11.73H19.97C18.78,48.7 18.13,52.64 18.13,56.73z"/>
diff --git a/app/src/main/res/drawable/round_icon_milestone.xml b/app/src/main/res/drawable/round_icon_milestone.xml
index b105ea3cd..23eb5142b 100644
--- a/app/src/main/res/drawable/round_icon_milestone.xml
+++ b/app/src/main/res/drawable/round_icon_milestone.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48s85.48,38.27 85.48,85.48S164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#FF000000" android:pathData="M73.27,163.84a44.23,6.61 0,1 0,88.46 0a44.23,6.61 0,1 0,-88.46 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_ocean.xml b/app/src/main/res/drawable/round_icon_ocean.xml
index 22b903104..7f62065aa 100644
--- a/app/src/main/res/drawable/round_icon_ocean.xml
+++ b/app/src/main/res/drawable/round_icon_ocean.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="112.8"
     android:viewportWidth="112.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h112.8v112.8h-112.8z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.27 -47.52,47.52c0,26.24 21.27,47.52 47.52,47.52c26.25,0 47.52,-21.28 47.52,-47.52C103.92,30.16 82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03s18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03S79.06,97.43 56.4,97.43z"/>
     <path android:fillColor="#54B948" android:pathData="M56.4,56.73m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
     <path android:fillColor="#007F9F" android:pathData="M18.13,56.73c0,21.14 17.13,38.27 38.27,38.27c21.14,0 38.27,-17.13 38.27,-38.27c0,-4.09 -0.65,-8.03 -1.84,-11.73H19.97C18.78,48.7 18.13,52.64 18.13,56.73z"/>
diff --git a/app/src/main/res/drawable/round_icon_railway_station.xml b/app/src/main/res/drawable/round_icon_railway_station.xml
index 1c89d2920..5a0520432 100644
--- a/app/src/main/res/drawable/round_icon_railway_station.xml
+++ b/app/src/main/res/drawable/round_icon_railway_station.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#352200" android:pathData="M48.69,144.99a69.93,13.72 0,1 0,139.86 0a69.93,13.72 0,1 0,-139.86 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_school.xml b/app/src/main/res/drawable/round_icon_school.xml
index 22eef79cf..303610416 100644
--- a/app/src/main/res/drawable/round_icon_school.xml
+++ b/app/src/main/res/drawable/round_icon_school.xml
@@ -1,6 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
     android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#FF000000" android:pathData="M51.77,153.81a65.73,6.07 0,1 0,131.47 0a65.73,6.07 0,1 0,-131.47 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_waterfall.xml b/app/src/main/res/drawable/round_icon_waterfall.xml
index 0d71b45b1..a02541583 100644
--- a/app/src/main/res/drawable/round_icon_waterfall.xml
+++ b/app/src/main/res/drawable/round_icon_waterfall.xml
@@ -1,17 +1,17 @@
 <vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.68,0 99,-44.33 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
-    <path android:fillColor="#54B948" android:pathData="M117.5,118.19m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
-    <path android:fillColor="#58595B" android:pathData="M117.5,197.91c44.03,0 79.73,-35.69 79.73,-79.72c0,-7.58 -1.08,-14.9 -3.06,-21.85c-27.77,-4.05 -53.39,-3.37 -55.11,0.61H91.73c-3.07,-5.81 -25.77,-5.67 -49.91,-3.83c-2.61,7.89 -4.04,16.31 -4.04,25.07C37.77,162.22 73.47,197.91 117.5,197.91z"/>
-    <path android:fillColor="#3D3D3E" android:pathData="M176.06,147.04c-5,-10.15 -18.33,-10.73 -20.33,-16.44c-1.53,-4.37 3.93,-20.85 0.29,-36.94c-9.63,0.21 -16.12,1.36 -16.96,3.3H91.73c-1.53,-2.89 -7.93,-4.31 -16.94,-4.78c3.91,15.01 8.94,33.28 11.94,39.63c3.67,7.75 2,17.74 2.33,27.58c0.22,6.6 -0.97,20.34 -1,32.89c9.11,3.62 19.03,5.64 29.44,5.64c24.39,0 46.21,-10.96 60.83,-28.22C178.44,159.86 178.05,151.07 176.06,147.04z"/>
-    <path android:fillColor="#007F9F" android:pathData="M117.5,197.91c16.31,0 31.46,-4.9 44.09,-13.3c-0.56,-5.74 -1.6,-13.6 -3.53,-22.06c-3.83,-16.83 -13.67,-24.67 -14.5,-28.83s5.5,-30.04 -4.5,-36.77c0,0 -18.33,-1.77 -47.33,0c2.83,7.27 5.83,21.44 8.5,27.1c2.67,5.67 2.17,17.83 3,24.33c0.73,5.67 2.31,34.44 0.22,48.27C108.01,197.46 112.7,197.91 117.5,197.91z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M161.59,184.61c-0.56,-5.74 -1.6,-13.6 -3.53,-22.06c-3.83,-16.83 -13.67,-24.67 -14.5,-28.83s5.5,-30.04 -4.5,-36.77c0,0 -0.43,-0.04 -1.26,-0.1c1.76,6.13 6.76,10.69 4.76,20.66s-2.25,18.22 2.25,25.47c3.95,6.37 15.43,26.47 14.69,42.97C160.21,185.51 160.9,185.07 161.59,184.61z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M103.23,148.39c0.73,5.67 2.31,34.44 0.22,48.27c2.45,0.44 4.94,0.76 7.46,0.97c-3.13,-11.2 -4.51,-35.25 -4.1,-42.4c0.5,-8.75 -1.75,-19 -3.25,-28c-1.35,-8.11 -5.75,-20.49 -10.33,-30.36c-0.5,0.03 -1,0.06 -1.5,0.09c2.83,7.27 5.83,21.44 8.5,27.1C102.89,129.72 102.39,141.89 103.23,148.39z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M102.56,98.97c2.88,4.13 8.88,14.75 9.13,29.5C114.31,119.22 114.69,107.1 102.56,98.97z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M115.06,101.1c2.5,4.13 7.73,14.75 7.94,29.5C125.29,121.35 125.61,109.22 115.06,101.1z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M125.64,100.1c2.12,3.5 6.55,12.5 6.73,25C134.31,117.26 134.59,106.98 125.64,100.1z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M111.03,134.72c0.31,7.5 5.88,9.38 9.16,22.75s-1.9,16.5 0,25.13c-3.47,-10.13 -0.47,-17.25 -3.35,-25S110.6,140.97 111.03,134.72z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M123.85,144.12c0.23,6.87 4.35,8.58 6.77,20.83c2.42,12.24 -1.4,15.1 0,23c-2.57,-9.27 -0.35,-15.79 -2.47,-22.89S123.52,149.84 123.85,144.12z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M129.24,131.8c0.53,6.85 4.72,8.38 7.68,20.51c2.96,12.13 -0.74,15.15 1.02,22.98c-2.97,-9.15 -1.05,-15.76 -3.48,-22.75S129.18,137.54 129.24,131.8z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M139.08,138.81c0.55,6.85 4.74,8.37 7.72,20.49c2.98,12.12 -0.7,15.15 1.06,22.98c-2.99,-9.14 -1.08,-15.76 -3.53,-22.75C141.88,152.54 139.02,144.54 139.08,138.81z"/>
+android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.68,0 99,-44.33 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+<path android:fillColor="#54B948" android:pathData="M117.5,118.19m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
+<path android:fillColor="#58595B" android:pathData="M117.5,197.91c44.03,0 79.73,-35.69 79.73,-79.72c0,-7.58 -1.08,-14.9 -3.06,-21.85c-27.77,-4.05 -53.39,-3.37 -55.11,0.61H91.73c-3.07,-5.81 -25.77,-5.67 -49.91,-3.83c-2.61,7.89 -4.04,16.31 -4.04,25.07C37.77,162.22 73.47,197.91 117.5,197.91z"/>
+<path android:fillColor="#3D3D3E" android:pathData="M176.06,147.04c-5,-10.15 -18.33,-10.73 -20.33,-16.44c-1.53,-4.37 3.93,-20.85 0.29,-36.94c-9.63,0.21 -16.12,1.36 -16.96,3.3H91.73c-1.53,-2.89 -7.93,-4.31 -16.94,-4.78c3.91,15.01 8.94,33.28 11.94,39.63c3.67,7.75 2,17.74 2.33,27.58c0.22,6.6 -0.97,20.34 -1,32.89c9.11,3.62 19.03,5.64 29.44,5.64c24.39,0 46.21,-10.96 60.83,-28.22C178.44,159.86 178.05,151.07 176.06,147.04z"/>
+<path android:fillColor="#007F9F" android:pathData="M117.5,197.91c16.31,0 31.46,-4.9 44.09,-13.3c-0.56,-5.74 -1.6,-13.6 -3.53,-22.06c-3.83,-16.83 -13.67,-24.67 -14.5,-28.83s5.5,-30.04 -4.5,-36.77c0,0 -18.33,-1.77 -47.33,0c2.83,7.27 5.83,21.44 8.5,27.1c2.67,5.67 2.17,17.83 3,24.33c0.73,5.67 2.31,34.44 0.22,48.27C108.01,197.46 112.7,197.91 117.5,197.91z"/>
+<path android:fillColor="#FFFFFF" android:pathData="M161.59,184.61c-0.56,-5.74 -1.6,-13.6 -3.53,-22.06c-3.83,-16.83 -13.67,-24.67 -14.5,-28.83s5.5,-30.04 -4.5,-36.77c0,0 -0.43,-0.04 -1.26,-0.1c1.76,6.13 6.76,10.69 4.76,20.66s-2.25,18.22 2.25,25.47c3.95,6.37 15.43,26.47 14.69,42.97C160.21,185.51 160.9,185.07 161.59,184.61z"/>
+<path android:fillColor="#FFFFFF" android:pathData="M103.23,148.39c0.73,5.67 2.31,34.44 0.22,48.27c2.45,0.44 4.94,0.76 7.46,0.97c-3.13,-11.2 -4.51,-35.25 -4.1,-42.4c0.5,-8.75 -1.75,-19 -3.25,-28c-1.35,-8.11 -5.75,-20.49 -10.33,-30.36c-0.5,0.03 -1,0.06 -1.5,0.09c2.83,7.27 5.83,21.44 8.5,27.1C102.89,129.72 102.39,141.89 103.23,148.39z"/>
+<path android:fillColor="#FFFFFF" android:pathData="M102.56,98.97c2.88,4.13 8.88,14.75 9.13,29.5C114.31,119.22 114.69,107.1 102.56,98.97z"/>
+<path android:fillColor="#FFFFFF" android:pathData="M115.06,101.1c2.5,4.13 7.73,14.75 7.94,29.5C125.29,121.35 125.61,109.22 115.06,101.1z"/>
+<path android:fillColor="#FFFFFF" android:pathData="M125.64,100.1c2.12,3.5 6.55,12.5 6.73,25C134.31,117.26 134.59,106.98 125.64,100.1z"/>
+<path android:fillColor="#FFFFFF" android:pathData="M111.03,134.72c0.31,7.5 5.88,9.38 9.16,22.75s-1.9,16.5 0,25.13c-3.47,-10.13 -0.47,-17.25 -3.35,-25S110.6,140.97 111.03,134.72z"/>
+<path android:fillColor="#FFFFFF" android:pathData="M123.85,144.12c0.23,6.87 4.35,8.58 6.77,20.83c2.42,12.24 -1.4,15.1 0,23c-2.57,-9.27 -0.35,-15.79 -2.47,-22.89S123.52,149.84 123.85,144.12z"/>
+<path android:fillColor="#FFFFFF" android:pathData="M129.24,131.8c0.53,6.85 4.72,8.38 7.68,20.51c2.96,12.13 -0.74,15.15 1.02,22.98c-2.97,-9.15 -1.05,-15.76 -3.48,-22.75S129.18,137.54 129.24,131.8z"/>
+<path android:fillColor="#FFFFFF" android:pathData="M139.08,138.81c0.55,6.85 4.74,8.37 7.72,20.49c2.98,12.12 -0.7,15.15 1.06,22.98c-2.99,-9.14 -1.08,-15.76 -3.53,-22.75C141.88,152.54 139.02,144.54 139.08,138.81z"/>
 </vector>

From 3a15f9a1d6cb57b94f34c9cb14632235f1401e75 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Thu, 7 Sep 2017 07:15:24 +0200
Subject: [PATCH 9/9] Localisation updates from https://translatewiki.net.

---
 app/src/main/res/values-br/strings.xml |  3 +++
 app/src/main/res/values-qq/strings.xml |  3 ++-
 app/src/main/res/values-uk/strings.xml |  8 ++++++--
 app/src/main/res/values-vi/strings.xml | 10 ++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 8f5eaa510..16e241561 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -147,6 +147,9 @@
   <string name="media_detail_description">Deskrivadur</string>
   <string name="media_detail_description_explanation">Amañ e lakaer titl ar media. Gallout a ra bezañ hir-mat ha mont dre meur a linenn. Spi hon eus e vo bravik an disoc\'h koulskoude.</string>
   <string name="media_detail_uploaded_date">Deiziad enporzhiañ</string>
+  <string name="media_detail_license">Aotre-implijout</string>
+  <string name="media_detail_coordinates">Daveennoù</string>
+  <string name="media_detail_coordinates_empty">N\'eo ket bet pourchaset</string>
   <string name="become_a_tester_title">Deuit da vezañ un amprouer beta</string>
   <string name="become_a_tester_description">En em enskrivañ en hor c\'hanol beta war Google Play ha kaout ur rakmoned d\'an arc\'hwelioù nevez d\'an drein difaziet</string>
   <string name="use_wikidata">Ober gant Wikidata</string>
diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml
index 1e3c13b81..7e1bfb282 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -103,7 +103,8 @@
   <string name="welcome_image_llamas">An animal. See [[:d:Q42569|Wikidata item Q42569]] for a list of possible translations.</string>
   <string name="welcome_image_rainbow_bridge">A bridge in Japan. See [[:d:Q1046736|Wikidata item Q1046736]] for a list of possible translations.</string>
   <string name="welcome_image_tulip">A flower. See [[:d:Q93201|Wikidata item Q93201]] for a list of possible translations.</string>
-  <string name="welcome_image_welcome_wikipedia">Welcome Wikipedia</string>
+  <string name="welcome_image_welcome_wikipedia">Description of [https://github.com/commons-app/apps-android-commons/blob/master/app/src/main/res/drawable-hdpi/welcome_wikipedia.png the image] displayed on the welcome screen to illustrate {{msg-wm|Commons-android-strings-welcome wikipedia text}} and {{msg-wm|Commons-android-strings-welcome wikipedia subtext}}.</string>
+  <string name="welcome_image_welcome_copyright">Description of [https://github.com/commons-app/apps-android-commons/blob/master/app/src/main/res/drawable-hdpi/welcome_copyright.png the image] displayed on the welcome screen to illustrate {{msg-wm|Commons-android-strings-welcome copyright text}} and {{msg-wm|Commons-android-strings-welcome copyright subtext}}.</string>
   <string name="welcome_image_sydney_opera_house">A building in the city of Sydney. See [[:d:Q45178|Wikidata item Q45178]] for a list of possible translations.</string>
   <string name="cancel">{{Identical|Cancel}}</string>
   <string name="navigation_drawer_open">{{Identical|Open}}</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 746d3c11d..679703b80 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -81,7 +81,7 @@
   <string name="title_activity_settings">Налаштування</string>
   <string name="title_activity_signup">Зареєструватися</string>
   <string name="menu_about">Про програму</string>
-  <string name="about_license" fuzzy="true">Програмне забезпечення з відкритим кодом випущено під &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;ліцензією Apache в.2&lt;/a&gt;. Вікісховище і його логотип є товарними знаками Фонду Вікімедіа і використовуються за дозволом Фонду Вікімедіа. Ми не користуємось підтримкою Фонду Вікімедіа і не є його афіліатом.</string>
+  <string name="about_license">Програмне забезпечення з відкритим кодом випущено під &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;ліцензією Apache в.2&lt;/a&gt;. 1$s і його логотип є товарними знаками Фонду Вікімедіа і використовуються за дозволом Фонду Вікімедіа. Ми не користуємось підтримкою Фонду Вікімедіа і не є його афіліатом.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Вихідний код&lt;/a&gt; і &lt;a href=\"https://commons-app.github.io/\"&gt;веб-сайт&lt;/a&gt; на GitHub. Створіть нове &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;завдання на GitHub&lt;/a&gt; для повідомлення про баги або для висловлення пропозицій.</string>
   <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Політика приватності&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Автори&lt;/a&gt;</string>
@@ -94,6 +94,7 @@
   <string name="menu_retry_upload">Повторити</string>
   <string name="menu_cancel_upload">Скасувати</string>
   <string name="share_license_summary">Це зображення буде ліцензоване згідно з %1$s</string>
+  <string name="media_upload_policy">Подаючи це зображення, я підтверджую, що це моя власна робота, яка не містить захищених авторським правом матеріалів чи селфі, а також відповідає &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines/uk\"&gt;правилам Вікісховища&lt;/a&gt;.</string>
   <string name="menu_download">Завантажити</string>
   <string name="preference_license">Ліцензія</string>
   <string name="use_previous">Використати попередню назву/опис</string>
@@ -196,6 +197,9 @@
   <string name="navigation_item_info">Посібник</string>
   <string name="nearby_needs_permissions">Місця поблизу неможливо показати без дозволу на визначення місця розташування.</string>
   <string name="no_description_found">опис не знайдено</string>
-  <string name="nearby_info_menu_commons_article" fuzzy="true">Стаття на Вікісховищі</string>
+  <string name="nearby_info_menu_commons_article">Сторінка файлу у Вікісховищі</string>
   <string name="nearby_info_menu_wikidata_article">Елемент Вікіданих</string>
+  <string name="error_while_cache">Помилка кешування зображень</string>
+  <string name="title_info">Унікальна описова назва файлу. Ви можете використовувати простий текст з пробілами. Не вказуйте розширення файлу</string>
+  <string name="description_info">Будь ласка, докладно опишіть файл: де його було зроблено? що на ньому зображено? який контекст? Будь ласка, опишіть об\'єкти чи осіб. Додайте інформацію, яку не можна легко здогадатися, наприклад, пору доби для фотографії пейзажу. Якщо зображено щось незвичайне, постарайтеся пояснити, що робить його незвичайним.</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 5b9d6192a..38f6d3987 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -39,6 +39,7 @@
   <string name="login_failed_password">Không thể đăng nhập – xin vui lòng kiểm tra mật khẩu</string>
   <string name="login_failed_throttled">Đã đăng nhập thất bại quá nhiều lần. Xin vui lòng thử lại trong vòng vài phút.</string>
   <string name="login_failed_blocked">Rất tiếc, người dùng này đã bị cấm tại Commons</string>
+  <string name="login_failed_2fa_needed">Bạn phải cung cấp mã xác thực dùng hai nhân tố.</string>
   <string name="login_failed_generic">Đăng nhập thất bại</string>
   <string name="share_upload_button">Tải lên</string>
   <string name="multiple_share_base_title">Đặt tên nhóm này</string>
@@ -47,6 +48,7 @@
   <string name="categories_search_text_hint">Tìm thể loại</string>
   <string name="menu_save_categories">Lưu</string>
   <string name="refresh_button">Làm mới</string>
+  <string name="gps_disabled">Chức năng GPS đang tắt trên thiết bị của bạn. Bạn có muốn bật nó lên?</string>
   <string name="enable_gps">Bật GPS</string>
   <string name="contributions_subtitle_zero">Chưa có tập tin tải lên</string>
   <plurals name="contributions_subtitle">
@@ -74,6 +76,7 @@
   <string name="menu_retry_upload">Thử lại</string>
   <string name="menu_cancel_upload">Hủy bỏ</string>
   <string name="share_license_summary">Hình này sẽ được phát hành theo giấy phép %1$s</string>
+  <string name="media_upload_policy">Với việc đăng hình này, tôi tuyên bố rằng nó là tác phẩm của chính mình, rằng nó không chứa nội dung có bản quyền hoặc ảnh tự chụp, và về mặt khác thì hoàn toàn tuân theo &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines?uselang=vi\"&gt;các quy định Wikimedia Commons&lt;/a&gt;.</string>
   <string name="menu_download">Tải về</string>
   <string name="preference_license">Giấy phép</string>
   <string name="use_previous">Sử dụng tiêu đề/miêu tả trước</string>
@@ -159,6 +162,9 @@
   <string name="welcome_image_rainbow_bridge">Cầu Cầu vồng</string>
   <string name="welcome_image_tulip">Tu-líp</string>
   <string name="welcome_image_no_selfies">Không cho phép Ảnh tự chụp</string>
+  <string name="welcome_image_proprietary">Hình có Bản quyền</string>
+  <string name="welcome_image_welcome_wikipedia">Hoan nghênh: Wikipedia</string>
+  <string name="welcome_image_welcome_copyright">Hoan nghênh: Bản quyền</string>
   <string name="welcome_image_sydney_opera_house">Nhà hát Opera Sydney</string>
   <string name="cancel">Hủy bỏ</string>
   <string name="navigation_drawer_open">Mở</string>
@@ -171,7 +177,11 @@
   <string name="navigation_item_feedback">Phản hồi</string>
   <string name="navigation_item_logout">Đăng xuất</string>
   <string name="navigation_item_info">Hướng dẫn</string>
+  <string name="nearby_needs_permissions">Cần có quyền truy cập vị trí của bạn để hiển thị các địa điểm lân cận</string>
   <string name="no_description_found">không tìm thấy miêu tả</string>
   <string name="nearby_info_menu_commons_article">Trang tập tin Commons</string>
   <string name="nearby_info_menu_wikidata_article">Khoản mục Wikidata</string>
+  <string name="error_while_cache">Xuất hiện lỗi khi đưa hình ảnh vào vùng nhớ đệm</string>
+  <string name="title_info">Tên ngắn và duy nhất cho tập tin sẽ được dùng làm tên tập tin. Có thể dùng thuật ngữ bình thường với khoảng cách. Đừng bao gồm phần mở rộng tập tin.</string>
+  <string name="description_info">Xin vui lòng miêu tả phương tiện càng đầy đủ càng tốt: Chụp ở đâu? Trong hình có gì? Bối cảnh làm sao? Xin vui lòng miêu tả các đối tượng và người trong hình. Cho biết những thông tin khó đoán ra, chẳng hạn giờ trong ngày nếu là phong cảnh. Nếu phương tiện có gì kỳ lạ, xin vui lòng giải thích tại sao nó kỳ lạ.</string>
 </resources>