Skip to content

Commit d72e4be

Browse files
committed
Merge remote-tracking branch 'refs/remotes/commons-app/master'
2 parents 6e7ce0f + 46a1f3c commit d72e4be

File tree

14 files changed

+49
-13
lines changed

14 files changed

+49
-13
lines changed

app/src/main/res/values-ast/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ Toque nesti mensaxe (o calque atrás) pa saltar esti pasu.</string>
9090
<string name="use_previous">Usar un títulu/descripción anterior</string>
9191
<string name="allow_gps">Llograr automáticamente l\'allugamientu actual</string>
9292
<string name="allow_gps_summary">Recuperar l\'allugamientu actual pa ufiertar suxerencies de categoríes si la imaxe nun tien etiquetes xeográfiques</string>
93+
<string name="license_name_cc_by_sa_four"> Reconocimientu-CompartirIgual 4.0</string>
94+
<string name="license_name_cc_by_four"> Reconocimientu 4.0</string>
9395
<string name="license_name_cc_by_sa"> Reconocimientu-CompartirIgual 3.0</string>
9496
<string name="license_name_cc_by"> Reconocimientu 3.0</string>
9597
<string name="license_name_cc0">CC0</string>

app/src/main/res/values-bn/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@
9090
<string name="use_previous">পূর্ববর্তী শিরোনাম/বিবরণ ব্যবহার করুন</string>
9191
<string name="allow_gps">স্বয়ংক্রিয়ভাবে বর্তমান অবস্থান পান</string>
9292
<string name="allow_gps_summary">বিষয়শ্রেণীর পরামর্শ দিতে বর্তমান অবস্থান পান যদি ছবিতে ভূ-ট্যাগ না থেকে থাকে</string>
93+
<string name="license_name_cc_by_sa_four">অ্যাট্রিবিউশন-শেয়ারঅ্যালাইক ৪.০</string>
94+
<string name="license_name_cc_by_four">অ্যাট্রিবিউশন ৪.০</string>
9395
<string name="license_name_cc_by_sa">অ্যাট্রিবিউশন-শেয়ারঅ্যালাইক ৩.০</string>
9496
<string name="license_name_cc_by">সিসিইউ০০এ০এঅ্যাট্রিবিউসনইউ০০এ০৩.০</string>
9597
<string name="license_name_cc0">সিসি০</string>

app/src/main/res/values-br/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ Pouezit war ar c\'hemenn-mañ (pe distroit en a-raok) evit mont dreist ar bazenn
9090
<string name="use_previous">Ober gant an titl/deskrivadur kent</string>
9191
<string name="allow_gps">Tapout al lec\'hiadur red ent emgefre</string>
9292
<string name="allow_gps_summary">Kavout al lec\'hiadur red evit pourchas kinnigoù rummadoù ma n\'eo ket douarlec\'hiet ar skeudenn.</string>
93+
<string name="license_name_cc_by_sa_four">Deroadur-RannañHeñvel 4.0</string>
94+
<string name="license_name_cc_by_four">Deroadur 4.0</string>
9395
<string name="license_name_cc_by_sa"> Deroadur-RannañHeñvel 3.0</string>
9496
<string name="license_name_cc_by">Deroadur 3.0</string>
9597
<string name="license_name_cc0">CC0</string>

app/src/main/res/values-es/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ Toca este mensaje (o pulsa Anterior) para omitir este paso.</string>
9090
<string name="use_previous">Usar título/descripción anteriores</string>
9191
<string name="allow_gps">Obtener ubicación actual automáticamente</string>
9292
<string name="allow_gps_summary">Recuperar ubicación actual para ofrecer sugerencias de categorías si la imagen no tiene etiquetas geográficas</string>
93+
<string name="license_name_cc_by_sa_four"> Atribución-CompartirIgual 4.0</string>
94+
<string name="license_name_cc_by_four">Atribución 4.0</string>
9395
<string name="license_name_cc_by_sa"> Atribución-CompartirIgual 3.0</string>
9496
<string name="license_name_cc_by">Atribución 3.0</string>
9597
<string name="license_name_cc0">CC0</string>

