Merge remote-tracking branch 'refs/remotes/commons-app/upload-overhaul' into upload-overhaul-fork

This commit is contained in:
misaochan 2018-05-15 19:31:57 +10:00
commit cd2a3b345d
31 changed files with 344 additions and 50 deletions

View file

@ -1,6 +1,7 @@
package fr.free.nrw.commons.location;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
@ -10,9 +11,10 @@ import android.location.LocationManager;
import android.os.Bundle;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.util.Log;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import timber.log.Timber;
@ -29,6 +31,7 @@ public class LocationServiceManager implements LocationListener {
private Location lastLocation;
private final List<LocationUpdateListener> locationListeners = new CopyOnWriteArrayList<>();
private boolean isLocationManagerRegistered = false;
private Set<Activity> locationExplanationDisplayed = new HashSet<>();
/**
* Constructs a new instance of LocationServiceManager.
@ -51,7 +54,6 @@ public class LocationServiceManager implements LocationListener {
/**
* Returns whether the location permission is granted.
*
* @return true if the location permission is granted
*/
public boolean isLocationPermissionGranted() {
@ -73,10 +75,23 @@ public class LocationServiceManager implements LocationListener {
LOCATION_REQUEST);
}
/**
* The permission explanation dialog box is now displayed just once for a particular activity. We are subscribing
* to updates from multiple providers so its important to show the dialog just once. Otherwise it will be displayed
* once for every provider, which in our case currently is 2.
* @param activity
* @return
*/
public boolean isPermissionExplanationRequired(Activity activity) {
return !activity.isFinishing() &&
ActivityCompat.shouldShowRequestPermissionRationale(activity,
Manifest.permission.ACCESS_FINE_LOCATION);
if (activity.isFinishing()) {
return false;
}
boolean showRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.ACCESS_FINE_LOCATION);
if (showRequestPermissionRationale && !locationExplanationDisplayed.contains(activity)) {
locationExplanationDisplayed.add(activity);
return true;
}
return false;
}
/**
@ -84,8 +99,9 @@ public class LocationServiceManager implements LocationListener {
* (e.g. when Location permission just granted)
* @return last known LatLng
*/
@SuppressLint("MissingPermission")
public LatLng getLKL() {
if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
if (isLocationPermissionGranted()) {
Location lastKL = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
if (lastKL == null) {
lastKL = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
@ -107,10 +123,11 @@ public class LocationServiceManager implements LocationListener {
* Registers a LocationManager to listen for current location.
*/
public void registerLocationManager() {
if (!isLocationManagerRegistered)
if (!isLocationManagerRegistered) {
isLocationManagerRegistered = requestLocationUpdatesFromProvider(LocationManager.NETWORK_PROVIDER)
&& requestLocationUpdatesFromProvider(LocationManager.GPS_PROVIDER);
}
}
/**
* Requests location updates from the specified provider.
@ -142,7 +159,7 @@ public class LocationServiceManager implements LocationListener {
* @return LOCATION_SIGNIFICANTLY_CHANGED if location changed significantly
* LOCATION_SLIGHTLY_CHANGED if location changed slightly
*/
protected LocationChangeType isBetterLocation(Location location, Location currentBestLocation) {
private LocationChangeType isBetterLocation(Location location, Location currentBestLocation) {
if (currentBestLocation == null) {
// A new location is always better than no location

View file

@ -16,6 +16,7 @@ import android.support.design.widget.BottomSheetBehavior;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@ -23,9 +24,14 @@ import android.view.View;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.Toast;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import io.reactivex.functions.Consumer;
import java.io.IOException;
import java.net.ConnectException;
import java.net.UnknownHostException;
import java.util.List;
import javax.inject.Inject;
@ -316,7 +322,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
protected void onStart() {
super.onStart();
locationManager.addLocationListener(this);
locationManager.registerLocationManager();
registerLocationUpdates();
}
@Override
@ -394,7 +400,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
return;
}
locationManager.registerLocationManager();
registerLocationUpdates();
LatLng lastLocation = locationManager.getLastLocation();
if (curLatLng != null && curLatLng.equals(lastLocation)) { //refresh view only if location has changed
@ -427,8 +433,14 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
.loadAttractionsFromLocation(curLatLng))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(this::populatePlaces);
} else if (locationChangeType.equals(LocationServiceManager.LocationChangeType.LOCATION_SLIGHTLY_CHANGED)) {
.subscribe(this::populatePlaces,
throwable -> {
Timber.d(throwable);
showErrorMessage(getString(R.string.error_fetching_nearby_places));
progressBar.setVisibility(View.GONE);
});
} else if (locationChangeType
.equals(LocationServiceManager.LocationChangeType.LOCATION_SLIGHTLY_CHANGED)) {
Gson gson = new GsonBuilder()
.registerTypeAdapter(Uri.class, new UriSerializer())
.create();
@ -438,6 +450,39 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
}
}
/**
* This method first checks if the location permissions has been granted and then register the location manager for updates.
*/
private void registerLocationUpdates() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (locationManager.isLocationPermissionGranted()) {
locationManager.registerLocationManager();
} else {
// Should we show an explanation?
if (locationManager.isPermissionExplanationRequired(this)) {
new AlertDialog.Builder(this)
.setMessage(getString(R.string.location_permission_rationale_nearby))
.setPositiveButton("OK", (dialog, which) -> {
requestLocationPermissions();
dialog.dismiss();
})
.setNegativeButton("Cancel", (dialog, id) -> {
showLocationPermissionDeniedErrorDialog();
dialog.cancel();
})
.create()
.show();
} else {
// No explanation needed, we can request the permission.
requestLocationPermissions();
}
}
} else {
locationManager.registerLocationManager();
}
}
private void populatePlaces(NearbyController.NearbyPlacesInfo nearbyPlacesInfo) {
List<Place> placeList = nearbyPlacesInfo.placeList;
LatLng[] boundaryCoordinates = nearbyPlacesInfo.boundaryCoordinates;
@ -518,7 +563,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
locationManager.removeLocationListener(this);
} else {
lockNearbyView = false;
locationManager.registerLocationManager();
registerLocationUpdates();
locationManager.addLocationListener(this);
}
}
@ -580,7 +625,12 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
.loadAttractionsFromLocation(curLatLng))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(this::populatePlaces);
.subscribe(this::populatePlaces,
throwable -> {
Timber.d(throwable);
showErrorMessage(getString(R.string.error_fetching_nearby_places));
progressBar.setVisibility(View.GONE);
});
nearbyMapFragment.setBundleForUpdtes(bundle);
nearbyMapFragment.updateMapSignificantly();
updateListFragment();
@ -646,4 +696,8 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
public void prepareViewsForSheetPosition(int bottomSheetState) {
// TODO
}
private void showErrorMessage(String message) {
ViewUtil.showLongToast(NearbyActivity.this, message);
}
}

View file

