From 7dd3dced351ad64111249cd5878814323c87eea6 Mon Sep 17 00:00:00 2001 From: Paul Hawke Date: Tue, 26 Sep 2017 22:33:59 -0500 Subject: [PATCH] Fixed merge conflicts --- .../ContributionsListFragment.java | 57 +++++++++++++++++-- .../media/MediaDetailPagerFragment.java | 2 +- .../nrw/commons/upload/ShareActivity.java | 56 +++++++++++------- app/src/main/res/values-ast/strings.xml | 2 +- app/src/main/res/values-bn/strings.xml | 2 +- app/src/main/res/values-br/strings.xml | 2 +- app/src/main/res/values-bs/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-frr/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 2 +- app/src/main/res/values-hi/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-jv/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-lb/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-mk/strings.xml | 2 +- app/src/main/res/values-mr/strings.xml | 2 +- app/src/main/res/values-nb/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pms/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sd/strings.xml | 2 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-su/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values-zh/strings.xml | 2 +- app/src/main/res/values/strings.xml | 6 +- app/src/main/res/xml/preferences.xml | 7 +++ 42 files changed, 138 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index b93a21fde..83dbced97 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -2,8 +2,10 @@ package fr.free.nrw.commons.contributions; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; +import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; @@ -27,6 +29,7 @@ import fr.free.nrw.commons.nearby.NearbyActivity; import timber.log.Timber; import static android.Manifest.permission.READ_EXTERNAL_STORAGE; +import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; import static android.app.Activity.RESULT_OK; import static android.content.Context.MODE_PRIVATE; import static android.content.pm.PackageManager.PERMISSION_GRANTED; @@ -34,9 +37,12 @@ import static android.view.View.GONE; public class ContributionsListFragment extends Fragment { - @BindView(R.id.contributionsList) GridView contributionsList; - @BindView(R.id.waitingMessage) TextView waitingMessage; - @BindView(R.id.emptyMessage) TextView emptyMessage; + @BindView(R.id.contributionsList) + GridView contributionsList; + @BindView(R.id.waitingMessage) + TextView waitingMessage; + @BindView(R.id.emptyMessage) + TextView emptyMessage; private ContributionController controller; @Override @@ -117,7 +123,7 @@ public class ContributionsListFragment extends Fragment { // sees the explanation, try again to request the permission. new AlertDialog.Builder(getActivity()) - .setMessage(getString(R.string.storage_permission_rationale)) + .setMessage(getString(R.string.read_storage_permission_rationale)) .setPositiveButton("OK", (dialog, which) -> { requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 1); dialog.dismiss(); @@ -149,7 +155,42 @@ public class ContributionsListFragment extends Fragment { return true; case R.id.menu_from_camera: - controller.startCameraCapture(); + SharedPreferences sharedPref = PreferenceManager + .getDefaultSharedPreferences(CommonsApplication.getInstance()); + boolean useExtStorage = sharedPref.getBoolean("useExternalStorage", true); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && useExtStorage) { + // Here, thisActivity is the current activity + if (ContextCompat.checkSelfPermission(getActivity(), WRITE_EXTERNAL_STORAGE) + != PackageManager.PERMISSION_GRANTED) { + if (shouldShowRequestPermissionRationale(WRITE_EXTERNAL_STORAGE)) { + // Show an explanation to the user *asynchronously* -- don't block + // this thread waiting for the user's response! After the user + // sees the explanation, try again to request the permission. + new AlertDialog.Builder(getActivity()) + .setMessage(getString(R.string.write_storage_permission_rationale)) + .setPositiveButton("OK", (dialog, which) -> { + requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, 3); + dialog.dismiss(); + }) + .setNegativeButton("Cancel", null) + .create() + .show(); + } else { + // No explanation needed, we can request the permission. + requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, + 3); + // MY_PERMISSIONS_WRITE_EXTERNAL_STORAGE is an + // app-defined int constant. The callback method gets the + // result of the request. + } + } else { + controller.startCameraCapture(); + return true; + } + } else { + controller.startCameraCapture(); + return true; + } return true; default: return super.onOptionsItemSelected(item); @@ -180,6 +221,12 @@ public class ContributionsListFragment extends Fragment { } } break; + case 3: { + if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + Timber.d("Call controller.startCameraCapture()"); + controller.startCameraCapture(); + } + } } } diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 42c463dca..0b718df2a 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -158,7 +158,7 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !(ContextCompat.checkSelfPermission(getContext(), READ_EXTERNAL_STORAGE) == PERMISSION_GRANTED)) { - Snackbar.make(getView(), R.string.storage_permission_rationale, + Snackbar.make(getView(), R.string.read_storage_permission_rationale, Snackbar.LENGTH_INDEFINITE).setAction(R.string.ok, view -> ActivityCompat.requestPermissions(getActivity(), new String[]{READ_EXTERNAL_STORAGE}, 1)).show(); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index 67e96090f..fa5f0d18b 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -3,12 +3,14 @@ package fr.free.nrw.commons.upload; import android.Manifest; import android.content.ContentResolver; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.os.ParcelFileDescriptor; +import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.RequiresApi; @@ -24,6 +26,7 @@ import android.widget.Toast; import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder; import com.facebook.drawee.view.SimpleDraweeView; +import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -52,9 +55,9 @@ import static fr.free.nrw.commons.upload.ExistingFileAsync.Result.NO_DUPLICATE; * Activity for the title/desc screen after image is selected. Also starts processing image * GPS coordinates or user location (if enabled in Settings) for category suggestions. */ -public class ShareActivity - extends AuthenticatedActivity - implements SingleUploadFragment.OnUploadActionInitiated, +public class ShareActivity + extends AuthenticatedActivity + implements SingleUploadFragment.OnUploadActionInitiated, OnCategoriesSaveHandler { private static final int REQUEST_PERM_ON_CREATE_STORAGE = 1; @@ -118,7 +121,7 @@ public class ShareActivity // and permission is not obtained. return !FileUtils.isSelfOwned(getApplicationContext(), mediaUri) && (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) - != PackageManager.PERMISSION_GRANTED); + != PackageManager.PERMISSION_GRANTED); } private void uploadBegins() { @@ -144,7 +147,7 @@ public class ShareActivity } private void showPostUpload() { - if(categorizationFragment == null) { + if (categorizationFragment == null) { categorizationFragment = new CategorizationFragment(); } getSupportFragmentManager().beginTransaction() @@ -154,7 +157,7 @@ public class ShareActivity @Override public void onCategoriesSave(List categories) { - if(categories.size() > 0) { + if (categories.size() > 0) { ModifierSequence categoriesSequence = new ModifierSequence(contribution.getContentUri()); categoriesSequence.queueModifier(new CategoryModifier(categories.toArray(new String[]{}))); @@ -180,7 +183,7 @@ public class ShareActivity @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - if(contribution != null) { + if (contribution != null) { outState.putParcelable("contribution", contribution); } } @@ -188,7 +191,7 @@ public class ShareActivity @Override public void onBackPressed() { super.onBackPressed(); - if(categorizationFragment != null && categorizationFragment.isVisible()) { + if (categorizationFragment != null && categorizationFragment.isVisible()) { EventLog.schema(CommonsApplication.EVENT_CATEGORIZATION_ATTEMPT) .param("username", app.getCurrentAccount().name) .param("categories-count", categorizationFragment.getCurrentSelectedCount()) @@ -227,7 +230,7 @@ public class ShareActivity ButterKnife.bind(this); initBack(); app = CommonsApplication.getInstance(); - backgroundImageView = (SimpleDraweeView)findViewById(R.id.backgroundImage); + backgroundImageView = (SimpleDraweeView) findViewById(R.id.backgroundImage); backgroundImageView.setHierarchy(GenericDraweeHierarchyBuilder .newInstance(getResources()) .setPlaceholderImage(VectorDrawableCompat.create(getResources(), @@ -253,7 +256,7 @@ public class ShareActivity backgroundImageView.setImageURI(mediaUri); } - if (savedInstanceState != null) { + if (savedInstanceState != null) { contribution = savedInstanceState.getParcelable("contribution"); } @@ -278,7 +281,7 @@ public class ShareActivity if (useNewPermissions && (!storagePermitted || !locationPermitted)) { if (!storagePermitted && !locationPermitted) { String permissionRationales = - getResources().getString(R.string.storage_permission_rationale) + "\n" + getResources().getString(R.string.read_storage_permission_rationale) + "\n" + getResources().getString(R.string.location_permission_rationale); snackbar = requestPermissionUsingSnackBar( permissionRationales, @@ -291,7 +294,7 @@ public class ShareActivity textView.setMaxLines(3); } else if (!storagePermitted) { requestPermissionUsingSnackBar( - getString(R.string.storage_permission_rationale), + getString(R.string.read_storage_permission_rationale), new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_PERM_ON_CREATE_STORAGE); } else if (!locationPermitted) { @@ -306,7 +309,7 @@ public class ShareActivity SingleUploadFragment shareView = (SingleUploadFragment) getSupportFragmentManager().findFragmentByTag("shareView"); categorizationFragment = (CategorizationFragment) getSupportFragmentManager().findFragmentByTag("categorization"); - if(shareView == null && categorizationFragment == null) { + if (shareView == null && categorizationFragment == null) { shareView = new SingleUploadFragment(); getSupportFragmentManager() .beginTransaction() @@ -416,12 +419,27 @@ public class ShareActivity // in older devices getPath() may fail depending on the source URI // creating and using a copy of the file seems to work instead. // TODO: there might be a more proper solution than this - String copyPath = getApplicationContext().getCacheDir().getAbsolutePath() - + "/" + new Date().getTime() + ".jpg"; + String copyPath = null; try { ParcelFileDescriptor descriptor = getContentResolver().openFileDescriptor(mediaUri, "r"); if (descriptor != null) { + SharedPreferences sharedPref = PreferenceManager + .getDefaultSharedPreferences(CommonsApplication.getInstance()); + boolean useExtStorage = sharedPref.getBoolean("useExternalStorage", true); + if (useExtStorage) { + copyPath = Environment.getExternalStorageDirectory().toString() + + "/CommonsApp/" + new Date().getTime() + ".jpg"; + File newFile = new File(Environment.getExternalStorageDirectory().toString() + "/CommonsApp"); + newFile.mkdir(); + FileUtils.copy( + descriptor.getFileDescriptor(), + copyPath); + Timber.d("Filepath (copied): %s", copyPath); + return copyPath; + } + copyPath = getApplicationContext().getCacheDir().getAbsolutePath() + + "/" + new Date().getTime() + ".jpg"; FileUtils.copy( descriptor.getFileDescriptor(), copyPath); @@ -438,6 +456,7 @@ public class ShareActivity /** * Gets coordinates for category suggestions, either from EXIF data or user location + * * @param gpsEnabled if true use GPS */ private void getFileMetadata(boolean gpsEnabled) { @@ -473,7 +492,7 @@ public class ShareActivity * Then initiates the calls to MediaWiki API through an instance of MwVolleyApi. */ public void useImageCoords() { - if(decimalCoords != null) { + if (decimalCoords != null) { Timber.d("Decimal coords of image: %s", decimalCoords); // Only set cache for this point if image has coords @@ -507,8 +526,7 @@ public class ShareActivity try { imageObj.unregisterLocationManager(); Timber.d("Unregistered locationManager"); - } - catch (NullPointerException e) { + } catch (NullPointerException e) { Timber.d("locationManager does not exist, not unregistered"); } } @@ -523,7 +541,7 @@ public class ShareActivity public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: - if(categorizationFragment!=null && categorizationFragment.isVisible()) { + if (categorizationFragment != null && categorizationFragment.isVisible()) { categorizationFragment.showBackButtonDialog(); } else { onBackPressed(); diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index 7caa2ea07..a8582166b 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -134,7 +134,7 @@ Ensin descripción Llicencia desconocida Refrescar - Permisu riquíu: llectura d\'almacenamientu esternu. L\'aplicación nun puede funcionar ensin él. + Permisu riquíu: llectura d\'almacenamientu esternu. L\'aplicación nun puede funcionar ensin él. Permisu opcional: llograr l\'allugamientu actual pa suxerir categoríes Aceutar Llugares cercanos diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 3d8f98247..d1ed60fd6 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -133,7 +133,7 @@ বিবরণ নেই অজানা লাইসেন্স পুনঃসতেজ - প্রয়োজনীয় অনুমতি: বহিঃস্ত সঞ্চয়স্থান পড়া। এটি ছাড়া অ্যাপ কাজ করবে না। + প্রয়োজনীয় অনুমতি: বহিঃস্ত সঞ্চয়স্থান পড়া। এটি ছাড়া অ্যাপ কাজ করবে না। ঐচ্ছিক অনুমতি: বিষয়শ্রেণী পরামর্শের জন্য বর্তমান অবস্থান নেয় ঠিক আছে কাছাকাছি স্থান diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index 16e241561..10d57e73b 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -133,7 +133,7 @@ Deskrivadur ebet Aotre-implijout dizanv Freskaat - Aotre rekis : lenn ur stokañ diavaez. Hep se, n\'hall ket an arload mont en-dro. + Aotre rekis : lenn ur stokañ diavaez. Hep se, n\'hall ket an arload mont en-dro. Aotre diret : kaout al lec\'hiadur red evit kinnig rummadoù Mat eo Lec\'hioù nes diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 17cebeb6a..4eb0e4d94 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -133,7 +133,7 @@ Nema opisa Nepoznata licenca Osvježi - Potrebna dozvola: Čitanje vanjske memorije. Aplikacija ne može raditi bez ovog. + Potrebna dozvola: Čitanje vanjske memorije. Aplikacija ne može raditi bez ovog. Neobavezna dozvola: Dobavljanje trenutne lokacije za predlaganje kategorija U redu Mjesta u blizini diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b034f8b64..d30724b7d 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -133,7 +133,7 @@ Bez popisu Neznámá licence Obnovit - Požadováno oprávnění ke čtení externího úložiště. Aplikace bez toho nemůže pracovat. + Požadováno oprávnění ke čtení externího úložiště. Aplikace bez toho nemůže pracovat. Volitelně: Umožněte aplikaci, aby získávala aktuální polohu a nabízela na jejím základě kategorie OK Místa v okolí diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 31a9c8f9c..d51d63c79 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -134,7 +134,7 @@ Keine Beschreibung Unbekannte Lizenz Aktualisieren - Erforderliche Berechtigung: Externen Speicher lesen. Die App funktioniert ohne diese Berechtigung nicht. + Erforderliche Berechtigung: Externen Speicher lesen. Die App funktioniert ohne diese Berechtigung nicht. Optionale Berechtigung: Ruft den aktuellen Standort für Kategorievorschläge ab Okay Orte in der Nähe diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 419382e13..63c94115e 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -129,7 +129,7 @@ Καμία περιγραφή Άγνωστη άδεια Ανανέωση - Απαιτούμενη άδεια: Ανάγνωση εξωτερικής αποθήκευσης. Η εφαρμογή δεν μπορεί να λειτουργήσει χωρίς αυτή. + Απαιτούμενη άδεια: Ανάγνωση εξωτερικής αποθήκευσης. Η εφαρμογή δεν μπορεί να λειτουργήσει χωρίς αυτή. Προαιρετική άδεια: Ανάκτηση τρέχουσας θέσης σας για προτάσεις κατηγοριών Εντάξει Κοντινοί Τόποι diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 16d345a37..c49cf7a51 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -134,7 +134,7 @@ Sin descripción Licencia desconocida Actualizar - Permiso obligatorio: lectura de almacenamiento externo. La aplicación no puede funcionar sin él. + Permiso obligatorio: lectura de almacenamiento externo. La aplicación no puede funcionar sin él. Permiso opcional: obtener la ubicación actual para sugerir categorías Aceptar Lugares cercanos diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 0254a2721..8960ce8f5 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -134,7 +134,7 @@ بدون توضیحات مجوز ناشناخته تازه‌کردن - اجازه‌های مورد نیاز: مطالعهٔ حافظهٔ خارجی. اپلیکیشن بدون آن نمی‌تواند کار کند. + اجازه‌های مورد نیاز: مطالعهٔ حافظهٔ خارجی. اپلیکیشن بدون آن نمی‌تواند کار کند. اجازه‌های اختیاری: دریافت موقعیت برای پیشنهاد رده تأیید مکان‌‌های اطراف diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index bf4ebdf0f..e8610de6f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -134,7 +134,7 @@ Ei kuvausta Tuntematon lisenssi Päivitä - Vaadittu oikeus: Ulkoisen tallennustilan luku. Appi ei toimi ilman tätä oikeutta. + Vaadittu oikeus: Ulkoisen tallennustilan luku. Appi ei toimi ilman tätä oikeutta. Valinnainen lupa: Saada tämänhetkinen sijainti loukkasuosituksia varten. OK Lähellä olevat paikat diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index bcb7d187e..b0c5fabe7 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -134,7 +134,7 @@ Aucune description Licence inconnue Rafraîchir - Autorisation nécessaire : Lire un stockage externe. L’application ne peut pas fonctionner sans cela. + Autorisation nécessaire : Lire un stockage externe. L’application ne peut pas fonctionner sans cela. Autorisation facultative : Obtenir l’emplacement actuel pour des suggestions de catégorie OK Endroits à proximité diff --git a/app/src/main/res/values-frr/strings.xml b/app/src/main/res/values-frr/strings.xml index 4027f90fe..e49f3e213 100644 --- a/app/src/main/res/values-frr/strings.xml +++ b/app/src/main/res/values-frr/strings.xml @@ -133,7 +133,7 @@ Nian beskriiwang Ünbekäänd lisens Nei loose - Ferlangd rochten: Ekstern spiiker lees. Det app koon saner detdiar rocht ei werke. + Ferlangd rochten: Ekstern spiiker lees. Det app koon saner detdiar rocht ei werke. Mögelk rocht: Rept di aktuel plak för kategoriiföörslacher ap. OK Steeden naibi diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 09c127df0..87601934a 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -134,7 +134,7 @@ Sen descrición Licenza descoñecida Refrescar - Permiso necesarioː ler un almacenamento externo. A aplicación non pode funcionar sen isto. + Permiso necesarioː ler un almacenamento externo. A aplicación non pode funcionar sen isto. Permiso opcionalː obter a localización actual para suxerir categorías Aceptar Lugares próximos diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 148fd908e..46d0cdc4f 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -129,7 +129,7 @@ कोई विवरण नहीं अज्ञात लाइसेन्स ताजा करें - अनिवार्य अनुमति: बाहरी स्मृति पढ़ें। एप इसके बिना कार्य नहीं करेगा। + अनिवार्य अनुमति: बाहरी स्मृति पढ़ें। एप इसके बिना कार्य नहीं करेगा। वैकल्पिक अनुमति: श्रेणी सुझाव हेतु वर्तमान स्थान ज्ञात करें ठीक है आसपास के स्थान diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b33b59fba..e3540ea68 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -133,7 +133,7 @@ Nincs leírás Ismeretlen licenc Frissítés - Szükséges engedély: Külső tárhely olvasása. Az alkalmazás nem működik enélkül. + Szükséges engedély: Külső tárhely olvasása. Az alkalmazás nem működik enélkül. Lehetséges engedély: Jelenlegi hely megszerzése, a kategóriajavaslatok lehetőségéért. OK Közeli helyek diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index aa6d1662d..c0b346ee5 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -133,7 +133,7 @@ אין תיאור רישיון לא ידוע רענון - הרשאה מחייבת: אחסון. היישום לא יכול לעבוד בלי זה. + הרשאה מחייבת: אחסון. היישום לא יכול לעבוד בלי זה. הרשאה לא מחייבת: קבלת מיקום נוכחי בשביל הצעות קטגוריות אישור מקומות בסביבה diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7119bc2ef..de5095d61 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -125,7 +125,7 @@ 説明はありません。 不明なライセンス 更新 - 必要な権限：外部ストレージを読み込みます。これがなければアプリは機能しません。 + 必要な権限：外部ストレージを読み込みます。これがなければアプリは機能しません。 オプションの権限：カテゴリ候補の現在の位置を取得する 承認 周りの場所 diff --git a/app/src/main/res/values-jv/strings.xml b/app/src/main/res/values-jv/strings.xml index 933d6e392..eb126eb8d 100644 --- a/app/src/main/res/values-jv/strings.xml +++ b/app/src/main/res/values-jv/strings.xml @@ -119,7 +119,7 @@ Tanpa katerangan Lisènsi ora kaweruhan Anyarana - Butuh palilah: Maca panyimpenan njaba. Aplikasi mokal mlaku yèn tanpa iki. + Butuh palilah: Maca panyimpenan njaba. Aplikasi mokal mlaku yèn tanpa iki. Palilah manasuka: Njupuk pernah saiki kanggo saran ing kategori Oké Papan Cedhak Kéné diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5489d9e45..cef6f592a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -133,7 +133,7 @@ 설명 없음 알 수 없는 라이선스 새로 고침 - 권한 필요: 외부 저장소 읽기. 이것이 없으면 앱은 동작하지 않습니다. + 권한 필요: 외부 저장소 읽기. 이것이 없으면 앱은 동작하지 않습니다. 선택적 권한: 분류 추천을 위해 현재 위치 정보를 가져옵니다. 확인 근처의 장소 diff --git a/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml index 55939f3d8..41ad81fb1 100644 --- a/app/src/main/res/values-lb/strings.xml +++ b/app/src/main/res/values-lb/strings.xml @@ -132,7 +132,7 @@ Keng Beschreiwung Onbekannt Lizenz Aktualiséieren - Obligatoresch Autorisatioun: Externe Späicher liesen. D\'App kann net ouni dat funktionéieren. + Obligatoresch Autorisatioun: Externe Späicher liesen. D\'App kann net ouni dat funktionéieren. Fakultativ Autorisatioun: Déi aktuell Plaz kréie fir Propose fir Kategorien OK Plazen nobäi diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 259996851..c7d8f05cc 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -106,7 +106,7 @@ Nėra aprašymo Nežinoma licencija Atnaujinti - Reikalinga teisė: Skaityti išorinę talpyklą. Programėle be to negali funkcionuoti. + Reikalinga teisė: Skaityti išorinę talpyklą. Programėle be to negali funkcionuoti. Neprivaloma teisė: Gauti dabartinę vietovę, kad būtų pasiūlomos kategorijos Gerai Netoliese Esančios Vietos diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 0880d4568..bf98a723b 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -134,7 +134,7 @@ Нема опис Непозната лиценца Превчитај - Потребна дозвола: Треба да се прочита од надворешен склад. Прилогот не може да работи без ова. + Потребна дозвола: Треба да се прочита од надворешен склад. Прилогот не може да работи без ова. Дозвола по желба: Утврдување на тековната местоположба за предлагање категории ОК Околни места diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml index 95ee21dd4..f304bcc5f 100644 --- a/app/src/main/res/values-mr/strings.xml +++ b/app/src/main/res/values-mr/strings.xml @@ -117,7 +117,7 @@ वर्णन नाही. अनोळखी परवाना ताजेतवाने करा - परवानगी आवश्यक:बाह्य भंडारण वाचन. याशिवाय अॲप काम करू शकत नाही. + परवानगी आवश्यक:बाह्य भंडारण वाचन. याशिवाय अॲप काम करू शकत नाही. ऐच्छिक परवानगी:वर्ग सुचवण्यांसाठी सध्याचे स्थान मिळवा ठीक आहे जवळपासची स्थाने diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 4ba52837d..23c0b5eca 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -134,7 +134,7 @@ Ingen beskrivelse Ukjent lisens Gjenoppfrisk - Nødvendig tillatelse: Lese ekstern lagring. Appen virker ikke uten dette. + Nødvendig tillatelse: Lese ekstern lagring. Appen virker ikke uten dette. Valgfri tillatelse: Hent nåværende posisjon for kategoriforslag OK Plasser i nærheten diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d948203aa..71476554e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -129,7 +129,7 @@ Geen beschrijving Onbekende licentie Vernieuwen - Benodigde toestemming: Lees externe opslag. Zonder deze toestemming kan de app niet functioneren. + Benodigde toestemming: Lees externe opslag. Zonder deze toestemming kan de app niet functioneren. Optionele toestemming: Huidige locatie ophalen voor categoriesuggesties OK Plaatsen in de buurt diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ac4298055..fe9f1ca5f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -133,7 +133,7 @@ Brak opisu Nieznana licencja Odśwież - Wymagane uprawnienia: odczyt z dysku zewnętrznego. Aplikacja nie będzie w stanie funkcjonować bez tego. + Wymagane uprawnienia: odczyt z dysku zewnętrznego. Aplikacja nie będzie w stanie funkcjonować bez tego. Opcjonalne zezwolenie: uzyskiwanie bieżącej lokalizacji dla wygenerowania propozycji kategorii OK Pobliskie miejsca diff --git a/app/src/main/res/values-pms/strings.xml b/app/src/main/res/values-pms/strings.xml index 5eefdacc6..ea217028b 100644 --- a/app/src/main/res/values-pms/strings.xml +++ b/app/src/main/res/values-pms/strings.xml @@ -134,7 +134,7 @@ Gnun-a descrission Licensa sconossùa Rinfrësché - Autorisassion necessaria: Lese n\'anmagasinament estern. L\'aplicassion a peul pa marcé sensa lòn. + Autorisassion necessaria: Lese n\'anmagasinament estern. L\'aplicassion a peul pa marcé sensa lòn. Autorisassion facoltativa: Oten-e la posission atual për dij sugeriment ëd categorìa Va bin Pòst davzin diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 9ccaff78c..7192a8f42 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -134,7 +134,7 @@ Sem descrição Licença desconhecida Atualizar - Permissão necessária: Ler armazenamento externo. O aplicativo não pode funcionar sem isso. + Permissão necessária: Ler armazenamento externo. O aplicativo não pode funcionar sem isso. Permissão opcional: Obter a localização atual de sugestões de categoria OK Lugares próximos diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c089ef77e..a2d790b68 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -137,7 +137,7 @@ Нет описания Неизвестная лицензия Обновить - Требуемые разрешения: чтение с внешнего накопителя. Приложение не сможет функционировать без этого. + Требуемые разрешения: чтение с внешнего накопителя. Приложение не сможет функционировать без этого. Необязательное разрешение: получение текущего местоположения для предложения категорий OK Места поблизости diff --git a/app/src/main/res/values-sd/strings.xml b/app/src/main/res/values-sd/strings.xml index cffebc509..c2fe324e8 100644 --- a/app/src/main/res/values-sd/strings.xml +++ b/app/src/main/res/values-sd/strings.xml @@ -128,7 +128,7 @@ ڪا تشريح ناھي اڻڄاتل لائسنس تازو ڪريو - گھربل اجازت: خارجي اسٽوريج پڙھڻ. ايپ ھن کانسواءِ فنڪشن نٿي ڪري سگھي. + گھربل اجازت: خارجي اسٽوريج پڙھڻ. ايپ ھن کانسواءِ فنڪشن نٿي ڪري سگھي. چونڊ اجازت: زمرن جي تجويزن لاءِ ھاڻوڪي مڪانيت وٺو ٺيڪ ويجھڙائيءَ ۾ جڳھون diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 708596b8b..c3903c613 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -133,7 +133,7 @@ Нема описа Непозната лиценца Освежи - Потребна дозвола: Провера спољашње меморије. Апликација без овога не може да функционише. + Потребна дозвола: Провера спољашње меморије. Апликација без овога не може да функционише. Опциона дозвола: Преузми тренутну локацију за предлоге категорија У реду Места у близини diff --git a/app/src/main/res/values-su/strings.xml b/app/src/main/res/values-su/strings.xml index 7b399043c..403342be1 100644 --- a/app/src/main/res/values-su/strings.xml +++ b/app/src/main/res/values-su/strings.xml @@ -134,7 +134,7 @@ Tanpa pedaran Lisénsi teu dipikanyaho Segerkeun - Merlukeun widi: Baca simpenan éksternal. Aplikasi teu bisa jalan tanpa ieu. + Merlukeun widi: Baca simpenan éksternal. Aplikasi teu bisa jalan tanpa ieu. Idin pilihan: Paké lokasi kiwari pikeun usulan kategori Oké Tempat Sabudeureun diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a92418bc4..72ad5974f 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -134,7 +134,7 @@ Ingen beskrivning Okänd licens Uppdatera - Nödvändig behörighet: Läsa extern lagring. Appen fungerar inte utan detta. + Nödvändig behörighet: Läsa extern lagring. Appen fungerar inte utan detta. Valfri behörighet: Hämta aktuell plats för kategoriförslag OK Platser i närheten diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 679703b80..880638298 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -142,7 +142,7 @@ Немає опису Невідома ліцензія Оновити - Обов\'язковий дозвіл: читання зовнішньої пам\'яті. Програмка не може працювати без цього. + Обов\'язковий дозвіл: читання зовнішньої пам\'яті. Програмка не може працювати без цього. Додатковий дозвіл: отримувати поточне розташування для підказок категорій Гаразд Місця поблизу diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 38f6d3987..0da4bf00d 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -124,7 +124,7 @@ Không miêu tả Giấy phép không rõ Làm tươi - Yêu cầu cấp phép: Đọc thiết bị lưu trữ bên ngoài. Ứng dụng cần được phép đọc thiết bị lưu trữ bên ngoài để hoạt động. + Yêu cầu cấp phép: Đọc thiết bị lưu trữ bên ngoài. Ứng dụng cần được phép đọc thiết bị lưu trữ bên ngoài để hoạt động. Tùy chọn cấp phép: Định vị hiện tại để nhận gợi ý thể loại OK Nơi Lân cận diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index bb8debaec..9411f903b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -134,7 +134,7 @@ 無說明 不明授權 重新整理 - 必要權限：讀取外部存儲裝置。應用程式必須此功能，才能進行正確運作。 + 必要權限：讀取外部存儲裝置。應用程式必須此功能，才能進行正確運作。 可有可無的權限：獲取目前的地理位置，以用於分類建議 好 附近地點 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 2ab5ad140..f00c24aff 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -134,7 +134,7 @@ 没有说明 未知许可协议 刷新 - 需要权限：读取外部存储。应用不能在没有它的情况下运行。 + 需要权限：读取外部存储。应用不能在没有它的情况下运行。 可选权限：获取当前位置以提供分类建议 确定 附近地点 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c24891222..d9a5d19d2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -139,7 +139,8 @@ Tap this message (or hit back) to skip this step. No description Unknown license Refresh - Required permission: Read external storage. App cannot function without this. + Required permission: Read external storage. App cannot function without this. + Required permission: Write external storage. App cannot function without this. Optional permission: Get current location for category suggestions OK Nearby Places @@ -203,5 +204,6 @@ Tap this message (or hit back) to skip this step. Error while caching pictures A unique descriptive title for the file, which will serve as a filename. You may use plain language with spaces. Do not include the file extension Please describe the media as much as possible: Where was it taken? What does it show? What is the context? Please describe the objects or persons. Reveal information that can not be easily guessed, for instance the time of day if it is a landscape. If the media shows something unusual, please explain what makes it unusual. - + Use external storage + Save pictures taken with the in-app camera on your device diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 6f105836e..fab5c93e7 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -46,4 +46,11 @@ android:maxLength="3" /> + + \ No newline at end of file