Merge remote-tracking branch 'origin/master' into structured-data

# Conflicts: # app/src/main/java/fr/free/nrw/commons/Media.java # app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java # app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
2025-10-26 20:33:53 +01:00 · 2020-04-07 11:35:01 +01:00 · 2020-04-07 11:35:01 +01:00 · 5d2c786392
commit 5d2c786392
parent 00e9357115 577fb02c78
39 changed files with 439 additions and 205 deletions
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@ -1,6 +1,6 @@
 **Description (required)**

-Fixes #{GitHub issue number}
+Fixes #INSERT_ISSUE_NUMBER_HERE

 What changes did you make and why?

--- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
@ -152,7 +152,7 @@ public class AboutActivity extends NavigationBaseActivity {
                    String langCode = CommonsApplication.getInstance().getLanguageLookUpTable().getCodes().get(spinner.getSelectedItemPosition());
                    Utils.handleWebUrl(AboutActivity.this, Uri.parse(Urls.TRANSLATE_WIKI_URL + langCode));
                });
-        builder.setNegativeButton(R.string.about_translate_cancel, (dialog, which) -> finish());
+        builder.setNegativeButton(R.string.about_translate_cancel, (dialog, which) -> dialog.cancel());
        builder.create().show();

    }
--- a/app/src/main/java/fr/free/nrw/commons/Media.java
+++ b/app/src/main/java/fr/free/nrw/commons/Media.java
@ -27,17 +27,6 @@ import org.wikipedia.page.PageTitle;
 public class Media implements Parcelable {

    public static final Media EMPTY = new Media("");
-    public static Creator<Media> CREATOR = new Creator<Media>() {
-        @Override
-        public Media createFromParcel(Parcel parcel) {
-            return new Media(parcel);
-        }
-
-        @Override
-        public Media[] newArray(int i) {
-            return new Media[0];
-        }
-    };

    // Primary metadata fields
    @Nullable
@ -71,14 +60,14 @@ public class Media implements Parcelable {
     * Depicts is a feature part of Structured data. Multiple Depictions can be added for an image just like categories.
     * However unlike categories depictions is multi-lingual
     */
-    public ArrayList<Map<String, String>> depictionList;
+    public List<Map<String, String>> depictionList;
    /**
     * The above hashmap is fetched from API and to diplay in Explore
     * However this list of depictions is for storing and retrieving depictions from local storage or cache
     */
    public ArrayList<String> depictions;
    public boolean requestedDeletion;
-    public Map<String, String> descriptions; // multilingual descriptions as loaded
+    public HashMap<String, String> descriptions; // multilingual descriptions as loaded
    /**
     * This hasmap stores the list of multilingual captions, where
     * key of the HashMap is the language and value is the caption in the corresponding language
@ -139,32 +128,6 @@ public class Media implements Parcelable {
        this.descriptions = new HashMap<>();
    }

-    @SuppressWarnings("unchecked")
-    public Media(Parcel in) {
-        localUri = in.readParcelable(Uri.class.getClassLoader());
-        thumbUrl = in.readString();
-        imageUrl = in.readString();
-        filename = in.readString();
-        caption = in.readString();
-        description = in.readString();
-        dataLength = in.readLong();
-        dateCreated = (Date) in.readSerializable();
-        dateUploaded = (Date) in.readSerializable();
-        creator = in.readString();
-        tags = (HashMap<String, String>) in.readSerializable();
-        width = in.readInt();
-        height = in.readInt();
-        license = in.readString();
-        if (categories != null) {
-            in.readStringList(categories);
-        }
-        if (depictions != null) {
-            in.readStringList(depictions);
-        }
-        descriptions = in.readHashMap(ClassLoader.getSystemClassLoader());
-        captions = in.readHashMap(ClassLoader.getSystemClassLoader());
-    }
-
    /**
     * Creating Media object from MWQueryPage.
     * Earlier only basic details were set for the media object but going forward,
@ -609,42 +572,7 @@ public class Media implements Parcelable {
        }
    }

-    /**
-     * Method of Parcelable interface
-     * @return zero
-     */
-    @Override
-    public int describeContents() {
-        return 0;
-    }

-    /**
-     * Creates a way to transfer information between two or more
-     * activities.
-     * @param parcel Instance of Parcel
-     * @param flags Parcel flag
-     */
-    @Override
-    public void writeToParcel(Parcel parcel, int flags) {
-        parcel.writeParcelable(localUri, flags);
-        parcel.writeString(thumbUrl);
-        parcel.writeString(imageUrl);
-        parcel.writeString(filename);
-        parcel.writeString(caption);
-        parcel.writeString(description);
-        parcel.writeLong(dataLength);
-        parcel.writeSerializable(dateCreated);
-        parcel.writeSerializable(dateUploaded);
-        parcel.writeString(creator);
-        parcel.writeSerializable(tags);
-        parcel.writeInt(width);
-        parcel.writeInt(height);
-        parcel.writeString(license);
-        parcel.writeStringList(categories);
-        parcel.writeStringList(depictions);
-        parcel.writeMap(descriptions);
-        parcel.writeMap(captions);
-    }

    /**
     * Set requested deletion to true
@ -692,4 +620,104 @@ public class Media implements Parcelable {
    public void setDepiction(ArrayList<Map<String, String>> depictions) {
        this.depictionList = depictions;
    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+    /**
+     * Depicts is a feature part of Structured data. Multiple Depictions can be added for an image just like categories.
+     * However unlike categories depictions is multi-lingual
+     */
+    public ArrayList<Map<String, String>> depictionList;
+    /**
+     * The above hashmap is fetched from API and to diplay in Explore
+     * However this list of depictions is for storing and retrieving depictions from local storage or cache
+     */
+    public ArrayList<String> depictions;
+    public boolean requestedDeletion;
+    public HashMap<String, String> descriptions; // multilingual descriptions as loaded
+    /**
+     * This hasmap stores the list of multilingual captions, where
+     * key of the HashMap is the language and value is the caption in the corresponding language
+     * Ex: key = "en", value: "<caption in short in English>"
+     *     key = "de" , value: "<caption in german>"
+     */
+    public Map<String, String> captions;
+    public HashMap<String, String> tags = new HashMap<>();
+    @Nullable public  LatLng coordinates;
+    /**
+     * Creates a way to transfer information between two or more
+     * activities.
+     * @param dest Instance of Parcel
+     * @param flags Parcel flag
+     */
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeParcelable(this.localUri, flags);
+        dest.writeString(this.thumbUrl);
+        dest.writeString(this.imageUrl);
+        dest.writeString(this.filename);
+        dest.writeString(this.thumbnailTitle);
+        dest.writeString(this.caption);
+        dest.writeString(this.description);
+        dest.writeString(this.discussion);
+        dest.writeLong(this.dataLength);
+        dest.writeLong(this.dateCreated != null ? this.dateCreated.getTime() : -1);
+        dest.writeLong(this.dateUploaded != null ? this.dateUploaded.getTime() : -1);
+        dest.writeInt(this.width);
+        dest.writeInt(this.height);
+        dest.writeString(this.license);
+        dest.writeString(this.licenseUrl);
+        dest.writeString(this.creator);
+        dest.writeString(this.pageId);
+        dest.writeStringList(this.categories);
+        dest.writeList(this.depictionList);
+        dest.writeByte(this.requestedDeletion ? (byte) 1 : (byte) 0);
+        dest.writeSerializable(this.descriptions);
+        dest.writeSerializable(this.tags);
+        dest.writeParcelable(this.coordinates, flags);
+    }
+
+    protected Media(Parcel in) {
+        this.localUri = in.readParcelable(Uri.class.getClassLoader());
+        this.thumbUrl = in.readString();
+        this.imageUrl = in.readString();
+        this.filename = in.readString();
+        this.thumbnailTitle = in.readString();
+        this.caption = in.readString();
+        this.description = in.readString();
+        this.discussion = in.readString();
+        this.dataLength = in.readLong();
+        long tmpDateCreated = in.readLong();
+        this.dateCreated = tmpDateCreated == -1 ? null : new Date(tmpDateCreated);
+        long tmpDateUploaded = in.readLong();
+        this.dateUploaded = tmpDateUploaded == -1 ? null : new Date(tmpDateUploaded);
+        this.width = in.readInt();
+        this.height = in.readInt();
+        this.license = in.readString();
+        this.licenseUrl = in.readString();
+        this.creator = in.readString();
+        this.pageId = in.readString();
+        final ArrayList<String> list = new ArrayList<>();
+        in.readStringList(list);
+        this.categories=list;
+        in.readList(depictionList,null);
+        this.requestedDeletion = in.readByte() != 0;
+        this.descriptions = (HashMap<String, String>) in.readSerializable();
+        this.tags = (HashMap<String, String>) in.readSerializable();
+        this.coordinates = in.readParcelable(LatLng.class.getClassLoader());
+    }
+
+    public static final Creator<Media> CREATOR = new Creator<Media>() {
+        @Override
+        public Media createFromParcel(Parcel source) {
+            return new Media(source);
+        }
+
+        @Override
+        public Media[] newArray(int size) {
+            return new Media[size];
+        }
+    };
 }
--- a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
@ -86,7 +86,11 @@ public class WelcomeActivity extends BaseActivity {
        if (pager.getCurrentItem() != 0) {
            pager.setCurrentItem(pager.getCurrentItem() - 1, true);
        } else {
-            finish();
+            if (defaultKvStore.getBoolean("firstrun", true)) {
+                finishAffinity();
+            } else {
+                super.onBackPressed();
+            }
        }
    }