@ -7,6 +7,7 @@ import android.support.graphics.drawable.VectorDrawableCompat;
import com.mapbox.mapboxsdk.annotations.IconFactory;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@ -44,7 +45,7 @@ public class NearbyController {
* @return NearbyPlacesInfo a variable holds Place list without distance information
* and boundary coordinates of current Place List
*/
public NearbyPlacesInfo loadAttractionsFromLocation(LatLng curLatLng) {
public NearbyPlacesInfo loadAttractionsFromLocation(LatLng curLatLng) throws IOException {
Timber.d("Loading attractions near %s", curLatLng);
NearbyPlacesInfo nearbyPlacesInfo = new NearbyPlacesInfo();

View file

@ -40,10 +40,9 @@ public class NearbyPlaces {
}
}
List<Place> getFromWikidataQuery(LatLng curLatLng, String lang) {
List<Place> getFromWikidataQuery(LatLng curLatLng, String lang) throws IOException {
List<Place> places = Collections.emptyList();
try {
// increase the radius gradually to find a satisfactory number of nearby places
while (radius <= MAX_RADIUS) {
places = getFromWikidataQuery(curLatLng, lang, radius);
@ -54,13 +53,6 @@ public class NearbyPlaces {
radius *= RADIUS_MULTIPLIER;
}
}
} catch (IOException e) {
Timber.d(e.toString());
// errors tend to be caused by too many results (and time out)
// try a small radius next time
Timber.d("back to initial radius: %f", radius);
radius = INITIAL_RADIUS;
}
// make sure we will be able to send at least one request next time
if (radius > MAX_RADIUS) {
radius = MAX_RADIUS;

View file

@ -145,4 +145,5 @@
<string name="notifications_welcome">مرحبا بكم في ويكيمديا كومنز، %1$s! نحن سعداء لأنك هنا.</string>
<string name="notifications_talk_page_message">%1$s رسالة على صفحة الحديث</string>
<string name="notifications_mention">%1$s ذكر لك على %2$s.</string>
<string name="share_app_title">شارك التطبيق</string>
</resources>

View file

@ -259,4 +259,8 @@
<string name="internet_established">ইন্টারনেট উপলব্ধ</string>
<string name="no_notifications">কোন বিজ্ঞপ্তি পাওয়া যায়নি</string>
<string name="retry">পুনঃচেষ্টা করুন</string>
<string name="showcase_view_got_it_button">বুঝেছি!</string>
<string name="no_images_found">কোন চিত্র পাওয়া যায়নি!</string>
<string name="image_uploaded_by">আপলোড করেছেন: %1$s</string>
<string name="error_fetching_nearby_places">কাছাকাছি স্থানগুলি আনতে ত্রুটি।</string>
</resources>

View file

@ -269,5 +269,14 @@
<string name="about_translate_proceed">Fortfahren</string>
<string name="about_translate_cancel">Abbrechen</string>
<string name="retry">Erneut versuchen</string>
<string name="showcase_view_got_it_button">Verstanden!</string>
<string name="showcase_view_whole_nearby_activity">Dies sind die Orte in deiner Nähe, die Bilder zur Illustration ihrer Wikipedia-Artikel benötigen.</string>
<string name="showcase_view_list_icon">Das Antippen dieser Schaltfläche zeigt eine Liste mit diesen Orten</string>
<string name="showcase_view_plus_fab">Du kannst ein Bild für einen beliebigen Ort von deiner Galerie oder Kamera hochladen</string>
<string name="no_images_found">Keine Bilder gefunden!</string>
<string name="error_loading_images">Beim Laden der Bilder ist ein Fehler aufgetreten.</string>
<string name="image_uploaded_by">Hochgeladen von: %1$s</string>
<string name="share_app_title">App teilen</string>
<string name="share_coordinates_not_present">Während der Bildauswahl wurden keine Koordinaten angegeben</string>
<string name="error_fetching_nearby_places">Fehler beim Abrufen der Orte in der Nähe.</string>
</resources>

View file

@ -9,11 +9,15 @@
* Mirzali
-->
<resources>
<string name="preference_category_appearance">Asayış</string>
<string name="preference_category_general">Bıngeh</string>
<string name="preference_category_location">Lokasyon</string>
<string name="app_name">Commons</string>
<string name="menu_settings">Eyari</string>
<string name="username">Namey karberi</string>
<string name="password">Parola</string>
<string name="login">Cı kewe</string>
<string name="forgot_password">Parola, xo vira kerde?</string>
<string name="signup">Qeyd be</string>
<string name="logging_in_title">Cıkewtış</string>
<string name="logging_in_message">Kerem kerên, bıpawên...</string>
@ -58,6 +62,8 @@
<string name="menu_upload_single">Bar ke</string>
<string name="categories_search_text_hint">Kategoriyan dı cı geyr</string>
<string name="menu_save_categories">Star ke</string>
<string name="refresh_button">Newe ke</string>
<string name="display_list_button">Liste</string>
<plurals name="contributions_subtitle">
<item quantity="zero">\@string/contributions_subtitle_zero</item>
<item quantity="one">Yew barbiyayış</item>
@ -129,5 +135,7 @@
<string name="navigation_item_home">Keye</string>
<string name="navigation_item_upload">Bar ke</string>
<string name="navigation_item_logout">Veciyayış</string>
<string name="about_translate_cancel">Bıtexelne</string>
<string name="retry">Anciya bıcerrebne</string>
<string name="showcase_view_got_it_button">Mı fehm kerd!</string>
</resources>

View file

@ -273,5 +273,14 @@
<string name="about_translate_proceed">Συνέχεια</string>
<string name="about_translate_cancel">Ακύρωση</string>
<string name="retry">Ξαναπροσπαθήστε</string>
<string name="showcase_view_got_it_button">Κατάλαβα!</string>
<string name="showcase_view_whole_nearby_activity">Αυτά είναι τα μέρη κοντά σας που χρειάζονται φωτογραφίες για να εικονογραφηθούν τα λήμματά τους στη Βικιπαίδεια</string>
<string name="showcase_view_list_icon">Πατώντας αυτό το κουμπί φέρνει μια λίστα αυτών των μερών</string>
<string name="showcase_view_plus_fab">Μπορείτε να ανεβάσετε μια εικόνα για οποιοδήποτε μέρος από την γκαλερί ή την κάμερά σας</string>
<string name="no_images_found">Δεν βρέθηκαν εικόνες!</string>
<string name="error_loading_images">Συνέβη σφάλμα κατά το ανέβασμα των εικόνων.</string>
<string name="image_uploaded_by">Ανέβηκε από: %1$s</string>
<string name="share_app_title">Κοινοποίηση εφαρμογής</string>
<string name="share_coordinates_not_present">Οι συντεταγμένες δεν ορίστηκαν κατά την διάρκεια της επιλογής εικόνας</string>
<string name="error_fetching_nearby_places">Σφάλμα κατά την εύρεση κοντινών μερών.</string>
</resources>

View file

@ -267,4 +267,13 @@
<string name="about_translate_message">Selecciona el idioma en que quieres enviar traducciones</string>
<string name="about_translate_cancel">Cancelar</string>
<string name="retry">Reintentar</string>
<string name="showcase_view_got_it_button">Entendido</string>
<string name="showcase_view_whole_nearby_activity">Estos sitios cercanos a ti necesitan imágenes para ilustrar sus artículos de Wikipedia</string>
<string name="showcase_view_plus_fab">Puedes cargar una imagen para cualquier sitio desde la galería o la cámara</string>
<string name="no_images_found">No se encontró ninguna imagen.</string>
<string name="error_loading_images">Se produjo un error al cargar las imágenes.</string>
<string name="image_uploaded_by">Cargada por: %1$s</string>
<string name="share_app_title">Compartir aplicación</string>
<string name="share_coordinates_not_present">No se especificaron las coordenadas al seleccionar la imagen</string>
<string name="error_fetching_nearby_places">Error al recuperar los lugares cercanos.</string>
</resources>

View file

@ -8,11 +8,17 @@
* Theklan
-->
<resources>
<string name="preference_category_appearance">Itxura</string>
<string name="preference_category_general">Orokorra</string>
<string name="preference_category_feedback">Feedback</string>
<string name="preference_category_location">Kokapena</string>
<string name="app_name">Commons</string>
<string name="bullet"></string>
<string name="menu_settings">Hobespenak</string>
<string name="username">Erabiltzaile izena</string>
<string name="password">Pasahitza</string>
<string name="login">Saioa hasi</string>
<string name="forgot_password">Pasahitza ahaztu duzu?</string>
<string name="signup">Eman izena</string>
<string name="logging_in_title">Saioa hasten</string>
<string name="logging_in_message">Mesedez itxaron…</string>
@ -54,22 +60,23 @@
<string name="categories_search_text_hint">Kategoriak bilatu</string>
<string name="menu_save_categories">Gorde</string>
<string name="refresh_button">Eguneratu</string>
<string name="display_list_button">Zerrenda</string>
<string name="enable_gps">GPSa gaitu</string>
<string name="contributions_subtitle_zero">Oraindik ez da ezer igo</string>
<plurals name="contributions_subtitle" fuzzy="true">
<item quantity="zero">Oraindik igoerarik ez</item>
<plurals name="contributions_subtitle">
<item quantity="zero">\@string/contributions_subtitle_zero</item>
<item quantity="one">igoera 1</item>
<item quantity="other">%1$d igoera</item>
</plurals>
<string name="categories_not_found">Ez da kategoriak aukritu %1$s izenarekin</string>
<string name="categories_skip_explanation" fuzzy="true">Gehitu kategoriak zure argazkiak Wikimedia Commonsen aurkitzen errazagoak izan daitezen.</string>
<string name="categories_skip_explanation">Gehitu kategoriak zure argazkiak Wikimedia Commonsen aurkitzen errazagoak izan daitezen.\nHasi idazten kategoriak gehitzeko.</string>
<string name="categories_activity_title">Kategoriak</string>
<string name="title_activity_settings">Hobespenak</string>
<string name="title_activity_signup">Eman izena</string>
<string name="menu_about">Honi buruz</string>
<string name="about_license" fuzzy="true">Open Source softwarea &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache v2 Lizentziaren&lt;/a&gt; pean egina. Wikimedia Commons eta bere logoa Wikimedia Fundazioaren marka erregistratuak dira eta Wikimedia Fundazioaren baimenarekin erabiltzen dira. Ez gaude Wikimedia Fundaziora afiliatuta.</string>
<string name="about_improve" fuzzy="true">GitHub-eko &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Iturria&lt;/a&gt; eta &lt;a href=\"https://commons-app.github.io/\"&gt;webgunea&lt;/a&gt;. &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-eko gai&lt;/a&gt; berria sortu erroreen berri emateko.</string>
<string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Pribatutasun politika&lt;/a&gt;</string>
<string name="about_privacy_policy">&lt;u&gt;Pribatutasun politika&lt;/u&gt;</string>
<string name="title_activity_about">Honi buruz</string>
<string name="menu_feedback">Bidali zure iritzia (e-posta bidez)</string>
<string name="no_email_client">Posta bezerorik ez da instalatu</string>
@ -81,7 +88,7 @@
<string name="share_license_summary">Irudi hau %1$s lizentziapean egongo da</string>
<string name="media_upload_policy">Irudi hau bidaltzen, nire lan propioa dela aitortzen dut, copyrighta duten materiala edo selfiak ez duela, eta beste motatakoak &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Ohikoaren arauak&lt;/a&gt;</string>
<string name="menu_download">Jaitsi</string>
<string name="preference_license" fuzzy="true">Lizentzia</string>
<string name="preference_license">Berezko lizentzia</string>
<string name="use_previous">Aurreko izenburu/deskribapena erabili</string>
<string name="allow_gps">Oraingo kokapena automatikoki lortu</string>
<string name="preference_theme">Gau modua</string>

View file

@ -5,6 +5,7 @@
* Happy13241
* Jean-Frédéric
* KATRINE1992
* Melissadeba95
* Metroitendo
* Nicolas Raoul
* Orikrin1998
@ -279,5 +280,14 @@
<string name="about_translate_proceed">Continuer</string>
<string name="about_translate_cancel">Annuler</string>
<string name="retry">Réessayer</string>
<string name="showcase_view_got_it_button">Cest bon!</string>
<string name="showcase_view_whole_nearby_activity">Il y a des lieux autour de vous qui demandent des images pour illustrer leurs articles Wikipédia</string>
<string name="showcase_view_list_icon">En cliquant sur ce bouton vous afficherez une liste de ces endroits</string>
<string name="showcase_view_plus_fab">Vous pouvez téléverser une photo de n\'importe quel endroit de votre gallerie ou de votre appareil photo</string>
<string name="no_images_found">Aucune images trouvée.</string>
<string name="error_loading_images">Une erreur s\'est produite pendant le chargement des images.</string>
<string name="image_uploaded_by">Importé par:%1$s</string>
<string name="share_app_title">Partager les applications</string>
<string name="share_coordinates_not_present">Les coordonnées n\'ont pas été spécifiées pendant la sélection de l\'image</string>
<string name="error_fetching_nearby_places">Erreur durant l\'exploration du voisinage.</string>
</resources>

View file

@ -223,4 +223,11 @@
<string name="about_translate_title">Lingue</string>
<string name="about_translate_cancel">Annulla</string>
<string name="retry">Riprova</string>
<string name="showcase_view_got_it_button">Capito!</string>
<string name="showcase_view_whole_nearby_activity">Questi sono i luoghi vicino a te che necessitano di immagini per illustrare le loro voci di Wikipedia</string>
<string name="showcase_view_plus_fab">Puoi caricare un\'immagine per ogni luogo dalla tua galleria o fotocamera</string>
<string name="no_images_found">Nessuna immagine trovata!</string>
<string name="error_loading_images">Si è verificato un errore durante il caricamento delle immagini.</string>
<string name="image_uploaded_by">Caricato da: %1$s</string>
<string name="share_app_title">Condividi applicazione</string>
</resources>

View file

@ -273,5 +273,14 @@
<string name="about_translate_proceed">המשך</string>
<string name="about_translate_cancel">ביטול</string>
<string name="retry">לנסות שוב</string>
<string name="showcase_view_got_it_button">הבנתי!</string>
<string name="showcase_view_whole_nearby_activity">אלה המקומות בסביבתך שזקוקים לתמונות כדי להמחיש את הערכים שלהם בוויקיפדיה</string>
<string name="showcase_view_list_icon">ניתן ללחוץ על כפתור זה כדי להציג רשימה של המקומות האלה</string>
<string name="showcase_view_plus_fab">באפשרותך להעלות תמונה של כל מקום מהגלריה או מהמצלמה שלך</string>
<string name="no_images_found">לא נמצאו תמונות!</string>
<string name="error_loading_images">אירעה שגיאה בטעינת התמונות.</string>
<string name="image_uploaded_by">הועלתה על־ידי: %1$s</string>
<string name="share_app_title">שיתוף היישום</string>
<string name="share_coordinates_not_present">לא צוינו קואורדינטות בעת בחירת התמונה</string>
<string name="error_fetching_nearby_places">שגיאה באחזור המקומות בסביבתך.</string>
</resources>

View file

@ -12,13 +12,18 @@
* Yusuke1109
-->
<resources>
<string name="preference_category_appearance">表示</string>
<string name="preference_category_general">全般</string>
<string name="preference_category_feedback">フィードバック</string>
<string name="preference_category_location">場所</string>
<string name="app_name">コモンズ</string>
<string name="bullet"></string>
<string name="menu_settings">設定</string>
<string name="username">利用者名</string>
<string name="password">パスワード</string>
<string name="login_credential">コモンズのベータ版アカウントにログイン</string>
<string name="login">ログイン</string>
<string name="forgot_password">パスワードを忘れた場合</string>
<string name="signup">利用者登録</string>
<string name="logging_in_title">ログイン中</string>
<string name="logging_in_message">お待ちください…</string>
@ -49,6 +54,7 @@
<string name="menu_share">共有</string>
<string name="menu_open_in_browser">ブラウザーで表示</string>
<string name="share_title_hint">タイトル</string>
<string name="add_title_toast">ファイル名をつけてください</string>
<string name="share_description_hint">説明</string>
<string name="login_failed_network">ログインできません - ネットワークのエラーです</string>
<string name="login_failed_username">ログインできません - 利用者名を確認してください</string>
@ -64,6 +70,7 @@
<string name="categories_search_text_hint">カテゴリを検索</string>
<string name="menu_save_categories">保存</string>
<string name="refresh_button">更新</string>
<string name="display_list_button">一覧</string>
<string name="gps_disabled">お使いのデバイスではGPSが無効になっています。有効にしますか?</string>
<string name="enable_gps">GPSを有効にする</string>
<string name="contributions_subtitle_zero">まだ何もアップロードされていません。</string>
@ -82,6 +89,7 @@
<string name="categories_activity_title">カテゴリ</string>
<string name="title_activity_settings">設定</string>
<string name="title_activity_signup">利用者登録</string>
<string name="title_activity_featured_images">秀逸な画像</string>
<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>
@ -96,6 +104,7 @@
<string name="menu_retry_upload">再試行</string>
<string name="menu_cancel_upload">キャンセル</string>
<string name="share_license_summary">この画像が %1$s ライセンスでアップロードされます。</string>
<string name="media_upload_policy">この画像の投稿に当たり、私はこれが自分自身の作品であり、著作権のあるコンテンツや自撮りは含まれていないと宣言します。</string>
<string name="menu_download">ダウンロード</string>
<string name="preference_license">既定のライセンス</string>
<string name="use_previous">前回のタイトルと記述を使用</string>
@ -126,11 +135,19 @@
<string name="tutorial_1_text">ウィキメディア・コモンズにはウィキペディアで使用する画像のほぼすべてが保管されています。</string>
<string name="tutorial_1_subtext">あなたの画像は世界中の人々が学習する助けになります!</string>
<string name="tutorial_2_text">アップロードする画像はあなたご本人が撮影したものかあなたが単独で制作したものに限定します。</string>
<string name="tutorial_2_subtext" fuzzy="true">- 自然物 (動植物、山)\n- 道具 (自転車、駅)\n- 著名人 (市区村長・都道府県知事、自分が会ったオリンピック選手)</string>
<string name="tutorial_2_subtext">自然物 (動植物、山)\n• 道具 (自転車、駅)\n• 著名人 (市区村長・都道府県知事、自分が会ったオリンピック選手)</string>
<string name="tutorial_2_subtext_1">自然物 (動植物、山)</string>
<string name="tutorial_2_subtext_2">道具 (自転車、駅)</string>
<string name="tutorial_2_subtext_3">著名人 (市区村長・都道府県知事、自分が会ったオリンピック選手)</string>
<string name="tutorial_3_text">アップロードが《禁止》のもの:</string>
<string name="tutorial_3_subtext">- あなたの友人の自撮り写真や画像\n- インターネットからダウンロードした画像\n- 著作権のあるアプリのスクリーンショット</string>
<string name="tutorial_3_subtext_1">自撮りもしくは友達を撮影した写真</string>
<string name="tutorial_3_subtext_2">ウェブからダウンロードした画像</string>
<string name="tutorial_3_subtext_3">独自のアプリケーションのスクリーンショット</string>
<string name="tutorial_4_text">アップロードの例:</string>
<string name="tutorial_4_subtext">- 題名: シドニー・オペラハウス\n- 説明: 湾の向こうから見たシドニー・オペラハウス\n- カテゴリ: 西側から見たシドニー・オペラハウス、遠くから見たシドニー・オペラハウス</string>
<string name="tutorial_4_subtext_1">題名: シドニーのオペラハウス</string>
<string name="tutorial_4_subtext_2">説明: シドニーのオペラハウス。湾を挟んで撮影。</string>
<string name="welcome_wikipedia_text">画像を投稿してください。ウィキペディアの記事に彩りを!</string>
<string name="welcome_wikipedia_subtext">ウィキペディアの画像はウィキメディア・コモンズに保管されています。</string>
<string name="welcome_copyright_text">あなたの画像は世界中の人々が学習する助けになります</string>
@ -143,11 +160,11 @@
<string name="detail_description_empty">説明はありません。</string>
<string name="detail_license_empty">不明なライセンス</string>
<string name="menu_refresh">更新</string>
<string name="read_storage_permission_rationale" fuzzy="true">必要な権限:外部ストレージを読み込みます。これがなければアプリは機能しません。</string>
<string name="write_storage_permission_rationale" fuzzy="true">必要な権限:外部ストレージを作成します。これがなければアプリは機能しません。</string>
<string name="location_permission_rationale">オプションの権限:カテゴリ候補の現在の位置を取得する</string>
<string name="read_storage_permission_rationale">必要な権限:外部ストレージを読み込みます。これがなければアプリはギャラリーを開けません。</string>
<string name="write_storage_permission_rationale">必要な権限:外部ストレージに入力します。これがないとアプリはカメラにアクセスできません。</string>
<string name="location_permission_rationale">オプションの権限:カテゴリ候補のため現在の位置を取得する</string>
<string name="ok">承認</string>
<string name="title_activity_nearby">周りの場所</string>
<string name="title_activity_nearby">近くの場所</string>
<string name="no_nearby">付近の場所が見つかりません</string>
<string name="warning">警告</string>
<string name="file_exists">このファイルが既にコモンズにあります。本当にアップロードしますか?</string>
@ -158,6 +175,7 @@
<string name="media_detail_description">記述</string>
<string name="media_detail_description_explanation">ここにメディアの説明が入ります。かなり長文になる場合には数行にわたることがあります。それでも見栄えがよいと願っています。</string>
<string name="media_detail_author">作者</string>
<string name="media_detail_author_explanation">秀逸な画像の作者名を記入します。</string>
<string name="media_detail_uploaded_date">アップロード日時</string>
<string name="media_detail_license">ライセンス</string>
<string name="media_detail_coordinates">緯度経度</string>
@ -174,14 +192,19 @@
<string name="commons_logo">コモンズの商標</string>
<string name="commons_website">コモンズのウェブサイト</string>
<string name="commons_facebook">コモンズのフェイスブックページ</string>
<string name="commons_github">コモンズのGithubソースコード</string>
<string name="background_image">背景画像</string>
<string name="mediaimage_failed">メディアイメージが失敗しました</string>
<string name="no_image_found">画像がありません</string>
<string name="upload_image">画像をアップロード</string>
<string name="welcome_image_mount_zao">蔵王連峰</string>
<string name="welcome_image_llamas">リャマ</string>
<string name="welcome_image_rainbow_bridge">レインボーブリッジ</string>
<string name="welcome_image_tulip">チューリップ</string>
<string name="welcome_image_no_selfies">自撮りはアップロードできません</string>
<string name="welcome_image_proprietary">独自の著作権がある画像</string>
<string name="welcome_image_welcome_wikipedia">ウィキペディアへようこそ</string>
<string name="welcome_image_welcome_copyright">著作権について</string>
<string name="welcome_image_sydney_opera_house">シドニーオペラハウス</string>
<string name="cancel">キャンセル</string>
<string name="navigation_drawer_open">開く</string>
@ -195,28 +218,62 @@
<string name="navigation_item_logout">ログアウト</string>
<string name="navigation_item_info">チュートリアル</string>
<string name="navigation_item_notification">通知</string>
<string name="nearby_needs_permissions">場所の権限がないと、近くの場所を表示できません</string>
<string name="navigation_item_featured_images">秀逸</string>
<string name="nearby_needs_permissions">場所の権限がないため、近くの場所を表示できません</string>
<string name="no_description_found">説明がありません</string>
<string name="nearby_info_menu_commons_article">コモンズのファイルページ</string>
<string name="nearby_info_menu_wikidata_article">ウィキデータ項目</string>
<string name="nearby_info_menu_wikipedia_article">ウィキペディアの記事</string>
<string name="error_while_cache">画像をキャッシュする際のエラー</string>
<string name="title_info">ファイル固有の説明的な表題。ファイル名として使われます。平易な言葉を使い、空白を入れることができます。拡張子は含めないでください。</string>
<string name="description_info">可能な限りメディアを説明してください:どこで撮られましたか?それは何を示していますか?文脈とは何ですか?物や人を説明してください。容易に推測できない情報、例えば風景の場合の時刻を明らかにする。メディアに珍しいことがある場合は、何が珍しいのかを説明してください。</string>
<string name="give_permission">権限を取得</string>
<string name="upload_image_too_dark">この画像は暗すぎますがアップロードしますか? ウィキメディア・コモンズは百科事典に適した画像のみ受け付けます。</string>
<string name="upload_image_blurry">ピントが合っていませんが、アップロードしますか? ウィキメディア・コモンズは百科事典に適した画像のみ受け付けます。</string>
<string name="give_permission">権限を付与</string>
<string name="use_external_storage">外部ストレージを使用</string>
<string name="use_external_storage_summary">アプリ内のカメラで撮影した写真を端末に保存する</string>
<string name="login_to_your_account">自分のアカウントにログイン</string>
<string name="send_log_file">ログファイルを送信する</string>
<string name="send_log_file_description">メールで開発者にログファイルを送信する</string>
<string name="no_web_browser">URLを開くブラウザーが見つかりません</string>
<string name="null_url">エラーが発生しました。URL が見つかりません</string>
<string name="nominate_deletion">削除の提案</string>
<string name="nominated_for_deletion">この画像の削除が提案されています。</string>
<string name="view_browser">ブラウザーで表示</string>
<string name="nearby_location_has_not_changed">場所は変更されていません。</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>
<string name="notifications_welcome">ウィキメディアコモンズにようこそ、%1$さん! このサイトへ来てくれてありがとうございます。</string>
<string name="notifications_talk_page_message">%1$さんからアナタのとーくぺ^字にメッセージが届いています</string>
<string name="notifications_thank_you_edit">編集をしてくれてありがとうございます</string>
<string name="notifications_mention">%1$さんが%2$であなたに言及しています。</string>
<string name="toggle_view_button">表示の切り替え</string>
<string name="nearby_directions">道順</string>
<string name="nearby_wikidata">ウィキデータ</string>
<string name="nearby_wikipedia">ウィキペディア</string>
<string name="nearby_commons">コモンズ</string>
<string name="about_rate_us">&lt;u&gt;評価する&lt;/u&gt;</string>
<string name="about_faq">&lt;u&gt;FAQ&lt;/u&gt;</string>
<string name="welcome_skip_button">チュートリアルをスキップする</string>
<string name="no_internet">インターネットに接続していません</string>
<string name="internet_established">インターネットに接続しました</string>
<string name="error_notifications">通知の取得に失敗しました</string>
<string name="no_notifications">通知はありません</string>
<string name="about_translate">&lt;u&gt;翻訳&lt;/u&gt;</string>
<string name="about_translate_title">言語</string>
<string name="about_translate_message">どの言語に編集するか選択</string>
<string name="about_translate_proceed">次へ</string>
<string name="about_translate_cancel">キャンセル</string>
<string name="retry">再試行</string>
<string name="retry">やり直す</string>
<string name="showcase_view_got_it_button">了解</string>
<string name="showcase_view_whole_nearby_activity">近くでウィキペディアの記事に使う写真がない場所はこちら</string>
<string name="showcase_view_list_icon">このボタンをタップするとリストを表示します</string>
<string name="showcase_view_plus_fab">場所の写真をアップロードするには、ギャラリーから選ぶことも撮影することもできます</string>
<string name="no_images_found">画像がありません</string>
<string name="error_loading_images">画像の読み込み中にエラーが発生しました</string>
<string name="image_uploaded_by">アップロードした人: %1$</string>
<string name="share_app_title">アプリをシェアする</string>
<string name="share_coordinates_not_present">画像の選択中に位置情報を特定できませんでした</string>
</resources>

View file

@ -266,5 +266,14 @@
<string name="about_translate_proceed">진행</string>
<string name="about_translate_cancel">취소</string>
<string name="retry">다시 시도</string>
<string name="showcase_view_got_it_button">알겠습니다!</string>
<string name="showcase_view_whole_nearby_activity">이들은 위키백과 글에 사진을 넣을 필요가 있는 당신 주위의 장소들입니다</string>
<string name="showcase_view_list_icon">이 버튼을 탭하면 이 장소들의 목록을 가져옵니다</string>
<string name="showcase_view_plus_fab">갤러리나 카메라 어느 곳이든 사진을 올릴 수 있습니다</string>
<string name="no_images_found">그림이 없습니다!</string>
<string name="error_loading_images">그림을 불러오는 동안 오류가 발생했습니다.</string>
<string name="image_uploaded_by">올린이: %1$s</string>
<string name="share_app_title">앱 공유</string>
<string name="share_coordinates_not_present">그림 선택 중에 좌표가 지정되지 않았습니다</string>
<string name="error_fetching_nearby_places">주변 장소를 가져오는데 오류가 있습니다.</string>
</resources>

View file

@ -240,4 +240,8 @@
<string name="about_translate_proceed">Virufueren</string>
<string name="about_translate_cancel">Ofbriechen</string>
<string name="retry">Nach eng Kéier probéieren</string>
<string name="showcase_view_got_it_button">Verstanen!</string>
<string name="no_images_found">Keng Biller fonnt!</string>
<string name="error_loading_images">Feeler beim Eropluede vu Biller.</string>
<string name="image_uploaded_by">Eropgeluede vum: %1$s</string>
</resources>

View file

@ -109,4 +109,5 @@
<string name="about_translate_title">Valodas</string>
<string name="about_translate_proceed">Turpināt</string>
<string name="about_translate_cancel">Atcelt</string>
<string name="showcase_view_got_it_button">Sapratu!</string>
</resources>

View file

@ -263,5 +263,14 @@
<string name="about_translate_proceed">Продолжи</string>
<string name="about_translate_cancel">Откажи</string>
<string name="retry">Пробај пак</string>
<string name="showcase_view_got_it_button">Јасно!</string>
<string name="showcase_view_whole_nearby_activity">Ова се места во ваша близинана кои им требаат слики за илустрирање на нивните статии на Википедија</string>
<string name="showcase_view_list_icon">Ако допрете на копчево ќе добиете список на тие места</string>
<string name="showcase_view_plus_fab">Можете да подигнете слика за било кое од местата од вашата галерија или камера</string>
<string name="no_images_found">Не пронајдов ниедна слика!</string>
<string name="error_loading_images">Се појави грешка при вчитувањето на сликите.</string>
<string name="image_uploaded_by">Подигач: %1$s</string>
<string name="share_app_title">Сподели прилог</string>
<string name="share_coordinates_not_present">Не беа укажани координати при изборот на сликата</string>
<string name="error_fetching_nearby_places">Грешка при добивањето на околните места.</string>
</resources>

View file

@ -227,4 +227,6 @@
<string name="no_notifications">Nie znaleziono powiadomień</string>
<string name="about_translate_title">Języki</string>
<string name="about_translate_cancel">Anuluj</string>
<string name="no_images_found">Nie znaleziono grafik!</string>
<string name="error_loading_images">Wystąpił błąd podczas ładowania grafik.</string>
</resources>

View file

@ -263,5 +263,14 @@
<string name="about_translate_proceed">Andé anans</string>
<string name="about_translate_cancel">Anulé</string>
<string name="retry">Prové torna</string>
<string name="showcase_view_got_it_button">Fàit!</string>
<string name="showcase_view_whole_nearby_activity">A-i é dij pòst davzin a chiel ch\'a l\'han da manca ëd plance për ilustré ij sò artìcoj su Wikipedia</string>
<string name="showcase_view_list_icon">Sgnacand su \'s boton a comparirà na lista ëd si pòst</string>
<string name="showcase_view_plus_fab">A peul carié na fòto da \'n pòst qualsëssìa ëd soa galarìa o màchina fòto</string>
<string name="no_images_found">Gnun-e plance trovà!</string>
<string name="error_loading_images">A-i é staje n\'eror durant ël cariament ëd le plance.</string>
<string name="image_uploaded_by">Carià da: %1$s</string>
<string name="share_app_title">Partagé j\'aplicassion</string>
<string name="share_coordinates_not_present">Le coordinà a son nen ëstàite spessificà durant la selession ëd la plancia</string>
<string name="error_fetching_nearby_places">Eror durant l\'esplorassion dj\'anviron.</string>
</resources>

View file

@ -275,5 +275,14 @@
<string name="about_translate_proceed">Avançar</string>
<string name="about_translate_cancel">Cancelar</string>
<string name="retry">Tentar novamente</string>
<string name="showcase_view_got_it_button">Entendido!</string>
<string name="showcase_view_whole_nearby_activity">Estes são os lugares perto de você que precisam de fotografias para ilustrar os respetivos artigos na Wikipédia</string>
<string name="showcase_view_list_icon">Tocar neste botão fará surgir uma lista destes lugares</string>
<string name="showcase_view_plus_fab">Pode carregar uma fotografia para qualquer dos lugares, da sua galeria ou câmara</string>
<string name="no_images_found">Não foi encontrada nenhuma imagem!</string>
<string name="error_loading_images">Ocorreu um erro durante o carregamento das imagens.</string>
<string name="image_uploaded_by">Carregada por: %1$s</string>
<string name="share_app_title">Compartilhar o aplicativo</string>
<string name="share_coordinates_not_present">Não foram especificadas coordenadas durante a seleção da imagem</string>
<string name="error_fetching_nearby_places">Erro ao buscar lugares próximos.</string>
</resources>

View file

@ -16,12 +16,12 @@
<string name="preference_category_general">Geral</string>
<string name="preference_category_feedback">Comentários</string>
<string name="preference_category_location">Localização</string>
<string name="app_name">Wikimedia Commons</string>
<string name="app_name">Commons</string>
<string name="bullet"></string>
<string name="menu_settings">Configurações</string>
<string name="username">Nome de utilizador(a)</string>
<string name="username">Nome de utilizador</string>
<string name="password">Palavra-passe</string>
<string name="login_credential">Entre com a sua conta do Commons Beta</string>
<string name="login_credential">Entre com a sua conta da wiki Commons Beta</string>
<string name="login">Iniciar sessão</string>
<string name="forgot_password">Esqueceu-se da palavra-passe?</string>
<string name="signup">Registar-se</string>
@ -118,7 +118,7 @@
<string name="preference_theme_summary">Utilizar tema escuro</string>
<string name="license_name_cc_by_sa_four">Atribuição-CompartilhaIgual 4.0</string>
<string name="license_name_cc_by_four">Atribuição 4.0</string>
<string name="license_name_cc_by_sa"> Atribuição Compartilhamento pela mesma Licença</string>
<string name="license_name_cc_by_sa"> AtribuiçãoCompartilhaIgual 3.0</string>
<string name="license_name_cc_by">Atribuição 3.0</string>
<string name="license_name_cc0">CC0</string>
<string name="license_name_cc_by_sa_3_0">CC BY-SA 3.0</string>
@ -136,7 +136,7 @@
<string name="license_name_cc_by_sa_4_0">CC-BY-SA 4.0</string>
<string name="license_name_cc_by_4_0">CC BY 4.0</string>
<string name="license_name_cc_zero">CC Zero</string>
<string name="tutorial_1_text">Wikimedia Commons armazena a maioria das imagens que são usadas na Wikipédia.</string>
<string name="tutorial_1_text">A wiki Wikimedia Commons aloja a maioria das imagens que são usadas na Wikipédia.</string>
<string name="tutorial_1_subtext">As suas imagens ajudam a educar pessoas em todo o mundo!</string>
<string name="tutorial_2_text">Por favor, carregue apenas imagens tiradas ou criadas exclusivamente por si:</string>
<string name="tutorial_2_subtext">Objetos naturais (flores, animais, montanhas)\n• Objetos úteis (bicicletas, estações de comboio)\n• Pessoas famosas (o seu presidente da câmara, atletas olímpicos que conheça)</string>
@ -274,4 +274,14 @@
<string name="about_translate_proceed">Avançar</string>
<string name="about_translate_cancel">Cancelar</string>
<string name="retry">Tentar novamente</string>
<string name="showcase_view_got_it_button">Entendido!</string>
<string name="showcase_view_whole_nearby_activity">Estes são os lugares perto de si que precisam de fotografias para ilustrar os respetivos artigos na Wikipédia</string>
<string name="showcase_view_list_icon">Tocar neste botão fará surgir uma lista destes lugares</string>
<string name="showcase_view_plus_fab">Pode carregar uma fotografia para qualquer dos lugares, da sua galeria ou câmara</string>
<string name="no_images_found">Não foi encontrada nenhuma imagem!</string>
<string name="error_loading_images">Ocorreu um erro durante o carregamento das imagens.</string>
<string name="image_uploaded_by">Carregada por: %1$s</string>
<string name="share_app_title">Partilhar aplicação</string>
<string name="share_coordinates_not_present">Não foram especificadas coordenadas durante a seleção da imagem</string>
<string name="error_fetching_nearby_places">Erro ao localizar locais próximos.</string>
</resources>

View file

@ -99,6 +99,7 @@
<string name="welcome_copyright_subtext">Message explaining what kind of images not to submit.</string>
<string name="welcome_final_text">Message asking user if they understand what kinds of images to upload.</string>
<string name="welcome_final_button_text">Button text for confirming the user understands what kinds of images to upload.\n{{Identical|Yes}}</string>
<string name="welcome_help_button_text">\'\'This message is empty, and it\'s probably invalid. See bug report: https://github.com/commons-app/apps-android-commons/issues/1333 .\'\'</string>
<string name="detail_panel_cats_label">Label for categories list in media detail panel.\n{{Identical|Category}}</string>
<string name="detail_panel_cats_loading">Placeholder for categories list in media detail panel, while loading from network.\n{{Identical|Loading}}</string>
<string name="detail_panel_cats_none">Placeholder for categories list in media detail panel, if no categories found.\n{{Identical|None selected}}</string>

View file

@ -285,4 +285,13 @@
<string name="about_translate_proceed">Выполняется</string>
<string name="about_translate_cancel">Отмена</string>
<string name="retry">Повторить</string>
<string name="showcase_view_got_it_button">Понятно!</string>
<string name="showcase_view_whole_nearby_activity">Это места поблизости, статьи о которых нуждаются в иллюстрациях</string>
<string name="showcase_view_list_icon">Нажатие этой кнопки сгенерирует список таких мест</string>
<string name="showcase_view_plus_fab">Вы можете загрузить изображение для любого из этих мест, сделав снимок камерой или выбрав уже существующее изображение из галереи</string>
<string name="no_images_found">Изображений не найдено!</string>
<string name="error_loading_images">Произошла ошибка при загрузке изображений.</string>
<string name="image_uploaded_by">Загружено участником %1$s</string>
<string name="share_app_title">Поделиться приложением</string>
<string name="share_coordinates_not_present">Во время выбора изображения не были указаны координаты</string>
</resources>

View file

@ -129,4 +129,5 @@
<string name="about_translate_proceed">اڳوں تے تھیوو</string>
<string name="about_translate_cancel">منسوخ</string>
<string name="retry">ولدا کوشش کرو</string>
<string name="showcase_view_got_it_button">گھن گھندا</string>
</resources>

View file

@ -90,9 +90,9 @@
<string name="categories_activity_title">Kategorier</string>
<string name="title_activity_settings">Inställningar</string>
<string name="title_activity_signup">Registrera</string>
<string name="title_activity_featured_images">Utvalda bild</string>
<string name="title_activity_featured_images">Utvalda bilder</string>
<string name="menu_about">Om</string>
<string name="about_license">Wikimedia Commons är en app med öppen källkod som skapas och underhålls av frivilliga från Wikimedias gemenskap. Wikimedia Foundation är inte involverad i skapandet, utvecklingen eller underhållet av appen.</string>
<string name="about_license">Wikimedia Commons-appen är en app med öppen källkod som skapas och underhålls av frivilliga från Wikimedias gemenskap. Wikimedia Foundation är inte involverad i skapandet, utvecklingen eller underhållet av appen.</string>
<string name="about_improve">Skapa ett nytt &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;ärende på GitHub&lt;/a&gt; för att rapportera buggar och förslag.</string>
<string name="about_privacy_policy">&lt;u&gt;Integritetspolicy&lt;/u&gt;</string>
<string name="about_credits">&lt;u&gt;Erkännande&lt;/u&gt;</string>
@ -105,7 +105,7 @@
<string name="menu_retry_upload">Försök igen</string>
<string name="menu_cancel_upload">Avbryt</string>
<string name="share_license_summary">Denna bild kommer att licensieras under %1$s</string>
<string name="media_upload_policy">Genom att skicka in denna bild intygar jag att detta är mitt eget verk, som inte innehåller upphovsrättsskyddat material eller selfies samt annars följer &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons-policys&lt;/a&gt;.</string>
<string name="media_upload_policy">Genom att skicka in denna bild intygar jag att detta är mitt eget verk, som inte innehåller upphovsrättsskyddat material eller selfies samt följer &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons-policys&lt;/a&gt;.</string>
<string name="menu_download">Ladda ned</string>
<string name="preference_license">Standardlicens</string>
<string name="use_previous">Använd föregående titel/beskrivning</string>
@ -135,7 +135,7 @@
<string name="license_name_cc_zero">CC Zero</string>
<string name="tutorial_1_text">Wikimedia Commons lagrar de flesta bilderna som används på Wikipedia.</string>
<string name="tutorial_1_subtext">Dina bilder hjälper till att utbilda\nmänniskor runt hela världen!</string>
<string name="tutorial_2_text">Ladda upp bilder som endast du har tagit eller skapat:</string>
<string name="tutorial_2_text">Ladda endast upp bilder som du har tagit eller skapat själv:</string>
<string name="tutorial_2_subtext">Naturliga föremål (blommor, djur, berg)\n• Användbara föremål (cyklar, tågstationer)\n• Berömda personer (din borgmästare, olympiska atleter du har träffat)</string>
<string name="tutorial_2_subtext_1">Naturliga föremål (blommor, djur, berg)</string>
<string name="tutorial_2_subtext_2">Användbar föremål (cyklar, tågstationer)</string>
@ -163,8 +163,8 @@
<string name="detail_description_empty">Ingen beskrivning</string>
<string name="detail_license_empty">Okänd licens</string>
<string name="menu_refresh">Uppdatera</string>
<string name="read_storage_permission_rationale">Nödvändig behörighet: Läsa extern lagring. Appen kan inte komma åt ditt galleri utan detta.</string>
<string name="write_storage_permission_rationale">Nödvändig behörighet: Skriva till extern lagring. Appen kan inte komma åt din kamera utan detta.</string>
<string name="read_storage_permission_rationale">Nödvändig behörighet: Läs extern lagring. Appen kan inte komma åt ditt galleri utan detta.</string>
<string name="write_storage_permission_rationale">Nödvändig behörighet: Skriv till extern lagring. Appen kan inte komma åt din kamera utan detta.</string>
<string name="location_permission_rationale">Valfri behörighet: Hämta aktuell plats för kategoriförslag</string>
<string name="ok">OK</string>
<string name="title_activity_nearby">Platser i närheten</string>
@ -271,5 +271,13 @@
<string name="about_translate_proceed">Fortsätt</string>
<string name="about_translate_cancel">Avbryt</string>
<string name="retry">Försök igen</string>
<string name="showcase_view_got_it_button">Uppfattat!</string>
<string name="showcase_view_whole_nearby_activity">Detta är platserna nära dig som behöver bilder för att illustrera deras Wikipedia-artiklar</string>
<string name="showcase_view_list_icon">Klicka på den här knappen för att få upp en lista med dessa platser</string>
<string name="showcase_view_plus_fab">Du kan ladda upp en bild från vilken plats som helst från ditt galleri eller kamera</string>
<string name="no_images_found">Inga bilder hittades!</string>
<string name="error_loading_images">Ett fel uppstod vid inläsning av bilder.</string>
<string name="image_uploaded_by">Uppladdad av: %1$s</string>
<string name="share_app_title">Dela app</string>
<string name="share_coordinates_not_present">Koordinater specificerades inte vid bildvalet</string>
</resources>

View file

@ -271,4 +271,13 @@
<string name="about_translate_proceed">İlerle</string>
<string name="about_translate_cancel">Vazgeç</string>
<string name="retry">Tekrar Deneyin</string>
<string name="showcase_view_got_it_button">Anladım!</string>
<string name="showcase_view_whole_nearby_activity">Vikipedi maddelerine eklemek için fotoğrafa ihtiyaç duyan size yakın yerler</string>
<string name="showcase_view_list_icon">Bu tuşa dokunmak bu yerlerin bir listesini getirir</string>
<string name="showcase_view_plus_fab">Galerinizden veya kameranızla herhangi bir yer için resim yükleyebilirsiniz.</string>
<string name="no_images_found">Resim bulunamadı!</string>
<string name="error_loading_images">Resimler yüklenirken hata oluştu.</string>
<string name="image_uploaded_by">Yükleyen: %1$s</string>
<string name="share_app_title">Uygulamayı Paylaş</string>
<string name="share_coordinates_not_present">Koordinatlar görüntü seçimi sırasında belirlenmedi</string>
</resources>

View file

@ -32,7 +32,7 @@
<string name="authentication_failed">未能核對身分!</string>
<string name="uploading_started">開始上傳!</string>
<string name="upload_completed_notification_title">已上傳%1$s</string>
<string name="upload_completed_notification_text">點選檢視您上傳的項目</string>
<string name="upload_completed_notification_text">輕觸來檢視您上傳的項目</string>
<string name="upload_progress_notification_title_start">開始上傳%1$s</string>
<string name="upload_progress_notification_title_in_progress">正在上傳%1$s</string>
<string name="upload_progress_notification_title_finishing">即將完成上傳 %1$s</string>
@ -271,5 +271,14 @@
<string name="about_translate_proceed">已進行</string>
<string name="about_translate_cancel">取消</string>
<string name="retry">重試</string>
<string name="showcase_view_got_it_button">了解!</string>
<string name="showcase_view_whole_nearby_activity">這些是在您的附近,並且需要圖片來圖解有關它們的維基百科條目之地點</string>
<string name="showcase_view_list_icon">輕觸此按鈕來帶出這些地點的清單</string>
<string name="showcase_view_plus_fab">您可從您的圖庫或相機,來上傳任何地點的圖片</string>
<string name="no_images_found">找不到圖片!</string>
<string name="error_loading_images">當載入圖片時發生錯誤。</string>
<string name="image_uploaded_by">由:%1$s 上傳</string>
<string name="share_app_title">分享應用程式</string>
<string name="share_coordinates_not_present">當選擇圖片時未指定座標</string>
<string name="error_fetching_nearby_places">索取附近地點時出錯。</string>
</resources>

View file

@ -269,5 +269,14 @@
<string name="about_translate_proceed">已处理</string>
<string name="about_translate_cancel">取消</string>
<string name="retry">重试</string>
<string name="showcase_view_got_it_button">明白了!</string>
<string name="showcase_view_whole_nearby_activity">这些是您附近需要图片以阐明维基百科条目的地方</string>
<string name="showcase_view_list_icon">点按此按钮会出现这些地点的列表</string>
<string name="showcase_view_plus_fab">您可以从您的图库或照相机中上传任意地点的图片</string>
<string name="no_images_found">找不到图片!</string>
<string name="error_loading_images">加载图片时出错。</string>
<string name="image_uploaded_by">由%1$s上传</string>
<string name="share_app_title">分享应用</string>
<string name="share_coordinates_not_present">图片选择时,坐标并未指定</string>
<string name="error_fetching_nearby_places">检索附近地点时出错。</string>
</resources>

View file

@ -282,5 +282,6 @@
<string name="share_app_title">Share App</string>
<string name="share_coordinates_not_present">Coordinates were not specified during image selection</string>
<string name="error_fetching_nearby_places">Error fetching nearby places.</string>
</resources>