mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 05:15:40 +03:00
Merge branch 'master' into fix-eoan-build
This commit is contained in:
commit
fd7ba861a1
3 changed files with 251 additions and 227 deletions
|
@ -985,7 +985,9 @@ If you decide to delete the files, they will be unavailable to you, unless you a
|
|||
<source>All files got deleted from your local sync folder '%1'.
|
||||
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
|
||||
If this action was unintended you can restore the lost data now.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Tots els fitxers s'han suprimit de la carpeta de sincronització local "%1".
|
||||
Aquests fitxers se suprimiran del servidor i no estaran disponibles als altres dispositius si no es restauren.
|
||||
Si aquesta acció no era desitjada, podeu restaurar les dades perdudes ara.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="1091"/>
|
||||
|
|
|
@ -130,12 +130,12 @@
|
|||
<message>
|
||||
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/>
|
||||
<source>Re-open Browser</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Отворите веб читач поново</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/>
|
||||
<source>Copy link</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Копирај везу</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
@ -158,12 +158,12 @@
|
|||
<message>
|
||||
<location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/>
|
||||
<source>Re-open Browser</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Отворите веб читач поново</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/>
|
||||
<source>Copy link</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Копирај везу</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
@ -331,7 +331,7 @@
|
|||
<location filename="../src/gui/accountsettings.cpp" line="618"/>
|
||||
<location filename="../src/gui/accountsettings.cpp" line="654"/>
|
||||
<source>Edit Ignored Files</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Измени игнорисане фајлове</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/accountsettings.cpp" line="658"/>
|
||||
|
@ -801,12 +801,12 @@
|
|||
<message>
|
||||
<location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/>
|
||||
<source>Login in your browser (Login Flow v2)</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Пријавите се из веб читача (Login Flow v2)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/wizard/flow2authcredspage.cpp" line="83"/>
|
||||
<source>Unable to open the Browser, please copy the link to your Browser.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Не могу да отворим веб читач, копирајте везу директно у Ваш веб читач.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
@ -814,7 +814,7 @@
|
|||
<message>
|
||||
<location filename="../src/gui/wizard/flow2authwidget.cpp" line="67"/>
|
||||
<source>Unable to open the Browser, please copy the link to your Browser.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Не могу да отворим веб читач, копирајте везу директно у Ваш веб читач.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
@ -911,12 +911,12 @@
|
|||
<message numerus="yes">
|
||||
<location filename="../src/gui/folder.cpp" line="422"/>
|
||||
<source>%1 and %n other file(s) are currently locked.</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%1 и још %n други фајл је тренутно закључан.</numerusform><numerusform>%1 и још %n друга фајла су тренутно закључана.</numerusform><numerusform>%1 и још %n других фајлова су тренутно закључани.</numerusform></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="424"/>
|
||||
<source>%1 is currently locked.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>%1 је тренутно закључан.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="432"/>
|
||||
|
@ -976,29 +976,34 @@ This means that the synchronization client might not upload local changes immedi
|
|||
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
|
||||
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
|
||||
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Сви фајлови из синхронизационе фасцикле '%1' су избрисани на серверу.
|
||||
Ово брисање ће бити синхронизовано са локалном синхронизационом фасциклом и тиме ће ови фајлови постати недоступни, осим ако немате право њиховог враћања.
|
||||
Ако одлучите да повратите фајлове, они ће бити опет синхронизовани назад са сервером, уколико имате права то да урадите.
|
||||
Ако одлучите да обришете фајлове, они ће Вам постати недоступни, осим ако нисте власник.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="1087"/>
|
||||
<source>All files got deleted from your local sync folder '%1'.
|
||||
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
|
||||
If this action was unintended you can restore the lost data now.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Сви фајлови су обрисани из Ваше локалне синхронизационе фасцикле '%1'.
|
||||
Ови фајлови ће бити обрисани са сервера и неће бити доступни Вашим осталим уређајима ако не буду повраћени.
|
||||
Уколико ово није била намера, можете сада повратити све обрисане податке.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="1091"/>
|
||||
<source>Delete all files?</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Избриши све фајлове?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="1094"/>
|
||||
<source>Delete all files</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Избриши све фајлове</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="1095"/>
|
||||
<source>Restore deleted files</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Поврати избрисане фајлове</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="1112"/>
|
||||
|
@ -1138,7 +1143,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
|
|||
<message>
|
||||
<location filename="../src/gui/folderstatusdelegate.cpp" line="256"/>
|
||||
<source>Synchronized with local folder (%1)</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Синхронизовано са локалном фасциклом (%1)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folderstatusdelegate.cpp" line="303"/>
|
||||
|
@ -1554,7 +1559,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
|
|||
<message>
|
||||
<location filename="../src/gui/ignorelisteditor.ui" line="20"/>
|
||||
<source>Global Ignore Settings</source>
|
||||
<translation>Опште поставке занемаривања</translation>
|
||||
<translation>Опште поставке игнорисања фајлова</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/ignorelisteditor.ui" line="26"/>
|
||||
|
@ -1577,59 +1582,61 @@ Continuing the sync as normal will cause all your files to be overwritten by an
|
|||
<message>
|
||||
<location filename="../src/gui/ignorelisttablewidget.ui" line="14"/>
|
||||
<source>IgnoreListTableWidget</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>IgnoreListTableWidget</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/ignorelisttablewidget.ui" line="33"/>
|
||||
<source>Pattern</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Шаблон</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/ignorelisttablewidget.ui" line="38"/>
|
||||
<source>Allow Deletion</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Дозволи брисање</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/ignorelisttablewidget.ui" line="49"/>
|
||||
<source>Add</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Додај</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/ignorelisttablewidget.ui" line="59"/>
|
||||
<source>Remove</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Уклони</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/ignorelisttablewidget.ui" line="66"/>
|
||||
<source>Remove all</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Уклони све</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/ignorelisttablewidget.cpp" line="24"/>
|
||||
<source>Files or folders matching a pattern will not be synchronized.
|
||||
|
||||
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Фајлови или фасцикле које одговарају шаблону неће бити синхронизоване.
|
||||
|
||||
Ставке над којима је дозвољено брисања ће бити избрисане уколико ометају да се директоријум избрише. Ово је корисно за мета податке.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/>
|
||||
<source>Could not open file</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Не могу да отворим фајл</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/>
|
||||
<source>Cannot write changes to '%1'.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>.Не могу да упишем измене у „%1“</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/>
|
||||
<source>Add Ignore Pattern</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Додај шаблон за игнорисање</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/>
|
||||
<source>Add a new ignore pattern:</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Додајте нови шаблон за игнорисање:</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
@ -2965,12 +2972,12 @@ It is not advisable to use it.</source>
|
|||
<location filename="../src/gui/socketapi.cpp" line="625"/>
|
||||
<location filename="../src/gui/socketapi.cpp" line="655"/>
|
||||
<source>Share options</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Опције дељења</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/socketapi.cpp" line="626"/>
|
||||
<source>Share via </source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Подели преко</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/socketapi.cpp" line="627"/>
|
||||
|
@ -2991,12 +2998,12 @@ It is not advisable to use it.</source>
|
|||
<location filename="../src/gui/socketapi.cpp" line="666"/>
|
||||
<location filename="../src/gui/socketapi.cpp" line="668"/>
|
||||
<source>Copy public link</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Копирај јавну везу</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/socketapi.cpp" line="672"/>
|
||||
<source>Copy internal link</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Копирај интерну везу</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/socketapi.cpp" line="722"/>
|
||||
|
@ -3171,17 +3178,17 @@ It is not advisable to use it.</source>
|
|||
<message>
|
||||
<location filename="../src/gui/sslerrordialog.cpp" line="189"/>
|
||||
<source>Fingerprint (SHA1): <tt>%1</tt></source>
|
||||
<translation>Отисак (СХА1): <tt>%1</tt></translation>
|
||||
<translation>Отисак (SHA1): <tt>%1</tt></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sslerrordialog.cpp" line="194"/>
|
||||
<source>Fingerprint (SHA-256): <tt>%1</tt></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Отисак (SHA-256): <tt>%1</tt></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sslerrordialog.cpp" line="195"/>
|
||||
<source>Fingerprint (SHA-512): <tt>%1</tt></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Отисак (SHA-512): <tt>%1</tt></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sslerrordialog.cpp" line="197"/>
|
||||
|
@ -3847,7 +3854,7 @@ It is not advisable to use it.</source>
|
|||
<message>
|
||||
<location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/>
|
||||
<source>Copy link</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Копирај везу</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
@ -3880,7 +3887,7 @@ It is not advisable to use it.</source>
|
|||
<message>
|
||||
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="417"/>
|
||||
<source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#7a7a7a;">Host your own server</span></a></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#7a7a7a;">Хостујте Ваш сопствени сервер</span></a></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue