Merge pull request #2012 from nextcloud-libraries/translations_441be4f7621043648cd4dbc98426de23

Author: nextcloud-command

l10n/uz.pot

@@ -28,12 +28,23 @@ msgstr "\"{segment}\" - zaxiralangan nom va ruxsat berilmaydi."
 msgid "\"/\" is not allowed inside a folder name."
 msgstr "\"/\" papka nomi ichida ruxsat berilmaydi."
 
+msgid "%n file conflict"
+msgid_plural "%n files conflict"
+msgstr[0] "%n fayl ziddiyatli"
+
+msgid "%n file conflict in {dirname}"
+msgid_plural "%n file conflicts in {dirname}"
+msgstr[0] "{dirname} da %n fayl ziddiyati"
+
 msgid "All files"
 msgstr "Barcha fayllar"
 
 msgid "Cancel"
 msgstr "Bekor qilish"
 
+msgid "Cancel the entire operation"
+msgstr "Butun operatsiyani bekor qiling"
+
 msgid "Choose"
 msgstr "Tanlang"
 
@@ -44,6 +55,12 @@ msgid "Choose %n file"
 msgid_plural "Choose %n files"
 msgstr[0] "Tanlang %n faylni"
 
+msgid "Confirm"
+msgstr "Tasdiqlang"
+
+msgid "Continue"
+msgstr "Davom eting"
+
 msgid "Copy"
 msgstr "Nusxa"
 
@@ -68,6 +85,9 @@ msgstr "Joriy ko'rinish selektori"
 msgid "Enter your name"
 msgstr "Ismingizni kiriting"
 
+msgid "Existing version"
+msgstr "Mavjud versiya"
+
 msgid "Failed to set nickname."
 msgstr "Taxallusni o‘rnatib bo‘lmadi."
 
@@ -92,9 +112,19 @@ msgstr "Foydalanuvchini identifikatsiyalash"
 msgid "Home"
 msgstr "Uy"
 
+msgid ""
+"If you select both versions, the incoming file will have a number added to "
+"its name."
+msgstr ""
+"Agar siz ikkala versiyani tanlasangiz, kiruvchi fayl nomiga qo'shilgan "
+"raqamga ega bo'ladi."
+
 msgid "Invalid name."
 msgstr "Nomi noto‘g‘ri."
 
+msgid "Last modified date unknown"
+msgstr "Oxirgi tahrirlangan sana noma'lum"
+
 msgid "Modified"
 msgstr "Modifikatsiyalangan"
 
@@ -128,6 +158,9 @@ msgstr "Yangi jild"
 msgid "New folder name"
 msgstr "Yangi jild nomi"
 
+msgid "New version"
+msgstr "Yangi versiya"
+
 msgid "No files in here"
 msgstr "Fayl mavjud emas"
 
@@ -143,9 +176,18 @@ msgstr "Kamida 2 ta belgidan iborat nom kiriting."
 msgid "Recent"
 msgstr "Yaqinda"
 
+msgid "Select all checkboxes"
+msgstr "Barcha katakchalarni belgilang"
+
 msgid "Select all entries"
 msgstr "Barcha yozuvlarni tanlang"
 
+msgid "Select all existing files"
+msgstr "Barcha mavjud fayllarni tanlang"
+
+msgid "Select all new files"
+msgstr "Barcha yangi fayllarni tanlang"
+
 msgid "Select entry"
 msgstr "Yozuvni tanlang"
 
@@ -155,6 +197,13 @@ msgstr "{nodename} uchun qatorni tanlang"
 msgid "Size"
 msgstr "O`lcham"
 
+msgid "Skip %n file"
+msgid_plural "Skip %n files"
+msgstr[0] "%n faylni oʻtkazib yuborish"
+
+msgid "Skip this file"
+msgstr "Ushbu faylni o'tkazib yuboring"
+
 msgid "Submit name"
 msgstr "Ismni tasdiqlang"
 
@@ -164,6 +213,23 @@ msgstr "Bekor qilish"
 msgid "Upload some content or sync with your devices!"
 msgstr "Qurilmangizga ba'zi kontentni yuklang yoki sinxronlang!"
 
+msgid ""
+"When an incoming folder is selected, any conflicting files within it will "
+"also be overwritten."
+msgstr ""
+"Kiruvchi papka tanlanganda, undagi har qanday ziddiyatli fayllar ham ustiga "
+"yoziladi."
+
+msgid ""
+"When an incoming folder is selected, the content is written into the "
+"existing folder and a recursive conflict resolution is performed."
+msgstr ""
+"Kiruvchi papka tanlanganda, kontent mavjud jildga yoziladi va nizolarni "
+"rekursiv hal qilish amalga oshiriladi."
+
+msgid "Which files do you want to keep?"
+msgstr "Qaysi fayllarni saqlamoqchisiz?"
+
 msgid "You are currently identified as {nickname}."
 msgstr "Siz hozirda {nickname} sifatida aniqlangansiz."
 
@@ -172,3 +238,11 @@ msgstr "Siz hozirda identifikatsiyadan o'tmagansiz"
 
 msgid "You cannot leave the name empty."
 msgstr "Ism katagini bo'sh qoldirib bo'lmaydi."
+
+msgid "You need to choose at least one conflict solution"
+msgstr "Siz kamida bitta mojaro yechimini tanlashingiz kerak"
+
+msgid "You need to select at least one version of each file to continue."
+msgstr ""
+"Davom etish uchun har bir faylning kamida bitta versiyasini tanlashingiz "
+"kerak."