Merge branch 'master' into dependency-injection

app/build.gradle

@@ -12,20 +12,26 @@ dependencies {
     compile 'ch.acra:acra:4.7.0'
     compile 'org.mediawiki:api:1.3'
     compile 'commons-codec:commons-codec:1.10'
-    compile "com.android.support:support-v4:${project.supportLibVersion}"
-    compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
-    compile "com.android.support:design:${project.supportLibVersion}"
-    compile 'com.google.code.gson:gson:2.8.0'
-    compile "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
     compile 'com.github.pedrovgs:renderers:3.3.3'
-    annotationProcessor "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
+    compile 'com.google.code.gson:gson:2.8.1'
     compile 'com.jakewharton.timber:timber:4.5.1'
-    compile 'com.squareup.okhttp3:okhttp:3.8.1'
+    compile 'info.debatty:java-string-similarity:0.24'
-    compile 'com.squareup.okio:okio:1.13.0'
     compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0@aar'){
         transitive=true
     }
 
+    compile "com.android.support:support-v4:${project.supportLibVersion}"
+    compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
+    compile "com.android.support:design:${project.supportLibVersion}"
+
+    compile "com.android.support:cardview-v7:${project.supportLibVersion}"
+
+    compile "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
+    annotationProcessor "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
+
+    compile 'com.squareup.okhttp3:okhttp:3.8.1'
+    compile 'com.squareup.okio:okio:1.13.0'
+
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
@@ -39,12 +45,12 @@ dependencies {
     compile 'com.facebook.stetho:stetho:1.5.0'
 
     testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.3.2'
+    testCompile 'org.robolectric:robolectric:3.4'
 
     testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
     androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
     androidTestCompile "com.android.support:support-annotations:${project.supportLibVersion}"
-    androidTestCompile ('com.android.support.test.espresso:espresso-core:2.2.2'){
+    androidTestCompile ('com.android.support.test.espresso:espresso-core:3.0.1'){
         exclude group: 'com.google.code.findbugs'
     }
 

app/src/main/AndroidManifest.xml

@@ -19,8 +19,13 @@
         android:name=".CommonsApplication"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:supportsRtl="true"
+        android:theme="@style/LightAppTheme"
-        android:theme="@style/Theme.AppCompat">
+        android:supportsRtl="true" >
+        <activity android:name="org.acra.CrashReportDialog"
+                  android:theme="@android:style/Theme.Dialog"
+                  android:launchMode="singleInstance"
+                  android:excludeFromRecents="true"
+                  android:finishOnTaskLaunch="true" />
 
         <activity
             android:name="org.acra.CrashReportDialog"

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

@@ -87,7 +87,7 @@ public class CommonsApplication extends DaggerApplication {
     }
 
     @Override
-    protected AndroidInjector<? extends DaggerApplication> applicationInjector() {
+     protected AndroidInjector<? extends DaggerApplication> applicationInjector() {
         return injector();
     }
 
@@ -120,8 +120,7 @@ public class CommonsApplication extends DaggerApplication {
                     //TODO: fix preference manager
                     defaultPrefs.edit().clear().commit();
                     applicationPrefs.edit().clear().commit();
-                    applicationPrefs.edit().putBoolean("firstrun", false).apply();
+                    applicationPrefs.edit().putBoolean("firstrun", false).apply();otherPrefs.edit().clear().commit();
-                    otherPrefs.edit().clear().commit();
                     updateAllDatabases();
 
                     logoutListener.onLogoutComplete();

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

@@ -3,10 +3,10 @@ package fr.free.nrw.commons;
 import android.support.annotation.Nullable;
 
 public class License {
-    String key;
+    private String key;
-    String template;
+    private String template;
-    String url;
+    private String url;
-    String name;
+    private String name;
 
     public License(String key, String template, String url, String name) {
         if (key == null) {

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

@@ -1,5 +1,8 @@
 package fr.free.nrw.commons;
 
+import android.content.Context;
+import android.preference.PreferenceManager;
+
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
 
@@ -9,9 +12,9 @@ import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.settings.Prefs;
 
-
 public class Utils {
 
     /**
@@ -76,10 +79,14 @@ public class Utils {
             extension = "jpg";
         }
         title = jpegPattern.matcher(title).replaceFirst(".jpg");
-        if (extension != null && !title.toLowerCase(Locale.getDefault()).endsWith("." + extension.toLowerCase(Locale.ENGLISH))) {
+        if (extension != null && !title.toLowerCase(Locale.getDefault())
+                .endsWith("." + extension.toLowerCase(Locale.ENGLISH))) {
             title += "." + extension;
         }
         return title;
     }
 
+    public static boolean isDarkTheme(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme", false);
+    }
 }

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

@@ -5,15 +5,21 @@ import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.support.annotation.ColorRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
 import android.support.v4.app.NavUtils;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatDelegate;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -24,6 +30,7 @@ import dagger.android.AndroidInjection;
 import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.PageTitle;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.WelcomeActivity;
 import fr.free.nrw.commons.contributions.ContributionsActivity;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
@@ -32,7 +39,6 @@ import timber.log.Timber;
 import static android.view.KeyEvent.KEYCODE_ENTER;
 import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
 
-
 public class LoginActivity extends AccountAuthenticatorActivity {
 
     public static final String PARAM_USERNAME = "fr.free.nrw.commons.login.username";
@@ -40,7 +46,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     @Inject MediaWikiApi mwApi;
     @Inject AccountUtil accountUtil;
     @Inject SessionManager sessionManager;
-    @Inject @Named("application_preferences") SharedPreferences prefs = null;
+    @Inject @Named("application_preferences") SharedPreferences prefs;
     @Inject @Named("default_preferences") SharedPreferences defaultPrefs;
 
     @BindView(R.id.loginButton) Button loginButton;
@@ -48,16 +54,22 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     @BindView(R.id.loginUsername) EditText usernameEdit;
     @BindView(R.id.loginPassword) EditText passwordEdit;
     @BindView(R.id.loginTwoFactor) EditText twoFactorEdit;
-
+    @BindView(R.id.error_message_container) ViewGroup errorMessageContainer;
+    @BindView(R.id.error_message) TextView errorMessage;
     ProgressDialog progressDialog;
+    private AppCompatDelegate delegate;
     private LoginTextWatcher textWatcher = new LoginTextWatcher();
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        setTheme(Utils.isDarkTheme(this) ? R.style.DarkAppTheme : R.style.LightAppTheme);
+        getDelegate().installViewFactory();
+        getDelegate().onCreate(savedInstanceState);
         AndroidInjection.inject(this);
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_login);
+
         ButterKnife.bind(this);
 
         usernameEdit.addTextChangedListener(textWatcher);
@@ -65,45 +77,17 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         twoFactorEdit.addTextChangedListener(textWatcher);
         passwordEdit.setOnEditorActionListener(newLoginInputActionListener());
 
-        loginButton.setOnClickListener(this::performLogin);
+        loginButton.setOnClickListener(view -> performLogin());
-        signupButton.setOnClickListener(this::signUp);
+        signupButton.setOnClickListener(view -> signUp());
     }
 
-    private class LoginTextWatcher implements TextWatcher {
+    @Override
-        @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
-        public void beforeTextChanged(CharSequence charSequence, int start, int count, int after) {
+        super.onPostCreate(savedInstanceState);
-        }
+        getDelegate().onPostCreate(savedInstanceState);
-
-        @Override
-        public void onTextChanged(CharSequence charSequence, int start, int count, int after) {
-        }
-
-        @Override
-        public void afterTextChanged(Editable editable) {
-            if (usernameEdit.getText().length() != 0 && passwordEdit.getText().length() != 0 &&
-                    (BuildConfig.DEBUG || twoFactorEdit.getText().length() != 0 || twoFactorEdit.getVisibility() != View.VISIBLE)) {
-                loginButton.setEnabled(true);
-            } else {
-                loginButton.setEnabled(false);
-            }
-        }
-    }
-
-    private TextView.OnEditorActionListener newLoginInputActionListener() {
-        return (textView, actionId, keyEvent) -> {
-            if (loginButton.isEnabled()) {
-                if (actionId == IME_ACTION_DONE) {
-                    performLogin(textView);
-                    return true;
-                } else if ((keyEvent != null) && keyEvent.getKeyCode() == KEYCODE_ENTER) {
-                    performLogin(textView);
-                    return true;
-                }
-            }
-            return false;
-        };
     }
 
+    @Override
     protected void onResume() {
         super.onResume();
         if (prefs.getBoolean("firstrun", true)) {
@@ -128,15 +112,10 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         usernameEdit.removeTextChangedListener(textWatcher);
         passwordEdit.removeTextChangedListener(textWatcher);
         twoFactorEdit.removeTextChangedListener(textWatcher);
+        delegate.onDestroy();
         super.onDestroy();
     }
 
-    private void performLogin(View view) {
-        Timber.d("Login to start!");
-        LoginTask task = getLoginTask();
-        task.execute();
-    }
-
     private LoginTask getLoginTask() {
         return new LoginTask(
                 this,
@@ -156,6 +135,29 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         return new PageTitle(username).getText();
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        delegate.onStart();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        delegate.onStop();
+    }
+
+    @Override
+    protected void onPostResume() {
+        super.onPostResume();
+        getDelegate().onPostResume();
+    }
+
+    @Override
+    public void setContentView(View view, ViewGroup.LayoutParams params) {
+        getDelegate().setContentView(view, params);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
@@ -166,36 +168,28 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    /**
+    @Override
-     * Called when Sign Up button is clicked.
+    @NonNull
-     * @param view View
+    public MenuInflater getMenuInflater() {
-     */
+        return getDelegate().getMenuInflater();
-    public void signUp(View view) {
-        Intent intent = new Intent(this, SignupActivity.class);
-        startActivity(intent);
     }
 
     public void askUserForTwoFactorAuth() {
         if (BuildConfig.DEBUG) {
             twoFactorEdit.setVisibility(View.VISIBLE);
-            showUserToastAndCancelDialog(R.string.login_failed_2fa_needed);
+            showMessageAndCancelDialog(R.string.login_failed_2fa_needed);
         } else {
-            showUserToastAndCancelDialog(R.string.login_failed_2fa_not_supported);
+            showMessageAndCancelDialog(R.string.login_failed_2fa_not_supported);
         }
     }
 
-    public void showUserToastAndCancelDialog(int resId) {
+    public void showMessageAndCancelDialog(@StringRes int resId) {
-        showUserToast(resId);
+        showMessage(resId, R.color.secondaryDarkColor);
         progressDialog.cancel();
     }
 
-    private void showUserToast(int resId) {
+    public void showSuccessAndDismissDialog() {
-        Toast.makeText(this, resId, Toast.LENGTH_LONG).show();
+        showMessage(R.string.login_success, R.color.primaryDarkColor);
-    }
-
-    public void showSuccessToastAndDismissDialog() {
-        Toast successToast = Toast.makeText(this, R.string.login_success, Toast.LENGTH_SHORT);
-        successToast.show();
         progressDialog.dismiss();
     }
 
@@ -209,4 +203,59 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         finish();
     }
 
+    private void performLogin() {
+        Timber.d("Login to start!");
+        LoginTask task = getLoginTask();
+        task.execute();
+    }
+
+    private void signUp() {
+        Intent intent = new Intent(this, SignupActivity.class);
+        startActivity(intent);
+    }
+
+    private TextView.OnEditorActionListener newLoginInputActionListener() {
+        return (textView, actionId, keyEvent) -> {
+            if (loginButton.isEnabled()) {
+                if (actionId == IME_ACTION_DONE) {
+                    performLogin();
+                    return true;
+                } else if ((keyEvent != null) && keyEvent.getKeyCode() == KEYCODE_ENTER) {
+                    performLogin();
+                    return true;
+                }
+            }
+            return false;
+        };
+    }
+
+    private void showMessage(@StringRes int resId, @ColorRes int colorResId) {
+        errorMessage.setText(getString(resId));
+        errorMessage.setTextColor(ContextCompat.getColor(this, colorResId));
+        errorMessageContainer.setVisibility(View.VISIBLE);
+    }
+
+    private AppCompatDelegate getDelegate() {
+        if (delegate == null) {
+            delegate = AppCompatDelegate.create(this, null);
+        }
+        return delegate;
+    }
+
+    private class LoginTextWatcher implements TextWatcher {
+        @Override
+        public void beforeTextChanged(CharSequence charSequence, int start, int count, int after) {
+        }
+
+        @Override
+        public void onTextChanged(CharSequence charSequence, int start, int count, int after) {
+        }
+
+        @Override
+        public void afterTextChanged(Editable editable) {
+            boolean enabled = usernameEdit.getText().length() != 0 && passwordEdit.getText().length() != 0 &&
+                    (BuildConfig.DEBUG || twoFactorEdit.getText().length() != 0 || twoFactorEdit.getVisibility() != View.VISIBLE);
+            loginButton.setEnabled(enabled);
+        }
+    }
 }

app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java

@@ -84,7 +84,7 @@ class LoginTask extends AsyncTask<String, String, String> {
     }
 
     private void handlePassResult() {
-        loginActivity.showSuccessToastAndDismissDialog();
+        loginActivity.showSuccessAndDismissDialog();
 
         AccountAuthenticatorResponse response = null;
 
@@ -111,27 +111,27 @@ class LoginTask extends AsyncTask<String, String, String> {
     private void handleOtherResults(String result) {
         if (result.equals("NetworkFailure")) {
             // Matches NetworkFailure which is created by the doInBackground method
-            loginActivity.showUserToastAndCancelDialog(R.string.login_failed_network);
+            loginActivity.showMessageAndCancelDialog(R.string.login_failed_network);
         } else if (result.toLowerCase().contains("nosuchuser".toLowerCase()) || result.toLowerCase().contains("noname".toLowerCase())) {
             // Matches nosuchuser, nosuchusershort, noname
-            loginActivity.showUserToastAndCancelDialog(R.string.login_failed_username);
+            loginActivity.showMessageAndCancelDialog(R.string.login_failed_username);
             loginActivity.emptySensitiveEditFields();
         } else if (result.toLowerCase().contains("wrongpassword".toLowerCase())) {
             // Matches wrongpassword, wrongpasswordempty
-            loginActivity.showUserToastAndCancelDialog(R.string.login_failed_password);
+            loginActivity.showMessageAndCancelDialog(R.string.login_failed_password);
             loginActivity.emptySensitiveEditFields();
         } else if (result.toLowerCase().contains("throttle".toLowerCase())) {
             // Matches unknown throttle error codes
-            loginActivity.showUserToastAndCancelDialog(R.string.login_failed_throttled);
+            loginActivity.showMessageAndCancelDialog(R.string.login_failed_throttled);
         } else if (result.toLowerCase().contains("userblocked".toLowerCase())) {
             // Matches login-userblocked
-            loginActivity.showUserToastAndCancelDialog(R.string.login_failed_blocked);
+            loginActivity.showMessageAndCancelDialog(R.string.login_failed_blocked);
         } else if (result.equals("2FA")) {
             loginActivity.askUserForTwoFactorAuth();
         } else {
             // Occurs with unhandled login failure codes
             Timber.d("Login failed with reason: %s", result);
-            loginActivity.showUserToastAndCancelDialog(R.string.login_failed_generic);
+            loginActivity.showMessageAndCancelDialog(R.string.login_failed_generic);
         }
     }
 }

app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java

@@ -24,7 +24,8 @@ public class SignupActivity extends BaseActivity {
 
         webView.setWebViewClient(new MyWebViewClient());
         WebSettings webSettings = webView.getSettings();
-        //Needed to refresh Captcha. Might introduce XSS vulnerabilities, but we can trust Wikimedia's site... right?
+        /*Needed to refresh Captcha. Might introduce XSS vulnerabilities, but we can
+         trust Wikimedia's site... right?*/
         webSettings.setJavaScriptEnabled(true);
 
         webView.loadUrl(BuildConfig.SIGNUP_LANDING_URL);

app/src/main/java/fr/free/nrw/commons/caching/CacheController.java

@@ -32,7 +32,7 @@ public class CacheController {
     public void cacheCategory() {
         List<String> pointCatList = new ArrayList<>();
         if (MwVolleyApi.GpsCatExists.getGpsCatExists()) {
-             pointCatList.addAll(MwVolleyApi.getGpsCat());
+            pointCatList.addAll(MwVolleyApi.getGpsCat());
             Timber.d("Categories being cached: %s", pointCatList);
         } else {
             Timber.d("No categories found, so no categories cached");

app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java

@@ -23,6 +23,7 @@ import com.pedrogomez.renderers.RVRendererAdapter;
 
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -38,6 +39,7 @@ import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.data.Category;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.upload.MwVolleyApi;
+import fr.free.nrw.commons.utils.StringSortingUtils;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
@@ -112,7 +114,7 @@ public class CategorizationFragment extends DaggerFragment {
 
         RxTextView.textChanges(categoriesFilter)
                 .takeUntil(RxView.detaches(categoriesFilter))
-                .debounce(300, TimeUnit.MILLISECONDS)
+                .debounce(500, TimeUnit.MILLISECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(filter -> updateCategoryList(filter.toString()));
         return rootView;
@@ -200,11 +202,12 @@ public class CategorizationFragment extends DaggerFragment {
                 .concatWith(
                         searchAll(filter)
                                 .mergeWith(searchCategories(filter))
-                                .concatWith( TextUtils.isEmpty(filter)
+                                .concatWith(TextUtils.isEmpty(filter)
                                         ? defaultCategories() : Observable.empty())
                 )
                 .filter(categoryItem -> !containsYear(categoryItem.getName()))
                 .distinct()
+                .sorted(sortBySimilarity(filter))
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         s -> categoriesAdapter.add(s),
@@ -228,6 +231,12 @@ public class CategorizationFragment extends DaggerFragment {
                 );
     }
 
+    private Comparator<CategoryItem> sortBySimilarity(final String filter) {
+        Comparator<String> stringSimilarityComparator = StringSortingUtils.sortBySimilarity(filter);
+        return (firstItem, secondItem) -> stringSimilarityComparator
+                .compare(firstItem.getName(), secondItem.getName());
+    }
+
     private List<String> getStringList(List<CategoryItem> input) {
         List<String> output = new ArrayList<>();
         for (CategoryItem item : input) {

app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java

@@ -13,7 +13,6 @@ import android.text.TextUtils;
 import javax.inject.Inject;
 
 import dagger.android.AndroidInjection;
-import fr.free.nrw.commons.data.Category;
 import fr.free.nrw.commons.data.DBOpenHelper;
 import timber.log.Timber;
 
@@ -142,11 +141,13 @@ public class CategoryContentProvider extends ContentProvider {
     public int update(@NonNull Uri uri, ContentValues contentValues, String selection,
                       String[] selectionArgs) {
         /*
-        SQL Injection warnings: First, note that we're not exposing this to the outside world (exported="false")
+        SQL Injection warnings: First, note that we're not exposing this to the
-        Even then, we should make sure to sanitize all user input appropriately. Input that passes through ContentValues
+        outside world (exported="false"). Even then, we should make sure to sanitize
+        all user input appropriately. Input that passes through ContentValues
         should be fine. So only issues are those that pass in via concating.
 
-        In here, the only concat created argument is for id. It is cast to an int, and will error out otherwise.
+        In here, the only concat created argument is for id. It is cast to an int,
+        and will error out otherwise.
          */
         int uriType = uriMatcher.match(uri);
         SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java

@@ -156,10 +156,12 @@ public class ContributionsContentProvider extends ContentProvider {
     public int update(@NonNull Uri uri, ContentValues contentValues, String selection, String[] selectionArgs) {
         /*
         SQL Injection warnings: First, note that we're not exposing this to the outside world (exported="false")
-        Even then, we should make sure to sanitize all user input appropriately. Input that passes through ContentValues
+        Even then, we should make sure to sanitize all user input appropriately.
-        should be fine. So only issues are those that pass in via concating.
+        Input that passes through ContentValuesshould be fine. So only issues are those that pass
+        in via concating.
 
-        In here, the only concat created argument is for id. It is cast to an int, and will error out otherwise.
+        In here, the only concat created argument is for id. It is cast to an int, and will
+        error out otherwise.
          */
         int uriType = uriMatcher.match(uri);
         SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();

app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java

@@ -27,7 +27,7 @@ public class ModifierSequence {
     public ModifierSequence(Uri mediaUri, JSONObject data) {
         this(mediaUri);
         JSONArray modifiersJSON = data.optJSONArray("modifiers");
-        for(int i=0; i< modifiersJSON.length(); i++) {
+        for (int i=0; i< modifiersJSON.length(); i++) {
             modifiers.add(PageModifier.fromJSON(modifiersJSON.optJSONObject(i)));
         }
     }
@@ -41,7 +41,7 @@ public class ModifierSequence {
     }
 
     public String executeModifications(String pageName, String pageContents) {
-        for(PageModifier modifier: modifiers) {
+        for (PageModifier modifier: modifiers) {
             pageContents = modifier.doModification(pageName,  pageContents);
         }
         return pageContents;
@@ -60,7 +60,7 @@ public class ModifierSequence {
         JSONObject data = new JSONObject();
         try {
             JSONArray modifiersJSON = new JSONArray();
-            for(PageModifier modifier: modifiers) {
+            for (PageModifier modifier: modifiers) {
                 modifiersJSON.put(modifier.toJSON());
             }
             data.put("modifiers", modifiersJSON);
@@ -81,7 +81,8 @@ public class ModifierSequence {
         // Hardcoding column positions!
         ModifierSequence ms = null;
         try {
-            ms = new ModifierSequence(Uri.parse(cursor.getString(1)), new JSONObject(cursor.getString(2)));
+            ms = new ModifierSequence(Uri.parse(cursor.getString(1)),
+                new JSONObject(cursor.getString(2)));
         } catch (JSONException e) {
             throw new RuntimeException(e);
         }

app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java

@@ -391,7 +391,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
     public UploadResult uploadFile(String filename, InputStream file, long dataLength, String pageContents, String editSummary, final ProgressListener progressListener) throws IOException {
         ApiResult result = api.upload(filename, file, dataLength, pageContents, editSummary, progressListener::onProgress);
 
-        Log.e("WTF", "Result: "+result.toString());
+        Log.e("WTF", "Result: " +result.toString());
 
         String resultStatus = result.getString("/api/upload/@result");
         if (!resultStatus.equals("Success")) {

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java

@@ -10,6 +10,7 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
@@ -49,26 +50,45 @@ public class NearbyActivity extends NavigationBaseActivity {
 
     private boolean isMapViewActive = false;
     private static final int LOCATION_REQUEST = 1;
+    private static final String MAP_LAST_USED_PREFERENCE = "mapLastUsed";
 
     private LocationServiceManager locationManager;
     private LatLng curLatLang;
     private Bundle bundle;
     private NearbyAsyncTask nearbyAsyncTask;
+    private SharedPreferences sharedPreferences;
+    private NearbyActivityMode viewMode;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         setContentView(R.layout.activity_nearby);
         ButterKnife.bind(this);
         checkLocationPermission();
         bundle = new Bundle();
         initDrawer();
+        initViewState();
+    }
+
+    private void initViewState() {
+        if (sharedPreferences.getBoolean(MAP_LAST_USED_PREFERENCE, false)) {
+            viewMode = NearbyActivityMode.MAP;
+        } else {
+            viewMode = NearbyActivityMode.LIST;
+        }
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.menu_nearby, menu);
+
+        if (viewMode.isMap()) {
+            MenuItem item = menu.findItem(R.id.action_toggle_view);
+            item.setIcon(viewMode.getIcon());
+        }
+
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -79,13 +99,10 @@ public class NearbyActivity extends NavigationBaseActivity {
             case R.id.action_refresh:
                 refreshView();
                 return true;
-            case R.id.action_map:
+            case R.id.action_toggle_view:
-                showMapView();
+                viewMode = viewMode.toggle();
-                if (isMapViewActive) {
+                item.setIcon(viewMode.getIcon());
-                    item.setIcon(R.drawable.ic_list_white_24dp);
+                toggleView();
-                } else {
-                    item.setIcon(R.drawable.ic_map_white_24dp);
-                }
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -163,15 +180,30 @@ public class NearbyActivity extends NavigationBaseActivity {
                     if (progressBar != null) {
                         progressBar.setVisibility(View.GONE);
                     }
-                    FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+
-                    Fragment noPermissionsFragment = new NoPermissionsFragment();
+                    showLocationPermissionDeniedErrorDialog();
-                    fragmentTransaction.replace(R.id.container, noPermissionsFragment);
-                    fragmentTransaction.commit();
                 }
             }
         }
     }
 
+    private void showLocationPermissionDeniedErrorDialog() {
+        new AlertDialog.Builder(this)
+                .setMessage(R.string.nearby_needs_permissions)
+                .setCancelable(false)
+                .setPositiveButton(R.string.give_permission, (dialog, which) -> {
+                    //will ask for the location permission again
+                    checkLocationPermission();
+                })
+                .setNegativeButton(R.string.cancel, (dialog, which) -> {
+                    //dismiss dialog and finish activity
+                    dialog.cancel();
+                    finish();
+                })
+                .create()
+                .show();
+    }
+
     private void checkGps() {
         LocationManager manager = (LocationManager) getSystemService(LOCATION_SERVICE);
         if (!manager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
@@ -203,20 +235,16 @@ public class NearbyActivity extends NavigationBaseActivity {
         }
     }
 
-    private void showMapView() {
+    private void toggleView() {
         if (nearbyAsyncTask != null) {
-            if (!isMapViewActive) {
+            if (nearbyAsyncTask.getStatus() == AsyncTask.Status.FINISHED) {
-                isMapViewActive = true;
+                if (viewMode.isMap()) {
-                if (nearbyAsyncTask.getStatus() == AsyncTask.Status.FINISHED) {
                     setMapFragment();
-                }
+                } else {
-
-            } else {
-                isMapViewActive = false;
-                if (nearbyAsyncTask.getStatus() == AsyncTask.Status.FINISHED) {
                     setListFragment();
                 }
             }
+            sharedPreferences.edit().putBoolean(MAP_LAST_USED_PREFERENCE, viewMode.isMap()).apply();
         }
     }
 
@@ -292,7 +320,7 @@ public class NearbyActivity extends NavigationBaseActivity {
             bundle.putString("CurLatLng", gsonCurLatLng);
 
             // Begin the transaction
-            if (isMapViewActive) {
+            if (viewMode.isMap()) {
                 setMapFragment();
             } else {
                 setListFragment();

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivityMode.java

@@ -0,0 +1,30 @@
+package fr.free.nrw.commons.nearby;
+
+import android.support.annotation.DrawableRes;
+
+import fr.free.nrw.commons.R;
+
+enum NearbyActivityMode {
+    MAP(R.drawable.ic_list_white_24dp),
+    LIST(R.drawable.ic_map_white_24dp);
+
+    @DrawableRes
+    private final int icon;
+
+    NearbyActivityMode(int icon) {
+        this.icon = icon;
+    }
+
+    @DrawableRes
+    public int getIcon() {
+        return icon;
+    }
+
+    public NearbyActivityMode toggle() {
+        return isMap() ? LIST : MAP;
+    }
+
+    public boolean isMap() {
+        return MAP.equals(this);
+    }
+}

app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java

@@ -309,7 +309,7 @@ public class MultipleShareActivity extends AuthenticatedActivity
 
     @Override
     public void onBackStackChanged() {
-        getSupportActionBar().setDisplayHomeAsUpEnabled(mediaDetails != null && mediaDetails.isVisible());
+        getSupportActionBar().setDisplayHomeAsUpEnabled(mediaDetails != null && mediaDetails.isVisible()) ;
     }
 
 }

app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java

@@ -90,7 +90,8 @@ public class SingleUploadFragment extends DaggerFragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+           Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.fragment_single_upload, container, false);
         ButterKnife.bind(this, rootView);
 

app/src/main/java/fr/free/nrw/commons/utils/StringSortingUtils.java

@@ -0,0 +1,46 @@
+package fr.free.nrw.commons.utils;
+
+import java.util.Comparator;
+
+import info.debatty.java.stringsimilarity.Levenshtein;
+
+public class StringSortingUtils {
+
+    private StringSortingUtils() {
+        //no-op
+    }
+
+    /**
+     * Returns Comparator for sorting strings by its similarity with Levenshtein
+     * algorithm. By using this Comparator we get results from the highest to
+     * the lowest match.
+     *
+     * @param filter pattern to compare similarity
+     * @return Comparator with string similarity
+     */
+
+    public static Comparator<String> sortBySimilarity(final String filter) {
+        return (firstItem, secondItem) -> {
+            double firstItemSimilarity = calculateSimilarity(firstItem, filter);
+            double secondItemSimilarity = calculateSimilarity(secondItem, filter);
+            return (int) Math.signum(secondItemSimilarity - firstItemSimilarity);
+        };
+    }
+
+    private static double calculateSimilarity(String firstString, String secondString) {
+        String longer = firstString.toLowerCase();
+        String shorter = secondString.toLowerCase();
+
+        if (firstString.length() < secondString.length()) {
+            longer = secondString;
+            shorter = firstString;
+        }
+        int longerLength = longer.length();
+        if (longerLength == 0) {
+            return 1.0;
+        }
+
+        double distanceBetweenStrings = new Levenshtein().distance(longer, shorter);
+        return (longerLength - distanceBetweenStrings) / (double) longerLength;
+    }
+}

app/src/main/res/drawable/blue_rinse_circle.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/primarySuperLightColor" />
+</shape>

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

@@ -0,0 +1,195 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:layout_width="400sp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="8dp">
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:layout_marginBottom="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
+            app:cardCornerRadius="4dp"
+            app:cardElevation="4dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/primaryColor"
+                    android:gravity="center"
+                    android:paddingBottom="32dp"
+                    android:paddingTop="32dp"
+                    android:text="@string/login_to_your_account"
+                    android:textColor="@android:color/white"
+                    android:textSize="24sp" />
+
+                <FrameLayout
+                    android:id="@+id/error_message_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/title"
+                    android:visibility="gone"
+                    tools:visibility="visible">
+
+                    <TextView
+                        android:id="@+id/error_message"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp"
+                        android:layout_marginStart="16dp"
+                        android:paddingBottom="8dp"
+                        android:paddingTop="8dp"
+                        android:textColor="@color/secondaryDarkColor"
+                        tools:text="Check your password, something doesnt look right" />
+                </FrameLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/username_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/error_message_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/loginUsername"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/username"
+                        android:imeOptions="flagNoExtractUi"
+                        android:inputType="textNoSuggestions">
+
+                        <requestFocus />
+
+                    </android.support.design.widget.TextInputEditText>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/password_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/username_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp"
+                    app:passwordToggleEnabled="false">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/loginPassword"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/password"
+                        android:imeOptions="flagNoExtractUi"
+                        android:inputType="textPassword" />
+
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/two_factor_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/password_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp"
+                    android:visibility="gone"
+                    app:passwordToggleEnabled="false"
+                    tools:visibility="visible">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/loginTwoFactor"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/_2fa_code"
+                        android:imeOptions="flagNoExtractUi"
+                        android:inputType="textNoSuggestions"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                </android.support.design.widget.TextInputLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/two_factor_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp">
+
+                    <Button
+                        android:id="@+id/signupButton"
+                        android:layout_width="0dp"
+                        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginEnd="8dp"
+                        android:layout_marginRight="8dp"
+                        android:layout_weight="1"
+                        android:text="@string/signup" />
+
+                    <Button
+                        android:id="@+id/loginButton"
+                        android:layout_width="0dp"
+                        style="@style/Widget.AppCompat.Button.Colored"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_weight="1"
+                        android:enabled="false"
+                        android:text="@string/login" />
+
+                </LinearLayout>
+
+            </RelativeLayout>
+        </android.support.v7.widget.CardView>
+
+        <android.support.v7.widget.AppCompatImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:elevation="8dp"
+            tools:ignore="UnusedAttribute"
+            android:layout_gravity="center_horizontal"
+            app:srcCompat="@drawable/blue_rinse_circle" />
+
+        <android.support.v7.widget.AppCompatImageView
+            android:layout_width="42dp"
+            tools:ignore="UnusedAttribute"
+            android:layout_height="42dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="8dp"
+            android:elevation="8dp"
+            app:srcCompat="@drawable/commons_logo_large" />
+
+    </FrameLayout>
+
+</ScrollView>

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

@@ -0,0 +1,195 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:layout_width="400sp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="8dp">
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:layout_marginBottom="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
+            app:cardCornerRadius="4dp"
+            app:cardElevation="4dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/primaryColor"
+                    android:gravity="center"
+                    android:paddingBottom="32dp"
+                    android:paddingTop="32dp"
+                    android:text="@string/login_to_your_account"
+                    android:textColor="@android:color/white"
+                    android:textSize="24sp" />
+
+                <FrameLayout
+                    android:id="@+id/error_message_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/title"
+                    android:visibility="gone"
+                    tools:visibility="visible">
+
+                    <TextView
+                        android:id="@+id/error_message"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp"
+                        android:layout_marginStart="16dp"
+                        android:paddingBottom="8dp"
+                        android:paddingTop="8dp"
+                        android:textColor="@color/secondaryDarkColor"
+                        tools:text="Check your password, something doesnt look right" />
+                </FrameLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/username_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/error_message_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/loginUsername"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/username"
+                        android:imeOptions="flagNoExtractUi"
+                        android:inputType="textNoSuggestions">
+
+                        <requestFocus />
+
+                    </android.support.design.widget.TextInputEditText>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/password_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/username_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp"
+                    app:passwordToggleEnabled="false">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/loginPassword"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/password"
+                        android:imeOptions="flagNoExtractUi"
+                        android:inputType="textPassword" />
+
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/two_factor_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/password_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp"
+                    android:visibility="gone"
+                    app:passwordToggleEnabled="false"
+                    tools:visibility="visible">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/loginTwoFactor"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/_2fa_code"
+                        android:imeOptions="flagNoExtractUi"
+                        android:inputType="textNoSuggestions"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                </android.support.design.widget.TextInputLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/two_factor_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp">
+
+                    <Button
+                        android:id="@+id/signupButton"
+                        android:layout_width="0dp"
+                        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginEnd="8dp"
+                        android:layout_marginRight="8dp"
+                        android:layout_weight="1"
+                        android:text="@string/signup" />
+
+                    <Button
+                        android:id="@+id/loginButton"
+                        android:layout_width="0dp"
+                        style="@style/Widget.AppCompat.Button.Colored"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_weight="1"
+                        android:enabled="false"
+                        android:text="@string/login" />
+
+                </LinearLayout>
+
+            </RelativeLayout>
+        </android.support.v7.widget.CardView>
+
+        <android.support.v7.widget.AppCompatImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:elevation="8dp"
+            android:layout_gravity="center_horizontal"
+            app:srcCompat="@drawable/blue_rinse_circle"
+            tools:ignore="UnusedAttribute" />
+
+        <android.support.v7.widget.AppCompatImageView
+            android:layout_width="42dp"
+            android:layout_height="42dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="8dp"
+            tools:ignore="UnusedAttribute"
+            android:elevation="8dp"
+            app:srcCompat="@drawable/commons_logo_large" />
+
+    </FrameLayout>
+
+</ScrollView>

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

@@ -1,100 +1,195 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="match_parent">
-    >
 
-    <LinearLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_margin="16dp"
+        android:layout_marginTop="8dp">
-        android:gravity="center"
-        android:orientation="vertical"
-        >
 
-        <TextView
+        <android.support.v7.widget.CardView
-            android:id="@+id/loginSubtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="48dp"
-            android:drawablePadding="8dp"
-            android:drawableTop="@drawable/commons_logo_large"
-            android:gravity="center_horizontal"
-            android:text="@string/app_name"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-
-        <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            >
+            android:layout_marginBottom="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="32dp"
+            app:cardCornerRadius="4dp"
+            app:cardElevation="4dp">
 
-            <android.support.design.widget.TextInputEditText
+            <RelativeLayout
-                android:id="@+id/loginUsername"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/username"
+                android:gravity="center"
-                android:imeOptions="flagNoExtractUi"
+                android:orientation="vertical">
-                android:inputType="textNoSuggestions"
-                >
 
-                <requestFocus/>
+                <TextView
+                    android:id="@+id/title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/primaryColor"
+                    android:gravity="center"
+                    android:paddingBottom="32dp"
+                    android:paddingTop="32dp"
+                    android:text="@string/login_to_your_account"
+                    android:textColor="@android:color/white"
+                    android:textSize="24sp" />
 
-            </android.support.design.widget.TextInputEditText>
+                <FrameLayout
+                    android:id="@+id/error_message_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/title"
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
-        </android.support.design.widget.TextInputLayout>
+                    <TextView
+                        android:id="@+id/error_message"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp"
+                        android:layout_marginStart="16dp"
+                        android:paddingBottom="8dp"
+                        android:paddingTop="8dp"
+                        android:textColor="@color/secondaryDarkColor"
+                        tools:text="Check your password, something doesnt look right" />
+                </FrameLayout>
 
-        <android.support.design.widget.TextInputLayout
+                <android.support.design.widget.TextInputLayout
-            android:layout_width="match_parent"
+                    android:id="@+id/username_container"
-            android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
-            app:passwordToggleEnabled="false"
+                    android:layout_height="wrap_content"
-            >
+                    android:layout_below="@id/error_message_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp">
 
-            <android.support.design.widget.TextInputEditText
+                    <android.support.design.widget.TextInputEditText
-                android:id="@+id/loginPassword"
+                        android:id="@+id/loginUsername"
-                android:layout_width="match_parent"
+                        android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                        android:layout_height="wrap_content"
-                android:hint="@string/password"
+                        android:hint="@string/username"
-                android:imeOptions="flagNoExtractUi"
+                        android:imeOptions="flagNoExtractUi"
-                android:inputType="textPassword"
+                        android:inputType="textNoSuggestions">
-                />
 
-        </android.support.design.widget.TextInputLayout>
+                        <requestFocus />
 
-        <android.support.design.widget.TextInputLayout
+                    </android.support.design.widget.TextInputEditText>
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:passwordToggleEnabled="false"
-            >
 
-            <android.support.design.widget.TextInputEditText
+                </android.support.design.widget.TextInputLayout>
-                android:id="@+id/loginTwoFactor"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/_2fa_code"
-                android:imeOptions="flagNoExtractUi"
-                android:inputType="textNoSuggestions"
-                android:visibility="gone"
-                />
 
-        </android.support.design.widget.TextInputLayout>
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/password_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/username_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp"
+                    app:passwordToggleEnabled="false">
 
-        <Button
+                    <android.support.design.widget.TextInputEditText
-            android:id="@+id/loginButton"
+                        android:id="@+id/loginPassword"
-            android:layout_width="match_parent"
+                        android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+                        android:layout_height="wrap_content"
-            android:enabled="false"
+                        android:hint="@string/password"
-            android:text="@string/login"
+                        android:imeOptions="flagNoExtractUi"
-            />
+                        android:inputType="textPassword" />
 
-        <Button
+                </android.support.design.widget.TextInputLayout>
-            android:id="@+id/signupButton"
+
-            android:layout_width="match_parent"
+                <android.support.design.widget.TextInputLayout
-            android:layout_height="wrap_content"
+                    android:id="@+id/two_factor_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/password_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp"
+                    android:visibility="gone"
+                    app:passwordToggleEnabled="false"
+                    tools:visibility="visible">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/loginTwoFactor"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/_2fa_code"
+                        android:imeOptions="flagNoExtractUi"
+                        android:inputType="textNoSuggestions"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                </android.support.design.widget.TextInputLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/two_factor_container"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp">
+
+                    <Button
+                        android:id="@+id/signupButton"
+                        android:layout_width="0dp"
+                        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginEnd="8dp"
+                        android:layout_marginRight="8dp"
+                        android:layout_weight="1"
+                        android:text="@string/signup" />
+
+                    <Button
+                        android:id="@+id/loginButton"
+                        android:layout_width="0dp"
+                        style="@style/Widget.AppCompat.Button.Colored"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_weight="1"
+                        android:enabled="false"
+                        android:text="@string/login" />
+
+                </LinearLayout>
+
+            </RelativeLayout>
+        </android.support.v7.widget.CardView>
+
+        <android.support.v7.widget.AppCompatImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:elevation="8dp"
+            tools:ignore="UnusedAttribute"
             android:layout_gravity="center_horizontal"
-            android:text="@string/signup"
+            app:srcCompat="@drawable/blue_rinse_circle" />
-            />
+
+        <android.support.v7.widget.AppCompatImageView
+            android:layout_width="42dp"
+            android:layout_height="42dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="8dp"
+            tools:ignore="UnusedAttribute"
+            android:elevation="8dp"
+            app:srcCompat="@drawable/commons_logo_large" />
+
+    </FrameLayout>
 
-    </LinearLayout>
 </ScrollView>

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

@@ -2,21 +2,18 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/commonsAppBlue"
+    android:background="@color/primaryColor">
-    >
 
     <android.support.v4.view.ViewPager
         android:id="@+id/welcomePager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fadingEdge="none"
+        android:fadingEdge="none" />
-        />
 
     <com.viewpagerindicator.CirclePageIndicator
         android:id="@+id/welcomePagerIndicator"
         android:layout_height="24dp"
         android:layout_width="match_parent"
-        android:layout_gravity="bottom"
+        android:layout_gravity="bottom" />
-        />
 
 </FrameLayout>

app/src/main/res/menu/activity_share.xml

@@ -2,7 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_upload_single"
         android:title="@string/menu_upload_single"
-        android:icon="?attr/iconSend"
+        android:icon="@drawable/ic_send_white_24dp"
         android:enabled="false"
         app:showAsAction="always" />
 </menu>

app/src/main/res/menu/fragment_categorization.xml

@@ -4,6 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_save_categories"
           android:title="@string/menu_save_categories"
-          android:icon="?attr/iconSave"
+          android:icon="@drawable/ic_save_white_24dp"
           app:showAsAction="always" />
 </menu>

app/src/main/res/menu/fragment_contributions_list.xml

@@ -3,12 +3,12 @@
     <item android:id="@+id/menu_from_camera"
           android:title="@string/menu_from_camera"
           app:showAsAction="ifRoom|withText"
-          android:icon="?attr/iconCamera"
+          android:icon="@drawable/ic_photo_camera_white_24dp"
             />
     <item android:id="@+id/menu_from_gallery"
         android:title="@string/menu_from_gallery"
         app:showAsAction="ifRoom|withText"
-        android:icon="?attr/iconPhoto"
+        android:icon="@drawable/ic_photo_white_24dp"
             />
     <!--<item android:id="@+id/menu_nearby"-->
         <!--android:title="@string/menu_nearby"-->

app/src/main/res/menu/fragment_image_detail.xml

@@ -18,7 +18,7 @@
     <item
         android:id="@+id/menu_retry_current_image"
         android:enabled="false"
-        android:icon="?attr/iconUndo"
+        android:icon="@drawable/ic_undo_white_24dp"
         android:title="@string/menu_retry_upload"
         android:visible="false"
         app:showAsAction="ifRoom|withText" />

app/src/main/res/menu/fragment_multiple_upload_list.xml

@@ -6,6 +6,6 @@
     <item android:id="@+id/menu_upload_multiple"
           android:title="@string/share_upload_button"
           app:showAsAction="always|withText"
-        android:icon="?attr/iconSend"
+        android:icon="@drawable/ic_send_white_24dp"
         />
 </menu>

app/src/main/res/menu/menu_nearby.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"      tools:context=".MainActivity">
 
     <item
-        android:id="@+id/action_map"
+        android:id="@+id/action_toggle_view"
         android:title="@string/refresh_button"
         android:icon="@drawable/ic_map_white_24dp"
         android:orderInCategory="1"

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

@@ -57,7 +57,7 @@
   <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;برخصة أباتشي النسخة 2&lt;/a&gt;</string>
   <string name="about_improve" fuzzy="true">المصدر على &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;غِتهب&lt;/a&gt;. العلل في &lt;a href=\" https://github.com/commons-app/apps-android-commons/issues\"&gt;بغزِلا&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_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;سياسة الخصوصية&lt;/a&gt;</string>
   <string name="about_credits" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;CREDITS&lt;/a&gt;</string>
   <string name="title_activity_about">حول</string>
   <string name="menu_feedback">إرسال ملاحظات (عبر البريد الإلكتروني)</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Configuración</string>
   <string name="title_activity_signup">Date d\'alta</string>
   <string name="menu_about">Tocante a</string>
-  <string name="about_license">Software de códigu abiertu lliberáu baxo la &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Llicencia Apache v2&lt;/a&gt;. %1$s ya\'l so logotipu son marques rexistraes de la Fundación Wikimedia y utilícense col so permisu. Nun tamos acreditaos pola Fundación Wikimedia nin tamos afiliaos con ella.</string>
+  <string name="about_license" fuzzy="true">Software de códigu abiertu lliberáu baxo la &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Llicencia Apache v2&lt;/a&gt;. %1$s ya\'l so logotipu son marques rexistraes de la Fundación Wikimedia y utilícense col so permisu. Nun tamos acreditaos pola Fundación Wikimedia nin tamos afiliaos con ella.</string>
   <string name="about_improve">El &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;códigu fonte&lt;/a&gt; ya\'l &lt;a href=\"https://commons-app.github.io/\"&gt;sitiu web&lt;/a&gt; tán en GitHub. Crea una nueva &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;incidencia en GitHub&lt;/a&gt; pa informar de problemes y suxerencies.</string>
-  <string name="about_privacy_policy">Wikimedia:Commons-android-strings-about privacy policy/ast</string>
+  <string name="about_privacy_policy" fuzzy="true">Wikimedia:Commons-android-strings-about privacy policy/ast</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Créditos&lt;/a&gt;</string>
   <string name="title_activity_about">Tocante a</string>
   <string name="menu_feedback">Unviar comentarios (per corréu)</string>
@@ -135,6 +135,7 @@
   <string name="detail_license_empty">Llicencia desconocida</string>
   <string name="menu_refresh">Refrescar</string>
   <string name="read_storage_permission_rationale">Permisu riquíu: llectura d\'almacenamientu esternu. L\'aplicación nun puede funcionar ensin él.</string>
+  <string name="write_storage_permission_rationale">Permisu riquíu: escritura d\'almacenamientu esternu. L\'aplicación nun puede funcionar ensin él.</string>
   <string name="location_permission_rationale">Permisu opcional: llograr l\'allugamientu actual pa suxerir categoríes</string>
   <string name="ok">Aceutar</string>
   <string name="title_activity_nearby">Llugares cercanos</string>
@@ -194,4 +195,7 @@
   <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="give_permission">Dar permisu</string>
+  <string name="use_external_storage">Usar almacenamientu esternu</string>
+  <string name="use_external_storage_summary">Guardar nel preséu les imaxes tomaes cola cámara de la app</string>
 </resources>

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

@@ -74,7 +74,7 @@
   <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;এ্যাপাচি লাইসেন্স v2&lt;/a&gt; অধীনে প্রকাশিত</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&gt;। কোন সমস্যা ও পরামর্শের জন্য &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;গিটহাব ইস্যু&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_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/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>
   <string name="title_activity_about">পরিচিতি</string>
   <string name="menu_feedback">প্রতিক্রিয়া পাঠান (ইমেইলের মাধ্যমে)</string>
@@ -187,5 +187,7 @@
   <string name="no_description_found">কোন বিবরণ পাওয়া যায়নি</string>
   <string name="nearby_info_menu_commons_article">কমন্সে ফাইলের পাতা</string>
   <string name="nearby_info_menu_wikidata_article">উইকিউপাত্ত পদ</string>
+  <string name="give_permission">অনুমতি দিন</string>
   <string name="use_external_storage">বাহ্যিক সঞ্চয়স্থান ব্যবহার করুন</string>
+  <string name="login_to_your_account">আপনার অ্যাকাউন্টে প্রবেশ করুন</string>
 </resources>

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

@@ -75,7 +75,7 @@
   <string name="menu_about">Diwar-benn</string>
   <string name="about_license" fuzzy="true">Meziant frank a wirioù embannet dindan &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;an Aotre-implijout Apache v2&lt;/a&gt;. Merkoù kenwerzhel eus Diazezadur Wikimedia eo Wikimedia Commons hag e logoioù. Gallout a reont bezañ implijet gant aotre an Diazezadur. N\'omp nag aprouet gant Diazezadur Wiikimedia na stag outañ.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Mammenn&lt;/a&gt; ha &lt;a href=\"https://commons-app.github.io/\"&gt;lec\'hienn&lt;/a&gt; war GitHub. Krouiñ ur &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;gemennadenn GitHub nevez&lt;/a&gt; evit kelaouiñ a-zivout un draen bennak pe bet kinnigoù.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Reolennoù prevezded&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Reolennoù prevezded&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Trugarekadennoù&lt;/a&gt;</string>
   <string name="title_activity_about">Diwar-benn</string>
   <string name="menu_feedback">Kas ho soñj (dre bostel)</string>

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

@@ -75,7 +75,7 @@
   <string name="menu_about">O</string>
   <string name="about_license" fuzzy="true">Program otvorenog kod objavljen pod licencom &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache v2&lt;/a&gt;. Wikimedia Commons i njen logo zaštitni su znaci Zadužbine Wikimedia i koriste se s njenom dozvolom. Nismo povezani niti nas podržava Zadužbina Wikimedia.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Izvorni kod&lt;/a&gt; i &lt;a href=\"https://commons-app.github.io/\"&gt;veb-sajt&lt;/a&gt; na GitHubu. Započnite novi &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;slučaj na GitHubu&lt;/a&gt; da biste prijavili greške i dali prijedloge.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Politika privatnosti&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Politika privatnosti&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Zasluge&lt;/a&gt;</string>
   <string name="title_activity_about">O</string>
   <string name="menu_feedback">Pošalji povratne informacije (putem e-pošte)</string>

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

@@ -70,9 +70,9 @@
   <string name="title_activity_settings">Paràmetres</string>
   <string name="title_activity_signup">Registre</string>
   <string name="menu_about">Quant a</string>
-  <string name="about_license" fuzzy="true">Programari de codi obert distribuït sota la &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;llicència Apache v2&lt;/a&gt;</string>
+  <string name="about_license">L’aplicació de codi obert Wikimedia Commons fou creada per, i rep manteniment de, cessionaris i voluntaris de la comunitat de Wikimedia. La Fundació Wikimedia no està involucrada en la creació, el desenvolupament ni el manteniment de l’aplicació.</string>
   <string name="about_improve" fuzzy="true">Codi a &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Informes d\'error a &lt;a href=\" https://github.com/commons-app/apps-android-commons/issues\"&gt;Github&lt;/a&gt;.</string>
-  <string name="about_privacy_policy">Wikimedia:Commons-android-texts-sobre privacitat/ca</string>
+  <string name="about_privacy_policy" fuzzy="true">Wikimedia:Commons-android-texts-sobre privacitat/ca</string>
   <string name="title_activity_about">Quant a</string>
   <string name="menu_feedback">Envia comentaris (per correu)</string>
   <string name="provider_categories">Categories usades recentment</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Nastavení</string>
   <string name="title_activity_signup">Zaregistrovat se</string>
   <string name="menu_about">O aplikaci</string>
-  <string name="about_license">Open Source software dostupný za podmínek &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. %1$s a logo %1$s jsou ochranné známky Wikimedia Foundation a jsou použity se svolením Wikimedia Foundation. Nejsme podporováni Wikimedia Foundation ani nejsme její součástí.</string>
+  <string name="about_license" fuzzy="true">Open Source software dostupný za podmínek &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. %1$s a logo %1$s jsou ochranné známky Wikimedia Foundation a jsou použity se svolením Wikimedia Foundation. Nejsme podporováni Wikimedia Foundation ani nejsme její součástí.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Zdrojový kód&lt;/a&gt;, &lt;a href=\"https://commons-app.github.io/\"&gt;webová stránka&lt;/a&gt; a &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;hlášení chyb a sdílení nápadů&lt;/a&gt; na GitHubu.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Ochrana_osobních_údajů\"&gt;Ochrana osobních údajů&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Ochrana osobních údajů&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Autoři&lt;/a&gt;</string>
   <string name="title_activity_about">O aplikaci</string>
   <string name="menu_feedback">Poslat názory (e-mailem)</string>

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

@@ -72,7 +72,7 @@
   <string name="title_activity_settings">Nastôwë</string>
   <string name="title_activity_signup">Wregistrëjë sã</string>
   <string name="menu_about">Ò aplikacëji</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Pòlitika priwatnotë&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Pòlitika priwatnotë&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Ùsôdzcë&lt;/a&gt;</string>
   <string name="title_activity_about">Ò aplikacëji</string>
   <string name="menu_feedback">Sélôj òpinijã (przez e-mail)</string>

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

@@ -70,7 +70,7 @@
   <string name="menu_about">Amdanom</string>
   <string name="about_license" fuzzy="true">Meddalwedd Cynnwys Agored wedi\'i rhyddhau o dan &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Drwydded Apache v2&lt;/a&gt; Mae logo a nod masnach Comin Wicimedia yn eiddo i Sefydliad Wicimedia ac fe\'u defnyddir gyda chaniatad y Sefydliad hwnnw. Nid ydym ni wedi cael sêl bendith y sefydliad nac yn perthyn iddyn nhw.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Mae\'r codau ffynhonnell ar wefanau&lt;/a&gt; Comin a &lt;a href=\"https://commons-app.github.io/\"&gt;gwefan &lt;/a&gt; GitHub. Gellwch greu &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;Ymholiad Github&lt;/a&gt; os gwelwch byg, neu i awgrymu gwelliannau.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Polisi preifatrwydd&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Polisi preifatrwydd&lt;/a&gt;</string>
   <string name="title_activity_about">Amdanom</string>
   <string name="menu_feedback">Danfonwch Adborth (drwy Ebost)</string>
   <string name="no_email_client">Dim ebost client wedi\'i ganfod</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Indstillinger</string>
   <string name="title_activity_signup">Opret konto</string>
   <string name="menu_about">Om</string>
-  <string name="about_license">Open Source-programmer udgivet under &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. %1$s og dets logo er varemærker for Wikimedia Foundation og bruges med tilladelse fra Wikimedia Foundation. Vi er hverken støttet af eller forbundet med Wikimedia Foundation.</string>
+  <string name="about_license">Wikimedia Commons-programmet oprettet og udviklet af frivillige i Wikimediafællesskabet. Wikimedia Foundation er ikke involveret i oprettelse, udvikling eller vedligeholdelse af programmet.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Kilde&lt;/a&gt; og &lt;a href=\"https://commons-app.github.io/\"&gt;hjemmeside&lt;/a&gt; på GitHub. Opret en ny &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-sag&lt;/a&gt; for fejlrapporter og forslag.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Privacy policy&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Privatlivspolitik&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Bidragsydere&lt;/a&gt;</string>
   <string name="title_activity_about">Om</string>
   <string name="menu_feedback">Send tilbagemelding (med e-mail)</string>
@@ -195,6 +195,8 @@
   <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="give_permission">Giv tilladelse</string>
   <string name="use_external_storage">Brug eksternt lager</string>
   <string name="use_external_storage_summary">Gem billeder taget med din enheds program på kameraet</string>
+  <string name="login_to_your_account">Log ind på din konto</string>
 </resources>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Einstellungen</string>
   <string name="title_activity_signup">Registrieren</string>
   <string name="menu_about">Über</string>
-  <string name="about_license">Die Open-Source-Software wurde veröffentlicht unter der &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache-Lizenz v2&lt;/a&gt;. %1$s und das entsprechende Logo sind Markenzeichen der Wikimedia Foundation und wurden mit Genehmigung der Wikimedia Foundation verwendet. Wir wurden nicht von der Wikimedia Foundation bestätigt oder sind nicht mit ihr verbunden.</string>
+  <string name="about_license">Die Wikimedia-Commons-App ist eine Open-Source-App, entwickelt und gewartet von Freiwilligen der Wikimedia-Gemeinschaft. Die Wikimedia Foundation ist nicht bei der Erstellung, Entwicklung oder Wartung der App beteiligt.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Quellcode&lt;/a&gt; und &lt;a href=\"https://commons-app.github.io/\"&gt;Website&lt;/a&gt; auf GitHub. Einen neuen &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-Eintrag&lt;/a&gt; für Fehlerberichte und Vorschläge erstellen.</string>
-  <string name="about_privacy_policy">&lt;a href=\"//de.wikipedia.org/wiki/Wikipedia:Datenschutz\"&gt;Datenschutzrichtlinie&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Datenschutzrichtlinie&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Danksagungen&lt;/a&gt;</string>
   <string name="title_activity_about">Über</string>
   <string name="menu_feedback">Rückmeldung per E-Mail senden</string>
@@ -195,6 +195,8 @@
   <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="give_permission">Berechtigung geben</string>
   <string name="use_external_storage">Externen Speicher verwenden</string>
   <string name="use_external_storage_summary">Mit der In-App-Kamera aufgenommene Bilder auf deinem Gerät speichern</string>
+  <string name="login_to_your_account">Bei deinem Benutzerkonto anmelden</string>
 </resources>

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

@@ -69,7 +69,7 @@
   <string name="title_activity_signup">Qeyd be</string>
   <string name="menu_about">Heq te cı</string>
   <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Çıme&lt;/a&gt; u &lt;a href=\"https://commons-app.github.io/\"&gt;website&lt;/a&gt; on GitHub&lt;/a&gt;. Newe vıraz &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub mewzu &lt;/a&gt; U rapor bıweseynê</string>
-  <string name="about_privacy_policy">/</string>
+  <string name="about_privacy_policy" fuzzy="true">/</string>
   <string name="title_activity_about">Heq te cı</string>
   <string name="menu_feedback">Peyd rışten bırış (E-posta ra)</string>
   <string name="no_email_client">E-posta eyar nêbi</string>

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

@@ -71,7 +71,7 @@
   <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 v2&lt;/a&gt;. Το Wikimedia Commons και το λογότυπο είναι εμπορικά σήματα του Ιδρύματος Wikimedia και χρησιμοποιούνται με άδεια από το Ίδρυμα Wikimedia. Δεν προτεινόμαστε ή συνδεόμαστε με το Ίδρυμα Wikimedia.</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_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Πολιτική προσωπικών δεδομένων&lt;/a&gt;</string>
   <string name="about_credits" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;CREDITS&lt;/a&gt;</string>
   <string name="title_activity_about">Σχετικά</string>
   <string name="menu_feedback">Αποστολή σχολίων (μέσω Email)</string>

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

@@ -8,10 +8,10 @@
   <string name="signup">Regístrate</string>
   <string name="logging_in_title">Accediendo</string>
   <string name="logging_in_message">Espera un momento…</string>
-  <string name="login_success">¡Inicio de sesión exitoso!</string>
+  <string name="login_success">Acceso correcto.</string>
-  <string name="login_failed">¡Inicio de sesión fallido!</string>
+  <string name="login_failed">Acceso fallido.</string>
   <string name="upload_failed">No se encontró el archivo. Prueba con otro.</string>
-  <string name="authentication_failed">¡Autentificación fallida!</string>
+  <string name="authentication_failed">Falló la autenticación.</string>
   <string name="uploading_started">¡Empenzando a subir!</string>
   <string name="upload_completed_notification_title">¡Se subieron %1$s!</string>
   <string name="upload_completed_notification_text">Pulsa para ver tu subida</string>
@@ -73,12 +73,12 @@
   <string name="title_activity_settings">Ajustes</string>
   <string name="title_activity_signup">Regístrate</string>
   <string name="menu_about">Acerca de</string>
-  <string name="about_license">Programa de código abierto publicado bajo la &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Licencia Apache ver. 2&lt;/a&gt;. %1$s y su logotipo son marcas registradas de la Fundación Wikimedia y se utilizan con su permiso. No hemos sido acreditados por la Fundación Wikimedia ni estamos afiliados con ella.</string>
+  <string name="about_license">La aplicación de código abierto Wikimedia Commons fue creada por, y recibe mantenimiento de, cesionarios y voluntarios de la comunidad de Wikimedia. La Fundación Wikimedia no está involucrada en la creación, el desarrollo ni el mantenimiento de la aplicación.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Código fuente&lt;/a&gt; y &lt;a href=\"https://commons-app.github.io/\"&gt;sitio web&lt;/a&gt; en GitHub. Crea &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;incidencias&lt;/a&gt; para informar de problemas y sugerencias.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Normativa de privacidad&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Normativa de privacidad&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Créditos&lt;/a&gt;</string>
   <string name="title_activity_about">Acerca de</string>
-  <string name="menu_feedback">Enviar comentarios (por e-mail)</string>
+  <string name="menu_feedback">Enviar comentarios (por correo)</string>
   <string name="no_email_client">No se ha instalado ningún cliente de correo</string>
   <string name="provider_categories">Categorías usadas recientemente</string>
   <string name="waiting_first_sync">Esperando la primera sincronización…</string>
@@ -135,6 +135,7 @@
   <string name="detail_license_empty">Licencia desconocida</string>
   <string name="menu_refresh">Actualizar</string>
   <string name="read_storage_permission_rationale">Permiso obligatorio: lectura de almacenamiento externo. La aplicación no puede funcionar sin él.</string>
+  <string name="write_storage_permission_rationale">Permiso necesario: Escribir en almacenamiento externo. La aplicación no puede funcionar sin él.</string>
   <string name="location_permission_rationale">Permiso opcional: obtener la ubicación actual para sugerir categorías</string>
   <string name="ok">Aceptar</string>
   <string name="title_activity_nearby">Lugares cercanos</string>
@@ -194,4 +195,8 @@
   <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="give_permission">Otorgar permiso</string>
+  <string name="use_external_storage">Utilizar almacenamiento externo</string>
+  <string name="use_external_storage_summary">Guardar en el dispositivo imágenes capturadas con la cámara de la aplicación</string>
+  <string name="login_to_your_account">Accede a tu cuenta</string>
 </resources>

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

@@ -59,9 +59,9 @@
   <string name="title_activity_settings">Hobespenak</string>
   <string name="title_activity_signup">Eman izena</string>
   <string name="menu_about">Honi buruz</string>
-  <string name="about_license">Open Source softwarea &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache v2 Lizentziaren&lt;/a&gt; pean egina. Wikimedia Commons eta bere logoa Wikimedia Fundazioaren marka erregistratuak dira eta Wikimedia Fundazioaren baimenarekin erabiltzen dira. Ez gaude Wikimedia Fundaziora afiliatuta.</string>
+  <string name="about_license" fuzzy="true">Open Source softwarea &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache v2 Lizentziaren&lt;/a&gt; pean egina. Wikimedia Commons eta bere logoa Wikimedia Fundazioaren marka erregistratuak dira eta Wikimedia Fundazioaren baimenarekin erabiltzen dira. Ez gaude Wikimedia Fundaziora afiliatuta.</string>
   <string name="about_improve">GitHub-eko &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Iturria&lt;/a&gt; eta &lt;a href=\"https://commons-app.github.io/\"&gt;webgunea&lt;/a&gt;. &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-eko gai&lt;/a&gt; berria sortu erroreen berri emateko.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Pribatutasun politika&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Pribatutasun politika&lt;/a&gt;</string>
   <string name="title_activity_about">Honi buruz</string>
   <string name="menu_feedback">Bidali zure iritzia (e-posta bidez)</string>
   <string name="no_email_client">Posta bezerorik ez da instalatu</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">تنظیمات</string>
   <string name="title_activity_signup">ثبت نام</string>
   <string name="menu_about">درباره</string>
-  <string name="about_license">نرم‌افزار متن‌باز آزاد تحت &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;مجوز آپاچی نسخهٔ ۲&lt;/a&gt;\n\n%1$s و نشانش یک نشان تجاری‌ست و با اجازهٔ بنیاد ویکی‌مدیا استفاده می‌شود. ما زیرمجموعه یا شعبهٔ بنیاد نیستیم.</string>
+  <string name="about_license">اپلیکیشن ویکی‌انبار بنیاد ویکی‌مدیا یک نرم‌افزار آزاد است که توسط کاربران داوطلب و پاداش‌بگیر ایجاد و نگهداری می‌شود. بنیاد ویکی‌مدیا در ایجاد، نگهداری و توسعهٔ آن دخالتی ندارد.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Source&lt;/a&gt; and &lt;a href=\"https://commons-app.github.io/\"&gt;وب‌سایت&lt;/a&gt; در گیت‌هاب. ایجاد یک &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;درخواست در گیت‌هاب&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_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/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>
   <string name="title_activity_about">درباره</string>
   <string name="menu_feedback">ارسال بازخورد (از طریق ایمیل)</string>
@@ -135,6 +135,7 @@
   <string name="detail_license_empty">مجوز ناشناخته</string>
   <string name="menu_refresh">تازه‌کردن</string>
   <string name="read_storage_permission_rationale">اجازه‌های مورد نیاز: مطالعهٔ حافظهٔ خارجی. اپلیکیشن بدون آن نمی‌تواند کار کند.</string>
+  <string name="write_storage_permission_rationale">اجازه‌های مورد نیاز: نوشتن حافظهٔ خارجی. اپلیکیشن بدون آن نمی‌تواند کار کند.</string>
   <string name="location_permission_rationale">اجازه‌های اختیاری: دریافت موقعیت برای پیشنهاد رده</string>
   <string name="ok">تأیید</string>
   <string name="title_activity_nearby">مکان‌‌های اطراف</string>
@@ -194,4 +195,8 @@
   <string name="error_while_cache">خطا در زمان دریافت تصاویر</string>
   <string name="title_info">عنوانی توصیفی و یکتا برای پرونده که به عنوان نام پرونده در نظر گرفته خواهد شد. ترجیحاً به زبان ساده باشد، می‌توانید فاصله هم به کار ببرید. پسوند پرونده را ننویسید.</string>
   <string name="description_info">لطفاً تصویر را تا حد توان شرح دهید. کجا گرفته شده‌است؟ شامل چه چیزی می‌شود؟ لطفاً اشیا یا افراد را شرح دهید. اطلاعاتی که به راحتی قابل مشاهده هستند را صرفه‌نظر کنید. اگر چیزی در تصویر غیر طبیعی به نظر می‌رسد آن را شرح دهید.</string>
+  <string name="give_permission">اجازه بده</string>
+  <string name="use_external_storage">استفاده از حافظهٔ خارجی</string>
+  <string name="use_external_storage_summary">ذخیرهٔ تصویرهای گرفته شده توسط دوربین درونکار اپلیکیشن بر روی دستگاه شما</string>
+  <string name="login_to_your_account">ورود به حساب کاربریتان</string>
 </resources>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Asetukset</string>
   <string name="title_activity_signup">Rekisteröidy</string>
   <string name="menu_about">Tietoja</string>
-  <string name="about_license">Tämä on vapaan lähdekoodin ohjelmisto, joka on julkaistu &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt; -lisenssin alaisena. Wikimedia Commons ja sen logo ovat Wikimedia Foundationin tavaramerkkejä ja niitä käytetään Wikimedia Foundationin luvalla. Emme ole hyväksyttyjä tai sidoksissa Wikimedia Foundationioniin.</string>
+  <string name="about_license" fuzzy="true">Tämä on vapaan lähdekoodin ohjelmisto, joka on julkaistu &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt; -lisenssin alaisena. Wikimedia Commons ja sen logo ovat Wikimedia Foundationin tavaramerkkejä ja niitä käytetään Wikimedia Foundationin luvalla. Emme ole hyväksyttyjä tai sidoksissa Wikimedia Foundationioniin.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Lähde&lt;/a&gt; ja &lt;a href=\"https://commons-app.github.io/\"&gt;nettisivusto&lt;/a&gt; GitHubissa. Luo uusi &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-issue&lt;/a&gt; bugiraporteille ja ehdotuksille.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Yksityisyydensuoja&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Yksityisyydensuoja&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Tekijät&lt;/a&gt;</string>
   <string name="title_activity_about">Tietoja</string>
   <string name="menu_feedback">Lähetä palautetta (sähköpostitse)</string>

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

@@ -49,7 +49,7 @@
   <string name="menu_about">Um</string>
   <string name="about_license" fuzzy="true">Open Source ritbúnaður útgivin undir &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;</string>
   <string name="about_improve" fuzzy="true">Kelda á &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Lýs (bugs) á &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;Privatlívs politikkur&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Privatlívs politikkur&lt;/a&gt;</string>
   <string name="title_activity_about">Um</string>
   <string name="menu_feedback">Send afturmelding (við T-posti)</string>
   <string name="provider_categories">Nýliga brúktir bólkar</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Paramètres</string>
   <string name="title_activity_signup">S’inscrire</string>
   <string name="menu_about">À propos</string>
-  <string name="about_license">Les logiciels Open Source sont publiés sous la &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;licence Apache v2&lt;/a&gt;. %1$s et son logo sont des marques déposées de la Fondation Wikimédia qui sont utilisées avec l’autorisation de la Fondation Wikimédia. Nous ne sommes pas approuvés par ou affiliés à la Fondation Wikimédia.</string>
+  <string name="about_license">L\'application Wikimedia Commons est une application open-source crée et maintenue par les bénéficiaires et volontaires de la communauté Wikimedia. La fondation Wikimedia n\'est pas associée à la création, le développement ou la maintenance de l\'application.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Sources&lt;/a&gt; et &lt;a href=\"https://commons-app.github.io/\"&gt;site web&lt;/a&gt; sur GitHub. Créer un nouveau &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;signalement GitHub&lt;/a&gt; pour signales des bogues ou des suggestions.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Politique de confidentialité&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Politique de confidentialité&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Remerciements&lt;/a&gt;</string>
   <string name="title_activity_about">À propos</string>
   <string name="menu_feedback">Envoyer vos commentaires (par courriel)</string>
@@ -195,6 +195,8 @@
   <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="give_permission">Accorder le droit</string>
   <string name="use_external_storage">Utiliser le stockage externe</string>
   <string name="use_external_storage_summary">Enregistrer les images prises avec l’appareil photo de votre appareil</string>
+  <string name="login_to_your_account">Connectez-vous à votre compte</string>
 </resources>

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

@@ -75,7 +75,7 @@
   <string name="menu_about">Auer</string>
   <string name="about_license" fuzzy="true">Open Source software ütjden oner det lisens &lt;a href=\" https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;.\nWikimedia Commons an det Wikimedia-Commons-Logo san markintiaken faan\'t Wikimedia Foundation an wurd mä ferloof faan\'t Wikimedia Foundation brükt. Wi hiar ei tu\'t Wikimedia Foundation.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Code&lt;/a&gt; an &lt;a href=\"https://commons-app.github.io/\"&gt;Wääbsteed&lt;/a&gt; üüb GitHub&lt;/a&gt;. En neien &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-iindrach&lt;/a&gt; för feelern of föörslacher maage.</string>
-  <string name="about_privacy_policy">Brükerreegeln</string>
+  <string name="about_privacy_policy" fuzzy="true">Brükerreegeln</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Soonk&lt;/a&gt;</string>
   <string name="title_activity_about">Auer</string>
   <string name="menu_feedback">Wat wel dü üs sai ? (auer e-mail)</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Configuracións</string>
   <string name="title_activity_signup">Rexistrarse</string>
   <string name="menu_about">Acerca de</string>
-  <string name="about_license">Software de código aberto liberado baixo a &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;licenza Apache v2&lt;/a&gt;. %1$s e o seu logo son marcas rexistradas da Fundación Wikimedia e úsanse coa súa autorización. Non fomos acreditados pola Fundación Wikimedia nin estamos afiliados con ela.</string>
+  <string name="about_license">A aplicación Wikimedia Commons é unha aplicación de código aberto creada e mantida polos cesionarios e voluntarios da comunidade de Wikimedia. A Fundación Wikimedia non está involucrada na creación, desenvolvemento ou mantemento da aplicación.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Código fonte&lt;/a&gt; e &lt;a href=\"https://commons-app.github.io/\"&gt;sitio web&lt;/a&gt; en GitHub. Crear unha nova &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;incidencia&lt;/a&gt; para informar de problemas e suxestións.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Política_de_protección_de_datos_(gl)\"&gt;Política de protección de datos&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Política de privacidade&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Créditos&lt;/a&gt;</string>
   <string name="title_activity_about">Acerca de</string>
   <string name="menu_feedback">Enviar comentarios (por correo electrónico)</string>
@@ -135,6 +135,7 @@
   <string name="detail_license_empty">Licenza descoñecida</string>
   <string name="menu_refresh">Refrescar</string>
   <string name="read_storage_permission_rationale">Permiso necesarioː ler un almacenamento externo. A aplicación non pode funcionar sen isto.</string>
+  <string name="write_storage_permission_rationale">Permiso necesario: Escribir en almacenamento externo. A aplicación non pode funcionar sen el.</string>
   <string name="location_permission_rationale">Permiso opcionalː obter a localización actual para suxerir categorías</string>
   <string name="ok">Aceptar</string>
   <string name="title_activity_nearby">Lugares próximos</string>
@@ -194,4 +195,8 @@
   <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="give_permission">Outorgar permiso</string>
+  <string name="use_external_storage">Usar o almacenamento externo</string>
+  <string name="use_external_storage_summary">Gardar as imaxes capturadas coa cámara do seu dispositivo</string>
+  <string name="login_to_your_account">Comezar sesión na súa conta</string>
 </resources>

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

@@ -49,7 +49,7 @@
   <string name="menu_about">Pilina</string>
   <string name="about_license" fuzzy="true">Hāʻawi ʻia nā lako pōlamu kūmolenoa ma lalo o ka &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Laikini ʻApaki m2&lt;/a&gt;</string>
   <string name="about_improve" fuzzy="true">Aia ke kūmole ma &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Aia nā mū ma &lt;a href=\"https://bugzilla.wikimedia.org/enter_bug.cgi?product=Commons%20App\"&gt;Bugzilla&lt;/a&gt;</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Kulekele pilikino&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Kulekele pilikino&lt;/a&gt;</string>
   <string name="title_activity_about">Pilina</string>
   <string name="menu_feedback">Hoʻouna Manaʻo (ia Lekauila)</string>
   <string name="provider_categories">Nā māhele i hanawale</string>

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

@@ -54,7 +54,10 @@
   <string name="gps_disabled">आपके डिवाइस में जीपीएस अक्षम है। क्या आप इसे सक्षम करना चाहेंगे?</string>
   <string name="enable_gps">जीपीएस सक्षम करें</string>
   <string name="contributions_subtitle_zero">अभी तक कोई अपलोड नहीं</string>
-  <string name="contributions_subtitle">{{PLURAL | शून्य = @ स्ट्रिंग / योगदान_उपशीर्षक_शुन्य | एक =% d अपलोड |% d अपलोड्स}}</string>
+  <plurals name="contributions_subtitle">
+    <item quantity="one">%d अपलोड</item>
+    <item quantity="other">%d अपलोड्स</item>
+  </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">%d अपलोड शुरू</item>
     <item quantity="other">%d अपलोड शुरू</item>
@@ -69,9 +72,9 @@
   <string name="title_activity_settings">पसंद</string>
   <string name="title_activity_signup">खाता खोलें</string>
   <string name="menu_about">परिचय</string>
-  <string name="about_license">मुक्त स्रोत सॉफ्टवेयर जो &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;अपाचे लाइसेन्स&lt;/a&gt; के अंतर्गत जारी किया गया है। %1$s और इसका लोगो विकिमीडिया संस्था का व्यापारिक चिह्न है और इसके मर्जी से ही उपयोग किया जाना चाहिए। हम किसी भी प्रकार से विकिमीडिया संस्था से जुड़े नहीं हैं।</string>
+  <string name="about_license" fuzzy="true">मुक्त स्रोत सॉफ्टवेयर जो &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;अपाचे लाइसेन्स&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; गिटहब में है और त्रुटि व सुझाव हेतु &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;गिटहब समस्या&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_privacy_policy" fuzzy="true">&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>
   <string name="title_activity_about">परिचय</string>
   <string name="menu_feedback">प्रतिक्रिया दें (ईमेल द्वारा)</string>
@@ -131,6 +134,7 @@
   <string name="detail_license_empty">अज्ञात लाइसेन्स</string>
   <string name="menu_refresh">ताजा करें</string>
   <string name="read_storage_permission_rationale">अनिवार्य अनुमति: बाहरी स्मृति पढ़ें। एप इसके बिना कार्य नहीं करेगा।</string>
+  <string name="write_storage_permission_rationale">अनिवार्य अनुमति:बाहरी कंप्यूटर स्टोरेज लिखना|इसके बिना एप कार्य नहीं करेगा।</string>
   <string name="location_permission_rationale">वैकल्पिक अनुमति: श्रेणी सुझाव हेतु वर्तमान स्थान ज्ञात करें</string>
   <string name="ok">ठीक है</string>
   <string name="title_activity_nearby">आसपास के स्थान</string>
@@ -190,4 +194,6 @@
   <string name="error_while_cache">चित्र कैशिंग करते समय त्रुटि</string>
   <string name="title_info">फ़ाइल के लिए एक अद्वितीय वर्णनात्मक शीर्षक, जो एक फ़ाइल नाम के रूप में काम करेगा। आप रिक्त स्थान के साथ सादे भाषा का उपयोग कर सकते हैं। फ़ाइल विस्तार शामिल न करें</string>
   <string name="description_info">कृपया मीडिया जितना संभव हो उतना बताएं: यह कहां लिया गया? यह क्या दिखाता है? संदर्भ क्या है? कृपया वस्तुओं या व्यक्तियों का वर्णन करें। ऐसी जानकारी का खुलासा करें जिसे आसानी से अनुमानित नहीं किया जा सकता, उदाहरण के लिए दिन का समय यदि यह परिदृश्य है। अगर मीडिया कुछ असामान्य दिखाता है, तो कृपया बताएं कि इसे क्या असामान्य बनाता है।</string>
+  <string name="use_external_storage">बाहरी स्टॉरज का पृयोग करे।</string>
+  <string name="use_external_storage_summary">आप अपने डिवाइस के इन-ऐप कैमरा से ली गई तस्वीरों को सहेजें।</string>
 </resources>

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

@@ -49,7 +49,7 @@
   <string name="menu_about">Üwer</string>
   <string name="about_license" fuzzy="true">Open-Source-Software veröffentlicht unner der &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;</string>
   <string name="about_improve" fuzzy="true">Quellcode uff &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Fehler unner &lt;a href=\"https://bugzilla.wikimedia.org/enter_bug.cgi?product=Commons%20App\"&gt;Bugzilla&lt;/a&gt;.</string>
-  <string name="about_privacy_policy">&lt;a href=\"//de.wikipedia.org/wiki/Wikipedia:Datenschutz\"&gt;Dateschutzrichtlinie&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"//de.wikipedia.org/wiki/Wikipedia:Datenschutz\"&gt;Dateschutzrichtlinie&lt;/a&gt;</string>
   <string name="title_activity_about">Üwer</string>
   <string name="menu_feedback">Rückmeldung doorrich E-Mail schicke</string>
   <string name="provider_categories">Keerzlich verwennete Kategorie</string>

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

@@ -48,7 +48,7 @@
   <string name="menu_about">Wo</string>
   <string name="about_license" fuzzy="true">Software zjawneho žórła wozjewjena pod licencu &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;</string>
   <string name="about_improve" fuzzy="true">Žórłowy kod na &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Zdźělenja wo programowych zmylkach na &lt;a href=\"https://bugzilla.wikimedia.org/enter_bug.cgi?product=Commons%20App\"&gt;Bugzilla&lt;/a&gt;.</string>
-  <string name="about_privacy_policy">&lt;a href=\"//de.wikipedia.org/wiki/Wikipedia:Datenschutz\"&gt;Prawidła priwatnosće&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"//de.wikipedia.org/wiki/Wikipedia:Datenschutz\"&gt;Prawidła priwatnosće&lt;/a&gt;</string>
   <string name="title_activity_about">Wo</string>
   <string name="menu_feedback">Komentar pósłać (přez e-mejl)</string>
   <string name="provider_categories">Njedawno wužite kategorije</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Beállítások</string>
   <string name="title_activity_signup">Regisztráció</string>
   <string name="menu_about">Névjegy</string>
-  <string name="about_license" fuzzy="true">Nyílt forráskódú szoftver &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt; alatt kiadva. A Wikimédia Commons és a logója a Wikimédia Alapítvány védjegyei, és a Wikimédia Alapítvány engedélyével vannak használva. Az alkalmazás fejlesztői nincsenek semmilyen kapcsolatban Wikimédia Alapítvánnyal.</string>
+  <string name="about_license">A Wikimedia Commons applikáció egy nyílt forráskódú szoftver, amit a Wikimedia-közösség önkéntesei készítettek és tartanak karban. A Wikimédia Alapítvány nem vesz részt az applikáció megalkotásában, fejlesztésében és üzemeltetésében.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Forráskód&lt;/a&gt; és &lt;a href=\"https://commons-app.github.io/\"&gt;weboldal&lt;/a&gt; a GitHubon. Nyiss egy új &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-problémát&lt;/a&gt; hibabejelentéssel vagy fejlesztési javaslattal.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Adatvédelmi_irányelv\"&gt;Adatvédelmi irányelvek&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Adatvédelmi_irányelv\"&gt;Adatvédelmi irányelvek&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Köszönetnyilvánítás&lt;/a&gt;</string>
   <string name="title_activity_about">Névjegy</string>
   <string name="menu_feedback">Visszajelzés küldése (e-mailben)</string>
@@ -86,6 +86,7 @@
   <string name="menu_retry_upload">Újra</string>
   <string name="menu_cancel_upload">Mégse</string>
   <string name="share_license_summary">Ez a kép %1$s licenc alatt kerül feltöltésre</string>
+  <string name="media_upload_policy">A kép feltöltésével kijelentem, hogy ez a saját munkám és nem tartalmaz jogvédett anyagot, nem szelfi és megfelel a&lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons irányelveinek&lt;/a&gt;.</string>
   <string name="menu_download">Letöltés</string>
   <string name="preference_license">Licenc</string>
   <string name="use_previous">Előző cím/leírás használata</string>
@@ -134,6 +135,7 @@
   <string name="detail_license_empty">Ismeretlen licenc</string>
   <string name="menu_refresh">Frissítés</string>
   <string name="read_storage_permission_rationale">Szükséges engedély: Külső tárhely olvasása. Az alkalmazás nem működik enélkül.</string>
+  <string name="write_storage_permission_rationale">Szükséges engedély: Külső tárhely írása. Az alkalmazás nem működik enélkül.</string>
   <string name="location_permission_rationale">Lehetséges engedély: Jelenlegi hely megszerzése, a kategóriajavaslatok lehetőségéért.</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Közeli helyek</string>
@@ -147,6 +149,9 @@
   <string name="media_detail_description">Leírás</string>
   <string name="media_detail_description_explanation">A média leírása kerül ide. Ez akár egészen hosszú is lehet, és több sorba fog kerülni. Azért reméljük, jól néz majd ki.</string>
   <string name="media_detail_uploaded_date">Feltöltési dátum</string>
+  <string name="media_detail_license">Licenc</string>
+  <string name="media_detail_coordinates">Koordináták</string>
+  <string name="media_detail_coordinates_empty">Nincs megadva</string>
   <string name="become_a_tester_title">Béta tesztelővé válás</string>
   <string name="become_a_tester_description">Jelentkezz a béta csatornánkra a Google Playen, hogy hamarabb megkapd a hibajavításokat és az új funkciókat</string>
   <string name="use_wikidata">Wikidata használata</string>
@@ -162,6 +167,13 @@
   <string name="background_image">Háttérkép</string>
   <string name="no_image_found">Nem található kép</string>
   <string name="upload_image">Kép feltöltése</string>
+  <string name="welcome_image_mount_zao">Zaō-hegy</string>
+  <string name="welcome_image_llamas">Lámák</string>
+  <string name="welcome_image_rainbow_bridge">Rainbow Bridge</string>
+  <string name="welcome_image_tulip">Tulipán</string>
+  <string name="welcome_image_no_selfies">Csak semmi szelfi</string>
+  <string name="welcome_image_proprietary">Szabadalmaztatott kép</string>
+  <string name="welcome_image_welcome_wikipedia">Üdvözlünk a Wikipédián</string>
   <string name="welcome_image_sydney_opera_house">Sydney Operaház</string>
   <string name="cancel">Mégse</string>
   <string name="navigation_drawer_open">Megnyitás</string>
@@ -174,7 +186,12 @@
   <string name="navigation_item_feedback">Visszajelzés</string>
   <string name="navigation_item_logout">Kijelentkezés</string>
   <string name="navigation_item_info">Bevezető</string>
+  <string name="nearby_needs_permissions">Közeli helyek nem megjeleníthetőek a helyadatokhoz való hozzáférés engedélyezése nélkül</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_commons_article">Commons leírólap</string>
   <string name="nearby_info_menu_wikidata_article">Wikidata-elem</string>
+  <string name="description_info">Kérlek a lehető legteljesebb módon írd le a fájlt: hol készült, mit ábrázol, mi a kontextus? Kérlek add meg az objektumokat vagy személyeket a képen, valamint a nehezen kitalálható információkat (például a kép készítésének dátumát, ha az egy tájkép). Amennyiben a média valami szokatlant ábrázol, kérlek fejtsd ki, hogy mi teszi szokatlanná.</string>
+  <string name="give_permission">Engedély adása</string>
+  <string name="use_external_storage">Külső tárhely használata</string>
+  <string name="login_to_your_account">Bejelentkezés a fiókodba</string>
 </resources>

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

@@ -70,7 +70,7 @@
   <string name="menu_about">Tentang</string>
   <string name="about_license" fuzzy="true">Perangkat lunak sumber terbuka dirilis di bawah &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;lisensi Apache v2&lt;/a&gt;. Wikimedia Commons dan logonya merupakan merek dagang dari Wikimedia Foundation dan digunakan dengan izin dari Wikimedia Foundation. Kami tidak disetujui oleh atau berafiliasi dengan Wikimedia Foundation.</string>
   <string name="about_improve" fuzzy="true">Bersumber di &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Bug di &lt;a href=\"https://bugzilla.wikimedia.org/enter_bug.cgi?product=Commons%20App\"&gt;Bugzilla&lt;/a&gt;.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy/id\"&gt;Kebijakan privasi&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy/id\"&gt;Kebijakan privasi&lt;/a&gt;</string>
   <string name="title_activity_about">Tentang</string>
   <string name="menu_feedback">Kirim umpan balik (via Surel)</string>
   <string name="provider_categories">Kategori yang terakhir digunakan</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Impostazioni</string>
   <string name="title_activity_signup">Registrati</string>
   <string name="menu_about">Informazioni</string>
-  <string name="about_license">Software open source rilasciato con &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;licenza Apache v2&lt;/a&gt;. %1$s ed il suo logo sono marchi registrati della Wikimedia Foundation e sono utilizzati con il permesso della Wikimedia Foundation. Non siamo approvati o affiliati con la Wikimedia Foundation.</string>
+  <string name="about_license">L\'app di Wikimedia Commons è un\'applicazione open source creata e mantenuta da beneficiari e volontari della comunità Wikimedia. La Fondazione Wikimedia non è coinvolta nella creazione, sviluppo o manutenzione dell\'applicazione.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Codice sorgente&lt;/a&gt; e &lt;a href=\"https://commons-app.github.io/\"&gt;sito web&lt;/a&gt; su GitHub. Crea una nuova &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;segnalazione GitHub&lt;/a&gt; per riportare errori e suggerimenti.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Politica sulla privacy&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Politica sulla privacy&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Crediti&lt;/a&gt;</string>
   <string name="title_activity_about">Informazioni</string>
   <string name="menu_feedback">Invia un commento (tramite email)</string>
@@ -166,4 +166,5 @@
   <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="login_to_your_account">Accedi alla tua utenza</string>
 </resources>

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

@@ -72,9 +72,9 @@
   <string name="title_activity_settings">הגדרות</string>
   <string name="title_activity_signup">רישום</string>
   <string name="menu_about">אודות</string>
-  <string name="about_license">תכנת קוד פתוח המתפרסמת לפי תנאי &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. השם %1$s והסמל שמשויך אליו הם סימני מסחר של קרן ויקימדיה ומשמשים באישור קרן ויקימדיה. איננו נתמכים על־ידי קרן ויקימדיה או קשורים אליה בשותפות.</string>
+  <string name="about_license" fuzzy="true">תכנת קוד פתוח המתפרסמת לפי תנאי &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&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; בגיטהאב. נא ליצור &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;דיווח בגיטהאב&lt;/a&gt; בשביל באגים והצעות.</string>
-  <string name="about_privacy_policy"/>
+  <string name="about_privacy_policy" fuzzy="true"/>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;יוצרים&lt;/a&gt;</string>
   <string name="title_activity_about">אודות</string>
   <string name="menu_feedback">שליחת משוב (בדוא\"ל)</string>
@@ -134,6 +134,7 @@
   <string name="detail_license_empty">רישיון לא ידוע</string>
   <string name="menu_refresh">רענון</string>
   <string name="read_storage_permission_rationale">הרשאה מחייבת: אחסון. היישום לא יכול לעבוד בלי זה.</string>
+  <string name="write_storage_permission_rationale">נדרשת הרשאה: כתיבה לאחסון חיצוני. היישום לא יכול לעבוד בלי זה.</string>
   <string name="location_permission_rationale">הרשאה לא מחייבת: קבלת מיקום נוכחי בשביל הצעות קטגוריות</string>
   <string name="ok">אישור</string>
   <string name="title_activity_nearby">מקומות בסביבה</string>
@@ -190,4 +191,6 @@
   <string name="error_while_cache">שגיאה במשירת תמונות במטמון</string>
   <string name="title_info">כותרת מתארת ייחודית לקובץ, שתשמש שם קובץ. אפשר להשתמש בשפה פשוטה עם רווחים. אין לכלול סיומת קובץ</string>
   <string name="description_info">נא לתאר את המדיה כמה שיותר: איפה היא נוצרה? מה היא מראה? מה ההקשר? נא לתאר את העצמים או את האנשים. נא לחשוף מידע שאי־אפשר לנחש בקלות, למשל, הזמן ביום אם זאת תמונת נוף. אם המדיה מציגה משהו בלתי־רגיל, נא להסביר מה מיוחד בה.</string>
+  <string name="use_external_storage">להשתמש באחסון חיצוני</string>
+  <string name="use_external_storage_summary">שמירת תמונות שצולמו באמצעות מצלמה בתוך היישום במכשיר שלך</string>
 </resources>

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

@@ -67,7 +67,7 @@
   <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 ライセンス v2&lt;/a&gt; のもとで公開されているオープン ソース ソフトウェアです。Wikimedia Commons ならびにそのロゴはウィキメディア財団の商標であり、ウィキメディア財団の許可により使用しています。このサイトはウィキメディア財団の公認3でも提携先でもありません。</string>
   <string name="about_improve">ソースは &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt; にあります。バグとアイディアは &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/プライバシー・ポリシー\"&gt;プライバシー・ポリシー&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/プライバシー・ポリシー\"&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>
   <string name="title_activity_about">このアプリについて</string>
   <string name="menu_feedback">フィードバックをメールで送信</string>
@@ -167,4 +167,5 @@
   <string name="navigation_item_info">チュートリアル</string>
   <string name="no_description_found">説明がありません</string>
   <string name="nearby_info_menu_wikidata_article">ウィキデータ項目</string>
+  <string name="use_external_storage">外部ストレージを使用</string>
 </resources>

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

@@ -72,7 +72,7 @@
   <string name="title_activity_signup">Ndhaftar</string>
   <string name="menu_about">Ngenani</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Sumber&lt;/a&gt; lan &lt;a href=\"https://commons-app.github.io/\"&gt;situs jaringan&lt;/a&gt; ing GitHub. Gawé anyar &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;bab GitHub&lt;/a&gt; ngenani lapuran ama lan saran.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Pranatan priangga&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Pranatan priangga&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Krèdhit&lt;/a&gt;</string>
   <string name="title_activity_about">Ngenani</string>
   <string name="menu_feedback">Kirim Pamrayoga (lumantar Layang-Èl)</string>

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

@@ -73,7 +73,7 @@
   <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 License v2&lt;/a&gt;. ვიკისაწყობი და მისი ლოგო ფონდი ვიკიმედიის სავაჭრო ნიშნებია და ფონდი ვიკიმედიის ნებართვით გამოიყენება. ჩვენ არ ვართ დაკავშირებული ფონდ ვიკიმედიასთან.</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_privacy_policy" fuzzy="true">&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>
   <string name="title_activity_about">პროგრამის შესახებ</string>
   <string name="menu_feedback">გამოხმაურების გაგზავნა (ელ.ფოსტით)</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Iɣewwaṛen</string>
   <string name="title_activity_signup">Jerred</string>
   <string name="menu_about">Ɣef</string>
-  <string name="about_license">Iseɣzanen n uɣbalu yeldin ffɣen-d  ddaw n &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;turagt Apache v2&lt;/a&gt;. %1$s akked ulugu-is d ticraḍ yersen n tesbeddit Wikimedia i yettwaseqdacen s tsiregt n tesbeddit Wikimedia. Ur nettwasireg ara sɣuṛ tasbeddit Wikimedia udiɣ ur nttekka ra ɣur-s.</string>
+  <string name="about_license">Asnas Wikipedia Commons d asnas n uɣbalu yeldin i d-yennulfan udiɣ yettwarfed sɣur iwiziwen d wid i t-iḍemnen n tmezdagnut Wikimedia. Tasbeddit Wikimedia ur tetteka ara deg usnulfu-is, tanfelit-is, neɣ aseggem n usnas.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Iɣbula&lt;/a&gt; akked &lt;a href=\"https://commons-app.github.io/\"&gt;usmel web&lt;/a&gt; di GitHub. Rnu &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;tummla GitHub&lt;/a&gt; tamaynut akken ad temmleḍ ibugen neɣ ad d-mudded isumar.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Tasertit n tbaḍnit&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Tasertit n tbaḍnit&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Ismaden&lt;/a&gt;</string>
   <string name="title_activity_about">Ɣef</string>
   <string name="menu_feedback">Azen tikti (s yimayl)</string>
@@ -195,6 +195,8 @@
   <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="give_permission">Mudd tasiregt</string>
   <string name="use_external_storage">Seqdec asekles azɣaray</string>
   <string name="use_external_storage_summary">Sekles tiwlafin yettwaṭṭfen s tkamirat yellan deg ibenk</string>
+  <string name="login_to_your_account">Qqen ar umiḍan-ik</string>
 </resources>

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

@@ -49,7 +49,7 @@
   <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 License v2&lt;/a&gt;</string>
   <string name="about_improve" fuzzy="true">ប្រភពកូដមាននៅ &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Bugs មាននៅ &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_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;គោលការភាពជាឯកជន&lt;/a&gt;</string>
   <string name="title_activity_about">អំពី</string>
   <string name="menu_feedback">ផ្ញើមតិកែលម្អ (តាមអ៊ីមែល)</string>
   <string name="provider_categories">ចំណាត់ថ្នាក់ក្រុមដែលត្រូវបានប្រើថ្មីៗ</string>

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

@@ -72,9 +72,9 @@
   <string name="title_activity_settings">설정</string>
   <string name="title_activity_signup">가입하기</string>
   <string name="menu_about">정보</string>
-  <string name="about_license">오픈 소스 소프트웨어는 &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;아파치 라이선스 v2&lt;/a&gt;에 따라 공개됩니다. %1$s 및 관련 로고는 위키미디어 재단의 상표이며 위키미디어 재단의 허가를 통해 사용될 수 있습니다. 저희는 위키미디어 재단에 의해 보증되거나 제휴되어 있지 않습니다.</string>
+  <string name="about_license" fuzzy="true">오픈 소스 소프트웨어는 &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;아파치 라이선스 v2&lt;/a&gt;에 따라 공개됩니다. %1$s 및 관련 로고는 위키미디어 재단의 상표이며 위키미디어 재단의 허가를 통해 사용될 수 있습니다. 저희는 위키미디어 재단에 의해 보증되거나 제휴되어 있지 않습니다.</string>
   <string name="about_improve">소스 코드는 &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;에 있으며, 웹사이트는 &lt;a href=\"https://commons-app.github.io/\"&gt;GitHub&lt;/a&gt;에 있습니다. 버그나 기타 제안은 &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/ko\"&gt;개인정보 정책&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/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>
   <string name="title_activity_about">정보</string>
   <string name="menu_feedback">(이메일로) 피드백 보내기</string>
@@ -192,6 +192,8 @@
   <string name="nearby_info_menu_commons_article">공용 파일 문서</string>
   <string name="nearby_info_menu_wikidata_article">위키데이터 항목</string>
   <string name="error_while_cache">그림 캐시 처리 오류</string>
+  <string name="give_permission">권한 부여</string>
   <string name="use_external_storage">외부 저장소 사용하기</string>
   <string name="use_external_storage_summary">장치의 인앱 카메라로 찍은 사진 저장하기</string>
+  <string name="login_to_your_account">자신의 계정으로 로그인</string>
 </resources>

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

@@ -66,7 +66,7 @@
   <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 License v2&lt;/a&gt; лицензиясынын негизинде чыгарылган</string>
   <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt; шилтемесине баштапкы код. &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/Конфиденциалдуулук_саясаты\"&gt;Конфиденциалдуулук саясаты&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Конфиденциалдуулук_саясаты\"&gt;Конфиденциалдуулук саясаты&lt;/a&gt;</string>
   <string name="title_activity_about">Тиркеме жөнүндө</string>
   <string name="menu_feedback">Шарттуу жооп жөнөтүү (Email)</string>
   <string name="provider_categories">Жакында колдонулган түрмөктөр</string>

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

@@ -72,9 +72,9 @@
   <string name="title_activity_settings">Astellungen</string>
   <string name="title_activity_signup">Mellt Iech un</string>
   <string name="menu_about">Iwwer</string>
-  <string name="about_license">\'Open-Source-Software\' verëffentlecht ënner der &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache Lizenz v2&lt;/a&gt;. %1$s a säi Logo si Markenzeeche vun der Wikimedia Foundation a gi mat der Autorisatioun vun der Wikimedia Foundation benotzt. Mir sinn net confirméiert vun oder liéiert mat der Wikimedia Foundation.</string>
+  <string name="about_license" fuzzy="true">\'Open-Source-Software\' verëffentlecht ënner der &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache Lizenz v2&lt;/a&gt;. %1$s a säi Logo si Markenzeeche vun der Wikimedia Foundation a gi mat der Autorisatioun vun der Wikimedia Foundation benotzt. Mir sinn net confirméiert vun oder liéiert mat der Wikimedia Foundation.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Quell&lt;/a&gt; an &lt;a href=\"https://commons-app.github.io/\"&gt;Internetsite&lt;/a&gt; vu GitHub.\nLeet w.e.g. &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt; e GitHub Problem&lt;/a&gt; fir Problemer ze mellen a Proposen ze maachen.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Dateschutzerklärung&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Dateschutzerklärung&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Merci&lt;/a&gt;</string>
   <string name="title_activity_about">Iwwer</string>
   <string name="menu_feedback">Feedback schécken (per E-Mail)</string>
@@ -185,4 +185,8 @@
   <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="give_permission">Autorisatioun ginn</string>
+  <string name="use_external_storage">Externe Späicher benotzen</string>
+  <string name="use_external_storage_summary">Biller späicheren déi mat der in-app Kamera vun Ärem Apparat gemaach goufen</string>
+  <string name="login_to_your_account">An Äre Benotzerkont aloggen</string>
 </resources>

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

@@ -69,7 +69,7 @@
   <string name="title_activity_settings">Nustatymai</string>
   <string name="title_activity_signup">Užsiregistruoti</string>
   <string name="menu_about">Apie</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Privatumo politika&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Privatumo politika&lt;/a&gt;</string>
   <string name="title_activity_about">Apie</string>
   <string name="menu_feedback">Siųsti Atsiliepimą (El. paštu)</string>
   <string name="no_email_client">Nėra įdiegtos el. pašto tvarkyklės</string>
@@ -116,4 +116,5 @@
   <string name="no">Ne</string>
   <string name="media_detail_title">Pavadinimas</string>
   <string name="media_detail_description">Aprašymas</string>
+  <string name="give_permission">Suteikti leidimą</string>
 </resources>

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

@@ -43,7 +43,7 @@
   <string name="title_activity_signup">Reģistrēties</string>
   <string name="menu_about">Par</string>
   <string name="about_improve" fuzzy="true">Izejas kods pieejams &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Kļūdas ziņot &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;Privātuma politika&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Privātuma politika&lt;/a&gt;</string>
   <string name="title_activity_about">Par</string>
   <string name="menu_feedback">Nosūtīt atsauksmes (pa e-pastu)</string>
   <string name="provider_categories">Nesen lietotās kategorijas</string>
@@ -55,6 +55,11 @@
   <string name="preference_license">Licence</string>
   <string name="preference_theme">Nakts režīms</string>
   <string name="license_name_cc0">CC0</string>
+  <string name="license_name_cc_by_sa_3_0">CC BY-SA 3.0</string>
+  <string name="license_name_cc_by_3_0">CC BY 3.0</string>
+  <string name="license_name_cc_by_sa_4_0">CC BY-SA 4.0</string>
+  <string name="license_name_cc_by_4_0">CC BY 4.0</string>
+  <string name="license_name_cc_zero">CC Zero</string>
   <string name="welcome_final_text">Jums šķiet, ka sapratāt?</string>
   <string name="welcome_final_button_text">Jā!</string>
   <string name="detail_panel_cats_label">Kategorijas</string>
@@ -67,6 +72,7 @@
   <string name="yes">Jā</string>
   <string name="no">Nē</string>
   <string name="media_detail_title">Nosaukums</string>
+  <string name="media_detail_description">Apraksts</string>
   <string name="media_detail_uploaded_date">Augšupielādēšanas datums</string>
   <string name="media_detail_license">Licence</string>
   <string name="media_detail_coordinates">Koordinātas</string>
@@ -75,6 +81,7 @@
   <string name="upload_image">Augšupielādēt attēlu</string>
   <string name="welcome_image_llamas">Lama</string>
   <string name="welcome_image_tulip">Tulpe</string>
+  <string name="welcome_image_no_selfies">Nekādu pašbilžu</string>
   <string name="cancel">Atcelt</string>
   <string name="navigation_drawer_open">Atvērt</string>
   <string name="navigation_drawer_close">Aizvērt</string>
@@ -85,6 +92,8 @@
   <string name="navigation_item_settings">Iestatījumi</string>
   <string name="navigation_item_feedback">Atsauksmes</string>
   <string name="navigation_item_logout">Iziet</string>
-  <string name="navigation_item_info" fuzzy="true">Ievads</string>
+  <string name="navigation_item_info">Apmācība</string>
   <string name="no_description_found">apraksts nav atrasts</string>
+  <string name="give_permission">Atļaut</string>
+  <string name="use_external_storage">Izmantot ārējo krātuvi</string>
 </resources>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Нагодувања</string>
   <string name="title_activity_signup">Регистрација</string>
   <string name="menu_about">За извршникот</string>
-  <string name="about_license">Програм со отворен код, издаден под лиценцата &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Апачи вер. 2&lt;/a&gt;. %1$s и нејзиното лого се заштитни знаци на Фондацијата Викимедија и се користат со нејзина дозвола. Ние не сме поддржани и поврзани со Фондацијата Викимедија.</string>
+  <string name="about_license">Прилогот на Ризницата има отворен код. Негови творци и оддржувачи се примателите на наменските средства од Викимедиината заедница како и членовите на заедницата. Фондацијата Викимедија нема учество во нејзиното создавање, разработка и одржување.</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&gt;. Создајте нов &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/Заштита на личните податоци\"&gt;Заштита_на_личните_податоци&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/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>
   <string name="title_activity_about">За извршникот</string>
   <string name="menu_feedback">Испратете Ваше мислење (по е-пошта)</string>
@@ -195,6 +195,8 @@
   <string name="error_while_cache">Грешка при меѓускладирање на сликите</string>
   <string name="title_info">Краток и единствен наслов на податотеката, кој ќе служи како нејзин назив. Можете да користите прост јазик со меѓупростор, но не пишувајте ја податотечната наставка</string>
   <string name="description_info">Објаснете ја податотеката што подобро можете: Каде е направена? Што е прикажано на неа? Кој е контекстот? Опишете ги предметите, објектите и личностите. Дајте сознанија што не можат лесно да се погодат, како на пр. време од денот ако се работи за природен предел. Ако на неа е претставено нешто необично, објаснете зошто прикажаното е необично.</string>
+  <string name="give_permission">Дај дозвола</string>
   <string name="use_external_storage">Користи надворешен склад</string>
   <string name="use_external_storage_summary">Зачувување на направените слики во прилогот со камерата на вашиот уред</string>
+  <string name="login_to_your_account">Најавете се со вашата сметка</string>
 </resources>

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

@@ -66,7 +66,7 @@
   <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;അപാച്ചേ അനുമതിപത്രം പതിപ്പ് 2&lt;/a&gt; പ്രകാരം പുറത്തിറക്കപ്പെട്ട ഓപ്പൺ സോഴ്സ് സോഫ്റ്റ്‌വേർ</string>
   <string name="about_improve" fuzzy="true">സ്രോതസ്സ് രൂപം &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;ജിറ്റ്ഹബിൽ&lt;/a&gt; ലഭ്യമാണ്.\nപ്രശ്നങ്ങൾ &lt;a href=\" https://github.com/commons-app/apps-android-commons/issues\"&gt;ബഗ്സില്ലയിൽ&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_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;സ്വകാര്യതാനയം&lt;/a&gt;</string>
   <string name="title_activity_about">വിവരണം</string>
   <string name="menu_feedback">പ്രതികരണം അറിയിക്കുക (ഇമെയിൽ വഴി)</string>
   <string name="provider_categories">സമീപകാലത്ത് ഉപയോഗിച്ച വർഗ്ഗങ്ങൾ</string>

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

@@ -24,7 +24,7 @@
     <item quantity="one">१ संचिका अपभारीत आहे</item>
     <item quantity="other">%d संचिका अपभारीत आहे</item>
   </plurals>
-  <string name="title_activity_contributions" fuzzy="true">माझी अपभारणे</string>
+  <string name="title_activity_contributions">माझी अपभारणे</string>
   <string name="contribution_state_queued">प्रतिक्षावलीत ठेवले</string>
   <string name="contribution_state_failed">अपयशी</string>
   <string name="contribution_state_in_progress">%1$d%% पूर्ण</string>
@@ -42,6 +42,7 @@
   <string name="login_failed_password">सनोंद प्रवेश अशक्य - कृपया आपला परवलीचा शब्द तपासा</string>
   <string name="login_failed_throttled">अनेक अयशस्वी प्रयत्न.काही मिनीटांनंतर पुन्हा प्रयत्न करा.</string>
   <string name="login_failed_blocked">माफ करा,कॉमन्सवर हा सदस्य प्रतिबंधित आहे</string>
+  <string name="login_failed_2fa_needed">आपण आपल्या दोन कारक प्रमाणिकरण कोड प्रदान करणे आवश्यक आहे.</string>
   <string name="login_failed_generic">सनोंद प्रवेश अयशस्वी!</string>
   <string name="share_upload_button">अपभारण करा</string>
   <string name="multiple_share_base_title">या संचास नाव द्या</string>

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

@@ -60,7 +60,7 @@
   <string name="menu_about">Perihal</string>
   <string name="about_license" fuzzy="true">Perisian Sumber Terbuka yang dikeluarkan dengan &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Lesen Apache v2&lt;/a&gt;</string>
   <string name="about_improve" fuzzy="true">Sumber di &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Pepijat di &lt;a href=\" https://github.com/commons-app/apps-android-commons/issues\"&gt;Github&lt;/a&gt;.</string>
-  <string name="about_privacy_policy">Wikimedia:Commons-android-strings-about privacy policy/ms</string>
+  <string name="about_privacy_policy" fuzzy="true">Wikimedia:Commons-android-strings-about privacy policy/ms</string>
   <string name="title_activity_about">Perihal</string>
   <string name="menu_feedback">Hantar Maklum Balas (secara e-mel)</string>
   <string name="provider_categories">Kategori yang baru digunakan</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Innstillinger</string>
   <string name="title_activity_signup">Registrer deg</string>
   <string name="menu_about">Om</string>
-  <string name="about_license">Programvare med åpen kildekode sluppet under &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. %1$s og dets logo er varemerker fra Wikimedia Foundation og brukes med tillatelse fra dem. Vi er verken støttet av eller koblet til Wikimedia Foundation.</string>
+  <string name="about_license">Wikimedia Commons-appen er åpen kildekode og er skapt og vedlikeholdt av stipendiater og frivillige fra Wikimedia-fellesskapet. Wikimedia Foundation er ikke involvert i utviklingen eller vedlikeholdet av appen.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Kildekode&lt;/a&gt; og &lt;a href=\"https://commons-app.github.io/\"&gt;nettside&lt;/a&gt; på GitHub. Opprett en ny &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-sak&lt;/a&gt; for feilrapporter og forslag.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Personvernpolicy&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Personvernpolicy&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-comons/blob/master/CREDITS\"&gt;Bidragsytere&lt;/a&gt;</string>
   <string name="title_activity_about">Om</string>
   <string name="menu_feedback">Send tilbakemelding (via Epost)</string>
@@ -195,6 +195,8 @@
   <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="give_permission">Gi tillatelse</string>
   <string name="use_external_storage">Bruk ekstern lagring</string>
   <string name="use_external_storage_summary">Lagre bilder som er tatt med kameraet i appen på enheten din</string>
+  <string name="login_to_your_account">Logg inn med kontoen din</string>
 </resources>

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

@@ -49,7 +49,7 @@
   <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;अपाचे लाइसेन्स संस्करण२&lt;/a&gt; को अाधारमा खुला स्रोत सफ्टवेयर जारी</string>
   <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;गिटहब&lt;/a&gt; मा स्रोत। &lt;a href=\" https://github.com/commons-app/apps-android-commons/issues\"&gt;बगजिल्ला&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_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;गोपनीयता नीति&lt;/a&gt;</string>
   <string name="title_activity_about">बारेमा</string>
   <string name="menu_feedback">सुझाव पठाउने (इमेल मार्फत)</string>
   <string name="provider_categories">हालै प्रयोग भएका श्रेणीहरू</string>

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

@@ -70,9 +70,9 @@
   <string name="title_activity_settings">Instellingen</string>
   <string name="title_activity_signup">Registreren</string>
   <string name="menu_about">Over</string>
-  <string name="about_license">Opensourcesoftware vrijgegeven onder de &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. Wikimedia Commons en haar logo zijn handelsmerken van de Wikimedia Foundation en worden gebruikt met toestemming van de Wikimedia Foundation. We worden niet bekrachtigd door en zijn niet verbonden met de Wikimedia Foundation.</string>
+  <string name="about_license" fuzzy="true">Opensourcesoftware vrijgegeven onder de &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. Wikimedia Commons en haar logo zijn handelsmerken van de Wikimedia Foundation en worden gebruikt met toestemming van de Wikimedia Foundation. We worden niet bekrachtigd door en zijn niet verbonden met de Wikimedia Foundation.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Broncode&lt;/a&gt; en &lt;a href=\"https://commons-app.github.io/\"&gt;website&lt;/a&gt; op GitHub. Maak een nieuwe &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;melding op GitHub&lt;/a&gt; voor bugs en suggesties.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Privacybeleid&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Privacybeleid&lt;/a&gt;</string>
   <string name="title_activity_about">Over</string>
   <string name="menu_feedback">Terugkoppeling geven (via e-mail)</string>
   <string name="no_email_client">Geen e-mail-client geïnstalleerd</string>

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

@@ -69,7 +69,7 @@
   <string name="title_activity_signup">S’inscriure</string>
   <string name="menu_about">A prepaus</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Fonts&lt;/a&gt; e &lt;a href=\"https://commons-app.github.io/\"&gt;site web&lt;/a&gt; sus GitHub. Crear un novèl &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;senhalament GitHub&lt;/a&gt; per senhalar de bugs o de suggestions.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Politica de confidencialitat&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Politica de confidencialitat&lt;/a&gt;</string>
   <string name="title_activity_about">A prepaus</string>
   <string name="menu_feedback">Mandar vòstres comentaris (per corrièl)</string>
   <string name="no_email_client">Cap de client de corrièl pas installat</string>

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

@@ -49,7 +49,7 @@
   <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 License v2&lt;/a&gt;ରେ ବିତରିତ</string>
   <string name="about_improve" fuzzy="true">ମୂଳସବୁ &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;ରେ ରହିଛି । ଅସୁବିଧାସବୁ &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_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;ଗୋପନୀୟତା ନୀତି&lt;/a&gt;</string>
   <string name="title_activity_about">ବାବଦରେ</string>
   <string name="menu_feedback">ଇମେଲରେ ମତାମତ ପଠାଇବେ</string>
   <string name="provider_categories">ନିକଟରେ ବ୍ୟବହୃତ ଶ୍ରେଣୀମାନ</string>

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

@@ -71,9 +71,9 @@
   <string name="title_activity_settings">ਸੈਟਿੰਗ</string>
   <string name="title_activity_signup">ਸਾਈਨ ਅੱਪ</string>
   <string name="menu_about">ਇਸ ਬਾਰੇ</string>
-  <string name="about_license">ਅਜ਼ਾਦ ਸਰੋਤ ਸਾਫ਼ਟਵੇਅਰ ਨੂੰ &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt; ਅਧੀਨ ਜਾਰੀ ਕੀਤਾ ਗਿਆ ਹੈ</string>
+  <string name="about_license" fuzzy="true">ਅਜ਼ਾਦ ਸਰੋਤ ਸਾਫ਼ਟਵੇਅਰ ਨੂੰ &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt; ਅਧੀਨ ਜਾਰੀ ਕੀਤਾ ਗਿਆ ਹੈ</string>
   <string name="about_improve" fuzzy="true">ਸਰੋਤ &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt; ਉੱਤੇ। ਮੁਸ਼ਕਲਾਂ &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;Privacy policy&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Privacy policy&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>
   <string name="title_activity_about">ਇਸ ਬਾਰੇ</string>
   <string name="menu_feedback">ਵਿਚਾਰ ਭੇਜੋ (ਈਮੇਲ ਰਾਹੀਂ)</string>

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

@@ -75,7 +75,7 @@
   <string name="menu_about">O aplikacji</string>
   <string name="about_license" fuzzy="true">Oprogramowanie Open Source, wydane na licencji &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. Wikimedia Commons i jego logo są znakami towarowymi Wikimedia Foundation i są wykorzystywane za zgodą Wikimedia Foundation. Nie jesteśmy powiązani z Wikimedia Foundation.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Kod źródłowy&lt;/a&gt; oraz &lt;a href=\"https://commons-app.github.io/\"&gt;strona internetowa&lt;/a&gt; na GitHub. Aby zgłosić błąd lub sugestię, utwórz nowe &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;zgłoszenie na GitHub&lt;/a&gt;.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Polityka prywatności&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Polityka prywatności&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Twórcy&lt;/a&gt;</string>
   <string name="title_activity_about">O aplikacji</string>
   <string name="menu_feedback">Wyślij opinię (przez e-mail)</string>
@@ -182,4 +182,5 @@
   <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="login_to_your_account">Zaloguj się na swoje konto</string>
 </resources>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Paràmeter</string>
   <string name="title_activity_signup">Marchesse</string>
   <string name="menu_about">A propòsit</string>
-  <string name="about_license">Ij programa Open Source a son publicà sota la &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;licensa Apache v2&lt;/a&gt;. %1$s e sò sìmbol a son dle marche argistrà dla Fondassion Wikimedia e a son dovrà con ël përmess ëd la Fondassion Wikimedia. Nojàutri i soma nen aprovà da o afilià a la Fondassion Wikimedia.</string>
+  <string name="about_license">L\'aplicassion Wikimedia Commons a l\'é n\'aplicassion a sorgiss duverta creà e mantnùa da \'d përson-e pagà e da \'d volontari ëd la comunità Wikimedia. La Fondassion Wikimedia a l\'é nen amplicà ant la creassion, ël dësvlup, o la manutension dl\'aplicassion.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Sorgiss&lt;/a&gt; e &lt;a href=\"https://commons-app.github.io/\"&gt;sit an sl\'aragnà&lt;/a&gt; su GitHub. Creé na neuva &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;signalassion GitHub&lt;/a&gt; për signalé dij givo e dij sugeriment.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Régole ëd confidensialità&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Régole ëd confidensialità&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Ringrassiament&lt;/a&gt;</string>
   <string name="title_activity_about">A propòsit</string>
   <string name="menu_feedback">Mandé dij coment (për pòsta eletrònica)</string>
@@ -135,6 +135,7 @@
   <string name="detail_license_empty">Licensa sconossùa</string>
   <string name="menu_refresh">Rinfrësché</string>
   <string name="read_storage_permission_rationale">Autorisassion necessaria: Lese n\'anmagasinament estern. L\'aplicassion a peul pa marcé sensa lòn.</string>
+  <string name="write_storage_permission_rationale">Autorisassion necessaria: Scrive n\'anmagasinament estern. L\'aplicassion a peul pa marcé sensa \'d lòn.</string>
   <string name="location_permission_rationale">Autorisassion facoltativa: Oten-e la posission atual për dij sugeriment ëd categorìa</string>
   <string name="ok">Va bin</string>
   <string name="title_activity_nearby">Pòst davzin</string>
@@ -194,4 +195,8 @@
   <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="give_permission">Dé ël përmess</string>
+  <string name="use_external_storage">Dovré n\'anmagasinament estern</string>
+  <string name="use_external_storage_summary">Argistré le plance pijà con la màchina fòto ëd sò angign</string>
+  <string name="login_to_your_account">Ch\'as colega a sò cont</string>
 </resources>

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

@@ -40,7 +40,7 @@
   <string name="title_activity_settings">امستنې</string>
   <string name="title_activity_signup">نومليکنه</string>
   <string name="menu_about">په اړه</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;د پټنتيا تگلاره&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;د پټنتيا تگلاره&lt;/a&gt;</string>
   <string name="title_activity_about">په اړه</string>
   <string name="provider_categories">وروستۍ کارېدلې وېشنيزې</string>
   <string name="no_uploads_yet">تاسې تر اوسه کوم انځور نه دی پورته کړی.</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Configurações</string>
   <string name="title_activity_signup">Criar conta</string>
   <string name="menu_about">Sobre</string>
-  <string name="about_license">Software livre distribuído sob a &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. %1$s e seu logotipo são marcas registradas da Wikimedia Foundation e são usadas com a permissão da Wikimedia Foundation. Não somos endossados nem afiliados à Wikimedia Foundation.</string>
+  <string name="about_license" fuzzy="true">Software livre distribuído sob a &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. %1$s e seu logotipo são marcas registradas da Wikimedia Foundation e são usadas com a permissão da Wikimedia Foundation. Não somos endossados nem afiliados à Wikimedia Foundation.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Fonte&lt;/a&gt; e &lt;a href=\"https://commons-app.github.io/\"&gt;site&lt;/a&gt; em GitHub. Crie um novo &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub issue&lt;/a&gt; para relatórios de bugs e sugestões.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Política de privacidade&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Política de privacidade&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Créditos&lt;/a&gt;</string>
   <string name="title_activity_about">Sobre</string>
   <string name="menu_feedback">Enviar comentários (por e-mail)</string>
@@ -135,6 +135,7 @@
   <string name="detail_license_empty">Licença desconhecida</string>
   <string name="menu_refresh">Atualizar</string>
   <string name="read_storage_permission_rationale">Permissão necessária: Ler armazenamento externo. O aplicativo não pode funcionar sem isso.</string>
+  <string name="write_storage_permission_rationale">Permissão necessária: Escreva armazenamento externo. A aplicação não pode funcionar sem isso.</string>
   <string name="location_permission_rationale">Permissão opcional: Obter a localização atual de sugestões de categoria</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Lugares próximos</string>
@@ -194,4 +195,7 @@
   <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="give_permission">Dar permissão</string>
+  <string name="use_external_storage">Usar o armazenamento externo</string>
+  <string name="use_external_storage_summary">Salvar as fotos tiradas com a câmera no aplicativo no seu dispositivo</string>
 </resources>

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

@@ -68,7 +68,7 @@
   <string name="menu_about">Sobre</string>
   <string name="about_license" fuzzy="true">Software em código aberto distribuído sob &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. O Wikimedia Commons e o seu logótipo são marcas registadas da Wikimedia Foundation e são usadas com permissão da Wikimedia Foundation. Não somos endossados ou afiliados à Wikimedia Foundation.</string>
   <string name="about_improve" fuzzy="true">Código no &lt;a href=\"https://github.com/commons-app/android-commons\"&gt;GitHub&lt;/a&gt;. Erros no &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;Política de privacidade&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Política de privacidade&lt;/a&gt;</string>
   <string name="title_activity_about">Sobre</string>
   <string name="menu_feedback">Enviar comentários (por e-mail)</string>
   <string name="provider_categories">Categorias usadas recentemente</string>

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

@@ -74,7 +74,7 @@
   <string name="menu_about">Despre</string>
   <string name="about_license" fuzzy="true">Software cu sursă deschisă lansat sub &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Licența Apache v2&lt;/a&gt;</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Sursa&lt;/a&gt; și &lt;a href=\"https://commons-app.github.io/\"&gt;pagina web&lt;/a&gt; pe GitHub. Deschide un nou &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;ticket pe GitHub&lt;/a&gt; pentru a raporta un bug sau a oferi o sugestie.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Politica de confidențialitate&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Politica de confidențialitate&lt;/a&gt;</string>
   <string name="title_activity_about">Despre</string>
   <string name="menu_feedback">Trimitere reacții (prin e-mail)</string>
   <string name="provider_categories">Categorii utilizate recent</string>

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

@@ -77,9 +77,9 @@
   <string name="title_activity_settings">Настройки</string>
   <string name="title_activity_signup">Зарегистрироваться</string>
   <string name="menu_about">О приложении</string>
-  <string name="about_license">Приложение с открытым исходным кодом, выпущено по лицензии &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. %1$s и его логотип являются товарными знаками Фонда Викимедиа и используются с разрешения Фонда Викимедиа. Мы не поддерживаемся и не связаны с Фондом Викимедиа.</string>
+  <string name="about_license" fuzzy="true">Приложение с открытым исходным кодом, выпущено по лицензии &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&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/ru\"&gt;Политика конфиденциальности&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/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>
   <string name="title_activity_about">О приложении</string>
   <string name="menu_feedback">Отправить отзыв (по эл. почте)</string>
@@ -137,7 +137,8 @@
   <string name="detail_description_empty">Нет описания</string>
   <string name="detail_license_empty">Неизвестная лицензия</string>
   <string name="menu_refresh">Обновить</string>
-  <string name="read_storage_permission_rationale">Требуемые разрешения: чтение с внешнего накопителя. Приложение не сможет функционировать без этого.</string>
+  <string name="read_storage_permission_rationale">Требуемые разрешения: чтение с внешнего хранилища. Приложение не сможет функционировать без этого.</string>
+  <string name="write_storage_permission_rationale">Требуемые разрешения: запись на внешнее хранилище. Приложение не сможет функционировать без этого.</string>
   <string name="location_permission_rationale">Необязательное разрешение: получение текущего местоположения для предложения категорий</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Места поблизости</string>
@@ -195,4 +196,7 @@
   <string name="nearby_info_menu_commons_article">Страница файла на Викискладе</string>
   <string name="nearby_info_menu_wikidata_article">Элемент Викиданных</string>
   <string name="error_while_cache">Ошибка при кэшировании картинок</string>
+  <string name="give_permission">Дать разрешение</string>
+  <string name="use_external_storage">Использовать внешнее хранилище</string>
+  <string name="use_external_storage_summary">Сохранять изображения, сделанные с помощью встроенной камеры на устройстве</string>
 </resources>

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

@@ -71,7 +71,7 @@
   <string name="title_activity_settings">ترتيبون</string>
   <string name="title_activity_signup">کاتو کوليو</string>
   <string name="menu_about">بابت</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;ذاتيات پاليسي&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;ذاتيات پاليسي&lt;/a&gt;</string>
   <string name="title_activity_about">بابت</string>
   <string name="menu_feedback">پذيرائي موڪليو (برقٽپال ذريعي)</string>
   <string name="no_email_client">ڪوبہ برقٽپال ڪلائينٽ تنصيبيل ناھي</string>

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

@@ -67,7 +67,7 @@
   <string name="title_activity_settings">සැකසුම්</string>
   <string name="title_activity_signup">ලියාපදිංචි වන්න</string>
   <string name="menu_about">පිළිබඳ</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;පෞද්ගලිකත්ව ප්‍රතිපත්තිය&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;පෞද්ගලිකත්ව ප්‍රතිපත්තිය&lt;/a&gt;</string>
   <string name="title_activity_about">පිළිබඳ</string>
   <string name="menu_feedback">අදහස් යවන්න (විද්‍යුත් තැපෑල හරහා)</string>
   <string name="no_email_client">විද්‍යුත් තැපැල් සේවාදායකයා ස්ථාපනය කර නැත</string>

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

@@ -59,7 +59,7 @@
   <string name="menu_about">O aplikácii</string>
   <string name="about_license" fuzzy="true">Open Source softvér dostupný za podmienok &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;</string>
   <string name="about_improve" fuzzy="true">Zdroj na &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Bugy na &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;Ochrana osobných údajov&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Ochrana osobných údajov&lt;/a&gt;</string>
   <string name="title_activity_about">O aplikácii</string>
   <string name="menu_feedback">Odoslať spätnú väzbu (emailom)</string>
   <string name="no_email_client">Nemáte nainštalovaného žiadneho e-mailového klienta</string>

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

@@ -99,4 +99,6 @@
   <string name="navigation_item_feedback">تہاڈی رائے</string>
   <string name="navigation_item_logout">لاگ آؤٹ</string>
   <string name="nearby_info_menu_wikidata_article">وکی ڈیٹا آئٹم</string>
+  <string name="give_permission">اجازت ݙیوو</string>
+  <string name="login_to_your_account">آپݨے کھاتے وچ لاگ ان تھیوو</string>
 </resources>

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

@@ -73,9 +73,9 @@
   <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; Викимедијина Остава и њен лого су заштитни знаци Викимедијине Фондације и користе се са дозволом Викимедијине Фондацине. Ми не одобравамо или подржавмо Викимедијину Фондацију.\n\nАпликација за Викимедијину оставу је апликација отвореног кода која је направљена и која се одржава помоћу грантова и волонтера Викимедијине заједнице. Задужбина Викимедија није укључена у стварање, развој или одржавање апликације.</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_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/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>
   <string name="title_activity_about">О апликацији</string>
   <string name="menu_feedback">Пошаљите повратне информације (путем е-поште)</string>
@@ -86,6 +86,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\"&gt;смерницама Викимедијине оставе&lt;/a&gt;.</string>
   <string name="menu_download">Преузми</string>
   <string name="preference_license">Лиценца</string>
   <string name="use_previous">Користи претходан наслов/опис</string>
@@ -134,6 +135,7 @@
   <string name="detail_license_empty">Непозната лиценца</string>
   <string name="menu_refresh">Освежи</string>
   <string name="read_storage_permission_rationale">Потребна дозвола: Провера спољашње меморије. Апликација без овога не може да функционише.</string>
+  <string name="write_storage_permission_rationale">Неопходна дозвола: Писање спољашњег складишта. Апликација не може да функционише без овога.</string>
   <string name="location_permission_rationale">Опциона дозвола: Преузми тренутну локацију за предлоге категорија</string>
   <string name="ok">У реду</string>
   <string name="title_activity_nearby">Места у близини</string>
@@ -149,6 +151,7 @@
   <string name="media_detail_uploaded_date">Датум отпремања</string>
   <string name="media_detail_license">Лиценца</string>
   <string name="media_detail_coordinates">Координате</string>
+  <string name="media_detail_coordinates_empty">Ништа није унето</string>
   <string name="become_a_tester_title">Постани Бета Тестер</string>
   <string name="become_a_tester_description">Прикључите се на наш бета канал на Гугл плеју и приступајте новим информацијама и поправкама багова</string>
   <string name="use_wikidata">Користи Википодатке</string>
@@ -184,6 +187,15 @@
   <string name="navigation_item_settings">Подешавања</string>
   <string name="navigation_item_feedback">Повратне информације</string>
   <string name="navigation_item_logout">Одјави ме</string>
-  <string name="nearby_info_menu_commons_article" fuzzy="true">Чланак на Остави</string>
+  <string name="navigation_item_info">Туторијал</string>
-  <string name="nearby_info_menu_wikidata_article" fuzzy="true">Чланак на Википодацима</string>
+  <string name="nearby_needs_permissions">Оближња места не могу да се приказују без дозвола за локацију</string>
+  <string name="no_description_found">опис није пронађен</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>
+  <string name="give_permission">Давање дозволе</string>
+  <string name="use_external_storage">Употреба спољашњег складишта</string>
+  <string name="use_external_storage_summary">Спремање слика направљених камером апликације на Вашем уређају</string>
 </resources>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Séting</string>
   <string name="title_activity_signup">Daptar</string>
   <string name="menu_about">Ngeunaan</string>
-  <string name="about_license">Pakakas lemes kodeu nembrak dirilis di handapeun &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Lisénsi Apache v2&lt;/a&gt;. %1$s sarta logona téh mérk dagang anu Yayasan Wikimédia ogé dipakéna kudu meunang widi ti Yayasan Wikimédia. Kami teu disatujuan ku atawa digawé bareng jeung Yayasan Wikimédia.</string>
+  <string name="about_license" fuzzy="true">Pakakas lemes kodeu nembrak dirilis di handapeun &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Lisénsi Apache v2&lt;/a&gt;. %1$s sarta logona téh mérk dagang anu Yayasan Wikimédia ogé dipakéna kudu meunang widi ti Yayasan Wikimédia. Kami teu disatujuan ku atawa digawé bareng jeung Yayasan Wikimédia.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Sumber&lt;/a&gt; sarta &lt;a href=\"https://commons-app.github.io/\"&gt;situ wéb&lt;/a&gt; dina GitHub. Jieun anyar &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;perkara GitHub&lt;/a&gt; pikeun saran jeung laporan kutu.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Kawijakan privasi&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Kawijakan privasi&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Pangajén&lt;/a&gt;</string>
   <string name="title_activity_about">Ngeunaan</string>
   <string name="menu_feedback">Kirim eupan balik (via Surélék)</string>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">Inställningar</string>
   <string name="title_activity_signup">Registrera</string>
   <string name="menu_about">Om</string>
-  <string name="about_license">Programvara med öppen källkod släppt under &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;licensen Apache v2&lt;/a&gt;. %1$s och dess logotyp är varumärken av Wikimedia Foundation och används med tillstånd från Wikimedia Foundation. Vi varken stöds eller är kopplade med Wikimedia Foundation.</string>
+  <string name="about_license">Wikimedia Commons är en app med öppen källkod som skapas och underhålls av frivilliga från Wikimedias gemenskap. Wikimedia Foundation är inte involverad i skapandet, utvecklingen eller underhållet av appen.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Källkoden&lt;/a&gt; och &lt;a href=\"https://commons-app.github.io/\"&gt;webbplatsen&lt;/a&gt; på GitHub. Skapa ett nytt &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-ärende&lt;/a&gt; för att rapportera buggar och förslag.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Integritetspolicy&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Integritetspolicy&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Erkännande&lt;/a&gt;</string>
   <string name="title_activity_about">Om</string>
   <string name="menu_feedback">Skicka feedback (via e-post)</string>
@@ -135,6 +135,7 @@
   <string name="detail_license_empty">Okänd licens</string>
   <string name="menu_refresh">Uppdatera</string>
   <string name="read_storage_permission_rationale">Nödvändig behörighet: Läsa extern lagring. Appen fungerar inte utan detta.</string>
+  <string name="write_storage_permission_rationale">Nödvändig behörighet: Skriva till extern lagring. Appen kan inte fungera så här.</string>
   <string name="location_permission_rationale">Valfri behörighet: Hämta aktuell plats för kategoriförslag</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Platser i närheten</string>
@@ -194,4 +195,8 @@
   <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="give_permission">Ge behörighet</string>
+  <string name="use_external_storage">Använd extern lagring</string>
+  <string name="use_external_storage_summary">Spara bilder som tas med kameran i appen på din enhet</string>
+  <string name="login_to_your_account">Logga in på ditt konto</string>
 </resources>

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

@@ -48,7 +48,7 @@
   <string name="title_activity_settings">అమరికలు</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 License v2&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_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;గోప్యతా విధానం&lt;/a&gt;</string>
   <string name="title_activity_about">గురించి</string>
   <string name="menu_feedback">ఫీడుబ్యాకును పంపండి (ఈమెయిలు ద్వారా)</string>
   <string name="provider_categories">ఇటీవల వాడిన వర్గాలు</string>

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

@@ -5,10 +5,12 @@
   <string name="username">Kullanıcı adı</string>
   <string name="password">Parola</string>
   <string name="login">Oturum aç</string>
+  <string name="signup">Kaydol</string>
   <string name="logging_in_title">Oturum açılıyor</string>
-  <string name="logging_in_message" fuzzy="true">Lütfen bekleyin…</string>
+  <string name="logging_in_message">Lütfen bekleyin…</string>
   <string name="login_success">Oturum açma başarılı!</string>
   <string name="login_failed">Oturum açma başarısız oldu!</string>
+  <string name="upload_failed">Dosya bulunamadı. Lütfen başka bir dosya deneyin.</string>
   <string name="authentication_failed">Kimlik doğrulama başarısız oldu!</string>
   <string name="uploading_started">Yükleme başladı!</string>
   <string name="upload_completed_notification_title">%1$s yüklendi!</string>
@@ -18,11 +20,11 @@
   <string name="upload_progress_notification_title_finishing">%1$s yüklemesi bitiriliyor</string>
   <string name="upload_failed_notification_title">%1$s dosyasının yüklemesi başarısız oldu</string>
   <string name="upload_failed_notification_subtitle">Görüntülemek için dokunun</string>
-  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
+  <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">1 dosya yükleniyor</item>
+    <item quantity="one">%d dosya karşıya yükleniyor</item>
-    <item quantity="other">%d dosya yükleniyor</item>
+    <item quantity="other">%d dosya karşıya yükleniyor</item>
   </plurals>
-  <string name="title_activity_contributions" fuzzy="true">Yüklemelerim</string>
+  <string name="title_activity_contributions">Yakın Zamandaki Yüklemelerim</string>
   <string name="contribution_state_queued">Sırada</string>
   <string name="contribution_state_failed">Başarısız</string>
   <string name="contribution_state_in_progress">%1$d%% tamamlandı</string>
@@ -37,7 +39,7 @@
   <string name="login_failed_network">Oturum açılamıyor - ağ hatası</string>
   <string name="login_failed_username">Oturum açılamıyor - lütfen kullanıcı adınızı kontrol edin</string>
   <string name="login_failed_password">Oturum açılamıyor - lütfen parolanızı kontrol edin</string>
-  <string name="login_failed_throttled" fuzzy="true">Çok sayıda başarısız girişimde bulundunuz. Birkaç dakika sonra tekrar deneyin.</string>
+  <string name="login_failed_throttled">Çok sayıda başarısız girişimde bulundunuz. Birkaç dakika sonra tekrar deneyin.</string>
   <string name="login_failed_blocked">Üzgünüz, bu kullanıcı Commons\'ta engellendi</string>
   <string name="login_failed_generic">Oturum açma başarısız</string>
   <string name="share_upload_button">Yükle</string>
@@ -46,6 +48,7 @@
   <string name="menu_upload_single">Yükle</string>
   <string name="categories_search_text_hint">Kategorileri ara</string>
   <string name="menu_save_categories">Kaydet</string>
+  <string name="refresh_button">Yenile</string>
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Henüz yükleme yok</item>
     <item quantity="one">1 yükleme</item>
@@ -66,7 +69,7 @@
   <string name="menu_about">Hakkında</string>
   <string name="about_license" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache Lisansı s2&lt;/a&gt; altında yayımlanan Açık Kaynak yazılımı</string>
   <string name="about_improve" fuzzy="true">Kaynak: &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;GitHub&lt;/a&gt;\n\nYazılım hataları: &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;Gizlilik Politikası&lt;/a&gt;</string>
+  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Gizlilik Politikası&lt;/a&gt;</string>
   <string name="title_activity_about">Hakkında</string>
   <string name="menu_feedback">Geri Bildirim Gönder (E-posta ile)</string>
   <string name="provider_categories">Son kullanılan kategoriler</string>
@@ -93,6 +96,9 @@
   <string name="license_name_cc_by_sa_3_0_ro">CC BY-SA 3.0 (Romanya)</string>
   <string name="license_name_cc_by_3_0">CC BY 3.0</string>
   <string name="license_name_cc_zero">CC0</string>
+  <string name="tutorial_3_text">Lütfen şunları YÜKLEMEYİN:</string>
+  <string name="tutorial_3_subtext">- Öz çekimlerinizi ya da arkadaşlarınızın fotoğraflarını\n- İnternetten indirdiğiniz resimleri\n- Tescilli uygulamaların ekran görüntülerini</string>
+  <string name="tutorial_4_text">Yüklenebileceklere örnekler:</string>
   <string name="welcome_wikipedia_text">Resimleriniz ile Vikipedi maddelerinin canlandırılmasına katkıda bulunabilirsiniz!</string>
   <string name="welcome_wikipedia_subtext">Vikipedi\'ye Wikimedia Commons\'tan gelen görüntüler.</string>
   <string name="welcome_copyright_text">Görüntüler dünya insanlarının eğitiminde yardımcı olur.</string>

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

@@ -81,9 +81,9 @@
   <string name="title_activity_settings">Налаштування</string>
   <string name="title_activity_signup">Зареєструватися</string>
   <string name="menu_about">Про програму</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_license">Додаток «Вікісховище» — це програма з відкритим кодом, яку створили отримувачі грантів та волонтери спільноти Вікімедіа. Фонд Вікімедіа не брав участі у створенні, розробці чи обслуговуванні цього додатка.</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_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/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>
   <string name="title_activity_about">Про програму</string>
   <string name="menu_feedback">Надіслати відгук (електронною поштою)</string>
@@ -143,6 +143,7 @@
   <string name="detail_license_empty">Невідома ліцензія</string>
   <string name="menu_refresh">Оновити</string>
   <string name="read_storage_permission_rationale">Обов\'язковий дозвіл: читання зовнішньої пам\'яті. Програмка не може працювати без цього.</string>
+  <string name="write_storage_permission_rationale">Необхідний дозвіл: записування на зовнішнє сховище. Додаток не може працювати без цього.</string>
   <string name="location_permission_rationale">Додатковий дозвіл: отримувати поточне розташування для підказок категорій</string>
   <string name="ok">Гаразд</string>
   <string name="title_activity_nearby">Місця поблизу</string>
@@ -202,4 +203,8 @@
   <string name="error_while_cache">Помилка кешування зображень</string>
   <string name="title_info">Унікальна описова назва файлу. Ви можете використовувати простий текст з пробілами. Не вказуйте розширення файлу</string>
   <string name="description_info">Будь ласка, докладно опишіть файл: де його було зроблено? що на ньому зображено? який контекст? Будь ласка, опишіть об\'єкти чи осіб. Додайте інформацію, яку не можна легко здогадатися, наприклад, пору доби для фотографії пейзажу. Якщо зображено щось незвичайне, постарайтеся пояснити, що робить його незвичайним.</string>
+  <string name="give_permission">Надати дозвіл</string>
+  <string name="use_external_storage">Використовувати зовнішнє сховище</string>
+  <string name="use_external_storage_summary">Зберігати зображення, виконані вбудованою в додатку камерою Вашого пристрою</string>
+  <string name="login_to_your_account">Увійдіть у свій обліковий запис</string>
 </resources>

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

@@ -63,9 +63,9 @@
   <string name="title_activity_settings">Cài đặt</string>
   <string name="title_activity_signup">Mở tài khoản</string>
   <string name="menu_about">Giới thiệu</string>
-  <string name="about_license">Phần mềm mã nguồn mở được phát hành theo &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Giấy phép Apache v2&lt;/a&gt;. %1$s và biểu trưng của nó là nhãn hiệu của Quỹ Wikimedia và được sử dụng do Quỹ Wikimedia cho phép. Chúng tôi không được Quỹ Wikimedia ủng hộ hoặc nhận làm chi nhánh.</string>
+  <string name="about_license" fuzzy="true">Phần mềm mã nguồn mở được phát hành theo &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Giấy phép Apache v2&lt;/a&gt;. %1$s và biểu trưng của nó là nhãn hiệu của Quỹ Wikimedia và được sử dụng do Quỹ Wikimedia cho phép. Chúng tôi không được Quỹ Wikimedia ủng hộ hoặc nhận làm chi nhánh.</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Mã nguồn&lt;/a&gt; và &lt;a href=\"https://commons-app.github.io/\"&gt;trang chủ&lt;/a&gt; tại GitHub. &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;Tạo vấn đề GitHub mới&lt;/a&gt; để báo cáo lỗi hoặc gợi ý thay đổi.</string>
-  <string name="about_privacy_policy"/>
+  <string name="about_privacy_policy" fuzzy="true"/>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Công trạng&lt;/a&gt;</string>
   <string name="title_activity_about">Giới thiệu</string>
   <string name="menu_feedback">Gửi Phản hồi (qua Thư điện tử)</string>
@@ -125,6 +125,7 @@
   <string name="detail_license_empty">Giấy phép không rõ</string>
   <string name="menu_refresh">Làm tươi</string>
   <string name="read_storage_permission_rationale">Yêu cầu cấp phép: Đọc thiết bị lưu trữ bên ngoài. Ứng dụng cần được phép đọc thiết bị lưu trữ bên ngoài để hoạt động.</string>
+  <string name="write_storage_permission_rationale">Yêu cầu cấp phép: Ghi vào thiết bị lưu trữ bên ngoài. Ứng dụng cần được phép ghi vào thiết bị lưu trữ bên ngoài để hoạt động.</string>
   <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>
@@ -184,4 +185,6 @@
   <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>
+  <string name="use_external_storage">Sử dụng thiết bị lưu trữ bên ngoài</string>
+  <string name="use_external_storage_summary">Lưu các hình ảnh được chụp bằng máy chụp hình trong ứng dụng vào thiết bị của bạn</string>
 </resources>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">設定</string>
   <string name="title_activity_signup">註冊</string>
   <string name="menu_about">關於</string>
-  <string name="about_license">以&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache許可證 v2&lt;/a&gt;釋放的開放源碼軟體。%1$s和其標誌圖像是維基媒體基金會的標記；並在維基媒體基金會的許可下使用。我們並非由維基媒體基金會所認可、也不隸屬於維基媒體基金會。</string>
+  <string name="about_license">維基共享資源應用程式是透過維基媒體社群上的受讓人、與志願者們所建立及維護的開放原始碼應用程式。維基媒體基金會並不涉及此應用程式的建立、開發、與維護方面。</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://meta.wikimedia.org/wiki/Privacy_policy/zh\"&gt;隱私方針&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/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>
   <string name="title_activity_about">關於</string>
   <string name="menu_feedback">傳送回饋 （通過電子郵件）</string>
@@ -195,6 +195,8 @@
   <string name="error_while_cache">在快取圖片時發生錯誤</string>
   <string name="title_info">用於本檔案的唯一描述性標題。您可以使用帶有空格的簡明語言，另外請不要包含副檔名。</string>
   <string name="description_info">請盡可能說明媒體內容：拍攝於何處？是顯示什麼事物？有什麼脈絡？請描述對象或人物。透露出一些較不易猜測的訊息，例如是風景的話；可以是一天裡的時間。如果媒體顯示出一些不正常的事物，請說明出造成不正常原因。</string>
+  <string name="give_permission">給予權限</string>
   <string name="use_external_storage">使用外部存儲裝置</string>
   <string name="use_external_storage_summary">在您的裝置上使用照相機應用程式來儲存照片</string>
+  <string name="login_to_your_account">登入您的帳號</string>
 </resources>

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

@@ -73,9 +73,9 @@
   <string name="title_activity_settings">设置</string>
   <string name="title_activity_signup">注册</string>
   <string name="menu_about">关于</string>
-  <string name="about_license">本开源软件采用&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache许可证第二版&lt;/a&gt;授权。%1$s及其标志是维基媒体基金会的商标，并在维基媒体基金会的许可下使用。我们并不被维基媒体基金会认可，也不与基金会有任何联系。</string>
+  <string name="about_license">维基共享资源应用程序是由维基媒体社区的受助者和志愿者创建和维护的开源应用程序。维基媒体基金会不参与该应用程序的创立，开发或维护。</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_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/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>
   <string name="title_activity_about">关于</string>
   <string name="menu_feedback">发送反馈（通过电子邮件）</string>
@@ -195,6 +195,8 @@
   <string name="error_while_cache">缓存图片时出错</string>
   <string name="title_info">用于文件的唯一描述性标题，它将作为文件名使用。您可以使用有空格的简明语言。请不要包含文件扩展名</string>
   <string name="description_info">请尽可能详细地描述媒体：拍摄在何地？显示什么？例文是什么？请描述对象或个人。透露一些不易猜想到的信息，例如这幅风景画的具体日期时间。如果媒体显示了一些不寻常的事物，请说明为什么它显得不寻常。</string>
+  <string name="give_permission">提供权限</string>
   <string name="use_external_storage">使用外部存储</string>
   <string name="use_external_storage_summary">在您的设备上，使用应用中的照相机保存照片</string>
+  <string name="login_to_your_account">登录您的账户</string>
 </resources>

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

@@ -2,17 +2,11 @@
 <resources>
     <attr name="mainBackground" format="reference"/>
     <attr name="semitransparentText" format="reference"/>
-    <attr name="commonsAppBlue" format="reference"/>
     <attr name="subBackground" format="reference"/>
     <attr name="fragmentCategorisationBackground" format="reference"/>
     <attr name="buttonBackground" format="reference"/>
     <attr name="uploadOverlayBackground" format="reference"/>
     <attr name="spinnerTheme" format="reference"/>
-    <attr name="iconSend" format="reference"/>
-    <attr name="iconSave" format="reference"/>
-    <attr name="iconCamera" format="reference"/>
-    <attr name="iconPhoto" format="reference"/>
-    <attr name="iconUndo" format="reference"/>
 
     <declare-styleable name="CompatTextView">
         <attr name="drawablePadding" format="dimension"/>