Merge branch 'master' into lint-cleanup

2025-10-26 20:33:53 +01:00 · 2017-09-23 13:27:07 -05:00 · 2017-09-23 13:27:07 -05:00 · c3d6d0eb44
commit c3d6d0eb44
parent d4fd6f8b77 f06fcf651f
13 changed files with 276 additions and 42 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -86,6 +86,8 @@ android {
            buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.org/wiki/\""
            buildConfigField "String", "EVENTLOG_URL", "\"https://www.wikimedia.org/beacon/event\""
            buildConfigField "String", "EVENTLOG_WIKI", "\"commonswiki\""
+            buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
+            buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Main_Page&welcome=yes\""
        }

        beta {
@ -97,6 +99,8 @@ android {
            buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/wiki/\""
            buildConfigField "String", "EVENTLOG_URL", "\"https://commons.wikimedia.beta.wmflabs.org/beacon/event\""
            buildConfigField "String", "EVENTLOG_WIKI", "\"commonswiki\""
+            buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
+            buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Main_Page&welcome=yes\""
        }
    }

--- a/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
@ -6,6 +6,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Toast;

+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.theme.BaseActivity;
 import timber.log.Timber;
@ -27,13 +28,13 @@ public class SignupActivity extends BaseActivity {
        //Needed to refresh Captcha. Might introduce XSS vulnerabilities, but we can trust Wikimedia's site... right?
        webSettings.setJavaScriptEnabled(true);

-        webView.loadUrl("https://commons.m.wikimedia.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes");
+        webView.loadUrl(BuildConfig.SIGNUP_LANDING_URL);
    }

    private class MyWebViewClient extends WebViewClient {
        @Override
        public boolean shouldOverrideUrlLoading(WebView view, String url) {
-            if (url.equals("https://commons.m.wikimedia.org/w/index.php?title=Main_Page&welcome=yes")) {
+            if (url.equals(BuildConfig.SIGNUP_SUCCESS_REDIRECTION_URL)) {
                //Signup success, so clear cookies, notify user, and load LoginActivity again
                Timber.d("Overriding URL %s", url);

--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
@ -2,6 +2,8 @@ package fr.free.nrw.commons.contributions;

 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
@ -11,17 +13,14 @@ import android.support.v4.content.FileProvider;

 import java.io.File;
 import java.util.Date;
+import java.util.List;

 import fr.free.nrw.commons.upload.ShareActivity;
-import fr.free.nrw.commons.upload.UploadService;
 import timber.log.Timber;

 import static android.content.Intent.ACTION_GET_CONTENT;
 import static android.content.Intent.ACTION_SEND;
 import static android.content.Intent.EXTRA_STREAM;
-import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
-import static android.content.Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
-import static android.provider.MediaStore.EXTRA_OUTPUT;
 import static fr.free.nrw.commons.contributions.Contribution.SOURCE_CAMERA;
 import static fr.free.nrw.commons.contributions.Contribution.SOURCE_GALLERY;
 import static fr.free.nrw.commons.upload.UploadService.EXTRA_SOURCE;
@ -51,15 +50,30 @@ class ContributionController {
                photoFile);
    }

-    void startCameraCapture() {
-        Intent pictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-        lastGeneratedCaptureUri = reGenerateImageCaptureUriInCache();
-        pictureIntent.setFlags(FLAG_GRANT_READ_URI_PERMISSION | FLAG_GRANT_WRITE_URI_PERMISSION);
-        pictureIntent.putExtra(EXTRA_OUTPUT, lastGeneratedCaptureUri);
-        fragment.startActivityForResult(pictureIntent, SELECT_FROM_CAMERA);
+    private static void requestWritePermission(Context context, Intent intent, Uri uri) {
+
+        List<ResolveInfo> resInfoList = context.getPackageManager().queryIntentActivities(intent,
+                PackageManager.MATCH_DEFAULT_ONLY);
+        for (ResolveInfo resolveInfo : resInfoList) {
+            String packageName = resolveInfo.activityInfo.packageName;
+            context.grantUriPermission(packageName, uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                    | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        }
    }

-    void startGalleryPick() {
+    void startCameraCapture() {
+
+        Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+        lastGeneratedCaptureUri = reGenerateImageCaptureUriInCache();
+
+        // Intent.setFlags doesn't work for API level <20
+        requestWritePermission(fragment.getContext(), takePictureIntent, lastGeneratedCaptureUri);
+
+        takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, lastGeneratedCaptureUri);
+        fragment.startActivityForResult(takePictureIntent, SELECT_FROM_CAMERA);
+    }
+
+    public void startGalleryPick() {
        //FIXME: Starts gallery (opens Google Photos)
        Intent pickImageIntent = new Intent(ACTION_GET_CONTENT);
        pickImageIntent.setType("image/*");
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -47,6 +47,8 @@
  <string name="categories_search_text_hint">تصنيفات البحث</string>
  <string name="menu_save_categories">احفظ</string>
  <string name="refresh_button">أنعش</string>
+    <string name="enable_gps">تفعيل GPS</string>
+    <string name="contributions_subtitle_zero">لا مرفوعات بعد</string>
  <string name="categories_not_found">لا توجد تصنيفات تطابق %1$s</string>
  <string name="categories_skip_explanation">أضف التصانيف لتسهل اكتشاف صورك على ويكيميديا كومنز.\n\nابدأ الكتاب لتضيف التصانيف.\nانقر هذه الرسالة لتتجاوز هذه الخطوة.</string>
  <string name="categories_activity_title">تصنيفات</string>
@ -81,10 +83,22 @@
  <string name="detail_license_empty">ترخيص غير معلوم</string>
  <string name="menu_refresh">تحديث</string>
  <string name="ok">موافق</string>
+    <string name="title_activity_nearby">الأماكن القريبة</string>
  <string name="warning">تحذير</string>
  <string name="yes">نعم</string>
  <string name="no">لا</string>
  <string name="media_detail_title">العنوان</string>
+    <string name="media_detail_media_title">عنوان الوسيط</string>
  <string name="media_detail_description">الوصف</string>
+    <string name="media_detail_license">الترخيص</string>
+    <string name="media_detail_coordinates">الإحداثيات</string>
+    <string name="use_wikidata">استخدم ويكي بيانات</string>
+    <string name="maximum_limit">الحد الأقصى</string>
+    <string name="navigation_item_home">الرئيسية</string>
+    <string name="navigation_item_upload">رفع</string>
+    <string name="navigation_item_nearby">بالقرب من هنا</string>
+    <string name="navigation_item_about">حول</string>
  <string name="navigation_item_settings">الإعدادات</string>
+    <string name="navigation_item_logout">تسجيل الخروج</string>
+    <string name="nearby_info_menu_commons_article">صفحة ملف كومنز</string>
 </resources>
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@ -85,6 +85,7 @@
  <string name="menu_retry_upload">পুনঃচেষ্টা করুন</string>
  <string name="menu_cancel_upload">বাতিল</string>
  <string name="share_license_summary">এই ছবিটি %1$s এর অধীনে লাইসেন্স করা হবে</string>
+    <string name="media_upload_policy">এই চিত্র জমা দেয়ার দ্বারা, আমি ঘোষণা দিচ্ছি যে এটি আমার নিজস্ব কাজ, এতে কপিরাইটযুক্ত উপাদান নেই বা এটই সেলফি নয়, এবং &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines/bn\"&gt;উইকিমিডিয়া কমন্স নীতি&lt;/a&gt; অনুসরণ করে।</string>
  <string name="menu_download">ডাউনলোড</string>
  <string name="preference_license">লাইসেন্স</string>
  <string name="use_previous">পূর্ববর্তী শিরোনাম/বিবরণ ব্যবহার করুন</string>
@ -148,6 +149,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="use_wikidata">উইকিউপাত্ত ব্যবহার করুন</string>
  <string name="use_wikidata_summary">(সতর্কতা: এটি নিষ্ক্রিয় করা অধিক পরিমাণে মোবাইল ডেটা খরচ হওয়ার কারণ হতে পারে)</string>
@ -166,6 +168,7 @@
  <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>
--- a/app/src/main/res/values-diq/strings.xml
+++ b/app/src/main/res/values-diq/strings.xml
@ -111,4 +111,11 @@
  <string name="warning">Tembe kem</string>
  <string name="yes">E</string>
  <string name="no">Nê</string>
+    <string name="media_detail_title">Sername</string>
+    <string name="media_detail_license">Lisans</string>
+    <string name="media_detail_coordinates">Koordinati</string>
+    <string name="cancel">Bıtexelne</string>
+    <string name="navigation_drawer_open">Ake</string>
+    <string name="navigation_item_home">Keye</string>
+    <string name="navigation_item_upload">Bar ke</string>
 </resources>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -14,7 +14,7 @@
  <string name="authentication_failed">Tunnistautuminen epäonnistui!</string>
  <string name="uploading_started">Tallentaminen aloitettiin!</string>
  <string name="upload_completed_notification_title">%1$s tallennettiin!</string>
-  <string name="upload_completed_notification_text">Napauta katsoaksesi tallennuksen</string>
+    <string name="upload_completed_notification_text">Napauta katsoaksesi tallennusta</string>
  <string name="upload_progress_notification_title_start">Aloitetaan tiedoston %1$s tallennusta</string>
  <string name="upload_progress_notification_title_in_progress">Tallennetaan %1$s</string>
  <string name="upload_progress_notification_title_finishing">%1$s tallennettu</string>
@ -29,7 +29,7 @@
  <string name="contribution_state_failed">Epäonnistui</string>
  <string name="contribution_state_in_progress">%1$d%% valmis</string>
  <string name="contribution_state_starting">Tallennetaan</string>
-  <string name="menu_from_gallery">Olemassaoleva</string>
+    <string name="menu_from_gallery">Galleriasta</string>
  <string name="menu_from_camera">Ota kuva</string>
  <string name="menu_nearby">Lähistöllä</string>
  <string name="provider_contributions">Omat tallennukset</string>
@ -39,7 +39,7 @@
  <string name="share_description_hint">Kuvaus</string>
  <string name="login_failed_network">Kirjautuminen epäonnistui - verkkovirhe</string>
  <string name="login_failed_username">Kirjautuminen epäonnistui - tarkista käyttäjätunnus</string>
-  <string name="login_failed_password">Kirjautuminen epäonnistui - tarkista salasana</string>
+    <string name="login_failed_password">Kirjautuminen epäonnistui - tarkista salasanasi</string>
  <string name="login_failed_throttled">Liikaa epäonnistuneita yrityksiä. Yritä uudelleen parin minuutin kuluttua.</string>
  <string name="login_failed_blocked">Pahoittelut, tämä käyttäjä on estetty Commonsissa</string>
  <string name="login_failed_2fa_needed">Anna kaksivaiheisen tunnistuksen koodi.</string>
@ -54,18 +54,18 @@
  <string name="gps_disabled">GPS ei ole käytössä. Haluatko ottaa sen käyttöön?</string>
  <string name="enable_gps">Ota GPS käyttöön</string>
  <string name="contributions_subtitle_zero">Ei tallennuksia vielä</string>
-  <plurals name="contributions_subtitle" fuzzy="true">
-    <item quantity="zero">Ei tallennuksia</item>
-    <item quantity="one">1 tallennus</item>
+    <plurals name="contributions_subtitle">
+        <item quantity="zero">\@string/contributions_subtitle_zero</item>
+        <item quantity="one">%d tallennus</item>
    <item quantity="other">%d tallennusta</item>
  </plurals>
-  <plurals name="starting_multiple_uploads" fuzzy="true">
-    <item quantity="one">1 tallennus alkaa</item>
-    <item quantity="other">%d tallennusta alkaa</item>
+    <plurals name="starting_multiple_uploads">
+        <item quantity="one">aloitetaan %d tallennus</item>
+        <item quantity="other">aloitetaan %d tallennusta</item>
  </plurals>
-  <plurals name="multiple_uploads_title" fuzzy="true">
-    <item quantity="one">1 lataus</item>
-    <item quantity="other">%d latausta</item>
+    <plurals name="multiple_uploads_title">
+        <item quantity="one">%d tallennus</item>
+        <item quantity="other">%d tallennusta</item>
  </plurals>
  <string name="categories_not_found">Luokkaa %1$s ei löytynyt</string>
  <string name="categories_skip_explanation">Lisää luokkia tehdäksesi kuvistasi helpommin löydettäviä.\n\nAloita kirjoittaminen lisätäksesi luokkia.\nNapauta tätä viestiä (tai paina takaisin) ohittaaksesi tämän vaiheen.</string>
@ -73,7 +73,7 @@
  <string name="title_activity_settings">Asetukset</string>
  <string name="title_activity_signup">Rekisteröidy</string>
  <string name="menu_about">Tietoja</string>
-  <string name="about_license" fuzzy="true">Tämä on vapaan lähdekoodin ohjelmisto, joka on julkaistu &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt; -lisenssin alaisena. Wikimedia Commons ja sen logo ovat Wikimedia Foundationin tavaramerkkejä ja niitä käytetään Wikimedia Foundationin luvalla. Emme ole hyväksyttyjä tai sidoksissa Wikimedia Foundationioniin.</string>
+    <string name="about_license">Tämä on vapaan lähdekoodin ohjelmisto, joka on julkaistu &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt; -lisenssin alaisena. Wikimedia Commons ja sen logo ovat Wikimedia Foundationin tavaramerkkejä ja niitä käytetään Wikimedia Foundationin luvalla. Emme ole hyväksyttyjä tai sidoksissa Wikimedia Foundationioniin.</string>
  <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Lähde&lt;/a&gt; ja &lt;a href=\"https://commons-app.github.io/\"&gt;nettisivusto&lt;/a&gt; GitHubissa. Luo uusi &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-issue&lt;/a&gt; bugiraporteille ja ehdotuksille.</string>
  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Yksityisyydensuoja&lt;/a&gt;</string>
  <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Tekijät&lt;/a&gt;</string>
@ -86,6 +86,7 @@
  <string name="menu_retry_upload">Yritä uudelleen</string>
  <string name="menu_cancel_upload">Peruuta</string>
  <string name="share_license_summary">Tiedosto tallennetaan lisenssin %1$s ehtojen mukaisesti.</string>
+    <string name="media_upload_policy">Lisäämällä kuvan, ilmoitan tämän olevan oma työ ja että se ei sisällä tekijänoikeuden alaista materiaalia tai selfietä ja muuten noudattaa &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons policies&lt;/a&gt;.</string>
  <string name="menu_download">Lataa</string>
  <string name="preference_license">Lisenssi</string>
  <string name="use_previous">Käytä edellistä otsikkoa/kuvausta</string>
@ -115,15 +116,15 @@
  <string name="license_name_cc_zero">CC0</string>
  <string name="tutorial_1_text">Wikimedia Commonsiin on tallennettu lähes kaikki Wikipediassa käytetyt kuvat.</string>
  <string name="tutorial_1_subtext">Kuvasi auttavat ihmisiä kaikkialta maailmasta ymmärtämään maailmaa!</string>
-  <string name="tutorial_2_text">Tallenna kuvia, jotka sinä itse olet kuvannot tai luonut:</string>
+    <string name="tutorial_2_text">Tallenna kuvia, jotka sinä itse olet ottanut tai luonut:</string>
  <string name="tutorial_2_subtext">- Luontokohteet (kukat, eläimet, vuoret)\n- Hyödylliset esineet (polkupyörät, rautatieasemat)\n- Kuuluisat henkilöt (kaupunginjohtajasi, tapaamasi olympiaurheilijat)</string>
-  <string name="tutorial_3_text">Älä tallenna seuraavia:</string>
+    <string name="tutorial_3_text">ÄLÄ tallenna seuraavia:</string>
  <string name="tutorial_3_subtext">- Selfiet tai kuvat ystävistäsi\n- Netistä ladatut kuvat\n- Kuvakaappaukset kaupallisista sovelluksista</string>
  <string name="tutorial_4_text">Tallennusesimerkki:</string>
  <string name="tutorial_4_subtext">- Nimi: Sydneyn operatalo\n- Kuvaus: Sydneyn oopperatalo katsottuna lahden toisella puolella\n- Luokat: Sydneyn oopperatalo, Sydneyn oopperatalo lännestä, Sydneyn oopperatalo remote views</string>
  <string name="welcome_wikipedia_text">Herätä Wikipedia-artikkelit eloon kuvillasi! Tuo kuvasi Wikipediaan.</string>
  <string name="welcome_wikipedia_subtext">Wikipedian kuvat tulevat Wikimedia Commonsista.</string>
-  <string name="welcome_copyright_text">Kuvat auttavat useita ihmisiä ympäri maailmaa artikkeleiden ymmärtämisessä.</string>
+    <string name="welcome_copyright_text">Kuvasi auttavat useita ihmisiä ympäri maailmaa artikkeleiden ymmärtämisessä.</string>
  <string name="welcome_copyright_subtext">Vältä tekijänoikeuksien alaista materiaalia, kuten julisteita, kirjan kansia ja useimpia Internetistä löydettyjä kuvia.</string>
  <string name="welcome_final_text">Luuletko ymmärtäneesi tämän?</string>
  <string name="welcome_final_button_text">Kyllä!</string>
@ -134,8 +135,9 @@
  <string name="detail_license_empty">Tuntematon lisenssi</string>
  <string name="menu_refresh">Päivitä</string>
  <string name="storage_permission_rationale">Vaadittu oikeus: Ulkoisen tallennustilan luku. Appi ei toimi ilman tätä oikeutta.</string>
+    <string name="location_permission_rationale">Valinnainen lupa: Saada tämänhetkinen sijainti loukkasuosituksia varten.</string>
  <string name="ok">OK</string>
-  <string name="title_activity_nearby">Läheiset paikat</string>
+    <string name="title_activity_nearby">Lähellä olevat paikat</string>
  <string name="no_nearby">Lähistöltä ei löytynyt paikkoja</string>
  <string name="warning">Varoitus</string>
  <string name="file_exists">Tämä tiedosto on jo Wikimedia Commonsissa. Haluatko varmasti jatkaa?</string>
@ -147,14 +149,24 @@
  <string name="media_detail_uploaded_date">Tallennuspäivämäärä</string>
  <string name="media_detail_license">Lisenssi</string>
  <string name="media_detail_coordinates">Koordinaatit</string>
+    <string name="media_detail_coordinates_empty">ei annettu</string>
  <string name="become_a_tester_title">Ryhdy beetatestaajaksi</string>
  <string name="use_wikidata">Käytä Wikidataa</string>
+    <string name="use_wikidata_summary">(Varoitus: poiskytkeminen voi aiheuttaa suuren mobiilidatankäytön)</string>
+    <string name="maximum_limit">Maksimimäärä</string>
+    <string name="maximum_limit_alert">Ei voida näyttää enempää, kuin 500</string>
  <string name="login_failed_2fa_not_supported">Kaksivaiheinen tunnistus ei ole vielä tuettu.</string>
-  <string name="logout_verification">Haluatko kirjautua ulos?</string>
+    <string name="logout_verification">Haluatko varmasti kirjautua ulos?</string>
+    <string name="commons_logo">Commons Logo</string>
+    <string name="background_image">Taustakuva</string>
+    <string name="no_image_found">Kuvaa ei löytynyt</string>
  <string name="upload_image">Lataa kuva</string>
+    <string name="welcome_image_mount_zao">Zao-vuori</string>
+    <string name="welcome_image_rainbow_bridge">Sateenkaarisilta</string>
  <string name="welcome_image_tulip">Tulppaani</string>
  <string name="welcome_image_no_selfies">Ei selfieitä</string>
  <string name="welcome_image_welcome_wikipedia">Tervetuloa Wikipediaan</string>
+    <string name="welcome_image_welcome_copyright">Tervetuloa tekijänoikeus</string>
  <string name="welcome_image_sydney_opera_house">Sydneyn oopperatalo</string>
  <string name="cancel">Peru</string>
  <string name="navigation_drawer_open">Avaa</string>
@ -166,6 +178,9 @@
  <string name="navigation_item_settings">Asetukset</string>
  <string name="navigation_item_feedback">Palaute</string>
  <string name="navigation_item_logout">Kirjaudu ulos</string>
+    <string name="navigation_item_info">Opas</string>
+    <string name="nearby_needs_permissions">Lähellä olevia paikkoja ei voida näyttää ilman sijaintilupaa</string>
  <string name="nearby_info_menu_commons_article">Commons-tiedostosivu</string>
  <string name="nearby_info_menu_wikidata_article">Wikidata-kohde</string>
+    <string name="title_info">Tiedoston yksilöllinen ja kuvaava otsikko, jota käytetään tiedostonimenä. Voit käyttää tavallista kieltä välilyönnein. Älä sisällytä tiedoston päätettä.</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -114,7 +114,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 Zéro</string>
-  <string name="tutorial_1_text">Wikimédia Communs héberge la plupart des images qui sont utilisées dans Wikipédia</string>
+    <string name="tutorial_1_text">Wikimedia Commons héberge la plupart des images qui sont utilisées dans Wikipédia.</string>
  <string name="tutorial_1_subtext">Vos images aident à éduquer les gens dans le monde entier !</string>
  <string name="tutorial_2_text">Veuillez téléverser des images qui sont prises ou créées entièrement par vous :</string>
  <string name="tutorial_2_subtext">- Objets naturels (fleurs, animaux, montagnes) \n- Objets utiles (bicyclettes, gares ferroviaires) \n- Personnes célèbres (votre maire, les athlètes olympiques que vous avez rencontrés)</string>
@ -140,7 +140,7 @@
  <string name="title_activity_nearby">Endroits à proximité</string>
  <string name="no_nearby">Rien trouvé dans le voisinage</string>
  <string name="warning">Avertissement</string>
-  <string name="file_exists">Ce fichier existe déjà sur Communs. Êtes-vous sûr de vouloir continuer ?</string>
+    <string name="file_exists">Ce fichier existe déjà sur Commons. Êtes-vous sûr de vouloir continuer ?</string>
  <string name="yes">Oui</string>
  <string name="no">Non</string>
  <string name="media_detail_title">Titre</string>
@ -162,7 +162,7 @@
  <string name="set_limit">Fixer la limite de téléversement récent</string>
  <string name="login_failed_2fa_not_supported">L’authentification à deux facteurs n’est pas prise en charge pour le moment.</string>
  <string name="logout_verification">Voulez-vous vraiment vous déconnecter ?</string>
-  <string name="commons_logo">Logo de Communs</string>
+    <string name="commons_logo">Logo de Commons</string>
  <string name="background_image">Image de fond</string>
  <string name="mediaimage_failed">Échec sur l’image du média</string>
  <string name="no_image_found">Aucune image trouvée</string>
@ -189,7 +189,7 @@
  <string name="navigation_item_info">Tutoriel</string>
  <string name="nearby_needs_permissions">Les endroits proches ne peuvent pas être affichés si vous ne partagez pas votre position géographique.</string>
  <string name="no_description_found">aucune description trouvée</string>
-  <string name="nearby_info_menu_commons_article">Page des fichiers de Communs</string>
+    <string name="nearby_info_menu_commons_article">Page des fichiers de Commons</string>
  <string name="nearby_info_menu_wikidata_article">Élément de Wikidata</string>
  <string name="error_while_cache">Erreur en mettant les images en cache</string>
  <string name="title_info">Un titre descriptif unique pour le fichier, qui servira de nom de fichier. Vous pouvez utiliser un langage simple avec des espaces. N’incluez pas l’extension du fichier</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -42,6 +42,7 @@
  <string name="login_failed_password">Nie można zalogować - sprawdź hasło</string>
  <string name="login_failed_throttled">Zbyt wiele nieudanych prób zalogowania. Spróbuj ponownie za kilka minut.</string>
  <string name="login_failed_blocked">Przepraszamy, ten użytkownik został zablokowany na Commons</string>
+    <string name="login_failed_2fa_needed">Wprowadź swój kod dla  dwuetapowej autoryzacji.</string>
  <string name="login_failed_generic">Logowanie nie powiodło się</string>
  <string name="share_upload_button">Prześlij</string>
  <string name="multiple_share_base_title">Nazwij ten zestaw</string>
@ -52,6 +53,7 @@
  <string name="refresh_button">Odśwież</string>
  <string name="gps_disabled">GPS w twoim urządzeniu jest wyłączony. Czy chcesz go włączyć?</string>
  <string name="enable_gps">Włącz GPS</string>
+    <string name="contributions_subtitle_zero">Na razie brak przesłanych plików!</string>
  <plurals name="contributions_subtitle">
    <item quantity="zero">Przesłano @string/contributions_subtitle_zero</item>
    <item quantity="one">Przesłano %d plik</item>
@ -151,6 +153,8 @@
  <string name="become_a_tester_description">Dołącz do kanału bety w Google Play i dostań wczesny dostęp do nowych funkcji i łatek</string>
  <string name="use_wikidata">Użyj Wikidanych</string>
  <string name="_2fa_code">Kod 2FA</string>
+    <string name="maximum_limit">Górna Granica</string>
+    <string name="maximum_limit_alert">Nie można wyświetlić ponad 500</string>
  <string name="login_failed_2fa_not_supported">Uwierzytelnianie dwuskładnikowe obecnie nie jest obsługiwane.</string>
  <string name="logout_verification">Czy na pewno wylogować?</string>
  <string name="commons_logo">Logo Commons</string>
@ -160,8 +164,10 @@
  <string name="welcome_image_llamas">Lamy</string>
  <string name="welcome_image_rainbow_bridge">Rainbow Bridge</string>
  <string name="welcome_image_tulip">Tulipan</string>
+    <string name="welcome_image_no_selfies">Brak Selfie</string>
  <string name="welcome_image_welcome_wikipedia">Witaj na Wikipedii</string>
  <string name="welcome_image_welcome_copyright" fuzzy="true">Witaj w prawach autorskich.</string>
+    <string name="welcome_image_sydney_opera_house">Opera Sydnej</string>
  <string name="cancel">Anuluj</string>
  <string name="navigation_drawer_open">Otwórz</string>
  <string name="navigation_drawer_close">Zamknij</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -153,6 +153,7 @@
  <string name="media_detail_uploaded_date">Дата загрузки</string>
  <string name="media_detail_license">Лицензия</string>
  <string name="media_detail_coordinates">Координаты</string>
+    <string name="media_detail_coordinates_empty">Не предоставлены</string>
  <string name="become_a_tester_title">Стать бета-тестером</string>
  <string name="become_a_tester_description">Подпишитесь на наш канал бета-версии на Google Play и получите ранний доступ к новым функциям и исправлениям ошибок</string>
  <string name="use_wikidata">Использовать Викиданные</string>
--- a/app/src/main/res/values-sd/strings.xml
+++ b/app/src/main/res/values-sd/strings.xml
@ -2,7 +2,7 @@
 <resources>
  <string name="app_name">العام</string>
  <string name="menu_settings">ترتيبون</string>
-  <string name="username">يُوزرنانءُ</string>
+    <string name="username">واپرائيندڙ-نانءُ</string>
  <string name="password">ڳجھولفظ</string>
  <string name="login">داخل ٿيو</string>
  <string name="signup">کاتو کوليو</string>
@ -20,11 +20,11 @@
  <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 فائيل چاڙھيندي</item>
+    <plurals name="uploads_pending_notification_indicator">
+        <item quantity="one">%d فائيل چاڙھيندي</item>
    <item quantity="other">%d فائيلَ چاڙھيندي</item>
  </plurals>
-  <string name="title_activity_contributions" fuzzy="true">منھنجا چاڙھ</string>
+    <string name="title_activity_contributions">منھنجا تازا چاڙھ</string>
  <string name="contribution_state_queued">قطار ۾</string>
  <string name="contribution_state_failed">ناڪام</string>
  <string name="contribution_state_in_progress">%1$d%% مڪمل</string>
@ -38,10 +38,10 @@
  <string name="share_title_hint">عنوان</string>
  <string name="share_description_hint">تشريح</string>
  <string name="login_failed_network">ناقابلِ داخل ٿيڻ - باھمڄار ناڪامي</string>
-  <string name="login_failed_username">ناقابلِ داخل ٿيڻ - براءِ مھرباني پنھنجو يُوزرنانءُ چڪاسيو</string>
+    <string name="login_failed_username">ناقابلِ داخل ٿيڻ - براءِ مھرباني پنھنجو واپرائيندڙ-نانءُ چڪاسيو</string>
  <string name="login_failed_password">ناقابل داخل ٿيڻ - براءِ مھرباني پنھنجو ڳجھولفظ چڪاسيو</string>
  <string name="login_failed_throttled">ھيڪانديون ناڪام ڪوششون. براءِ مھرباني ڪجھ منٽن کانپوءِ ٻيھر ڪوشش ڪريو.</string>
-  <string name="login_failed_blocked">افسوس، ھي واھپ العام تي بندشيل آھي</string>
+    <string name="login_failed_blocked">افسوس، ھي واپرائيندڙ العام تي بندشيل آھي</string>
  <string name="login_failed_generic">داخل ٿيڻ ناڪام</string>
  <string name="share_upload_button">چاڙھيو</string>
  <string name="multiple_share_base_title">ھن سيٽ کي نالو ڏيو</string>
@ -50,6 +50,8 @@
  <string name="categories_search_text_hint">زمرا ڳوليو</string>
  <string name="menu_save_categories">سانڍيو</string>
  <string name="refresh_button">تازو ڪيو</string>
+    <string name="enable_gps">جي پي ايس چالو ڪيو (اين ايبل جي پي ايس)</string>
+    <string name="contributions_subtitle_zero">اڃان تائين ڪو به ڄاڙهه (اَپلوڊ) نه ٿيو آهي</string>
  <plurals name="contributions_subtitle" fuzzy="true">
    <item quantity="zero">اڃان تائين ڪو چاڙھ ناھي</item>
    <item quantity="one">1 چاڙھ</item>
@ -121,7 +123,7 @@
  <string name="welcome_final_text">توھان سمجھو ٿا توھان سمجھي ويئو؟</string>
  <string name="welcome_final_button_text">ھا!</string>
  <string name="detail_panel_cats_label">زمرا</string>
-  <string name="detail_panel_cats_loading" fuzzy="true">اتاريندي…</string>
+    <string name="detail_panel_cats_loading">لاهيندي...</string>
  <string name="detail_panel_cats_none">ڪوبہ چونڊيل ناھي</string>
  <string name="detail_description_empty">ڪا تشريح ناھي</string>
  <string name="detail_license_empty">اڻڄاتل لائسنس</string>
@ -137,6 +139,28 @@
  <string name="media_detail_title">عنوان</string>
  <string name="media_detail_media_title">ابلاغ جو عنوان</string>
  <string name="media_detail_description">تشريح</string>
+    <string name="media_detail_uploaded_date">چاڙهڻ جي تاريخ (اَپلوڊ ڊيٽ)</string>
+    <string name="media_detail_license">لائسنس (اجازت نامو)</string>
  <string name="become_a_tester_title">آزمائشي آزمائيندڙ ٿيو</string>
  <string name="use_wikidata">وڪيڊيٽا استعماڪ ڪريو</string>
+    <string name="number_of_uploads">منهنجي تازي چاڙهڻ (اَپلوڊ) جي حد (لِمٽ)</string>
+    <string name="maximum_limit">وڌ ۾ وڌ حد (ميگزيمم لِمٽ)</string>
+    <string name="no_image_found">ڪوبہ عڪس نہ لڌو</string>
+    <string name="upload_image">عڪس چاڙهيو</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>
+    <string name="navigation_item_upload">چاڙهيو</string>
+    <string name="navigation_item_about">بابت</string>
+    <string name="navigation_item_settings">ترتيبون (سيٽنگس)</string>
+    <string name="navigation_item_feedback">اوهان جي راءِ</string>
+    <string name="navigation_item_info">سکيا (ٽيوٽوريل)</string>
+    <string name="no_description_found">ڪا به وضاحت نه ملي</string>
+    <string name="nearby_info_menu_commons_article">ڪامن فائيل جو ورق</string>
+    <string name="nearby_info_menu_wikidata_article">وڪيڊيٽا جزو (وڪيڊيٽا آئيٽم)</string>
 </resources>
--- a/app/src/main/res/values-xmf/error.xml
+++ b/app/src/main/res/values-xmf/error.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="crash_dialog_title">ვიკიოწკარუექ აკორთუ</string>
+    <string name="crash_dialog_text">უი. მუდგაინქ ქჷმოხვადუǃ</string>
+    <string name="crash_dialog_comment_prompt">ქომწით მუს აკეთენდით დო ქჷმომჯღონით ელექტრონული ფოსტათ. თენა ჩქი პრობლემაშ გიშათინუა ქემეხვარებჷნა!</string>
+    <string name="crash_dialog_ok_toast">დიდი მარდიǃ</string>
+</resources>
--- a/app/src/main/res/values-xmf/strings.xml
+++ b/app/src/main/res/values-xmf/strings.xml
@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">ვიკიოწკარუე</string>
+    <string name="menu_settings">პარამეტრეფი</string>
+    <string name="username">მახვარებუშ ჯოხო</string>
+    <string name="password">პაროლი</string>
+    <string name="login">მიშულა</string>
+    <string name="signup">რეგისტრაცია</string>
+    <string name="logging_in_title">სისტემაშა მიშულა</string>
+    <string name="logging_in_message">ქორთხინთ ქიმიცადით …</string>
+    <string name="login_success">სისტემაშა მიშულაქ წჷმოძინელო გეთუ!</string>
+    <string name="login_failed">სისტემაშა მიშულაქ ვემიხუჯინუ!</string>
+    <string name="upload_failed">ფაილქ ვეგორუ. ქორთხინთ, ქოცადით შხვა ფაილი.</string>
+    <string name="authentication_failed">აუთენტიფიკაციაქ ვემიხუჯინუ!</string>
+    <string name="uploading_started">ეხარგუაქ ქჷდიჭყუ!</string>
+    <string name="upload_completed_notification_title">%1$ ეხარგილი რე!</string>
+    <string name="upload_completed_notification_text">ქეგუწკანტეთ თქვანი ეხარგუაშ ოძირაფალო</string>
+    <string name="upload_progress_notification_title_start">ქჷდიჭყუ %1$ ეხარგუაქ</string>
+    <string name="upload_progress_notification_title_in_progress">%1$ იხარგუ</string>
+    <string name="upload_progress_notification_title_finishing">ეხარგუაშ თება %1$</string>
+    <string name="upload_failed_notification_title">%1$ ეხარგუაქ ვემიხუჯინუ</string>
+    <string name="upload_failed_notification_subtitle">ოძირაფალო ქეგუწკანტეთ</string>
+    <plurals name="uploads_pending_notification_indicator">
+        <item quantity="one">%d ფაილი იხარგუ</item>
+        <item quantity="other">%d ფაილი იხარგუ</item>
+    </plurals>
+    <string name="title_activity_contributions">ჩქიმი ბოლო ეხარგუეფი</string>
+    <string name="contribution_state_queued">რადი</string>
+    <string name="contribution_state_failed">ვემიხუჯინუ</string>
+    <string name="contribution_state_in_progress">%1$d%% გეთუ</string>
+    <string name="contribution_state_starting">იხარგუაფუ</string>
+    <string name="menu_from_gallery">გალერეაშე</string>
+    <string name="menu_from_camera">ფოტოშ გინოღალა</string>
+    <string name="menu_nearby">გოხოლუას</string>
+    <string name="provider_contributions">ჩქიმი ეხარგუეფი</string>
+    <string name="menu_share">გობჟინაფა</string>
+    <string name="menu_open_in_browser">ბრაუზერს გონწყუმა</string>
+    <string name="share_title_hint">დუდჯოხო</string>
+    <string name="share_description_hint">ეჭარუა</string>
+    <string name="login_failed_network">მიშულაქ ვემიხუჯინუ - რშვილიშ ჩილათა</string>
+    <string name="login_failed_username">მიშულაქ ვემიხუჯინუ - ქორთხინთ გეგნაჯინით ჯოხოს</string>
+    <string name="login_failed_password">მიშულაქ ვემიხუჯინუ - ქორთხინთ გეგნაჯინით პაროლს</string>
+    <string name="login_failed_throttled">ძალამ მიარე უმწუძინუ ცადება. ქორთხინ, მუხირენ წუთშა ხოლო ქოცადით.</string>
+    <string name="login_failed_blocked">მორდება, თე მახვარებუ ბლოკირი რე ვიკიოწკარუეს</string>
+    <string name="login_failed_2fa_needed">თქვა გემშიონათ ოკო ჟირფაქტორიანი ავტორიზაციაშ კოდი.</string>
+    <string name="login_failed_generic">მიშულაქ ვემიხუჯინუ</string>
+    <string name="share_upload_button">ეხარგუა</string>
+    <string name="multiple_share_base_title">სერიაშ ჯოხო</string>
+    <string name="provider_modifications">მოდიფიკაციეფი</string>
+    <string name="menu_upload_single">ეხარგუა</string>
+    <string name="categories_search_text_hint">კატეგორიაშ გიშაგორუა</string>
+    <string name="menu_save_categories">ჩუალა</string>
+    <string name="refresh_button">გოახალაფა</string>
+    <string name="gps_disabled">თქვან მონწყილობას GPS თიშილი რე. თახმო გოკონანო ჩართება?</string>
+    <string name="enable_gps">GPS-იშ ჩართება</string>
+    <string name="contributions_subtitle_zero">ეხარგუეფი ვა რე</string>
+    <plurals name="contributions_subtitle">
+        <item quantity="zero">\@string/contributions_subtitle_zero</item>
+        <item quantity="one">%d ეხარგუა</item>
+        <item quantity="other">%d ეხარგუა</item>
+    </plurals>
+    <plurals name="starting_multiple_uploads">
+        <item quantity="one">იჭყაფუ %d ეხარგუა</item>
+        <item quantity="other">იჭყაფუ %d ეხარგუა</item>
+    </plurals>
+    <plurals name="multiple_uploads_title">
+        <item quantity="one">%d ეხარგუა</item>
+        <item quantity="other">%d ეხარგუა</item>
+    </plurals>
+    <string name="categories_activity_title">კატეგორია</string>
+    <string name="title_activity_settings">პარამეტრეფი</string>
+    <string name="title_activity_signup">რეგისტრაცია</string>
+    <string name="menu_about">პროგრამაშ გეშა</string>
+    <string name="menu_retry_upload">გომაჟირაფა</string>
+    <string name="menu_cancel_upload">გოუქვაფა</string>
+    <string name="share_license_summary">თე სურათი გიბჟინუ %1$s ლიცენზიათ</string>
+    <string name="menu_download">გინოჭარუა</string>
+    <string name="preference_license">ლიცენზია</string>
+    <string name="use_previous">წჷმი სათაურიშ/ეჭარუაშ გჷმორინაფა</string>
+    <string name="allow_gps">ასეიანი ორენიშ ავტომატური მეღება</string>
+    <string name="preference_theme">სერიშ რეჟიმი</string>
+    <string name="preference_theme_summary">რუმე თემაშ გჷმორინაფა</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>
+    <string name="license_name_cc_by"> Attribution 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>
+    <string name="license_name_cc_by_sa_3_0_at">CC BY-SA 3.0 (ავსტრია)</string>
+    <string name="license_name_cc_by_sa_3_0_de">CC BY-SA 3.0 (გერმანია)</string>
+    <string name="license_name_cc_by_sa_3_0_ee">CC BY-SA 3.0 (ესტონეთი)</string>
+    <string name="license_name_cc_by_sa_3_0_es">CC BY-SA 3.0 (ესპანეთი)</string>
+    <string name="license_name_cc_by_sa_3_0_hr">CC BY-SA 3.0 (ხორვატია)</string>
+    <string name="license_name_cc_by_sa_3_0_lu">CC BY-SA 3.0 (ლუქსემბურგი)</string>
+    <string name="license_name_cc_by_sa_3_0_nl">CC BY-SA 3.0 (ნიდერლანდი)</string>
+    <string name="license_name_cc_by_sa_3_0_no">CC BY-SA 3.0 (ნორვეგია)</string>
+    <string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (პოლონეთი)</string>
+    <string name="license_name_cc_by_sa_3_0_ro">CC BY-SA 3.0 (რუმინეთი)</string>
+    <string name="license_name_cc_by_3_0">CC BY-SA 3.0</string>
+    <string name="license_name_cc_by_sa_4_0">CC BY-SA 4.0</string>
+    <string name="license_name_cc_by_4_0">CC BY 4.0</string>
+    <string name="license_name_cc_zero">CC Zero</string>
+    <string name="tutorial_2_text">ქორთხინთ გეხარგეთ, ხვალე თქვანით ინოღალირი ვარდა აკოქიმინელი სურათეფი:</string>
+    <string name="tutorial_2_subtext">- ორთაშობური ობიექტეფი (პიოლეფი, ჩხოლარეფი, გვალეფი)\n- ორგებელი ობიექტეფი (ველოსიპედეფი, მახინწალიშ დგჷმიელფი)\n- ჩინებული ადამიერეფი (თქვანი ნოღაშ მერი, ოლიმპიარი სპორტსმენეფი, ნამუეფსჷთ შეხვალამუთჷნ)</string>
+    <string name="tutorial_3_text">ქორთხინთ ვეხარგათ:</string>
+    <string name="tutorial_3_subtext">- სელფი ვარდა მაჸალეეფიშ სურათეფი\n- ინტერნეტშე გჷმოხარგილი ფოტოეფი\n- ვადუდიშული აპლიკაციეფიშ სკრინშოტეფი</string>
+    <string name="tutorial_4_text">ეხარგუაშ მინუში:</string>
+    <string name="tutorial_4_subtext">- დუდჯოხო: სიდნეიშ ოპერაშ თეატრი\n- ეჭარუა: სიდნეიშ ოპერაშ თეატრიშ მიოჯინი ლუბაშე\n- კატეგორიეფი: Sydney Opera House, Sydney Opera House from the west, Sydney Opera House remote views</string>
+    <string name="welcome_wikipedia_text">გეხარგეთ თქვანი ფოტოეფი. ქემეხვარით ვიკიპედიაშ სტატიეფიშ გაჭყანიერებას!</string>
+    <string name="welcome_wikipedia_subtext">ვიკიპედიაშ ფოტოეფი ვიკიოწკარუეს იჩუალუაფუ.</string>
+    <string name="welcome_copyright_text">თქვანი სურათეფი კათაშ გონათუას ოხვარუ ედომუშამ მოსოფელს.</string>
+    <string name="welcome_final_button_text">ქოǃ</string>
+    <string name="detail_panel_cats_label">კატეგორიეფი</string>
+    <string name="detail_panel_cats_loading">იხარგუ...</string>
+    <string name="detail_panel_cats_none">მუთუნ ვა რე გიშაგორილი</string>
+    <string name="detail_description_empty">ვა რე ეჭარუა</string>
+    <string name="detail_license_empty">უჩინებუ ლიცენზია</string>
+    <string name="menu_refresh">გოახალაფა</string>
+    <string name="ok">OK</string>
+    <string name="title_activity_nearby">გოხოლუაშ აბანეფი</string>
+    <string name="no_nearby">გოხოლუაშ აბანეფქ ვეგორუ</string>
+    <string name="warning">გათხილება</string>
+    <string name="yes">ქო</string>
+    <string name="no">ვარი</string>
+    <string name="media_detail_title">დუდჯოხო</string>
+    <string name="media_detail_media_title">მედიაფაილიშ დუდჯოხო</string>
+    <string name="media_detail_description">ეჭარუა</string>
+    <string name="media_detail_uploaded_date">ეხარგუაშ თარიღი</string>
+    <string name="media_detail_license">ლიცენზია</string>
+    <string name="media_detail_coordinates">კოორდინატეფი</string>
+    <string name="become_a_tester_title">ბეტა ტესტირებას კათაფი</string>
+    <string name="use_wikidata">ვიკიმუნაჩემეფიშ გჷმორინაფა</string>
+    <string name="_2fa_code">2ფა კოდი</string>
+    <string name="number_of_uploads">ჩქიმი ბოლო ეხარგუეფიშ ლიმიტი</string>
+    <string name="maximum_limit">მაქსიმალური ლიმიტი</string>
+    <string name="maximum_limit_alert">500-შე უმოსიშ ძირაფა ვეშილებე</string>
+    <string name="set_limit">ბოლო ეხარგუეფიშ ლიმიტიშ გერინაფა</string>
+</resources>