From d95bab800c9a6aad039d4971ec272a764307f128 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Tue, 31 May 2016 21:28:36 +0100 Subject: [PATCH] Remove text advising to skip categories --- README.md | 6 ++- .../res/layout/fragment_categorization.xml | 2 +- commons/res/values-af/strings.xml | 2 +- commons/res/values-ar/strings.xml | 2 +- commons/res/values-bn/strings.xml | 2 +- commons/res/values-br/strings.xml | 2 +- commons/res/values-ca/strings.xml | 2 +- commons/res/values-cs/strings.xml | 2 +- commons/res/values-cy/strings.xml | 2 +- commons/res/values-da/strings.xml | 2 +- commons/res/values-de/strings.xml | 2 +- commons/res/values-el/strings.xml | 2 +- commons/res/values-es/strings.xml | 2 +- commons/res/values-eu/strings.xml | 2 +- commons/res/values-fa/strings.xml | 2 +- commons/res/values-fi/strings.xml | 2 +- commons/res/values-fo/strings.xml | 2 +- commons/res/values-fr/strings.xml | 2 +- commons/res/values-gl/strings.xml | 2 +- commons/res/values-he/strings.xml | 2 +- commons/res/values-hu/strings.xml | 2 +- commons/res/values-id/strings.xml | 2 +- commons/res/values-it/strings.xml | 2 +- commons/res/values-ja/strings.xml | 2 +- commons/res/values-km/strings.xml | 2 +- commons/res/values-ko/strings.xml | 2 +- commons/res/values-ky/strings.xml | 2 +- commons/res/values-la/strings.xml | 2 +- commons/res/values-lb/strings.xml | 2 +- commons/res/values-mk/strings.xml | 2 +- commons/res/values-ml/strings.xml | 2 +- commons/res/values-ms/strings.xml | 2 +- commons/res/values-mt/strings.xml | 2 +- commons/res/values-nb/strings.xml | 2 +- commons/res/values-ne/strings.xml | 2 +- commons/res/values-nl/strings.xml | 2 +- commons/res/values-or/strings.xml | 2 +- commons/res/values-pa/strings.xml | 2 +- commons/res/values-pl/strings.xml | 2 +- commons/res/values-pt-rBR/strings.xml | 2 +- commons/res/values-pt/strings.xml | 2 +- commons/res/values-qq/strings.xml | 2 +- commons/res/values-ro/strings.xml | 2 +- commons/res/values-ru/strings.xml | 2 +- commons/res/values-sk/strings.xml | 2 +- commons/res/values-sv/strings.xml | 2 +- commons/res/values-te/strings.xml | 2 +- commons/res/values-tr/strings.xml | 2 +- commons/res/values-uk/strings.xml | 2 +- commons/res/values-vi/strings.xml | 2 +- commons/res/values-zh-rCN/strings.xml | 2 +- commons/res/values-zh-rTW/strings.xml | 2 +- commons/res/values-zh/strings.xml | 2 +- commons/res/values/strings.xml | 4 +- commons/res/xml/wikimedia_licenses.xml | 2 + .../category/CategorizationFragment.java | 46 ++++++++++--------- .../nrw/commons/category/MethodAUpdater.java | 2 +- .../nrw/commons/category/PrefixUpdater.java | 2 +- 58 files changed, 87 insertions(+), 79 deletions(-) diff --git a/README.md b/README.md index 692e7d82a..1a568ba70 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Initially started by the Wikimedia Foundation, this app is now maintained by vol ### Import and Compile Commons Android App ## -[Download IntelliJ][6] or [Download Android Studio][7]. +[Download IntelliJ][6] or [Download Android Studio][7]. (Note: The steps below currently only work on Android Studio 1.5 and below) 1. Clone the repository. 2. Open IntelliJ/Android Studio. Ensure Maven integration plugin is enabled (File > Settings > Plugins > Maven integration). @@ -39,7 +39,9 @@ Initially started by the Wikimedia Foundation, this app is now maintained by vol 11. Select 'Finish'. 12. After the program opens select 'Make project' - there should be errors. 13. Near the top of the file that is opened up, one of the offending lines should be "import android.support.v4.app.FragmentActivity;" - put your cursor on that line and hit 'alt'/'option'+'enter' to bring up the AutoFix dialog. Select the 'compatibility' option. -14. Select 'Make project' again. It should compile successfully. +14. File -> Project Structure -> Project and ensure the Project SDK is set to at least API 23. This is required for DocumentsContract to work. +15. File -> Project Structure -> Modules and select 'commons'. Select the 'Dependencies' tab and click the green '+' button. Select 'JARs or directories' and navigate to the 'lib' folder. Select all the .jars in that folder and click 'OK'. This imports the QuadTree and GSON libraries. +16. Select 'Make project' again. It should compile successfully. ## License ## diff --git a/commons/res/layout/fragment_categorization.xml b/commons/res/layout/fragment_categorization.xml index 900f868dc..9c2995bc5 100644 --- a/commons/res/layout/fragment_categorization.xml +++ b/commons/res/layout/fragment_categorization.xml @@ -54,7 +54,7 @@ android:layout_marginTop="48dp" android:gravity="center" android:focusable="true" - android:text="@string/categories_skip_explanation" + android:text="@string/categories_explanation" android:visibility="gone" /> diff --git a/commons/res/values-af/strings.xml b/commons/res/values-af/strings.xml index a00af87c3..378a73754 100644 --- a/commons/res/values-af/strings.xml +++ b/commons/res/values-af/strings.xml @@ -44,7 +44,7 @@ Soek kategorieë Stoor Geen kategorieë met \"%1$s\" gevind nie - Voeg kategorieë by om dit makliker te maak om u beelde op te spoor. + Voeg kategorieë by om dit makliker te maak om u beelde op te spoor. Begin tik om kategorieë by te sit. Tik die boodskap (of terug) om die stap oor te slaan. diff --git a/commons/res/values-ar/strings.xml b/commons/res/values-ar/strings.xml index 97fb6d719..f5c9bae7d 100644 --- a/commons/res/values-ar/strings.xml +++ b/commons/res/values-ar/strings.xml @@ -45,7 +45,7 @@ تصنيفات البحث احفظ لا توجد تصنيفات تطابق %1$s - أضف التصانيف لتسهل اكتشاف صورك على ويكيميديا كومنز. + أضف التصانيف لتسهل اكتشاف صورك على ويكيميديا كومنز. ابدأ الكتاب لتضيف التصانيف. انقر هذه الرسالة لتتجاوز هذه الخطوة. diff --git a/commons/res/values-bn/strings.xml b/commons/res/values-bn/strings.xml index d9ba3e6c7..d129230dc 100644 --- a/commons/res/values-bn/strings.xml +++ b/commons/res/values-bn/strings.xml @@ -61,7 +61,7 @@ %dটি আপলোড %1$s বিষয়শ্রেণী পাওয়া যায়নি - উইকিমিডিয়া কমন্স থেকে আপনার মিডিয়া ফাইলটি সহজে খুঁজে পেতে বিষয়শ্রেণী যুক্ত করুন। + উইকিমিডিয়া কমন্স থেকে আপনার মিডিয়া ফাইলটি সহজে খুঁজে পেতে বিষয়শ্রেণী যুক্ত করুন। বিষয়শ্রেণী যোগ করার জন্য টাইপিং শুরু করুন। এই ধাপটি বাতিল করতে এই বার্তা (বা ফিরে যান) ট্যাপ করুন। diff --git a/commons/res/values-br/strings.xml b/commons/res/values-br/strings.xml index cb9aff0a4..186f5bce0 100644 --- a/commons/res/values-br/strings.xml +++ b/commons/res/values-br/strings.xml @@ -58,7 +58,7 @@ %d pellgargadennoù N\'eus bet kavet rummad ebet o klotañ gant %1$s - Ouzhpennit rummadoù evit ma vo aesoc\'h kavout ho skeudennoù war Wikimedia Commons. + Ouzhpennit rummadoù evit ma vo aesoc\'h kavout ho skeudennoù war Wikimedia Commons. Krogit da ouzhpennañ rummadoù. Pouezit war ar c\'hemenn-mañ (pe distroit en a-raok) evit mont dreist ar bazenn-mañ. diff --git a/commons/res/values-ca/strings.xml b/commons/res/values-ca/strings.xml index eba9dbc72..0b24ae13f 100644 --- a/commons/res/values-ca/strings.xml +++ b/commons/res/values-ca/strings.xml @@ -61,7 +61,7 @@ %d càrregues No s\'ha trobat cap categoria que coincideixi amb %1$s - Afegiu categories per fer que les vostres imatges siguin més fàcils de trobar a Wikimedia Commons. + Afegiu categories per fer que les vostres imatges siguin més fàcils de trobar a Wikimedia Commons. Categories Informes d\'ús Envia informes d\'ús a Wikimedia per ajudar-nos a millorar l\'aplicació diff --git a/commons/res/values-cs/strings.xml b/commons/res/values-cs/strings.xml index 07e4e574b..63775d8d0 100644 --- a/commons/res/values-cs/strings.xml +++ b/commons/res/values-cs/strings.xml @@ -44,7 +44,7 @@ Hledání kategorií Uložit Žádné kategorie neodpovídají „%1$s“ - Přidejte kategorie, aby bylo vaše obrázky možno na Wikimedia Commons najít. + Přidejte kategorie, aby bylo vaše obrázky možno na Wikimedia Commons najít. Kategorie Hlášení o používání Odesílat hlášení o používání nadaci Wikimedia za účelem zlepšování aplikace diff --git a/commons/res/values-cy/strings.xml b/commons/res/values-cy/strings.xml index 51ed5980f..326c65d91 100644 --- a/commons/res/values-cy/strings.xml +++ b/commons/res/values-cy/strings.xml @@ -44,7 +44,7 @@ Archwilio\'r categorïau Cadw Dim categori\'n cyfateb i %1$s ar gael - Cychwynwch deipio i ychwanegu categoriau. + Cychwynwch deipio i ychwanegu categoriau. Cyffyrddwch y neges hon (neu ddewis Nôl) i fynd i\'r cam nesaf. Categorïau Adroddiadau ar y defnydd diff --git a/commons/res/values-da/strings.xml b/commons/res/values-da/strings.xml index ba2511c2b..9b5c3d660 100644 --- a/commons/res/values-da/strings.xml +++ b/commons/res/values-da/strings.xml @@ -44,7 +44,7 @@ Søgekategorier Gem Ingen kategorier matchende %1$s er fundet - Tilføj kategorier for at gøre billederne mere synlig på Wikimedia Commons. + Tilføj kategorier for at gøre billederne mere synlig på Wikimedia Commons. Kategorier Brugsrapporter Send brugsrapporter til Wikimedia, så vi kan forbedre denne app diff --git a/commons/res/values-de/strings.xml b/commons/res/values-de/strings.xml index fea2c5d34..1f6d8ceae 100644 --- a/commons/res/values-de/strings.xml +++ b/commons/res/values-de/strings.xml @@ -58,7 +58,7 @@ %d hochgeladene Dateien Die Kategorie „%1$s“ wurde nicht gefunden - Füge Kategorien hinzu, um deine Bilder auf Wikimedia Commons auffindbarer zu machen. + Füge Kategorien hinzu, um deine Bilder auf Wikimedia Commons auffindbarer zu machen. Beginn zu schreiben, um Kategorien hinzuzufügen. Tippe auf diese Nachricht oder drücke „Zurück“, um diesen Schritt zu überspringen. diff --git a/commons/res/values-el/strings.xml b/commons/res/values-el/strings.xml index acc24a7b5..20ffbb7be 100644 --- a/commons/res/values-el/strings.xml +++ b/commons/res/values-el/strings.xml @@ -61,7 +61,7 @@ %d επιφορτώσεις Δεν βρέθηκαν κατηγορίες που ταιριάζουν %1$s - Προσθέστε κατηγορίες για να κάνετε τις εικόνες σας πιο ανιχνεύσιμες στα Wikimedia Commons. + Προσθέστε κατηγορίες για να κάνετε τις εικόνες σας πιο ανιχνεύσιμες στα Wikimedia Commons. Αρχίστε να γράφετε για να προσθέσετε κατηγορίες. Πατήστε αυτό το μήνυμα (ή πατήστε επιστροφή) για να παραλείψετε αυτό το βήμα. diff --git a/commons/res/values-es/strings.xml b/commons/res/values-es/strings.xml index 2f1a6950e..337d5932b 100644 --- a/commons/res/values-es/strings.xml +++ b/commons/res/values-es/strings.xml @@ -58,7 +58,7 @@ %d cargas No se encontraron categorías que coincidieran con %1$s - Añade categorías para hacer que tus imágenes sean más fáciles de encontrar en Wikimedia Commons. + Añade categorías para hacer que tus imágenes sean más fáciles de encontrar en Wikimedia Commons. Comienza a escribir para añadir categorías. Toca este mensaje (o pulsa Anterior) para omitir este paso. diff --git a/commons/res/values-eu/strings.xml b/commons/res/values-eu/strings.xml index 7533bea02..3c6f489f7 100644 --- a/commons/res/values-eu/strings.xml +++ b/commons/res/values-eu/strings.xml @@ -44,7 +44,7 @@ Kategoriak bilatu Gorde Ez da kategoriak aukritu %1$s izenarekin - Gehitu kategoriak zure argazkiak Wikimedia Commonsen aurkitzen errazagoak izan daitezen. + Gehitu kategoriak zure argazkiak Wikimedia Commonsen aurkitzen errazagoak izan daitezen. Kategoriak Erabilera txostenak Erabiler txostenak Wikimediara bidaltzen tresna hau hobetzen laguntzen diguzu diff --git a/commons/res/values-fa/strings.xml b/commons/res/values-fa/strings.xml index e9edc61aa..01fcaaef8 100644 --- a/commons/res/values-fa/strings.xml +++ b/commons/res/values-fa/strings.xml @@ -61,7 +61,7 @@ %d بارگذاری رده‌ای منطبق با %1$s یافت نشد - برای دسترسی آسان‌تر در ویکی‌انبار به تصویرهایتان رده بیافزائید. + برای دسترسی آسان‌تر در ویکی‌انبار به تصویرهایتان رده بیافزائید. شروع به افزودن رده. این پیام (یا دکمه بازگشت) را لمس کنید تا این مرحله پایان پذیرد. diff --git a/commons/res/values-fi/strings.xml b/commons/res/values-fi/strings.xml index 050d9e62c..7ed263f76 100644 --- a/commons/res/values-fi/strings.xml +++ b/commons/res/values-fi/strings.xml @@ -44,7 +44,7 @@ Etsi luokkia Tallenna Luokkaa %1$s ei löytynyt - Lisää luokkia tehdäksesi kuvistasi helpommin löydettäviä. + Lisää luokkia tehdäksesi kuvistasi helpommin löydettäviä. Aloita kirjoittaminen lisätäksesi luokkia. Napauta tätä viestiä (tai paina takaisin) ohittaaksesi tämän vaiheen. diff --git a/commons/res/values-fo/strings.xml b/commons/res/values-fo/strings.xml index 68b156db5..555445081 100644 --- a/commons/res/values-fo/strings.xml +++ b/commons/res/values-fo/strings.xml @@ -44,7 +44,7 @@ Leita í bólkum Goym Ongin bólkur sum passaði saman við %1$s varð funnin - Legg bólkar til fyri at tínar myndir verða lættari at finna á Wikimedia Commons. + Legg bólkar til fyri at tínar myndir verða lættari at finna á Wikimedia Commons. Byrja við at skriva fyri at leggja bólkar til. Trýst hetta boðið (ella vend aftur) fyri at droppa hetta stigið. diff --git a/commons/res/values-fr/strings.xml b/commons/res/values-fr/strings.xml index ed293e0a5..85351fd9a 100644 --- a/commons/res/values-fr/strings.xml +++ b/commons/res/values-fr/strings.xml @@ -58,7 +58,7 @@ %d téléchargements Aucune catégorie correspondant à %1$s trouvée - Ajoutez des catégories pour rendre vos images plus simple à trouver sur Wikimedia Commons. + Ajoutez des catégories pour rendre vos images plus simple à trouver sur Wikimedia Commons. Commencer à ajouter des catégories. Appuyez sur ce message (ou retournez en arrière) pour sauter cette étape. diff --git a/commons/res/values-gl/strings.xml b/commons/res/values-gl/strings.xml index 157f464f4..b54bbc480 100644 --- a/commons/res/values-gl/strings.xml +++ b/commons/res/values-gl/strings.xml @@ -58,7 +58,7 @@ %d cargas Non se atopou ningunha categoría que coincidise con \"%1$s\" - Engada categorías para facer máis accesibles as súas imaxes na Wikimedia Commons. + Engada categorías para facer máis accesibles as súas imaxes na Wikimedia Commons. Comece a escribir para engadir categorías. Prema nesta mensaxe (ou no botón \"Atrás\") para saltar este paso. diff --git a/commons/res/values-he/strings.xml b/commons/res/values-he/strings.xml index 01caefa7a..1c0349c78 100644 --- a/commons/res/values-he/strings.xml +++ b/commons/res/values-he/strings.xml @@ -45,7 +45,7 @@ חיפוש קטגוריות שמירה לא נמצאו קטגוריות בשם %1$s - נא להוסיף קטגוריות כדי שיהיה קל יותר למצוא את התמונות שלך בוויקישיתוף. + נא להוסיף קטגוריות כדי שיהיה קל יותר למצוא את התמונות שלך בוויקישיתוף. כדי להוסיף קטגוריה יש להתחיל לכתוב. יש ללחוץ על ההודעה הזאת או על כפתור \"חזרה\" כדי לדלג על הצעד הזה. diff --git a/commons/res/values-hu/strings.xml b/commons/res/values-hu/strings.xml index 0cf3df51d..15429f067 100644 --- a/commons/res/values-hu/strings.xml +++ b/commons/res/values-hu/strings.xml @@ -45,7 +45,7 @@ Keresés a kategóriák között Mentés Nincs a(z) „%1$s” keresési kifejezésnek megfelelő kategória - Adj kategóriákat a képekhez, hogy könnyebben meg lehessen találni őket a Commonson. + Adj kategóriákat a képekhez, hogy könnyebben meg lehessen találni őket a Commonson. Kezdd el beírni a kategória nevét, hogy hozzáadd. Kattints erre az üzenetre a lépés kihagyásához diff --git a/commons/res/values-id/strings.xml b/commons/res/values-id/strings.xml index 1472a20b2..0c9e4dd39 100644 --- a/commons/res/values-id/strings.xml +++ b/commons/res/values-id/strings.xml @@ -61,7 +61,7 @@ %d unggahan Tidak ada kategori yang cocok dengan %1$s - Tambahkan kategori agar foto Anda lebih mudah ditemukan di Wikimedia Commons. + Tambahkan kategori agar foto Anda lebih mudah ditemukan di Wikimedia Commons. Mulai mengetik untuk menambahkan kategori. Tekan pesan ini (atau tekan kembali) untuk melewatkan langkah ini. diff --git a/commons/res/values-it/strings.xml b/commons/res/values-it/strings.xml index a1a3d3693..7585e10af 100644 --- a/commons/res/values-it/strings.xml +++ b/commons/res/values-it/strings.xml @@ -58,7 +58,7 @@ %d caricamenti Non è stata trovata alcuna categoria che contiene %1$s - Aggiungi categorie per rendere le tue immagini più facilmente individuabili su Wikimedia Commons. + Aggiungi categorie per rendere le tue immagini più facilmente individuabili su Wikimedia Commons. Inizia a digitare per aggiungere categorie. Tocca questo messaggio (o premi Indietro) per saltare l\'aggiunta di categorie. diff --git a/commons/res/values-ja/strings.xml b/commons/res/values-ja/strings.xml index 82d1c39aa..201215c23 100644 --- a/commons/res/values-ja/strings.xml +++ b/commons/res/values-ja/strings.xml @@ -44,7 +44,7 @@ 検索するカテゴリ 保存 %1$s に一致するカテゴリが見つかりません - あなたの画像をウィキメディア・コモンズで見つけやすくするためにカテゴリを追加してください。 + あなたの画像をウィキメディア・コモンズで見つけやすくするためにカテゴリを追加してください。 カテゴリ名の入力を開始してください。 この手順をスキップするにはこのメッセージをタップしてください(または戻るボタン)。 diff --git a/commons/res/values-km/strings.xml b/commons/res/values-km/strings.xml index 8ce4ceb5b..8bc335820 100644 --- a/commons/res/values-km/strings.xml +++ b/commons/res/values-km/strings.xml @@ -44,7 +44,7 @@ ស្វែងរកចំណាត់ថ្នាក់ក្រុម រក្សាទុក រកមិនឃើញចំណាត់ថ្នាក់ក្រុមដែលត្រូវនឹង %1$s ទេ - បន្ថែមចំណាត់ថ្នាក់ក្រុមអោយរូបភាពរបស់អ្នកដើម្បីអោយងាយស្រួលស្វែងរក្នុង Wikimedia Commons។ + បន្ថែមចំណាត់ថ្នាក់ក្រុមអោយរូបភាពរបស់អ្នកដើម្បីអោយងាយស្រួលស្វែងរក្នុង Wikimedia Commons។ ចាប់ផ្ដើមវាយបញ្ចូលឈ្មោះចំណាត់ថ្នាក់ក្រុម។ ចុចលើសារនេះ (ឬចុចប៊ូតុងត្រលប់ក្រោយ)ដើម្បីរំលងជំហ៊ាននេះ។ ចំណាត់ថ្នាក់ក្រុម diff --git a/commons/res/values-ko/strings.xml b/commons/res/values-ko/strings.xml index 4f4902afd..17afd61a8 100644 --- a/commons/res/values-ko/strings.xml +++ b/commons/res/values-ko/strings.xml @@ -54,7 +54,7 @@ %d 장 업로드 %1$s와(과) 일치하는 분류를 찾을 수 없습니다 - 위키미디어 공용에 그림을 더 찾을 수 있도록 분류를 추가합니다. + 위키미디어 공용에 그림을 더 찾을 수 있도록 분류를 추가합니다. 분류를 추가하려면 입력을 시작하세요. 이 단계를 건너뛰려면 이 메시지를 탭하세요(또는 뒤로를 누르세요). diff --git a/commons/res/values-ky/strings.xml b/commons/res/values-ky/strings.xml index a4cea0518..37810fa06 100644 --- a/commons/res/values-ky/strings.xml +++ b/commons/res/values-ky/strings.xml @@ -61,7 +61,7 @@ %d жүктөө %1$s түрмөктөрү табылган жок - Уикиказынада Сиздин сүрөттөрдү жеңил табуу үчүн түрмөктөрдү кошуңуз. + Уикиказынада Сиздин сүрөттөрдү жеңил табуу үчүн түрмөктөрдү кошуңуз. Түрмөктөрдү жазууну баштаңыз. Бул кадамды аттап өтүү үчүн, бул билдирүүнү (же кийинкини) басыңыз. diff --git a/commons/res/values-la/strings.xml b/commons/res/values-la/strings.xml index 21de0a3ec..f865e3421 100644 --- a/commons/res/values-la/strings.xml +++ b/commons/res/values-la/strings.xml @@ -38,7 +38,7 @@ Categorias scrutari Servare Nullae categoriae %1$s adaequant - Categorias perspicuitatis Vicimediae causa addere. + Categorias perspicuitatis Vicimediae causa addere. Hanc notionem tangere ad id praetermittere. Categoriae diff --git a/commons/res/values-lb/strings.xml b/commons/res/values-lb/strings.xml index 5a5f39184..5d04dc06d 100644 --- a/commons/res/values-lb/strings.xml +++ b/commons/res/values-lb/strings.xml @@ -58,7 +58,7 @@ %d Fichieren eropgelueden D\'Kategorie %1$s gouf net fonnt - Fänkt u mat Tippen fir Kategorien derbäizesetzen. + Fänkt u mat Tippen fir Kategorien derbäizesetzen. Klickt op dëse Message (oder dréck op Zréck) fir dëse Schrëtt z\'iwwersprangen. Kategorien Rapporten iwwer de Gebrauch diff --git a/commons/res/values-mk/strings.xml b/commons/res/values-mk/strings.xml index fb8696750..24668eade 100644 --- a/commons/res/values-mk/strings.xml +++ b/commons/res/values-mk/strings.xml @@ -58,7 +58,7 @@ %d подигања Нема категории што одговараат на %1$s - Ставете им категории на сликите, за да можат корисниците полесно да ги најдат на Ризницата. + Ставете им категории на сликите, за да можат корисниците полесно да ги најдат на Ризницата. За да ставите категорија, почнете со пишување на нејзиното име. Допрете ја поракава (или стиснете на назад) за да го прескокнете овој чекор. diff --git a/commons/res/values-ml/strings.xml b/commons/res/values-ml/strings.xml index e0e687cf9..6a8503d0d 100644 --- a/commons/res/values-ml/strings.xml +++ b/commons/res/values-ml/strings.xml @@ -61,7 +61,7 @@ %d അപ്‌ലോഡുകൾ %1$s എന്നതുമായി പൊരുത്തമുള്ള ഒരു വർഗ്ഗവും കണ്ടെത്താനായില്ല - താങ്കളുടെ ചിത്രങ്ങൾ വിക്കിമീഡിയ കോമൺസിൽ കൂടുതൽ എളുപ്പത്തിൽ കണ്ടെത്തപ്പെടാനായി വർഗ്ഗങ്ങൾ ചേർക്കുക. + താങ്കളുടെ ചിത്രങ്ങൾ വിക്കിമീഡിയ കോമൺസിൽ കൂടുതൽ എളുപ്പത്തിൽ കണ്ടെത്തപ്പെടാനായി വർഗ്ഗങ്ങൾ ചേർക്കുക. വർഗ്ഗങ്ങൾ ചേർക്കാനായി ടൈപ്പ് ചെയ്ത് തുടങ്ങുക. ഈ ഘട്ടം ഒഴിവാക്കാൻ ടാപ് ചെയ്യുക (അല്ലെങ്കിൽ പിന്നോട്ട് പോവുക). diff --git a/commons/res/values-ms/strings.xml b/commons/res/values-ms/strings.xml index b2b3f0202..c3612ae43 100644 --- a/commons/res/values-ms/strings.xml +++ b/commons/res/values-ms/strings.xml @@ -52,7 +52,7 @@ Memulakan %d kerja muat naik 1 muatnaikan Tiada kategori yang sepadan dengan %1$s dijumpai - Tambahkan kategori supaya gambar-gambar anda lebih senang ditemui di Wikimedia Commons. + Tambahkan kategori supaya gambar-gambar anda lebih senang ditemui di Wikimedia Commons. Mula menaip untuk menambahkan kategori. Ketik mesej ini (atau tekan butang undur) untuk melangkau langkah ini. diff --git a/commons/res/values-mt/strings.xml b/commons/res/values-mt/strings.xml index cd26dd4bb..e3706bacb 100644 --- a/commons/res/values-mt/strings.xml +++ b/commons/res/values-mt/strings.xml @@ -39,7 +39,7 @@ Fittex fil-kategoriji Salva L-ebda kategorija ma nstabet li għandha %1$s - Żid kategoriji sabiex l-istampi tiegħek ikunu skoperti iktar fuq Wikimedia Commons. + Żid kategoriji sabiex l-istampi tiegħek ikunu skoperti iktar fuq Wikimedia Commons. Ibda ikteb sabiex iżżid kategoriji. Agħfas fuq dan il-messaġġ (jew mur lura) sabiex taqbeż dan il-pass. diff --git a/commons/res/values-nb/strings.xml b/commons/res/values-nb/strings.xml index fe9313d68..dff806fa4 100644 --- a/commons/res/values-nb/strings.xml +++ b/commons/res/values-nb/strings.xml @@ -61,7 +61,7 @@ %d opplastinger Ingen kategorier som stemte overens med %1$s funnet - Legg til kategorier for å gjøre bildene dine lettere å finne på Wikimedia Commons. + Legg til kategorier for å gjøre bildene dine lettere å finne på Wikimedia Commons. Begynn å skrive navnet på kategoriene. Trykk på denne meldingen (eller trykk tilbake) for å hoppe over dette steget. diff --git a/commons/res/values-ne/strings.xml b/commons/res/values-ne/strings.xml index 2b867f527..20f72b9e7 100644 --- a/commons/res/values-ne/strings.xml +++ b/commons/res/values-ne/strings.xml @@ -44,7 +44,7 @@ खोज श्रेणीहरू संग्रह गर्ने मिल्दो वर्ग %1$s फेला परेन - विकिमीडिया कमन्समा आफ्नो तस्वीरहरू थप भेट्टाउने बनाउन वर्नहरू थप्नुहोस। + विकिमीडिया कमन्समा आफ्नो तस्वीरहरू थप भेट्टाउने बनाउन वर्नहरू थप्नुहोस। वर्गहरू थप्नको लागि टाइप गर्न सुरु गर्नुहोस्। यो चरण छोड्न यो सन्देशमा ट्याप गर्नुहोस् (वा पछाडि जाने थिच्नुहोस्)। diff --git a/commons/res/values-nl/strings.xml b/commons/res/values-nl/strings.xml index 6c24d9028..26a2b0cdd 100644 --- a/commons/res/values-nl/strings.xml +++ b/commons/res/values-nl/strings.xml @@ -58,7 +58,7 @@ %d uploads Er zijn geen categorieën met \"%1$s\" gevonden - Voeg categorieën toe om uw afbeeldingen makkelijker te vinden te maken op Wikimedia Commons. + Voeg categorieën toe om uw afbeeldingen makkelijker te vinden te maken op Wikimedia Commons. Begin met het toevoegen van categorieën. diff --git a/commons/res/values-or/strings.xml b/commons/res/values-or/strings.xml index ec8face5f..7906f38a3 100644 --- a/commons/res/values-or/strings.xml +++ b/commons/res/values-or/strings.xml @@ -44,7 +44,7 @@ ଶ୍ରେଣୀଗୁଡ଼ିକ ଖୋଜନ୍ତୁ ସାଇତିବେ [Save] %1$s ସହ ମେଳ ହେଉଥିବା କୌଣସି ଶ୍ରେଣୀ ମିଳିଲା ନାହିଁ - ଶ୍ରେଣୀମାନ ଯୋଡ଼ିବା ପାଇଁ ଟାଇପ କରନ୍ତୁ । + ଶ୍ରେଣୀମାନ ଯୋଡ଼ିବା ପାଇଁ ଟାଇପ କରନ୍ତୁ । ଏହି ସୋପାନଟି ବାଦ ଦେବା ପାଇଁ ମେସେଜଟି ଉପରେ ଟ୍ୟାପ କରନ୍ତୁ (କିମ୍ବା ପଛକୁ ଫେରନ୍ତୁ) । ଶ୍ରେଣୀସମୂହ ବ୍ୟବହାର ବିବରଣୀ diff --git a/commons/res/values-pa/strings.xml b/commons/res/values-pa/strings.xml index 6f89c7093..663666e2b 100644 --- a/commons/res/values-pa/strings.xml +++ b/commons/res/values-pa/strings.xml @@ -60,7 +60,7 @@ %d ਅੱਪਲੋਡ %1$s ਨਾਲ਼ ਮੇਲ ਖਾਂਦੀ ਕੋਈ ਸ਼੍ਰੇਣੀ ਨਹੀਂ ਲੱਭੀ - ਆਪਣੀਆਂ ਤਸਵੀਰਾਂ ਨੂੰ ਵਿਕੀਮੀਡੀਆ ਕਾਮਨਜ਼ ਵਿਚ ਜ਼ਿਆਦਾ ਲੱਭਣਯੋਗ ਬਣਾਉਣ ਲਈ ਸ਼੍ਰੇਣੀਆਂ ਜੋੜੋ। + ਆਪਣੀਆਂ ਤਸਵੀਰਾਂ ਨੂੰ ਵਿਕੀਮੀਡੀਆ ਕਾਮਨਜ਼ ਵਿਚ ਜ਼ਿਆਦਾ ਲੱਭਣਯੋਗ ਬਣਾਉਣ ਲਈ ਸ਼੍ਰੇਣੀਆਂ ਜੋੜੋ। ਸ਼੍ਰੇਣੀਆਂ ਜੋੜਨ ਲਈ ਟਾਈਪ ਕਰਨ ਅਰੰਭ ਕਰੋ। ਇਸ ਕਾਰਜ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਨ ਲਈ ਇਹ ਸੁਨੇਹਾ ਥਪੇੜੋ (ਜਾਂ ਵਾਪਸੀ ਬਟਨ ਦਬਾਓ)। diff --git a/commons/res/values-pl/strings.xml b/commons/res/values-pl/strings.xml index 04d67adc9..f309c8151 100644 --- a/commons/res/values-pl/strings.xml +++ b/commons/res/values-pl/strings.xml @@ -44,7 +44,7 @@ Szukaj kategorii Zapisz Kategorii %1$s nie znaleziono - Dodaj kategorię aby Twoje pliki były łatwiej wyszukiwalne na Commons. + Dodaj kategorię aby Twoje pliki były łatwiej wyszukiwalne na Commons. Zacznij dobierać kategorię. Dotknij tej wiadomości (lub naciśnij \"cofnij\") aby pominąć ten krok diff --git a/commons/res/values-pt-rBR/strings.xml b/commons/res/values-pt-rBR/strings.xml index ac2e06703..b14e07935 100644 --- a/commons/res/values-pt-rBR/strings.xml +++ b/commons/res/values-pt-rBR/strings.xml @@ -53,7 +53,7 @@ %d envios Nenhuma categoria correspondente %1$s encontrada - Adicione categorias para fazer suas imagens mais vistas no Wikimedia Commons. + Adicione categorias para fazer suas imagens mais vistas no Wikimedia Commons. Comece a digitar para adicionar categorias. Aperte nesta mensagem (ou aperte para voltar) para pular este passo diff --git a/commons/res/values-pt/strings.xml b/commons/res/values-pt/strings.xml index 4fb4bf703..9f187b553 100644 --- a/commons/res/values-pt/strings.xml +++ b/commons/res/values-pt/strings.xml @@ -61,7 +61,7 @@ %d carregamentos Nenhuma categoria correspondente %1$s encontrada - Adicione categorias para tornar as suas imagens mais fáceis de encontrar no Wikimedia Commons. + Adicione categorias para tornar as suas imagens mais fáceis de encontrar no Wikimedia Commons. Comece a digitar para adicionar categorias. Carregue nesta mensagem (ou carregue para voltar) para saltar este passo diff --git a/commons/res/values-qq/strings.xml b/commons/res/values-qq/strings.xml index d1c55cc29..c3ca79abd 100644 --- a/commons/res/values-qq/strings.xml +++ b/commons/res/values-qq/strings.xml @@ -62,7 +62,7 @@ {{Identical|Save}} {{Identical|Upload}} Message shown to the user when no category matching what they searched for was found. %1$s represents the category name - Text explaining to users why and how to add categories to images. Users can also tap this message to skip adding categories. + Text explaining to users why and how to add categories to images. Users can also tap this message to skip adding categories. Title for the activity where Categories are being selected to add to the Image. {{Identical|Category}} Text for preference that enables the user to enable or disable collection of data about the user\'s usage patterns. diff --git a/commons/res/values-ro/strings.xml b/commons/res/values-ro/strings.xml index a04da313d..3506bb911 100644 --- a/commons/res/values-ro/strings.xml +++ b/commons/res/values-ro/strings.xml @@ -61,7 +61,7 @@ %d de încărcări Nu s-a găsit nicio categorie corespunzătoare cu %1$s - Adăugați categorii pentru a facilita găsirea imaginilor dumneavoastră la Wikimedia Commons. + Adăugați categorii pentru a facilita găsirea imaginilor dumneavoastră la Wikimedia Commons. Începeți să tastați pentru a adăuga categorii. Atingeți acest mesaj (sau mergeți înapoi) pentru a omite acest pas. diff --git a/commons/res/values-ru/strings.xml b/commons/res/values-ru/strings.xml index df234caae..b64f3441e 100644 --- a/commons/res/values-ru/strings.xml +++ b/commons/res/values-ru/strings.xml @@ -65,7 +65,7 @@ %d загрузки Категории, соответствующие %1$s, не найдены - Добавьте категории, чтобы ваши изображения можно было легко найти на Викискладе. + Добавьте категории, чтобы ваши изображения можно было легко найти на Викискладе. Начните вводить название для добавления категорий. Нажмите на это сообщение (или за ним), чтобы пропустить этот шаг. diff --git a/commons/res/values-sk/strings.xml b/commons/res/values-sk/strings.xml index 08d8cb3c6..222d8cdb3 100644 --- a/commons/res/values-sk/strings.xml +++ b/commons/res/values-sk/strings.xml @@ -44,7 +44,7 @@ Vyhľadávanie kategórií Uložiť Žiadne kategórie nezodpovedajú „%1$s“ - Pridajte kategórie, aby boli vaše obrázky možné na Wikimedia Commons nájsť. + Pridajte kategórie, aby boli vaše obrázky možné na Wikimedia Commons nájsť. Na pridanie kategórií začnite písať. Kliknite na tento odkaz (alebo na späť) ak chcete tento krok vynechať. diff --git a/commons/res/values-sv/strings.xml b/commons/res/values-sv/strings.xml index 58cbaef40..110d0b249 100644 --- a/commons/res/values-sv/strings.xml +++ b/commons/res/values-sv/strings.xml @@ -61,7 +61,7 @@ %d uppladdningar Inga kategorier som stämmer överens med %1$s hittades - Lägg till kategorier för att göra dina bilder synliga på Wikimedia Commons. + Lägg till kategorier för att göra dina bilder synliga på Wikimedia Commons. Börja skriva för att lägga till kategorier. Tryck på detta meddelande (eller gå tillbaka) för att hoppa över detta steg. diff --git a/commons/res/values-te/strings.xml b/commons/res/values-te/strings.xml index 494aaccb1..c19efd369 100644 --- a/commons/res/values-te/strings.xml +++ b/commons/res/values-te/strings.xml @@ -44,7 +44,7 @@ వర్గాల్లో వెతకండి భద్రపరచు %1$s తో సరిపోలే వర్గాలేమీ లేవు - వికీమీడియా కామన్స్ లో వెతికేటపుడు మీ బొమ్మలు మరింత సులువుగా కనబడేందుకు వాటికి వర్గాలను చేర్చండి. + వికీమీడియా కామన్స్ లో వెతికేటపుడు మీ బొమ్మలు మరింత సులువుగా కనబడేందుకు వాటికి వర్గాలను చేర్చండి. వర్గాలను చేర్చేందుకు టైపండి. ఈ అంగను దాటేసి ముందుకు పోయేందుకు, ఈ సందేశాన్ని నొక్కండి (లేదా ’బ్యాక్’ నొక్కండి) diff --git a/commons/res/values-tr/strings.xml b/commons/res/values-tr/strings.xml index 580e60900..bd03d41e8 100644 --- a/commons/res/values-tr/strings.xml +++ b/commons/res/values-tr/strings.xml @@ -61,7 +61,7 @@ %d yükleme %1$s ile eşleşen bir kategori bulunamadı - Resimlerinizi Wikimedia Commons\'ta daha bulunabilir duruma getirmek için kategoriler ekleyin. + Resimlerinizi Wikimedia Commons\'ta daha bulunabilir duruma getirmek için kategoriler ekleyin. Kategori eklemek için yazmaya başlayın. Bu adımı atlamak için bu iletiye dokunun ya da geri tıklayın. diff --git a/commons/res/values-uk/strings.xml b/commons/res/values-uk/strings.xml index 2f6785e45..9ac416eb4 100644 --- a/commons/res/values-uk/strings.xml +++ b/commons/res/values-uk/strings.xml @@ -64,7 +64,7 @@ %d завантажень Категорій, відповідних %1$s, не знайдено - Додайте категорії, щоб ваші зображення було легше знайти на Вікісховищі. + Додайте категорії, щоб ваші зображення було легше знайти на Вікісховищі. Почніть ввід щоб додати категорії. Натисніть на це повідомлення (або поверніться назад), щоб пропустити цей крок. diff --git a/commons/res/values-vi/strings.xml b/commons/res/values-vi/strings.xml index 213da8e35..655902dc2 100644 --- a/commons/res/values-vi/strings.xml +++ b/commons/res/values-vi/strings.xml @@ -51,7 +51,7 @@ Đang bắt đầu tải lên %d tập tin %d tập tin tải lên Không tìm thấy thể loại khớp với %1$s - Xếp các hình ảnh vào thể loại để cho chúng dễ tìm kiếm hơn trên Wikimedia Commons. + Xếp các hình ảnh vào thể loại để cho chúng dễ tìm kiếm hơn trên Wikimedia Commons. Hãy bắt đầu nhập tên thể loại để tìm kiếm. Chạm vào thông điệp này (hoặc bấm Quay lại) để bỏ qua bước này. diff --git a/commons/res/values-zh-rCN/strings.xml b/commons/res/values-zh-rCN/strings.xml index 150a264aa..90436427c 100644 --- a/commons/res/values-zh-rCN/strings.xml +++ b/commons/res/values-zh-rCN/strings.xml @@ -61,7 +61,7 @@ %d次上传 没有找到匹配%1$s的分类 - 为您的图片添加分类，让它们在维基共享上更容易被找到。 + 为您的图片添加分类，让它们在维基共享上更容易被找到。 开始添加分类。 点击本信息（或点击返回）跳过此步。 diff --git a/commons/res/values-zh-rTW/strings.xml b/commons/res/values-zh-rTW/strings.xml index 28eb311e8..d8c517b8f 100644 --- a/commons/res/values-zh-rTW/strings.xml +++ b/commons/res/values-zh-rTW/strings.xml @@ -58,7 +58,7 @@ %d 上傳 沒有發現與 %1$s 匹配的分類 - 添加分類使您的相片在維基共享資源上更容易發現。 + 添加分類使您的相片在維基共享資源上更容易發現。 開始輸入要添加的分類。 按此（或按返回）跳過此步驟。 diff --git a/commons/res/values-zh/strings.xml b/commons/res/values-zh/strings.xml index adc108861..82037ae79 100644 --- a/commons/res/values-zh/strings.xml +++ b/commons/res/values-zh/strings.xml @@ -44,7 +44,7 @@ 搜索分类 保存 没有找到匹配%1$s的分类 - 添加分类使你的图像更容易在维基共享资源被找到。 + 添加分类使你的图像更容易在维基共享资源被找到。 开始输入以添加分类。 点击该信息（或按返回）以跳过此步。 diff --git a/commons/res/values/strings.xml b/commons/res/values/strings.xml index f076f3604..ce8bc8f95 100644 --- a/commons/res/values/strings.xml +++ b/commons/res/values/strings.xml @@ -69,7 +69,7 @@ No categories matching %1$s found - Add categories to make your images more discoverable on Wikimedia Commons.\n\nStart typing to add categories.\nTap this message (or hit back) to skip this step. + Add categories to make your images more discoverable on Wikimedia Commons.\n\nStart typing to add categories. Categories Usage reports Send usage reports to Wikimedia to help us improve the app @@ -114,6 +114,8 @@ CC BY-SA 3.0 (Poland) CC BY-SA 3.0 (Romania) CC BY 3.0 + CC BY-SA 4.0 + CC BY 4.0 CC Zero own-pd CC BY-SA 2.5 diff --git a/commons/res/xml/wikimedia_licenses.xml b/commons/res/xml/wikimedia_licenses.xml index e23bcbfc5..49fa07bf9 100644 --- a/commons/res/xml/wikimedia_licenses.xml +++ b/commons/res/xml/wikimedia_licenses.xml @@ -1,5 +1,7 @@ + + diff --git a/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 94f2e18c0..b9bcc309c 100644 --- a/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -4,25 +4,30 @@ import android.app.Activity; import android.content.ContentProviderClient; import android.content.Context; import android.database.Cursor; -import android.os.*; +import android.os.AsyncTask; +import android.os.Bundle; +import android.os.Parcel; +import android.os.Parcelable; +import android.os.RemoteException; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.util.Log; -import android.view.*; -import android.widget.*; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.BaseAdapter; +import android.widget.CheckedTextView; +import android.widget.EditText; +import android.widget.ListView; +import android.widget.ProgressBar; +import android.widget.TextView; + import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; -import fr.free.nrw.commons.Utils; -import org.mediawiki.api.ApiResult; -import org.mediawiki.api.MWApi; -import fr.free.nrw.commons.CommonsApplication; -import fr.free.nrw.commons.R; -import fr.free.nrw.commons.upload.MwVolleyApi; -import java.io.IOException; -import java.sql.ResultSet; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -33,6 +38,10 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ScheduledThreadPoolExecutor; +import fr.free.nrw.commons.R; +import fr.free.nrw.commons.Utils; +import fr.free.nrw.commons.upload.MwVolleyApi; + /** * Displays the category suggestion and selection screen. Category search is initiated here. */ @@ -45,7 +54,7 @@ public class CategorizationFragment extends SherlockFragment{ protected EditText categoriesFilter; ProgressBar categoriesSearchInProgress; TextView categoriesNotFoundView; - TextView categoriesSkip; + TextView categoriesExplain; CategoriesAdapter categoriesAdapter; ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(2); @@ -167,8 +176,8 @@ public class CategorizationFragment extends SherlockFragment{ if (categories.isEmpty()) { if (TextUtils.isEmpty(filter)) { - // If we found no recent cats, show the skip message! - categoriesSkip.setVisibility(View.VISIBLE); + // If we found no recent cats, show the explanation message! + categoriesExplain.setVisibility(View.VISIBLE); } else { categoriesNotFoundView.setText(getString(R.string.categories_not_found, filter)); categoriesNotFoundView.setVisibility(View.VISIBLE); @@ -297,14 +306,7 @@ public class CategorizationFragment extends SherlockFragment{ categoriesFilter = (EditText) rootView.findViewById(R.id.categoriesSearchBox); categoriesSearchInProgress = (ProgressBar) rootView.findViewById(R.id.categoriesSearchInProgress); categoriesNotFoundView = (TextView) rootView.findViewById(R.id.categoriesNotFound); - categoriesSkip = (TextView) rootView.findViewById(R.id.categoriesExplanation); - - categoriesSkip.setOnClickListener(new View.OnClickListener() { - public void onClick(View view) { - getActivity().onBackPressed(); - getActivity().finish(); - } - }); + categoriesExplain = (TextView) rootView.findViewById(R.id.categoriesExplanation); ArrayList items; if(savedInstanceState == null) { diff --git a/commons/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java b/commons/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java index 816f0c34e..0fcc31cae 100644 --- a/commons/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java +++ b/commons/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java @@ -35,7 +35,7 @@ public class MethodAUpdater extends AsyncTask> { catFragment.categoriesSearchInProgress.setVisibility(View.VISIBLE); catFragment.categoriesNotFoundView.setVisibility(View.GONE); - catFragment.categoriesSkip.setVisibility(View.GONE); + catFragment.categoriesExplain.setVisibility(View.GONE); } @Override diff --git a/commons/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java b/commons/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java index a984f1a72..524dd7755 100644 --- a/commons/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java +++ b/commons/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java @@ -36,7 +36,7 @@ public class PrefixUpdater extends AsyncTask> { catFragment.categoriesSearchInProgress.setVisibility(View.VISIBLE); catFragment.categoriesNotFoundView.setVisibility(View.GONE); - catFragment.categoriesSkip.setVisibility(View.GONE); + catFragment.categoriesExplain.setVisibility(View.GONE); } @Override