--- a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java
@ -30,18 +30,6 @@ public class  Contribution extends Media {
    //2009-01-09 → 9 January 2009
    private static final String TEMPLATE_DATA_OTHER_SOURCE = "%s";

-    public static Creator<Contribution> CREATOR = new Creator<Contribution>() {
-        @Override
-        public Contribution createFromParcel(Parcel parcel) {
-            return new Contribution(parcel);
-        }
-
-        @Override
-        public Contribution[] newArray(int i) {
-            return new Contribution[0];
-        }
-    };
-
    // No need to be bitwise - they're mutually exclusive
    public static final int STATE_COMPLETED = -1;
    public static final int STATE_FAILED = 1;
@ -111,26 +99,7 @@ public class  Contribution extends Media {
        this.state=state;
    }

-    public Contribution(Parcel in) {
-        super(in);
-        contentUri = in.readParcelable(Uri.class.getClassLoader());
-        source = in.readString();
-        state = in.readInt();
-        transferred = in.readLong();
-        isMultiple = in.readInt() == 1;
-        wikiItemName = in.readString();
-    }

-    @Override
-    public void writeToParcel(Parcel parcel, int flags) {
-        super.writeToParcel(parcel, flags);
-        parcel.writeParcelable(contentUri, flags);
-        parcel.writeString(source);
-        parcel.writeInt(state);
-        parcel.writeLong(transferred);
-        parcel.writeInt(isMultiple ? 1 : 0);
-        parcel.writeString(wikiItemName);
-    }

    public void setDateCreatedSource(String dateCreatedSource) {
        this.dateCreatedSource = dateCreatedSource;
@ -318,4 +287,56 @@ public class  Contribution extends Media {
    public ArrayList<String> getDepictionsEntityIds() {
        return depictionsEntityIds;
    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeLong(this._id);
+        dest.writeParcelable(this.contentUri, flags);
+        dest.writeString(this.source);
+        dest.writeString(this.editSummary);
+        dest.writeInt(this.state);
+        dest.writeLong(this.transferred);
+        dest.writeString(this.decimalCoords);
+        dest.writeByte(this.isMultiple ? (byte) 1 : (byte) 0);
+        dest.writeString(this.wikiDataEntityId);
+        dest.writeString(this.wikiItemName);
+        dest.writeString(this.p18Value);
+        dest.writeParcelable(this.contentProviderUri, flags);
+        dest.writeString(this.dateCreatedSource);
+    }
+
+    protected Contribution(Parcel in) {
+        super(in);
+        this._id = in.readLong();
+        this.contentUri = in.readParcelable(Uri.class.getClassLoader());
+        this.source = in.readString();
+        this.editSummary = in.readString();
+        this.state = in.readInt();
+        this.transferred = in.readLong();
+        this.decimalCoords = in.readString();
+        this.isMultiple = in.readByte() != 0;
+        this.wikiDataEntityId = in.readString();
+        this.wikiItemName = in.readString();
+        this.p18Value = in.readString();
+        this.contentProviderUri = in.readParcelable(Uri.class.getClassLoader());
+        this.dateCreatedSource = in.readString();
+    }
+
+    public static final Creator<Contribution> CREATOR = new Creator<Contribution>() {
+        @Override
+        public Contribution createFromParcel(Parcel source) {
+            return new Contribution(source);
+        }
+
+        @Override
+        public Contribution[] newArray(int size) {
+            return new Contribution[size];
+        }
+    };
 }
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
@ -60,8 +60,6 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
        this.contribution = contribution;
        fetchAndDisplayCaption(contribution);
        this.position = position;
-        imageView.getHierarchy().setPlaceholderImage(new ColorDrawable(
-            Color.argb(100, random.nextInt(256), random.nextInt(256), random.nextInt(256))));
        String imageSource = chooseImageSource(contribution.thumbUrl, contribution.getLocalUri());
        if (!TextUtils.isEmpty(imageSource)) {
            final ImageRequest imageRequest =
--- a/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.java
@ -6,21 +6,30 @@ import androidx.appcompat.app.AppCompatActivity;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.R;
+import com.facebook.drawee.drawable.ProgressBarDrawable;
 import fr.free.nrw.commons.media.zoomControllers.zoomable.DoubleTapGestureListener;
 import fr.free.nrw.commons.media.zoomControllers.zoomable.ZoomableDraweeView;
 import timber.log.Timber;

 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.drawable.Animatable;
 import android.net.Uri;
 import android.os.Bundle;
 import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.drawee.controller.BaseControllerListener;
+import com.facebook.drawee.controller.ControllerListener;
+import com.facebook.drawee.drawable.ScalingUtils;
+import com.facebook.drawee.generic.GenericDraweeHierarchy;
+import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
 import com.facebook.drawee.interfaces.DraweeController;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ProgressBar;

 import com.facebook.drawee.view.SimpleDraweeView;
+import com.facebook.imagepipeline.image.ImageInfo;
 import com.github.chrisbanes.photoview.PhotoView;

 import java.io.InputStream;
@ -32,6 +41,8 @@ public class ZoomableActivity extends AppCompatActivity {

    @BindView(R.id.zoomable)
    ZoomableDraweeView photo;
+    @BindView(R.id.zoom_progress_bar)
+    ProgressBar spinner;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@ -48,13 +59,42 @@ public class ZoomableActivity extends AppCompatActivity {
        init();
    }

+    /**
+     * Two types of loading indicators have been added to the zoom activity:
+     *  1.  An Indeterminate spinner for showing the time lapsed between dispatch of the image request
+     *      and starting to receiving the image.
+     *  2.  ProgressBarDrawable that reflects how much image has been downloaded
+     */
+    private final ControllerListener loadingListener = new BaseControllerListener<ImageInfo>() {
+        @Override
+        public void onSubmit(String id, Object callerContext) {
+            // Sometimes the spinner doesn't appear when rapidly switching between images, this fixes that
+            spinner.setVisibility(View.VISIBLE);
+        }
+
+        @Override
+        public void onIntermediateImageSet(String id, @Nullable ImageInfo imageInfo) {
+            spinner.setVisibility(View.GONE);
+        }
+        @Override
+        public void onFinalImageSet(String id, @Nullable ImageInfo imageInfo, @Nullable Animatable animatable) {
+            spinner.setVisibility(View.GONE);
+        }
+    };
    private void init() {
        if( imageUri != null ) {
+            GenericDraweeHierarchy hierarchy = GenericDraweeHierarchyBuilder.newInstance(getResources())
+                    .setActualImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)
+                    .setProgressBarImage(new ProgressBarDrawable())
+                    .setProgressBarImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)
+                    .build();
+            photo.setHierarchy(hierarchy);
            photo.setAllowTouchInterceptionWhileZoomed(true);
            photo.setIsLongpressEnabled(false);
            photo.setTapListener(new DoubleTapGestureListener(photo));
            DraweeController controller = Fresco.newDraweeControllerBuilder()
                    .setUri(imageUri)
+                    .setControllerListener(loadingListener)
                    .build();
            photo.setController(controller);
        }
--- a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java
@ -71,6 +71,9 @@ public interface NearbyParentFragmentContract {
        LatLng getLastLocation();

        com.mapbox.mapboxsdk.geometry.LatLng getLastFocusLocation();
+
+        boolean isCurrentLocationMarkerVisible();
+        void setProjectorLatLngBounds();
    }

    interface NearbyListView {
--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
@ -50,6 +50,7 @@ import com.mapbox.mapboxsdk.annotations.PolygonOptions;
 import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.Style;
@ -201,6 +202,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
    private boolean isVisibleToUser;
    private MapboxMap.OnCameraMoveListener cameraMoveListener;
    private fr.free.nrw.commons.location.LatLng lastFocusLocation;
+    private LatLngBounds latLngBounds;


    @Override
@ -632,6 +634,22 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
        return lastFocusLocation==null?null:LocationUtils.commonsLatLngToMapBoxLatLng(lastFocusLocation);
    }

+    @Override
+    public boolean isCurrentLocationMarkerVisible() {
+        if (latLngBounds == null) {
+            Timber.d("Map projection bounds are null");
+            return false;
+        } else {
+            Timber.d("Current location marker %s" , latLngBounds.contains(currentLocationMarker.getPosition()) ? "visible" : "invisible");
+            return latLngBounds.contains(currentLocationMarker.getPosition());
+        }
+    }
+
+    @Override
+    public void setProjectorLatLngBounds() {
+        latLngBounds = mapBox.getProjection().getVisibleRegion().latLngBounds;
+    }
+
    @Override
    public boolean isNetworkConnectionEstablished() {
        return NetworkUtils.isInternetConnectionEstablished(getActivity());
@ -906,9 +924,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
    }

    private void handleLocationUpdate(fr.free.nrw.commons.location.LatLng latLng, LocationServiceManager.LocationChangeType locationChangeType){
-        setMapBoxPosition(latLng);
-        this.lastKnownLocation=latLng;
-        NearbyController.currentLocation=lastKnownLocation;
+        this.lastKnownLocation = latLng;
+        NearbyController.currentLocation = lastKnownLocation;
        presenter.updateMapAndList(locationChangeType);
    }

@ -941,14 +958,6 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
        }
    }

-    void setMapBoxPosition(fr.free.nrw.commons.location.LatLng latLng){
-        CameraPosition position = new CameraPosition.Builder()
-                .target(LocationUtils.commonsLatLngToMapBoxLatLng(latLng)) // Sets the new camera position
-                .zoom(ZOOM_LEVEL) // Same zoom level
-                .build();
-        mapBox.moveCamera(CameraUpdateFactory.newCameraPosition(position));
-    }
-
    public void backButtonClicked() {
        presenter.backButtonClicked();
    }
--- a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java
@ -8,8 +8,6 @@ import java.lang.reflect.Proxy;
 import java.util.HashMap;
 import java.util.List;

-import javax.inject.Inject;
-
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.location.LatLng;
@ -21,9 +19,7 @@ import fr.free.nrw.commons.nearby.MarkerPlaceGroup;
 import fr.free.nrw.commons.nearby.NearbyBaseMarker;
 import fr.free.nrw.commons.nearby.NearbyController;
 import fr.free.nrw.commons.nearby.NearbyFilterState;
-import fr.free.nrw.commons.nearby.Place;
 import fr.free.nrw.commons.nearby.contract.NearbyParentFragmentContract;
-import fr.free.nrw.commons.upload.UploadContract;
 import fr.free.nrw.commons.utils.LocationUtils;
 import fr.free.nrw.commons.wikidata.WikidataEditListener;
 import timber.log.Timber;
@ -194,7 +190,7 @@ public class NearbyParentFragmentPresenter
            nearbyParentFragmentView.populatePlaces(nearbyParentFragmentView.getCameraTarget());
        } else { // Means location changed slightly, ie user is walking or driving.
            Timber.d("Means location changed slightly");
-            if (!nearbyParentFragmentView.isSearchThisAreaButtonVisible()) { // Do not track users position if the user is checking around
+            if (nearbyParentFragmentView.isCurrentLocationMarkerVisible()){ // Means user wants to see their live location
                nearbyParentFragmentView.recenterMap(curLatLng);
            }
        }
@ -259,6 +255,7 @@ public class NearbyParentFragmentPresenter

    @Override
    public void onCameraMove(com.mapbox.mapboxsdk.geometry.LatLng latLng) {
+        nearbyParentFragmentView.setProjectorLatLngBounds();
            // If our nearby markers are calculated at least once
            if (NearbyController.latestSearchLocation != null) {
               double distance =latLng.distanceTo
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
@ -216,7 +216,8 @@ public class UploadService extends HandlerService<Contribution> {
        Timber.d("Before execution!");
        curNotification.setContentTitle(getString(R.string.upload_progress_notification_title_start, contribution.getDisplayTitle()))
                .setContentText(getResources().getQuantityString(R.plurals.uploads_pending_notification_indicator, toUpload, toUpload))
-                .setTicker(getString(R.string.upload_progress_notification_title_in_progress, contribution.getDisplayTitle()));
+                .setTicker(getString(R.string.upload_progress_notification_title_in_progress, contribution.getDisplayTitle()))
+                .setOngoing(true);
        notificationManager
                .notify(notificationTag, NOTIFICATION_UPLOAD_IN_PROGRESS, curNotification.build());

@ -309,7 +310,7 @@ public class UploadService extends HandlerService<Contribution> {
            contribution.setFilename(canonicalFilename);
            contribution.setImageUrl(uploadResult.getImageinfo().getOriginalUrl());
            contribution.setState(Contribution.STATE_COMPLETED);
-            contribution.setDateUploaded(CommonsDateUtil.getIso8601DateFormatShort()
+            contribution.setDateUploaded(CommonsDateUtil.getIso8601DateFormatTimestamp()
                .parse(uploadResult.getImageinfo().getTimestamp()));
            compositeDisposable.add(contributionDao
                .save(contribution)
@ -325,7 +326,8 @@ public class UploadService extends HandlerService<Contribution> {
        curNotification.setTicker(getString(R.string.upload_failed_notification_title, contribution.getDisplayTitle()))
                .setContentTitle(getString(R.string.upload_failed_notification_title, contribution.getDisplayTitle()))
                .setContentText(getString(R.string.upload_failed_notification_subtitle))
-                .setProgress(0, 0, false);
+                .setProgress(0, 0, false)
+                .setOngoing(false);
        notificationManager.notify(contribution.getLocalUri().toString(), NOTIFICATION_UPLOAD_FAILED, curNotification.build());

        contribution.setState(Contribution.STATE_FAILED);
--- a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
@ -277,10 +277,12 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
    public void showDuplicatePicturePopup() {
        String uploadTitleFormat = getString(R.string.upload_title_duplicate);
        DialogUtil.showAlertDialog(getActivity(),
-                getString(R.string.warning),
+                getString(R.string.duplicate_image_found),
                String.format(Locale.getDefault(),
                        uploadTitleFormat,
                        uploadItem.getFileName()),
+                getString(R.string.upload),
+                getString(R.string.cancel),
                () -> {
                    uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
                    onNextButtonClicked();
@ -293,9 +295,11 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
        String errorMessageForResult = getErrorMessageForResult(getContext(), errorCode);
        if (!StringUtils.isBlank(errorMessageForResult)) {
            DialogUtil.showAlertDialog(getActivity(),
-                    getString(R.string.warning),
+                    getString(R.string.upload_problem_image),
                    errorMessageForResult,
-                    () -> {
+                    getString(R.string.upload),
+                    getString(R.string.cancel),
+                () -> {
                        uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
                        onNextButtonClicked();
                    },
--- a/app/src/main/java/fr/free/nrw/commons/utils/CommonsDateUtil.java
+++ b/app/src/main/java/fr/free/nrw/commons/utils/CommonsDateUtil.java
@ -13,11 +13,21 @@ public class CommonsDateUtil {

    /**
     * Gets SimpleDateFormat for short date pattern
-     * @return
+     * @return simpledateformat
     */
    public static SimpleDateFormat getIso8601DateFormatShort() {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
        simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
        return simpleDateFormat;
    }
+
+    /**
+     * Gets the timestamp pattern for a date
+     * @return timestamp
+     */
+    public static SimpleDateFormat getIso8601DateFormatTimestamp() {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT);
+        simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        return simpleDateFormat;
+    }
 }
--- a/app/src/main/res/drawable/ic_action_facebook.xml
+++ b/app/src/main/res/drawable/ic_action_facebook.xml
@ -5,6 +5,6 @@
    android:viewportWidth="2143"
    android:width="22dp">
    <path
-        android:fillColor="#000000"
+        android:fillColor="?aboutIconsColor"
        android:pathData="M1017,6c-267.2,14.8 -511.9,123.8 -699.5,311.4 -120.1,120.1 -207.8,262.9 -260.3,423.6 -50.7,155.1 -64.9,323.5 -41.1,486 13.4,91 37.7,177.7 74.1,263.5 9.5,22.6 33.9,72.6 46.3,95 32.3,58.7 72.2,117.1 114.8,168.2 42,50.3 95.8,103.7 146.2,144.8 97.7,79.9 209.8,142.2 328.5,182.6 57.7,19.7 113.4,33.6 176.8,44.2l2.2,0.4 0,-372.8 0,-372.9 -135.5,-0 -135.5,-0 0,-154.5 0,-154.5 135.5,-0 135.4,-0 0.4,-139.2c0.4,-149.8 0.2,-145.3 5.7,-182.7 15.3,-103.3 60.3,-187.6 130.2,-243.8 55.9,-44.9 125.2,-71.9 207.7,-80.8 62.6,-6.8 167.2,-1.4 273.2,14.1 13,1.8 24,3.4 24.3,3.4 0.3,-0 0.6,59.1 0.6,131.4l0,131.5 -79.7,0.4c-53.2,0.3 -82.5,0.8 -87.8,1.6 -24,3.5 -45.4,9.5 -60.5,17.1 -45.1,22.6 -71.1,61.6 -78.5,117.8 -1.3,9.4 -1.5,29.4 -1.5,120.3l0,108.9 147.5,-0c138.6,-0 147.5,0.1 147.5,1.7 0,1.8 -45.7,301 -46.5,305l-0.5,2.3 -124,-0 -124,-0 0,372.6 0,372.7 5.3,-0.7c19.2,-2.6 71.7,-13.8 101.2,-21.6 71.8,-19.2 136.6,-43.7 203.5,-77.2 231.3,-115.4 414.5,-313.7 511.8,-553.8 44,-108.8 68.9,-220.2 76.3,-342.5 1.5,-24.8 1.5,-90.7 0,-115.5 -6.8,-113.2 -28,-214.3 -66.3,-317 -83.7,-224.1 -244.7,-417.2 -450.8,-540.6 -50.1,-30 -111,-59.9 -162,-79.5 -103,-39.5 -202.3,-61.5 -315.5,-70 -19,-1.4 -105,-2 -125.5,-0.9z" android:strokeColor="#00000000"/>
 </vector>
--- a/app/src/main/res/drawable/ic_action_github.xml
+++ b/app/src/main/res/drawable/ic_action_github.xml
@ -5,18 +5,18 @@
    android:viewportWidth="120"
    android:width="26dp">
    <path
-        android:fillColor="#000000"
+        android:fillColor="?aboutIconsColor"
        android:pathData="M45.2,3c-10.9,2.9 -18.7,7.4 -27.2,16 -8.7,8.6 -13.1,16.3 -16,27.6 -3.6,14.1 -1.8,29.4 5.2,42.7 4.8,9.2 16.4,20.5 25.9,25.1 10.3,5.1 11.3,4.8 11.7,-3.5l0.3,-6.6 -5.9,-0c-7.5,-0 -11.6,-2.3 -14.7,-8.4 -1.3,-2.6 -3.8,-5.8 -5.5,-7.3 -3.6,-2.9 -3.1,-5.1 0.9,-4.1 3.2,0.8 5.1,2.3 4.7,3.8 -0.1,0.7 -0.1,0.8 0.2,0.4 0.5,-0.9 3.2,1.1 3.2,2.5 0,0.5 -0.4,0.6 -1,0.3 -0.5,-0.3 -1,-0.1 -1,0.5 0,0.7 0.6,1 1.4,0.7 0.8,-0.3 2.2,0.3 3.1,1.3 3.9,4.3 13.7,3.7 15.3,-0.8 0.6,-1.5 1.3,-3.4 1.7,-4.3 0.5,-1.3 -0.2,-1.8 -3.5,-2.3 -6,-0.9 -13.5,-5 -16.5,-9 -6,-7.9 -7.3,-21.3 -2.9,-30.6 1.9,-3.9 2.6,-6.9 2.5,-10.3 -0.2,-2.6 0,-6.1 0.4,-7.7 0.9,-4 4.3,-4 11.9,-0.1 5.5,2.8 5.9,2.8 13.2,1.8 5.3,-0.8 9.5,-0.8 14.8,-0 7.3,1 7.7,1 13.2,-1.8 7.6,-3.9 11,-3.9 11.9,0.1 0.4,1.6 0.6,5.1 0.4,7.7 -0.1,3.4 0.6,6.4 2.5,10.3 4.4,9.3 3.1,22.7 -2.9,30.6 -3.1,4.1 -10.8,8.2 -16.9,9l-4.5,0.7 1.7,2.5c1.3,2 1.8,5.7 2.2,15.1 0.6,15.1 0.6,15.1 11.9,9.5 9.5,-4.6 21.1,-15.9 25.9,-25.1 4.2,-8 7.2,-19.8 7.2,-28.3 0,-8.5 -3,-20.3 -7.2,-28.3 -4.2,-8.1 -16.4,-20.3 -24.5,-24.5 -13.2,-6.9 -29.1,-8.8 -43.1,-5.2z" android:strokeColor="#00000000"/>
    <path
-        android:fillColor="#000000"
+        android:fillColor="?aboutIconsColor"
        android:pathData="M29,96c0,0.5 0.5,1 1,1 0.6,-0 1,-0.5 1,-1 0,-0.6 -0.4,-1 -1,-1 -0.5,-0 -1,0.4 -1,1z" android:strokeColor="#00000000"/>
    <path
-        android:fillColor="#000000"
+        android:fillColor="?aboutIconsColor"
        android:pathData="M33,98c0,0.5 0.5,1 1,1 0.6,-0 1,-0.5 1,-1 0,-0.6 -0.4,-1 -1,-1 -0.5,-0 -1,0.4 -1,1z" android:strokeColor="#00000000"/>
    <path
-        android:fillColor="#000000"
+        android:fillColor="?aboutIconsColor"
        android:pathData="M42.5,98c-0.3,0.5 0.1,1 1,1 0.9,-0 1.3,-0.5 1,-1 -0.3,-0.6 -0.8,-1 -1,-1 -0.2,-0 -0.7,0.4 -1,1z" android:strokeColor="#00000000"/>
    <path
-        android:fillColor="#000000"
+        android:fillColor="?aboutIconsColor"
        android:pathData="M38,99c0,0.5 0.5,1 1,1 0.6,-0 1,-0.5 1,-1 0,-0.6 -0.4,-1 -1,-1 -0.5,-0 -1,0.4 -1,1z" android:strokeColor="#00000000"/>
 </vector>
--- a/app/src/main/res/drawable/ic_action_website.xml
+++ b/app/src/main/res/drawable/ic_action_website.xml
@ -4,6 +4,6 @@
    android:viewportHeight="125"
    android:viewportWidth="125"
    android:width="22dp">
-    <path android:fillColor="#000000"
+    <path android:fillColor="?aboutIconsColor"
        android:pathData="M49,1.6c-23.2,4.9 -42.6,24.6 -47.5,47.9 -9.2,44.2 29.8,83.2 74,74 33.4,-7 55,-40.4 48,-74 -7,-33.5 -40.7,-55.2 -74.5,-47.9zM97.6,27.4c9.8,9.8 14.4,21 14.4,35.1 0,11.5 -3.4,21.8 -9.8,30.3l-2.5,3.3 -1.8,-2.7c-2.4,-3.8 -4.5,-4.8 -10.9,-5.4l-5.5,-0.5 -0.5,-11.3c-0.4,-8.5 -0.9,-11.5 -2,-12.2 -0.8,-0.5 -10.4,-1 -21.2,-1l-19.8,-0 0,-6.5 0,-6.5 6.8,-0c10.1,-0 11.2,-1.1 11.2,-11.1l0,-7.9 8.1,-0c9,-0 12.5,-1.4 15.3,-6 0.9,-1.6 1.6,-4.2 1.6,-5.9l0,-3.1 5.2,2.6c2.9,1.5 8,5.4 11.4,8.8zM44,86.7c0,4.4 0.5,5.8 3,8.7 1.7,1.9 4.4,3.8 6,4.1 2.9,0.6 3,0.8 3,6.7l0,6 -3.2,-0.7c-16,-3.5 -28.7,-13.7 -35.6,-28.5 -3.1,-6.6 -3.6,-8.7 -4,-17.7 -0.2,-5.6 -0.2,-11 0.2,-11.9 0.6,-1.4 3.6,1.2 15.6,13.1l15,15 0,5.2z" android:strokeColor="#00000000"/>
 </vector>
--- a/app/src/main/res/layout/activity_zoomable.xml
+++ b/app/src/main/res/layout/activity_zoomable.xml
@ -13,5 +13,14 @@
        android:layout_width="match_parent"
        app:actualImageScaleType="fitCenter"
        />
+    <ProgressBar
+        android:layout_width="@dimen/dimen_72"
+        android:layout_height="@dimen/dimen_72"
+        android:id="@+id/zoom_progress_bar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/layout_contribution.xml
+++ b/app/src/main/res/layout/layout_contribution.xml
@ -23,6 +23,7 @@
        android:layout_width="match_parent"
        android:layout_height="@dimen/very_large_height"
        app:actualImageScaleType="centerCrop"
+        android:background="?attr/mainBackground"
        fresco:placeholderImage="@drawable/ic_image_black_24dp"
        />

--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -50,9 +50,13 @@
  <string name="upload_progress_notification_title_finishing">اكتمال رفع %1$s</string>
  <string name="upload_failed_notification_title">فشل رفع %1$s</string>
  <string name="upload_failed_notification_subtitle">انقر لتشاهد</string>
-  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
-    <item quantity="one">%1$d رفع ملف</item>
-    <item quantity="other">%1$d رفع ملفات</item>
+  <plurals name="uploads_pending_notification_indicator">
+    <item quantity="zero">%1$d ملف جاري رفعه</item>
+    <item quantity="one">%1$d ملف جاري رفعه</item>
+    <item quantity="two">%1$d ملف جاري رفعه</item>
+    <item quantity="few">%1$d ملف جاري رفعه</item>
+    <item quantity="many">%1$d ملف جاري رفعه</item>
+    <item quantity="other">%1$d ملفات جاري رفعها</item>
  </plurals>
  <string name="title_activity_contributions">مرفوعاتي الأخيرة</string>
  <string name="contribution_state_queued">في قائمة الانتظار</string>
@ -86,16 +90,30 @@
  <string name="gps_disabled">عطل نظام الملاحة العالمي GPS بجهازك. أترغب في التنشيط؟</string>
  <string name="enable_gps">تفعيل GPS</string>
  <string name="contributions_subtitle_zero">لا مرفوعات بعد</string>
-  <plurals name="contributions_subtitle" fuzzy="true">
+  <plurals name="contributions_subtitle">
    <item quantity="zero">\@string/contributions_subtitle_zero</item>
    <item quantity="one">(%1$d)</item>
+    <item quantity="two">(%1$d)</item>
+    <item quantity="few">(%1$d)</item>
+    <item quantity="many">(%1$d)</item>
    <item quantity="other">(%1$d)</item>
  </plurals>
-  <plurals name="starting_multiple_uploads" fuzzy="true">
+  <plurals name="starting_multiple_uploads">
+    <item quantity="zero">جارٍ بدء %1$d رفع</item>
    <item quantity="one">جارٍ بدء %1$d رفع</item>
+    <item quantity="two">جارٍ بدء %1$d رفع</item>
+    <item quantity="few">جارٍ بدء %1$d رفع</item>
+    <item quantity="many">جارٍ بدء %1$d رفع</item>
    <item quantity="other">جارٍ بدء %1$d مرفوعات</item>
  </plurals>
-  <string name="multiple_uploads_title" fuzzy="true">{{جمع|واحد=%1$d رفع|%1$d رفع}}</string>
+  <plurals name="multiple_uploads_title">
+    <item quantity="zero">%1$d رفع</item>
+    <item quantity="one">%1$d رفع</item>
+    <item quantity="two">%1$d رفع</item>
+    <item quantity="few">%1$d رفع</item>
+    <item quantity="many">%1$d رفع</item>
+    <item quantity="other">%1$d رفع</item>
+  </plurals>
  <string name="categories_not_found">لا توجد تصنيفات تطابق %1$s</string>
  <string name="categories_skip_explanation">أضف تصنيفات لجعل صورك أكثر قابلية للاكتشاف على ويكيميديا كومنز.\n\nابدأ الكتابة لإضافة تصنيفات.</string>
  <string name="categories_activity_title">تصنيفات</string>
@ -117,8 +135,12 @@
  <string name="no_uploads_yet">لم ترفع بعد أية صور.</string>
  <string name="menu_retry_upload">إعادة المحاولة</string>
  <string name="menu_cancel_upload">إلغاء</string>
-  <plurals name="share_license_summary" fuzzy="true">
+  <plurals name="share_license_summary">
+    <item quantity="zero">سيتم ترخيص هذه الصور تحت %1$s</item>
    <item quantity="one">سيتم ترخيص هذه الصورة تحت %1$s</item>
+    <item quantity="two">سيتم ترخيص هاتين الصورتين تحت ترخيص %1$s</item>
+    <item quantity="few">سيتم ترخيص هذه الصور تحت %1$s</item>
+    <item quantity="many">سيتم ترخيص هذه الصور تحت %1$s</item>
    <item quantity="other">سيتم ترخيص هذه الصور تحت %1$s</item>
  </plurals>
  <string name="media_upload_policy">بتقديم هذه الصورة، أعلن أن هذا عملي الخاص، وأنه لا يحتوي على مواد محفوظة الحقوق أو صور شخصية، وغير ذلك يلتزم &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;بسياسات ويكيميديا كومنز&lt;/a&gt;.</string>
@ -185,7 +207,9 @@
  <string name="title_activity_nearby">الأماكن القريبة</string>
  <string name="no_nearby">الأماكن القريبة غير متوفرة</string>
  <string name="warning">تحذير</string>
+  <string name="duplicate_image_found">تم العثور على صورة مكررة</string>
  <string name="upload_image_duplicate">هذا الملف موجود بالفعل في كومنز، هل أنت متأكد أنك تريد المتابعة؟</string>
+  <string name="upload">رفع</string>
  <string name="yes">نعم</string>
  <string name="no">لا</string>
  <string name="media_detail_title">العنوان</string>
@ -259,6 +283,7 @@
  <string name="upload_problem_different_geolocation">تم التقاط هذه الصورة في موقع مختلف.</string>
  <string name="upload_problem_fbmd">من فضلك فقط ارفع الصور التي التقطها بنفسك. لا ترفع الصور التي وجدتها على حسابات الآخرين في فيسبوك.</string>
  <string name="upload_problem_do_you_continue">هل ما زلت تريد رفع هذه الصورة؟</string>
+  <string name="upload_problem_image">تم العثور على مشاكل في الصورة</string>
  <string name="internet_downloaded">يُرجَى فقط رفع الصور التي التقطتها بنفسك، لا ترفع الصور التي قمت بتنزيلها من الإنترنت.</string>
  <string name="give_permission">إعطاء السماح</string>
  <string name="use_external_storage">استخدم تخزينا خارجيا</string>
@ -390,7 +415,7 @@
  <string name="contributions_fragment">مساهمات</string>
  <string name="nearby_fragment">مجاور</string>
  <string name="notifications">الإشعارات</string>
-  <string name="read_notifications" fuzzy="true">الإخطارات (مؤرشفة)</string>
+  <string name="read_notifications">الإخطارات (مقروءة)</string>
  <string name="display_nearby_notification">عرض الإخطار القريب</string>
  <string name="display_nearby_notification_summary">انقر هنا لرؤية أقرب مكان يحتاج إلى صور</string>
  <string name="no_close_nearby">لم يتم العثور على أماكن قريبة بالقرب منك</string>
@ -405,8 +430,12 @@
  <string name="submit">إرسال</string>
  <string name="upload_title_duplicate">يوجد ملف باسم الملف %1$s، هل أنت متأكد أنك تريد المتابعة؟</string>
  <string name="map_application_missing">لا يمكن العثور على تطبيق خرائط متوافق على جهازك; الرجاء تثبيت تطبيق خرائط لاستخدام هذه الميزة.</string>
-  <plurals name="upload_count_title" fuzzy="true">
+  <plurals name="upload_count_title">
+    <item quantity="zero">%1$d رفع</item>
    <item quantity="one">%1$d رفع</item>
+    <item quantity="two">%1$d رفع</item>
+    <item quantity="few">%1$d رفع</item>
+    <item quantity="many">%1$d رفع</item>
    <item quantity="other">%1$d مرفوعات</item>
  </plurals>
  <string name="navigation_item_bookmarks">العلامات</string>
@ -496,17 +525,21 @@
  <string name="review_thanks_no_button_text">الصورة التالية</string>
  <string name="skip_image_explanation">النقر فوق هذا الزر سيمنحك صورة أخرى مرفوعة مؤخرا من ويكيميديا كومنز</string>
  <string name="review_image_explanation">يمكنك مراجعة الصور وتحسين جودة ويكيميديا كومنز.\n وسائط اللمراجعة الأربعة هي:\n - هل هذه الصورة في النطاق؟\n - هل تتبع هذه الصورة قواعد حقوق النشر؟\n - هل هذه الصورة مصنفة بشكل صحيح؟\n - إذا سارت الأمور على ما يرام يمكنك أيضا شكر المساهم.</string>
-  <plurals name="receiving_shared_content" fuzzy="true">
+  <plurals name="receiving_shared_content">
+    <item quantity="zero">جارٍ تلقي محتوى مشترك، قد تستغرق معالجة الصور بعض الوقت بناءً على حجم الصور وجهازك</item>
    <item quantity="one">جارٍ تلقي محتوى مشترك، قد تستغرق معالجة الصورة بعض الوقت بناءً على حجم الصور وجهازك</item>
+    <item quantity="two">جارٍ تلقي محتوى مشترك، قد تستغرق معالجة الصور بعض الوقت بناءً على حجم الصور وجهازك</item>
+    <item quantity="few">جارٍ تلقي محتوى مشترك، قد تستغرق معالجة الصور بعض الوقت بناءً على حجم الصور وجهازك</item>
+    <item quantity="many">جارٍ تلقي محتوى مشترك، قد تستغرق معالجة الصور بعض الوقت بناءً على حجم الصور وجهازك</item>
    <item quantity="other">جارٍ تلقي محتوى مشترك، قد تستغرق معالجة الصور بعض الوقت بناءً على حجم الصور وجهازك</item>
  </plurals>
  <string name="no_image">لا صور مستخدمة</string>
  <string name="no_image_reverted">لم يتم إرجاع أية صور</string>
  <string name="no_image_uploaded">لا توجد صور مرفوعة</string>
  <string name="no_notification">ليست لديك إشعارات غير مقروءة</string>
-  <string name="no_read_notification" fuzzy="true">ليست لديك إشعارات مؤرشفة</string>
+  <string name="no_read_notification">ليست لديك إشعارات مقروءة</string>
  <string name="share_logs_using">مشاركة السجلات باستخدام</string>
-  <string name="menu_option_read" fuzzy="true">عرض المؤرشفة</string>
+  <string name="menu_option_read">عرض المقروءة</string>
  <string name="menu_option_unread">عرض غير المقروءة</string>
  <string name="error_occurred_in_picking_images">حدث خطأ أثناء التقاط الصور</string>
  <string name="image_chooser_title">اختيار الصور للرفع</string>
@ -575,7 +608,12 @@
  <string name="wallpaper_set_unsuccessfully">هناك خطأ ما. تعذر تعيين الخلفية</string>
  <string name="setting_wallpaper_dialog_title">اجعلها خلفية</string>
  <string name="setting_wallpaper_dialog_message">إعداد الخلفية. أرجو الإنتظار…</string>
-  <string name="theme_default_name" fuzzy="true">افتراضي</string>
+  <string name="theme_default_name">اتبع النظام</string>
  <string name="theme_dark_name">غامق</string>
  <string name="theme_light_name">فاتح</string>
+  <string name="cannot_open_location_settings">فشل في فتح إعدادات الموقع. يرجى تشغيل الموقع يدويا</string>
+  <string name="recommend_high_accuracy_mode">للحصول على أفضل النتائج، اختر وضع High Accuracy.</string>
+  <string name="ask_to_turn_location_on">تشغيل الموقع؟</string>
+  <string name="nearby_needs_location">خدمة قريب من هنا تحتاج إلى تفعيل خدمة الموقع للعمل بشكل صحيح</string>
+  <string name="use_location_from_similar_image">هل قمت بتصوير هاتين الصورتين في نفس المكان؟ هل تريد استخدام دائرة العرض / خط الطول للصورة على اليمين؟</string>
 </resources>
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@ -72,8 +72,7 @@
  <string name="gps_disabled">El GPS ta desactiváu nel preséu. ¿Quiés activalu?</string>
  <string name="enable_gps">Activar GPS</string>
  <string name="contributions_subtitle_zero">Inda nun hai xubes</string>
-  <plurals name="contributions_subtitle" fuzzy="true">
-    <item quantity="zero">\@string/contributions_subtitle_zero</item>
+  <plurals name="contributions_subtitle">
    <item quantity="one">(%1$d)</item>
    <item quantity="other">(%1$d)</item>
  </plurals>
@ -116,7 +115,7 @@
  <string name="use_previous">Usar un títulu y descripción anterior</string>
  <string name="allow_gps">Llograr automáticamente l\'allugamientu actual</string>
  <string name="allow_gps_summary">Recupera la posición actual si la imaxe nun tien etiquetes xeográfiques, y marca la imaxe con ella. Atención: Esto revelará\'l to allugamientu actual.</string>
-  <string name="preference_theme" fuzzy="true">Mou nocherniegu</string>
+  <string name="preference_theme">Tema</string>
  <string name="license_name_cc_by_sa_four"> Reconocimientu-CompartirIgual 4.0</string>
  <string name="license_name_cc_by_four"> Reconocimientu 4.0</string>
  <string name="license_name_cc_by_sa"> Reconocimientu-CompartirIgual 3.0</string>
@ -379,7 +378,7 @@
  <string name="contributions_fragment">Collaboraciones</string>
  <string name="nearby_fragment">Cercanu</string>
  <string name="notifications">Avisos</string>
-  <string name="read_notifications" fuzzy="true">Avisos (archivaos)</string>
+  <string name="read_notifications">Avisos (lleíos)</string>
  <string name="display_nearby_notification">Amosar notificaciones de cercanía</string>
  <string name="display_nearby_notification_summary">Toca equí para ver el llugar más cercanu que precisa semeyes</string>
  <string name="no_close_nearby">Nun s\'atoparon llugares cercanos nos alredores</string>
@ -434,6 +433,7 @@
  <string name="display_location_permission_title">Amosar permisu d\'allugamientu</string>
  <string name="display_location_permission_explanation">Pidir permisu d\'allugamientu cuando se precise pa la función de ver la tarxeta de notificación cercana.</string>
  <string name="achievements_fetch_failed">Daqué salió mal, nun pudimos recibir los tos llogros</string>
+  <string name="achievements_fetch_failed_ultimate_achievement">Ficisti tantes collaboraciones que superen al nuesu sistema de cálculu de llogros. Esti ye\'l llogru definitivu.</string>
  <string name="ends_on">Remata el:</string>
  <string name="display_campaigns">Amosar campañes</string>
  <string name="display_campaigns_explanation">Ver les campañes en cursu</string>
@ -483,7 +483,7 @@
  <string name="review_thanks_yes_button_text">Sí, por qué non</string>
  <string name="review_thanks_no_button_text">Imaxe siguiente</string>
  <string name="skip_image_explanation">Faciendo clic nesti botón recibirás otra imaxe de Wikimedia Commons xubida apocayá</string>
-  <string name="review_image_explanation">Puedes revisar imaxes y ameyorar la calidá de Wikimedia Commons.\nLos cuatro parámetros de revisión son: \n - ¿Ésta imaxe tien rellación col contestu? \n - ¿La imaxe cumple les riegles de copyright? \n - ¿La imaxe ta correchamente categorizada? \n - Si too ta correuto, tamién puedes dar les gracies al collaborador.</string>
+  <string name="review_image_explanation">Puedes revisar imaxes y ameyorar la calidá de Wikimedia Commons.\nLos cuatro parámetros de revisión son: \n - ¿Ésta imaxe tien rellación col contestu? \n - ¿La imaxe cumple les riegles de copyright? \n - ¿La imaxe ta correchamente categorizada? \n - Si too ta correuto, tamién pues dar les gracies al collaborador.</string>
  <plurals name="receiving_shared_content">
    <item quantity="one">Recibiendo\'l conteníu compartíu. El procesamientu de la imaxe puede tardar ciertu tiempu, dependiendo del tamañu de la imaxe y del to preséu</item>
    <item quantity="other">Recibiendo\'l conteníu compartíu. El procesamientu de les imaxes puede tardar ciertu tiempu, dependiendo del tamañu de les imaxes y del to preséu</item>
@ -492,9 +492,9 @@
  <string name="no_image_reverted">Nun se revertió nenguna imaxe</string>
  <string name="no_image_uploaded">Nun se xubió nenguna imaxe</string>
  <string name="no_notification">Nun tienes avisos ensin lleer</string>
-  <string name="no_read_notification" fuzzy="true">Nun tienes avisos archivaos</string>
+  <string name="no_read_notification">Nun tienes avisos lleíos</string>
  <string name="share_logs_using">Compartir rexistros usando</string>
-  <string name="menu_option_read" fuzzy="true">Ver los archivaos</string>
+  <string name="menu_option_read">Ver los lleíos</string>
  <string name="menu_option_unread">Ver los nun lleíos</string>
  <string name="error_occurred_in_picking_images">Asocedió un error al escoyer les imaxes</string>
  <string name="image_chooser_title">Escueyi les imaxes pa xubir</string>
@ -563,4 +563,12 @@
  <string name="wallpaper_set_unsuccessfully">Daqué salió mal. Nun pudo ponese\'l fondu d\'escritoriu</string>
  <string name="setting_wallpaper_dialog_title">Poner como fondu d\'escritoriu</string>
  <string name="setting_wallpaper_dialog_message">Poniendo fondu d\'escritoriu. Espera…</string>
+  <string name="theme_default_name">Siguir sistema</string>
+  <string name="theme_dark_name">Escuru</string>
+  <string name="theme_light_name">Claru</string>
+  <string name="cannot_open_location_settings">Nun pudo abrise la configuración d\'allugamientu. Activa manualmente l\'allugamientu</string>
+  <string name="recommend_high_accuracy_mode">Pa meyores resultaos, escueye\'l mou d\'Alta Precisión.</string>
+  <string name="ask_to_turn_location_on">¿Activar l\'allugamientu?</string>
+  <string name="nearby_needs_location">«Cercano» precisa activar l\'allugamientu pa funcionar correutamente</string>
+  <string name="use_location_from_similar_image">¿Sacasti estes dos semeyes nel mesmu llugar? ¿Quies usar la llatitú/llonxitú da la semeya de la derecha?</string>
 </resources>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -395,7 +395,7 @@
  <string name="contributions_fragment">Příspěvky</string>
  <string name="nearby_fragment">Poblíž</string>
  <string name="notifications">Upozornění</string>
-  <string name="read_notifications" fuzzy="true">Upozornění (přečtená)</string>
+  <string name="read_notifications">Upozornění (přečtená)</string>
  <string name="display_nearby_notification">Zobrazit upozornění v okolí</string>
  <string name="display_nearby_notification_summary">Klepnutím sem zobrazíte nejbližší místo, které potřebuje obrázky</string>
  <string name="no_close_nearby">Nebyla nalezena žádná místa v okolí</string>
@ -508,9 +508,9 @@
  <string name="no_image_reverted">Žádné revertované obrázky</string>
  <string name="no_image_uploaded">Žádné nahrané obrázky</string>
  <string name="no_notification">Nemáte žádná nepřečtená upozornění</string>
-  <string name="no_read_notification" fuzzy="true">Nemáte nepřečtená upozornění</string>
+  <string name="no_read_notification">Nemáte žádná přečtená upozornění</string>
  <string name="share_logs_using">Sdílet logy pomocí</string>
-  <string name="menu_option_read" fuzzy="true">Zobrazit přečtené</string>
+  <string name="menu_option_read">Zobrazit přečtené</string>
  <string name="menu_option_unread">Zobrazit nepřečtené</string>
  <string name="error_occurred_in_picking_images">Nastala chyba při vybírání obrázků</string>
  <string name="image_chooser_title">Vyberte obrázky, které chcete nahrát</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -198,7 +198,9 @@
  <string name="title_activity_nearby">Lieux à proximité</string>
  <string name="no_nearby">Aucun lieu trouvé à proximité</string>
  <string name="warning">Avertissement</string>
+  <string name="duplicate_image_found">Image en doublon trouvée</string>
  <string name="upload_image_duplicate">Ce fichier existe déjà dans Commons. Êtes-vous sûr de vouloir continuer ?</string>
+  <string name="upload">Téléverser</string>
  <string name="yes">Oui</string>
  <string name="no">Non</string>
  <string name="media_detail_title">Titre</string>
@ -272,6 +274,7 @@
  <string name="upload_problem_different_geolocation">Cette image a été prise à un emplacement différent.</string>
  <string name="upload_problem_fbmd">Veuillez ne téléverser que des images que vous avez prises vous-même. Ne téléversez aucune image prise sur les comptes Facebook d’autres personnes.</string>
  <string name="upload_problem_do_you_continue">Voulez-vous tout de même téléverser cette image ?</string>
+  <string name="upload_problem_image">Problème trouvé avec l\'image</string>
  <string name="internet_downloaded">Veuillez ne téléverser que des images que vous avez prises vous-même. Ne téléversez aucune image que vous avez téléchargée depuis Internet.</string>
  <string name="give_permission">Accorder le droit</string>
  <string name="use_external_storage">Utiliser le stockage externe</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -102,8 +102,8 @@
  <string name="menu_about">Acerca de</string>
  <string name="about_license">A aplicación Wikimedia Commons é unha aplicación de código aberto creada e mantida polos cesionarios e voluntarios da comunidade de Wikimedia. A Fundación Wikimedia non está involucrada na creación, desenvolvemento ou mantemento da aplicación.</string>
  <string name="about_improve">Crear unha nova &lt;a href=\"%1$s\"&gt;incidencia&lt;/a&gt; para informar de problemas e suxestións.</string>
-  <string name="about_privacy_policy" fuzzy="true">&lt;u&gt;Política de privacidade&lt;/u&gt;</string>
-  <string name="about_credits" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Créditos&lt;/a&gt;</string>
+  <string name="about_privacy_policy">Política de privacidade</string>
+  <string name="about_credits">Créditos</string>
  <string name="title_activity_about">Acerca de</string>
  <string name="menu_feedback">Enviar comentarios (por correo electrónico)</string>
  <string name="no_email_client">Non hai instalado ningún cliente de correo</string>
@ -119,10 +119,10 @@
  <string name="media_upload_policy">Publicando esta imaxe, declaro que é da miña obra, que non contén material con dereitos de autor ou selfies e que se adhire ás &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Políticas de Wikimedia Commons&lt;/a&gt;.</string>
  <string name="menu_download">Descargar</string>
  <string name="preference_license">Licenza por defecto</string>
-  <string name="use_previous" fuzzy="true">Usar o título ou a descrición anterior</string>
+  <string name="use_previous">Usar o título e descrición anteriores</string>
  <string name="allow_gps">Obter automaticamente a localización actual</string>
  <string name="allow_gps_summary">Obter a localización actual se a imaxe non está xeolocalizada, e xeolocaliza a imaxe con ela. Atención: Isto revelará a súa localización actual.</string>
-  <string name="preference_theme" fuzzy="true">Modo nocturno</string>
+  <string name="preference_theme">Tema</string>
  <string name="license_name_cc_by_sa_four"> Recoñecemento-CompartirIgual 4.0</string>
  <string name="license_name_cc_by_four">Recoñecemento 4.0</string>
  <string name="license_name_cc_by_sa"> Recoñecemento-CompartirIgual 3.0</string>
@ -163,7 +163,7 @@
  <string name="welcome_copyright_subtext">Evite os materiais protexidos por dereitos de autoría que se atopen na internet, así como imaxes de pósters, portadas de libros etc.</string>
  <string name="welcome_final_text">Entende como vai?</string>
  <string name="welcome_final_button_text">Si!</string>
-  <string name="welcome_help_button_text" fuzzy="true">&lt;u&gt;Máis Información&lt;/u&gt;</string>
+  <string name="welcome_help_button_text">Máis Información</string>
  <string name="detail_panel_cats_label">Categorías</string>
  <string name="detail_panel_cats_loading">Cargando…</string>
  <string name="detail_panel_cats_none">Ningunha seleccionada</string>
@ -265,7 +265,7 @@
  <string name="null_url">Errorǃ Nos se atopou a URL</string>
  <string name="nominate_deletion">Nomear para borrado</string>
  <string name="nominated_for_deletion">Esta imaxe foi nomeada para borrar.</string>
-  <string name="nominated_see_more" fuzzy="true">&lt;u&gt;Consulte a páxina web para ter máis para detalles&lt;/u&gt;</string>
+  <string name="nominated_see_more">Ver páxina web para máis detalles</string>
  <string name="nominating_file_for_deletion">Nomeando %1$d para borrado.</string>
  <string name="nominating_for_deletion_status">Nomeando ficheiro para borradoː %1$s</string>
  <string name="view_browser">Ver en navegador</string>
@ -277,7 +277,7 @@
  <string name="copy_wikicode">Copiar o texto wiki ó portapapeis</string>
  <string name="wikicode_copied">Texto wiki copiado ó portapapeis</string>
  <string name="nearby_location_has_not_changed">A localización non cambiou.</string>
-  <string name="nearby_location_not_available" fuzzy="true">A localización non está dispoñible.</string>
+  <string name="nearby_location_not_available">A localización non está dispoñible. A identificación de sitios próximos pode non funcionar correctamente.</string>
  <string name="location_permission_rationale_nearby">Precísase permiso para amosar unha lista de lugares preto de aquí</string>
  <string name="get_directions">OBTER DIRECCIÓNS</string>
  <string name="read_article">LER ARTIGO</string>
@ -290,8 +290,8 @@
  <string name="nearby_wikidata">WIKIDATA</string>
  <string name="nearby_wikipedia">WIKIPEDIA</string>
  <string name="nearby_commons">COMMONS</string>
-  <string name="about_rate_us" fuzzy="true">&lt;u&gt;Avalíenos&lt;/u&gt;</string>
-  <string name="about_faq" fuzzy="true">&lt;u&gt;FAQ&lt;/u&gt;</string>
+  <string name="about_rate_us">Avalíenos</string>
+  <string name="about_faq">FAQ</string>
  <string name="welcome_skip_button">Saltar titorial</string>
  <string name="no_internet">Internet non dispoñible</string>
  <string name="internet_established">Internet dispoñible</string>
@ -299,7 +299,7 @@
  <string name="error_review">Houbo un erro ó recuperar a imaxe a revisar. Prema en refrescar para tentalo de novo.</string>
  <string name="error_review_categories">Houbo un erro ó obter as categorías de imaxes a revisar. Prema en refrescar para tentalo de novo.</string>
  <string name="no_notifications">Non se atopou ningunha notificación</string>
-  <string name="about_translate" fuzzy="true">&lt;u&gt;Traducir&lt;/u&gt;</string>
+  <string name="about_translate">Traducir</string>
  <string name="about_translate_title">Linguas</string>
  <string name="about_translate_message">Seleccione a lingua para a que quere enviar as traducións</string>
  <string name="about_translate_proceed">Proceder</string>
@ -385,7 +385,7 @@
  <string name="contributions_fragment">Contribucións</string>
  <string name="nearby_fragment">Preto</string>
  <string name="notifications">Notificacións</string>
-  <string name="read_notifications" fuzzy="true">Notificacións (arquivadas)</string>
+  <string name="read_notifications">Notificacións (lidas)</string>
  <string name="display_nearby_notification">Amosar notificacións de proximidade</string>
  <string name="display_nearby_notification_summary">Prema aquí para ver o lugar máis preto que necesita fotos</string>
  <string name="no_close_nearby">Non se atoparon lugares preto de ti</string>
@ -484,7 +484,7 @@
  <string name="no_notification">Non ten ningunha notificación sen ler</string>
  <string name="no_read_notification" fuzzy="true">Non ten notificacións arquivadas</string>
  <string name="share_logs_using">Compartir os rexistros usando</string>
-  <string name="menu_option_read" fuzzy="true">Ver arquivadas</string>
+  <string name="menu_option_read">Ver lidas</string>
  <string name="menu_option_unread">Ver as non lidas</string>
  <string name="error_occurred_in_picking_images">Houbo un erro ó escoller as imaxes</string>
  <string name="image_chooser_title">Escoller imaxes a subir</string>
@ -501,6 +501,7 @@
  <string name="image_info">Información da imaxe</string>
  <string name="no_categories_found">Non se atoparon categorías</string>
  <string name="upload_cancelled">Cancelouse a carga</string>
+  <string name="delete_helper_show_deletion_title">Nomeando para borrado</string>
  <string name="delete_helper_show_deletion_title_success">Todo correcto</string>
  <string name="delete_helper_show_deletion_title_failed">Fallou</string>
  <string name="delete_helper_ask_spam_selfie">Un autorretrato</string>
@ -512,4 +513,17 @@
  <string name="delete_helper_ask_reason_copyright_logo">Logo</string>
  <string name="delete_helper_ask_reason_copyright_other">Outro</string>
  <string name="delete_helper_ask_alert_set_positive_button_reason">Porque é</string>
+  <string name="share_image_via">Compartir imaxe vía</string>
+  <string name="account_created">Conta creada!</string>
+  <string name="place_state_exists">Existe</string>
+  <string name="place_state_needs_photo">Precisa fotografía</string>
+  <string name="nearby_search_hint">Ponte, museo, hotel etc.</string>
+  <string name="title_app_shortcut_explore">Explorar</string>
+  <string name="title_app_shortcut_bookmark">Favoritos</string>
+  <string name="title_app_shortcut_setting">Axustes</string>
+  <string name="remove_bookmark">Eliminado de favoritos</string>
+  <string name="add_bookmark">Engadido a favoritos</string>
+  <string name="setting_wallpaper_dialog_title">Definir como fondo de pantalla</string>
+  <string name="theme_dark_name">Escuro</string>
+  <string name="theme_light_name">Claro</string>
 </resources>
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@ -95,8 +95,8 @@
  <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_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=\"%1$s\"&gt;მოთხოვნა GitHub-ზე&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;მადლობები&lt;/a&gt;</string>
+  <string name="about_privacy_policy">კონფიდენციალურობის პოლიტიკა</string>
+  <string name="about_credits">შემქმნელები</string>
  <string name="title_activity_about">პროგრამის შესახებ</string>
  <string name="menu_feedback">გამოხმაურების გაგზავნა (ელ.ფოსტით)</string>
  <string name="no_email_client">ელ-ფოსტის კლიენტი არ არის დაყენებული</string>
@ -109,10 +109,10 @@
  <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" fuzzy="true">წინა სათაურის/აღწერის გამოყენება</string>
+  <string name="use_previous">წინა სათაურისა და აღწერის გამოყენება</string>
  <string name="allow_gps">ამჟამინდელი მდებარეობის ავტომატური მიღება</string>
  <string name="allow_gps_summary">შლის მიმდინარე ადგილმდებარეობას, თუ სურათი არ არის დატანილი რუკაზე. ყურადღება! ეს ცვლილება გაჩვენებთ თქვენს მიმდინარე ადგილმდებარეობას.</string>
-  <string name="preference_theme" fuzzy="true">ღამის რეჟიმი</string>
+  <string name="preference_theme">თემა</string>
  <string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string>
  <string name="license_name_cc_by_four"> Attribution 4.0</string>
  <string name="license_name_cc_by_sa"> Attribution-ShareAlike 3.0</string>
@ -153,7 +153,7 @@
  <string name="welcome_copyright_subtext">თავიდან აიცილეთ საავტორო უფლებებით დაცული მასალების ატვირთვას, რომლებიც მოიძიეთ ინტერნეტში, ასევე პლაკატების, წიგნის ყდის და ა.შ.</string>
  <string name="welcome_final_text">თქვენ ფიქრობთ, რომ გაიგეთ ეს?</string>
  <string name="welcome_final_button_text">დიახ!</string>
-  <string name="welcome_help_button_text" fuzzy="true">&lt;u&gt;მეტი ინფორმაცია&lt;/u&gt;</string>
+  <string name="welcome_help_button_text">მეტი ინფორმაცია</string>
  <string name="detail_panel_cats_label">კატეგორიები</string>
  <string name="detail_panel_cats_loading">იტვირთება…</string>
  <string name="detail_panel_cats_none">არჩეული არაფერია</string>
@ -170,7 +170,9 @@
  <string name="title_activity_nearby">ახლომდებარე ადგილები</string>
  <string name="no_nearby">ახლომდებარე ადგილები ვერ მოიძებნა</string>
  <string name="warning">გაფრთხილება</string>
+  <string name="duplicate_image_found">ნაპოვნია სურათის ასლი</string>
  <string name="upload_image_duplicate">ეს ფაილი ვიკისაწყობში უკვე არსებობს. ნამდვილად გსურთ გაგრძელება?</string>
+  <string name="upload">ატვირთვა</string>
  <string name="yes">დიახ</string>
  <string name="no">არა</string>
  <string name="media_detail_title">სათაური</string>
@ -180,6 +182,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="_2fa_code">2ფა კოდი</string>
  <string name="number_of_uploads">ჩემი ბოლო ატვირთვების ლიმიტი</string>
@ -242,7 +245,7 @@
  <string name="null_url">შეცდომა! URL ვერ მოიძებნა</string>
  <string name="nominate_deletion">წაშლაზე ნომინირება</string>
  <string name="nominated_for_deletion">ეს სურათი წარდგენილია წაშლაზე</string>
-  <string name="nominated_see_more" fuzzy="true">&lt;u&gt;დეტალებისთვის ვებ-გვერდის ნახვა&lt;/u&gt;</string>
+  <string name="nominated_see_more">დეტალებისთვის ვებგვერდის ნახვა</string>
  <string name="view_browser">ბრაუზერში გახსნა</string>
  <string name="skip_login">გამოტოვება</string>
  <string name="navigation_item_login">შესვლა</string>
@ -250,12 +253,12 @@
  <string name="nearby_wikidata">ვიკიმონაცემები</string>
  <string name="nearby_wikipedia">ვიკიპედია</string>
  <string name="nearby_commons">ვიკისაწყობი</string>
-  <string name="about_rate_us" fuzzy="true">&lt;u&gt;შეგვაფასეთ&lt;/u&gt;</string>
-  <string name="about_faq" fuzzy="true">&lt;u&gt;ხდშ&lt;/u&gt;</string>
+  <string name="about_rate_us">შეგვაფასეთ</string>
+  <string name="about_faq">ხდშ</string>
  <string name="welcome_skip_button">სახელმძღვანელოს გამოტოვება</string>
  <string name="no_internet">ინტერნეტი არ არის</string>
  <string name="internet_established">ინტერნეტი არის</string>
-  <string name="about_translate" fuzzy="true">&lt;u&gt;თარგმნა&lt;/u&gt;</string>
+  <string name="about_translate">თარგმნა</string>
  <string name="about_translate_title">ენები</string>
  <string name="about_translate_proceed">გაგრძელება</string>
  <string name="about_translate_cancel">გაუქმება</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -104,7 +104,7 @@
  <string name="menu_about">정보</string>
  <string name="about_license">위키미디어 공용 앱은 오픈 소스 애플리케이션이며 위키미디어 공동체 내의 자원봉사자에 의해 유지됩니다. 위키미디어 재단은 애플리케이션의 생성, 개발, 유지보수에 관여하지 않습니다.</string>
  <string name="about_improve">버그나 기타 제안은 &lt;a href=\" https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub&lt;/a&gt;에 보고해주세요.</string>
-  <string name="about_privacy_policy">개인정보 정책</string>
+  <string name="about_privacy_policy">개인정보처리방침</string>
  <string name="about_credits">제작진</string>
  <string name="title_activity_about">정보</string>
  <string name="menu_feedback">(이메일로) 피드백 보내기</string>
@ -182,7 +182,9 @@
  <string name="title_activity_nearby">근처의 장소</string>
  <string name="no_nearby">근처에 장소가 없습니다</string>
  <string name="warning">경고</string>
+  <string name="duplicate_image_found">중복 이미지가 있습니다</string>
  <string name="upload_image_duplicate">이 파일은 이미 공용에 존재합니다. 계속하시겠습니까?</string>
+  <string name="upload">업로드</string>
  <string name="yes">예</string>
  <string name="no">아니오</string>
  <string name="media_detail_title">제목</string>
@ -254,6 +256,7 @@
  <string name="upload_problem_image_duplicate">이미지가 이미 공용에 있습니다.</string>
  <string name="upload_problem_different_geolocation">이 사진은 다른 위치에서 찍었습니다.</string>
  <string name="upload_problem_do_you_continue">그래도 이 사진을 업로드하시겠습니까?</string>
+  <string name="upload_problem_image">이미지에 문제가 있습니다</string>
  <string name="give_permission">권한 부여</string>
  <string name="use_external_storage">외부 저장소 사용하기</string>
  <string name="use_external_storage_summary">장치의 인앱 카메라로 찍은 사진 저장하기</string>
--- a/app/src/main/res/values-lb/strings.xml
+++ b/app/src/main/res/values-lb/strings.xml
@ -164,6 +164,7 @@
  <string name="title_activity_nearby">Plazen nobäi</string>
  <string name="no_nearby">Keng Plazen nobäi fonnt</string>
  <string name="warning">Warnung</string>
+  <string name="upload">Eroplueden</string>
  <string name="yes">Jo</string>
  <string name="no">Neen</string>
  <string name="media_detail_title">Titel</string>
@ -337,7 +338,7 @@
  <string name="review_thanks_no_button_text">Nächst BILD</string>
  <string name="no_image">Keng Biller benotzt</string>
  <string name="no_image_uploaded">Keng Biller eropgelueden</string>
-  <string name="no_read_notification" fuzzy="true">Dir hutt keng archivéier Notifikatiounen</string>
+  <string name="no_read_notification">Dir hutt keng net-geliest Notifikatiounen</string>
  <string name="menu_option_read">Déi geliest weisen</string>
  <string name="error_occurred_in_picking_images">Feeler beim Eraussiche vun de Biller</string>
  <string name="image_chooser_title">Sicht Biller eraus fir eropzelueden</string>
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@ -175,7 +175,9 @@
  <string name="title_activity_nearby">Околни места</string>
  <string name="no_nearby">Не најдов околни места</string>
  <string name="warning">Предупредување</string>
+  <string name="duplicate_image_found">Пронајдена дуплирана слика</string>
  <string name="upload_image_duplicate">Податотекава веќе постои на Ризницата. Дали сигурно сакате да продолжите?</string>
+  <string name="upload">Подигни</string>
  <string name="yes">Да</string>
  <string name="no">Не</string>
  <string name="media_detail_title">Наслов</string>
@ -249,6 +251,7 @@
  <string name="upload_problem_different_geolocation">Оваа слика е направена на друго место.</string>
  <string name="upload_problem_fbmd">Подигајте само слики кои самите сте ги направиле. Не подигајте слики пронајдени на туѓи профили на Фејсбук.</string>
  <string name="upload_problem_do_you_continue">Дали сепак сакате да ја подигнете?</string>
+  <string name="upload_problem_image">Пронајдени проблеми во сликата</string>
  <string name="internet_downloaded">Подигајте само слики кои самите сте ги направиле. Не подигајте слики што сте ги нашле некаде на семрежјето.</string>
  <string name="give_permission">Дај дозвола</string>
  <string name="use_external_storage">Користи надворешен склад</string>
--- a/app/src/main/res/values-pms/strings.xml
+++ b/app/src/main/res/values-pms/strings.xml
@ -173,7 +173,9 @@
  <string name="title_activity_nearby">Pòst davzin</string>
  <string name="no_nearby">Trovà gnente ant ij parage</string>
  <string name="warning">Avertensa</string>
+  <string name="duplicate_image_found">Plancia dobia trovà</string>
  <string name="upload_image_duplicate">St\'archivi a esist già su Commons. É-lo sigur ëd vorèj continué?</string>
+  <string name="upload">Carié</string>
  <string name="yes">Bò</string>
  <string name="no">Nò</string>
  <string name="media_detail_title">Tìtol</string>
@ -247,6 +249,7 @@
  <string name="upload_problem_different_geolocation">Sa fòto a l\'é stàita fàita ant un pòst diferent.</string>
  <string name="upload_problem_fbmd">Për piasì, ch\'a caria mach dle fòto che a l\'ha fàit chiel-midem. Ch\'a caria pa dle fòto che a l\'ha trovà an sij cont Facebook d\'àutra gent.</string>
  <string name="upload_problem_do_you_continue">Veul-lo istess carié sta plancia?</string>
+  <string name="upload_problem_image">Trovà un problema con la plancia</string>
  <string name="internet_downloaded">Për piasì, ch\'a caria mach dle fòto ch\'a l\'ha fàit chiel-midem. Ch\'a caria pa dle fòto che a l\'ha dëscarià da \'ns l\'aragnà.</string>
  <string name="give_permission">Dé ël përmess</string>
  <string name="use_external_storage">Dovré n\'anmagasinament estern</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -187,7 +187,9 @@
  <string name="title_activity_nearby">Lugares próximos</string>
  <string name="no_nearby">Não fora encontrado locais próximos.</string>
  <string name="warning">Alerta</string>
+  <string name="duplicate_image_found">Imagem duplicada encontrada</string>
  <string name="upload_image_duplicate">Este arquivo já existe no Commons. Tem certeza de que deseja continuar?</string>
+  <string name="upload">Enviar</string>
  <string name="yes">Sim</string>
  <string name="no">Não</string>
  <string name="media_detail_title">Título</string>
@ -261,6 +263,7 @@
  <string name="upload_problem_different_geolocation">Esta foto foi tirada em um local diferente.</string>
  <string name="upload_problem_fbmd">Por favor, apenas envie fotos que você tirou sozinho. Não faça upload de fotos que você encontrou nas contas do Facebook de outras pessoas.</string>
  <string name="upload_problem_do_you_continue">Você ainda quer enviar esta foto?</string>
+  <string name="upload_problem_image">Problemas encontrados na imagem</string>
  <string name="internet_downloaded">Por favor, só envie fotos que você tirou. Não faça upload de fotos baixadas da Internet.</string>
  <string name="give_permission">Dar permissão</string>
  <string name="use_external_storage">Usar o armazenamento externo</string>
@ -392,7 +395,7 @@
  <string name="contributions_fragment">Contribuições</string>
  <string name="nearby_fragment">Próximo</string>
  <string name="notifications">Notificações</string>
-  <string name="read_notifications" fuzzy="true">Notificações (arquivadas)</string>
+  <string name="read_notifications">Notificações (lidas)</string>
  <string name="display_nearby_notification">Exibir notificação próxima</string>
  <string name="display_nearby_notification_summary">Toque aqui para ver o local mais próximo que precisa de fotos</string>
  <string name="no_close_nearby">Nenhum lugar próximo encontrado perto de você</string>
@ -506,9 +509,9 @@
  <string name="no_image_reverted">Nenhuma imagem revertida</string>
  <string name="no_image_uploaded">Nenhuma imagem enviada</string>
  <string name="no_notification">Não tem nenhuma notificação por ler</string>
-  <string name="no_read_notification" fuzzy="true">Não tem nenhuma notificação arquivada</string>
+  <string name="no_read_notification">Não tem nenhuma notificação lida</string>
  <string name="share_logs_using">Compartilhar registros usando</string>
-  <string name="menu_option_read" fuzzy="true">Ver arquivadas</string>
+  <string name="menu_option_read">Ver leitura</string>
  <string name="menu_option_unread">Ver não lidas</string>
  <string name="error_occurred_in_picking_images">Ocorreu um erro ao escolher imagens</string>
  <string name="image_chooser_title">Escolha imagens para fazer o carregamento</string>
@ -577,11 +580,12 @@
  <string name="wallpaper_set_unsuccessfully">Algo deu errado. Não foi possível definir o papel de parede</string>
  <string name="setting_wallpaper_dialog_title">Definir como papel de parede</string>
  <string name="setting_wallpaper_dialog_message">Definir papel de parede. Por favor, espere…</string>
-  <string name="theme_default_name" fuzzy="true">Padrão</string>
+  <string name="theme_default_name">Seguir sistema</string>
  <string name="theme_dark_name">Escuro</string>
  <string name="theme_light_name">Claro</string>
  <string name="cannot_open_location_settings">Falha ao abrir as configurações de localização. Ative o local manualmente</string>
  <string name="recommend_high_accuracy_mode">Para obter melhores resultados, escolha o modo de alta precisão.</string>
  <string name="ask_to_turn_location_on">Ativar a localização?</string>
  <string name="nearby_needs_location">Proximidade precisa de localização ativado para funcionar corretamente</string>
+  <string name="use_location_from_similar_image">Você tirou essas duas fotos no mesmo lugar? Deseja usar a latitude/longitude da imagem à direita?</string>
 </resources>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -179,7 +179,9 @@
  <string name="title_activity_nearby">Platser i närheten</string>
  <string name="no_nearby">Inga platser i närheten hittades</string>
  <string name="warning">Varning</string>
+  <string name="duplicate_image_found">Dubblettbild hittades</string>
  <string name="upload_image_duplicate">Denna fil finns redan på Commons. Är du säker på att du vill fortsätta?</string>
+  <string name="upload">Ladda upp</string>
  <string name="yes">Ja</string>
  <string name="no">Nej</string>
  <string name="media_detail_title">Titel</string>
@ -253,6 +255,7 @@
  <string name="upload_problem_different_geolocation">Bilden togs på en annan plats.</string>
  <string name="upload_problem_fbmd">Var god ladda bara upp bilder som du själv har tagit. Ladda inte upp bilder som du har hittat på andra personers Facebook-konton.</string>
  <string name="upload_problem_do_you_continue">Vill du fortfarande ladda upp denna bild?</string>
+  <string name="upload_problem_image">Problem hittades i bilden</string>
  <string name="internet_downloaded">Var god ladda bara upp bilder som du själv har tagit. Ladda inte upp bilder som du har laddat ned från Internet.</string>
  <string name="give_permission">Ge behörighet</string>
  <string name="use_external_storage">Använd extern lagring</string>
@ -384,7 +387,7 @@
  <string name="contributions_fragment">Bidrag</string>
  <string name="nearby_fragment">I närheten</string>
  <string name="notifications">Aviseringar</string>
-  <string name="read_notifications" fuzzy="true">Aviseringar (arkiverade)</string>
+  <string name="read_notifications">Aviseringar (lästa)</string>
  <string name="display_nearby_notification">Visa avisering för i närheten</string>
  <string name="display_nearby_notification_summary">Tryck här för att se den närmaste platsen som behöver bilder</string>
  <string name="no_close_nearby">Inga platser i närheten hittades som är nära dig</string>
@ -498,9 +501,9 @@
  <string name="no_image_reverted">Inga bilder återställdes</string>
  <string name="no_image_uploaded">Inga bilder laddades upp</string>
  <string name="no_notification">Du har inga olästa aviseringar</string>
-  <string name="no_read_notification" fuzzy="true">Du har inga arkiverade aviseringar</string>
+  <string name="no_read_notification">Du har inga lästa aviseringar</string>
  <string name="share_logs_using">Dela loggar med</string>
-  <string name="menu_option_read" fuzzy="true">Visa arkiverade</string>
+  <string name="menu_option_read">Visa lästa</string>
  <string name="menu_option_unread">Visa olästa</string>
  <string name="error_occurred_in_picking_images">Fel uppstod när bilder valdes ut</string>
  <string name="image_chooser_title">Välj bilder att ladda upp</string>
@ -569,7 +572,12 @@
  <string name="wallpaper_set_unsuccessfully">Någonting gick fel. Kunde inte ändra bakgrundsbild</string>
  <string name="setting_wallpaper_dialog_title">Ange som bakgrundsbild</string>
  <string name="setting_wallpaper_dialog_message">Anger som bakgrundsbild. Var god vänta…</string>
-  <string name="theme_default_name" fuzzy="true">Standard</string>
+  <string name="theme_default_name">Följ systemet</string>
  <string name="theme_dark_name">Mörkt</string>
  <string name="theme_light_name">Ljust</string>
+  <string name="cannot_open_location_settings">Misslyckades att öppna platsinställningar. Aktivera plats manuellt</string>
+  <string name="recommend_high_accuracy_mode">För bästa resultat väljer du alternativet \"Öka precisionen\".</string>
+  <string name="ask_to_turn_location_on">Aktivera plats?</string>
+  <string name="nearby_needs_location">I närheten behöver ha plats aktiverat för att fungera ordentligt</string>
+  <string name="use_location_from_similar_image">Tog du dessa två bilder på samma plats? Vill du använda den högra bildens latitud/longitud?</string>
 </resources>
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@ -97,8 +97,8 @@
  <string name="menu_about">เกี่ยวกับ</string>
  <string name="about_license">แอปวิกิมีเดียคอมมอนส์เป็นแอปโอเพนซอร์สที่สร้างขึ้นและดูแลโดยผู้มีสิทธิและอาสาสมัครของชุมชนวิกิมีเดีย มูลนิธิวิกิมีเดียไม่มีส่วนเกี่ยวข้องในการสร้าง พัฒนา หรือการบำรุงรักษาแอปใดๆ ทั้งสิ้น</string>
  <string name="about_improve">สร้าง &lt;a href=\"%1$s\"&gt;GitHub issue&lt;/a&gt; ใหม่เพื่อรายงานบั๊กและส่งข้อเสนอแนะ</string>
-  <string name="about_privacy_policy" fuzzy="true">&lt;u&gt;นโยบายความเป็นส่วนตัว&lt;/u&gt;</string>
-  <string name="about_credits" fuzzy="true">&lt;u&gt;เครดิต&lt;/u&gt;</string>
+  <string name="about_privacy_policy">นโยบายความเป็นส่วนตัว</string>
+  <string name="about_credits">เครดิต</string>
  <string name="title_activity_about">เกี่ยวกับ</string>
  <string name="menu_feedback">ส่งคำติชม (ผ่านทางอีเมล)</string>
  <string name="no_email_client">ไม่ได้ติดตั้งไคลเอนต์อีเมล</string>
@ -114,10 +114,10 @@
  <string name="media_upload_policy">โดยการส่งรูปภาพนี้ ฉันยืนยันว่านี่เป็นงานของฉันเอง ซึ่งไม่ประกอบด้วยเนื้อหาที่ละเมิดลิขสิทธิ์หรือภาพเซลฟี หรืออื่นๆ ตามที่ระบุใน&lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;นโยบายของ Wikimedia Commons&lt;/a&gt;</string>
  <string name="menu_download">ดาวน์โหลด</string>
  <string name="preference_license">สัญญาอนุญาตปริยาย</string>
-  <string name="use_previous" fuzzy="true">ใช้ชื่อเรื่อง/คำอธิบายก่อนหน้านี้</string>
+  <string name="use_previous">ใช้ชื่อเรื่องและคำอธิบายก่อนหน้านี้</string>
  <string name="allow_gps">รับข้อมูลตำแหน่งที่ตั้งปัจจุบันโดยอัตโนมัติ</string>
  <string name="allow_gps_summary">ดึงข้อมูลตำแหน่งที่ตั้งปัจจุบันเพื่อรับข้อเสนอแนะเกี่ยวกับหมวดหมู่ถ้ารูปภาพไม่ได้ติดแท็กตำแหน่งที่ตั้งเอาไว้</string>
-  <string name="preference_theme" fuzzy="true">โหมดกลางคืน</string>
+  <string name="preference_theme">ธีม</string>
  <string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string>
  <string name="license_name_cc_by_four"> Attribution 4.0</string>
  <string name="license_name_cc_by_sa"> Attribution-ShareAlike 3.0</string>
@ -158,7 +158,7 @@
  <string name="welcome_copyright_subtext">หลีกเลี่ยงเนื้อหาที่คุณพบในอินเทอร์เน็ต เช่น รูปภาพในโปสเตอร์ ปกหนังสือ ฯลฯ</string>
  <string name="welcome_final_text">คุณคิดว่าคุณเข้าใจแล้วใช่ไหม?</string>
  <string name="welcome_final_button_text">ใช่!</string>
-  <string name="welcome_help_button_text" fuzzy="true">&lt;u&gt;ข้อมูลเพิ่มเติม&lt;/u&gt;</string>
+  <string name="welcome_help_button_text">ข้อมูลเพิ่มเติม</string>
  <string name="detail_panel_cats_label">หมวดหมู่</string>
  <string name="detail_panel_cats_loading">กำลังโหลด…</string>
  <string name="detail_panel_cats_none">ไม่ได้เลือกไว้</string>
@ -175,7 +175,9 @@
  <string name="title_activity_nearby">สถานที่ใกล้เคียง</string>
  <string name="no_nearby">ไม่พบสถานที่ใกล้เคียง</string>
  <string name="warning">คำเตือน</string>
+  <string name="duplicate_image_found">พบภาพซ้ำซ้อน</string>
  <string name="upload_image_duplicate">มีไฟล์นี้อยู่แล้วบนคอมมอนส์ คุณต้องการจะดำเนินการต่อหรือไม่</string>
+  <string name="upload">อัปโหลด</string>
  <string name="yes">ใช่</string>
  <string name="no">ไม่</string>
  <string name="media_detail_title">ชื่อเรื่อง</string>
@ -249,6 +251,7 @@
  <string name="upload_problem_different_geolocation">ภาพนี้ถูกถ่ายในตำแหน่งอื่น</string>
  <string name="upload_problem_fbmd">กรุณาอัพโหลดเฉพาะภาพที่คุณเป็นคนถ่ายหรือสร้างสรรค์ขึ้นมาเองเท่านั้น อย่าอัพโหลดรูปภาพที่คุณได้มาจากบุคคลอื่นจากบัญชีเฟซบุคของพวกเขา</string>
  <string name="upload_problem_do_you_continue">คุณยังต้องการอัพโหลดภาพนี้อยู่หรือไม่</string>
+  <string name="upload_problem_image">พบปัญหาในภาพ</string>
  <string name="internet_downloaded">กรุณาอัพโหลดเฉพาะภาพที่คุณเป็นคนถ่ายหรือสร้างสรรค์ขึ้นมาเองเท่านั้น อย่าอัพโหลดรูปภาพที่คุณได้มาจากการดาวน์โหลดบนอินเทอร์เน็ต</string>
  <string name="give_permission">ให้สิทธิ์</string>
  <string name="use_external_storage">ใช้ที่จัดเก็บข้อมูลภายนอก</string>
@ -260,7 +263,7 @@
  <string name="null_url">ข้อผิดพลาด! ไม่พบ URL</string>
  <string name="nominate_deletion">เสนอการลบ</string>
  <string name="nominated_for_deletion">ภาพนี้ถูกเสนอการลบแล้ว</string>
-  <string name="nominated_see_more" fuzzy="true">&lt;u&gt;ดูที่เว็บไซต์สำหรับข้อมูลเพิ่มเติม&lt;/u&gt;</string>
+  <string name="nominated_see_more">ดูที่เว็บไซต์สำหรับข้อมูลเพิ่มเติม</string>
  <string name="nominating_file_for_deletion">แจ้งลบไฟล์ %1$s</string>
  <string name="nominating_for_deletion_status">รายชื่อไฟล์ที่แจ้งไปแล้ว: %1$s</string>
  <string name="view_browser">ดูในเบราว์เซอร์</string>
@ -272,7 +275,7 @@
  <string name="copy_wikicode">คัดลอก Wikitext ไปที่คลิปบอร์ด</string>
  <string name="wikicode_copied">คัดลอกแล้ว</string>
  <string name="nearby_location_has_not_changed">ไม่ได้เปลี่ยนตำแหน่งที่ตั้ง</string>
-  <string name="nearby_location_not_available" fuzzy="true">ตำแหน่งที่ตั้งไม่พร้อมใช้งาน</string>
+  <string name="nearby_location_not_available">ฟีเจอร์สถานที่ใกล้ฉันอาจไม่ทำงาน ตำแหน่งที่ตั้งไม่พร้อมใช้งาน</string>
  <string name="location_permission_rationale_nearby">ต้องการสิทธิเพื่อแสดงรายการสถานที่ใกล้เคียง</string>
  <string name="get_directions">ดูเส้นทาง</string>
  <string name="read_article">อ่านบทความ</string>
@ -285,8 +288,8 @@
  <string name="nearby_wikidata">วิกิสนเทศ</string>
  <string name="nearby_wikipedia">วิกิพีเดีย</string>
  <string name="nearby_commons">คอมมอนส์</string>
-  <string name="about_rate_us" fuzzy="true">&lt;u&gt;ให้คะแนนเรา&lt;/u&gt;</string>
-  <string name="about_faq" fuzzy="true">&lt;u&gt;FAQ&lt;/u&gt;</string>
+  <string name="about_rate_us">ให้คะแนน</string>
+  <string name="about_faq">คำถามที่พบบ่อย</string>
  <string name="welcome_skip_button">ข้ามบทช่วยสอน</string>
  <string name="no_internet">อินเทอร์เน็ตไม่พร้อมใช้งาน</string>
  <string name="internet_established">อินเทอร์เน็ตพร้อมใช้งาน</string>
@ -294,7 +297,7 @@
  <string name="error_review">เกิดข้อผิดพลาดสำหรับการแสดงตัวอย่าง กรุณาลองใหม่อีกครั้ง</string>
  <string name="error_review_categories">เกิดข้อผิดพลาดสำหรับการแสดงตัวอย่าง กรุณาลองใหม่อีกครั้ง</string>
  <string name="no_notifications">ไม่พบการแจ้งความ</string>
-  <string name="about_translate" fuzzy="true">&lt;u&gt;แปล&lt;/u&gt;</string>
+  <string name="about_translate">แปลภาษา</string>
  <string name="about_translate_title">ภาษา</string>
  <string name="about_translate_message">เลือกภาษาที่คุณต้องการส่งการแปล</string>
  <string name="about_translate_proceed">ดำเนินการต่อ</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -191,7 +191,9 @@
  <string name="title_activity_nearby">Yakındaki Yerler</string>
  <string name="no_nearby">Yakınlardaki yer bulunamadı</string>
  <string name="warning">Uyarı</string>
+  <string name="duplicate_image_found">Yinelenen Resim Bulundu</string>
  <string name="upload_image_duplicate">Bu dosya Commons\'ta zaten yok edildi. Devam etmek istediğinizden emin misiniz?</string>
+  <string name="upload">Yükle</string>
  <string name="yes">Evet</string>
  <string name="no">Hayır</string>
  <string name="media_detail_title">Başlık</string>
@ -265,6 +267,7 @@
  <string name="upload_problem_different_geolocation">Bu resim farklı bir yerde çekilmiş.</string>
  <string name="upload_problem_fbmd">Lütfen yalnızca kendi çektiğiniz resimleri yükleyin. Başkalarının Facebook hesaplarında bulduğunuz resimleri yüklemeyin.</string>
  <string name="upload_problem_do_you_continue">Hâlâ bu resmi yüklemek istiyor musunuz?</string>
+  <string name="upload_problem_image">Resimde bulunan sorunlar</string>
  <string name="internet_downloaded">Lütfen yalnızca kendi çektiğiniz resimleri yükleyin. İnternetten indirdiğiniz resimleri yüklemeyin.</string>
  <string name="give_permission">İzin ver</string>
  <string name="use_external_storage">Harici depolamayı kullanın</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -193,7 +193,9 @@
  <string name="title_activity_nearby">Місця поблизу</string>
  <string name="no_nearby">Не знайдено місць поблизу</string>
  <string name="warning">Попередження</string>
+  <string name="duplicate_image_found">Виявлено дублікат зображення</string>
  <string name="upload_image_duplicate">Цей файл вже існує на Вікісховищі. Ви впевнені, що хочете продовжити?</string>
+  <string name="upload">Вивантажити</string>
  <string name="yes">Так</string>
  <string name="no">Ні</string>
  <string name="media_detail_title">Назва</string>
@ -267,6 +269,7 @@
  <string name="upload_problem_different_geolocation">Зображення виконано в іншому місці.</string>
  <string name="upload_problem_fbmd">Будь ласка, завантажуйте тільки ті зображення, які були зроблені вами. Не завантажуйте зображень, які ви знайшли у Фейсбуці.</string>
  <string name="upload_problem_do_you_continue">Ви все одно хочете завантажити це зображення?</string>
+  <string name="upload_problem_image">Виявлено проблеми із зображенням</string>
  <string name="internet_downloaded">Будь ласка, завантажуйте тільки ті зображення, які були зроблені вами. Не завантажуйте зображень, які ви знайшли в інтернеті.</string>
  <string name="give_permission">Надати дозвіл</string>
  <string name="use_external_storage">Використовувати зовнішнє сховище</string>
@ -594,5 +597,5 @@
  <string name="recommend_high_accuracy_mode">Щоб отримати кращі результати, виберіть режим високої точності.</string>
  <string name="ask_to_turn_location_on">Увімкнути визначення місця розташування?</string>
  <string name="nearby_needs_location">«Поблизу» потребує увімкненого визначення місця розташування, щоб працювати належним чином</string>
-  <string name="use_location_from_similar_image">Ви зробили ці два знімки в одному й тому ж місці? Хочете використати широту/довготу для зображення справа?</string>
+  <string name="use_location_from_similar_image">Ви зробили ці два знімки в одному й тому ж місці? Хочете використати широту/довготу зображення справа?</string>
 </resources>
--- a/app/src/main/res/values-vec/strings.xml
+++ b/app/src/main/res/values-vec/strings.xml
@ -562,4 +562,5 @@
  <string name="recommend_high_accuracy_mode">Par mejori rixultai, dopara ła modałità a Alta Preçixion</string>
  <string name="ask_to_turn_location_on">Ativar ła poxision?</string>
  <string name="nearby_needs_location">La locałixasion n\'te łe viçinanse ła ga da esare inpisada parché ła funsionee in modo justo.</string>
+  <string name="use_location_from_similar_image">Ste do foto łe gheto fate in tel steso posto? Vuto doparar ła stesa latitudine/lonxitudine de l\'imajine a drita?</string>
 </resources>
--- a/app/src/main/res/values-xmf/strings.xml
+++ b/app/src/main/res/values-xmf/strings.xml
@ -171,6 +171,7 @@
  <string name="no_nearby">გოხოლუაშ აბანეფქ ვეგორუ</string>
  <string name="warning">ხვილაფა</string>
  <string name="upload_image_duplicate">თე ფაილი Commons-ს უკვე რე. დარწუმებული რეთო გაგირძოება გოკონან?</string>
+  <string name="upload">ეხარგუა</string>
  <string name="yes">ქო</string>
  <string name="no">ვარი</string>
  <string name="media_detail_title">დუდჯოხო</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -184,7 +184,9 @@
  <string name="title_activity_nearby">附近地點</string>
  <string name="no_nearby">找不到附近地點</string>
  <string name="warning">警告</string>
+  <string name="duplicate_image_found">發現重複圖片</string>
  <string name="upload_image_duplicate">維基共享資源已有此檔案。確定要繼續嗎？</string>
+  <string name="upload">上傳</string>
  <string name="yes">是</string>
  <string name="no">否</string>
  <string name="media_detail_title">標題</string>
@ -258,6 +260,7 @@
  <string name="upload_problem_different_geolocation">此圖片是在不同的地點拍攝。</string>
  <string name="upload_problem_fbmd">請僅上傳您自己拍攝的圖片。不要上傳您從別人臉書帳號裡所找到的圖片。</string>
  <string name="upload_problem_do_you_continue">您仍要上傳此圖片嗎？</string>
+  <string name="upload_problem_image">在圖片裡發現問題</string>
  <string name="internet_downloaded">請僅上傳您自己拍攝的圖片。不要上傳您從網路下載來的圖片。</string>
  <string name="give_permission">給予權限</string>
  <string name="use_external_storage">使用外部存儲裝置</string>
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@ -27,6 +27,7 @@
    <attr name="mainCardBackground" format="reference"/>
    <attr name="mainScreenNearbyPermissionbutton" format="reference"/>
    <attr name="icon" format="reference"/>
+    <attr name="aboutIconsColor" format="reference"/>


    <declare-styleable name="CompatTextView">
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -180,7 +180,9 @@
  <string name="title_activity_nearby">Nearby Places</string>
  <string name="no_nearby">No nearby places found</string>
  <string name="warning">Warning</string>
+  <string name="duplicate_image_found">Duplicate Image Found</string>
  <string name="upload_image_duplicate">This file already destroyed on Commons. Are you sure you want to proceed?</string>
+  <string name="upload">Upload</string>
  <string name="yes">Yes</string>
  <string name="no">No</string>
  <string name="media_detail_caption">Caption</string>
@ -262,6 +264,7 @@
  <string name="upload_problem_different_geolocation">This picture was taken at a different location.</string>
  <string name="upload_problem_fbmd">Please only upload pictures that you have taken by yourself. Don\'t upload pictures that you have found on other people\'s Facebook accounts.</string>
  <string name="upload_problem_do_you_continue">Do you still want to upload this picture?</string>
+  <string name="upload_problem_image">Problems found in image</string>
  <string name="internet_downloaded">Please only upload pictures that you have taken by yourself. Don\'t upload pictures that you have downloaded from the Internet.</string>


--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -18,6 +18,7 @@
        <item name="bookmarkButtonColor">@color/button_blue_dark</item>
        <item name="rowButtonColor">@color/button_blue_dark</item>
        <item name="reviewHeading">@color/white</item>
+        <item name="aboutIconsColor">@color/white</item>

        <item name="semitransparentText">@color/commons_app_blue_dark</item>
        <item name="subBackground">@color/sub_background_dark</item>
@ -52,6 +53,7 @@
        <item name="bookmarkButtonColor">@color/button_blue</item>
        <item name="rowButtonColor">@color/button_blue</item>
        <item name="reviewHeading">@color/black</item>
+        <item name="aboutIconsColor">@color/black</item>

        <item name="semitransparentText">@color/commons_app_blue_light</item>
        <item name="subBackground">@color/sub_background_light</item>