diff options
Diffstat (limited to 'translations/client_sr.ts')
| -rw-r--r-- | translations/client_sr.ts | 793 |
1 files changed, 327 insertions, 466 deletions
diff --git a/translations/client_sr.ts b/translations/client_sr.ts index de7c2501c..b340d0d45 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -103,34 +103,6 @@ </message> </context> <context> - <name>Flow2AuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> - <source>Browser Authentication</source> - <translation>Провера идентитета из веб читача</translation> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation>Пребаците се на веб читач да наставите.</translation> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation>Догодила се грешка при повезивању. Покушајте поново.</translation> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation>Отворите веб читач поново</translation> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="70"/> - <source>Copy link</source> - <translation>Копирај везу</translation> - </message> -</context> -<context> <name>Flow2AuthWidget</name> <message> <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> @@ -138,22 +110,22 @@ <translation>Провера идентитета из веб читача</translation> </message> <message> - <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="32"/> <source>Please switch to your browser to proceed.</source> <translation>Пребаците се на веб читач да наставите.</translation> </message> <message> - <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="42"/> <source>An error occurred while connecting. Please try again.</source> <translation>Догодила се грешка при повезивању. Покушајте поново.</translation> </message> <message> - <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="52"/> <source>Re-open Browser</source> <translation>Отворите веб читач поново</translation> </message> <message> - <location filename="../src/gui/wizard/flow2authwidget.ui" line="82"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="65"/> <source>Copy link</source> <translation>Копирај везу</translation> </message> @@ -167,8 +139,8 @@ </message> <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/> - <source>&Choose...</source> - <translation>&Изабери…</translation> + <source>&Choose …</source> + <translation type="unfinished"/> </message> </context> <context> @@ -228,11 +200,6 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="211"/> - <source>Storage space: ...</source> - <translation>Простор у складишту: ...</translation> - </message> - <message> <location filename="../src/gui/accountsettings.ui" line="31"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation>Неозначене фасцикле биће <b>уклоњене</b> из локалног фајл-система и више се неће синхронизовати на овом рачунару</translation> @@ -258,9 +225,14 @@ <translation>Примени</translation> </message> <message> + <location filename="../src/gui/accountsettings.ui" line="204"/> + <source>Storage space: …</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/accountsettings.ui" line="126"/> - <location filename="../src/gui/accountsettings.cpp" line="803"/> - <location filename="../src/gui/accountsettings.cpp" line="1219"/> + <location filename="../src/gui/accountsettings.cpp" line="759"/> + <location filename="../src/gui/accountsettings.cpp" line="1154"/> <source>Cancel</source> <translation>Одустани</translation> </message> @@ -270,230 +242,199 @@ <translation>Повезан са <server> као <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="190"/> + <location filename="../src/gui/accountsettings.cpp" line="187"/> <source>No account configured.</source> <translation>Није подешен налог.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="220"/> - <source>Add new</source> - <translation>Додај нови</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="228"/> - <source>Remove</source> - <translation>Уклони</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="232"/> - <source>Account</source> - <translation>Налог</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="242"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>This account supports end-to-end encryption</source> <translation>Овај налог подржава шифровање са краја на крај</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="244"/> + <location filename="../src/gui/accountsettings.cpp" line="218"/> <source>Enable encryption</source> <translation>Укључи шифровање</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="261"/> - <source>Show E2E mnemonic</source> - <translation>Прикажи E2E мнемоник</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="561"/> <source>Encrypt</source> <translation>Шифруј</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="649"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Edit Ignored Files</source> <translation>Измени игнорисане фајлове</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="653"/> + <location filename="../src/gui/accountsettings.cpp" line="609"/> <source>Choose what to sync</source> <translation>Изаберите шта синхронизовати</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="659"/> + <location filename="../src/gui/accountsettings.cpp" line="615"/> <source>Force sync now</source> <translation>Форсирај синхронизацију сада</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="661"/> + <location filename="../src/gui/accountsettings.cpp" line="617"/> <source>Restart sync</source> <translation>Поново покрени синхронизацију</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="626"/> <source>Remove folder sync connection</source> <translation>Уклони везу на синхронизацију фасцикле</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="741"/> + <location filename="../src/gui/accountsettings.cpp" line="697"/> <source>Folder creation failed</source> <translation>Прављење фасцикле није успело</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="795"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Потврдите уклањање конекције на синхронизацију фасцикле</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="802"/> + <location filename="../src/gui/accountsettings.cpp" line="758"/> <source>Remove Folder Sync Connection</source> <translation>Уклони везу на синхронизацију фасцикле</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="887"/> + <location filename="../src/gui/accountsettings.cpp" line="843"/> <source>Sync Running</source> <translation>Синхронизација у току</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="888"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Синхронизација је у току.<br/>Желите ли да је прекинете?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="977"/> + <location filename="../src/gui/accountsettings.cpp" line="933"/> <source>%1 in use</source> <translation>%1 искоришћено</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1004"/> + <location filename="../src/gui/accountsettings.cpp" line="960"/> <source>%1 as <i>%2</i></source> <translation>%1 као <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Верзија сервера %1 је стара и није подржана! Настављате на сопствену одговорност.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1012"/> + <location filename="../src/gui/accountsettings.cpp" line="968"/> <source>Connected to %1.</source> <translation>Повезан са %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1014"/> + <location filename="../src/gui/accountsettings.cpp" line="970"/> <source>Server %1 is temporarily unavailable.</source> <translation>Сервер %1 је привремено недоступан.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1016"/> + <location filename="../src/gui/accountsettings.cpp" line="972"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Сервер %1 је тренутно у режиму одржавања.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1018"/> + <location filename="../src/gui/accountsettings.cpp" line="974"/> <source>Signed out from %1.</source> <translation>Одјављен са %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1027"/> + <location filename="../src/gui/accountsettings.cpp" line="983"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Дохватам ауторизацију из веб читача. <a href='%1'>Кликните овде</a> да поново отворите веб читач.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1034"/> + <location filename="../src/gui/accountsettings.cpp" line="990"/> <source>No connection to %1 at %2.</source> <translation>Нема конекције на %1 са %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1066"/> - <source>Log in</source> - <translation>Пријава</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="1162"/> + <location filename="../src/gui/accountsettings.cpp" line="1109"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Ово су фасцикле које нису синхронизоване јер су превелике:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1164"/> + <location filename="../src/gui/accountsettings.cpp" line="1111"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Ово су фасцикле које нису синхронизоване зато што су на спољним складиштима:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1165"/> + <location filename="../src/gui/accountsettings.cpp" line="1112"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Ово су фасцикле које нису синхронизоване зато што су превелике или су на спољним складиштима:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1211"/> + <location filename="../src/gui/accountsettings.cpp" line="1146"/> <source>Confirm Account Removal</source> <translation>Потврда уклањања налога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1212"/> + <location filename="../src/gui/accountsettings.cpp" line="1147"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Да ли стварно желите да уклоните везу ка налогу <i>%1</i>?</p><p><b>Белешка:</b> Овим <b>нећете</b>обрисати ниједан фајл.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1218"/> + <location filename="../src/gui/accountsettings.cpp" line="1153"/> <source>Remove connection</source> <translation>Уклони везу</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> - <location filename="../src/gui/accountsettings.cpp" line="646"/> + <location filename="../src/gui/accountsettings.cpp" line="545"/> + <location filename="../src/gui/accountsettings.cpp" line="602"/> <source>Open folder</source> <translation>Отвори фасциклу</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="224"/> - <location filename="../src/gui/accountsettings.cpp" line="1068"/> - <source>Log out</source> - <translation>Одјава</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="667"/> + <location filename="../src/gui/accountsettings.cpp" line="623"/> <source>Resume sync</source> <translation>Настави синхронизацију</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="667"/> + <location filename="../src/gui/accountsettings.cpp" line="623"/> <source>Pause sync</source> <translation>Паузирај синхронизацију</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="742"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source><p>Could not create local folder <i>%1</i>.</p></source> <translation><p>Не могу да направим локалну фасциклу <i>%1</i>.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="796"/> + <location filename="../src/gui/accountsettings.cpp" line="752"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Желите ли заиста да престанете са синхронизацијом фасцикле <i>%1</i>?</p><p><b>Напомена:</b> Ово <b>неће</b> обрисати ниједан фајл.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="964"/> + <location filename="../src/gui/accountsettings.cpp" line="920"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) од %2 искоришћено. Неке фасцикле, укључујући мрежно монтиране или дељене фасцикле, могу имати друга ограничења.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="965"/> + <location filename="../src/gui/accountsettings.cpp" line="921"/> <source>%1 of %2 in use</source> - <translation>%1% од %2 искоришћено</translation> + <translation>%1 од %2 искоришћено</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="974"/> + <location filename="../src/gui/accountsettings.cpp" line="930"/> <source>Currently there is no storage usage information available.</source> <translation>Тренутно нема доступних података о заузећу складишта.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1031"/> + <location filename="../src/gui/accountsettings.cpp" line="987"/> <source>Connecting to %1 …</source> <translation>Повезујем се на %1 …</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1040"/> + <location filename="../src/gui/accountsettings.cpp" line="996"/> <source>No %1 connection configured.</source> <translation>Нема подешене %1 везе.</translation> </message> @@ -501,103 +442,62 @@ <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="134"/> <source>Signed out</source> <translation>Одјављен</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="136"/> <source>Disconnected</source> <translation>Неповезан</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="138"/> <source>Connected</source> <translation>Повезан</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="140"/> <source>Service unavailable</source> <translation>Услуга није доступна</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="142"/> <source>Maintenance mode</source> <translation>Режим одржавања</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="137"/> + <location filename="../src/gui/accountstate.cpp" line="144"/> <source>Network error</source> <translation>Грешка мреже</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="139"/> + <location filename="../src/gui/accountstate.cpp" line="146"/> <source>Configuration error</source> <translation>Грешка подешавања</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="141"/> + <location filename="../src/gui/accountstate.cpp" line="148"/> <source>Asking Credentials</source> <translation>Питам за акредитиве</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="143"/> + <location filename="../src/gui/accountstate.cpp" line="150"/> <source>Unknown account state</source> <translation>Непознато стање налога</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="229"/> - <source>More information</source> - <translation>Више информација</translation> - </message> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="230"/> - <source>Accept</source> - <translation>Прихвати</translation> - </message> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="231"/> - <source>Join</source> - <translation>Придружи се</translation> - </message> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="252"/> - <source>Open Browser</source> - <translation>Отвори веб читач</translation> - </message> -</context> -<context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="230"/> + <location filename="../src/gui/tray/ActivityListModel.cpp" line="322"/> <source>Files from the ignore list as well as symbolic links are not synced. This includes:</source> <translation>Фајлови са списка за игнорисање као и симболичке везе нису синхронизовани. Ово укључује:</translation> </message> -</context> -<context> - <name>OCC::ActivityWidget</name> - <message> - <location filename="../src/gui/activitywidget.cpp" line="56"/> - <source>Accept</source> - <translation>Прихвати</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="192"/> - <source>Synced</source> - <translation>Синхронизовано</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="231"/> - <source>Retry all uploads</source> - <translation>Понови сва отпремања</translation> - </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="346"/> - <source><br/>Account %1 does not have activities enabled.</source> - <translation><br/>Налог %1 нема укључене активности.</translation> + <location filename="../src/gui/tray/ActivityListModel.cpp" line="424"/> + <source>For more activities please open the Activity app.</source> + <translation type="unfinished"/> </message> </context> <context> @@ -619,8 +519,8 @@ </message> <message> <location filename="../src/gui/addcertificatedialog.ui" line="51"/> - <source>Browse...</source> - <translation>Прегледај...</translation> + <source>Browse …</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/addcertificatedialog.ui" line="60"/> @@ -703,32 +603,32 @@ <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="47"/> - <source>No ownCloud account configured</source> - <translation>Нема подешеног оунКлауд налога</translation> - </message> - <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="289"/> <source>The configured server for this client is too old</source> <translation>Подешени сервер је сувише стар за ову верзију клијента</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="283"/> + <location filename="../src/gui/connectionvalidator.cpp" line="290"/> <source>Please update to the latest server and restart the client.</source> <translation>Ажурирајте сервер и поново покрените клијента.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="144"/> + <location filename="../src/gui/connectionvalidator.cpp" line="147"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Грешка аутентификације: лозинка или корисничко име су погрешни.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="156"/> + <location filename="../src/gui/connectionvalidator.cpp" line="50"/> + <source>No Nextcloud account configured</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="159"/> <source>timeout</source> <translation>истек времена</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="193"/> + <location filename="../src/gui/connectionvalidator.cpp" line="196"/> <source>The provided credentials are not correct</source> <translation>Дати акредитиви нису исправни</translation> </message> @@ -736,7 +636,7 @@ <context> <name>OCC::DiscoveryMainThread</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="631"/> + <location filename="../src/libsync/discoveryphase.cpp" line="638"/> <source>Aborted by the user</source> <translation>Прекинуо корисник</translation> </message> @@ -744,7 +644,7 @@ <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="392"/> + <location filename="../src/libsync/discoveryphase.cpp" line="399"/> <source>The server file discovery reply is missing data.</source> <translation>У одговору са сервера за откривање фајлова недостају подаци.</translation> </message> @@ -752,26 +652,26 @@ <context> <name>OCC::Flow2Auth</name> <message> - <location filename="../src/gui/creds/flow2auth.cpp" line="76"/> - <location filename="../src/gui/creds/flow2auth.cpp" line="145"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="109"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="212"/> <source>Error returned from the server: <em>%1</em></source> <translation>Грешка враћена са сервера: <em>%1</em></translation> </message> <message> - <location filename="../src/gui/creds/flow2auth.cpp" line="79"/> - <location filename="../src/gui/creds/flow2auth.cpp" line="148"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="112"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="215"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Догодила се грешка при приступању 'token' крајњој тачки: <br><em>%1</em></translation> </message> <message> - <location filename="../src/gui/creds/flow2auth.cpp" line="82"/> - <location filename="../src/gui/creds/flow2auth.cpp" line="151"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="115"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="218"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Не могу да парсирам JSON враћен са сервера: <br><em>%1</em></translation> </message> <message> - <location filename="../src/gui/creds/flow2auth.cpp" line="85"/> - <location filename="../src/gui/creds/flow2auth.cpp" line="154"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="118"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="221"/> <source>The reply from the server did not contain all expected fields</source> <translation>Одговор са сервера није садржао сва очекивана поља</translation> </message> @@ -779,28 +679,43 @@ <context> <name>OCC::Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="37"/> <source>Connect to %1</source> <translation>Повежи се са %1</translation> </message> <message> - <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="38"/> <source>Login in your browser (Login Flow v2)</source> <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>Не могу да отворим веб читач, копирајте везу директно у Ваш веб читач.</translation> - </message> </context> <context> <name>OCC::Flow2AuthWidget</name> <message> - <location filename="../src/gui/wizard/flow2authwidget.cpp" line="67"/> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="80"/> <source>Unable to open the Browser, please copy the link to your Browser.</source> <translation>Не могу да отворим веб читач, копирајте везу директно у Ваш веб читач.</translation> </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="143"/> + <source>Waiting for authorization</source> + <translation>Чекам на ауторизацију</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="148"/> + <source>Polling for authorization</source> + <translation>Испитујем има ли ауторизације</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="153"/> + <source>Starting authorization</source> + <translation>Започињем ауторизацију</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="157"/> + <source>Link copied to clipboard.</source> + <translation>Веза копирана у оставу</translation> + </message> </context> <context> <name>OCC::Folder</name> @@ -914,36 +829,36 @@ <translation>Не могу да прочитам системски списак за игнорисање</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="970"/> + <location filename="../src/gui/folder.cpp" line="972"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Додата је нова фасцикла већа од %1 MB: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="973"/> + <location filename="../src/gui/folder.cpp" line="975"/> <source>A folder from an external storage has been added. </source> <translation>Додата је фасцикла са спољног складишта. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="974"/> + <location filename="../src/gui/folder.cpp" line="976"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Идите у поставке и означите ако желите да ја преузмете.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1029"/> + <location filename="../src/gui/folder.cpp" line="1031"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Фасцикла %1 је креирана, али је још раније искључена из синхронизације. Подаци унутар ње неће бити синхронизовани.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1032"/> + <location filename="../src/gui/folder.cpp" line="1034"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Фајл %1 је креиран, али је још раније искључен из синхронизације. Неће бити синхронизован.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1043"/> + <location filename="../src/gui/folder.cpp" line="1045"/> <source>Changes in synchronized folders could not be tracked reliably. This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). @@ -956,7 +871,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1090"/> <source>All files in the sync folder '%1' were deleted on the server. 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. @@ -967,7 +882,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a Ако одлучите да обришете фајлове, они ће Вам постати недоступни, осим ако нисте власник.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1093"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <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> @@ -976,22 +891,22 @@ If this action was unintended you can restore the lost data now.</source> Уколико ово није била намера, можете сада повратити све обрисане податке.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1097"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Delete all files?</source> <translation>Избриши све фајлове?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1100"/> + <location filename="../src/gui/folder.cpp" line="1102"/> <source>Delete all files</source> <translation>Избриши све фајлове</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1103"/> <source>Restore deleted files</source> <translation>Поврати избрисане фајлове</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <source>This sync would reset the files to an earlier time in the sync folder '%1'. This might be because a backup was restored on the server. Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source> @@ -1000,17 +915,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an Ако наставите синхронизацију, сви Ваши фајлови ће бити преписани са старијим фајловима из старијег стања. Да ли желите да задржите Ваше најскорије локалне фајлове као конфликтне фајлове?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1123"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Backup detected</source> <translation>Детектован бекап</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1126"/> + <location filename="../src/gui/folder.cpp" line="1128"/> <source>Normal Synchronisation</source> <translation>Нормална синхронизација</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1127"/> + <location filename="../src/gui/folder.cpp" line="1129"/> <source>Keep Local Files as Conflict</source> <translation>Чувај локалне фајлове као конфликтне</translation> </message> @@ -1131,7 +1046,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Синхронизовано са локалном фасциклом (%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="313"/> <source>File</source> <translation>Фајл</translation> </message> @@ -1384,22 +1299,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="181"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation>Нема е-ознаке са сервера. Проверите прокси или мрежни излаз</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="193"/> + <location filename="../src/libsync/propagatedownload.cpp" line="188"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation>Добијена је различита е-ознака за наставак преноса. Покушаћу поново следећи пут.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="220"/> + <location filename="../src/libsync/propagatedownload.cpp" line="215"/> <source>Server returned wrong content-range</source> <translation>Сервер је вратио погрешан опсег садржаја</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="332"/> + <location filename="../src/libsync/propagatedownload.cpp" line="325"/> <source>Connection Timeout</source> <translation>Време за повезивање је истекло</translation> </message> @@ -1497,12 +1412,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GetOrCreatePublicLinkShare</name> <message> - <location filename="../src/gui/socketapi.cpp" line="520"/> + <location filename="../src/gui/socketapi.cpp" line="556"/> + <source>Password for share required</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="557"/> + <source>Please enter a password for your link share:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="576"/> <source>Sharing error</source> <translation>Грешка приликом дељења</translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="521"/> + <location filename="../src/gui/socketapi.cpp" line="577"/> <source>Could not retrieve or create the public link share. Error: %1</source> @@ -1633,8 +1558,8 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/legalnotice.cpp" line="27"/> - <source><p>Copyright 2017-2019 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></source> - <translation><p>Ауторска права 2017-2019 Nextcloud GmbH<br />Ауторска права 2012-2018 ownCloud GmbH</p></translation> + <source><p>Copyright 2017-2020 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/legalnotice.cpp" line="30"/> @@ -2103,15 +2028,14 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="182"/> - <source>This url is NOT secure as it is not encrypted. + <source>This URL is NOT secure as it is not encrypted. It is not advisable to use it.</source> - <translation>Ова адреса НИЈЕ безбедна јер није шифрована. -Не препоручује се њено коришћење.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="186"/> - <source>This url is secure. You can use it.</source> - <translation>Ова адреса је безбедна. Можете је користити.</translation> + <source>This URL is secure. You can use it.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="225"/> @@ -2177,104 +2101,104 @@ It is not advisable to use it.</source> <translation>Покушавам да се повежем са %1 на %2…</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Локална фасцикла %1 већ постоји. Одређујем је за синхронизацију.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>Creating local sync folder %1 …</source> <translation>Правим локалну фасциклу синхронизације %1…</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="459"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/> <source>ok</source> <translation>у реду</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>failed.</source> <translation>неуспешно</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="463"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/> <source>Could not create local folder %1</source> <translation>Не могу да направим локалну фасциклу %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> <source>No remote folder specified!</source> <translation>Није наведена удаљена фасцикла!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> <source>Error: %1</source> <translation>Грешка: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> <source>creating folder on Nextcloud: %1</source> <translation>правим фасциклу на Некстклауду: % 1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> <source>Remote folder %1 created successfully.</source> <translation>Удаљена фасцикла %1 је успешно направљена.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="561"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Удаљена фасцикла %1 већ постоји. Повезујем се ради синхронизовања.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="563"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="565"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Прављење фасцикле довело је до ХТТП грешке са кодом %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Прављење удаљене фасцикле није успело због погрешних акредитива!<br/>Идите назад и проверите ваше акредитиве.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Прављење удаљене фасцикле није успело због погрешних акредитива.</font><br/>Идите назад и проверите ваше акредитиве.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="577"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Прављење удаљене фасцикле %1 није успело због грешке <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="594"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Веза за синхронизацију %1 до удаљеног директоријума %2 је подешена.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="599"/> <source>Successfully connected to %1!</source> <translation>Успешно повезан са %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="606"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Не може се успоставити веза са %1. Проверите поново.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <source>Folder rename failed</source> <translation>Преименовање није успело</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="621"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Не могу да уклоним и направим резервну копију фасцикле јер су фасцикла или фајл отворени у другом програму. Затворите фасциклу или фајл и покушајте поново или одустаните од подешавања.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="668"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локална фасцикла за синхронизовање %1 је успешно направљена!</b></font></translation> </message> @@ -2282,12 +2206,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="94"/> <source>%1 Connection Wizard</source> <translation>%1 чаробњак повезивања</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="103"/> <source>Skip folders configuration</source> <translation>Прескочи подешавање фасцикли</translation> </message> @@ -2329,52 +2253,52 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFile</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="357"/> <source>File %1 can not be downloaded because encryption information is missing.</source> <translation>Фајл %1 се не може преузети јер недостају подаци о шифровању.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="434"/> + <location filename="../src/libsync/propagatedownload.cpp" line="427"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation>Фајл %1 се не може преузети јер се судара са називом локалног фајла!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="484"/> + <location filename="../src/libsync/propagatedownload.cpp" line="477"/> <source>The download would reduce free local disk space below the limit</source> <translation>Преузимање ће смањити слободно место на диску испод границе</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="488"/> + <location filename="../src/libsync/propagatedownload.cpp" line="481"/> <source>Free space on disk is less than %1</source> <translation>Слободан простор на диску је мањи од %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="608"/> + <location filename="../src/libsync/propagatedownload.cpp" line="601"/> <source>File was deleted from server</source> <translation>Фајл је обрисан са сервера</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="661"/> + <location filename="../src/libsync/propagatedownload.cpp" line="654"/> <source>The file could not be downloaded completely.</source> <translation>Фајл није могао бити преузет у потпуности.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="668"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>Преузети фајл је празан иако је сервер рекао да треба да је %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="857"/> + <location filename="../src/libsync/propagatedownload.cpp" line="850"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Фајл %1 се не може сачувати јер се судара са називом локалног фајла!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="892"/> + <location filename="../src/libsync/propagatedownload.cpp" line="885"/> <source>File has changed since discovery</source> <translation>Фајл је измењен у међувремену</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="948"/> + <location filename="../src/libsync/propagatedownload.cpp" line="941"/> <source>Error writing metadata to the database</source> <translation>Грешка приликом упису мета података у базу података</translation> </message> @@ -2640,7 +2564,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="153"/> + <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/> <source>Dismiss</source> <translation>Откажи</translation> </message> @@ -2653,22 +2577,17 @@ It is not advisable to use it.</source> <translation>Поставке</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> - <source>Activity</source> - <translation>Активност</translation> - </message> - <message> - <location filename="../src/gui/settingsdialog.cpp" line="101"/> + <location filename="../src/gui/settingsdialog.cpp" line="100"/> <source>General</source> <translation>Опште</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="110"/> + <location filename="../src/gui/settingsdialog.cpp" line="109"/> <source>Network</source> <translation>Мрежа</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="236"/> + <location filename="../src/gui/settingsdialog.cpp" line="207"/> <source>Account</source> <translation>Налог</translation> </message> @@ -2676,26 +2595,36 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareDialog</name> <message> - <location filename="../src/gui/sharedialog.cpp" line="104"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>%1 Sharing</source> <translation>%1 дељење</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="80"/> + <location filename="../src/gui/sharedialog.cpp" line="81"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="101"/> + <location filename="../src/gui/sharedialog.cpp" line="102"/> <source>Folder: %2</source> <translation>Фасцикла: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="274"/> + <location filename="../src/gui/sharedialog.cpp" line="276"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Фајл се не може делити јер је подељен без дозволе за поновно дељење.</translation> </message> <message> + <location filename="../src/gui/sharedialog.cpp" line="311"/> + <source>Password for share required</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="312"/> + <source>Please enter a password for your link share:</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.ui" line="51"/> <source>share label</source> <translation>ознака дељења</translation> @@ -2734,72 +2663,72 @@ It is not advisable to use it.</source> <translation>Истиче:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="471"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="470"/> <source>Delete</source> <translation>Обриши</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="159"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="158"/> <source>Allow Editing</source> <translation>Дозволи мењање</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Read only</source> <translation>Само за читање</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> <source>Allow Upload && Editing</source> <translation>Дозволи отпремање и мењање</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="175"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="174"/> <source>File Drop (Upload Only)</source> <translation>Превлачење фајлова (само за отпремање)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="190"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="189"/> <source>Add note to recipient</source> <translation>Додај белешку примаоцу</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="200"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="199"/> <source>Password Protect</source> <translation>Заштита лозинком</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="217"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="216"/> <source>Expiration Date</source> <translation>Датум истека</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="236"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="235"/> <source>Unshare</source> <translation>Укини дељење</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="241"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="240"/> <source>Add another link</source> <translation>Додај још једну везу</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="464"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="463"/> <source>Confirm Link Share Deletion</source> <translation>Потврдите брисање везе дељења</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="465"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="464"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Да ли стварно желите да обришете јавну везу дељења <i>%1</i>?</p><p>Белешка: ово је неповратна операција.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="472"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="471"/> <source>Cancel</source> <translation>Откажи</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="490"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="489"/> <source>Public link</source> <translation>Јавна веза</translation> </message> @@ -2807,11 +2736,6 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> - <source>Share with users or groups ...</source> - <translation>Дели са корисницима или групама...</translation> - </message> - <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="270"/> <source>Copy link</source> <translation>Копирај везу</translation> @@ -2826,13 +2750,18 @@ It is not advisable to use it.</source> <source>I shared something with you</source> <translation>Поделио сам нешто са Вама</translation> </message> + <message> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> + <source>Share with users or groups …</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::ShareUserLine</name> <message> <location filename="../src/gui/shareuserline.ui" line="57"/> - <source>User name</source> - <translation>Корисничко име</translation> + <source>Username</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/shareuserline.ui" line="89"/> @@ -2904,60 +2833,54 @@ It is not advisable to use it.</source> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="457"/> - <source>Share with %1</source> - <comment>parameter is Nextcloud</comment> - <translation>Подели са %1</translation> - </message> - <message> - <location filename="../src/gui/socketapi.cpp" line="491"/> + <location filename="../src/gui/socketapi.cpp" line="529"/> <source>Context menu share</source> <translation>Контекстни мени дељења</translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="612"/> + <location filename="../src/gui/socketapi.cpp" line="668"/> <source>I shared something with you</source> <translation>Поделио сам нешто са Вама</translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="625"/> - <location filename="../src/gui/socketapi.cpp" line="655"/> + <location filename="../src/gui/socketapi.cpp" line="681"/> + <location filename="../src/gui/socketapi.cpp" line="711"/> <source>Share options</source> <translation>Опције дељења</translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="626"/> - <source>Share via %1</source> - <translation>Подели преко %1</translation> - </message> - <message> - <location filename="../src/gui/socketapi.cpp" line="628"/> + <location filename="../src/gui/socketapi.cpp" line="684"/> <source>Send private link by email …</source> <translation>Пошаљи приватну везу е-поштом…</translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="627"/> + <location filename="../src/gui/socketapi.cpp" line="683"/> <source>Copy private link to clipboard</source> <translation>Копирај приватну везу у оставу</translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="653"/> + <location filename="../src/gui/socketapi.cpp" line="709"/> <source>Resharing this file is not allowed</source> <translation>Поновно дељење није дозвољено</translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="666"/> - <location filename="../src/gui/socketapi.cpp" line="668"/> + <location filename="../src/gui/socketapi.cpp" line="722"/> + <location filename="../src/gui/socketapi.cpp" line="724"/> <source>Copy public link</source> <translation>Копирај јавну везу</translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="672"/> + <location filename="../src/gui/socketapi.cpp" line="728"/> <source>Copy internal link</source> <translation>Копирај интерну везу</translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="722"/> + <location filename="../src/gui/socketapi.cpp" line="782"/> + <source>Edit</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="784"/> <source>Open in browser</source> <translation>Отвори у веб читачу</translation> </message> @@ -3444,7 +3367,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="54"/> + <location filename="../src/gui/systray.cpp" line="130"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> @@ -3452,17 +3375,68 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="352"/> + <location filename="../src/libsync/theme.cpp" line="345"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Верзија %1. За више информација кликните <a href='%2'>овде</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="356"/> + <location filename="../src/libsync/theme.cpp" line="349"/> <source><p>This release was supplied by %1</p></source> <translation><p>Ово издање је обезбедио %1</p></translation> </message> </context> <context> + <name>OCC::User</name> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="319"/> + <source>Retry all uploads</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="368"/> + <source>You renamed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="370"/> + <source>You deleted</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="372"/> + <source>You created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="374"/> + <source>You changed</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::UserModel</name> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="688"/> + <source>Confirm Account Removal</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="689"/> + <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="694"/> + <source>Remove connection</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="695"/> + <source>Cancel</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="208"/> @@ -3478,247 +3452,134 @@ It is not advisable to use it.</source> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="166"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="169"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Одјављени сте се са %1 као корисник %2. Пријавите се поново</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="185"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="189"/> <source>Please login with the user: %1</source> <translation>Пријавите се са корисником: %1</translation> </message> </context> <context> + <name>OCC::WebFlowCredentialsDialog</name> + <message> + <location filename="../src/gui/creds/webflowcredentialsdialog.cpp" line="34"/> + <source>Log in</source> + <translation>Пријава</translation> + </message> +</context> +<context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="293"/> + <location filename="../src/gui/owncloudgui.cpp" line="289"/> <source>Please sign in</source> <translation>Пријавите се</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="339"/> + <location filename="../src/gui/owncloudgui.cpp" line="335"/> <source>Folder %1: %2</source> <translation>Фасцикла %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="357"/> + <location filename="../src/gui/owncloudgui.cpp" line="353"/> <source>There are no sync folders configured.</source> <translation>Нема подешених фасцикли за синхронизацију.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="366"/> - <source>Open in browser</source> - <translation>Отвори у прегледачу</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="419"/> - <source>Log out</source> - <translation>Одјава</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="514"/> - <source>Recent Changes</source> - <translation>Недавне измене</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="393"/> - <source>Managed Folders:</source> - <translation>Управљане фасцикле:</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="396"/> - <source>Open folder '%1'</source> - <translation>Отвори фасциклу „%1“</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> - <source>Open %1 in browser</source> - <translation>Отвори %1 у прегледачу</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> - <source>Unknown status</source> - <translation>Непознато стање</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> - <source>Help</source> - <translation>Помоћ</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> - <source>Quit %1</source> - <translation>Напусти %1</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Disconnected from %1</source> <translation>Одјављен са %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="220"/> <source>Unsupported Server Version</source> <translation>Неподржана верзија сервера</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="225"/> + <location filename="../src/gui/owncloudgui.cpp" line="221"/> <source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>Сервер на налогу %1 ради са старом и неподржаном верзијом %2. Коришћење овог клијента са неподржаном серверском верзијом није тестирано и може потенцијално бити опасно. Настављате на сопствену одговорност.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="264"/> + <location filename="../src/gui/owncloudgui.cpp" line="260"/> <source>Disconnected</source> <translation>Неповезан</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="266"/> + <location filename="../src/gui/owncloudgui.cpp" line="262"/> <source>Disconnected from some accounts</source> <translation>Изгубљена веза за неке налоге</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="277"/> + <location filename="../src/gui/owncloudgui.cpp" line="273"/> <source>Disconnected from accounts:</source> <translation>Одјављен са налога:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="279"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> <source>Account %1: %2</source> <translation>Налог %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="294"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> <source>Signed out</source> <translation>Одјављен</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="298"/> + <location filename="../src/gui/owncloudgui.cpp" line="294"/> <source>Account synchronization is disabled</source> <translation>Синхронизација налога је искључена</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="299"/> - <location filename="../src/gui/owncloudgui.cpp" line="352"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Synchronization is paused</source> <translation>Синхронизација је паузирана</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="347"/> + <location filename="../src/gui/owncloudgui.cpp" line="343"/> <source>Unresolved conflicts</source> <translation>Неразрешени конфликти</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="350"/> <source>Error during synchronization</source> <translation>Грешка приликом синхронизације</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="358"/> + <location filename="../src/gui/owncloudgui.cpp" line="354"/> <source>No sync folders configured</source> <translation>Нису подешене фасцикле за синхронизацију</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="404"/> - <source>Resume all folders</source> - <translation>Настави за све фасцикле</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="409"/> - <source>Pause all folders</source> - <translation>Паузирај за све фасцикле</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="415"/> - <source>Log in …</source> - <translation>Пријава…</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="692"/> - <source>Resume all synchronization</source> - <translation>Настави сву синхронизацију</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> - <source>Resume synchronization</source> - <translation>Настави синхронизацију</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="702"/> - <source>Pause all synchronization</source> - <translation>Паузирај сву синхронизацију</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="704"/> - <source>Pause synchronization</source> - <translation>Паузирај синхронизацију</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="937"/> + <location filename="../src/gui/owncloudgui.cpp" line="418"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Синхронизујем %1 од %2 (преостало %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="794"/> - <source>Crash now</source> - <comment>Only shows in debug mode to allow testing the crash handler</comment> - <translation>Падни сада</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> - <source>Apps</source> - <translation>Апликације</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="780"/> - <source>Settings …</source> - <translation>Поставке…</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="781"/> - <source>New account …</source> - <translation>Нови налог…</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>View more activity …</source> - <translation>Види још активности…</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="897"/> - <source>No items synced recently</source> - <translation>Ништа није недавно синхронизовано</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="919"/> - <source>Checking for changes in remote '%1'</source> - <translation>Проверавам за измене у удаљеној '%1'</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="922"/> - <source>Checking for changes in local '%1'</source> - <translation>Проверавам за измене у локалној '%1'</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="942"/> + <location filename="../src/gui/owncloudgui.cpp" line="423"/> <source>Syncing %1 of %2</source> <translation>Синхронизујем %1 од %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="951"/> + <location filename="../src/gui/owncloudgui.cpp" line="432"/> <source>Syncing %1 (%2 left)</source> <translation>Синхронизујем %1 (преостало %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="954"/> + <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Syncing %1</source> <translation>Синхронизујем %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="972"/> + <location filename="../src/gui/owncloudgui.cpp" line="445"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="349"/> + <location filename="../src/gui/owncloudgui.cpp" line="345"/> <source>Up to date</source> <translation>Ажурно</translation> </message> @@ -3990,7 +3851,7 @@ It is not advisable to use it.</source> <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="336"/> + <location filename="../src/libsync/theme.cpp" line="329"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Направљено од ГИТ ревизије <a href="%1">%2</a> %3, %4 користећи QT %5, %6</small></p></translation> </message> |