app/src/main/res/values-gl/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ Prema nesta mensaxe (ou no botón \"Atrás\") para saltar este paso.</string>
9090
<string name="use_previous">Usar o título ou a descrición anterior</string>
9191
<string name="allow_gps">Obter automaticamente a localización actual</string>
9292
<string name="allow_gps_summary">Obter a localización actual para ofrecer suxestións de categoría se a imaxe non está xeolocalizada</string>
93+
<string name="license_name_cc_by_sa_four"> Recoñecemento-CompartirIgual 4.0</string>
94+
<string name="license_name_cc_by_four">Recoñecemento 4.0</string>
9395
<string name="license_name_cc_by_sa"> Recoñecemento-CompartirIgual 3.0</string>
9496
<string name="license_name_cc_by">Recoñecemento 3.0</string>
9597
<string name="license_name_cc0">CC0</string>

app/src/main/res/values-in/strings.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,12 @@ Tekan pesan ini (atau tekan kembali) untuk melewatkan langkah ini.</string>
8686
<string name="share_license_summary">Gambar ini akan diberi lisensi %1$s</string>
8787
<string name="menu_download">Unduh</string>
8888
<string name="preference_license">Lisensi</string>
89-
<string name="license_name_cc_by_sa" fuzzy="true">CCu00A0Attribution-ShareAlikeu00A03.0</string>
90-
<string name="license_name_cc_by" fuzzy="true">CCu00A0Attributionu00A03.0</string>
89+
<string name="use_previous">Gunakan judul/deskripsi sebelumnya</string>
90+
<string name="allow_gps">Dapatkan lokasi secara otomatis</string>
91+
<string name="license_name_cc_by_sa_four">Atribusi-BerbagiSerupa 4.0</string>
92+
<string name="license_name_cc_by_four">Atribusi 4.0</string>
93+
<string name="license_name_cc_by_sa">Atribusi-BerbagiSerupa 3.0</string>
94+
<string name="license_name_cc_by">Atribusi 3.0</string>
9195
<string name="license_name_cc0">CC0</string>
9296
<string name="license_name_cc_by_sa_3_0">CC BY-SA 3.0</string>
9397
<string name="license_name_cc_by_sa_3_0_at">CC BY-SA 3.0 (Austria)</string>
@@ -101,6 +105,8 @@ Tekan pesan ini (atau tekan kembali) untuk melewatkan langkah ini.</string>
101105
<string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (Polandia)</string>
102106
<string name="license_name_cc_by_sa_3_0_ro">CC BY-SA 3.0 (Rumania)</string>
103107
<string name="license_name_cc_by_3_0">CC BY 3.0</string>
108+
<string name="license_name_cc_by_sa_4_0">CC BY-SA 4.0</string>
109+
<string name="license_name_cc_by_4_0">CC BY 4.0</string>
104110
<string name="license_name_cc_zero">CC Nol</string>
105111
<string name="license_name_own_pd">own-pd</string>
106112
<string name="license_name_cc_by_sa_2_5">CC BY-SA 2.5</string>
@@ -118,6 +124,7 @@ Tekan pesan ini (atau tekan kembali) untuk melewatkan langkah ini.</string>
118124
<string name="license_name_pd_ineligible">Domain umum (tidak memenuhi syarat untuk hak cipta)</string>
119125
<string name="license_name_attribution">Atribusi</string>
120126
<string name="license_name_gfdl">Lisensi Dokumentasi Bebas GNU</string>
127+
<string name="tutorial_1_subtext">Gambar Anda membatu mendidik orang-orang di seluruh dunia!</string>
121128
<string name="welcome_wikipedia_text">Sumbangkan gambar-gambar Anda. Bantu hidupkan artikel Wikipedia!</string>
122129
<string name="welcome_wikipedia_subtext">Gambar di Wikipedia diambil dari Wikimedia Commons.</string>
123130
<string name="welcome_copyright_text">Gambar Anda membantu mendidik orang-orang di seluruh dunia</string>
@@ -130,4 +137,7 @@ Tekan pesan ini (atau tekan kembali) untuk melewatkan langkah ini.</string>
130137
<string name="detail_description_empty">Tidak ada keterangan</string>
131138
<string name="detail_license_empty">Lisensi tidak diketahui</string>
132139
<string name="menu_refresh">Segarkan</string>
140+
<string name="title_activity_nearby">Tempat disekitar</string>
141+
<string name="yes">Ya</string>
142+
<string name="no">Tidak</string>
133143
</resources>

app/src/main/res/values-it/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ Tocca questo messaggio (o premi Indietro) per saltare l\'aggiunta di categorie.<
8989
<string name="preference_license">Licenza</string>
9090
<string name="use_previous">Utilizza titolo/descrizione precedente</string>
9191
<string name="allow_gps">Ottieni automaticamente l\'attuale posizione</string>
92+
<string name="license_name_cc_by_sa_four"> Attribuzione-Condividi allo stesso modo 4.0</string>
93+
<string name="license_name_cc_by_four"> Attribuzione 4.0</string>
9294
<string name="license_name_cc_by_sa"> Attribuzione-Condividi allo stesso modo 3.0</string>
9395
<string name="license_name_cc_by">CCu00A0Attribuzioneu00A03.0</string>
9496
<string name="license_name_cc0">CC0</string>

app/src/main/res/values-iw/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@
9090
<string name="use_previous">להשתמש בכותרת ובתיאור קודמים</string>
9191
<string name="allow_gps">לקבל אוטומטית את המיקום הנוכחי</string>
9292
<string name="allow_gps_summary">לאחזר את המיקום הנוכחי כדי להציע קטגוריות אם בתמונה אין תגי מיקום</string>
93+
<string name="license_name_cc_by_sa_four">ייחוס–שיתוף זהה 4.0</string>
94+
<string name="license_name_cc_by_four">ייחוס 4.0</string>
9395
<string name="license_name_cc_by_sa">ייחוס–שיתוף זהה 3.0</string>
9496
<string name="license_name_cc_by">ייחוס 3.0</string>
9597
<string name="license_name_cc0">CC0</string>

app/src/main/res/values-pl/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ Kliknij ten komunikat lub naciśnij „cofnij”, aby pominąć ten krok.</strin
9090
<string name="use_previous">Użyj poprzedniego tytułu/opisu</string>
9191
<string name="allow_gps">Automatycznie uzyskaj bieżącą lokalizację</string>
9292
<string name="allow_gps_summary">Pobierz aktualną lokalizację, aby uzyskać propozycje kategorii, jeśli obraz nie zawiera znaczników geograficznych</string>
93+
<string name="license_name_cc_by_sa_four">Uznanie autorstwa-Na tych samych warunkach 4.0</string>
94+
<string name="license_name_cc_by_four">Uznanie autorstwa 4.0</string>
9395
<string name="license_name_cc_by_sa"> Uznanie autorstwa-Na tych samych warunkach 3.0</string>
9496
<string name="license_name_cc_by"> Uznanie autorstwa 3.0</string>
9597
<string name="license_name_cc0">CC0</string>

app/src/main/res/values-qq/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@
8080
<string name="title_activity_settings">{{Identical|Settings}}</string>
8181
<string name="title_activity_signup">{{Identical|Sign up}}</string>
8282
<string name="menu_about">{{Identical|About}}</string>
83-
<string name="about_license">License</string>
83+
<string name="about_license">\'\'\'The name \"Wikimedia Commons\" is a trademark in English, and must not be translated.\'\'\'
84+
85+
License and legal notice.</string>
8486
<string name="about_improve">{{doc-important|Please make sure that your translation of \"source\" means \"source code\", not \"reference source\".}}
8587
Source and Bugs</string>
8688
<string name="about_privacy_policy">HTML fragment linking to Wikimedia\'s privacy policy. Note: avoid percent-encoding in the URL, as this causes problems with Android\'s resource compiler. Use accented/non-ASCII characters \"as is\" if possible. (We can fix it manually, so don\'t worry too much about it.)

0 commit comments

Comments
 (0)